From d578d8f6dfb1f519c378dde66a81abc91ed3b9da Mon Sep 17 00:00:00 2001
From: Ketok <70479035+Ketok4321@users.noreply.github.com>
Date: Tue, 28 Jun 2022 05:08:21 +0200
Subject: [PATCH] Add biome tag entries for 1.19 biomes (#8684)

---
 .../resources/data/forge/tags/worldgen/biome/is_hot.json      | 3 ++-
 .../data/forge/tags/worldgen/biome/is_hot/overworld.json      | 3 ++-
 .../data/forge/tags/worldgen/biome/is_overworld.json          | 4 +++-
 .../resources/data/forge/tags/worldgen/biome/is_rare.json     | 3 ++-
 .../resources/data/forge/tags/worldgen/biome/is_spooky.json   | 3 ++-
 .../resources/data/forge/tags/worldgen/biome/is_swamp.json    | 3 ++-
 .../data/forge/tags/worldgen/biome/is_underground.json        | 3 ++-
 .../resources/data/forge/tags/worldgen/biome/is_wet.json      | 3 ++-
 .../data/forge/tags/worldgen/biome/is_wet/overworld.json      | 3 ++-
 .../minecraftforge/common/data/ForgeBiomeTagsProvider.java    | 2 ++
 10 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_hot.json b/src/generated/resources/data/forge/tags/worldgen/biome/is_hot.json
index f4aec3d0fc..07eb3e7d1b 100644
--- a/src/generated/resources/data/forge/tags/worldgen/biome/is_hot.json
+++ b/src/generated/resources/data/forge/tags/worldgen/biome/is_hot.json
@@ -14,6 +14,7 @@
     "minecraft:soul_sand_valley",
     "minecraft:crimson_forest",
     "minecraft:warped_forest",
-    "minecraft:basalt_deltas"
+    "minecraft:basalt_deltas",
+    "minecraft:mangrove_swamp"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_hot/overworld.json b/src/generated/resources/data/forge/tags/worldgen/biome/is_hot/overworld.json
index 006af083b4..f283627eb9 100644
--- a/src/generated/resources/data/forge/tags/worldgen/biome/is_hot/overworld.json
+++ b/src/generated/resources/data/forge/tags/worldgen/biome/is_hot/overworld.json
@@ -9,6 +9,7 @@
     "minecraft:warm_ocean",
     "minecraft:windswept_savanna",
     "minecraft:eroded_badlands",
-    "minecraft:bamboo_jungle"
+    "minecraft:bamboo_jungle",
+    "minecraft:mangrove_swamp"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_overworld.json b/src/generated/resources/data/forge/tags/worldgen/biome/is_overworld.json
index 79caff7089..ca7f203314 100644
--- a/src/generated/resources/data/forge/tags/worldgen/biome/is_overworld.json
+++ b/src/generated/resources/data/forge/tags/worldgen/biome/is_overworld.json
@@ -49,6 +49,8 @@
     "minecraft:eroded_badlands",
     "minecraft:bamboo_jungle",
     "minecraft:lush_caves",
-    "minecraft:dripstone_caves"
+    "minecraft:dripstone_caves",
+    "minecraft:mangrove_swamp",
+    "minecraft:deep_dark"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_rare.json b/src/generated/resources/data/forge/tags/worldgen/biome/is_rare.json
index 8b986a6a5e..490abd4392 100644
--- a/src/generated/resources/data/forge/tags/worldgen/biome/is_rare.json
+++ b/src/generated/resources/data/forge/tags/worldgen/biome/is_rare.json
@@ -11,6 +11,7 @@
     "minecraft:old_growth_spruce_taiga",
     "minecraft:windswept_savanna",
     "minecraft:eroded_badlands",
-    "minecraft:bamboo_jungle"
+    "minecraft:bamboo_jungle",
+    "minecraft:deep_dark"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_spooky.json b/src/generated/resources/data/forge/tags/worldgen/biome/is_spooky.json
index 2d31b9e8e4..9255238fa6 100644
--- a/src/generated/resources/data/forge/tags/worldgen/biome/is_spooky.json
+++ b/src/generated/resources/data/forge/tags/worldgen/biome/is_spooky.json
@@ -1,5 +1,6 @@
 {
   "values": [
-    "minecraft:dark_forest"
+    "minecraft:dark_forest",
+    "minecraft:deep_dark"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_swamp.json b/src/generated/resources/data/forge/tags/worldgen/biome/is_swamp.json
index 6afa257544..0f5eb22e0c 100644
--- a/src/generated/resources/data/forge/tags/worldgen/biome/is_swamp.json
+++ b/src/generated/resources/data/forge/tags/worldgen/biome/is_swamp.json
@@ -1,5 +1,6 @@
 {
   "values": [
-    "minecraft:swamp"
+    "minecraft:swamp",
+    "minecraft:mangrove_swamp"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_underground.json b/src/generated/resources/data/forge/tags/worldgen/biome/is_underground.json
index b01b1bd909..21a70cfeec 100644
--- a/src/generated/resources/data/forge/tags/worldgen/biome/is_underground.json
+++ b/src/generated/resources/data/forge/tags/worldgen/biome/is_underground.json
@@ -1,6 +1,7 @@
 {
   "values": [
     "minecraft:lush_caves",
-    "minecraft:dripstone_caves"
+    "minecraft:dripstone_caves",
+    "minecraft:deep_dark"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_wet.json b/src/generated/resources/data/forge/tags/worldgen/biome/is_wet.json
index 628eed2b87..1fdb1e12b0 100644
--- a/src/generated/resources/data/forge/tags/worldgen/biome/is_wet.json
+++ b/src/generated/resources/data/forge/tags/worldgen/biome/is_wet.json
@@ -5,6 +5,7 @@
     "minecraft:sparse_jungle",
     "minecraft:sparse_jungle",
     "minecraft:bamboo_jungle",
-    "minecraft:lush_caves"
+    "minecraft:lush_caves",
+    "minecraft:mangrove_swamp"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_wet/overworld.json b/src/generated/resources/data/forge/tags/worldgen/biome/is_wet/overworld.json
index c7b9b20695..b69dd10d0b 100644
--- a/src/generated/resources/data/forge/tags/worldgen/biome/is_wet/overworld.json
+++ b/src/generated/resources/data/forge/tags/worldgen/biome/is_wet/overworld.json
@@ -3,6 +3,7 @@
     "minecraft:swamp",
     "minecraft:jungle",
     "minecraft:bamboo_jungle",
-    "minecraft:lush_caves"
+    "minecraft:lush_caves",
+    "minecraft:mangrove_swamp"
   ]
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java
index 4fd11c655f..da93d2effa 100644
--- a/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java
+++ b/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java
@@ -86,6 +86,8 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider
         tag(Biomes.CRIMSON_FOREST, Tags.Biomes.IS_HOT, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY, Tags.Biomes.IS_DRY_NETHER);
         tag(Biomes.WARPED_FOREST, Tags.Biomes.IS_HOT, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY, Tags.Biomes.IS_DRY_NETHER);
         tag(Biomes.BASALT_DELTAS, Tags.Biomes.IS_HOT, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY, Tags.Biomes.IS_DRY_NETHER);
+        tag(Biomes.MANGROVE_SWAMP, Tags.Biomes.IS_WET, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_HOT, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_SWAMP, Tags.Biomes.IS_OVERWORLD);
+        tag(Biomes.DEEP_DARK, Tags.Biomes.IS_UNDERGROUND, Tags.Biomes.IS_RARE, Tags.Biomes.IS_SPOOKY, Tags.Biomes.IS_OVERWORLD);
 
         tag(Tags.Biomes.IS_WATER).addTag(BiomeTags.IS_OCEAN).addTag(BiomeTags.IS_RIVER);
         tag(Tags.Biomes.IS_MOUNTAIN).addTag(Tags.Biomes.IS_PEAK).addTag(Tags.Biomes.IS_SLOPE);