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.5:dev')
-	implementation('com.github.GTNewHorizons:GTNHLib:0.6.18: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.34-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")
 }

gradle.properties

@@ -14,7 +14,7 @@ modId = BinnieCore
 modGroup = binnie
 
 # Whether to use modGroup as the maven publishing group.
-# When false, com.github.GTNewHorizons is used.
+# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -205,7 +206,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

settings.gradle

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
+    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/extratrees/genetics/ExtraTreeFruitGene.java

@@ -376,7 +376,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
 
         float modeYieldMod = 1.0f;
         for (Map.Entry<ItemStack, Float> entry2 : products.entrySet()) {
-            if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry2.getValue() * 5.0f * stage) {
+            if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry2.getValue() * stage) {
                 product2.add(entry2.getKey().copy());
             }
         }

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);