Fix compat for the original battlegear 2 (#1992)

* Fix compat for the original battlegear 2

* oops

glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLDebug.java

@@ -572,6 +572,15 @@ public final class GLDebug {
         }
     }
 
+    /**
+     * Overload that lets you gate the String concat behind the debugState
+     */
+    public static void pushGroup(String prefix, int value) {
+        if (debugState != null && Thread.currentThread() == GLStateManager.getMainThread()) {
+            debugState.pushGroup(prefix + value);
+        }
+    }
+
     public static void pushGroup(String group) {
         if (debugState != null && Thread.currentThread() == GLStateManager.getMainThread()) {
             debugState.pushGroup(group);

glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java

@@ -3329,7 +3329,7 @@ public class GLStateManager {
     }
 
     public static void glCallList(int list) {
-        GLDebug.pushGroup("glCallList " + list);
+        GLDebug.pushGroup("glCallList ", list);
         try {
             DisplayListManager.glCallList(list);
         } finally {

gradle/gradle-daemon-jvm.properties

@@ -1,12 +1,12 @@
 #This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e1118b4c7c2858d28154d086dbff010e/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/59a9771cad43219260d9aac9a8ec4d6a/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a4c09dd2e2d7079373d30e524bbc2829/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/97d46b5ff4df0bf61e95652a190a5567/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/9ef54a08e06b0754cee9fc95ed3a3134/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/97d46b5ff4df0bf61e95652a190a5567/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/9ef54a08e06b0754cee9fc95ed3a3134/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1df82b76031285ef2e6a4f59ffe9299d/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/c7d5be6a02945ac2e045048ee54a7d32/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/97d46b5ff4df0bf61e95652a190a5567/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/9ef54a08e06b0754cee9fc95ed3a3134/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/643f404f769811f5f265fd66f7af5d89/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/38256085a73e137cb4937ea9c4807fec/redirect
 toolchainVersion=25

lwjgl3-backend/build.gradle.kts

@@ -60,7 +60,7 @@ repositories {
 dependencies {
     api(project(":glsm"))
 
-    compileOnly("com.github.GTNewHorizons:lwjgl3ify:3.0.15:dev") { isTransitive = false }
+    compileOnly("com.github.GTNewHorizons:lwjgl3ify:3.0.31:dev") { isTransitive = false }
     compileOnly("org.embeddedt.celeritas:celeritas-common:2.5.8-GTNH") { isTransitive = false }
 
     val osName = System.getProperty("os.name").lowercase()

settings.gradle.kts

@@ -16,7 +16,7 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gtnewhorizons.gtnhsettingsconvention") version ("2.0.26")
+    id("com.gtnewhorizons.gtnhsettingsconvention") version ("2.0.27")
 }
 
 include("glsm")

src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java

@@ -46,7 +46,6 @@ public class ModStatus {
         isChunkAPILoaded = Loader.isModLoaded("chunkapi");
         isXaerosMinimapLoaded = Loader.isModLoaded("XaeroMinimap");
         isHoloInventoryLoaded = Loader.isModLoaded("holoinventory");
-        isBattlegearLoaded = Loader.isModLoaded("battlegear2");
         isThaumcraftLoaded = Loader.isModLoaded("Thaumcraft");
         isThaumicHorizonsLoaded = Loader.isModLoaded("ThaumicHorizons");
         isBaublesLoaded = Loader.isModLoaded("Baubles");
@@ -58,12 +57,16 @@ public class ModStatus {
         isHoloInventoryLoaded = Loader.isModLoaded("holoinventory");
         isBOPLoaded = Loader.isModLoaded("BiomesOPlenty");
 
-        // remove compat with original release of BG2
-        if (isBattlegearLoaded){
-            isBattlegearLoaded = new DefaultArtifactVersion("1.2.0")
-                .compareTo(
-                    LoadControllerHelper.getOwningMod(Battlegear.class).getProcessedVersion()
-                ) <= 0;
+        // Angelica's compat relies on GTNH extensions, so this should only be true for NH Battlegear2, 1.2.0+
+        if (Loader.isModLoaded("battlegear2")) {
+            // Don't ask me why battlegear2 reports as 1.7.10, I don't know
+            final var OG_BG2_VER = new DefaultArtifactVersion("1.7.10");
+            final var NH_BG2_VER = new DefaultArtifactVersion("1.2.0");
+
+            @SuppressWarnings("DataFlowIssue")
+            var battlegearVersion = LoadControllerHelper.getOwningMod(Battlegear.class).getProcessedVersion();
+            // We can be sure the NH version will never be 1.7.10, because that garbage got archived.
+            isBattlegearLoaded = battlegearVersion.compareTo(OG_BG2_VER) != 0 && battlegearVersion.compareTo(NH_BG2_VER) >= 0;
         }
 
         isNEIDMetadataExtended = false;

src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java

@@ -620,8 +620,7 @@ public class DynamicLights {
                     if (offhand != null) {
                         luminance = Math.max(luminance, getLuminanceFromItemStack(offhand));
                     }
-                }
-                else if (ModStatus.isBackhandLoaded){
+                } else if (ModStatus.isBackhandLoaded){
                     final ItemStack offhand = BackhandReflectionCompat.getOffhandItem(player);
                     if (offhand != null) {
                         luminance = Math.max(luminance, getLuminanceFromItemStack(offhand));