From d54905713fdc0bc5bf9f94928455dfe6dbdef71e Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Tue, 7 May 2019 12:48:36 +0200 Subject: [PATCH] Fix mouse scroll and screenshot mixin targets --- .../java/com/replaymod/core/mixin/MixinMouseListener.java | 6 +++--- .../com/replaymod/replay/mixin/MixinKeyboardListener.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/replaymod/core/mixin/MixinMouseListener.java b/src/main/java/com/replaymod/core/mixin/MixinMouseListener.java index 9911f195..1fc6698d 100644 --- a/src/main/java/com/replaymod/core/mixin/MixinMouseListener.java +++ b/src/main/java/com/replaymod/core/mixin/MixinMouseListener.java @@ -5,7 +5,7 @@ //$$ import de.johni0702.minecraft.gui.versions.callbacks.MouseCallback; //$$ import net.minecraft.client.Mouse; //$$ import net.minecraft.client.gui.Element; -//$$ import net.minecraft.client.gui.ParentElement; +//$$ import net.minecraft.client.gui.Screen; //$$ import org.spongepowered.asm.mixin.Mixin; //$$ import org.spongepowered.asm.mixin.Shadow; //$$ import org.spongepowered.asm.mixin.injection.At; @@ -47,9 +47,9 @@ //$$ //$$ @Redirect( //$$ method = "onMouseScroll", -//$$ at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/ParentElement;mouseScrolled(DDD)Z") +//$$ at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Screen;mouseScrolled(DDD)Z") //$$ ) -//$$ private boolean mouseScroll(ParentElement element, double x, double y, double scroll) { +//$$ private boolean mouseScroll(Screen element, double x, double y, double scroll) { //$$ if (MouseCallback.EVENT.invoker().mouseScroll(x, y, scroll)) { //$$ return true; //$$ } else { diff --git a/src/main/java/com/replaymod/replay/mixin/MixinKeyboardListener.java b/src/main/java/com/replaymod/replay/mixin/MixinKeyboardListener.java index cf2c9951..0555795b 100644 --- a/src/main/java/com/replaymod/replay/mixin/MixinKeyboardListener.java +++ b/src/main/java/com/replaymod/replay/mixin/MixinKeyboardListener.java @@ -28,7 +28,7 @@ public abstract class MixinKeyboardListener { at = @At( value = "INVOKE", //#if MC>=11400 - //$$ target = "Lnet/minecraft/client/util/ScreenshotUtils;method_1662(Ljava/io/File;Ljava/lang/String;IILnet/minecraft/client/gl/GlFramebuffer;Ljava/util/function/Consumer;)V" + //$$ target = "Lnet/minecraft/client/util/ScreenshotUtils;method_1659(Ljava/io/File;IILnet/minecraft/client/gl/GlFramebuffer;Ljava/util/function/Consumer;)V" //#else //#if MC>=11300 target = "Lnet/minecraft/util/ScreenShotHelper;saveScreenshot(Ljava/io/File;IILnet/minecraft/client/shader/Framebuffer;Ljava/util/function/Consumer;)V"