From 35bef76aeb5ec8b6db1ec9d6c4f3ee27c8d5c4b0 Mon Sep 17 00:00:00 2001 From: TomTheFurry <46843632+TomTheFurry@users.noreply.github.com> Date: Wed, 16 Mar 2022 19:57:27 +0800 Subject: [PATCH] Fix 1.18.2 WorldRenderer renderSky() mixin falling --- build.properties | 2 +- .../com/seibel/lod/fabric/mixins/MixinWorldRenderer.java | 6 ++++-- gradle.properties | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.properties b/build.properties index f059b81db..ae4f3e14a 100644 --- a/build.properties +++ b/build.properties @@ -1 +1 @@ -MC_VERSION_1_18_1= +MC_VERSION_1_18_2= diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinWorldRenderer.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinWorldRenderer.java index cc656e644..5af847ea4 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinWorldRenderer.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinWorldRenderer.java @@ -24,6 +24,7 @@ import com.mojang.math.Matrix4f; import com.seibel.lod.common.wrappers.McObjectConverter; import com.seibel.lod.core.api.ClientApi; import com.seibel.lod.core.objects.math.Mat4f; +import net.minecraft.client.Camera; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.RenderType; import org.spongepowered.asm.mixin.Mixin; @@ -62,9 +63,10 @@ public class MixinWorldRenderer // HEAD or RETURN @Inject(at = @At("RETURN"), - method = "renderSky(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/math/Matrix4f;FLjava/lang/Runnable;)V", + method = "renderSky", cancellable = true) - private void renderLod(PoseStack modelViewMatrixStack, Matrix4f projectionMatrix, float f, Runnable r, CallbackInfo callback) { + private void renderLod(PoseStack modelViewMatrixStack, Matrix4f projectionMatrix, float f, + #if MC_VERSION_1_18_2 Camera camera, boolean bl,#endif Runnable r, CallbackInfo callback) { Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose()); Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix); diff --git a/gradle.properties b/gradle.properties index 736b8a929..8ddcaa853 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,4 @@ toml_version=3.6.4 manifold_version=2022.1.5 ##### FOR IDE SUPPORT AND TELL IDE TO USE CERTIAN MC VERSION: SWITCH THIS: -mcVer=1.18.1 \ No newline at end of file +mcVer=1.18.2 \ No newline at end of file