diff --git a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java index 2dbd1c083..60bc5e436 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java @@ -66,6 +66,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid LibBlockNames.SUBTILE_ARCANE_ROSE, LibBlockNames.SUBTILE_MUNCHDEW, LibBlockNames.SUBTILE_ENTROPINNYUM, + LibBlockNames.SUBTILE_KEKIMURUS, // Functional LibBlockNames.SUBTILE_JADED_AMARANTHUS, diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index e23457fa0..e28f5acd8 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -45,6 +45,7 @@ import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.block.subtile.generating.SubTileEndoflame; import vazkii.botania.common.block.subtile.generating.SubTileEntropinnyum; import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas; +import vazkii.botania.common.block.subtile.generating.SubTileKekimurus; import vazkii.botania.common.block.subtile.generating.SubTileMunchdew; import vazkii.botania.common.block.subtile.generating.SubTileNightshade; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; @@ -168,6 +169,7 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ARCANE_ROSE, SubTileArcaneRose.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MUNCHDEW, SubTileMunchdew.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ENTROPINNYUM, SubTileEntropinnyum.class); + BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_KEKIMURUS, SubTileKekimurus.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_BELLETHORN, SubTileBellethorn.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DREADTHORN, SubTileDreadthorn.class); diff --git a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java new file mode 100644 index 000000000..ec6128f9f --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java @@ -0,0 +1,59 @@ +/** + * 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 @ [Jun 8, 2014, 6:26:37 PM (GMT)] + */ +package vazkii.botania.common.block.subtile.generating; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockCake; +import vazkii.botania.api.subtile.SubTileGenerating; + +public class SubTileKekimurus extends SubTileGenerating { + + @Override + public void onUpdate() { + super.onUpdate(); + + int mana = 320; + + if(getMaxMana() - this.mana >= mana && !supertile.getWorldObj().isRemote && supertile.getWorldObj().getTotalWorldTime() % 50 == 0) { + int range = 5; + for(int i = 0; i < range * 2 + 1; i++) + for(int j = 0; j < range * 2 + 1; j++) + for(int k = 0; k < range * 2 + 1; k++) { + int x = supertile.xCoord + i; + int y = supertile.yCoord + j; + int z = supertile.zCoord + k; + Block block = supertile.getWorldObj().getBlock(x, y, z); + if(block instanceof BlockCake) { + int meta = supertile.getWorldObj().getBlockMetadata(x, y, z) + 1; + if(meta == 6) + supertile.getWorldObj().setBlockToAir(x, y, z); + else supertile.getWorldObj().setBlockMetadataWithNotify(x, y, z, meta, 1 | 2); + supertile.getWorldObj().playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); + this.mana += mana; + sync(); + return; + } + } + } + } + + @Override + public int getColor() { + return 0x935D28; + } + + @Override + public int getMaxMana() { + return 1600; + } + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 93199eeeb..bdb36ee05 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -53,7 +53,8 @@ public final class LibBlockNames { public static final String SUBTILE_ARCANE_ROSE = "arcanerose"; public static final String SUBTILE_MUNCHDEW = "munchdew"; public static final String SUBTILE_ENTROPINNYUM = "entropinnyum"; - + public static final String SUBTILE_KEKIMURUS = "kekimurus"; + public static final String SUBTILE_BELLETHORN = "bellethorn"; public static final String SUBTILE_DREADTHORN = "dreadthorn"; public static final String SUBTILE_HEISEI_DREAM = "heiseiDream"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index e14b9ba60..e76b8ef47 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -211,6 +211,8 @@ tile.botania:flower.munchdew.name=Munchdew tile.botania:flower.munchdew.reference=Nommy nommy the art teacher tile.botania:flower.entropinnyum.name=Entropinnyum tile.botania:flower.entropinnyum.reference=Magical girls are an option +tile.botania:flower.kekimurus.name=Kekimurus +tile.botania:flower.kekimurus.reference=This flower is a lie # - FUNCTIONAL tile.botania:flower.bellethorn.name=Bellethorne diff --git a/resources/assets/botania/textures/blocks/kekimurus.png b/resources/assets/botania/textures/blocks/kekimurus.png new file mode 100644 index 000000000..ff110c404 Binary files /dev/null and b/resources/assets/botania/textures/blocks/kekimurus.png differ