diff --git a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java index 36fe0f016..50e7884bc 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java @@ -57,6 +57,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid LibBlockNames.SUBTILE_ENDOFLAME, // Functional + LibBlockNames.SUBTILE_JADED_AMARANTHUS, LibBlockNames.SUBTILE_BELLETHORN, LibBlockNames.SUBTILE_HEISEI_DREAM, LibBlockNames.SUBTILE_TIGERSEYE, diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 76100ae56..b2f17ce17 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.SubTileBellethorn; import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; +import vazkii.botania.common.block.subtile.functional.SubTileJadedAmaranthus; import vazkii.botania.common.block.subtile.functional.SubTileTigerseye; import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.block.subtile.generating.SubTileEndoflame; @@ -93,6 +94,7 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_BELLETHORN, SubTileBellethorn.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_HEISEI_DREAM, SubTileHeiseiDream.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_TIGERSEYE, SubTileTigerseye.class); + BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_JADED_AMARANTHUS, SubTileJadedAmaranthus.class); } private static void registerMultiparts() { diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java new file mode 100644 index 000000000..e2f6a4fee --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java @@ -0,0 +1,69 @@ +/** + * 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 @ [Mar 3, 2014, 10:31:29 PM (GMT)] + */ +package vazkii.botania.common.block.subtile.functional; + +import cpw.mods.fml.common.network.PacketDispatcher; +import net.minecraft.block.Block; +import net.minecraft.world.World; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.subtile.SubTileFunctional; + +public class SubTileJadedAmaranthus extends SubTileFunctional { + + private static final int COST = 100; + int cooldown = 0; + + @Override + public void onUpdate() { + super.onUpdate(); + + if(cooldown > 0) { + cooldown--; + return; + } + + if(mana >= COST && !supertile.worldObj.isRemote) { + int range = 4; + int x = supertile.xCoord - range + supertile.worldObj.rand.nextInt(range * 2 + 1); + int y = supertile.yCoord + range; + int z = supertile.zCoord - range + supertile.worldObj.rand.nextInt(range * 2 + 1); + + for(int i = 0; i < range * 2; i++) { + int blockID = supertile.worldObj.getBlockId(x, y, z); + if((blockID == Block.grass.blockID || blockID == Block.dirt.blockID || blockID == Block.tilledField.blockID) && supertile.worldObj.isAirBlock(x, y + 1, z)) { + int color = supertile.worldObj.rand.nextInt(16); + if(ModBlocks.flower.canBlockStay(supertile.worldObj, x, y + 1, z)) + supertile.worldObj.setBlock(x, y + 1, z, ModBlocks.flower.blockID, color, 1 | 2); + + mana -= COST; + PacketDispatcher.sendPacketToAllInDimension(supertile.getDescriptionPacket(), supertile.worldObj.provider.dimensionId); + + cooldown = 30; + break; + } + + y--; + } + } + } + + @Override + public int getColor() { + return 0x961283; + } + + @Override + public int getMaxMana() { + return COST; + } + +} diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 45a41e01a..e0463c1b3 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -42,6 +42,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.lexicon); addBlock(ModBlocks.flower); + addBlock(ModBlocks.specialFlower); addItem(ModItems.petal); addItem(ModItems.manaPetal); addItem(ModItems.pestleAndMortar); diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index d9ea81cd1..6508d074e 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -39,5 +39,6 @@ public final class LibBlockNames { public static final String SUBTILE_BELLETHORN = "bellethorn"; 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 9c43d6aa6..26638d203 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -110,6 +110,7 @@ tile.botania:flower.endoflame.name=Endoflame tile.botania:flower.bellethorn.name=Bellethorne tile.botania:flower.heiseiDream.name=Heisei Dream tile.botania:flower.tigerseye.name=Tigerseye +tile.botania:flower.jadedAmaranthus.name=Jaded Amaranthus # ITEM NAMES item.botania:lexicon.name=Lexica Botania diff --git a/resources/assets/botania/textures/blocks/jadedAmaranthus.png b/resources/assets/botania/textures/blocks/jadedAmaranthus.png new file mode 100644 index 000000000..0b85bc88e Binary files /dev/null and b/resources/assets/botania/textures/blocks/jadedAmaranthus.png differ