From ef3408c1ebca8fc9efc29c24b3806c298c8e7a60 Mon Sep 17 00:00:00 2001
From: Girafi <faj10@msn.com>
Date: Thu, 20 Jan 2022 21:21:45 +0100
Subject: [PATCH] Added new 1.18 biomes to the BiomeDictionary (#8246)

---
 .../common/BiomeDictionary.java               | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/minecraftforge/common/BiomeDictionary.java b/src/main/java/net/minecraftforge/common/BiomeDictionary.java
index 59fc089c59..2a5dc069b6 100644
--- a/src/main/java/net/minecraftforge/common/BiomeDictionary.java
+++ b/src/main/java/net/minecraftforge/common/BiomeDictionary.java
@@ -88,7 +88,6 @@ public class BiomeDictionary
         public static final Type MESA = new Type("MESA");
         public static final Type FOREST = new Type("FOREST");
         public static final Type PLAINS = new Type("PLAINS");
-        public static final Type MOUNTAIN = new Type("MOUNTAIN");
         public static final Type HILLS = new Type("HILLS");
         public static final Type SWAMP = new Type("SWAMP");
         public static final Type SANDY = new Type("SANDY");
@@ -96,6 +95,12 @@ public class BiomeDictionary
         public static final Type WASTELAND = new Type("WASTELAND");
         public static final Type BEACH = new Type("BEACH");
         public static final Type VOID = new Type("VOID");
+        public static final Type UNDERGROUND = new Type("UNDERGROUND");
+
+        /*Mountain related tags*/
+        public static final Type PEAK = new Type("PEAK");
+        public static final Type SLOPE = new Type("SLOPE");
+        public static final Type MOUNTAIN = new Type("MOUNTAIN", PEAK, SLOPE);
 
         /*Tags specifying the dimension a biome generates in. Specifying none implies a biome that generates in a modded dimension*/
         public static final Type OVERWORLD = new Type("OVERWORLD");
@@ -302,7 +307,7 @@ public class BiomeDictionary
         addTypes(Biomes.OCEAN, OCEAN, OVERWORLD);
         addTypes(Biomes.PLAINS, PLAINS, OVERWORLD);
         addTypes(Biomes.DESERT, HOT, DRY, SANDY, OVERWORLD);
-        addTypes(Biomes.WINDSWEPT_HILLS, MOUNTAIN, HILLS, OVERWORLD);
+        addTypes(Biomes.WINDSWEPT_HILLS, HILLS, OVERWORLD);
         addTypes(Biomes.FOREST, FOREST, OVERWORLD);
         addTypes(Biomes.TAIGA, COLD, CONIFEROUS, FOREST, OVERWORLD);
         addTypes(Biomes.SWAMP, WET, SWAMP, OVERWORLD);
@@ -323,11 +328,17 @@ public class BiomeDictionary
         addTypes(Biomes.DARK_FOREST, SPOOKY, DENSE, FOREST, OVERWORLD);
         addTypes(Biomes.SNOWY_TAIGA, COLD, CONIFEROUS, FOREST, SNOWY, OVERWORLD);
         addTypes(Biomes.OLD_GROWTH_PINE_TAIGA, COLD, CONIFEROUS, FOREST, OVERWORLD);
-        addTypes(Biomes.WINDSWEPT_FOREST, MOUNTAIN, FOREST, SPARSE, OVERWORLD);
+        addTypes(Biomes.WINDSWEPT_FOREST, HILLS, FOREST, SPARSE, OVERWORLD);
         addTypes(Biomes.SAVANNA, HOT, SAVANNA, PLAINS, SPARSE, OVERWORLD);
-        addTypes(Biomes.SAVANNA_PLATEAU, HOT, SAVANNA, PLAINS, SPARSE, RARE, OVERWORLD, PLATEAU);
+        addTypes(Biomes.SAVANNA_PLATEAU, HOT, SAVANNA, PLAINS, SPARSE, RARE, OVERWORLD, SLOPE, PLATEAU);
         addTypes(Biomes.BADLANDS, MESA, SANDY, DRY, OVERWORLD);
-        addTypes(Biomes.WOODED_BADLANDS, MESA, SANDY, DRY, SPARSE, OVERWORLD, PLATEAU);
+        addTypes(Biomes.WOODED_BADLANDS, MESA, SANDY, DRY, SPARSE, OVERWORLD, SLOPE, PLATEAU);
+        addTypes(Biomes.MEADOW, PLAINS, PLATEAU, SLOPE, OVERWORLD);
+        addTypes(Biomes.GROVE, COLD, CONIFEROUS, FOREST, SNOWY, SLOPE, OVERWORLD);
+        addTypes(Biomes.SNOWY_SLOPES, COLD, SPARSE, SNOWY, SLOPE, OVERWORLD);
+        addTypes(Biomes.JAGGED_PEAKS, COLD, SPARSE, SNOWY, PEAK, OVERWORLD);
+        addTypes(Biomes.FROZEN_PEAKS, COLD, SPARSE, SNOWY, PEAK, OVERWORLD);
+        addTypes(Biomes.STONY_PEAKS, HOT, PEAK, OVERWORLD);
         addTypes(Biomes.SMALL_END_ISLANDS, END);
         addTypes(Biomes.END_MIDLANDS, END);
         addTypes(Biomes.END_HIGHLANDS, END);
@@ -340,14 +351,16 @@ public class BiomeDictionary
         addTypes(Biomes.DEEP_FROZEN_OCEAN, OCEAN, COLD, OVERWORLD);
         addTypes(Biomes.THE_VOID, VOID);
         addTypes(Biomes.SUNFLOWER_PLAINS, PLAINS, RARE, OVERWORLD);
-        addTypes(Biomes.WINDSWEPT_GRAVELLY_HILLS, MOUNTAIN, SPARSE, RARE, OVERWORLD);
-        addTypes(Biomes.FLOWER_FOREST, FOREST, HILLS, RARE, OVERWORLD);
-        addTypes(Biomes.ICE_SPIKES, COLD, SNOWY, HILLS, RARE, OVERWORLD);
-        addTypes(Biomes.OLD_GROWTH_BIRCH_FOREST, FOREST, DENSE, HILLS, RARE, OVERWORLD);
+        addTypes(Biomes.WINDSWEPT_GRAVELLY_HILLS, HILLS, SPARSE, RARE, OVERWORLD);
+        addTypes(Biomes.FLOWER_FOREST, FOREST, RARE, OVERWORLD);
+        addTypes(Biomes.ICE_SPIKES, COLD, SNOWY, RARE, OVERWORLD);
+        addTypes(Biomes.OLD_GROWTH_BIRCH_FOREST, FOREST, DENSE, RARE, OVERWORLD);
         addTypes(Biomes.OLD_GROWTH_SPRUCE_TAIGA, DENSE, FOREST, RARE, OVERWORLD);
-        addTypes(Biomes.WINDSWEPT_SAVANNA, HOT, DRY, SPARSE, SAVANNA, MOUNTAIN, RARE, OVERWORLD);
-        addTypes(Biomes.ERODED_BADLANDS, HOT, DRY, SPARSE, MOUNTAIN, RARE, OVERWORLD);
+        addTypes(Biomes.WINDSWEPT_SAVANNA, HOT, DRY, SPARSE, SAVANNA, HILLS, RARE, OVERWORLD);
+        addTypes(Biomes.ERODED_BADLANDS, MESA, HOT, DRY, SPARSE, RARE, OVERWORLD);
         addTypes(Biomes.BAMBOO_JUNGLE, HOT, WET, RARE, JUNGLE, OVERWORLD);
+        addTypes(Biomes.LUSH_CAVES, UNDERGROUND, LUSH, WET, OVERWORLD);
+        addTypes(Biomes.DRIPSTONE_CAVES, UNDERGROUND, SPARSE, OVERWORLD);
         addTypes(Biomes.SOUL_SAND_VALLEY, HOT, DRY, NETHER);
         addTypes(Biomes.CRIMSON_FOREST, HOT, DRY, NETHER, FOREST);
         addTypes(Biomes.WARPED_FOREST, HOT, DRY, NETHER, FOREST);