From 5fbb67e26fb40ae7006c38ad6963a823ea0f1459 Mon Sep 17 00:00:00 2001
From: Jason Mitchell <mitchej+github@gmail.com>
Date: Mon, 14 Oct 2024 18:17:32 -0700
Subject: [PATCH] New mixins 0.8.7, mixinextras 0.4.1, and ASM 9.7.1 (#30)

* UniMix -> 0.15.0+mixin.0.8.7
MixinExtras -> 0.4.0

* maybe fix 1.8+

* GTNHMixins fix

* specify jdk

* rm

* mixin 0.15.3+mixin.0.8.7 and asm 9.7.1

* mixin extras 0.4.1
---
 .../legacymoddingmc/unimixins/compat/CompatCore.java | 10 ++++++++--
 module-gtnhmixins/build.gradle                       |  2 +-
 .../gtnewhorizon/gtnhmixins/core/GTNHMixinsCore.java |  4 ++--
 .../mixins/LateMixinOrchestrationMixin.java          |  4 ++--
 module-mixin/gradle.properties                       | 12 ++++++------
 module-mixinextras/gradle.properties                 |  2 +-
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java
index 0acd3f2..356cfe4 100644
--- a/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java
+++ b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java
@@ -95,10 +95,16 @@ public DummyTransformer() {
          * case. We add an extra check here, in a method that gets called right before that log message.</p>
          */
         private static void setFmlLoggerToVerbose() {
-            Logger fmlLog = FMLRelaunchLog.log.getLogger();
-            if (!(fmlLog instanceof org.apache.logging.log4j.core.Logger)) {
+            Logger fmlLog;
+            try {
+                fmlLog = FMLRelaunchLog.log.getLogger();
+                if (!(fmlLog instanceof org.apache.logging.log4j.core.Logger)) {
+                    return;
+                }
+            } catch (NoClassDefFoundError e) {
                 return;
             }
+
             org.apache.logging.log4j.core.Logger fmlCoreLog = (org.apache.logging.log4j.core.Logger)fmlLog;
 
             if(fmlCoreLog.getLevel() != Level.ALL) {
diff --git a/module-gtnhmixins/build.gradle b/module-gtnhmixins/build.gradle
index ab9244d..0e35600 100644
--- a/module-gtnhmixins/build.gradle
+++ b/module-gtnhmixins/build.gradle
@@ -3,7 +3,7 @@ def mixinExtrasVersion = "0.1.1"
 configurations.create("shadowMixinExtras")
 
 dependencies {
-	compileOnly('org.spongepowered:mixin:0.8.5')
+	compileOnly('org.spongepowered:mixin:0.8.7')
 	shadow(project(":module-common")) {
 		transitive = false
 	}
diff --git a/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/core/GTNHMixinsCore.java b/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/core/GTNHMixinsCore.java
index 96a217d..fbef459 100644
--- a/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/core/GTNHMixinsCore.java
+++ b/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/core/GTNHMixinsCore.java
@@ -95,7 +95,7 @@ private Set<String> getLoadedCoremods(List<?> coremodList) {
     public void injectData(Map<String, Object> data) {
         LOGGER.info("Examining core mod list");
         final Object coremodList = data.get("coremodList");
-        
+
         if (coremodList instanceof List) {
             final Set<String> loadedCoremods = getLoadedCoremods((List<?>) coremodList);
 
@@ -107,7 +107,7 @@ public void injectData(Map<String, Object> data) {
                     if (theMod instanceof IEarlyMixinLoader) {
                         final IEarlyMixinLoader loader = (IEarlyMixinLoader)theMod;
                         final String mixinConfig = loader.getMixinConfig();
-                        final Config config = Config.create(mixinConfig);
+                        final Config config = Config.create(mixinConfig, null);
                         final List<String> mixins = loader.getMixins(loadedCoremods);
                         for(String mixin : mixins) {
                             LOGGER.info("Loading [{}] {}", mixinConfig, mixin);
diff --git a/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/mixins/LateMixinOrchestrationMixin.java b/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/mixins/LateMixinOrchestrationMixin.java
index f275e15..511c94f 100644
--- a/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/mixins/LateMixinOrchestrationMixin.java
+++ b/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/mixins/LateMixinOrchestrationMixin.java
@@ -71,7 +71,7 @@ private void beforeConstructing(Object[] eventData, CallbackInfo ci) throws Thro
             final String mixinConfig = lateLoader.getMixinConfig();
             GTNHMixins.LOGGER.info("Adding {} mixin configuration.", mixinConfig);
 
-            final Config config = Config.create(mixinConfig);
+            final Config config = Config.create(mixinConfig, null);
             final List<String> mixins = lateLoader.getMixins(loadedMods);
             for(String mixin : mixins) {
                 GTNHMixins.LOGGER.info("Loading [{}] {}", mixinConfig, mixin);
@@ -125,4 +125,4 @@ private static Set<String> getLiteLoaderMods() {
         }
         return mods;
     }
-}
\ No newline at end of file
+}
diff --git a/module-mixin/gradle.properties b/module-mixin/gradle.properties
index 5a79a24..fc630af 100644
--- a/module-mixin/gradle.properties
+++ b/module-mixin/gradle.properties
@@ -1,7 +1,7 @@
-fabricMixinVersion=0.13.1+mixin.0.8.5
-unimixMixinVersion=0.13.0+mixin.0.8.5
-spongepoweredMixinVersion=0.8.5
-gtnhMixinVersion=0.8.5-GTNH-2
-gasmixMixinVersion=0.8.5-gasstation_7
+fabricMixinVersion=0.15.3+mixin.0.8.7
+unimixMixinVersion=0.15.3+mixin.0.8.7
+spongepoweredMixinVersion=0.8.7
+gtnhMixinVersion=0.8.7-GTNH-2
+gasmixMixinVersion=0.8.7-gasstation_7
 
-asmVersion=9.6
+asmVersion=9.7.1
diff --git a/module-mixinextras/gradle.properties b/module-mixinextras/gradle.properties
index 6a9a4f0..6829a87 100644
--- a/module-mixinextras/gradle.properties
+++ b/module-mixinextras/gradle.properties
@@ -1 +1 @@
-mixinExtrasVersion=0.3.5
+mixinExtrasVersion=0.4.1