diff --git a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java index f05494734..811ddafcd 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java @@ -67,6 +67,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid LibBlockNames.SUBTILE_MUNCHDEW, LibBlockNames.SUBTILE_ENTROPINNYUM, LibBlockNames.SUBTILE_KEKIMURUS, + LibBlockNames.SUBTILE_GOURMARYLLIS, // Functional LibBlockNames.SUBTILE_JADED_AMARANTHUS, diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index ef178a3c4..75b64eb6d 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -72,6 +72,7 @@ import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose; 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.SubTileGourmaryllis; import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas; import vazkii.botania.common.block.subtile.generating.SubTileKekimurus; import vazkii.botania.common.block.subtile.generating.SubTileMunchdew; @@ -386,6 +387,7 @@ public final class ModBlocks { 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_GOURMARYLLIS, SubTileGourmaryllis.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/SubTileGourmaryllis.java b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java new file mode 100644 index 000000000..ed3dc1e8a --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -0,0 +1,85 @@ +/** + * 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 @ [Jul 26, 2014, 1:42:17 PM (GMT)] + */ +package vazkii.botania.common.block.subtile.generating; + +import java.util.List; + +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.AxisAlignedBB; +import vazkii.botania.api.subtile.SubTileGenerating; + +public class SubTileGourmaryllis extends SubTileGenerating { + + private static final String TAG_COOLDOWN = "cooldown"; + private static final String TAG_STORED_MANA = "storedMana"; + + int cooldown = 0; + int storedMana = 0; + + @Override + public void onUpdate() { + super.onUpdate(); + + if(cooldown > 0) + cooldown--; + if(cooldown == 0 && !supertile.getWorldObj().isRemote) { + mana = Math.min(getMaxMana(), mana + storedMana); + storedMana = 0; + sync(); + } + + if(!supertile.getWorldObj().isRemote) { + int range = 1; + List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - range, supertile.yCoord - range, supertile.zCoord - range, supertile.xCoord + range + 1, supertile.yCoord + range + 1, supertile.zCoord + range + 1)); + for(EntityItem item : items) { + ItemStack stack = item.getEntityItem(); + if(stack != null && stack.getItem() instanceof ItemFood) { + if(cooldown == 0) { + int val = ((ItemFood) stack.getItem()).func_150905_g(stack); + storedMana = (val * val) * 18; + cooldown = val * 10; + sync(); + } + + item.setDead(); + } + } + } + } + + @Override + public void writeToPacketNBT(NBTTagCompound cmp) { + super.writeToPacketNBT(cmp); + cmp.setInteger(TAG_COOLDOWN, cooldown); + cmp.setInteger(TAG_COOLDOWN, cooldown); + } + + @Override + public void readFromPacketNBT(NBTTagCompound cmp) { + super.readFromPacketNBT(cmp); + cooldown = cmp.getInteger(TAG_COOLDOWN); + } + + @Override + public int getMaxMana() { + return 2400; + } + + @Override + public int getColor() { + return 0xD3D604; + } + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 4d9fcb75c..2897ea401 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -65,6 +65,7 @@ public final class LibBlockNames { 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_GOURMARYLLIS = "gourmaryllis"; public static final String SUBTILE_BELLETHORN = "bellethorn"; public static final String SUBTILE_DREADTHORN = "dreadthorn"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 0b83b7902..933267272 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -386,6 +386,8 @@ 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 +tile.botania:flower.gourmaryllis.name=Gourmaryllis +tile.botania:flower.gourmaryllis.reference=Fuyukai Desu # - FUNCTIONAL tile.botania:flower.bellethorn.name=Bellethorne