diff --git a/build.gradle b/build.gradle index 2979a84..0ba7742 100755 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ archivesBaseName = "ironchest" // Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here minecraft { - version = "1.8-7.10.93.1001-1.8" + version = "1.8-7.10.99.1005-1.8" mappings = 'snapshot_20140930' } diff --git a/src/main/java/cpw/mods/ironchest/IronChestType.java b/src/main/java/cpw/mods/ironchest/IronChestType.java index 9849323..78ad873 100755 --- a/src/main/java/cpw/mods/ironchest/IronChestType.java +++ b/src/main/java/cpw/mods/ironchest/IronChestType.java @@ -15,6 +15,7 @@ import java.util.Arrays; import java.util.List; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; @@ -114,7 +115,7 @@ public enum IronChestType implements IStringSerializable { generateRecipesForType(blockResult, previous, typ); ItemStack chest = new ItemStack(blockResult, 1, typ.ordinal()); - if (typ.isValidForCreativeMode()) GameRegistry.registerCustomItemStack(typ.friendlyName, chest); + //if (typ.isValidForCreativeMode()) GameRegistry.registerCustomItemStack(typ.friendlyName, chest);//TODO fix this!! if (typ.tieredChest) previous = chest; } } @@ -151,13 +152,33 @@ public enum IronChestType implements IStringSerializable { return Blocks.dirt; } + else if (mat.equals("ingotIron"))//TODO get rid of this when forge is out + { + return Items.iron_ingot; + } + else if (mat.equals("ingotGold"))//TODO get rid of this when forge is out + { + return Items.gold_ingot; + } + else if (mat.equals("gemDiamond"))//TODO get rid of this when forge is out + { + return Items.diamond; + } + else if (mat.equals("blockGlass"))//TODO get rid of this when forge is out + { + return Blocks.glass; + } + else if(mat.equals("plankWood"))//TODO get rid of this when forge is out + { + return Blocks.planks; + } return mat; } public static void addRecipe(ItemStack is, Object... parts) { - //ShapedOreRecipe oreRecipe = new ShapedOreRecipe(is, parts); - //GameRegistry.addRecipe(oreRecipe); + //ShapedOreRecipe oreRecipe = new ShapedOreRecipe(is, parts);//TODO re-enable this as shaped instead use GameRegistry.addRecipe(oreRecipe); + //GameRegistry.addRecipe(is, parts); } public int getRowCount() diff --git a/src/main/java/cpw/mods/ironchest/RegistryHelper.java b/src/main/java/cpw/mods/ironchest/RegistryHelper.java index c403719..d0ef8c1 100644 --- a/src/main/java/cpw/mods/ironchest/RegistryHelper.java +++ b/src/main/java/cpw/mods/ironchest/RegistryHelper.java @@ -31,7 +31,7 @@ public class RegistryHelper block = GameRegistry.registerBlock(block, itemclass, name, itemCtorArgs); Item associatedItem = GameRegistry.findItem("ironchest", name); - Map itemBlockMap = (Map)ObfuscationReflectionHelper.getPrivateValue(Item.class, null, "field_179220_a"); + Map itemBlockMap = (Map)ObfuscationReflectionHelper.getPrivateValue(Item.class, null, "BLOCK_TO_ITEM", "field_179220_a"); if (!itemBlockMap.containsKey(block)) itemBlockMap.put(block, associatedItem); diff --git a/src/main/java/cpw/mods/ironchest/client/ClientProxy.java b/src/main/java/cpw/mods/ironchest/client/ClientProxy.java index ea88561..9c45f41 100755 --- a/src/main/java/cpw/mods/ironchest/client/ClientProxy.java +++ b/src/main/java/cpw/mods/ironchest/client/ClientProxy.java @@ -11,7 +11,7 @@ package cpw.mods.ironchest.client; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.tileentity.TileEntityRendererChestHelper; +import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -36,8 +36,8 @@ public class ClientProxy extends CommonProxy ModelHelper.registerBlock(IronChest.ironChestBlock, chestType.ordinal(), "ironchest:BlockIronChest"); } } - - TileEntityRendererChestHelper.instance = new IronChestRenderHelper(); + + TileEntityItemStackRenderer.instance = new IronChestRenderHelper(); } @Override diff --git a/src/main/java/cpw/mods/ironchest/client/IronChestRenderHelper.java b/src/main/java/cpw/mods/ironchest/client/IronChestRenderHelper.java index 232fda9..4c0ca28 100755 --- a/src/main/java/cpw/mods/ironchest/client/IronChestRenderHelper.java +++ b/src/main/java/cpw/mods/ironchest/client/IronChestRenderHelper.java @@ -13,7 +13,7 @@ package cpw.mods.ironchest.client; import java.util.Map; import net.minecraft.block.Block; -import net.minecraft.client.renderer.tileentity.TileEntityRendererChestHelper; +import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; @@ -23,7 +23,7 @@ import cpw.mods.ironchest.IronChest; import cpw.mods.ironchest.IronChestType; import cpw.mods.ironchest.TileEntityIronChest; -public class IronChestRenderHelper extends TileEntityRendererChestHelper +public class IronChestRenderHelper extends TileEntityItemStackRenderer { private Map itemRenders = Maps.newHashMap();