From b61cf685e4416e3d097af2e55c6be3d0c5b2d058 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:52:49 +0100 Subject: [PATCH] spotlessApply (#77) Co-authored-by: GitHub GTNH Actions <> --- src/main/java/forestry/apiculture/genetics/Bee.java | 6 +++--- .../forestry/apiculture/genetics/BeeMutation.java | 12 ++++++++---- .../forestry/core/genetics/mutations/Mutation.java | 8 +++++--- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index fdfb6b1f0..917993472 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/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; @@ -67,9 +70,6 @@ import forestry.core.utils.Log; import forestry.core.utils.StringUtil; import forestry.core.utils.vect.Vect; -import static forestry.core.utils.MathUtil.safeAdd; -import static forestry.core.utils.MathUtil.safeMultiply; - public class Bee extends IndividualLiving implements IBee { private int generation; diff --git a/src/main/java/forestry/apiculture/genetics/BeeMutation.java b/src/main/java/forestry/apiculture/genetics/BeeMutation.java index a7856cba1..97e381d59 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeMutation.java +++ b/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; @@ -21,8 +23,6 @@ import forestry.api.apiculture.IBeeRoot; import forestry.api.genetics.IAllele; import forestry.core.genetics.mutations.Mutation; -import static forestry.core.utils.MathUtil.safeMultiply; - public class BeeMutation extends Mutation implements IBeeMutationCustom { public BeeMutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance) { @@ -51,8 +51,12 @@ public class BeeMutation extends Mutation implements IBeeMutationCustom { IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); IBeeModifier beeModeModifier = BeeManager.beeRoot.getBeekeepingMode(world).getBeeModifier(); - processedChance = safeMultiply(processedChance, beeHousingModifier.getMutationModifier(genome0, genome1, processedChance)); - processedChance = safeMultiply(processedChance, beeModeModifier.getMutationModifier(genome0, genome1, processedChance)); + processedChance = safeMultiply( + processedChance, + beeHousingModifier.getMutationModifier(genome0, genome1, processedChance)); + processedChance = safeMultiply( + processedChance, + beeModeModifier.getMutationModifier(genome0, genome1, processedChance)); return processedChance; } diff --git a/src/main/java/forestry/core/genetics/mutations/Mutation.java b/src/main/java/forestry/core/genetics/mutations/Mutation.java index a84251578..802cabb32 100644 --- a/src/main/java/forestry/core/genetics/mutations/Mutation.java +++ b/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; @@ -25,8 +27,6 @@ import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; import forestry.api.genetics.IMutationCustom; -import static forestry.core.utils.MathUtil.safeMultiply; - public abstract class Mutation implements IMutationCustom { private final int chance; @@ -128,7 +128,9 @@ public abstract class Mutation implements IMutationCustom { IGenome genome1, IClimateProvider climate) { float mutationChance = chance; for (IMutationCondition mutationCondition : mutationConditions) { - mutationChance = safeMultiply(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; }