Updating to Forestry 2.2.8.0

fixing some shit.
This commit is contained in:
MysteriousAges committed 2013-06-14 13:30:00 -07:00
1 parent c3210c0883
commit e20ab2dfb9
25 files changed
+211 -208

No files matched your search

+25 -2
View File
@@ -17,10 +17,12 @@ import forestry.api.genetics.IEffectData;
public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect
{
protected int throttle;
public AlleleEffect(String id, boolean isDominant)
public AlleleEffect(String id, boolean isDominant, int timeout)
{
super("effect" + id, isDominant);
this.throttle = timeout;
}
@Override
@@ -33,7 +35,28 @@ public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect
public abstract IEffectData validateStorage(IEffectData storedData);
@Override
public abstract IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
public final IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing)
{
int count = storedData.getInteger(0);
if (count >= this.throttle)
{
storedData = this.doEffectThrottled(genome, storedData, housing);
}
else
{
storedData.setInteger(0, count + 1);
}
return storedData;
}
/**
*
* @param genome
* @param storedData
* @param housing
* @return
*/
protected abstract IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
@Override
public IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing)