Merge branch 'master' into master-java8

Author: basdxz

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [1.1.0] - 2025-11-29
+
+### Changed
+
+- Improved the implementation of fast fog, now with better mod compat
+
+### Added
+
+- Added a fog bias config when using ChunkDrawMode=Fast, which can pull in the fog and reduce pop-in
+
 ## [1.0.7] - 2025-11-24
 
 ### Changed

build.gradle.kts

@@ -96,4 +96,9 @@ dependencies {
 
     // netherlicious-3.2.8.jar
     compileOnly(deobfCurse("netherlicious-385860:4363437"))
+
+
+    // WelcomeToTheJungle-1.0.9-1.7.10.jar
+    // Here for testing the Fast Fog implementation
+//    runtimeOnly(deobfCurse("welcometothejungle-246895:2775633"))
 }

src/main/java/com/ventooth/beddium/config/TerrainRenderingConfig.java

@@ -68,6 +68,17 @@ public final class TerrainRenderingConfig {
     @Config.DefaultEnum("Vanilla")
     public static DrawModeEnum ChunkDrawMode;
 
+    @Config.Name("FastChunkDrawModeFogBias")
+    @Config.Comment({
+            "Adds a bias (in blocks) to the fog distance when using Fast Chunk Edge Mode.",
+            "The default value is set to hide all pop in, but can be adjusted to taste.",
+    })
+    @Config.LangKey("config.beddium.terrainrendering.FastChunkDrawModeFogBias")
+    @Config.DefaultDouble(-16D)
+    @Config.RangeDouble(min = -16D,
+                        max = 0D)
+    public static double FastChunkDrawModeFogBias;
+
     @Config.Name("UseMultiDrawIndirect")
     @Config.Comment({
             "Controls if chunks should be drawn using MultiDrawIndirect.",

src/main/java/com/ventooth/beddium/mixin/mixins/client/TerrainRendering/EntityRendererMixin.java

@@ -22,19 +22,64 @@
 
 package com.ventooth.beddium.mixin.mixins.client.TerrainRendering;
 
+import com.falsepattern.lib.util.MathUtil;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.ventooth.beddium.config.TerrainRenderingConfig;
 import com.ventooth.beddium.modules.TerrainRendering.fog.FogStateTracker;
+import lombok.val;
+import org.lwjgl.opengl.GL11;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.client.renderer.EntityRenderer;
 
 import java.nio.FloatBuffer;
 
 @Mixin(EntityRenderer.class)
 public abstract class EntityRendererMixin {
+    @Shadow
+    private float farPlaneDistance;
+
+    @Inject(method = "setupFog",
+            at = @At(value = "RETURN"))
+    private void applyFogBias(CallbackInfo ci) {
+        val fogBias = (float) TerrainRenderingConfig.FastChunkDrawModeFogBias;
+        if (TerrainRenderingConfig.ChunkDrawMode != TerrainRenderingConfig.DrawModeEnum.Fast || MathUtil.epsilonEquals(fogBias, 0F)) {
+            return;
+        }
+
+        float fogEnd;
+        float fogStart;
+        if (TerrainRenderingConfig.FastFog) {
+            fogEnd = FogStateTracker.end;
+            fogStart = FogStateTracker.start;
+        } else {
+            fogEnd = GL11.glGetInteger(GL11.GL_FOG_END);
+            fogStart = GL11.glGetInteger(GL11.GL_FOG_START);
+        }
+        val maxFogEnd = this.farPlaneDistance + fogBias;
+
+        if (maxFogEnd >= fogEnd || fogStart > fogEnd) {
+            return;
+        }
+
+        val biasRatio = maxFogEnd / fogEnd;
+        fogEnd = maxFogEnd;
+        fogStart *= biasRatio;
+
+        GL11.glFogf(GL11.GL_FOG_END, fogEnd);
+        GL11.glFogf(GL11.GL_FOG_START, fogStart);
+
+        if (TerrainRenderingConfig.FastFog) {
+            FogStateTracker.end = fogEnd;
+            FogStateTracker.start = fogStart;
+        }
+    }
+
     @WrapOperation(method = "setupFog",
                    at = @At(value = "INVOKE",
                             target = "Lorg/lwjgl/opengl/GL11;glFog(ILjava/nio/FloatBuffer;)V"))
@@ -75,7 +120,6 @@ private void track_glEnable(int cap, Operation<Void> original) {
         original.call(cap);
     }
 
-
     @WrapOperation(method = "renderWorld",
                    at = @At(value = "INVOKE",
                             target = "Lorg/lwjgl/opengl/GL11;glDisable(I)V"))

src/main/java/com/ventooth/beddium/modules/TerrainRendering/fog/FogStateTracker.java

@@ -34,8 +34,8 @@
 public final class FogStateTracker {
     static final FloatBuffer color = BufferUtils.createFloatBuffer(16);
 
-    static float end = 1000F;
-    static float start = 1000F;
+    public static float end = 1000F;
+    public static float start = 1000F;
     static float density = 0.1F;
 
     static boolean isEnabled = false;
@@ -55,7 +55,6 @@ public static void setFromGl() {
         density = GL11.glGetInteger(GL11.GL_FOG_DENSITY);
     }
 
-    @SuppressWarnings("unused")
     public static void glFog(int pname, FloatBuffer params) {
         if (pname == GL11.GL_FOG_COLOR) {
             FogStateTracker.color.put(0, params.get(0));
@@ -65,7 +64,6 @@ public static void glFog(int pname, FloatBuffer params) {
         }
     }
 
-    @SuppressWarnings("unused")
     public static void glFogf(int pname, float param) {
         switch (pname) {
             case GL11.GL_FOG_END -> FogStateTracker.end = param;
@@ -74,21 +72,18 @@ public static void glFogf(int pname, float param) {
         }
     }
 
-    @SuppressWarnings("unused")
     public static void glEnable(int cap) {
         if (cap == GL11.GL_FOG) {
             FogStateTracker.isEnabled = true;
         }
     }
 
-    @SuppressWarnings("unused")
     public static void glDisable(int cap) {
         if (cap == GL11.GL_FOG) {
             FogStateTracker.isEnabled = false;
         }
     }
 
-    @SuppressWarnings("unused")
     public static void glFogi(int pname, int param) {
         if (pname == GL11.GL_FOG_MODE) {
             FogStateTracker.mode = FogStateTracker.fromGLMode(param);

src/main/resources/assets/beddium/lang/en_US.lang

@@ -24,6 +24,9 @@ config.beddium.terrainrendering.MEGAChunks.tooltip=Larger chunk renderers. One m
 config.beddium.terrainrendering.ChunkDrawMode=Chunk Edge Mode
 config.beddium.terrainrendering.ChunkDrawMode.tooltip=Changes the way chunks at the world edge are rendered.\nVanilla: Renders "chunk cliffs" at the world edge. Slightly slower,\n         but fixes issues such as invisible chunks in minigame servers,\n or reduced render distance.\nFast: Only renders chunks if all of the neighboring chunks are loaded.\n      A bit faster than safe, but on some servers this might cause missing\n      chunks at map edges,\n      and it reduces visual render distance by 1 (the chunks are still present).",
 
+config.beddium.terrainrendering.FastChunkDrawModeFogBias=Fast Chunk Edge Mode Fog Bias
+config.beddium.terrainrendering.FastChunkDrawModeFogBias.tooltip=Adds a bias (in blocks) to the fog distance when using Fast Chunk Edge Mode.\nThe default value is set to hide all pop in, but can be adjusted to taste.
+
 config.beddium.terrainrendering.UseMultiDrawIndirect=Multi-Draw Indirect
 config.beddium.terrainrendering.UseMultiDrawIndirect.tooltip=Controls if chunks should be drawn using MultiDrawIndirect.\nThis option is a trade off between CPU and GPU overhead when rendering chunks.\nIt is best left disabled in most cases, particularly on Intel iGPUs.\nCan improve performance on render distances beyond 16 if you are CPU limited.