From 01be0406a5844384aae50df909cbe74271b41d48 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Thu, 31 Jul 2014 18:04:23 +0100 Subject: [PATCH] Added a config to disable the mana enchanter. --- .../botania/common/core/handler/ConfigHandler.java | 4 ++++ MODSRC/vazkii/botania/common/item/ItemTwigWand.java | 3 ++- .../vazkii/botania/common/lexicon/LexiconData.java | 12 +++++++----- resources/assets/botania/lang/en_US.lang | 1 + 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index ac72559a3..ffed6344f 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -46,6 +46,7 @@ public final class ConfigHandler { public static boolean fallenKanadeEnabled = true; public static boolean darkQuartzEnabled = true; + public static boolean enchanterEnabled = true; public static int shedRateChicken = 26000; public static int shedRateSquid = 18000; @@ -131,6 +132,9 @@ public final class ConfigHandler { desc = "Set to false to disable the Smokey Quartz blocks. This config option is here for those using Thaumic Tinkerer"; darkQuartzEnabled = loadPropBool("darkQuartz.enabled", desc, darkQuartzEnabled); + 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 = "The average amount of ticks between a chicken randomly dropping a feather. Set to -1 to disable this feature"; shedRateChicken = loadPropInt("shedRate.chicken", desc, shedRateChicken); diff --git a/MODSRC/vazkii/botania/common/item/ItemTwigWand.java b/MODSRC/vazkii/botania/common/item/ItemTwigWand.java index c7f8faf81..4c1344a9e 100644 --- a/MODSRC/vazkii/botania/common/item/ItemTwigWand.java +++ b/MODSRC/vazkii/botania/common/item/ItemTwigWand.java @@ -41,6 +41,7 @@ import vazkii.botania.common.block.BlockPistonRelay; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.block.tile.mana.TileSpreader; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; @@ -107,7 +108,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { par2EntityPlayer.swingItem(); } - if(block == Blocks.lapis_block) { + if(block == Blocks.lapis_block && ConfigHandler.enchanterEnabled) { int meta = -1; if(TileEnchanter.canEnchanterExist(par3World, par4, par5, par6, 0)) meta = 0; diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 137cbb84b..2587dac08 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -370,11 +370,13 @@ public final class LexiconData { pylon = new BLexiconEntry(LibLexicon.DEVICE_PYLON, categoryDevices); pylon.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipePylon)); - manaEnchanting = new BLexiconEntry(LibLexicon.DEVICE_MANA_ENCHANTING, categoryDevices); - manaEnchanting.setLexiconPages(new PageText("0"), new PageText("1"), - new PageImage("2", LibResources.ENTRY_ENCHANTER0), new PageImage("3", LibResources.ENTRY_ENCHANTER1), new PageImage("4", LibResources.ENTRY_ENCHANTER2), new PageImage("5", LibResources.ENTRY_ENCHANTER3), - new PageText("6"), new PageText("7"), new PageText("8"), new PageText("9"), new PageText("10")); - + if(ConfigHandler.enchanterEnabled) { + manaEnchanting = new BLexiconEntry(LibLexicon.DEVICE_MANA_ENCHANTING, categoryDevices); + manaEnchanting.setLexiconPages(new PageText("0"), new PageText("1"), + new PageImage("2", LibResources.ENTRY_ENCHANTER0), new PageImage("3", LibResources.ENTRY_ENCHANTER1), new PageImage("4", LibResources.ENTRY_ENCHANTER2), new PageImage("5", LibResources.ENTRY_ENCHANTER3), + new PageText("6"), new PageText("7"), new PageText("8"), new PageText("9"), new PageText("10")); + } + turntable = new BLexiconEntry(LibLexicon.DEVICE_TURNTABLE, categoryDevices); turntable.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeTurntable)); diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index adaf02dee..3e563aadc 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -84,6 +84,7 @@ blockBreakingParticlesTool.enabled=Tool Block Break Particles boundBlock.wireframe.enabled=Bound Block Wireframe darkQuartz.enabled=Enable Smokey Quatrz fallenKanade.enabled=Enable Fallen Kanade +manaEnchanter.enabled=Enable Mana Enchanter flower.forceCheck=Flower Force Checking flowerParticles.frequency=Flower Particle Frequency lexicon.enable.rotatingItems=Lexicon Rotating Items