From dd055e5c5baa7bac234a364ede520b8423d3cfd5 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 29 Nov 2021 16:21:00 +0100 Subject: [PATCH] Fix build for 1.8 --- .../replaymod/render/mixin/Mixin_ChromaKeyForceSky.java | 9 +++++---- .../mixin/Mixin_PreserveDepthDuringHandRendering.java | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyForceSky.java b/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyForceSky.java index 1d22d82a..f5b63a21 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyForceSky.java +++ b/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyForceSky.java @@ -27,14 +27,15 @@ import net.minecraft.client.render.WorldRenderer; public abstract class Mixin_ChromaKeyForceSky { @Shadow @Final private MinecraftClient client; + // FIXME preprocessor bug: should be able to remap these //#if MC>=11500 @ModifyConstant(method = "render", constant = @Constant(intValue = 4)) - //#else - //#if MC>=11400 + //#elseif MC>=11400 //$$ @ModifyConstant(method = "renderCenter", constant = @Constant(intValue = 4)) - //#else + //#elseif MC>=10809 //$$ @ModifyConstant(method = "updateCameraAndRender(FJ)V", constant = @Constant(intValue = 4)) - //#endif + //#else + //$$ @ModifyConstant(method = "updateCameraAndRender(F)V", constant = @Constant(intValue = 4)) //#endif private int forceSkyWhenChromaKeying(int value) { EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) this.client.gameRenderer).replayModRender_getHandler(); diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_PreserveDepthDuringHandRendering.java b/src/main/java/com/replaymod/render/mixin/Mixin_PreserveDepthDuringHandRendering.java index 5edd5e29..fb7e3877 100644 --- a/src/main/java/com/replaymod/render/mixin/Mixin_PreserveDepthDuringHandRendering.java +++ b/src/main/java/com/replaymod/render/mixin/Mixin_PreserveDepthDuringHandRendering.java @@ -10,7 +10,12 @@ import org.spongepowered.asm.mixin.injection.ModifyArg; @Mixin(GameRenderer.class) public abstract class Mixin_PreserveDepthDuringHandRendering { @ModifyArg( + // FIXME preprocessor bug: 1.8.9 uses method with `(FJ)V` when just name would be enough + //#if MC>=10809 method = "renderWorld", + //#else + //$$ method = "updateCameraAndRender(F)V", + //#endif at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;clear(IZ)V"), index = 0 )