update gradle+bs+deps

* Fix double layers tooltip with nei

* Remove wildcard imports

.gitignore

@@ -26,7 +26,13 @@ whitelist.json
 *.iml
 *.ipr
 *.iws
-src/main/resources/mixins.*.json
+src/main/resources/mixins.*([!.]).json
 *.bat
 *.DS_Store
 !gradlew.bat
+.factorypath
+addon.local.gradle
+addon.local.gradle.kts
+addon.late.local.gradle
+addon.late.local.gradle.kts
+layout.json

build.gradle

@@ -1,4 +1,4 @@
-//version: 1696952014
+//version: 1702141377
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -28,27 +28,12 @@ import java.util.concurrent.TimeUnit
 
 buildscript {
     repositories {
-        mavenCentral()
-
-        maven {
-            name 'forge'
-            url 'https://maven.minecraftforge.net'
-        }
         maven {
             // GTNH RetroFuturaGradle and ASM Fork
             name "GTNH Maven"
             url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
             allowInsecureProtocol = true
         }
-        maven {
-            name 'sonatype'
-            url 'https://oss.sonatype.org/content/repositories/snapshots/'
-        }
-        maven {
-            name 'Scala CI dependencies'
-            url 'https://repo1.maven.org/maven2/'
-        }
-
         mavenLocal()
     }
 }
@@ -69,7 +54,7 @@ plugins {
     id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
     id 'com.modrinth.minotaur' version '2.+' apply false
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
-    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.26'
 }
 
 print("You might want to check out './gradlew :faq' if your build fails.\n")
@@ -302,7 +287,7 @@ if (apiPackage) {
 }
 
 if (accessTransformersFile) {
-    for (atFile in accessTransformersFile.split(",")) {
+    for (atFile in accessTransformersFile.split(" ")) {
         String targetFile = "src/main/resources/META-INF/" + atFile.trim()
         if (!getFile(targetFile).exists()) {
             throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
@@ -628,7 +613,7 @@ repositories {
         }
         maven {
             name = "ic2"
-            url = getURL("https://maven.ic2.player.to/", "https://maven2.ic2.player.to/")
+            url = getURL("https://maven2.ic2.player.to/", "https://maven.ic2.player.to/")
             content {
                 includeGroup "net.industrial-craft"
             }
@@ -646,7 +631,7 @@ repositories {
 
 def mixinProviderGroup = "io.github.legacymoddingmc"
 def mixinProviderModule = "unimixins"
-def mixinProviderVersion = "0.1.7.1"
+def mixinProviderVersion = "0.1.13"
 def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
 def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
 ext.mixinProviderSpec = mixinProviderSpec
@@ -687,6 +672,8 @@ configurations.all {
         substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
         substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
         substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier")
+
+        substitute module('org.scala-lang:scala-library:2.11.1') using module('org.scala-lang:scala-library:2.11.5') because('To allow mixing with Java 8 targets')
     }
 }
 
@@ -793,12 +780,12 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
 }
 
 dependencies {
-    def lwjgl3ifyVersion = '1.5.1'
+    def lwjgl3ifyVersion = '1.5.7'
     if (modId != 'lwjgl3ify') {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.7')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
     }
 
     java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
@@ -1187,9 +1174,8 @@ publishing {
             version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
         }
     }
-
     repositories {
-        if (usesMavenPublishing.toBoolean()) {
+        if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) {
             maven {
                 url = mavenPublishUrl
                 allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
@@ -1311,7 +1297,7 @@ def addCurseForgeRelation(String type, String name) {
 
 // Updating
 
-def buildscriptGradleVersion = "8.2.1"
+def buildscriptGradleVersion = "8.5"
 
 tasks.named('wrapper', Wrapper).configure {
     gradleVersion = buildscriptGradleVersion

dependencies.gradle

@@ -1,11 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-	api('com.github.GTNewHorizons:ForestryMC:4.6.14:dev')
+	api('com.github.GTNewHorizons:ForestryMC:4.7.0:dev')
 	implementation('com.github.GTNewHorizons:GTNHLib:0.0.13:dev')
 
-	devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.4.3-GTNH:dev')
+	devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev')
 
-	compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.36:api')
+	compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.37:api')
 	compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
+	compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

src/main/java/binnie/botany/genetics/EnumFlowerColor.java

@@ -92,6 +92,7 @@ public enum EnumFlowerColor implements IFlowerColor {
     YELLOW("yellow", 0xffff00),
     YELLOW_GREEN("yellowGreen", 0x9acd32);
 
+    private static final EnumFlowerColor[] ALL_VALUES = values();
     private int color;
     private int colorDis;
     private String name;
@@ -2963,7 +2964,7 @@ public enum EnumFlowerColor implements IFlowerColor {
     }
 
     public static EnumFlowerColor get(int i) {
-        return values()[Math.max(0, i) % values().length];
+        return ALL_VALUES[Math.max(0, i) % ALL_VALUES.length];
     }
 
     @Override

src/main/java/binnie/core/Mods.java

@@ -12,6 +12,7 @@ public class Mods {
     public static Mod forestry;
     public static Mod ic2;
     public static Mod botania;
+    public static Mod extraBiomes;
 
     private static Item findItem(String modId, String name) {
         Item stack = GameRegistry.findItem(modId, name);
@@ -41,6 +42,7 @@ public class Mods {
         Mods.forestry = new Mod("Forestry");
         Mods.ic2 = new Mod("IC2");
         Mods.botania = new Mod("Botania");
+        Mods.extraBiomes = new Mod("ExtrabiomesXL");
     }
 
     public static class Mod {

src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java

@@ -119,10 +119,10 @@ public class GuiCraftGUI extends GuiContainer {
             window.getTooltip(tooltip);
         }
 
-        NEIHook.renderToolTips(mouseX, mouseY);
-
         if (tooltip.exists()) {
             renderTooltip(new IPoint(mouseX, mouseY), tooltip);
+        } else {
+            NEIHook.renderToolTips(mouseX, mouseY);
         }
         zLevel = 0.0f;
         GL11.glEnable(GL11.GL_LIGHTING);

src/main/java/binnie/core/craftgui/minecraft/Window.java

@@ -29,6 +29,7 @@ import binnie.core.craftgui.minecraft.control.ControlHelp;
 import binnie.core.craftgui.minecraft.control.ControlInfo;
 import binnie.core.craftgui.minecraft.control.ControlPowerSystem;
 import binnie.core.craftgui.minecraft.control.ControlSlot;
+import binnie.core.craftgui.minecraft.control.ControlSlotBase;
 import binnie.core.craftgui.minecraft.control.ControlUser;
 import binnie.core.craftgui.minecraft.control.EnumHighlighting;
 import binnie.core.craftgui.renderer.Renderer;
@@ -40,6 +41,7 @@ import binnie.core.machines.Machine;
 import binnie.core.machines.inventory.IInventoryMachine;
 import binnie.core.machines.network.INetwork;
 import binnie.core.machines.power.PowerSystem;
+import binnie.core.nei.NEIHook;
 import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.resource.BinnieResource;
 import binnie.core.resource.ResourceType;
@@ -118,6 +120,9 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG
                 if (!widget.calculateIsMouseOver()) {
                     continue;
                 }
+                if (NEIHook.enabled && widget instanceof ControlSlotBase) {
+                    return;
+                }
                 if (widget instanceof ITooltip) {
                     ((ITooltip) widget).getTooltip(tooltip);
                     if (tooltip.exists()) {

src/main/java/binnie/extratrees/block/PlankType.java

@@ -8,13 +8,12 @@ import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import com.google.common.base.Optional;
-
 import binnie.core.Mods;
 import binnie.core.block.TileEntityMetadata;
 import binnie.core.util.I18N;
 import binnie.extratrees.ExtraTrees;
 import binnie.extratrees.api.CarpentryManager;
+import extrabiomes.api.Stuff;
 
 public class PlankType {
 
@@ -267,13 +266,10 @@ public class PlankType {
 
         @Override
         public ItemStack getStack() {
-            try {
-                Class clss = Class.forName("extrabiomes.api.Stuff");
-                Block block = (Block) ((Optional) clss.getField("planks").get(null)).get();
-                return new ItemStack(block, 1, ordinal());
-            } catch (Exception e) {
+            if (!Mods.extraBiomes.active()) {
                 return null;
             }
+            return Stuff.planks.transform(block -> new ItemStack(block, 1, ordinal())).orNull();
         }
 
         @Override

src/main/java/binnie/extratrees/block/WoodManager.java

@@ -8,6 +8,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
+import binnie.core.Mods;
 import binnie.core.block.TileEntityMetadata;
 import binnie.extratrees.ExtraTrees;
 import binnie.extratrees.api.CarpentryManager;
@@ -17,6 +18,8 @@ import binnie.extratrees.block.decor.FenceType;
 
 public class WoodManager {
 
+    private static List<IPlankType> allPlankTypes;
+
     public static IPlankType getPlankType(int index) {
         IDesignMaterial wood = CarpentryManager.carpentryInterface.getWoodMaterial(index);
         if (wood instanceof IPlankType) {
@@ -97,16 +100,18 @@ public class WoodManager {
     }
 
     public static List<IPlankType> getAllPlankTypes() {
+        if (allPlankTypes != null) {
+            return allPlankTypes;
+        }
+
         List<IPlankType> list = new ArrayList<>();
         Collections.addAll(list, PlankType.ExtraTreePlanks.values());
         Collections.addAll(list, PlankType.ForestryPlanks.values());
-        for (IPlankType type : PlankType.ExtraBiomesPlank.values()) {
-            if (type.getStack() != null) {
-                list.add(type);
-            }
+        if (Mods.extraBiomes.active()) {
+            Collections.addAll(list, PlankType.ExtraBiomesPlank.values());
         }
-
         Collections.addAll(list, PlankType.VanillaPlanks.values());
+        allPlankTypes = list;
         return list;
     }