Pre-launch entrypoint once again

Moved outside a mixin plugin so that mixins can apply correctly to mc classes that get referenced from pre-launch entrypoints.
Sinytra · Oct 22, 2023 · 83da997 · 83da997
1 parent 67d0e22
commit 83da997
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 36 deletions.
diff --git a/src/main/java/dev/su5ed/sinytra/connector/service/ConnectorLoaderService.java b/src/main/java/dev/su5ed/sinytra/connector/service/ConnectorLoaderService.java
@@ -8,6 +8,7 @@
 import cpw.mods.modlauncher.api.ITransformer;
 import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
 import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader;
+import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.LoadingModList;
 import net.minecraftforge.fml.unsafe.UnsafeHacks;
 
@@ -26,7 +27,17 @@ public String name() {
     }
 
     @Override
-    public void initialize(IEnvironment environment) {}
+    public void initialize(IEnvironment environment) {
+        Runnable original = FMLLoader.progressWindowTick;
+        FMLLoader.progressWindowTick = () -> {
+            ConnectorEarlyLoader.setup();
+            FabricMixinBootstrap.init();
+            FabricASMFixer.injectMinecraftModuleReader();
+
+            FMLLoader.progressWindowTick = original;
+            original.run();
+        };
+    }
 
     @SuppressWarnings("unchecked")
     @Override

diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/ConnectorBootstrap.java b/src/mod/java/dev/su5ed/sinytra/connector/mod/ConnectorBootstrap.java
diff --git a/src/mod/resources/connectormod.mixins.json b/src/mod/resources/connectormod.mixins.json
@@ -4,7 +4,6 @@
   "refmap": "mixins.connectormod.refmap.json",
   "package": "dev.su5ed.sinytra.connector.mod.mixin",
   "compatibilityLevel": "JAVA_17",
-  "plugin": "dev.su5ed.sinytra.connector.mod.ConnectorBootstrap",
   "mixins": [
     "AttributeSupplierAccessor",
     "ForgeHooksMixin",