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 000000000..d5b625a1d Binary files /dev/null and b/resources/assets/botania/textures/blocks/agricarnation.png differ