diff --git a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java index 0276168e8..6f9d96e71 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java @@ -74,7 +74,8 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid LibBlockNames.SUBTILE_HOPPERHOCK, LibBlockNames.SUBTILE_RANNUNCARPUS, LibBlockNames.SUBTILE_TANGLEBERRIE, - LibBlockNames.SUBTILE_JIYUULIA + LibBlockNames.SUBTILE_JIYUULIA, + LibBlockNames.SUBTILE_HYACIDUS }; protected BlockSpecialFlower() { diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index d41bf2d51..b6c7b394a 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -23,6 +23,7 @@ import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.subtile.functional.SubTileFallenKanade; import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; import vazkii.botania.common.block.subtile.functional.SubTileHopperhock; +import vazkii.botania.common.block.subtile.functional.SubTileHyacidus; import vazkii.botania.common.block.subtile.functional.SubTileJadedAmaranthus; import vazkii.botania.common.block.subtile.functional.SubTileJiyuulia; import vazkii.botania.common.block.subtile.functional.SubTileRannuncarpus; @@ -151,6 +152,7 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_TANGLEBERRIE, SubTileTangleberrie.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_JIYUULIA, SubTileJiyuulia.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_RANNUNCARPUS, SubTileRannuncarpus.class); + BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_HYACIDUS, SubTileHyacidus.class); } } \ No newline at end of file diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java index 8e6828a44..6dcacc4a8 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java @@ -35,7 +35,6 @@ public class SubTileFallenKanade extends SubTileFunctional { if(player.getActivePotionEffect(Potion.regeneration) == null && mana >= cost) { player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 60, 3)); mana -= cost; - sync(); } } } diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java new file mode 100644 index 000000000..04320f760 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java @@ -0,0 +1,51 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [May 15, 2014, 4:47:41 PM (GMT)] + */ +package vazkii.botania.common.block.subtile.functional; + +import java.util.List; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.AxisAlignedBB; +import vazkii.botania.api.subtile.SubTileFunctional; + +public class SubTileHyacidus extends SubTileFunctional { + + @Override + public void onUpdate() { + super.onUpdate(); + + final int range = 6; + final int cost = 20; + + List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - range, supertile.yCoord - range, supertile.zCoord - range, supertile.xCoord + range, supertile.yCoord + range, supertile.zCoord + range)); + for(EntityLivingBase entity : entities) { + if(!(entity instanceof EntityPlayer) && entity.getActivePotionEffect(Potion.poison) == null && mana >= cost) { + entity.addPotionEffect(new PotionEffect(Potion.poison.id, 60, 0)); + mana -= cost; + } + } + } + + @Override + public int getColor() { + return 0x8B438F; + } + + @Override + public int getMaxMana() { + return 180; + } + +} \ No newline at end of file diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 1c3723293..7a909d261 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -62,4 +62,5 @@ public final class LibBlockNames { public static final String SUBTILE_TANGLEBERRIE = "tangleberrie"; public static final String SUBTILE_JIYUULIA = "jiyuulia"; public static final String SUBTILE_RANNUNCARPUS = "rannuncarpus"; + public static final String SUBTILE_HYACIDUS = "hyacidus"; } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index f127e255e..51e17f56b 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -178,6 +178,8 @@ tile.botania:flower.jiyuulia.reference=Flügel der Freiheit # TRANSLATE THAT VEXATOS tile.botania:flower.rannuncarpus.name=Rannuncarpus tile.botania:flower.rannuncarpus.reference=That's handy +tile.botania:flower.hyacidus.name=Hyacidus +tile.botania:flower.hyacidus.reference=If you don't walk, it doesn't hurt # ITEM NAMES item.botania:lexicon.name=Lexica Botania