From 79e0fabacbfb5f36585fb25e4f2f29232ac1ae27 Mon Sep 17 00:00:00 2001 From: Nirek-K Date: Fri, 21 Aug 2015 02:01:41 -0500 Subject: [PATCH] Make Chest Recipes oreDictionary aware with chestWood --- src/main/java/forestry/plugins/PluginApiculture.java | 2 +- .../java/forestry/plugins/PluginArboriculture.java | 2 +- src/main/java/forestry/plugins/PluginCore.java | 2 +- src/main/java/forestry/plugins/PluginFactory.java | 4 ++-- .../java/forestry/plugins/PluginLepidopterology.java | 2 +- src/main/java/forestry/plugins/PluginMail.java | 4 ++-- src/main/java/forestry/plugins/PluginStorage.java | 12 ++++++------ 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index c5c08be5e..22108207f 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -229,7 +229,7 @@ public class PluginApiculture extends ForestryPlugin { "XXX", '#', "blockGlass", 'X', "beeComb", - 'Y', Blocks.chest)) + 'Y', "chestWood")) .setFaces(0, 1, 2, 3, 4, 4)); definitionBeehouse = ((BlockBase) ForestryBlock.apiculture.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_BEEHOUSE_META, "forestry.Beehouse", TileBeehouse.class, diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 78790eed6..3f9d2bd6a 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -194,7 +194,7 @@ public class PluginArboriculture extends ForestryPlugin { "XXX", '#', "blockGlass", 'X', "treeSapling", - 'Y', Blocks.chest)) + 'Y', "chestWood")) .setFaces(0, 1, 2, 3, 4, 4, 0, 7)); // Init rendering diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index a45e4045c..e06566c83 100644 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -133,7 +133,7 @@ public class PluginCore extends ForestryPlugin { OreDictionary.registerOre("blockCopper", ForestryBlock.resourceStorage.getItemStack(1, 1)); OreDictionary.registerOre("blockTin", ForestryBlock.resourceStorage.getItemStack(1, 2)); OreDictionary.registerOre("blockBronze", ForestryBlock.resourceStorage.getItemStack(1, 3)); - + OreDictionary.registerOre("chestWood", Blocks.chest); ForestryBlock.glass.registerBlock(new BlockStainedGlass(), ItemForestryBlock.class, "stained"); } diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index fae127a5c..92ba86c1d 100644 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -209,7 +209,7 @@ public class PluginFactory extends ForestryPlugin { '#', "blockGlass", 'X', "ingotGold", 'Y', ForestryItem.sturdyCasing, - 'Z', Blocks.chest)) + 'Z', "chestWood")) .setFaces(0, 1, 2, 3, 4, 4)); definitionRaintank = factoryPlain.addDefinition(new MachineDefinition(Defaults.DEFINITION_RAINTANK_META, "forestry.Raintank", MachineRaintank.class, @@ -229,7 +229,7 @@ public class PluginFactory extends ForestryPlugin { "C", 'B', Items.book, 'W', Blocks.crafting_table, - 'C', Blocks.chest)) + 'C', "chestWood")) .setFaces(0, 1, 2, 3, 4, 4)); ICircuitLayout layoutMachineUpgrade = new CircuitLayout("machine.upgrade"); diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index 79306274d..83929b2f6 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -133,7 +133,7 @@ public class PluginLepidopterology extends ForestryPlugin { "XXX", '#', "blockGlass", 'X', ForestryItem.butterflyGE.getItemStack(1, Defaults.WILDCARD), - 'Y', Blocks.chest)) + 'Y', "chestWood")) .setFaces(0, 1, 2, 3, 4, 4, 0, 7))); definitionChest.register(); diff --git a/src/main/java/forestry/plugins/PluginMail.java b/src/main/java/forestry/plugins/PluginMail.java index b35047d10..d42120156 100755 --- a/src/main/java/forestry/plugins/PluginMail.java +++ b/src/main/java/forestry/plugins/PluginMail.java @@ -80,7 +80,7 @@ public class PluginMail extends ForestryPlugin { ShapedRecipeCustom recipe = ShapedRecipeCustom.createShapedRecipe(ForestryBlock.mail.getItemStack(1, Defaults.DEFINITION_MAILBOX_META), " # ", "#Y#", "XXX", '#', "ingotTin", - 'X', Blocks.chest, + 'X', "chestWood", 'Y', ForestryItem.sturdyCasing); BlockBase mail = ((BlockBase) ForestryBlock.mail.block()); @@ -93,7 +93,7 @@ public class PluginMail extends ForestryPlugin { "#Y#", "XWX", '#', ForestryItem.tubes.getItemStack(1, 2), - 'X', Blocks.chest, + 'X', "chestWood", 'Y', ForestryItem.sturdyCasing, 'Z', ForestryItem.tubes.getItemStack(1, 3), 'W', ForestryItem.circuitboards.getItemStack(1, 2)); diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java index ac09baca6..4343b8e94 100755 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/plugins/PluginStorage.java @@ -589,24 +589,24 @@ public class PluginStorage extends ForestryPlugin { // Miner's Backpack Proxies.common.addRecipe(ForestryItem.minerBackpack.getItemStack(), "X#X", "VYV", "X#X", '#', Blocks.wool, 'X', Items.string, 'V', - Items.iron_ingot, 'Y', Blocks.chest); + "ingotIron", 'Y', "chestWood"); // Digger's Backpack Proxies.common.addRecipe(ForestryItem.diggerBackpack.getItemStack(), "X#X", "VYV", "X#X", '#', Blocks.wool, 'X', Items.string, 'V', - Blocks.stone, 'Y', Blocks.chest); + Blocks.stone, 'Y', "chestWood"); // Forester's Backpack Proxies.common.addRecipe(ForestryItem.foresterBackpack.getItemStack(), "X#X", "VYV", "X#X", '#', Blocks.wool, - 'X', Items.string, 'V', "logWood", 'Y', Blocks.chest); + 'X', Items.string, 'V', "logWood", 'Y', "chestWood"); // Hunter's Backpack Proxies.common.addRecipe(ForestryItem.hunterBackpack.getItemStack(), "X#X", "VYV", "X#X", '#', Blocks.wool, 'X', Items.string, 'V', - Items.feather, 'Y', Blocks.chest); + Items.feather, 'Y', "chestWood"); // Adventurer's Backpack Proxies.common.addRecipe(ForestryItem.adventurerBackpack.getItemStack(), "X#X", "VYV", "X#X", '#', Blocks.wool, - 'X', Items.string, 'V', Items.bone, 'Y', Blocks.chest); + 'X', Items.string, 'V', Items.bone, 'Y', "chestWood"); // Builder's Backpack Proxies.common.addRecipe(ForestryItem.builderBackpack.getItemStack(), "X#X", "VYV", "X#X", '#', Blocks.wool, - 'X', Items.string, 'V', Items.clay_ball, 'Y', Blocks.chest); + 'X', Items.string, 'V', Items.clay_ball, 'Y', "chestWood"); if (PluginManager.Module.FACTORY.isEnabled()) { // / CARPENTER