From 3e96b019813f1290b857d12addee1a9fef0d7cf2 Mon Sep 17 00:00:00 2001 From: coolGi Date: Fri, 12 May 2023 19:09:28 +0930 Subject: [PATCH] Reverted the MixinFogRenderer to fix fog not disabling --- .../lod/forge/mixins/client/MixinFogRenderer.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinFogRenderer.java b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinFogRenderer.java index c616c0ab0..f3425398a 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinFogRenderer.java +++ b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinFogRenderer.java @@ -48,12 +48,11 @@ public class MixinFogRenderer { private static final float A_REALLY_REALLY_BIG_VALUE = 420694206942069.F; private static final float A_EVEN_LARGER_VALUE = 42069420694206942069.F; - @Inject(at = @At("RETURN"), method = "setupFog") - #if PRE_MC_1_19 - private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, CallbackInfo callback) { - #else - private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float g, CallbackInfo callback) { - #endif + @Inject(at = @At("RETURN"), + method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZF)V", + remap = #if MC_1_16_5 true #else false #endif) // Remap messiness due to this being added by forge. + private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float partTick, CallbackInfo callback) + { #if PRE_MC_1_17_1 FluidState fluidState = camera.getFluidInCamera(); boolean cameraNotInFluid = fluidState.isEmpty();