From c337282ab0eb9766a64dc3c4b9528ab426ee0bcc Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 20 Mar 2014 17:27:40 +0000 Subject: [PATCH] Added the agricarnation. Moar puns :D --- .../common/block/BlockSpecialFlower.java | 3 +- .../botania/common/block/ModBlocks.java | 2 + .../functional/SubTileAgricarnation.java | 63 ++++++++++++++++++ .../botania/common/item/ItemManaTablet.java | 1 - .../botania/common/lib/LibBlockNames.java | 1 + resources/assets/botania/lang/en_US.lang | 2 + .../botania/textures/blocks/agricarnation.png | Bin 0 -> 2926 bytes 7 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 MODSRC/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java create mode 100644 resources/assets/botania/textures/blocks/agricarnation.png diff --git a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java index d83ebdb4e..0e00afaf9 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java @@ -67,7 +67,8 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid LibBlockNames.SUBTILE_TIGERSEYE, LibBlockNames.SUBTILE_ORECHID, LibBlockNames.SUBTILE_FALLEN_KANADE, - LibBlockNames.SUBTILE_EXOFLAME + LibBlockNames.SUBTILE_EXOFLAME, + LibBlockNames.SUBTILE_AGRICARNATION }; protected BlockSpecialFlower() { diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 70cc9c095..59fd7c7a3 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; 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.SubTileExoflame; import vazkii.botania.common.block.subtile.functional.SubTileFallenKanade; @@ -141,6 +142,7 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ORECHID, SubtileOrechid.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_FALLEN_KANADE, SubTileFallenKanade.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_EXOFLAME, SubTileExoflame.class); + BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_AGRICARNATION, SubTileAgricarnation.class); } private static void registerMultiparts() { diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java new file mode 100644 index 000000000..1440a925c --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java @@ -0,0 +1,63 @@ +/** + * 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 19, 2014, 10:16:53 PM (GMT)] + */ +package vazkii.botania.common.block.subtile.functional; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import vazkii.botania.api.subtile.SubTileFunctional; + +public class SubTileAgricarnation extends SubTileFunctional { + + @Override + public void onUpdate() { + super.onUpdate(); + + if(supertile.worldObj.getTotalWorldTime() % 3 == 0) { + int range = 5; + int x = supertile.xCoord + supertile.worldObj.rand.nextInt(range * 2 + 1) - range; + int z = supertile.zCoord + supertile.worldObj.rand.nextInt(range * 2 + 1) - range; + + for(int i = 4; i > -2; i--) { + int y = supertile.yCoord + i; + + if(supertile.worldObj.isAirBlock(x, y, z)) + continue; + + if(isPlant(x, y, z) && mana > 5) { + int id = supertile.worldObj.getBlockId(x, y, z); + mana -= 5; + supertile.worldObj.scheduleBlockUpdate(x, y, z, id, 1); + } + } + } + } + + boolean isPlant(int x, int y, int z) { + int id = supertile.worldObj.getBlockId(x, y, z); + if(id == Block.grass.blockID || id == Block.leaves.blockID || id == Block.tallGrass.blockID) + return false; + + Material mat = supertile.worldObj.getBlockMaterial(x, y, z); + return mat != null && (mat == Material.plants || mat == Material.cactus || mat == Material.grass || mat == Material.leaves || mat == Material.vine || mat == Material.wood || mat == Material.pumpkin); + } + + @Override + public int getColor() { + return 0x8EF828; + } + + @Override + public int getMaxMana() { + return 200; + } + +} diff --git a/MODSRC/vazkii/botania/common/item/ItemManaTablet.java b/MODSRC/vazkii/botania/common/item/ItemManaTablet.java index 27ddab87b..f432efe43 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaTablet.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaTablet.java @@ -19,7 +19,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.Icon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 362edfd13..784ebdfc9 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -51,5 +51,6 @@ public final class LibBlockNames { public static final String SUBTILE_ORECHID = "orechid"; public static final String SUBTILE_FALLEN_KANADE = "fallenKanade"; public static final String SUBTILE_EXOFLAME = "exoflame"; + public static final String SUBTILE_AGRICARNATION = "agricarnation"; } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index dda3ee72b..ce957724c 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -143,6 +143,8 @@ tile.botania:flower.fallenKanade.name=Fallen Kanade tile.botania:flower.fallenKanade.reference=I'm not an Angel tile.botania:flower.exoflame.name=Exoflame tile.botania:flower.exoflame.reference=An exothermic reaction +tile.botania:flower.agricarnation.name=Agricarnation +tile.botania:flower.agricarnation.reference=Wear on the 25th of april # ITEM NAMES item.botania:lexicon.name=Lexica Botania diff --git a/resources/assets/botania/textures/blocks/agricarnation.png b/resources/assets/botania/textures/blocks/agricarnation.png new file mode 100644 index 0000000000000000000000000000000000000000..d5b625a1de8ee625b8f753fd36968b03d209034b GIT binary patch literal 2926 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 literal 0 HcmV?d00001