From 46268713abe2f33e8a5258a4b1c653801108212f Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Thu, 5 Mar 2015 21:47:05 +0000 Subject: [PATCH] Added a config option to disable the Mana Fluxfield. --- .../botania/common/core/handler/ConfigHandler.java | 4 ++++ .../common/crafting/ModCraftingRecipes.java | 14 ++++++++------ .../vazkii/botania/common/lexicon/LexiconData.java | 7 +++++-- src/main/resources/assets/botania/lang/en_US.lang | 1 + 4 files changed, 18 insertions(+), 8 deletions(-) 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 8000ed17c..8d5297e94 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -55,6 +55,7 @@ public final class ConfigHandler { public static boolean fallenKanadeEnabled = true; public static boolean darkQuartzEnabled = true; public static boolean enchanterEnabled = true; + public static boolean fluxfieldEnabled = true; public static int flowerQuantity = 2; public static int flowerDensity = 16; @@ -156,6 +157,9 @@ public final class ConfigHandler { desc = "Set to false to disable the Mana Enchanter. Since some people find it OP or something. This only disables the entry and creation. Old ones that are already in the world will stay."; enchanterEnabled = loadPropBool("manaEnchanter.enabled", desc, enchanterEnabled); + desc = "Set to false to disable the Mana Fluxfield (generates RF from mana). This only disables the entry and creation. Old ones that are already in the world will stay."; + fluxfieldEnabled = loadPropBool("manaFluxfield.enabled", desc, fluxfieldEnabled); + desc = "The quanity of botania flower patches to generate in the world, defaults to 2, the lower the number the less patches generate."; flowerQuantity = loadPropInt("worldgen.flower.quantity", desc, flowerQuantity); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index f5e037021..c8b203289 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1268,12 +1268,14 @@ public final class ModCraftingRecipes { recipesWings = BotaniaAPI.getLatestAddedRecipes(7); // Mana Fluxfield Recipe - addOreDictRecipe(new ItemStack(ModBlocks.rfGenerator), - "SRS", "RMR", "SRS", - 'S', LibOreDict.LIVING_ROCK, - 'M', LibOreDict.MANA_STEEL, - 'R', new ItemStack(Blocks.redstone_block)); - recipeRFGenerator = BotaniaAPI.getLatestAddedRecipe(); + if(ConfigHandler.fluxfieldEnabled) { + addOreDictRecipe(new ItemStack(ModBlocks.rfGenerator), + "SRS", "RMR", "SRS", + 'S', LibOreDict.LIVING_ROCK, + 'M', LibOreDict.MANA_STEEL, + 'R', new ItemStack(Blocks.redstone_block)); + recipeRFGenerator = BotaniaAPI.getLatestAddedRecipe(); + } // Vial Recipe GameRegistry.addRecipe(new ItemStack(ModItems.vial, 3, 0), diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index a2f2ac855..e5a175246 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -13,6 +13,7 @@ package vazkii.botania.common.lexicon; import java.util.ArrayList; import java.util.List; +import baubles.common.Config; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -310,8 +311,10 @@ public final class LexiconData { sparkUpgrades = new ALexiconEntry(LibLexicon.MANA_SPARK_UPGRADES, categoryMana); sparkUpgrades.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageCraftingRecipe("5", ModCraftingRecipes.recipesSparkUpgrades)); - rfGenerator = new BLexiconEntry(LibLexicon.MANA_RF_GENERATOR, categoryMana); - rfGenerator.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeRFGenerator)); + if(ConfigHandler.fluxfieldEnabled) { + rfGenerator = new BLexiconEntry(LibLexicon.MANA_RF_GENERATOR, categoryMana); + rfGenerator.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeRFGenerator)); + } lenses = new BLexiconEntry(LibLexicon.MANA_LENSES, categoryMana); lenses.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaLens), new PageText("4"), new PageText("5"), diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index cbc14cd6e..7cae8ad90 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -210,6 +210,7 @@ boundBlock.wireframe.enabled=Bound Block Wireframe darkQuartz.enabled=Enable Smokey Quartz fallenKanade.enabled=Enable Fallen Kanade manaEnchanter.enabled=Enable Mana Enchanter +manaFluxfield.enabled=Enabel Mana Fluxfield flower.forceCheck=Flower Force Checking enderPickpocket.enabled=Enable Ender Pickpocketting thermalily.obsidian=Thermalily Needs Obsidian