Update conventional tags to 22w17a (FabricMC#2169)

Make all tags have same line endings
Astrarre · May 1, 2022 · 6da0939 · 6da0939
1 parent aa505e0
commit 6da0939
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java
@@ -75,7 +75,8 @@ private void generateDimensionTags() {
 				.add(BiomeKeys.WOODED_BADLANDS).add(BiomeKeys.MEADOW).add(BiomeKeys.GROVE)
 				.add(BiomeKeys.SNOWY_SLOPES).add(BiomeKeys.FROZEN_PEAKS).add(BiomeKeys.JAGGED_PEAKS)
 				.add(BiomeKeys.STONY_PEAKS).add(BiomeKeys.MUSHROOM_FIELDS).add(BiomeKeys.DRIPSTONE_CAVES)
-				.add(BiomeKeys.LUSH_CAVES).add(BiomeKeys.SNOWY_BEACH).add(BiomeKeys.SWAMP).add(BiomeKeys.STONY_SHORE);
+				.add(BiomeKeys.LUSH_CAVES).add(BiomeKeys.SNOWY_BEACH).add(BiomeKeys.SWAMP).add(BiomeKeys.STONY_SHORE)
+				.add(BiomeKeys.DEEP_DARK).add(BiomeKeys.MANGROVE_SWAMP);
 	}
 
 	private void generateCategoryTags() {
@@ -122,6 +123,7 @@ private void generateCategoryTags() {
 		getOrCreateTagBuilder(ConventionalBiomeTags.RIVER)
 				.addOptionalTag(BiomeTags.IS_RIVER);
 		getOrCreateTagBuilder(ConventionalBiomeTags.SWAMP)
+				.add(BiomeKeys.MANGROVE_SWAMP)
 				.add(BiomeKeys.SWAMP);
 		getOrCreateTagBuilder(ConventionalBiomeTags.MUSHROOM)
 				.add(BiomeKeys.MUSHROOM_FIELDS);
@@ -136,6 +138,7 @@ private void generateOtherBiomeTypes() {
 				.addOptionalTag(ConventionalBiomeTags.MESA)
 				.addOptionalTag(BiomeTags.IS_BADLANDS);
 		getOrCreateTagBuilder(ConventionalBiomeTags.CAVES)
+				.add(BiomeKeys.DEEP_DARK)
 				.add(BiomeKeys.DRIPSTONE_CAVES)
 				.add(BiomeKeys.LUSH_CAVES);
 		getOrCreateTagBuilder(ConventionalBiomeTags.VOID)

diff --git a/...a/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java b/...a/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java
@@ -42,6 +42,7 @@ protected void generateTags() {
 				.add(Enchantments.POWER)
 				.add(Enchantments.SHARPNESS);
 		getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_MOVEMENT_ENHANCEMENT)
+				.add(Enchantments.SWIFT_SNEAK)
 				.add(Enchantments.DEPTH_STRIDER)
 				.add(Enchantments.SOUL_SPEED);
 		getOrCreateTagBuilder(ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENT)

diff --git a/...-tags-v1/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json b/...-tags-v1/src/generated/resources/data/c/tags/enchantment/entity_movement_enhancement.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
+    "minecraft:swift_sneak",
     "minecraft:depth_strider",
     "minecraft:soul_speed"
   ]

diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/caves.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/caves.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
+    "minecraft:deep_dark",
     "minecraft:dripstone_caves",
     "minecraft:lush_caves"
   ]

diff --git a/...c-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_overworld.json b/...c-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/in_overworld.json
@@ -50,6 +50,8 @@
     "minecraft:lush_caves",
     "minecraft:snowy_beach",
     "minecraft:swamp",
-    "minecraft:stony_shore"
+    "minecraft:stony_shore",
+    "minecraft:deep_dark",
+    "minecraft:mangrove_swamp"
   ]
 }
diff --git a/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/swamp.json b/fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/swamp.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
+    "minecraft:mangrove_swamp",
     "minecraft:swamp"
   ]
 }