update

* Change up how the radioactive bee works to make it a bit more reasonable.

* Remove debug code

* Fix the range of bees being off by one block. nextInt is [0,n), so we need to do n+1 to get our boundary included.

* Remove unnecessary check, fix alveary block under not using correct y and unprotect other blocks under. Also fix canMineBlock being the wrong way round.

* Fix under block protection for non-alvearies

* spotlessApply (#73)

Co-authored-by: GitHub GTNH Actions <>

* Fix condition

---------

Co-authored-by: GTNH-Colen <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

dependencies.gradle

@@ -2,8 +2,8 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha52:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.8-GTNH:dev')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta4:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.33-GTNH:dev')
     compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.6.2:api')
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

gradle.properties

@@ -85,6 +85,11 @@ accessTransformersFile =
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
 
+# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
+# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
+# Mixin classes will have access to "main" classes, but not the other way around.
+separateMixinSourceSet =
+
 # Adds some debug arguments like verbose output and class export.
 usesMixinDebug = false
 
@@ -117,9 +122,15 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
+# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
+# list of strings, with the acceptable keys being(case does not matter):
+# cursemaven
+# modrinth
+excludeWellKnownRepositories =
+
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
 # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
 # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.26'
 }
 
 

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

@@ -8,6 +8,9 @@
  ******************************************************************************/
 package forestry.apiculture.genetics;
 
+import static forestry.core.utils.MathUtil.safeAdd;
+import static forestry.core.utils.MathUtil.safeMultiply;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -699,9 +702,9 @@ public class Bee extends IndividualLiving implements IBee {
 
             // boost chance for researched mutations
             if (breedingTracker.isResearched(beeMutation)) {
-                float mutationBoost = chance * (Config.researchMutationBoostMultiplier - 1.0f);
+                float mutationBoost = safeMultiply(chance, Config.researchMutationBoostMultiplier - 1.0f);
                 mutationBoost = Math.min(Config.maxResearchMutationBoostPercent, mutationBoost);
-                chance += mutationBoost;
+                chance = safeAdd(chance, mutationBoost);
             }
 
             if (chance > world.rand.nextFloat() * 100) {

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

@@ -8,6 +8,8 @@
  ******************************************************************************/
 package forestry.apiculture.genetics;
 
+import static forestry.core.utils.MathUtil.safeMultiply;
+
 import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.World;
 
@@ -49,8 +51,8 @@ public class BeeMutation extends Mutation implements IBeeMutationCustom {
         IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
         IBeeModifier beeModeModifier = BeeManager.beeRoot.getBeekeepingMode(world).getBeeModifier();
 
-        processedChance *= beeHousingModifier.getMutationModifier(genome0, genome1, processedChance);
-        processedChance *= beeModeModifier.getMutationModifier(genome0, genome1, processedChance);
+        processedChance = safeMultiply(processedChance, beeHousingModifier.getMutationModifier(genome0, genome1, 1.0F));
+        processedChance = safeMultiply(processedChance, beeModeModifier.getMutationModifier(genome0, genome1, 1.0F));
 
         return processedChance;
     }

src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java

@@ -21,7 +21,7 @@ import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.genetics.IEffectData;
-import forestry.apiculture.blocks.BlockAlveary;
+import forestry.apiculture.multiblock.AlvearyController;
 import forestry.core.utils.DamageSourceForestry;
 import forestry.core.utils.vect.Vect;
 
@@ -36,8 +36,13 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
     @Override
     public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
         harmEntities(genome, housing);
+        if (isMobGriefingEnabled(housing)) destroyEnvironment(genome, housing);
 
-        return destroyEnvironment(genome, storedData, housing);
+        return storedData;
+    }
+
+    private boolean isMobGriefingEnabled(IBeeHousing housing) {
+        return housing.getWorld().getGameRules().getGameRuleBooleanValue("mobGriefing");
     }
 
     private void harmEntities(IBeeGenome genome, IBeeHousing housing) {
@@ -56,7 +61,7 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
         }
     }
 
-    private static IEffectData destroyEnvironment(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+    private static void destroyEnvironment(IBeeGenome genome, IBeeHousing housing) {
         World world = housing.getWorld();
         Random rand = world.rand;
 
@@ -65,43 +70,69 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
         Vect offset = area.multiply(-1 / 2.0f);
         Vect posHousing = new Vect(housing.getCoordinates());
 
+        boolean isAlveary = housing instanceof AlvearyController;
+
         for (int i = 0; i < 20; i++) {
             Vect randomPos = Vect.getRandomPositionInArea(rand, area);
-            Vect posBlock = randomPos.add(posHousing);
-            posBlock = posBlock.add(offset);
+            Vect posBlock = randomPos.add(posHousing).add(offset);
 
-            if (posBlock.y <= 1 || posBlock.y >= housing.getWorld().getActualHeight()) {
+            // Don't destroy blocks in the protected 3x3x4 area if housing is an Alveary.
+            // Stops the bee destroying itself. Silly behaviour.
+            if (isInAlvearyProtectedArea(posHousing, posBlock)) {
                 continue;
             }
 
-            // Don't destroy ourselves or blocks below us.
-            if (posBlock.x == posHousing.x && posBlock.z == posHousing.z && posBlock.y <= posHousing.y) {
-                continue;
-            }
-
-            if (world.isAirBlock(posBlock.x, posBlock.y, posBlock.z)) {
-                continue;
+            // Don't destroy the block directly below the bee.
+            if (isAlveary) {
+                if (posBlock.y == posHousing.y - 3) {
+                    continue;
+                }
+            } else {
+                if (posBlock.y == posHousing.y - 1) {
+                    continue;
+                }
             }
 
             Block block = world.getBlock(posBlock.x, posBlock.y, posBlock.z);
 
-            if (block instanceof BlockAlveary) {
-                continue;
-            }
-
+            // Never delete a tile entity. Allows far too much griefing and abuse otherwise.
             TileEntity tile = world.getTileEntity(posBlock.x, posBlock.y, posBlock.z);
-            if (tile instanceof IBeeHousing) {
+            if (tile != null) {
                 continue;
             }
 
+            // Don't let us delete blocks that are not supposed to be breakable by players.
             if (block.getBlockHardness(world, posBlock.x, posBlock.y, posBlock.z) < 0) {
                 continue;
             }
 
+            // Some mods might use this logic? Idk, just a safety check. Might stop griefing.
+            if (!world.canMineBlock(
+                    housing.getWorld().func_152378_a(housing.getOwner().getId()),
+                    posHousing.x,
+                    posHousing.y,
+                    posHousing.z)) {
+                continue;
+            }
+
             world.setBlockToAir(posBlock.x, posBlock.y, posBlock.z);
             break;
         }
+    }
 
-        return storedData;
+    private static boolean isInAlvearyProtectedArea(Vect posHousing, Vect posBlock) {
+        // Alveary protection area is a 3x3x4 area centered on the top middle, down one block.
+        int startX = posHousing.x - 1;
+        int endX = posHousing.x + 1;
+        int startZ = posHousing.z - 1;
+        int endZ = posHousing.z + 1;
+        int startY = posHousing.y - 2;
+        int endY = posHousing.y + 1;
+
+        return posBlock.x >= startX && posBlock.x <= endX
+                && posBlock.z >= startZ
+                && posBlock.z <= endZ
+                && posBlock.y >= startY
+                && posBlock.y <= endY;
     }
 }

src/main/java/forestry/core/genetics/mutations/Mutation.java

@@ -8,6 +8,8 @@
  ******************************************************************************/
 package forestry.core.genetics.mutations;
 
+import static forestry.core.utils.MathUtil.safeMultiply;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -126,7 +128,9 @@ public abstract class Mutation implements IMutationCustom {
             IGenome genome1, IClimateProvider climate) {
         float mutationChance = chance;
         for (IMutationCondition mutationCondition : mutationConditions) {
-            mutationChance *= mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1, climate);
+            mutationChance = safeMultiply(
+                    mutationChance,
+                    mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1, climate));
             if (mutationChance == 0) {
                 return 0;
             }

src/main/java/forestry/core/utils/MathUtil.java

@@ -0,0 +1,30 @@
+package forestry.core.utils;
+
+import java.math.BigDecimal;
+
+public class MathUtil {
+
+    private static final BigDecimal MAX_FLOAT = BigDecimal.valueOf(Float.MAX_VALUE);
+    private static final BigDecimal MIN_FLOAT = BigDecimal.valueOf(-Float.MAX_VALUE);
+
+    private static float clampToFloatRange(BigDecimal result) {
+        if (result.compareTo(MAX_FLOAT) > 0) {
+            return Float.MAX_VALUE;
+        } else if (result.compareTo(MIN_FLOAT) < 0) {
+            return -Float.MAX_VALUE;
+        }
+        return result.floatValue();
+    }
+
+    public static float safeMultiply(float a, float b) {
+        BigDecimal bigA = BigDecimal.valueOf(a);
+        BigDecimal bigB = BigDecimal.valueOf(b);
+        return clampToFloatRange(bigA.multiply(bigB));
+    }
+
+    public static float safeAdd(float a, float b) {
+        BigDecimal bigA = BigDecimal.valueOf(a);
+        BigDecimal bigB = BigDecimal.valueOf(b);
+        return clampToFloatRange(bigA.add(bigB));
+    }
+}

src/main/java/forestry/core/utils/vect/Vect.java

@@ -73,9 +73,9 @@ public class Vect implements IVect {
     }
 
     public static Vect getRandomPositionInArea(Random random, IVect area) {
-        int x = random.nextInt(area.getX());
-        int y = random.nextInt(area.getY());
-        int z = random.nextInt(area.getZ());
+        int x = random.nextInt(area.getX() + 1);
+        int y = random.nextInt(area.getY() + 1);
+        int z = random.nextInt(area.getZ() + 1);
         return new Vect(x, y, z);
     }