upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-12 16:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed API dependency on non-API Botania classes.

Browse Source
This commit is contained in:
Vasco Lavos committed 2015-10-11 16:13:28 +01:00
1 parent 2752f6f0df
commit bbc778f6ce
2 files changed
+14 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/vazkii/botania/api/package-info.java
+1 -1
View File
@@ -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;
src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java
+13 -6
View File
@@ -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<ItemStack> 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