diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index e75a3e390..6cf7a60a0 100755 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -354,9 +354,6 @@ public class PluginCore extends NativePlugin implements IFuelHandler { ForestryItem.cratedWheat.registerItem(new ItemCrated(new ItemStack(Items.wheat)), "cratedWheat"); ForestryItem.cratedMycelium.registerItem(new ItemCrated(new ItemStack(Blocks.mycelium)), "cratedMycelium"); ForestryItem.cratedMulch.registerItem(new ItemCrated(ForestryItem.mulch.getItemStack()), "cratedMulch"); - ForestryItem.cratedSilver.registerItem(new ItemCrated(), "cratedSilver"); - ForestryItem.cratedBrass.registerItem(new ItemCrated(), "cratedBrass"); - ForestryItem.cratedNikolite.registerItem(new ItemCrated(), "cratedNikolite"); ForestryItem.cratedCookies.registerItem(new ItemCrated(new ItemStack(Items.cookie)), "cratedCookies"); ForestryItem.cratedRedstone.registerItem(new ItemCrated(new ItemStack(Items.redstone)), "cratedRedstone"); ForestryItem.cratedLapis.registerItem(new ItemCrated(new ItemStack(Items.dye, 1, 4)), "cratedLapis"); @@ -365,10 +362,6 @@ public class PluginCore extends NativePlugin implements IFuelHandler { ForestryItem.cratedGlowstone.registerItem(new ItemCrated(new ItemStack(Items.glowstone_dust)), "cratedGlowstone"); ForestryItem.cratedApples.registerItem(new ItemCrated(new ItemStack(Items.apple)), "cratedApples"); ForestryItem.cratedNetherwart.registerItem(new ItemCrated(new ItemStack(Items.nether_wart)), "cratedNetherwart"); - ForestryItem.cratedResin.registerItem(new ItemCrated(), "cratedResin"); - ForestryItem.cratedRubber.registerItem(new ItemCrated(), "cratedRubber"); - ForestryItem.cratedScrap.registerItem(new ItemCrated(), "cratedScrap"); - ForestryItem.cratedUUM.registerItem(new ItemCrated(), "cratedUUM"); ForestryItem.cratedPhosphor.registerItem(new ItemCrated(ForestryItem.phosphor.getItemStack()), "cratedPhosphor"); ForestryItem.cratedAsh.registerItem(new ItemCrated(ForestryItem.ash.getItemStack()), "cratedAsh"); ForestryItem.cratedCharcoal.registerItem(new ItemCrated(new ItemStack(Items.coal, 1, 1)), "cratedCharcoal"); diff --git a/src/main/java/forestry/plugins/PluginIC2.java b/src/main/java/forestry/plugins/PluginIC2.java index 550580c7e..229e39e52 100755 --- a/src/main/java/forestry/plugins/PluginIC2.java +++ b/src/main/java/forestry/plugins/PluginIC2.java @@ -59,6 +59,9 @@ public class PluginIC2 implements IPlugin { public static ItemStack waterCell; public static ItemStack rubber; public static ItemStack scrap; + public static ItemStack silver; + public static ItemStack brass; + public static ItemStack uuMatter; public static int fuelcanMeta; public PluginIC2() { @@ -182,22 +185,44 @@ public class PluginIC2 implements IPlugin { } private void initCrates() { - resin = IC2Items.getItem("resin"); - rubber = IC2Items.getItem("rubber"); - scrap = IC2Items.getItem("scrap"); // Add crates for the IC2 items that exist. + + resin = IC2Items.getItem("resin"); if (resin != null) { + ForestryItem.cratedResin.registerItem(new ItemCrated(), "cratedResin"); ((ItemCrated) ForestryItem.cratedResin.item()).setContained(ForestryItem.cratedResin.getItemStack(), resin); } + rubber = IC2Items.getItem("rubber"); if (rubber != null) { + ForestryItem.cratedRubber.registerItem(new ItemCrated(), "cratedRubber"); ((ItemCrated) ForestryItem.cratedRubber.item()).setContained(ForestryItem.cratedRubber.getItemStack(), rubber); } + scrap = IC2Items.getItem("scrap"); if (scrap != null) { + ForestryItem.cratedScrap.registerItem(new ItemCrated(), "cratedScrap"); ((ItemCrated) ForestryItem.cratedScrap.item()).setContained(ForestryItem.cratedScrap.getItemStack(), scrap); } + + uuMatter = IC2Items.getItem("matter"); + if (uuMatter != null) { + ForestryItem.cratedUUM.registerItem(new ItemCrated(), "cratedUUM"); + ((ItemCrated) ForestryItem.cratedUUM.item()).setContained(ForestryItem.cratedUUM.getItemStack(), uuMatter); + } + + silver = IC2Items.getItem("silverIngot"); + if (silver != null) { + ForestryItem.cratedSilver.registerItem(new ItemCrated(), "cratedSilver"); + ((ItemCrated) ForestryItem.cratedSilver.item()).setContained(ForestryItem.cratedSilver.getItemStack(), silver); + } + + brass = IC2Items.getItem("bronzeIngot"); + if (brass != null) { + ForestryItem.cratedBrass.registerItem(new ItemCrated(), "cratedBrass"); + ((ItemCrated) ForestryItem.cratedBrass.item()).setContained(ForestryItem.cratedBrass.getItemStack(), brass); + } } private void registerBackpackItems() {