Fixed incorrect sky color causing the horizon to be visible through t…

…he fog
NaoCraftLab · Oct 13, 2024 · 71c4b70 · 71c4b70
1 parent 65d810f
commit 71c4b70
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.21.2-2.4.1
+
+### Fixed
+
+- Incorrect sky color causing the horizon to be visible through the fog
+
 ## 1.21.2-2.4.0
 
 ### Added

diff --git a/docs/presets/custom/SNOWY_VEIL.v2.json b/docs/presets/custom/SNOWY_VEIL.v2.json
@@ -16,8 +16,7 @@
       "opacity": 95.0,
       "encapsulationSpeed": 6.0,
       "brightness": {
-        "mode": "BY_GAME_FOG",
-        "adjustment": 0.5
+        "mode": "BY_GAME_FOG"
       },
       "color": {
         "mode": "BY_GAME_FOG",
@@ -39,8 +38,7 @@
       "opacity": 100.0,
       "encapsulationSpeed": 6.0,
       "brightness": {
-        "mode": "BY_GAME_FOG",
-        "adjustment": 0.5
+        "mode": "BY_GAME_FOG"
       },
       "color": {
         "mode": "BY_GAME_FOG",

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.parallel=true
 group=com.naocraftlab
 modId=foggy-pale-garden
 modCurseForgeId=1114471
-modVersion=2.4.0
+modVersion=2.4.1
 modName=Foggy Pale Garden
 modDescription=Adds dense fog to the Pale Garden biome.
 modLicense=MIT

diff --git a/src/main/java/com/naocraftlab/foggypalegarden/mixin/PaleGardenFogMixin.java b/src/main/java/com/naocraftlab/foggypalegarden/mixin/PaleGardenFogMixin.java
@@ -90,6 +90,11 @@ private static void injectApplyFog(
             assert fogCharacteristics.color().alpha() >= 0.0f : "FPG: Alpha color component is negative";
             assert fogCharacteristics.color().alpha() <= 1.0f : "FPG: Alpha color component is greater than 1.0";
 
+            color.x = color.x * (1.0f - fogDensity) + fogCharacteristics.color().red() * fogDensity;
+            color.y = color.y * (1.0f - fogDensity) + fogCharacteristics.color().green() * fogDensity;
+            color.z = color.z * (1.0f - fogDensity) + fogCharacteristics.color().blue() * fogDensity;
+            color.w = color.w * (1.0f - fogDensity) + fogCharacteristics.color().alpha() * fogDensity;
+
             cir.setReturnValue(fogOf(fogCharacteristics));
             cir.cancel();
         }