Merge remote-tracking branch 'Astatine5985/master' into dev

# Conflicts:
#	dependencies.gradle

dependencies.gradle

@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-	api('com.github.GTNewHorizons:ForestryMC:4.10.1:dev')
-	implementation('com.github.GTNewHorizons:GTNHLib:0.6.2:dev')
+	api('com.github.GTNewHorizons:ForestryMC:4.10.0:dev')
+	implementation('com.github.GTNewHorizons:GTNHLib:0.6.0:dev')
 
-	devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.20-GTNH:dev')
+	devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.8-GTNH:dev')
 
-	compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api')
+	compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
 	compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
 	compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

settings.gradle

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.31'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
 }

src/main/java/binnie/extrabees/ExtraBees.java

@@ -33,7 +33,8 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
         name = ExtraBees.EB_MOD_NAME,
         version = Tags.VERSION,
         useMetadata = true,
-        dependencies = "after:BinnieCore")
+        dependencies = "after:BinnieCore",
+        guiFactory = "binnie.extrabees.config.EBConfigGUIFactory")
 public class ExtraBees extends AbstractMod {
 
     public static final String EB_MODID = "ExtraBees";

src/main/java/binnie/extrabees/config/EBConfigGUI.java

@@ -0,0 +1,16 @@
+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);
+    }
+}

src/main/java/binnie/extrabees/config/EBConfigGUIFactory.java

@@ -0,0 +1,13 @@
+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;
+    }
+}

src/main/java/binnie/extratrees/ExtraTrees.java

@@ -41,7 +41,8 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
         name = EB_MOD_NAME,
         version = Tags.VERSION,
         useMetadata = true,
-        dependencies = "after:BinnieCore")
+        dependencies = "after:BinnieCore",
+        guiFactory = "binnie.extratrees.config.ETConfigGUIFactory")
 public class ExtraTrees extends AbstractMod {
 
     public static final String ET_MODID = "ExtraTrees";

src/main/java/binnie/extratrees/config/ETConfigGUI.java

@@ -0,0 +1,16 @@
+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);
+    }
+}

src/main/java/binnie/extratrees/config/ETConfigGUIFactory.java

@@ -0,0 +1,13 @@
+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;
+    }
+}

src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java

@@ -1,7 +1,5 @@
 package binnie.genetics.machine.isolator;
 
-import java.util.Arrays;
-import java.util.Objects;
 import java.util.Random;
 
 import net.minecraft.item.ItemStack;
@@ -17,7 +15,6 @@ 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;
@@ -83,15 +80,10 @@ 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 (chromosomes[chromosome.ordinal()] == null);
+        } while (individual.getGenome().getChromosomes()[chromosome.ordinal()] == null);
 
         final IAllele allele = rand.nextBoolean() ? individual.getGenome().getActiveAllele(chromosome)
                 : individual.getGenome().getInactiveAllele(chromosome);