Update Iron Chest's to 1.12!

build.gradle

@@ -33,7 +33,7 @@ repositories {
 }
 
 dependencies {
-    deobfCompile "mezz.jei:jei_1.11.2:4.3.5.277"
+    deobfCompile "mezz.jei:jei_1.12:4.6.0.+"
 }
 
 // This is our group. I'm cpw.mods
@@ -43,8 +43,8 @@ archivesBaseName = "ironchest"
 
 // Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here
 minecraft {
-    version = "1.11.2-13.20.0.2299"
+    version = "1.12-14.21.0.2321"
-    mappings = "snapshot_20170519"
+    mappings = "snapshot_20161220"
     runDir = "run"
 }
 

src/main/java/cpw/mods/ironchest/client/renderer/chest/TileEntityIronChestRenderer.java

@@ -51,7 +51,7 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer<TileE
     }
 
     @Override
-    public void renderTileEntityAt(TileEntityIronChest te, double x, double y, double z, float partialTicks, int destroyStage)
+    public void func_192841_a(TileEntityIronChest te, double x, double y, double z, float partialTicks, int destroyStage, float partial)
     {
         if (te == null || te.isInvalid())
         {
@@ -204,7 +204,8 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer<TileE
 
                 if (this.itemRenderer == null)
                 {
-                    this.itemRenderer = new RenderEntityItem(Minecraft.getMinecraft().getRenderManager(), Minecraft.getMinecraft().getRenderItem()) {
+                    this.itemRenderer = new RenderEntityItem(Minecraft.getMinecraft().getRenderManager(), Minecraft.getMinecraft().getRenderItem())
+                    {
                         @Override
                         public int getModelCount(ItemStack stack)
                         {

src/main/java/cpw/mods/ironchest/client/renderer/shulker/TileEntityIronShulkerBoxRenderer.java

@@ -49,7 +49,7 @@ public class TileEntityIronShulkerBoxRenderer extends TileEntitySpecialRenderer<
     }
 
     @Override
-    public void renderTileEntityAt(TileEntityIronShulkerBox te, double x, double y, double z, float partialTicks, int destroyStage)
+    public void func_192841_a(TileEntityIronShulkerBox te, double x, double y, double z, float partialTicks, int destroyStage, float partial)
     {
         if (te == null || te.isInvalid())
         {
@@ -206,7 +206,8 @@ public class TileEntityIronShulkerBoxRenderer extends TileEntitySpecialRenderer<
 
                 if (this.itemRenderer == null)
                 {
-                    this.itemRenderer = new RenderEntityItem(Minecraft.getMinecraft().getRenderManager(), Minecraft.getMinecraft().getRenderItem()) {
+                    this.itemRenderer = new RenderEntityItem(Minecraft.getMinecraft().getRenderManager(), Minecraft.getMinecraft().getRenderItem())
+                    {
                         @Override
                         public int getModelCount(ItemStack stack)
                         {

src/main/java/cpw/mods/ironchest/common/ICContent.java

@@ -14,12 +14,10 @@ import java.util.List;
 
 import com.google.common.collect.Lists;
 
-import cpw.mods.ironchest.IronChest;
 import cpw.mods.ironchest.common.blocks.chest.BlockIronChest;
 import cpw.mods.ironchest.common.blocks.chest.IronChestType;
 import cpw.mods.ironchest.common.blocks.shulker.BlockIronShulkerBox;
 import cpw.mods.ironchest.common.blocks.shulker.IronShulkerBoxType;
-import cpw.mods.ironchest.common.crafting.IronShulkerBoxColoring;
 import cpw.mods.ironchest.common.items.ChestChangerType;
 import cpw.mods.ironchest.common.items.ShulkerBoxChangerType;
 import cpw.mods.ironchest.common.items.chest.ItemIronChest;
@@ -35,54 +33,85 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.oredict.RecipeSorter;
-import net.minecraftforge.oredict.RecipeSorter.Category;
 
 public class ICContent
 {
     public static CreativeTab tabGeneral = new CreativeTab("IronChest", new ItemStack(Item.getItemFromBlock(Blocks.SLIME_BLOCK)));
 
     public static BlockIronChest ironChestBlock;
+
     public static ItemIronChest ironChestItemBlock;
 
     public static BlockIronShulkerBox ironShulkerBoxWhiteBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxOrangeBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxMagentaBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxLightBlueBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxYellowBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxLimeBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxPinkBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxGrayBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxSilverBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxCyanBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxPurpleBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxBlueBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxBrownBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxGreenBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxRedBlock;
+
     public static BlockIronShulkerBox ironShulkerBoxBlackBlock;
 
     public static ItemIronShulkerBox ironShulkerBoxWhiteItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxOrangeItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxMagentaItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxLightBlueItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxYellowItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxLimeItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxPinkItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxGrayItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxSilverItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxCyanItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxPurpleItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxBlueItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxBrownItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxGreenItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxRedItemBlock;
+
     public static ItemIronShulkerBox ironShulkerBoxBlackItemBlock;
 
     public static final List<Block> SHULKER_BLOCKS = Lists.newArrayList();
+
     public static final List<ItemBlock> SHULKER_ITEM_BLOCKS = Lists.newArrayList();
 
     public static final List<Block> VANILLA_SHULKER_BLOCKS = Lists.newArrayList();
+
     public static final List<EnumDyeColor> VANILLA_SHULKER_COLORS = Lists.newArrayList();
 
     public static void preInit()
@@ -132,8 +161,9 @@ public class ICContent
             BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(block, new BehaviorDispenseIronShulkerBox());
         }
 
-        GameRegistry.addRecipe(new IronShulkerBoxColoring());
+        // CraftingManager.func_193372_a(new ResourceLocation("ironchests", "ironshulkerboxcoloring"), new IronShulkerBoxColoring()); // TEMP FIX FOR COLORING OF SHULKER BOXES.
-        RecipeSorter.register(IronChest.MOD_ID, IronShulkerBoxColoring.class, Category.SHAPELESS, "after:forge:shapelessore");
+        // GameRegistry.addRecipe(new ResourceLocation("ironchests", "ironshulkerboxcoloring"), new IronShulkerBoxColoring()); // TODO RE-ADD WHEN FIXED.
+        // RecipeSorter.register(IronChest.MOD_ID, IronShulkerBoxColoring.class, Category.SHAPELESS, "after:forge:shapelessore"); // TODO: REMOVE WHEN FORGE REMOVES
 
         ShulkerBoxChangerType.generateRecipes();
         // Shulkers End

src/main/java/cpw/mods/ironchest/common/blocks/chest/BlockIronChest.java

@@ -26,7 +26,6 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.InventoryHelper;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumBlockRenderType;
@@ -137,13 +136,13 @@ public class BlockIronChest extends Block
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList<ItemStack> list)
+    public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list)
     {
         for (IronChestType type : IronChestType.VALUES)
         {
             if (type.isValidForCreativeMode())
             {
-                list.add(new ItemStack(itemIn, 1, type.ordinal()));
+                list.add(new ItemStack(this, 1, type.ordinal()));
             }
         }
     }

src/main/java/cpw/mods/ironchest/common/blocks/chest/IronChestType.java

@@ -31,8 +31,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagByte;
 import net.minecraft.util.IStringSerializable;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.oredict.ShapedOreRecipe;
 
 public enum IronChestType implements IStringSerializable
 {
@@ -184,9 +182,9 @@ public enum IronChestType implements IStringSerializable
 
     public static void addRecipe(ItemStack is, Object... parts)
     {
-        ShapedOreRecipe oreRecipe = new ShapedOreRecipe(is, parts);
+        //ShapedOreRecipe oreRecipe = new ShapedOreRecipe(is, parts); // TODO RE-ADD WHEN FIXED.
 
-        GameRegistry.addRecipe(oreRecipe);
+        //GameRegistry.addRecipe(oreRecipe); // TODO RE-ADD WHEN FIXED.
     }
 
     public int getRowCount()

src/main/java/cpw/mods/ironchest/common/blocks/shulker/BlockIronShulkerBox.java

@@ -12,6 +12,8 @@ package cpw.mods.ironchest.common.blocks.shulker;
 
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 import cpw.mods.ironchest.IronChest;
 import cpw.mods.ironchest.common.ICContent;
 import cpw.mods.ironchest.common.tileentity.shulker.TileEntityIronShulkerBox;
@@ -21,6 +23,7 @@ import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -52,7 +55,9 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 public class BlockIronShulkerBox extends Block
 {
     public static final PropertyEnum<IronShulkerBoxType> VARIANT_PROP = PropertyEnum.create("variant", IronShulkerBoxType.class);
+
     private final EnumDyeColor color;
+
     private EnumFacing facingDirection;
 
     public BlockIronShulkerBox(EnumDyeColor colorIn)
@@ -169,13 +174,13 @@ public class BlockIronShulkerBox extends Block
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList<ItemStack> list)
+    public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list)
     {
         for (IronShulkerBoxType type : IronShulkerBoxType.VALUES)
         {
             if (type.isValidForCreativeMode())
             {
-                list.add(new ItemStack(itemIn, 1, type.ordinal()));
+                list.add(new ItemStack(this, 1, type.ordinal()));
             }
         }
     }
@@ -333,9 +338,9 @@ public class BlockIronShulkerBox extends Block
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
+    public void addInformation(ItemStack stack, @Nullable World playerIn, List<String> tooltip, ITooltipFlag advanced)
     {
-        super.addInformation(stack, player, tooltip, advanced);
+        super.addInformation(stack, playerIn, tooltip, advanced);
 
         NBTTagCompound nbttagcompound = stack.getTagCompound();
 

src/main/java/cpw/mods/ironchest/common/blocks/shulker/IronShulkerBoxType.java

@@ -29,8 +29,6 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IStringSerializable;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.oredict.ShapedOreRecipe;
 
 public enum IronShulkerBoxType implements IStringSerializable
 {
@@ -178,9 +176,9 @@ public enum IronShulkerBoxType implements IStringSerializable
 
     public static void addRecipe(ItemStack is, Object... parts)
     {
-        ShapedOreRecipe oreRecipe = new ShapedOreRecipe(is, parts);
+        //ShapedOreRecipe oreRecipe = new ShapedOreRecipe(is, parts); // TODO RE-ADD WHEN FIXED.
 
-        GameRegistry.addRecipe(oreRecipe);
+        //GameRegistry.addRecipe(oreRecipe); // TODO RE-ADD WHEN FIXED.
     }
 
     public int getRowCount()

src/main/java/cpw/mods/ironchest/common/crafting/IronShulkerBoxColoring.java

@@ -101,15 +101,6 @@ public class IronShulkerBoxColoring implements IRecipe
         return itemstack3;
     }
 
-    /**
-     * Returns the size of the recipe area
-     */
-    @Override
-    public int getRecipeSize()
-    {
-        return 10;
-    }
-
     @Override
     public ItemStack getRecipeOutput()
     {
@@ -133,4 +124,16 @@ public class IronShulkerBoxColoring implements IRecipe
 
         return nonnulllist;
     }
+
+    @Override
+    public boolean func_192399_d()
+    {
+        return true;
+    }
+
+    @Override
+    public boolean func_194133_a(int p_194133_1_, int p_194133_2_)
+    {
+        return p_194133_1_ * p_194133_2_ >= 2;
+    }
 }

src/main/java/cpw/mods/ironchest/common/util/ItemTooltip.java

@@ -12,13 +12,16 @@ package cpw.mods.ironchest.common.util;
 
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 import com.google.common.collect.Lists;
 
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.translation.I18n;
+import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -27,7 +30,7 @@ public class ItemTooltip extends Item
 {
     @Override
     @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced)
+    public void addInformation(ItemStack stack, @Nullable World playerIn, List<String> tooltip, ITooltipFlag advanced)
     {
         addOptionalTooltip(stack, tooltip);
 
@@ -68,4 +71,4 @@ public class ItemTooltip extends Item
 
         return list;
     }
-}
+}