From 78ba9bd55e5cfdc17bedcfdd8e5b5d2e52289045 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 30 Mar 2020 15:30:22 +0200 Subject: [PATCH] Fix misc preprocessor directives --- .../com/replaymod/render/blend/mixin/MixinRenderManager.java | 2 +- .../java/com/replaymod/render/mixin/MixinRenderManager.java | 4 ++-- src/main/java/com/replaymod/replay/NoGuiScreenshot.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderManager.java b/src/main/java/com/replaymod/render/blend/mixin/MixinRenderManager.java index 83a62005..91625992 100644 --- a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderManager.java +++ b/src/main/java/com/replaymod/render/blend/mixin/MixinRenderManager.java @@ -27,7 +27,7 @@ public abstract class MixinRenderManager { //#if MC>=11500 //$$ method = "render", //#else - //#if MC>=11400 + //#if MC>=11400 && FABRIC>=1 method = "render(Lnet/minecraft/entity/Entity;DDDFFZ)V", //#else //#if MC>=11400 diff --git a/src/main/java/com/replaymod/render/mixin/MixinRenderManager.java b/src/main/java/com/replaymod/render/mixin/MixinRenderManager.java index 659ee846..72233d4f 100644 --- a/src/main/java/com/replaymod/render/mixin/MixinRenderManager.java +++ b/src/main/java/com/replaymod/render/mixin/MixinRenderManager.java @@ -31,10 +31,10 @@ public abstract class MixinRenderManager { @Shadow private float cameraYaw; //#endif - //#if MC>=11400 + //#if MC>=11500 //$$ @Inject(method = "render", at = @At("HEAD")) //#else - //#if MC>=11400 + //#if MC>=11400 && FABRIC>=1 @Inject(method = "render(Lnet/minecraft/entity/Entity;DDDFFZ)V", at = @At("HEAD")) //#else //#if MC>=11400 diff --git a/src/main/java/com/replaymod/replay/NoGuiScreenshot.java b/src/main/java/com/replaymod/replay/NoGuiScreenshot.java index 9a6e442b..7f66ebae 100644 --- a/src/main/java/com/replaymod/replay/NoGuiScreenshot.java +++ b/src/main/java/com/replaymod/replay/NoGuiScreenshot.java @@ -98,8 +98,8 @@ public class NoGuiScreenshot { //#if MC>=11400 Image image = new Image(ScreenshotUtils.method_1663(frameWidth, frameHeight, mc.getFramebuffer())); //#else - // We're using Minecraft's ScreenShotHelper even though it writes the screenshot to - // disk for better maintainability + //$$ // We're using Minecraft's ScreenShotHelper even though it writes the screenshot to + //$$ // disk for better maintainability //$$ File tmpFolder = Files.createTempDir(); //$$ Image image; //$$ try {