From ef0de4c86ca1d109f736e8851f84fcdd2011c4f3 Mon Sep 17 00:00:00 2001 From: Astatine Date: Sat, 28 Dec 2024 20:46:54 +0900 Subject: [PATCH] Isolator crash fix --- .../isolator/IsolatorComponentLogic.java | 29 +++++-------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java index 532b7f3c..3d24d9be 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java @@ -4,9 +4,6 @@ import java.util.Random; import net.minecraft.item.ItemStack; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import binnie.core.genetics.Gene; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IChargedSlots; @@ -23,8 +20,6 @@ import forestry.api.genetics.ISpeciesRoot; public class IsolatorComponentLogic extends ComponentProcessSetCost implements IProcess { - private static final Logger LOG = LogManager.getLogger("Genetics"); - protected float enzymePerProcess = 0.5f; protected float ethanolPerProcess = 10.0f; @@ -83,22 +78,14 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I } final IChromosomeType[] karyo = root.getKaryotype(); - final IChromosomeType chromosome = karyo[rand.nextInt(karyo.length)]; - final IAllele allele; - try { - allele = rand.nextBoolean() ? individual.getGenome().getActiveAllele(chromosome) - : individual.getGenome().getInactiveAllele(chromosome); - } catch (NullPointerException npe) { - // just return and eat the power without eating the rest of it - LOG.warn( - "NPE occurred on unknown gene: name: " + chromosome.getName() - + " | ordinal: " - + chromosome.ordinal() - + " | is null? " - + (individual.getGenome().getChromosomes()[chromosome.ordinal()] == null ? "true" - : "false")); - return; - } + + IChromosomeType chromosome; + do { + chromosome = karyo[rand.nextInt(karyo.length)]; + } while (individual.getGenome().getChromosomes()[chromosome.ordinal()] == null); + + final IAllele allele = rand.nextBoolean() ? individual.getGenome().getActiveAllele(chromosome) + : individual.getGenome().getInactiveAllele(chromosome); final Gene gene = new Gene(allele, chromosome, root); ItemStack serum = ItemSequence.create(gene);