Fix launching under forge using PREINIT mixin for ClientBrandRetriever

Mumfrey
1 parent 6c1c673a
Showing 4 changed files with 48 additions and 1 deletions
src/client/java/com/mumfrey/liteloader/client/api/LiteLoaderCoreAPIClient.java
src/client/resources/mixins.liteloader.client.json
src/client/resources/mixins.liteloader.client.preinit.json
src/main/java/com/mumfrey/liteloader/launch/LiteLoaderTweaker.java
@@ -47,6 +47,7 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
  
     private static final String[] clientMixinConfigs = new String[] {
             "mixins.liteloader.client.json",
+            "mixins.liteloader.client.preinit.json",
             "mixins.liteloader.client.optional.json",
     };
  
@@ -24,7 +24,6 @@
         "MixinGuiTextField",
         "MixinIntIdentityHashBiMap",
         "MixinGuiOverlayDebug",
-        "MixinClientBrandRetriever",
         "IGuiButton",
         "IKeyBinding"
     ],
+{
+    "required": true,
+    "minVersion": "0.7.4",
+    "compatibilityLevel": "JAVA_8",
+    "target": "@env(PREINIT)",
+    "package": "com.mumfrey.liteloader.client.mixin",
+    "refmap": "mixins.liteloader.client.refmap.json",
+    "mixins": [
+        "MixinClientBrandRetriever"
+    ],
+    "injectors": {
+        "defaultRequire": 1
+    }
+}
 \ No newline at end of file
@@ -44,6 +44,37 @@ public class LiteLoaderTweaker implements ITweaker
  
     protected static final String BOOTSTRAP_CLASS = "com.mumfrey.liteloader.core.LiteLoaderBootstrap";
     private static final String CLIENT_API = "com.mumfrey.liteloader.client.api.LiteLoaderCoreAPIClient";
+    
+    public static class PreInitTweaker implements ITweaker
+    {
+        public PreInitTweaker()
+        {
+            MixinService.getService().beginPhase();
+        }
+        
+        @Override
+        public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile)
+        {
+        }
+
+        @Override
+        public void injectIntoClassLoader(LaunchClassLoader classLoader)
+        {
+        }
+
+        @Override
+        public String getLaunchTarget()
+        {
+            return "";
+        }
+
+        @Override
+        public String[] getLaunchArguments()
+        {
+            return new String[0];
+        }
+        
+    }
  
     /**
      * Loader startup state
@@ -272,6 +303,8 @@ public class LiteLoaderTweaker implements ITweaker
             LiteLoaderLogger.info("Queuing required class transformer '%s'", transformerClassName);
             this.transformerManager.injectTransformer(transformerClassName);
         }
+        
+        LiteLoaderTweaker.injectTweakClass("com.mumfrey.liteloader.launch.LiteLoaderTweaker$PreInitTweaker");
     }
  
     /* (non-Javadoc)