Updated mappings.

build.gradle

@@ -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.
 }
 

src/main/java/com/legacy/aether/api/moa/AetherMoaType.java

@@ -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()

src/main/java/com/legacy/aether/blocks/BlocksAether.java

@@ -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));

src/main/java/com/legacy/aether/blocks/decorative/BlockAerogel.java

@@ -22,7 +22,7 @@ public class BlockAerogel extends BlockBreakable
 
 	@Override
     @SideOnly(Side.CLIENT)
-    public BlockRenderLayer getBlockLayer()
+    public BlockRenderLayer getRenderLayer()
     {
         return BlockRenderLayer.TRANSLUCENT;
     }

src/main/java/com/legacy/aether/blocks/decorative/BlockAerogelSlab.java

@@ -33,7 +33,7 @@ public class BlockAerogelSlab extends BlockAetherSlab
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public BlockRenderLayer getBlockLayer()
+	public BlockRenderLayer getRenderLayer()
 	{
 		return BlockRenderLayer.TRANSLUCENT;
 	}

src/main/java/com/legacy/aether/blocks/decorative/BlockAerogelStairs.java

@@ -21,7 +21,7 @@ public class BlockAerogelStairs extends BlockAetherStairs
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public BlockRenderLayer getBlockLayer()
+	public BlockRenderLayer getRenderLayer()
 	{
 		return BlockRenderLayer.TRANSLUCENT;
 	}

src/main/java/com/legacy/aether/blocks/decorative/BlockAerogelWall.java

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

src/main/java/com/legacy/aether/blocks/decorative/BlockAetherSlab.java

@@ -116,7 +116,7 @@ public class BlockAetherSlab extends BlockSlab
     }
 
 	@Override
-	public String getUnlocalizedName(int meta) 
+	public String getTranslationKey(int meta) 
 	{
 		return this.name;
 	}

src/main/java/com/legacy/aether/blocks/decorative/BlockAmbrosiumTorch.java

@@ -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
         {

src/main/java/com/legacy/aether/blocks/decorative/BlockQuicksoilGlass.java

@@ -31,7 +31,7 @@ public class BlockQuicksoilGlass extends BlockBreakable
 
 	@Override
     @SideOnly(Side.CLIENT)
-    public BlockRenderLayer getBlockLayer()
+    public BlockRenderLayer getRenderLayer()
     {
         return BlockRenderLayer.TRANSLUCENT;
     }

src/main/java/com/legacy/aether/blocks/dungeon/BlockTreasureChest.java

@@ -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)
         {

src/main/java/com/legacy/aether/blocks/natural/BlockAercloud.java

@@ -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;
     }

src/main/java/com/legacy/aether/blocks/natural/BlockAetherLeaves.java

@@ -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;
     }

src/main/java/com/legacy/aether/blocks/portal/BlockAetherPortal.java

@@ -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();
 

src/main/java/com/legacy/aether/blocks/util/BlockFloating.java

@@ -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);
 		}

src/main/java/com/legacy/aether/client/AetherClientEvents.java

@@ -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);
 				}

src/main/java/com/legacy/aether/client/gui/GuiLore.java

@@ -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;
         	}

src/main/java/com/legacy/aether/client/gui/toast/GuiAetherToast.java

@@ -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);
 

src/main/java/com/legacy/aether/client/renders/blocks/AetherStateMap.java

@@ -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)

src/main/java/com/legacy/aether/client/renders/entities/MoaRenderer.java

@@ -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));

src/main/java/com/legacy/aether/entities/ai/aerwhale/AerwhaleAITravelCourse.java

@@ -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);
 

src/main/java/com/legacy/aether/entities/bosses/slider/EntitySlider.java

@@ -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"));
     

src/main/java/com/legacy/aether/entities/passive/EntityAerwhale.java

@@ -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);
 

src/main/java/com/legacy/aether/items/ItemMoaEgg.java

@@ -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

src/main/java/com/legacy/aether/items/ItemsAether.java

@@ -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;

src/main/java/com/legacy/aether/items/armor/ItemAetherArmor.java

@@ -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);

src/main/java/com/legacy/aether/items/block/ItemAetherSlab.java

@@ -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)

src/main/java/com/legacy/aether/items/block/ItemSubtype.java

@@ -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);
 	}

src/main/java/com/legacy/aether/items/dungeon/ItemDungeonKey.java

@@ -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();
 	}
 
 }

src/main/java/com/legacy/aether/items/food/ItemGummySwet.java

@@ -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();
 	}
 
 }

src/main/java/com/legacy/aether/items/tools/ItemSkyrootBucket.java

@@ -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

src/main/java/com/legacy/aether/items/tools/ItemValkyrieTool.java

@@ -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)
 			{

src/main/java/com/legacy/aether/items/weapons/ItemValkyrieLance.java

@@ -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)
 			{

src/main/java/com/legacy/aether/items/weapons/projectile/ItemDart.java

@@ -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

src/main/java/com/legacy/aether/items/weapons/projectile/ItemDartShooter.java

@@ -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

src/main/java/com/legacy/aether/registry/AetherLore.java

@@ -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

src/main/java/com/legacy/aether/registry/creative_tabs/AetherCreativeTabs.java

@@ -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;
 		}

src/main/java/com/legacy/aether/world/gen/components/ComponentLargeColdAercloud.java

@@ -41,7 +41,7 @@ public class ComponentLargeColdAercloud extends AetherStructure
 	{
 		this.replaceAir = true;
 
-		if (this.data.hasNoTags())
+		if (this.data.tagCount() <= 0)
 		{
 			NBTTagCompound icd;
 

src/main/resources/mcmod.info

@@ -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": "",