Fix realms screen mixin for realms 1.9.8 and make it optional, fixes #15

Mumfrey
1 parent aa2b1973
Showing 4 changed files with 21 additions and 5 deletions
src/client/java/com/mumfrey/liteloader/client/api/LiteLoaderCoreAPIClient.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinRealmsMainScreen.java
src/client/resources/mixins.liteloader.client.json
src/client/resources/mixins.liteloader.client.optional.json
@@ -46,14 +46,18 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
             LiteLoaderCoreAPI.PKG_LITELOADER + ".transformers.event.json.ModEventInjectionTransformer"
     };
  
+    private static final String[] clientMixinConfigs = new String[] {
+            "mixins.liteloader.client.json",
+            "mixins.liteloader.client.optional.json",
+    };
+
     private ObjectFactory<Minecraft, IntegratedServer> objectFactory;
  
     @Override
     public String[] getMixinConfigs()
     {
         String[] commonConfigs = super.getMixinConfigs();
-        String[] clientConfigs = new String[] { "mixins.liteloader.client.json" };
-        return ObjectArrays.concat(commonConfigs, clientConfigs, String.class);
+        return ObjectArrays.concat(commonConfigs, LiteLoaderCoreAPIClient.clientMixinConfigs, String.class);
     }
  
     /* (non-Javadoc)
@@ -19,8 +19,11 @@ import net.minecraft.realms.RealmsScreen;
 @Mixin(value = RealmsMainScreen.class, remap = false)
 public abstract class MixinRealmsMainScreen extends RealmsScreen
 {
-    @Inject(method = "play(Lcom/mojang/realmsclient/dto/RealmsServer;)V", at = @At("HEAD"))
-    private void onJoinRealm(RealmsServer server, CallbackInfo ci)
+    @Inject(
+        method = "play(Lcom/mojang/realmsclient/dto/RealmsServer;Lnet/minecraft/realms/RealmsScreen;)V",
+        at = @At("HEAD")
+    )
+    private void onJoinRealm(RealmsServer server, RealmsScreen screen, CallbackInfo ci)
     {
         PacketEventsClient.onJoinRealm(server);
     }
@@ -14,7 +14,6 @@
         "MixinFramebuffer",
         "MixinIntegratedServer",
         "MixinScreenShotHelper",
-        "MixinRealmsMainScreen",
         "MixinNetHandlerLoginClient",
         "MixinRegistrySimple",
         "MixinRegistryNamespaced",
+{
+    "required": false,
+    "minVersion": "0.5.10",
+    "target": "@env(DEFAULT)",
+    "package": "com.mumfrey.liteloader.client.mixin",
+    "refmap": "mixins.liteloader.client.refmap.json",
+    "mixins": [
+        "MixinRealmsMainScreen"
+    ]
+}
 \ No newline at end of file