From 85ba33e1ff78f6cbaf7ae8423436c74c1356edc8 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 20 Jun 2016 23:11:44 -0700 Subject: [PATCH] Add trapdoorWood oredict name --- src/main/java/forestry/core/blocks/BlockRegistryCore.java | 1 + src/main/java/forestry/core/utils/OreDictUtil.java | 1 + src/main/java/forestry/farming/PluginFarming.java | 3 ++- src/main/java/forestry/greenhouse/PluginGreenhouse.java | 5 +++-- src/main/java/forestry/storage/PluginStorage.java | 8 ++++---- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/core/blocks/BlockRegistryCore.java b/src/main/java/forestry/core/blocks/BlockRegistryCore.java index a72eef3e8..458d8d6a0 100644 --- a/src/main/java/forestry/core/blocks/BlockRegistryCore.java +++ b/src/main/java/forestry/core/blocks/BlockRegistryCore.java @@ -69,5 +69,6 @@ public class BlockRegistryCore extends BlockRegistry { // register some common oreDict names for our recipes OreDictionary.registerOre(OreDictUtil.CRAFTING_TABLE_WOOD, Blocks.CRAFTING_TABLE); + OreDictionary.registerOre(OreDictUtil.TRAPDOOR_WOOD, Blocks.TRAPDOOR); } } diff --git a/src/main/java/forestry/core/utils/OreDictUtil.java b/src/main/java/forestry/core/utils/OreDictUtil.java index 73b0baaac..aa94eb5c6 100644 --- a/src/main/java/forestry/core/utils/OreDictUtil.java +++ b/src/main/java/forestry/core/utils/OreDictUtil.java @@ -34,6 +34,7 @@ public class OreDictUtil { public static final String FENCE_GATE_WOOD = "fenceGateWood"; public static final String STAIR_WOOD = "stairWood"; public static final String DOOR_WOOD = "doorWood"; + public static final String TRAPDOOR_WOOD = "trapdoorWood"; public static final String TREE_LEAVES = "treeLeaves"; public static final String EMPTIED_LETTER_ORE_DICT = "emptiedLetter"; diff --git a/src/main/java/forestry/farming/PluginFarming.java b/src/main/java/forestry/farming/PluginFarming.java index e3c4e6a63..4affa4d25 100644 --- a/src/main/java/forestry/farming/PluginFarming.java +++ b/src/main/java/forestry/farming/PluginFarming.java @@ -42,6 +42,7 @@ import forestry.core.circuits.CircuitLayout; import forestry.core.config.Constants; import forestry.core.items.EnumElectronTube; import forestry.core.recipes.RecipeUtil; +import forestry.core.utils.OreDictUtil; import forestry.farming.blocks.BlockMushroom; import forestry.farming.blocks.BlockRegistryFarming; import forestry.farming.blocks.EnumFarmBlockType; @@ -207,7 +208,7 @@ public class PluginFarming extends BlankForestryPlugin { "TDT", '#', basic, 'T', "gearTin", - 'D', Blocks.TRAPDOOR); + 'D', OreDictUtil.TRAPDOOR_WOOD); RecipeUtil.addRecipe(valve, " # ", diff --git a/src/main/java/forestry/greenhouse/PluginGreenhouse.java b/src/main/java/forestry/greenhouse/PluginGreenhouse.java index 511ec311e..ff2342cd7 100644 --- a/src/main/java/forestry/greenhouse/PluginGreenhouse.java +++ b/src/main/java/forestry/greenhouse/PluginGreenhouse.java @@ -27,6 +27,7 @@ import forestry.core.fluids.Fluids; import forestry.core.items.EnumElectronTube; import forestry.core.network.IPacketRegistry; import forestry.core.recipes.RecipeUtil; +import forestry.core.utils.OreDictUtil; import forestry.greenhouse.blocks.BlockGreenhouseType; import forestry.greenhouse.blocks.BlockRegistryGreenhouse; import forestry.greenhouse.logics.GreenhouseLogicGreenhouseDoor; @@ -91,7 +92,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { "TXT", "#H#", 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), - 'H', Blocks.TRAPDOOR, + 'H', OreDictUtil.TRAPDOOR_WOOD, '#', "gearTin", 'T', PluginCore.items.tubes.get(EnumElectronTube.BRONZE, 1)); @@ -100,7 +101,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { "#H#", "TXT", 'X', blocks.getGreenhouseBlock(BlockGreenhouseType.PLAIN), - 'H', Blocks.TRAPDOOR, + 'H', OreDictUtil.TRAPDOOR_WOOD, '#', "gearTin", 'T', PluginCore.items.tubes.get(EnumElectronTube.BRONZE, 1)); diff --git a/src/main/java/forestry/storage/PluginStorage.java b/src/main/java/forestry/storage/PluginStorage.java index 861bea43e..93c20e365 100644 --- a/src/main/java/forestry/storage/PluginStorage.java +++ b/src/main/java/forestry/storage/PluginStorage.java @@ -219,11 +219,12 @@ public class PluginStorage extends BlankForestryPlugin { "stainedGlass[A-Z].*", "stone", "sandstone", - "plankWood", - "stairWood", - "slabWood", + OreDictUtil.PLANK_WOOD, + OreDictUtil.STAIR_WOOD, + OreDictUtil.SLAB_WOOD, OreDictUtil.FENCE_WOOD, OreDictUtil.FENCE_GATE_WOOD, + OreDictUtil.TRAPDOOR_WOOD, "glass", "paneGlass", "torch", @@ -350,7 +351,6 @@ public class PluginStorage extends BlankForestryPlugin { new ItemStack(Blocks.PURPUR_SLAB), new ItemStack(Blocks.END_BRICKS), new ItemStack(Blocks.CARPET, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(Blocks.TRAPDOOR), new ItemStack(Blocks.IRON_TRAPDOOR), new ItemStack(Blocks.STONE_PRESSURE_PLATE), new ItemStack(Blocks.WOODEN_PRESSURE_PLATE),