Browse Source

Updated mappings.

tags/1.12.2-1.4.3
Bailey 1 year ago
parent
commit
f9814ab9b2
40 changed files with 56 additions and 62 deletions
  1. +3
    -3
      build.gradle
  2. +1
    -1
      src/main/java/com/legacy/aether/api/moa/AetherMoaType.java
  3. +1
    -1
      src/main/java/com/legacy/aether/blocks/BlocksAether.java
  4. +1
    -1
      src/main/java/com/legacy/aether/blocks/decorative/BlockAerogel.java
  5. +1
    -1
      src/main/java/com/legacy/aether/blocks/decorative/BlockAerogelSlab.java
  6. +1
    -1
      src/main/java/com/legacy/aether/blocks/decorative/BlockAerogelStairs.java
  7. +1
    -1
      src/main/java/com/legacy/aether/blocks/decorative/BlockAerogelWall.java
  8. +1
    -1
      src/main/java/com/legacy/aether/blocks/decorative/BlockAetherSlab.java
  9. +1
    -1
      src/main/java/com/legacy/aether/blocks/decorative/BlockAmbrosiumTorch.java
  10. +1
    -1
      src/main/java/com/legacy/aether/blocks/decorative/BlockQuicksoilGlass.java
  11. +2
    -2
      src/main/java/com/legacy/aether/blocks/dungeon/BlockTreasureChest.java
  12. +2
    -2
      src/main/java/com/legacy/aether/blocks/natural/BlockAercloud.java
  13. +1
    -1
      src/main/java/com/legacy/aether/blocks/natural/BlockAetherLeaves.java
  14. +1
    -1
      src/main/java/com/legacy/aether/blocks/portal/BlockAetherPortal.java
  15. +1
    -1
      src/main/java/com/legacy/aether/blocks/util/BlockFloating.java
  16. +4
    -4
      src/main/java/com/legacy/aether/client/AetherClientEvents.java
  17. +1
    -1
      src/main/java/com/legacy/aether/client/gui/GuiLore.java
  18. +2
    -2
      src/main/java/com/legacy/aether/client/gui/toast/GuiAetherToast.java
  19. +1
    -1
      src/main/java/com/legacy/aether/client/renders/blocks/AetherStateMap.java
  20. +1
    -1
      src/main/java/com/legacy/aether/client/renders/entities/MoaRenderer.java
  21. +1
    -1
      src/main/java/com/legacy/aether/entities/ai/aerwhale/AerwhaleAITravelCourse.java
  22. +1
    -1
      src/main/java/com/legacy/aether/entities/bosses/slider/EntitySlider.java
  23. +1
    -1
      src/main/java/com/legacy/aether/entities/passive/EntityAerwhale.java
  24. +3
    -3
      src/main/java/com/legacy/aether/items/ItemMoaEgg.java
  25. +1
    -1
      src/main/java/com/legacy/aether/items/ItemsAether.java
  26. +2
    -2
      src/main/java/com/legacy/aether/items/armor/ItemAetherArmor.java
  27. +1
    -1
      src/main/java/com/legacy/aether/items/block/ItemAetherSlab.java
  28. +1
    -1
      src/main/java/com/legacy/aether/items/block/ItemSubtype.java
  29. +2
    -2
      src/main/java/com/legacy/aether/items/dungeon/ItemDungeonKey.java
  30. +2
    -2
      src/main/java/com/legacy/aether/items/food/ItemGummySwet.java
  31. +2
    -2
      src/main/java/com/legacy/aether/items/tools/ItemSkyrootBucket.java
  32. +1
    -1
      src/main/java/com/legacy/aether/items/tools/ItemValkyrieTool.java
  33. +1
    -1
      src/main/java/com/legacy/aether/items/weapons/ItemValkyrieLance.java
  34. +2
    -2
      src/main/java/com/legacy/aether/items/weapons/projectile/ItemDart.java
  35. +2
    -2
      src/main/java/com/legacy/aether/items/weapons/projectile/ItemDartShooter.java
  36. +1
    -1
      src/main/java/com/legacy/aether/registry/AetherLore.java
  37. +2
    -8
      src/main/java/com/legacy/aether/registry/creative_tabs/AetherCreativeTabs.java
  38. +1
    -1
      src/main/java/com/legacy/aether/world/gen/components/ComponentLargeColdAercloud.java
  39. BIN
      src/main/resources/assets/aether_legacy/textures/blocks/aether_grass_side_snowy.png
  40. +1
    -1
      src/main/resources/mcmod.info

+ 3
- 3
build.gradle View File

@@ -9,7 +9,7 @@ buildscript {
}
apply plugin: 'net.minecraftforge.gradle.forge'

version = "1.12.2-v1.4.3"
version = "1.12.2-v1.4.4"
group = "com.legacy.aether"
archivesBaseName = "aether_legacy"

@@ -19,10 +19,10 @@ compileJava {
}

minecraft {
version = "1.12.2-14.23.4.2705"
version = "1.12.2-14.23.5.2768"
runDir = "run"

mappings = "snapshot_20171003"
mappings = "stable_39"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}



+ 1
- 1
src/main/java/com/legacy/aether/api/moa/AetherMoaType.java View File

@@ -36,7 +36,7 @@ public class AetherMoaType extends AetherRegistryEntry<AetherMoaType>
return this.properties.getCustomTexture(saddled);
}

return new ResourceLocation("aether_legacy", "textures/entities/moa/" + ("moa_") + this.getRegistryName().getResourcePath().toLowerCase() + ".png");
return new ResourceLocation("aether_legacy", "textures/entities/moa/" + ("moa_") + this.getRegistryName().getPath().toLowerCase() + ".png");
}

public MoaProperties getMoaProperties()


+ 1
- 1
src/main/java/com/legacy/aether/blocks/BlocksAether.java View File

@@ -226,7 +226,7 @@ public class BlocksAether

public static Block register(String name, Block block)
{
block.setUnlocalizedName(name);
block.setTranslationKey(name);
block.setCreativeTab(AetherCreativeTabs.blocks);

blockList[availableId] = block.setRegistryName(Aether.locate(name));


+ 1
- 1
src/main/java/com/legacy/aether/blocks/decorative/BlockAerogel.java View File

@@ -22,7 +22,7 @@ public class BlockAerogel extends BlockBreakable

@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer()
public BlockRenderLayer getRenderLayer()
{
return BlockRenderLayer.TRANSLUCENT;
}


+ 1
- 1
src/main/java/com/legacy/aether/blocks/decorative/BlockAerogelSlab.java View File

@@ -33,7 +33,7 @@ public class BlockAerogelSlab extends BlockAetherSlab

@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer()
public BlockRenderLayer getRenderLayer()
{
return BlockRenderLayer.TRANSLUCENT;
}


+ 1
- 1
src/main/java/com/legacy/aether/blocks/decorative/BlockAerogelStairs.java View File

@@ -21,7 +21,7 @@ public class BlockAerogelStairs extends BlockAetherStairs

@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer()
public BlockRenderLayer getRenderLayer()
{
return BlockRenderLayer.TRANSLUCENT;
}


+ 1
- 1
src/main/java/com/legacy/aether/blocks/decorative/BlockAerogelWall.java View File

@@ -28,7 +28,7 @@ public class BlockAerogelWall extends BlockAetherWall
@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer()
public BlockRenderLayer getRenderLayer()
{
return BlockRenderLayer.TRANSLUCENT;
}


+ 1
- 1
src/main/java/com/legacy/aether/blocks/decorative/BlockAetherSlab.java View File

@@ -116,7 +116,7 @@ public class BlockAetherSlab extends BlockSlab
}

@Override
public String getUnlocalizedName(int meta)
public String getTranslationKey(int meta)
{
return this.name;
}


+ 1
- 1
src/main/java/com/legacy/aether/blocks/decorative/BlockAmbrosiumTorch.java View File

@@ -38,7 +38,7 @@ public class BlockAmbrosiumTorch extends BlockTorch
if (enumfacing.getAxis().isHorizontal())
{
EnumFacing enumfacing1 = enumfacing.getOpposite();
worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + 0.27D * (double)enumfacing1.getFrontOffsetX(), d1 + 0.22D, d2 + 0.27D * (double)enumfacing1.getFrontOffsetZ(), 0.0D, 0.0D, 0.0D);
worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + 0.27D * (double)enumfacing1.getXOffset(), d1 + 0.22D, d2 + 0.27D * (double)enumfacing1.getZOffset(), 0.0D, 0.0D, 0.0D);
}
else
{


+ 1
- 1
src/main/java/com/legacy/aether/blocks/decorative/BlockQuicksoilGlass.java View File

@@ -31,7 +31,7 @@ public class BlockQuicksoilGlass extends BlockBreakable

@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer()
public BlockRenderLayer getRenderLayer()
{
return BlockRenderLayer.TRANSLUCENT;
}


+ 2
- 2
src/main/java/com/legacy/aether/blocks/dungeon/BlockTreasureChest.java View File

@@ -112,7 +112,7 @@ public class BlockTreasureChest extends BlockContainer
*/
public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
{
EnumFacing enumfacing = EnumFacing.getHorizontal(MathHelper.floor((double)(placer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3).getOpposite();
EnumFacing enumfacing = EnumFacing.byHorizontalIndex(MathHelper.floor((double)(placer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3).getOpposite();
state = state.withProperty(FACING, enumfacing);
BlockPos blockpos = pos.north();
BlockPos blockpos1 = pos.south();
@@ -444,7 +444,7 @@ public class BlockTreasureChest extends BlockContainer
*/
public IBlockState getStateFromMeta(int meta)
{
EnumFacing enumfacing = EnumFacing.getFront(meta);
EnumFacing enumfacing = EnumFacing.fromAngle(meta);

if (enumfacing.getAxis() == EnumFacing.Axis.Y)
{


+ 2
- 2
src/main/java/com/legacy/aether/blocks/natural/BlockAercloud.java View File

@@ -75,7 +75,7 @@ public class BlockAercloud extends Block implements IAetherMeta
}

@Override
public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity)
public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity)
{
entity.fallDistance = 0;

@@ -183,7 +183,7 @@ public class BlockAercloud extends Block implements IAetherMeta

@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer()
public BlockRenderLayer getRenderLayer()
{
return BlockRenderLayer.TRANSLUCENT;
}


+ 1
- 1
src/main/java/com/legacy/aether/blocks/natural/BlockAetherLeaves.java View File

@@ -69,7 +69,7 @@ public class BlockAetherLeaves extends BlockLeaves implements IAetherMeta

@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer()
public BlockRenderLayer getRenderLayer()
{
return BlockRenderLayer.CUTOUT_MIPPED;
}


+ 1
- 1
src/main/java/com/legacy/aether/blocks/portal/BlockAetherPortal.java View File

@@ -40,7 +40,7 @@ public class BlockAetherPortal extends BlockPortal
}

@Override
public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity)
public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity)
{
MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();



+ 1
- 1
src/main/java/com/legacy/aether/blocks/util/BlockFloating.java View File

@@ -40,7 +40,7 @@ public class BlockFloating extends Block
@Override
public void updateTick(World world, BlockPos pos, IBlockState state, Random rand)
{
if (!this.leveled || this.leveled && world.isBlockIndirectlyGettingPowered(pos) != 0)
if (!this.leveled || this.leveled && world.isBlockPowered(pos))
{
this.floatBlock(world, pos);
}


+ 4
- 4
src/main/java/com/legacy/aether/client/AetherClientEvents.java View File

@@ -157,10 +157,10 @@ public class AetherClientEvents
{
if (event.getGui() instanceof GuiContainerCreative)
{
if (((GuiContainerCreative)event.getGui()).getSelectedTabIndex() == CreativeTabs.INVENTORY.getTabIndex())
if (((GuiContainerCreative)event.getGui()).getSelectedTabIndex() == CreativeTabs.INVENTORY.getIndex())
{
event.getButtonList().add(ACCESSORY_BUTTON.setPosition(guiLeft + 73, guiTop + 38));
previousSelectedTabIndex = CreativeTabs.INVENTORY.getTabIndex();
previousSelectedTabIndex = CreativeTabs.INVENTORY.getIndex();
}
}
}
@@ -203,14 +203,14 @@ public class AetherClientEvents

if (previousSelectedTabIndex != guiScreen.getSelectedTabIndex())
{
if (guiScreen.getSelectedTabIndex() == CreativeTabs.INVENTORY.getTabIndex() && !buttonList.contains(ACCESSORY_BUTTON))
if (guiScreen.getSelectedTabIndex() == CreativeTabs.INVENTORY.getIndex() && !buttonList.contains(ACCESSORY_BUTTON))
{
int guiLeft = ObfuscationReflectionHelper.getPrivateValue(GuiContainer.class, (GuiContainer)event.getGui(), "guiLeft", "field_147003_i");
int guiTop = ObfuscationReflectionHelper.getPrivateValue(GuiContainer.class, (GuiContainer)event.getGui(), "guiTop", "field_147009_r");

buttonList.add(ACCESSORY_BUTTON.setPosition(guiLeft + 73, guiTop + 38));
}
else if (previousSelectedTabIndex == CreativeTabs.INVENTORY.getTabIndex())
else if (previousSelectedTabIndex == CreativeTabs.INVENTORY.getIndex())
{
buttonList.remove(ACCESSORY_BUTTON);
}


+ 1
- 1
src/main/java/com/legacy/aether/client/gui/GuiLore.java View File

@@ -95,7 +95,7 @@ public class GuiLore extends GuiContainer

for (String name : this.fontRenderer.listFormattedStringToWidth(searchedStack.getItem().getItemStackDisplayName(searchedStack), 109))
{
this.drawCenteredString(this.fontRenderer, searchedStack.getRarity().rarityColor.toString() + name, 71, 18 + (10 * nameSize), 4210752);
this.drawCenteredString(this.fontRenderer, searchedStack.getRarity().color.toString() + name, 71, 18 + (10 * nameSize), 4210752);

++nameSize;
}


+ 2
- 2
src/main/java/com/legacy/aether/client/gui/toast/GuiAetherToast.java View File

@@ -45,9 +45,9 @@ public class GuiAetherToast extends GuiToast
{
Advancement advancement = getToastAdvancement((AdvancementToast)toastIn);

if (advancement.getId() != null && advancement.getId().getResourceDomain().equals("aether_legacy"))
if (advancement.getId() != null && advancement.getId().getNamespace().equals("aether_legacy"))
{
String achievementName = advancement.getId().getResourcePath();
String achievementName = advancement.getId().getPath();

int achievementType = (achievementName.contains("bronze_dungeon") ? 1 : achievementName.contains("silver_dungeon") ? 2 : 0);



+ 1
- 1
src/main/java/com/legacy/aether/client/renders/blocks/AetherStateMap.java View File

@@ -43,7 +43,7 @@ public class AetherStateMap extends StateMapperBase
}
else
{
s = String.format("%s:%s", Block.REGISTRY.getNameForObject(state.getBlock()).getResourceDomain(), this.removeName(this.name, map));
s = String.format("%s:%s", Block.REGISTRY.getNameForObject(state.getBlock()).getNamespace(), this.removeName(this.name, map));
}

if (this.suffix != null)


+ 1
- 1
src/main/java/com/legacy/aether/client/renders/entities/MoaRenderer.java View File

@@ -24,7 +24,7 @@ public class MoaRenderer extends RenderLiving<EntityMoa>

public MoaRenderer(RenderManager renderManager)
{
super(renderManager, new MoaModel(0.0F), 1.0F);
super(renderManager, new MoaModel(0.0F), 0.7F);

this.addLayer(new MoaDonatorLayer(renderManager, (MoaModel) this.getMainModel()));
this.addLayer(new LayerMoaSaddle(this));


+ 1
- 1
src/main/java/com/legacy/aether/entities/ai/aerwhale/AerwhaleAITravelCourse.java View File

@@ -181,7 +181,7 @@ public class AerwhaleAITravelCourse extends EntityAIBase
float f9 = f3 * f5;

Vec3d vec3d = new Vec3d(this.aerwhale.getPosition());
Vec3d vec3d1 = vec3d.addVector((double)f7 * standard, (double)f8 * standard, (double)f9 * standard);
Vec3d vec3d1 = vec3d.add((double)f7 * standard, (double)f8 * standard, (double)f9 * standard);

RayTraceResult movingobjectposition = this.worldObj.rayTraceBlocks(vec3d, vec3d1, false);



+ 1
- 1
src/main/java/com/legacy/aether/entities/bosses/slider/EntitySlider.java View File

@@ -568,7 +568,7 @@ public class EntitySlider extends EntityFlying implements IAetherBoss
else if (!isTCPickaxe)
{
if (!(stack.getItem() instanceof ItemPickaxe) && !(stack.getItem() instanceof ItemAetherTool) && !stack.getItem().getUnlocalizedName().contains("pickaxe"))
if (!(stack.getItem() instanceof ItemPickaxe) && !(stack.getItem() instanceof ItemAetherTool) && !stack.getItem().getTranslationKey().contains("pickaxe"))
{
this.sendMessage(player, new TextComponentTranslation("gui.slider.notpickaxe"));


+ 1
- 1
src/main/java/com/legacy/aether/entities/passive/EntityAerwhale.java View File

@@ -378,7 +378,7 @@ public class EntityAerwhale extends EntityFlying implements IMob
float f9 = f3 * f5;

Vec3d vec3d = new Vec3d(this.posX, this.getEntityBoundingBox().minY, this.posZ);
Vec3d vec3d1 = vec3d.addVector((double)f7 * standard, (double)f8 * standard, (double)f9 * standard);
Vec3d vec3d1 = vec3d.add((double)f7 * standard, (double)f8 * standard, (double)f9 * standard);

RayTraceResult movingobjectposition = this.world.rayTraceBlocks(vec3d, vec3d1, true);



+ 3
- 3
src/main/java/com/legacy/aether/items/ItemMoaEgg.java View File

@@ -107,7 +107,7 @@ public class ItemMoaEgg extends Item
}

@Override
public String getUnlocalizedName(ItemStack stack)
public String getTranslationKey(ItemStack stack)
{
NBTTagCompound tag = stack.getTagCompound();

@@ -115,10 +115,10 @@ public class ItemMoaEgg extends Item
{
AetherMoaType moaType = AetherAPI.getInstance().getMoaType(tag.getInteger("typeId"));

return "item." + moaType.getRegistryName().getResourcePath().replace(" ", "_").toLowerCase() + "_moa_egg.name";
return "item." + moaType.getRegistryName().getPath().replace(" ", "_").toLowerCase() + "_moa_egg.name";
}

return super.getUnlocalizedName();
return super.getTranslationKey();
}

@Override


+ 1
- 1
src/main/java/com/legacy/aether/items/ItemsAether.java View File

@@ -267,7 +267,7 @@ public class ItemsAether

public static Item register(String name, Item item)
{
item.setUnlocalizedName(name);
item.setTranslationKey(name);
itemRegistry.register(item.setRegistryName(Aether.locate(name)));

return item;


+ 2
- 2
src/main/java/com/legacy/aether/items/armor/ItemAetherArmor.java View File

@@ -71,7 +71,7 @@ public class ItemAetherArmor extends ItemArmor
@Override
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type)
{
boolean leggings = this.getUnlocalizedName().contains("leggings");
boolean leggings = this.getTranslationKey().contains("leggings");
String type1 = leggings ? "layer_2" : "layer_1";

return this.shouldDefualt ? (leggings ? defualt_location[1] : defualt_location[0]) : Aether.modAddress() + "textures/armor/" + this.armorName + "_" + type1 + ".png";
@@ -82,7 +82,7 @@ public class ItemAetherArmor extends ItemArmor
{
if (shouldDefualt)
{
return new ModelColoredArmor(this.getUnlocalizedName().contains("leggings") ? 0.5F : 1.0F, this, armorSlot);
return new ModelColoredArmor(this.getTranslationKey().contains("leggings") ? 0.5F : 1.0F, this, armorSlot);
}

return super.getArmorModel(entityLiving, itemStack, armorSlot, _default);


+ 1
- 1
src/main/java/com/legacy/aether/items/block/ItemAetherSlab.java View File

@@ -38,7 +38,7 @@ public class ItemAetherSlab extends ItemBlock

public String getUnlocalizedName(ItemStack stack)
{
return this.singleSlab.getUnlocalizedName(stack.getMetadata());
return this.singleSlab.getTranslationKey(stack.getMetadata());
}

public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ)


+ 1
- 1
src/main/java/com/legacy/aether/items/block/ItemSubtype.java View File

@@ -16,7 +16,7 @@ public class ItemSubtype extends ItemBlock
}

@Override
public String getUnlocalizedName(ItemStack itemstack)
public String getTranslationKey(ItemStack itemstack)
{
return "tile." + ((IAetherMeta)this.block).getMetaName(itemstack);
}


+ 2
- 2
src/main/java/com/legacy/aether/items/dungeon/ItemDungeonKey.java View File

@@ -42,11 +42,11 @@ public class ItemDungeonKey extends Item
}

@Override
public String getUnlocalizedName(ItemStack itemstack)
public String getTranslationKey(ItemStack itemstack)
{
int meta = itemstack.getItemDamage();

return this.getUnlocalizedName() + "_" + EnumDungeonKeyType.getType(meta).toString();
return this.getTranslationKey() + "_" + EnumDungeonKeyType.getType(meta).toString();
}

}

+ 2
- 2
src/main/java/com/legacy/aether/items/food/ItemGummySwet.java View File

@@ -54,11 +54,11 @@ public class ItemGummySwet extends ItemAetherFood


@Override
public String getUnlocalizedName(ItemStack itemstack)
public String getTranslationKey(ItemStack itemstack)
{
int meta = itemstack.getItemDamage();

return this.getUnlocalizedName() + "_" + EnumGummySwetType.getType(meta).toString();
return this.getTranslationKey() + "_" + EnumGummySwetType.getType(meta).toString();
}

}

+ 2
- 2
src/main/java/com/legacy/aether/items/tools/ItemSkyrootBucket.java View File

@@ -72,11 +72,11 @@ public class ItemSkyrootBucket extends Item
}

@Override
public String getUnlocalizedName(ItemStack itemstack)
public String getTranslationKey(ItemStack itemstack)
{
int meta = itemstack.getItemDamage();

return this.getUnlocalizedName() + "_" + EnumSkyrootBucketType.getType(meta).toString();
return this.getTranslationKey() + "_" + EnumSkyrootBucketType.getType(meta).toString();
}

@Override


+ 1
- 1
src/main/java/com/legacy/aether/items/tools/ItemValkyrieTool.java View File

@@ -66,7 +66,7 @@ public class ItemValkyrieTool extends ItemAetherTool
}

Vec3d vec = new Vec3d(ent.posX - player.posX, ent.getEntityBoundingBox().minY + ent.height / 2f - player.posY - player.getEyeHeight(), ent.posZ - player.posZ);
double len = vec.lengthVector();
double len = vec.length();

if (len > 10.0F)
{


+ 1
- 1
src/main/java/com/legacy/aether/items/weapons/ItemValkyrieLance.java View File

@@ -63,7 +63,7 @@ public class ItemValkyrieLance extends ItemSword
}

Vec3d vec = new Vec3d(ent.posX - player.posX, ent.getEntityBoundingBox().minY + ent.height / 2f - player.posY - player.getEyeHeight(), ent.posZ - player.posZ);
double len = vec.lengthVector();
double len = vec.length();

if (len > 10.0F)
{


+ 2
- 2
src/main/java/com/legacy/aether/items/weapons/projectile/ItemDart.java View File

@@ -26,11 +26,11 @@ public class ItemDart extends Item
}

@Override
public String getUnlocalizedName(ItemStack itemstack)
public String getTranslationKey(ItemStack itemstack)
{
int i = itemstack.getItemDamage();

return this.getUnlocalizedName() + "_" + EnumDartType.values()[i].toString();
return this.getTranslationKey() + "_" + EnumDartType.values()[i].toString();
}

@Override


+ 2
- 2
src/main/java/com/legacy/aether/items/weapons/projectile/ItemDartShooter.java View File

@@ -113,9 +113,9 @@ public class ItemDartShooter extends Item
}

@Override
public String getUnlocalizedName(ItemStack itemstack)
public String getTranslationKey(ItemStack itemstack)
{
return this.getUnlocalizedName() + "_" + EnumDartShooterType.getType(itemstack.getItemDamage()).toString();
return this.getTranslationKey() + "_" + EnumDartShooterType.getType(itemstack.getItemDamage()).toString();
}

@Override


+ 1
- 1
src/main/java/com/legacy/aether/registry/AetherLore.java View File

@@ -18,7 +18,7 @@ public class AetherLore

public static String getLoreEntry(ItemStack stack)
{
ResourceLocation location = new ResourceLocation(stack.getItem().getRegistryName().getResourceDomain(), "lore/" + stack.getUnlocalizedName().replace("item.", "").replace("tile.", "").replace(".", "_") + ".txt");
ResourceLocation location = new ResourceLocation(stack.getItem().getRegistryName().getNamespace(), "lore/" + stack.getTranslationKey().replace("item.", "").replace("tile.", "").replace(".", "_") + ".txt");
IResource iresource = null;

try


+ 2
- 8
src/main/java/com/legacy/aether/registry/creative_tabs/AetherCreativeTabs.java View File

@@ -54,19 +54,13 @@ public class AetherCreativeTabs
}

@SideOnly(Side.CLIENT)
public String getTranslatedTabLabel()
public String getTranslationKey()
{
return "tab." + this.getTabLabel();
}

@Override
public ItemStack getIconItemStack()
{
return stack;
}

@Override
public ItemStack getTabIconItem()
public ItemStack createIcon()
{
return stack;
}


+ 1
- 1
src/main/java/com/legacy/aether/world/gen/components/ComponentLargeColdAercloud.java View File

@@ -41,7 +41,7 @@ public class ComponentLargeColdAercloud extends AetherStructure
{
this.replaceAir = true;

if (this.data.hasNoTags())
if (this.data.tagCount() <= 0)
{
NBTTagCompound icd;



BIN
src/main/resources/assets/aether_legacy/textures/blocks/aether_grass_side_snowy.png View File

Before After
Width: 16  |  Height: 16  |  Size: 3.3 KiB

+ 1
- 1
src/main/resources/mcmod.info View File

@@ -3,7 +3,7 @@
"modid": "aether_legacy",
"name": "Aether Legacy",
"description": "Aether Legacy, a port of Aether I which has been updated to the latest version of Minecraft. This version of the aether includes multiplayer support to play with friends and others alike.",
"version": "v1.4.3",
"version": "v1.4.4",
"mcversion": "1.12.2",
"url": "https://www.moddinglegacy.com/",
"updateUrl": "",


Loading…
Cancel
Save