From 549996b2709ade8f78d8d973208514cb80a8ff9f Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Sun, 28 Nov 2021 17:37:02 +0100
Subject: [PATCH] Fix underwater visibility (fixes #572)

Used to always be super short because that method returns 0 when `isSubmergedIn`
returns false.
---
 root.gradle.kts                                             | 2 +-
 src/main/java/com/replaymod/replay/camera/CameraEntity.java | 5 +++++
 versions/mapping-fabric-1.16.1-1.15.2.txt                   | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 versions/mapping-fabric-1.16.1-1.15.2.txt

diff --git a/root.gradle.kts b/root.gradle.kts
index f105140d..fe2af4b6 100755
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -212,7 +212,7 @@ preprocess {
     mc11701.link(mc11700)
     mc11700.link(mc11604, file("versions/mapping-fabric-1.17-1.16.4.txt"))
     mc11604.link(mc11601)
-    mc11601.link(mc11502)
+    mc11601.link(mc11502, file("versions/mapping-fabric-1.16.1-1.15.2.txt"))
     mc11502.link(mc11404, file("versions/mapping-fabric-1.15.2-1.14.4.txt"))
     mc11404.link(mc11404Forge, file("versions/mapping-1.14.4-fabric-forge.txt"))
     mc11404Forge.link(mc11202, file("versions/1.14.4-forge/mapping.txt"))
diff --git a/src/main/java/com/replaymod/replay/camera/CameraEntity.java b/src/main/java/com/replaymod/replay/camera/CameraEntity.java
index ba1b59e3..09716e7e 100644
--- a/src/main/java/com/replaymod/replay/camera/CameraEntity.java
+++ b/src/main/java/com/replaymod/replay/camera/CameraEntity.java
@@ -365,6 +365,11 @@ public class CameraEntity
     public boolean isSubmergedIn(Tag<Fluid> fluid) {
         return falseUnlessSpectating(entity -> entity.isSubmergedIn(fluid));
     }
+
+    @Override
+    public float getUnderwaterVisibility() {
+        return falseUnlessSpectating(__ -> true) ? super.getUnderwaterVisibility() : 1f;
+    }
     //#else
     //#if MC>=10800
     //$$ @Override
diff --git a/versions/mapping-fabric-1.16.1-1.15.2.txt b/versions/mapping-fabric-1.16.1-1.15.2.txt
new file mode 100644
index 00000000..1f8df9e4
--- /dev/null
+++ b/versions/mapping-fabric-1.16.1-1.15.2.txt
@@ -0,0 +1 @@
+net.minecraft.client.network.ClientPlayerEntity getUnderwaterVisibility() method_3140()