From b0e96caaf143f4a36a895803f2e1dd550b104189 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 22 Jul 2016 11:06:05 +0200 Subject: [PATCH] Added config option for tiny coal and charcoal block Closes #163 --- .../mod/config/values/ConfigCrafting.java | 5 ++++- .../mod/crafting/BlockCrafting.java | 16 +++++++++------- .../mod/crafting/ItemCrafting.java | 14 ++++++++------ 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java index df753cac2..6adfcb960 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java @@ -166,7 +166,10 @@ public enum ConfigCrafting{ SPAWNER_CHANGER("Spawner Changer", ConfigCategories.ITEMS_CRAFTING), ITEM_INTERFACE("Item Interface", ConfigCategories.BLOCKS_CRAFTING), DISPLAY_STAND("Display Stand", ConfigCategories.BLOCKS_CRAFTING), - FILTER("Item Filter", ConfigCategories.ITEMS_CRAFTING); + FILTER("Item Filter", ConfigCategories.ITEMS_CRAFTING), + + CHARCOAL_BLOCK("Charcoal Block", ConfigCategories.BLOCKS_CRAFTING), + TINY_COAL("Tiny Coal", ConfigCategories.ITEMS_CRAFTING); public final String name; public final String category; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java index b60ac6224..d505911b2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java @@ -317,13 +317,15 @@ public final class BlockCrafting{ recipeSolidifier = RecipeUtil.lastIRecipe(); } - //Charcoal Block - GameRegistry.addRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal()), - "CCC", "CCC", "CCC", - 'C', new ItemStack(Items.COAL, 1, 1)); - recipeBlockChar = RecipeUtil.lastIRecipe(); - GameRegistry.addShapelessRecipe(new ItemStack(Items.COAL, 9, 1), - new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal())); + if(ConfigCrafting.CHARCOAL_BLOCK.isEnabled()){ + //Charcoal Block + GameRegistry.addRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal()), + "CCC", "CCC", "CCC", + 'C', new ItemStack(Items.COAL, 1, 1)); + recipeBlockChar = RecipeUtil.lastIRecipe(); + GameRegistry.addShapelessRecipe(new ItemStack(Items.COAL, 9, 1), + new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal())); + } //Wood Casing if(ConfigCrafting.WOOD_CASING.isEnabled()){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java index 99922ecfe..abc3589d8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java @@ -490,12 +490,14 @@ public final class ItemCrafting{ } //Tiny Coal - GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.TINY_COAL.ordinal()), - new ItemStack(Items.COAL)); - recipeTinyCoal = RecipeUtil.lastIRecipe(); - GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.TINY_CHAR.ordinal()), - new ItemStack(Items.COAL, 1, 1)); - recipeTinyChar = RecipeUtil.lastIRecipe(); + if(ConfigCrafting.TINY_COAL.isEnabled()){ + GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.TINY_COAL.ordinal()), + new ItemStack(Items.COAL)); + recipeTinyCoal = RecipeUtil.lastIRecipe(); + GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.TINY_CHAR.ordinal()), + new ItemStack(Items.COAL, 1, 1)); + recipeTinyChar = RecipeUtil.lastIRecipe(); + } //Rice Seeds GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemRiceSeed),