Skip to content

Commit 83da997

Browse files
committed
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.
1 parent 67d0e22 commit 83da997

File tree

3 files changed

+12
-36
lines changed

3 files changed

+12
-36
lines changed

src/main/java/dev/su5ed/sinytra/connector/service/ConnectorLoaderService.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import cpw.mods.modlauncher.api.ITransformer;
99
import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
1010
import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader;
11+
import net.minecraftforge.fml.loading.FMLLoader;
1112
import net.minecraftforge.fml.loading.LoadingModList;
1213
import net.minecraftforge.fml.unsafe.UnsafeHacks;
1314

@@ -26,7 +27,17 @@ public String name() {
2627
}
2728

2829
@Override
29-
public void initialize(IEnvironment environment) {}
30+
public void initialize(IEnvironment environment) {
31+
Runnable original = FMLLoader.progressWindowTick;
32+
FMLLoader.progressWindowTick = () -> {
33+
ConnectorEarlyLoader.setup();
34+
FabricMixinBootstrap.init();
35+
FabricASMFixer.injectMinecraftModuleReader();
36+
37+
FMLLoader.progressWindowTick = original;
38+
original.run();
39+
};
40+
}
3041

3142
@SuppressWarnings("unchecked")
3243
@Override

src/mod/java/dev/su5ed/sinytra/connector/mod/ConnectorBootstrap.java

-34
This file was deleted.

src/mod/resources/connectormod.mixins.json

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"refmap": "mixins.connectormod.refmap.json",
55
"package": "dev.su5ed.sinytra.connector.mod.mixin",
66
"compatibilityLevel": "JAVA_17",
7-
"plugin": "dev.su5ed.sinytra.connector.mod.ConnectorBootstrap",
87
"mixins": [
98
"AttributeSupplierAccessor",
109
"ForgeHooksMixin",

0 commit comments

Comments
 (0)