finished

ferriarnus · Aug 13, 2024 · 841dfe0 · 841dfe0
1 parent f5e7910
commit 841dfe0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/main/java/com/replaymod/core/mixin/MixinMinecraft.java b/src/main/java/com/replaymod/core/mixin/MixinMinecraft.java
@@ -50,14 +50,14 @@ public void replayModExecuteTaskQueue() {
 
     @Inject(method = "render",
             at = @At(value = "INVOKE",
-                    target = "Lnet/minecraft/client/render/GameRenderer;render(FJZ)V"))
+                    target = "Lnet/minecraft/client/render/GameRenderer;render(Lnet/minecraft/client/render/RenderTickCounter;Z)V"))
     private void preRender(boolean unused, CallbackInfo ci) {
         PreRenderCallback.EVENT.invoker().preRender();
     }
 
     @Inject(method = "render",
             at = @At(value = "INVOKE",
-                    target = "Lnet/minecraft/client/render/GameRenderer;render(FJZ)V",
+                    target = "Lnet/minecraft/client/render/GameRenderer;render(Lnet/minecraft/client/render/RenderTickCounter;Z)V",
                     shift = At.Shift.AFTER))
     private void postRender(boolean unused, CallbackInfo ci) {
         PostRenderCallback.EVENT.invoker().postRender();

diff --git a/src/main/java/com/replaymod/recording/mixin/MixinMouseHelper.java b/src/main/java/com/replaymod/recording/mixin/MixinMouseHelper.java
@@ -33,18 +33,18 @@ private void handleReplayModScroll(
             long _p0, double _p1, double _p2,
             CallbackInfo ci,
             //#if MC>=12002
-            //$$ boolean discreteScroll,
-            //$$ double sensitivity,
-            //$$ double xOffsetAccumulated,
-            //$$ double yOffsetAccumulated
+            boolean discreteScroll,
+            double sensitivity,
+            double xOffsetAccumulated,
+            double yOffsetAccumulated
             //#else
-            double _l1,
+            //$$ double _l1,
             //#if MC>=11802
             //$$ int yOffsetAccumulated
             //#elseif MC>=11400
             //$$ float yOffsetAccumulated
             //#else
-            double yOffsetAccumulated
+            //$$ double yOffsetAccumulated
             //#endif
             //#endif
     ) {

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
@@ -23,7 +23,7 @@ public abstract class MixinMouseListener {
 
     @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) {
+    private static void mouseDown(boolean[] result, Screen screen, double x, double y, int button, CallbackInfo ci) {
     //#else
     //$$ private void mouseDown(boolean[] result, double x, double y, int button, CallbackInfo ci) {
     //#endif
@@ -35,7 +35,7 @@ private void mouseDown(boolean[] result, Screen screen, double x, double y, int
 
     @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) {
+    private static  void mouseUp(boolean[] result, Screen screen, double x, double y, int button, CallbackInfo ci) {
     //#else
     //$$ private void mouseUp(boolean[] result, double x, double y, int button, CallbackInfo ci) {
     //#endif

diff --git a/src/main/resources/mixins.replay.replaymod.json b/src/main/resources/mixins.replay.replaymod.json
@@ -15,7 +15,7 @@
     "Mixin_AllowExpiredPlayerKeys",
     //#endif
     //#if MC>=11800
-    //$$ "Mixin_FixEntityNotTracking",
+    "Mixin_FixEntityNotTracking",
     //#endif
     //#if MC>=11600
     "Mixin_MoveRealmsButton",
@@ -56,7 +56,8 @@
     "MixinRenderItem",
     "MixinRenderLivingBase",
     "MixinTileEntityEndPortalRenderer",
-    "MixinWorldClient"
+    "MixinWorldClient",
+    "Mixin_ScreenButton"
   ],
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.6.11"