From c7c2921b2fa05b6d0fa9e6c2934c08fc84dcb71f Mon Sep 17 00:00:00 2001
From: Ben Staddon <bs2609@users.noreply.github.com>
Date: Sun, 29 Jul 2018 01:38:47 +0100
Subject: [PATCH] Fire colour events for mesa and swamp biomes (#5029)

---
 .../minecraft/world/biome/BiomeMesa.java.patch   | 16 ++++++++++++++++
 .../minecraft/world/biome/BiomeSwamp.java.patch  | 14 ++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeMesa.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomeMesa.java.patch
index c80c241140..5f13874f70 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeMesa.java.patch
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeMesa.java.patch
@@ -1,5 +1,21 @@
 --- ../src-base/minecraft/net/minecraft/world/biome/BiomeMesa.java
 +++ ../src-work/minecraft/net/minecraft/world/biome/BiomeMesa.java
+@@ -318,13 +318,13 @@
+     @SideOnly(Side.CLIENT)
+     public int func_180625_c(BlockPos p_180625_1_)
+     {
+-        return 10387789;
++        return getModdedBiomeFoliageColor(10387789);
+     }
+ 
+     @SideOnly(Side.CLIENT)
+     public int func_180627_b(BlockPos p_180627_1_)
+     {
+-        return 9470285;
++        return getModdedBiomeGrassColor(9470285);
+     }
+ 
+     class Decorator extends BiomeDecorator
 @@ -336,6 +336,7 @@
          protected void func_76797_b(World p_76797_1_, Random p_76797_2_)
          {
diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeSwamp.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomeSwamp.java.patch
index b728c8ba7a..b39501ffa4 100644
--- a/patches/minecraft/net/minecraft/world/biome/BiomeSwamp.java.patch
+++ b/patches/minecraft/net/minecraft/world/biome/BiomeSwamp.java.patch
@@ -8,9 +8,19 @@
          if (p_180624_2_.nextInt(64) == 0)
          {
              (new WorldGenFossils()).func_180709_b(p_180624_1_, p_180624_2_, p_180624_3_);
-@@ -97,4 +98,10 @@
+@@ -89,12 +90,18 @@
+     public int func_180627_b(BlockPos p_180627_1_)
      {
-         return 6975545;
+         double d0 = field_180281_af.func_151601_a((double)p_180627_1_.func_177958_n() * 0.0225D, (double)p_180627_1_.func_177952_p() * 0.0225D);
+-        return d0 < -0.1D ? 5011004 : 6975545;
++        return getModdedBiomeGrassColor(d0 < -0.1D ? 5011004 : 6975545);
+     }
+ 
+     @SideOnly(Side.CLIENT)
+     public int func_180625_c(BlockPos p_180625_1_)
+     {
+-        return 6975545;
++        return getModdedBiomeFoliageColor(6975545);
      }
 +
 +    @Override