DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mouse scroll and screenshot mixin targets

Browse Source
This commit is contained in:
Jonas Herzig
2019-05-07 12:48:36 +02:00
parent 6ba05f3d99
commit d54905713f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/replaymod/core/mixin/MixinMouseListener.java
View File

@@ -5,7 +5,7 @@
//$$ import de.johni0702.minecraft.gui.versions.callbacks.MouseCallback; //$$ import de.johni0702.minecraft.gui.versions.callbacks.MouseCallback;
//$$ import net.minecraft.client.Mouse; //$$ import net.minecraft.client.Mouse;
//$$ import net.minecraft.client.gui.Element; //$$ 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.Mixin;
//$$ import org.spongepowered.asm.mixin.Shadow; //$$ import org.spongepowered.asm.mixin.Shadow;
//$$ import org.spongepowered.asm.mixin.injection.At; //$$ import org.spongepowered.asm.mixin.injection.At;
@@ -47,9 +47,9 @@
//$$ //$$
//$$ @Redirect( //$$ @Redirect(
//$$ method = "onMouseScroll", //$$ 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)) { //$$ if (MouseCallback.EVENT.invoker().mouseScroll(x, y, scroll)) {
//$$ return true; //$$ return true;
//$$ } else { //$$ } else {

2
src/main/java/com/replaymod/replay/mixin/MixinKeyboardListener.java
View File

@@ -28,7 +28,7 @@ public abstract class MixinKeyboardListener {
at = @At( at = @At(
value = "INVOKE", value = "INVOKE",
//#if MC>=11400 //#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 //#else
//#if MC>=11300 //#if MC>=11300
target = "Lnet/minecraft/util/ScreenShotHelper;saveScreenshot(Ljava/io/File;IILnet/minecraft/client/shader/Framebuffer;Ljava/util/function/Consumer;)V" target = "Lnet/minecraft/util/ScreenShotHelper;saveScreenshot(Ljava/io/File;IILnet/minecraft/client/shader/Framebuffer;Ljava/util/function/Consumer;)V"