From f67510c7ae2506007a0bff7acd266b17283beba4 Mon Sep 17 00:00:00 2001
From: ferriarnus <61201275+ferriarnus@users.noreply.github.com>
Date: Sat, 18 May 2024 13:24:53 +0200
Subject: [PATCH] update loom and mappings

---
 build.gradle                                       |  1 -
 .../gui/versions/mixin/MixinKeyboardListener.java  | 14 +++++++-------
 .../gui/versions/mixin/MixinMouseListener.java     |  6 +++---
 .../mixins.compat.mapwriter.replaymod.json         |  3 +--
 .../resources/mixins.compat.shaders.replaymod.json |  3 +--
 src/main/resources/mixins.core.replaymod.json      |  3 +--
 .../mixins.extras.playeroverview.replaymod.json    |  3 +--
 src/main/resources/mixins.jgui.json                |  3 +--
 .../resources/mixins.nonmmlauncher.replaymod.json  |  3 +--
 src/main/resources/mixins.recording.replaymod.json |  3 +--
 .../resources/mixins.render.blend.replaymod.json   |  3 +--
 src/main/resources/mixins.render.replaymod.json    |  3 +--
 src/main/resources/mixins.replay.replaymod.json    |  3 +--
 13 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/build.gradle b/build.gradle
index 10c24b7..6538b35 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,6 @@ loom {
                 "mixins.core.replaymod.json",
                 "mixins.extras.playeroverview.replaymod.json",
                 "mixins.jgui.json",
-                "mixins.nonmmlauncher.replaymod.json",
                 "mixins.recording.replaymod.json",
                 "mixins.render.blend.replaymod.json",
                 "mixins.render.replaymod.json",
diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinKeyboardListener.java b/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinKeyboardListener.java
index c28cd21..f67cba9 100644
--- a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinKeyboardListener.java
+++ b/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinKeyboardListener.java
@@ -62,13 +62,13 @@ private void keyReleased(int i, boolean[] bls, Screen screen, int keyCode, int s
         }
     }
 
-    @Inject(method = "method_1458", at = @At("HEAD"), cancellable = true)
-    @Group(min = 1, max = 1, name = "replaymod-jgui-charTyped-int")
-    private void charTyped(Element element, int keyChar, int modifiers, CallbackInfo ci) {
-        if (KeyboardCallback.EVENT.invoker().charTyped((char) keyChar, modifiers)) {
-            ci.cancel();
-        }
-    }
+    //@Inject(method = "method_1458", at = @At("HEAD"), cancellable = true)
+    //@Group(min = 1, max = 1, name = "replaymod-jgui-charTyped-int")
+//    private static void charTyped(Element element, int keyChar, int modifiers, CallbackInfo ci) {
+//        if (KeyboardCallback.EVENT.invoker().charTyped((char) keyChar, modifiers)) {
+//            ci.cancel();
+//        }
+//    }
 
     @Inject(method = "lambda$charTyped$5", at = @At("HEAD"), cancellable = true, remap = false)
     @Group(min = 1, max = 1, name = "replaymod-jgui-charTyped-int")
diff --git a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinMouseListener.java b/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinMouseListener.java
index 132e72c..be4e9fb 100644
--- a/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinMouseListener.java
+++ b/src/main/java/de/johni0702/minecraft/gui/versions/mixin/MixinMouseListener.java
@@ -21,7 +21,7 @@ public abstract class MixinMouseListener {
     @Accessor // Note: for some reason Mixin doesn't include this in the refmap json if it's just a @Shadow field
     abstract int getActiveButton();
 
-    @Inject(method = "method_1611", at = @At("HEAD"), cancellable = true, remap = false)
+    @Inject(method = "method_1611", at = @At("HEAD"), cancellable = true)
     //#if MC>=11700
     private void mouseDown(boolean[] result, Screen screen, double x, double y, int button, CallbackInfo ci) {
     //#else
@@ -33,7 +33,7 @@ private void mouseDown(boolean[] result, Screen screen, double x, double y, int
         }
     }
 
-    @Inject(method = "method_1605", at = @At("HEAD"), cancellable = true, remap = false)
+    @Inject(method = "method_1605", at = @At("HEAD"), cancellable = true)
     //#if MC>=11700
     private void mouseUp(boolean[] result, Screen screen, double x, double y, int button, CallbackInfo ci) {
     //#else
@@ -45,7 +45,7 @@ private void mouseUp(boolean[] result, Screen screen, double x, double y, int bu
         }
     }
 
-    @Inject(method = "method_1602", at = @At("HEAD"), cancellable = true, remap = false)
+    @Inject(method = "method_1602", at = @At("HEAD"), cancellable = true)
     //#if MC>=11700
     private void mouseDrag(Screen screen, double x, double y, double dx, double dy, CallbackInfo ci) {
     //#else
diff --git a/src/main/resources/mixins.compat.mapwriter.replaymod.json b/src/main/resources/mixins.compat.mapwriter.replaymod.json
index ac038ec..ca4e97d 100644
--- a/src/main/resources/mixins.compat.mapwriter.replaymod.json
+++ b/src/main/resources/mixins.compat.mapwriter.replaymod.json
@@ -9,6 +9,5 @@
     //#endif
   ],
   "compatibilityLevel": "JAVA_8",
-  "minVersion": "0.6.11",
-  "refmap": "mixins.replaymod.refmap.json"
+  "minVersion": "0.6.11"
 }
\ No newline at end of file
diff --git a/src/main/resources/mixins.compat.shaders.replaymod.json b/src/main/resources/mixins.compat.shaders.replaymod.json
index 56c38aa..a35d631 100644
--- a/src/main/resources/mixins.compat.shaders.replaymod.json
+++ b/src/main/resources/mixins.compat.shaders.replaymod.json
@@ -18,6 +18,5 @@
     "MixinShadersRender"
   ],
   "compatibilityLevel": "JAVA_8",
-  "minVersion": "0.6.11",
-  "refmap": "mixins.replaymod.refmap.json"
+  "minVersion": "0.6.11"
 }
\ No newline at end of file
diff --git a/src/main/resources/mixins.core.replaymod.json b/src/main/resources/mixins.core.replaymod.json
index f355831..f5156ae 100644
--- a/src/main/resources/mixins.core.replaymod.json
+++ b/src/main/resources/mixins.core.replaymod.json
@@ -27,6 +27,5 @@
     "TimerAccessor"
   ],
   "compatibilityLevel": "JAVA_8",
-  "minVersion": "0.6.11",
-  "refmap": "mixins.replaymod.refmap.json"
+  "minVersion": "0.6.11"
 }
\ No newline at end of file
diff --git a/src/main/resources/mixins.extras.playeroverview.replaymod.json b/src/main/resources/mixins.extras.playeroverview.replaymod.json
index 9c9bf8e..8582ed7 100644
--- a/src/main/resources/mixins.extras.playeroverview.replaymod.json
+++ b/src/main/resources/mixins.extras.playeroverview.replaymod.json
@@ -7,6 +7,5 @@
     "MixinRender"
   ],
   "compatibilityLevel": "JAVA_8",
-  "minVersion": "0.6.11",
-  "refmap": "mixins.replaymod.refmap.json"
+  "minVersion": "0.6.11"
 }
\ No newline at end of file
diff --git a/src/main/resources/mixins.jgui.json b/src/main/resources/mixins.jgui.json
index 71b03a7..4a9b65e 100644
--- a/src/main/resources/mixins.jgui.json
+++ b/src/main/resources/mixins.jgui.json
@@ -22,6 +22,5 @@
     //#endif
   ],
   "compatibilityLevel": "JAVA_8",
-  "minVersion": "0.6.11",
-  "refmap": "mixins.replaymod.refmap.json"
+  "minVersion": "0.6.11"
 }
\ No newline at end of file
diff --git a/src/main/resources/mixins.nonmmlauncher.replaymod.json b/src/main/resources/mixins.nonmmlauncher.replaymod.json
index 3a06b39..2023424 100644
--- a/src/main/resources/mixins.nonmmlauncher.replaymod.json
+++ b/src/main/resources/mixins.nonmmlauncher.replaymod.json
@@ -6,6 +6,5 @@
   "server": [],
   "client": [],
   "compatibilityLevel": "JAVA_8",
-  "minVersion": "0.6.11",
-  "refmap": "mixins.nonmmlauncher.replaymod.refmap.json"
+  "minVersion": "0.6.11"
 }
\ No newline at end of file
diff --git a/src/main/resources/mixins.recording.replaymod.json b/src/main/resources/mixins.recording.replaymod.json
index df7f09e..8de0083 100644
--- a/src/main/resources/mixins.recording.replaymod.json
+++ b/src/main/resources/mixins.recording.replaymod.json
@@ -39,6 +39,5 @@
     "MixinRenderGlobal"
   ],
   "compatibilityLevel": "JAVA_8",
-  "minVersion": "0.6.11",
-  "refmap": "mixins.replaymod.refmap.json"
+  "minVersion": "0.6.11"
 }
\ No newline at end of file
diff --git a/src/main/resources/mixins.render.blend.replaymod.json b/src/main/resources/mixins.render.blend.replaymod.json
index b79f09a..c918b89 100644
--- a/src/main/resources/mixins.render.blend.replaymod.json
+++ b/src/main/resources/mixins.render.blend.replaymod.json
@@ -29,6 +29,5 @@
     //#endif
   ],
   "compatibilityLevel": "JAVA_8",
-  "minVersion": "0.6.11",
-  "refmap": "mixins.replaymod.refmap.json"
+  "minVersion": "0.6.11"
 }
\ No newline at end of file
diff --git a/src/main/resources/mixins.render.replaymod.json b/src/main/resources/mixins.render.replaymod.json
index 0530a4c..86bafad 100644
--- a/src/main/resources/mixins.render.replaymod.json
+++ b/src/main/resources/mixins.render.replaymod.json
@@ -58,6 +58,5 @@
     "MixinRenderManager"
   ],
   "compatibilityLevel": "JAVA_8",
-  "minVersion": "0.6.11",
-  "refmap": "mixins.replaymod.refmap.json"
+  "minVersion": "0.6.11"
 }
\ No newline at end of file
diff --git a/src/main/resources/mixins.replay.replaymod.json b/src/main/resources/mixins.replay.replaymod.json
index b360e22..69de06d 100644
--- a/src/main/resources/mixins.replay.replaymod.json
+++ b/src/main/resources/mixins.replay.replaymod.json
@@ -61,6 +61,5 @@
     "Mixin_ConnectionType"
   ],
   "compatibilityLevel": "JAVA_8",
-  "minVersion": "0.6.11",
-  "refmap": "mixins.replaymod.refmap.json"
+  "minVersion": "0.6.11"
 }
\ No newline at end of file