Update core + Add disableVanillaFog for Forge

2022-01-13 23:35:18 +08:00
parent 328ac93178
commit e4b40c9383
4 changed files with 55 additions and 2 deletions
@@ -263,4 +263,9 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
    public boolean isFogStateInUnderWater() {
    	return GAME_RENDERER.getMainCamera().getFluidInCamera() == FogType.WATER;
    }
+
+	@Override
+	public boolean tryDisableVanillaFog() {
+		return true; // Handled via MixinFogRenderer in both forge and fabric
+	}
 }
@@ -0,0 +1,47 @@
+package com.seibel.lod.forge.mixins;
+
+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;
+
+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;
+
+@Mixin(FogRenderer.class)
+public class MixinFogRenderer {
+	
+	// Using this instead of Float.MAX_VALUE because Sodium don't like it. (and copy paste in case someone in forge don't like it)
+	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(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZF)V", 
+			remap = false) // Remap = false due to this being added by forge.
+	private static final void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float partTick, CallbackInfo callback) {
+		ILodConfigWrapperSingleton CONFIG;
+		try {
+			CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
+		} catch (NullPointerException e) {
+			return; // May happen due to forge for some reason haven't inited out thingy yet.
+		}
+	    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(A_REALLY_REALLY_BIG_VALUE);
+			    RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE);
+			}
+	    }
+	}
+}
@@ -7,7 +7,8 @@
 	],
 	"client": [
 		"MixinOptionsScreen",
-		"MixinWorldRenderer"
+		"MixinWorldRenderer",
+		"MixinFogRenderer"
 	],
 	"server": []
 }