From a8a22e1403f10e3e58f3e1d543bbedba70e671f7 Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 5 Jun 2020 21:26:47 -0300 Subject: [PATCH] delaying of carpet startup due to extensions not loaded --- src/main/java/carpet/mixins/Main_clientCoreMixin.java | 5 ++++- src/main/java/carpet/mixins/Main_serverCoreMixin.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/carpet/mixins/Main_clientCoreMixin.java b/src/main/java/carpet/mixins/Main_clientCoreMixin.java index 99cd04ff..7e886d93 100644 --- a/src/main/java/carpet/mixins/Main_clientCoreMixin.java +++ b/src/main/java/carpet/mixins/Main_clientCoreMixin.java @@ -10,7 +10,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Main.class) public class Main_clientCoreMixin { - @Inject(method = "main", at = @At("HEAD")) + @Inject(method = "main", at = @At( // little bit later giving extensions time to react an join the train + value = "INVOKE", + target = "Ljoptsimple/OptionParser;parse([Ljava/lang/String;)Ljoptsimple/OptionSet;") + ) private static void onServerStarted(String[] args, CallbackInfo ci) { CarpetServer.onGameStarted(); diff --git a/src/main/java/carpet/mixins/Main_serverCoreMixin.java b/src/main/java/carpet/mixins/Main_serverCoreMixin.java index 1860b9e6..57f45d21 100644 --- a/src/main/java/carpet/mixins/Main_serverCoreMixin.java +++ b/src/main/java/carpet/mixins/Main_serverCoreMixin.java @@ -10,7 +10,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Main.class) public class Main_serverCoreMixin { - @Inject(method = "main", at = @At("HEAD")) + @Inject(method = "main", at = @At( // little bit later than main to add chance for extensions to register. + value = "INVOKE", + target = "Ljoptsimple/OptionParser;parse([Ljava/lang/String;)Ljoptsimple/OptionSet;") + ) private static void onServerStarted(String[] args, CallbackInfo ci) { CarpetServer.onGameStarted();