From c3e8d9821626b1d87006d3da8b19680ef416cdde Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 17 Apr 2015 12:27:10 +0100 Subject: [PATCH] Added a config option to disable the 1.8 stones. Closes #752 --- .../botania/common/core/BotaniaCreativeTab.java | 16 +++++++++------- .../common/core/handler/ConfigHandler.java | 4 ++++ .../common/crafting/ModManaAlchemyRecipes.java | 10 ++++++---- .../botania/common/lexicon/LexiconData.java | 8 +++++--- .../resources/assets/botania/lang/en_US.lang | 1 + 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 6e6e7301a..618c4e7c5 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -318,13 +318,15 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModFluffBlocks.sunnyQuartz); addBlock(ModFluffBlocks.sunnyQuartzSlab); addBlock(ModFluffBlocks.sunnyQuartzStairs); - - addBlock(ModFluffBlocks.stone); - for(int i= 0; i < 8; i++) - addBlock(ModFluffBlocks.stoneStairs[i]); - for(int i= 0; i < 8; i++) - addBlock(ModFluffBlocks.stoneSlabs[i]); - + + if(ConfigHandler.stones18Enabled) { + addBlock(ModFluffBlocks.stone); + for(int i= 0; i < 8; i++) + addBlock(ModFluffBlocks.stoneStairs[i]); + for(int i= 0; i < 8; i++) + addBlock(ModFluffBlocks.stoneSlabs[i]); + } + addBlock(ModFluffBlocks.biomeStoneA); addBlock(ModFluffBlocks.biomeStoneB); for(int i = 0; i < 24; i++) diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 54bd7a375..e22882702 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -58,6 +58,7 @@ public final class ConfigHandler { public static boolean enchanterEnabled = true; public static boolean fluxfieldEnabled = true; public static boolean relicsEnabled = true; + public static boolean stones18Enabled = true; public static boolean ringOfOdinFireResist = true; public static int flowerQuantity = 2; @@ -172,6 +173,9 @@ public final class ConfigHandler { desc = "Set this to false to disable the Relic System. This only disables the entries, drops and achievements. Old ones that are already in the world will stay."; relicsEnabled = loadPropBool("relics.enabled", desc, relicsEnabled); + desc = "Set this to false to disable the 1.8 Stones available as mana alchemy recipes. This only disables the recipes and entries. Old ones that are already in the world will stay."; + stones18Enabled = loadPropBool("18stones.enabled", desc, stones18Enabled); + desc = "Set this to false to make the Ring of Odin not apply fire resistance. Mostly for people who use Witchery transformations."; ringOfOdinFireResist = loadPropBool("ringOfOdin.fireResist", desc, ringOfOdinFireResist); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index d22f5f95c..db4e7bef8 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -129,9 +129,11 @@ public final class ModManaAlchemyRecipes { prismarineRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.manaResource, 1, 10), new ItemStack(Items.quartz), 200); - stoneRecipes = new ArrayList(); - stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModFluffBlocks.stone), "stone", 200)); - for(int i = 0; i < 4; i++) - stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModFluffBlocks.stone, 1, i), new ItemStack(ModFluffBlocks.stone, 1, i == 0 ? 3 : i - 1), 200)); + if(ConfigHandler.stones18Enabled) { + stoneRecipes = new ArrayList(); + stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModFluffBlocks.stone), "stone", 200)); + for(int i = 0; i < 4; i++) + stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModFluffBlocks.stone, 1, i), new ItemStack(ModFluffBlocks.stone, 1, i == 0 ? 3 : i - 1), 200)); + } } } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index ab070b359..005c2cda7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -876,9 +876,11 @@ public final class LexiconData { phantomInk = new BLexiconEntry(LibLexicon.MISC_PHANTOM_INK, categoryMisc); phantomInk.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePhantomInk)); - stoneAlchemy = new BLexiconEntry(LibLexicon.MISC_STONE_ALCHEMY, categoryMisc); - stoneAlchemy.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaAlchemyRecipes.stoneRecipes), new PageCraftingRecipe("2", ModCraftingRecipes.recipe18StonePolish), new PageCraftingRecipe("3", ModCraftingRecipes.recipe18StoneBrick), new PageCraftingRecipe("4", ModCraftingRecipes.recipe18StoneChisel)); - + if(ConfigHandler.stones18Enabled) { + stoneAlchemy = new BLexiconEntry(LibLexicon.MISC_STONE_ALCHEMY, categoryMisc); + stoneAlchemy.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaAlchemyRecipes.stoneRecipes), new PageCraftingRecipe("2", ModCraftingRecipes.recipe18StonePolish), new PageCraftingRecipe("3", ModCraftingRecipes.recipe18StoneBrick), new PageCraftingRecipe("4", ModCraftingRecipes.recipe18StoneChisel)); + } + if(Botania.bcTriggersLoaded) { bcIntegration = new BLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc); bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.redstone)); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index db22ad28a..e0d6811d4 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -247,6 +247,7 @@ fallenKanade.enabled=Enable Fallen Kanade manaEnchanter.enabled=Enable Mana Enchanter manaFluxfield.enabled=Enable Mana Fluxfield relics.enabled=Enable Relics +18stones.enabled=Enable 1.8 Stones ringOfOdin.fireResist=Enable Ring of Odin Fire Resist flower.forceCheck=Flower Force Checking enderPickpocket.enabled=Enable Ender Pickpocketting