From 56857cf5e79f414c6d41e46d0660cf4f887402b5 Mon Sep 17 00:00:00 2001
From: valoeghese <46117728+valoeghese@users.noreply.github.com>
Date: Thu, 29 Aug 2019 15:12:52 +1200
Subject: [PATCH] Added hook to allow biomes to specify custom river variants.
 (#5969)

---
 .../net/minecraft/world/biome/Biome.java.patch    | 15 ++++++++++++++-
 .../world/gen/layer/MixRiverLayer.java.patch      | 15 +++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 patches/minecraft/net/minecraft/world/gen/layer/MixRiverLayer.java.patch

diff --git a/patches/minecraft/net/minecraft/world/biome/Biome.java.patch b/patches/minecraft/net/minecraft/world/biome/Biome.java.patch
index ffcf9a00e..3df1066b2 100644
--- a/patches/minecraft/net/minecraft/world/biome/Biome.java.patch
+++ b/patches/minecraft/net/minecraft/world/biome/Biome.java.patch
@@ -41,7 +41,20 @@
                 return true;
              }
           }
-@@ -526,6 +526,18 @@
+@@ -375,6 +375,12 @@
+       return this.field_185364_H;
+    }
+ 
++   public Biome getRiver() {
++      if (this == Biomes.field_76774_n) return Biomes.field_76777_m;
++      if (this == Biomes.field_76789_p || this == Biomes.field_76788_q) return Biomes.field_76788_q;
++      return Biomes.field_76781_i;
++   }
++
+    public static class Builder {
+       @Nullable
+       private ConfiguredSurfaceBuilder<?> field_205422_a;
+@@ -526,6 +532,18 @@
        }
     }
  
diff --git a/patches/minecraft/net/minecraft/world/gen/layer/MixRiverLayer.java.patch b/patches/minecraft/net/minecraft/world/gen/layer/MixRiverLayer.java.patch
new file mode 100644
index 000000000..922fa6b45
--- /dev/null
+++ b/patches/minecraft/net/minecraft/world/gen/layer/MixRiverLayer.java.patch
@@ -0,0 +1,15 @@
+--- a/net/minecraft/world/gen/layer/MixRiverLayer.java
++++ b/net/minecraft/world/gen/layer/MixRiverLayer.java
+@@ -22,11 +22,7 @@
+       if (LayerUtil.func_202827_a(i)) {
+          return i;
+       } else if (j == field_202725_h) {
+-         if (i == field_202721_d) {
+-            return field_202720_c;
+-         } else {
+-            return i != field_202722_e && i != field_202723_f ? j & 255 : field_202723_f;
+-         }
++         return Registry.field_212624_m.func_148757_b(Registry.field_212624_m.func_148745_a(i).getRiver());
+       } else {
+          return i;
+       }