From 4f9bec6dd8d6841f6d40887e76dd7070b0989811 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 3 Mar 2014 23:06:09 +0000 Subject: [PATCH] Added the Jaded Amaranthus. Guess who requested that >.< --- .../common/block/BlockSpecialFlower.java | 1 + .../botania/common/block/ModBlocks.java | 2 + .../functional/SubTileJadedAmaranthus.java | 69 ++++++++++++++++++ .../common/core/BotaniaCreativeTab.java | 1 + .../botania/common/lib/LibBlockNames.java | 1 + resources/assets/botania/lang/en_US.lang | 1 + .../textures/blocks/jadedAmaranthus.png | Bin 0 -> 3234 bytes 7 files changed, 75 insertions(+) create mode 100644 MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java create mode 100644 resources/assets/botania/textures/blocks/jadedAmaranthus.png 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 0000000000000000000000000000000000000000..0b85bc88e3fa53764e4170c634ebbfb9c7537e3c GIT binary patch literal 3234 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 literal 0 HcmV?d00001