From 69a95ed90a295f21e8932603ccff21e1f059dcf5 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 8 Jun 2014 18:46:18 +0100 Subject: [PATCH] Added the Kekimurus. I'm running out of feasable names, and good textures, that too. --- .../common/block/BlockSpecialFlower.java | 1 + .../botania/common/block/ModBlocks.java | 2 + .../subtile/generating/SubTileKekimurus.java | 59 ++++++++++++++++++ .../botania/common/lib/LibBlockNames.java | 3 +- resources/assets/botania/lang/en_US.lang | 2 + .../botania/textures/blocks/kekimurus.png | Bin 0 -> 2947 bytes 6 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 MODSRC/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java create mode 100644 resources/assets/botania/textures/blocks/kekimurus.png 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 0000000000000000000000000000000000000000..ff110c4046b4f607afc8705c9761e16a6783b436 GIT binary patch literal 2947 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 literal 0 HcmV?d00001