aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/bees
diff options
context:
space:
mode:
authorGlodBlock <60341015+GlodBlock@users.noreply.github.com>2021-09-27 15:39:31 +0800
committerGitHub <noreply@github.com>2021-09-27 15:39:31 +0800
commit097438be70486735a8940dd5ce4e9484b6d951af (patch)
tree90f26b34d5059eb9858d9c82aabbd5373638acfa /src/main/java/gregtech/common/bees
parenta0a77f0b9868a4ca8a3df8ae8d50b4dcfb4030db (diff)
parent92433a5b85bb2fcca541ac25ca4033fac24f841e (diff)
downloadGT5-Unofficial-097438be70486735a8940dd5ce4e9484b6d951af.tar.gz
GT5-Unofficial-097438be70486735a8940dd5ce4e9484b6d951af.tar.bz2
GT5-Unofficial-097438be70486735a8940dd5ce4e9484b6d951af.zip
Merge pull request #1 from GlodBlock/fix-crack-recipe-check
Fix crack recipe check
Diffstat (limited to 'src/main/java/gregtech/common/bees')
-rw-r--r--src/main/java/gregtech/common/bees/GT_AlleleHelper.java1
-rw-r--r--src/main/java/gregtech/common/bees/GT_Bee_Mutation.java9
2 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java
index e1db4c2ac0..4a47bfa46e 100644
--- a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java
+++ b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java
@@ -23,6 +23,7 @@ public class GT_AlleleHelper extends AlleleHelper {
private Map<Class<?>, Map<?, ? extends IAllele>> alleleMaps = new HashMap<>();
+ @Override
public void init() {
if (PluginManager.Module.APICULTURE.isEnabled()) {
createAlleles(EnumAllele.Fertility.class, EnumBeeChromosome.FERTILITY);
diff --git a/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java b/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java
index ca919e7cf2..a4a162ddae 100644
--- a/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java
+++ b/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java
@@ -1,6 +1,7 @@
package gregtech.common.bees;
import forestry.api.apiculture.*;
+import forestry.api.core.IClimateProvider;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IGenome;
import forestry.api.genetics.IMutationCondition;
@@ -37,7 +38,7 @@ public class GT_Bee_Mutation extends BeeMutation {
int y = housingCoordinates != null ? housingCoordinates.posY : 0;
int z = housingCoordinates != null ? housingCoordinates.posZ : 0;
- float processedChance = getBasicChance(world, x, y, z, allele0, allele1, genome0, genome1);
+ float processedChance = getBasicChance(world, x, y, z, allele0, allele1, genome0, genome1, housing);
if (processedChance <= 0f) {
return 0f;
@@ -53,7 +54,7 @@ public class GT_Bee_Mutation extends BeeMutation {
}
@SuppressWarnings("unchecked")
- private float getBasicChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
+ private float getBasicChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
float mutationChance = this.getBaseChance();
List<IMutationCondition> mutationConditions = null;
Field f = FieldUtils.getDeclaredField(Mutation.class, "mutationConditions", true);
@@ -69,11 +70,11 @@ public class GT_Bee_Mutation extends BeeMutation {
if (mutationConditions != null)
for (IMutationCondition mutationCondition : mutationConditions) {
- mutationChance *= mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1);
+ mutationChance *= mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1, climate);
if (mutationChance == 0) {
return 0;
}
}
return mutationChance;
}
-} \ No newline at end of file
+}