New bees formula (#45)

* New formula

* Make production modifier globally additive

src/main/java/forestry/api/apiculture/DefaultBeeModifier.java

@@ -43,6 +43,10 @@ public class DefaultBeeModifier implements IBeeModifier {
         return false;
     }
 
+    public boolean isSelfUnlighted() {
+        return false;
+    }
+
     public boolean isSunlightSimulated() {
         return false;
     }

src/main/java/forestry/api/apiculture/IBeeModifier.java

@@ -54,10 +54,17 @@ public interface IBeeModifier {
     boolean isSealed();
 
     /**
-     * @return Boolean indicating if housing can ignore darkness/night
+     * @return Boolean indicating if housing can ignore darkness/night. Cannot be used together with SelfUnlighted
      */
     boolean isSelfLighted();
 
+    /**
+     * @return Boolean indicating if housing can ignore lightness/day. Cannot be used together with SelfLighted
+     */
+    default boolean isSelfUnlighted() {
+        return false;
+    }
+
     /**
      * @return Boolean indicating if housing can ignore not seeing the sky
      */

src/main/java/forestry/apiculture/BeeHousingModifier.java

@@ -51,7 +51,7 @@ public class BeeHousingModifier implements IBeeModifier {
     public float getProductionModifier(IBeeGenome genome, final float currentModifier) {
         float modifierValue = 1.0f;
         for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {
-            modifierValue *= modifier.getProductionModifier(genome, modifierValue * currentModifier);
+            modifierValue += modifier.getProductionModifier(genome, modifierValue + currentModifier);
         }
         return modifierValue;
     }
@@ -94,6 +94,16 @@ public class BeeHousingModifier implements IBeeModifier {
         return false;
     }
 
+    @Override
+    public boolean isSelfUnlighted() {
+        for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {
+            if (modifier.isSelfUnlighted()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     public boolean isSunlightSimulated() {
         for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {

src/main/java/forestry/apiculture/genetics/Bee.java

@@ -248,7 +248,7 @@ public class Bee extends IndividualLiving implements IBee {
 
         // / Night or darkness requires nocturnal species
         if (world.isDaytime()) {
-            if (!canWorkDuringDay()) {
+            if (!canWorkDuringDay(beeModifier)) {
                 errorStates.add(EnumErrorCode.NOT_NIGHT);
             }
         } else {
@@ -258,7 +258,7 @@ public class Bee extends IndividualLiving implements IBee {
         }
 
         if (housing.getBlockLightValue() > Constants.APIARY_MIN_LEVEL_LIGHT) {
-            if (!canWorkDuringDay()) {
+            if (!canWorkDuringDay(beeModifier)) {
                 errorStates.add(EnumErrorCode.NOT_GLOOMY);
             }
         } else {
@@ -308,12 +308,16 @@ public class Bee extends IndividualLiving implements IBee {
         return errorStates;
     }
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     private boolean canWorkAtNight(IBeeModifier beeModifier) {
-        return genome.getPrimary().isNocturnal() || genome.getNocturnal() || beeModifier.isSelfLighted();
+        return (genome.getPrimary().isNocturnal() || genome.getNocturnal() || beeModifier.isSelfLighted())
+                && !(beeModifier.isSelfUnlighted() && beeModifier.isSelfLighted());
     }
 
-    private boolean canWorkDuringDay() {
-        return !genome.getPrimary().isNocturnal() || genome.getNocturnal();
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+    private boolean canWorkDuringDay(IBeeModifier beeModifier) {
+        return (!genome.getPrimary().isNocturnal() || genome.getNocturnal() || beeModifier.isSelfUnlighted())
+                && !(beeModifier.isSelfUnlighted() && beeModifier.isSelfLighted());
     }
 
     private boolean canWorkUnderground(IBeeModifier beeModifier) {
@@ -451,12 +455,11 @@ public class Bee extends IndividualLiving implements IBee {
     // / PRODUCTION
     @Override
     public ItemStack[] getProduceList() {
-        ArrayList<ItemStack> products = new ArrayList<>();
 
         IAlleleBeeSpecies primary = genome.getPrimary();
         IAlleleBeeSpecies secondary = genome.getSecondary();
 
-        products.addAll(primary.getProductChances().keySet());
+        ArrayList<ItemStack> products = new ArrayList<>(primary.getProductChances().keySet());
 
         Set<ItemStack> secondaryProducts = secondary.getProductChances().keySet();
         // Remove duplicates
@@ -475,13 +478,13 @@ public class Bee extends IndividualLiving implements IBee {
             }
         }
 
-        return products.toArray(new ItemStack[products.size()]);
+        return products.toArray(new ItemStack[0]);
     }
 
     @Override
     public ItemStack[] getSpecialtyList() {
         Set<ItemStack> specialties = genome.getPrimary().getSpecialtyChances().keySet();
-        return specialties.toArray(new ItemStack[specialties.size()]);
+        return specialties.toArray(new ItemStack[0]);
     }
 
     @Override
@@ -513,7 +516,6 @@ public class Bee extends IndividualLiving implements IBee {
         float speed = genome.getSpeed();
         float prodModifier = beeHousingModifier.getProductionModifier(genome, 1f)
                 * beeModeModifier.getProductionModifier(genome, 1f);
-        prodModifier /= 4f;
 
         // / Primary Products
         for (Map.Entry<ItemStack, Float> entry : primary.getProductChances().entrySet()) {
@@ -537,7 +539,7 @@ public class Bee extends IndividualLiving implements IBee {
             }
         }
 
-        ItemStack[] productsArray = products.toArray(new ItemStack[products.size()]);
+        ItemStack[] productsArray = products.toArray(new ItemStack[0]);
         ChunkCoordinates housingCoordinates = housing.getCoordinates();
         return genome.getFlowerProvider().affectProducts(
                 housing.getWorld(),
@@ -550,9 +552,9 @@ public class Bee extends IndividualLiving implements IBee {
 
     public static float getFinalChance(float chance, float beeSpeed, float productionModifier, float t) {
         chance *= 100f;
-        return (float) (((1f + t / 6f) * Math.sqrt(chance) * 2f * (1f + beeSpeed)
-                + Math.pow(productionModifier, Math.cbrt(chance))
-                - 3f) / 100f);
+        return (float) (2.8 * Math.pow(chance, 0.52)
+                * Math.pow((productionModifier + t), 0.52)
+                * Math.pow(beeSpeed, 0.37)) / 100.f;
     }
 
     /* REPRODUCTION */