Fix WorldColor mixins

Author: Avanatiker

src/main/java/com/lambda/mixin/render/BackgroundRendererMixin.java

@@ -20,6 +20,7 @@
 import com.lambda.module.modules.render.WorldColors;
 import net.minecraft.client.render.BackgroundRenderer;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.biome.Biome;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -40,16 +41,22 @@
 public class BackgroundRendererMixin {
     @Redirect(method = "getFogColor", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/Vec3d;getX()D"))
     private static double redirectRed(Vec3d baseColor) {
-        return WorldColors.backgroundColor(baseColor).getX();
+        return WorldColors.fogOfWarColor(baseColor).getX();
     }
 
     @Redirect(method = "getFogColor", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/Vec3d;getY()D"))
     private static double redirectGreen(Vec3d baseColor) {
-        return WorldColors.backgroundColor(baseColor).getY();
+        return WorldColors.fogOfWarColor(baseColor).getY();
     }
 
     @Redirect(method = "getFogColor", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/Vec3d;getZ()D"))
     private static double redirectBlue(Vec3d baseColor) {
-        return WorldColors.backgroundColor(baseColor).getZ();
+        return WorldColors.fogOfWarColor(baseColor).getZ();
     }
+
+    @Redirect(method = "getFogColor", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/biome/Biome;getWaterFogColor()I"))
+    private static int redirectWaterFogColor(Biome biome) {
+        return WorldColors.waterFogColor(biome.getWaterFogColor());
+    }
+
 }

src/main/java/com/lambda/mixin/render/RenderSystemMixin.java

@@ -48,19 +48,22 @@ private void onRemoveEntity(int entityId, Entity.RemovalReason removalReason, Ca
     }
 
     @Inject(method = "getCloudsColor", at = @At("HEAD"), cancellable = true)
-    private void getCloudsColorInject(float tickDelta, CallbackInfoReturnable<Vec3d> cir) {
+    private void getCloudsColorInject(float tickDelta, CallbackInfoReturnable<Integer> cir) {
         if (WorldColors.INSTANCE.isEnabled() && WorldColors.getCustomClouds()) {
-            cir.setReturnValue(ColorKt.getVec3d(WorldColors.getCloudColor()));
+            int rgb = WorldColors.getCloudColor().getRGB() & 0xFFFFFF;
+            cir.setReturnValue(rgb);
         }
     }
 
     @Inject(method = "getSkyColor", at = @At("HEAD"), cancellable = true)
-    private void getSkyColorInject(Vec3d cameraPos, float tickDelta, CallbackInfoReturnable<Vec3d> cir) {
+    private void getSkyColorInject(Vec3d cameraPos, float tickDelta, CallbackInfoReturnable<Integer> cir) {
         if (WorldColors.INSTANCE.isEnabled() && WorldColors.getCustomSky()) {
-            cir.setReturnValue(ColorKt.getVec3d(WorldColors.getSkyColor()));
+            int rgb = WorldColors.getSkyColor().getRGB() & 0xFFFFFF;
+            cir.setReturnValue(rgb);
         }
     }
 
+
     @Inject(method = "handleBlockUpdate", at = @At("HEAD"), cancellable = true)
     private void handleBlockUpdateInject(BlockPos pos, BlockState newState, int flags, CallbackInfo ci) {
         if (EventFlow.post(new WorldEvent.BlockUpdate.Server(pos, newState)).isCanceled()) ci.cancel();

src/main/java/com/lambda/mixin/world/ClientWorldMixin.java

@@ -25,7 +25,7 @@ import java.awt.Color
 
 object WorldColors : Module(
     name = "WorldColors",
-    description = "Changes the color of the sky",
+    description = "Changes the color of the sky, clouds and fog",
     tag = ModuleTag.RENDER,
 ) {
     @JvmStatic
@@ -35,10 +35,10 @@ object WorldColors : Module(
     val skyColor by setting("Sky Color", Color(255, 24, 75), "The color of your sky") { customSky }
 
     @JvmStatic
-    val customFog by setting("Custom Fog", false)
+    val customFogOfWar by setting("Custom Fog of War", false)
 
     @JvmStatic
-    val fogColor by setting("Fog Color", Color(255, 24, 75, 255), "The color of your fog") { customFog }
+    val fogOfWarColor by setting("Fog of War Color", Color(255, 24, 75, 255), "The color of your fog") { customFogOfWar }
 
     @JvmStatic
     val customClouds by setting("Custom Clouds", false)
@@ -47,6 +47,16 @@ object WorldColors : Module(
     val cloudColor by setting("Cloud Color", Color(255, 24, 75)) { customClouds }
 
     @JvmStatic
-    fun backgroundColor(base: Vec3d) =
-        if (customFog && isEnabled) fogColor.vec3d else base
+    val customWaterFog by setting("Custom Water Fog", true)
+
+    @JvmStatic
+    val waterFogColor by setting("Water Fog Color", Color(255, 24, 75, 255), "The color of your water fog") { customWaterFog }
+
+    @JvmStatic
+    fun fogOfWarColor(base: Vec3d) =
+        if (customFogOfWar && isEnabled) fogOfWarColor.vec3d else base
+
+    @JvmStatic
+    fun waterFogColor(base: Int): Int =
+        if (customWaterFog && isEnabled) this.waterFogColor.rgb else base
 }

src/main/kotlin/com/lambda/module/modules/render/WorldColors.kt

@@ -46,7 +46,6 @@
     "render.LivingEntityRendererMixin",
     "render.PlayerListHudMixin",
     "render.RenderLayersMixin",
-    "render.RenderSystemMixin",
     "render.ScreenHandlerMixin",
     "render.SplashOverlayMixin",
     "render.SplashOverlayMixin$LogoTextureMixin",