diff --git a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java index fbeb7cdff..22976118c 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java +++ b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java @@ -54,7 +54,7 @@ public class SubTileHydroangeas extends SubTileGenerating { else if(randomInt2 == 2) positions[1] = supertile.zCoord - 1; - if(supertile.getWorldObj().getBlock(positions[0], supertile.yCoord, positions[1]) == getBlockToSearchFor() && supertile.getWorldObj().getBlockMetadata(positions[0], supertile.yCoord, positions[1]) == 0) { + if(supertile.getWorldObj().getBlock(positions[0], supertile.yCoord, positions[1]) == getBlockToSearchFor() && (getBlockToSearchBelow() == null || supertile.getWorldObj().getBlock(positions[0], supertile.yCoord - 1, positions[1]) == getBlockToSearchBelow()) && supertile.getWorldObj().getBlockMetadata(positions[0], supertile.yCoord, positions[1]) == 0) { supertile.getWorldObj().setBlockToAir(positions[0], supertile.yCoord, positions[1]); didSomething = true; burnTime += getBurnTime(); @@ -77,6 +77,10 @@ public class SubTileHydroangeas extends SubTileGenerating { public Block getBlockToSearchFor() { return Blocks.water; } + + public Block getBlockToSearchBelow() { + return null; + } public int getBurnTime() { return 10; diff --git a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java index b0e4f9442..67e112ae7 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java +++ b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java @@ -15,6 +15,7 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; public class SubTileThermalily extends SubTileHydroangeas { @@ -39,6 +40,11 @@ public class SubTileThermalily extends SubTileHydroangeas { return Blocks.lava; } + @Override + public Block getBlockToSearchBelow() { + return ConfigHandler.thermalilyObsidian ? Blocks.obsidian : null; + } + @Override public int getDelayBetweenPassiveGeneration() { return 1; diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index 1487a5171..08e8504c3 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 int spreaderPositionShift = 1; public static boolean flowerForceCheck = true; public static boolean enderPickpocketEnabled = true; + public static boolean thermalilyObsidian = false; public static boolean fallenKanadeEnabled = true; public static boolean darkQuartzEnabled = true; @@ -135,6 +136,9 @@ public final class ConfigHandler { desc = "Set to false to disable the ability for the Hand of Ender to pickpocket other players' ender chests."; enderPickpocketEnabled = loadPropBool("enderPickpocket.enabled", desc, enderPickpocketEnabled); + desc = "Set to true to only allow the Thermalily to absorb Lava if there's Obsidian below it. Another config option for the Blood Magic balance freaks."; + thermalilyObsidian = loadPropBool("thermalily.obsidian", desc, thermalilyObsidian); + desc = "Set to false to disable the Fallen Kanade flower (gives Regeneration). This config option is here for those using Blood Magic. Note: Turning this off will not remove ones already in the world, it'll simply prevent the crafting."; fallenKanadeEnabled = loadPropBool("fallenKanade.enabled", desc, fallenKanadeEnabled); diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 246d595c6..0eacd7e23 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -348,7 +348,7 @@ public final class LexiconData { hydroangeas.setLexiconPages(new PageText("0"), new PageImage("2", LibResources.ENTRY_HYDROANGEAS), new PagePetalRecipe("1", ModPetalRecipes.hydroangeasRecipe)); thermalily = new BLexiconEntry(LibLexicon.GFLOWER_THERMALILY, categoryGenerationFlowers); - thermalily.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.thermalilyRecipe)); + thermalily.setLexiconPages(new PageText(ConfigHandler.thermalilyObsidian ? "0a" : "0"), new PagePetalRecipe("1", ModPetalRecipes.thermalilyRecipe)); arcaneRose = new BLexiconEntry(LibLexicon.GFLOWER_ARCANE_ROSE, categoryGenerationFlowers); arcaneRose.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.arcaneRoseRecipe)); diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 69f2ac0ff..181f87e9e 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -110,6 +110,7 @@ fallenKanade.enabled=Enable Fallen Kanade manaEnchanter.enabled=Enable Mana Enchanter flower.forceCheck=Flower Force Checking enderPickpocket.enabled=Enable Ender Pickpocketting +thermalily.obsidian=Thermalily Needs Obsidian flowerParticles.frequency=Flower Particle Frequency lexicon.enable.rotatingItems=Lexicon Rotating Items lexicon.render.3D=3D Lexicon Render @@ -1023,6 +1024,7 @@ botania.page.hydroangeas1=&oFrom some Hyperdimension&r? # -- THERMALILY botania.entry.thermalily=Thermalily botania.page.thermalily0=There comes a point where slow generating power, like the &1Hydroangeas&0 or the &1Endoflame&0 is not enough. An answer to that is the &1Thermalily&0, which works similarly to the &1Hydroangeas&0, except with &1Lava&0. +botania.page.thermalily0a=There comes a point where slow generating power, like the &1Hydroangeas&0 or the &1Endoflame&0 is not enough. An answer to that is the &1Thermalily&0, which works similarly to the &1Hydroangeas&0, except with &1Lava&0.
Due to the heat the &1Lava&0 produces, there must be a block of &1Obsidian&0 below it for it to be absorbed. botania.page.thermalily1=&oLily ought to know&r. # -- ROSA ARCANA