Skip to content

Commit 6c568fd

Browse files
committed
[entrypoints] invoke common before client/server entrypoint
1 parent e188cf6 commit 6c568fd

4 files changed

Lines changed: 20 additions & 20 deletions

File tree

libraries/entrypoints/entrypoints-mc13w16a-mc1.14.4/src/main/java/net/ornithemc/osl/entrypoints/impl/mixin/client/MainMixin.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ public class MainMixin {
3333
)
3434
)
3535
private static void osl$entrypoints$init(CallbackInfo ci) {
36-
FabricLoader.getInstance().invokeEntrypoints(
37-
ClientModInitializer.ENTRYPOINT_KEY,
38-
ClientModInitializer.class,
39-
ClientModInitializer::initClient
40-
);
4136
FabricLoader.getInstance().invokeEntrypoints(
4237
ModInitializer.ENTRYPOINT_KEY,
4338
ModInitializer.class,
4439
ModInitializer::init
4540
);
41+
FabricLoader.getInstance().invokeEntrypoints(
42+
ClientModInitializer.ENTRYPOINT_KEY,
43+
ClientModInitializer.class,
44+
ClientModInitializer::initClient
45+
);
4646
}
4747

4848
@Inject(

libraries/entrypoints/entrypoints-mc13w16a-mc1.14.4/src/main/java/net/ornithemc/osl/entrypoints/impl/mixin/server/MinecraftServerMixin.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ public class MinecraftServerMixin {
2323
)
2424
)
2525
private static void osl$entrypoints$init(String[] args, CallbackInfo ci) {
26-
FabricLoader.getInstance().invokeEntrypoints(
27-
ServerModInitializer.ENTRYPOINT_KEY,
28-
ServerModInitializer.class,
29-
ServerModInitializer::initServer
30-
);
3126
FabricLoader.getInstance().invokeEntrypoints(
3227
ModInitializer.ENTRYPOINT_KEY,
3328
ModInitializer.class,
3429
ModInitializer::init
3530
);
31+
FabricLoader.getInstance().invokeEntrypoints(
32+
ServerModInitializer.ENTRYPOINT_KEY,
33+
ServerModInitializer.class,
34+
ServerModInitializer::initServer
35+
);
3636

3737
LaunchUtils.triggerLaunchEvents(args);
3838
}

libraries/entrypoints/entrypoints-mcin-20091223-1459-mc1.5.2/src/main/java/net/ornithemc/osl/entrypoints/impl/mixin/client/MinecraftAppletMixin.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ public class MinecraftAppletMixin {
2323
)
2424
)
2525
private void osl$entrypoints$init(CallbackInfo ci) {
26-
FabricLoader.getInstance().invokeEntrypoints(
27-
ClientModInitializer.ENTRYPOINT_KEY,
28-
ClientModInitializer.class,
29-
ClientModInitializer::initClient
30-
);
3126
FabricLoader.getInstance().invokeEntrypoints(
3227
ModInitializer.ENTRYPOINT_KEY,
3328
ModInitializer.class,
3429
ModInitializer::init
3530
);
31+
FabricLoader.getInstance().invokeEntrypoints(
32+
ClientModInitializer.ENTRYPOINT_KEY,
33+
ClientModInitializer.class,
34+
ClientModInitializer::initClient
35+
);
3636

3737
LaunchUtils.triggerLaunchEvents(FabricLoader.getInstance().getLaunchArguments(false));
3838
}

libraries/entrypoints/entrypoints-mcin-20091223-1459-mc1.5.2/src/main/java/net/ornithemc/osl/entrypoints/impl/mixin/server/MinecraftServerMixin.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ public class MinecraftServerMixin {
2323
)
2424
)
2525
private static void osl$entrypoints$init(String[] args, CallbackInfo ci) {
26-
FabricLoader.getInstance().invokeEntrypoints(
27-
ServerModInitializer.ENTRYPOINT_KEY,
28-
ServerModInitializer.class,
29-
ServerModInitializer::initServer
30-
);
3126
FabricLoader.getInstance().invokeEntrypoints(
3227
ModInitializer.ENTRYPOINT_KEY,
3328
ModInitializer.class,
3429
ModInitializer::init
3530
);
31+
FabricLoader.getInstance().invokeEntrypoints(
32+
ServerModInitializer.ENTRYPOINT_KEY,
33+
ServerModInitializer.class,
34+
ServerModInitializer::initServer
35+
);
3636

3737
LaunchUtils.triggerLaunchEvents(args);
3838
}

0 commit comments

Comments
 (0)