From bc6c4be4e4de390b1708f3935880f3ce768739fa Mon Sep 17 00:00:00 2001
From: "J.T. McQuigg" <J.T.McQuigg12@gmail.com>
Date: Mon, 26 Sep 2022 14:08:24 -0400
Subject: [PATCH] Fix is_desert tag not being applied correctly. (#9051)

---
 .../resources/data/forge/tags/worldgen/biome/is_desert.json  | 5 +++++
 .../resources/data/forge/tags/worldgen/biome/is_hot.json     | 1 -
 .../resources/data/forge/tags/worldgen/biome/is_wet.json     | 1 -
 .../minecraftforge/common/data/ForgeBiomeTagsProvider.java   | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 src/generated/resources/data/forge/tags/worldgen/biome/is_desert.json

diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_desert.json b/src/generated/resources/data/forge/tags/worldgen/biome/is_desert.json
new file mode 100644
index 0000000000..f1a8ccb642
--- /dev/null
+++ b/src/generated/resources/data/forge/tags/worldgen/biome/is_desert.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:desert"
+  ]
+}
\ No newline at end of file
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 43c55b0c91..6559f017e6 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
@@ -1,6 +1,5 @@
 {
   "values": [
-    "minecraft:mangrove_swamp",
     "#forge:is_hot/overworld",
     "#forge:is_hot/nether",
     {
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 b057580fa9..b355261275 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
@@ -1,6 +1,5 @@
 {
   "values": [
-    "minecraft:mangrove_swamp",
     "#forge:is_wet/overworld",
     {
       "id": "#forge:is_wet/nether",
diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java
index 5a283635c7..e812ca2f58 100644
--- a/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java
+++ b/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java
@@ -26,7 +26,7 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider
     protected void addTags()
     {
         tag(Biomes.PLAINS, Tags.Biomes.IS_PLAINS);
-        tag(Biomes.DESERT, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_DRY_OVERWORLD, Tags.Biomes.IS_SANDY);
+        tag(Biomes.DESERT, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_DRY_OVERWORLD, Tags.Biomes.IS_SANDY, Tags.Biomes.IS_DESERT);
         tag(Biomes.TAIGA, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_CONIFEROUS);
         tag(Biomes.SWAMP, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_SWAMP);
         tag(Biomes.NETHER_WASTES, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER);
@@ -77,7 +77,7 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider
         tag(Biomes.CRIMSON_FOREST, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER);
         tag(Biomes.WARPED_FOREST, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER);
         tag(Biomes.BASALT_DELTAS, Tags.Biomes.IS_HOT_NETHER, 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);
+        tag(Biomes.MANGROVE_SWAMP, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_SWAMP);
         tag(Biomes.DEEP_DARK, Tags.Biomes.IS_CAVE, Tags.Biomes.IS_RARE, Tags.Biomes.IS_SPOOKY);
 
         tag(Tags.Biomes.IS_HOT).addTag(Tags.Biomes.IS_HOT_OVERWORLD).addTag(Tags.Biomes.IS_HOT_NETHER).addOptionalTag(Tags.Biomes.IS_HOT_END.location());