From f07783deb1ae478ae1e6936b5473b071d88ab9cb Mon Sep 17 00:00:00 2001 From: coolGi2007 Date: Mon, 10 Jan 2022 14:18:07 +1030 Subject: [PATCH] Removed forge fog renderer to fix a crash --- .../lod/forge/mixins/MixinFogRenderer.java | 34 ------------------- forge/src/main/resources/lod.mixins.json | 3 +- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 forge/src/main/java/com/seibel/lod/forge/mixins/MixinFogRenderer.java diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinFogRenderer.java b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinFogRenderer.java deleted file mode 100644 index 3c38b98d0..000000000 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinFogRenderer.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.seibel.lod.forge.mixins; - -import com.mojang.blaze3d.systems.RenderSystem; -import com.seibel.lod.core.util.SingletonHandler; -import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; -import net.minecraft.client.Camera; -import net.minecraft.client.renderer.FogRenderer; -import net.minecraft.client.renderer.FogRenderer.FogMode; -import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.level.material.FogType; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(FogRenderer.class) -public class MixinFogRenderer { - private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class); - - @Inject(at = @At("RETURN"), method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZ)V") - private static final void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, CallbackInfo callback) { - FogType fogTypes = camera.getFluidInCamera(); - Entity entity = camera.getEntity(); - boolean isUnderWater = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS); - if (!isUnderWater) { - if (fogMode == FogMode.FOG_TERRAIN && fogTypes == FogType.NONE && CONFIG.client().graphics().fogQuality().getDisableVanillaFog()) { - RenderSystem.setShaderFogStart(Float.MAX_VALUE); - RenderSystem.setShaderFogEnd(Float.MAX_VALUE); - } - } - } -} diff --git a/forge/src/main/resources/lod.mixins.json b/forge/src/main/resources/lod.mixins.json index b88cdffd1..9ee3060e8 100644 --- a/forge/src/main/resources/lod.mixins.json +++ b/forge/src/main/resources/lod.mixins.json @@ -7,8 +7,7 @@ ], "client": [ "MixinOptionsScreen", - "MixinWorldRenderer", - "MixinFogRenderer" + "MixinWorldRenderer" ], "server": [] }