diff --git a/src/main/java/forestry/api/apiculture/IBeekeepingMode.java b/src/main/java/forestry/api/apiculture/IBeekeepingMode.java index 3bb76f776..3a7036df7 100644 --- a/src/main/java/forestry/api/apiculture/IBeekeepingMode.java +++ b/src/main/java/forestry/api/apiculture/IBeekeepingMode.java @@ -37,10 +37,15 @@ public interface IBeekeepingMode { */ boolean isFatigued(IBee queen, IBeeHousing housing); - /** - * @return true if the queen is being overworked in the bee housing (with chance). will trigger a negative effect. + /** + * @return true if the queen is being overworked in the bee housing (with chance). will trigger a negative effect. + * @deprecated bees max out at 16x productivity instead of being overworked. + * TODO remove this method in 1.13 */ - boolean isOverworked(IBee queen, IBeeHousing housing); + @Deprecated + default boolean isOverworked(IBee queen, IBeeHousing housing) { + return false; + } /** * @return true if the genetic structure of the queen is breaking down during spawning of the offspring (with chance). will trigger a negative effect. diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index e16313a0c..61ff64b9c 100755 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -476,11 +476,6 @@ public class Bee extends IndividualLiving implements IBee { IAlleleBeeSpecies primary = genome.getPrimary(); IAlleleBeeSpecies secondary = genome.getSecondary(); - // All work and no play makes queen a dull girl. - if (mode.isOverworked(this, housing)) { - setIsNatural(false); - } - IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); IBeeModifier beeModeModifier = mode.getBeeModifier(); diff --git a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java index e3d89d97e..64a5b5aa0 100755 --- a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java +++ b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java @@ -93,20 +93,6 @@ public class BeekeepingMode implements IBeekeepingMode { rand.nextFloat() < 0.02f * beeModifier.getGeneticDecay(queen.getGenome(), 1f); } - @Override - public boolean isOverworked(IBee queen, IBeeHousing housing) { - IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); - - float productionModifier = beeModifier.getProductionModifier(queen.getGenome(), 1f); - if (productionModifier > 16) { - if (housing.getWorldObj().rand.nextFloat() * 100 < 0.01 * (productionModifier * productionModifier - 100)) { - return true; - } - } - - return false; - } - @Override public boolean isDegenerating(IBee queen, IBee offspring, IBeeHousing housing) { IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); @@ -159,6 +145,10 @@ public class BeekeepingMode implements IBeekeepingMode { @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { + if(this.speedModifier>16.0f) + { + return 16.0f; + } return this.speedModifier; } }