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

# Conflicts:
#	dependencies.gradle

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

@@ -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;
@@ -24,8 +21,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;
 
@@ -84,22 +79,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);