diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 72ada7d10..c6ed2b133 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -28,6 +28,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TilePylon; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -111,6 +112,6 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu } @Override public boolean canStabaliseInfusion(World world, int x, int y, int z) { - return true; + return ConfigHandler.enableThaumcraftStablizers; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index fc1fae8f9..fa300f92d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -170,6 +170,6 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab @Override public boolean canStabaliseInfusion(World world, int x, int y, int z) { - return true; + return ConfigHandler.enableThaumcraftStablizers; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index a7b4e36f3..e66816ebc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -128,7 +128,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override public boolean canStabaliseInfusion(World world, int x, int y, int z) { - return true; + return ConfigHandler.enableThaumcraftStablizers; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index be5e94f8f..7ec379792 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -71,7 +71,7 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili @Override public boolean canStabaliseInfusion(World world, int x, int y, int z) { - return true; + return ConfigHandler.enableThaumcraftStablizers; } @Override 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 c7c44abe6..f85ab281f 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -88,6 +88,8 @@ public final class ConfigHandler { public static boolean ringOfOdinFireResist = true; public static boolean enderStuff19Enabled = true; public static boolean invertMagnetRing = false; + public static boolean enableThaumcraftStablizers = true; + public static int harvestLevelWeight = 2; public static int harvestLevelBore = 3; @@ -247,6 +249,9 @@ public final class ConfigHandler { desc = "Set this to true to invert the Ring of Magnetization's controls (from shift to stop to shift to work)"; invertMagnetRing = loadPropBool("magnetRing.invert", desc, invertMagnetRing); + desc = "Set this to false to disable Thaumcraft Infusion Stabilizing in botania blocks"; + enableThaumcraftStablizers = loadPropBool("thaumraftStabilizers.enabled", desc, enableThaumcraftStablizers); + desc = "The harvest level of the Mana Lens: Weight. 3 is diamond level. Defaults to 2 (iron level)"; harvestLevelWeight = loadPropInt("harvestLevel.weightLens", desc, harvestLevelWeight); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 438bb06da..4635cb557 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -1100,7 +1100,10 @@ public final class LexiconData { if(Botania.thaumcraftLoaded) { tcIntegration = new CLexiconEntry(LibLexicon.MISC_TC_INTEGRATION, BotaniaAPI.categoryMisc, "Thaumcraft"); - tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageText("5"), new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")).setIcon(new ItemStack(ModItems.manaInkwell)); + + if(ConfigHandler.enableThaumcraftStablizers) + tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageText("5"), new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")).setIcon(new ItemStack(ModItems.manaInkwell)); + else tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")).setIcon(new ItemStack(ModItems.manaInkwell)); } if(Botania.etFuturumLoaded) { diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 637e46b0c..884f42499 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3834,7 +3834,7 @@ botania.page.tcIntegration1=First and foremost, combining any of the &1Mana Meta botania.page.tcIntegration2=Helmets of Revealing (works with any Botania helm) botania.page.tcIntegration3=Carrying on, &4Mana&0 can also serve as an interesting type of Ink. Infusing a set of black &1Scribing Tools&0 with &4Mana&0 from a &1Mana Pool&0 allows for them to use said &4Mana&0 as their source of color.
Refilling these tools works similarly to a &1Mana Tablet&0, done by tossing it on top of the pool. It's to note that the tools do not come pre-filled. botania.page.tcIntegration4=Making the &1Botanurgist's Inkwell -botania.page.tcIntegration5=Next off, there's a few varied resources or constructs that can work as paraphernalia for an &1Infusion Altar&0, to lower its' instability, these come in the form of &1Glimmering Flowers, Floating Flowers and any variety of Pylons&0.
Lastly, a special &4Brew&0 can be put together using typical thaumaturgic resources in order to apply a &4Warp Ward&0 effect. +botania.page.tcIntegration5=Next off, there's a few varied resources or constructs that can work as paraphernalia for an &1Infusion Altar&0, to lower its' instability, these come in the form of &1Glimmering Flowers, Floating Flowers and any variety of Pylons&0. botania.page.tcIntegration6a=Perhaps insanity might not be the greatest tool in all of occasions. For those cases, a nice bath generally takes care of it. A brew might be a better format for such a task, though... botania.page.tcIntegration6b=The official frowny face