Compare commits

..
2 Commits
Author SHA1 Message Date
Martin Robertz a1f54e7500 update 2025-01-16 21:59:06 +01:00
Astatine5985andMaya 5f1b5daa24 Isolator crash fix revision (#56)
Co-authored-by: Maya <[email protected]>
2025-01-16 16:50:35 +00:00
9 changed files with 16 additions and 68 deletions

No files matched your search

+4 -4
View File
@@ -1,12 +1,12 @@
// Add your dependencies here
dependencies {
api('com.github.GTNewHorizons:ForestryMC:4.10.0:dev')
implementation('com.github.GTNewHorizons:GTNHLib:0.6.0:dev')
api('com.github.GTNewHorizons:ForestryMC:4.10.1:dev')
implementation('com.github.GTNewHorizons:GTNHLib:0.6.2:dev')
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.8-GTNH:dev')
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.20-GTNH:dev')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api')
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
compileOnly("curse.maven:extrabiomesxl-60041:2273301")
}
+1 -1
View File
@@ -17,5 +17,5 @@ pluginManagement {
}
plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.31'
}
@@ -33,8 +33,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
name = ExtraBees.EB_MOD_NAME,
version = Tags.VERSION,
useMetadata = true,
dependencies = "after:BinnieCore",
guiFactory = "binnie.extrabees.config.EBConfigGUIFactory")
dependencies = "after:BinnieCore")
public class ExtraBees extends AbstractMod {
public static final String EB_MODID = "ExtraBees";
@@ -1,16 +0,0 @@
package binnie.extrabees.config;
import static binnie.extrabees.ExtraBees.EB_MODID;
import static binnie.extrabees.ExtraBees.EB_MOD_NAME;
import net.minecraft.client.gui.GuiScreen;
import com.gtnewhorizon.gtnhlib.config.ConfigException;
import com.gtnewhorizon.gtnhlib.config.SimpleGuiConfig;
public class EBConfigGUI extends SimpleGuiConfig {
public EBConfigGUI(GuiScreen parent) throws ConfigException {
super(parent, EB_MODID, EB_MOD_NAME, false, EBConfig.class, EBConfigMachines.class);
}
}
@@ -1,13 +0,0 @@
package binnie.extrabees.config;
import net.minecraft.client.gui.GuiScreen;
import com.gtnewhorizon.gtnhlib.config.SimpleGuiFactory;
public class EBConfigGUIFactory implements SimpleGuiFactory {
@Override
public Class<? extends GuiScreen> mainConfigGuiClass() {
return EBConfigGUI.class;
}
}
@@ -41,8 +41,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
name = EB_MOD_NAME,
version = Tags.VERSION,
useMetadata = true,
dependencies = "after:BinnieCore",
guiFactory = "binnie.extratrees.config.ETConfigGUIFactory")
dependencies = "after:BinnieCore")
public class ExtraTrees extends AbstractMod {
public static final String ET_MODID = "ExtraTrees";
@@ -1,16 +0,0 @@
package binnie.extratrees.config;
import static binnie.extratrees.ExtraTrees.EB_MOD_NAME;
import static binnie.extratrees.ExtraTrees.ET_MODID;
import net.minecraft.client.gui.GuiScreen;
import com.gtnewhorizon.gtnhlib.config.ConfigException;
import com.gtnewhorizon.gtnhlib.config.SimpleGuiConfig;
public class ETConfigGUI extends SimpleGuiConfig {
public ETConfigGUI(GuiScreen parent) throws ConfigException {
super(parent, ETConfig.class, ET_MODID, EB_MOD_NAME);
}
}
@@ -1,13 +0,0 @@
package binnie.extratrees.config;
import net.minecraft.client.gui.GuiScreen;
import com.gtnewhorizon.gtnhlib.config.SimpleGuiFactory;
public class ETConfigGUIFactory implements SimpleGuiFactory {
@Override
public Class<? extends GuiScreen> mainConfigGuiClass() {
return ETConfigGUI.class;
}
}
@@ -1,5 +1,7 @@
package binnie.genetics.machine.isolator;
import java.util.Arrays;
import java.util.Objects;
import java.util.Random;
import net.minecraft.item.ItemStack;
@@ -15,6 +17,7 @@ import binnie.extrabees.config.EBConfigMachines;
import binnie.genetics.item.ItemSequence;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IChromosome;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.ISpeciesRoot;
@@ -80,10 +83,15 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I
final IChromosomeType[] karyo = root.getKaryotype();
final IChromosome[] chromosomes = individual.getGenome().getChromosomes();
if (Arrays.stream(chromosomes).allMatch(Objects::isNull)) {
return;
}
IChromosomeType chromosome;
do {
chromosome = karyo[rand.nextInt(karyo.length)];
} while (individual.getGenome().getChromosomes()[chromosome.ordinal()] == null);
} while (chromosomes[chromosome.ordinal()] == null);
final IAllele allele = rand.nextBoolean() ? individual.getGenome().getActiveAllele(chromosome)
: individual.getGenome().getInactiveAllele(chromosome);