From 9bf3c106dff9d87101dae3eb95d647949b73169a Mon Sep 17 00:00:00 2001
From: DJ Cook <89934852+SlimyFrog123@users.noreply.github.com>
Date: Fri, 29 Nov 2024 00:59:14 -0800
Subject: [PATCH] Fixed submerging in liquid crashing the game in the Fabric
 loader version (#2291)

---
 .../main/java/biomesoplenty/fabric/mixin/MixinBloodFluid.java | 2 +-
 .../java/biomesoplenty/fabric/mixin/MixinLiquidNullFluid.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fabric/src/main/java/biomesoplenty/fabric/mixin/MixinBloodFluid.java b/fabric/src/main/java/biomesoplenty/fabric/mixin/MixinBloodFluid.java
index 6e65224fa..75e27001d 100644
--- a/fabric/src/main/java/biomesoplenty/fabric/mixin/MixinBloodFluid.java
+++ b/fabric/src/main/java/biomesoplenty/fabric/mixin/MixinBloodFluid.java
@@ -32,7 +32,7 @@
 @Mixin(FogRenderer.class)
 public abstract class MixinBloodFluid
 {
-    @Inject(method = "computeFogColor", at = @At(value = "RETURN"))
+    @Inject(method = "computeFogColor", at = @At(value = "RETURN"), cancellable = true)
     private static void modifyFogColors(Camera camera, float f, ClientLevel level, int i, float g, CallbackInfoReturnable<Vector4f> cir)
     {
         BlockPos blockPos = camera.getBlockPosition();
diff --git a/fabric/src/main/java/biomesoplenty/fabric/mixin/MixinLiquidNullFluid.java b/fabric/src/main/java/biomesoplenty/fabric/mixin/MixinLiquidNullFluid.java
index e52ae7b86..ce1a026c8 100644
--- a/fabric/src/main/java/biomesoplenty/fabric/mixin/MixinLiquidNullFluid.java
+++ b/fabric/src/main/java/biomesoplenty/fabric/mixin/MixinLiquidNullFluid.java
@@ -32,7 +32,7 @@
 @Mixin(FogRenderer.class)
 public abstract class MixinLiquidNullFluid
 {
-    @Inject(method = "computeFogColor", at = @At(value = "RETURN"))
+    @Inject(method = "computeFogColor", at = @At(value = "RETURN"), cancellable = true)
     private static void modifyFogColors(Camera camera, float f, ClientLevel level, int i, float g, CallbackInfoReturnable<Vector4f> cir)
     {
         BlockPos blockPos = camera.getBlockPosition();
@@ -46,7 +46,7 @@ private static void modifyFogColors(Camera camera, float f, ClientLevel level, i
 
         if(BOPFluids.LIQUID_NULL.isSame(fluid))
         {
-            cir.setReturnValue(new Vector4f(0.0F, 0.0F, 0.0F, 0.0F));
+            cir.setReturnValue(new Vector4f(0.6274509803921569F, 0.12549019607843137F, 0.9411764705882353F, 0.5F));
         }
     }