From 702f691a48f1ba23d2702dd98624eae2c9151c4e Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 15 May 2014 16:38:00 +0100 Subject: [PATCH] Added the Dreadthorne. --- .../common/block/BlockSpecialFlower.java | 1 + .../botania/common/block/ModBlocks.java | 3 +- .../subtile/functional/SubTileBellethorn.java | 28 ++++++++++-- .../subtile/functional/SubTileDreadthorn.java | 42 ++++++++++++++++++ .../botania/common/lib/LibBlockNames.java | 1 + resources/assets/botania/lang/en_US.lang | 2 + .../botania/textures/blocks/dreadthorn.png | Bin 0 -> 3238 bytes 7 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 MODSRC/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java create mode 100644 resources/assets/botania/textures/blocks/dreadthorn.png diff --git a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java index 0e3ffc139..0276168e8 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java @@ -64,6 +64,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid // Functional LibBlockNames.SUBTILE_JADED_AMARANTHUS, LibBlockNames.SUBTILE_BELLETHORN, + LibBlockNames.SUBTILE_DREADTHORN, LibBlockNames.SUBTILE_HEISEI_DREAM, LibBlockNames.SUBTILE_TIGERSEYE, LibBlockNames.SUBTILE_ORECHID, diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 0b5a747f0..d41bf2d51 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -18,6 +18,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.block.subtile.SubTilePureDaisy; import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation; import vazkii.botania.common.block.subtile.functional.SubTileBellethorn; +import vazkii.botania.common.block.subtile.functional.SubTileDreadthorn; import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.subtile.functional.SubTileFallenKanade; import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; @@ -51,7 +52,6 @@ import vazkii.botania.common.block.tile.TileTinyPlanet; import vazkii.botania.common.block.tile.TileTurntable; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; public final class ModBlocks { @@ -139,6 +139,7 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ARCANE_ROSE, SubTileArcaneRose.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_BELLETHORN, SubTileBellethorn.class); + BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DREADTHORN, SubTileDreadthorn.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_HEISEI_DREAM, SubTileHeiseiDream.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_TIGERSEYE, SubTileTigerseye.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_JADED_AMARANTHUS, SubTileJadedAmaranthus.class); diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index 0301ff236..db8c76351 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -13,6 +13,8 @@ package vazkii.botania.common.block.subtile.functional; import java.util.List; +import net.minecraft.command.IEntitySelector; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; @@ -38,21 +40,39 @@ public class SubTileBellethorn extends SubTileFunctional { super.onUpdate(); final int range = 6; - final int manaToUse = 24; + final int manaToUse = getManaCost(); - if(supertile.getWorldObj().getTotalWorldTime() % 15 == 0) { + if(supertile.getWorldObj().getTotalWorldTime() % 5 == 0) { List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - range, supertile.yCoord, supertile.zCoord - range, supertile.xCoord + range, supertile.yCoord + 1, supertile.zCoord + range)); + IEntitySelector selector = getSelector(); + for(EntityLivingBase entity : entities) { - if(entity instanceof EntityPlayer) + if(!selector.isEntityApplicable(entity)) continue; - + if(entity.hurtTime == 0 && mana >= manaToUse) { entity.attackEntityFrom(DamageSource.magic, 4); mana -= manaToUse; + break; } } } } + + public int getManaCost() { + return 24; + } + + public IEntitySelector getSelector() { + return new IEntitySelector() { + + @Override + public boolean isEntityApplicable(Entity entity) { + return !(entity instanceof EntityPlayer); + } + + }; + } @Override public LexiconEntry getEntry() { diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java new file mode 100644 index 000000000..7b4cac545 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java @@ -0,0 +1,42 @@ +/** + * 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:25:24 PM (GMT)] + */ +package vazkii.botania.common.block.subtile.functional; + +import net.minecraft.command.IEntitySelector; +import net.minecraft.entity.Entity; +import net.minecraft.entity.passive.EntityAnimal; + +public class SubTileDreadthorn extends SubTileBellethorn { + + @Override + public int getColor() { + return 0x260B45; + } + + @Override + public IEntitySelector getSelector() { + return new IEntitySelector() { + + @Override + public boolean isEntityApplicable(Entity var1) { + return var1 instanceof EntityAnimal && ((EntityAnimal) var1).getGrowingAge() == 0; + } + + }; + } + + @Override + public int getManaCost() { + return 30; + } + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index c0730e67d..1c3723293 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -50,6 +50,7 @@ public final class LibBlockNames { public static final String SUBTILE_ARCANE_ROSE = "arcanerose"; public static final String SUBTILE_BELLETHORN = "bellethorn"; + public static final String SUBTILE_DREADTHORN = "dreadthorn"; public static final String SUBTILE_HEISEI_DREAM = "heiseiDream"; public static final String SUBTILE_TIGERSEYE = "tigerseye"; public static final String SUBTILE_JADED_AMARANTHUS = "jadedAmaranthus"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 21a484252..49154de03 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -153,6 +153,8 @@ tile.botania:flower.arcanerose.reference=Ten blue orbs in the corner # - FUNCTIONAL tile.botania:flower.bellethorn.name=Bellethorne tile.botania:flower.bellethorn.reference=Just a paper cut +tile.botania:flower.dreadthorn.name=Dreadthorne +tile.botania:flower.dreadthorn.reference=Plan C tile.botania:flower.heiseiDream.name=Heisei Dream tile.botania:flower.heiseiDream.reference=Heisei heisei kowarete tile.botania:flower.tigerseye.name=Tigerseye diff --git a/resources/assets/botania/textures/blocks/dreadthorn.png b/resources/assets/botania/textures/blocks/dreadthorn.png new file mode 100644 index 0000000000000000000000000000000000000000..221ad4754f9548fcc00f2f258b3bf0baf55a6eb3 GIT binary patch literal 3238 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 Y0GN&hnlKCeKL7v#07*qoM6N<$g3u@i5&!@I literal 0 HcmV?d00001