diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 55e466c0d..2817f4759 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "64", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "65", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index fe6336b7e..0dd2f329a 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -30,8 +30,6 @@ import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.core.helper.ItemNBTHelper; /** * The basic class for a Generating Flower. @@ -194,15 +192,24 @@ public class SubTileGenerating extends SubTileEntity { } public void populateDropStackNBTs(List drops) { - if(isPassiveFlower() && ticksExisted > 0 && ConfigHandler.hardcorePassiveGeneration > 0) - ItemNBTHelper.setInt(drops.get(0), TAG_PASSIVE_DECAY_TICKS, passiveDecayTicks); + if(isPassiveFlower() && ticksExisted > 0 && BotaniaAPI.internalHandler.getPassiveFlowerDecay() > 0) { + ItemStack drop = drops.get(0); + if(drop != null) { + if(!drop.hasTagCompound()) + drop.setTagCompound(new NBTTagCompound()); + NBTTagCompound cmp = drop.getTagCompound(); + cmp.setInteger(TAG_PASSIVE_DECAY_TICKS, passiveDecayTicks); + } + } } @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { super.onBlockPlacedBy(world, x, y, z, entity, stack); - if(isPassiveFlower()) - passiveDecayTicks = ItemNBTHelper.getInt(stack, TAG_PASSIVE_DECAY_TICKS, 0); + if(isPassiveFlower()) { + NBTTagCompound cmp = stack.getTagCompound(); + passiveDecayTicks = cmp.getInteger(TAG_PASSIVE_DECAY_TICKS); + } } @Override