Sync with fabric tags

src/generated/resources/assets/c/lang/en_us.json

@@ -299,6 +299,7 @@
   "tag.item.c.ores_in_ground.stone": "Stone Ores In Ground",
   "tag.item.c.player_workstations.crafting_tables": "Crafting Tables",
   "tag.item.c.player_workstations.furnaces": "Furnaces",
+  "tag.item.c.potions": "Potions",
   "tag.item.c.raw_materials": "Raw Materials",
   "tag.item.c.raw_materials.copper": "Copper Raw Materials",
   "tag.item.c.raw_materials.gold": "Gold Raw Materials",
@@ -425,6 +426,10 @@
   "tag.worldgen.biome.c.is_stony_shores": "Stony Shores",
   "tag.worldgen.biome.c.is_swamp": "Swamps",
   "tag.worldgen.biome.c.is_taiga": "Taiga",
+  "tag.worldgen.biome.c.is_temperate": "Temperate",
+  "tag.worldgen.biome.c.is_temperate.end": "Temperate End",
+  "tag.worldgen.biome.c.is_temperate.nether": "Temperate Nether",
+  "tag.worldgen.biome.c.is_temperate.overworld": "Temperate Overworld",
   "tag.worldgen.biome.c.is_tree.coniferous": "Coniferous Trees",
   "tag.worldgen.biome.c.is_tree.deciduous": "Deciduous Trees",
   "tag.worldgen.biome.c.is_tree.jungle": "Jungle Trees",

src/generated/resources/data/c/tags/item/potions.json

@@ -0,0 +1,7 @@
+{
+  "values": [
+    "minecraft:potion",
+    "minecraft:splash_potion",
+    "minecraft:lingering_potion"
+  ]
+}

src/generated/resources/data/c/tags/worldgen/biome/is_cold.json

@@ -1,10 +1,7 @@
 {
   "values": [
     "#c:is_cold/overworld",
-    {
-      "id": "#c:is_cold/nether",
-      "required": false
-    },
+    "#c:is_cold/nether",
     "#c:is_cold/end",
     {
       "id": "#forge:is_cold",

src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json

@@ -1,14 +1,8 @@
 {
   "values": [
     "#c:is_dense_vegetation/overworld",
-    {
-      "id": "#c:is_dense_vegetation/nether",
-      "required": false
-    },
-    {
-      "id": "#c:is_dense_vegetation/end",
-      "required": false
-    },
+    "#c:is_dense_vegetation/nether",
+    "#c:is_dense_vegetation/end",
     {
       "id": "#forge:is_dense",
       "required": false

src/generated/resources/data/c/tags/worldgen/biome/is_hot.json

@@ -2,10 +2,7 @@
   "values": [
     "#c:is_hot/overworld",
     "#c:is_hot/nether",
-    {
-      "id": "#c:is_hot/end",
-      "required": false
-    },
+    "#c:is_hot/end",
     {
       "id": "#forge:is_hot",
       "required": false

src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json

@@ -1,6 +1,5 @@
 {
   "values": [
-    "minecraft:swamp",
     "minecraft:mangrove_swamp",
     "minecraft:jungle",
     "minecraft:bamboo_jungle",

src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json

@@ -1,14 +1,8 @@
 {
   "values": [
     "#c:is_sparse_vegetation/overworld",
-    {
-      "id": "#c:is_sparse_vegetation/nether",
-      "required": false
-    },
-    {
-      "id": "#c:is_sparse_vegetation/end",
-      "required": false
-    },
+    "#c:is_sparse_vegetation/nether",
+    "#c:is_sparse_vegetation/end",
     {
       "id": "#forge:is_sparse_vegetation",
       "required": false

src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json

@@ -0,0 +1,7 @@
+{
+  "values": [
+    "#c:is_temperate/overworld",
+    "#c:is_temperate/nether",
+    "#c:is_temperate/end"
+  ]
+}

src/generated/resources/data/c/tags/worldgen/biome/is_temperate/end.json

@@ -0,0 +1,3 @@
+{
+  "values": []
+}

src/generated/resources/data/c/tags/worldgen/biome/is_temperate/nether.json

@@ -0,0 +1,3 @@
+{
+  "values": []
+}

src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json

@@ -0,0 +1,17 @@
+{
+  "values": [
+    "minecraft:plains",
+    "minecraft:sunflower_plains",
+    "minecraft:forest",
+    "minecraft:flower_forest",
+    "minecraft:birch_forest",
+    "minecraft:old_growth_birch_forest",
+    "minecraft:dark_forest",
+    "minecraft:cherry_grove",
+    "minecraft:meadow",
+    "minecraft:swamp",
+    "minecraft:beach",
+    "minecraft:ocean",
+    "minecraft:deep_ocean"
+  ]
+}

src/generated/resources/data/c/tags/worldgen/biome/is_wet.json

@@ -1,14 +1,8 @@
 {
   "values": [
     "#c:is_wet/overworld",
-    {
-      "id": "#c:is_wet/nether",
-      "required": false
-    },
-    {
-      "id": "#c:is_wet/end",
-      "required": false
-    },
+    "#c:is_wet/nether",
+    "#c:is_wet/end",
     {
       "id": "#forge:is_wet",
       "required": false

src/main/java/net/neoforged/neoforge/common/Tags.java

@@ -550,6 +550,10 @@ public static class Items {
         public static final TagKey<Item> ORES_IN_GROUND_STONE = tag("ores_in_ground/stone");
         public static final TagKey<Item> PLAYER_WORKSTATIONS_CRAFTING_TABLES = tag("player_workstations/crafting_tables");
         public static final TagKey<Item> PLAYER_WORKSTATIONS_FURNACES = tag("player_workstations/furnaces");
+        /**
+         * All kinds of potion items that can hold various effects including splash and lingering potions from vanilla.
+         */
+        public static final TagKey<Item> POTIONS = tag("potions");
         public static final TagKey<Item> RAW_MATERIALS = tag("raw_materials");
         public static final TagKey<Item> RAW_MATERIALS_COPPER = tag("raw_materials/copper");
         public static final TagKey<Item> RAW_MATERIALS_GOLD = tag("raw_materials/gold");
@@ -887,6 +891,11 @@ public static class Biomes {
         public static final TagKey<Biome> IS_COLD_NETHER = tag("is_cold/nether");
         public static final TagKey<Biome> IS_COLD_END = tag("is_cold/end");
 
+        public static final TagKey<Biome> IS_TEMPERATE = tag("is_temperate");
+        public static final TagKey<Biome> IS_TEMPERATE_OVERWORLD = tag("is_temperate/overworld");
+        public static final TagKey<Biome> IS_TEMPERATE_NETHER = tag("is_temperate/nether");
+        public static final TagKey<Biome> IS_TEMPERATE_END = tag("is_temperate/end");
+
         public static final TagKey<Biome> IS_SPARSE_VEGETATION = tag("is_sparse_vegetation");
         public static final TagKey<Biome> IS_SPARSE_VEGETATION_OVERWORLD = tag("is_sparse_vegetation/overworld");
         public static final TagKey<Biome> IS_SPARSE_VEGETATION_NETHER = tag("is_sparse_vegetation/nether");

src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBiomeTagsProvider.java

@@ -35,7 +35,6 @@ protected void addTags(HolderLookup.Provider lookupProvider) {
         tag(Tags.Biomes.IS_OVERWORLD).addTags(BiomeTags.IS_OVERWORLD);
 
         tag(Tags.Biomes.IS_HOT_OVERWORLD)
-                .add(Biomes.SWAMP)
                 .add(Biomes.MANGROVE_SWAMP)
                 .add(Biomes.JUNGLE)
                 .add(Biomes.BAMBOO_JUNGLE)
@@ -56,7 +55,7 @@ protected void addTags(HolderLookup.Provider lookupProvider) {
                 .add(Biomes.SOUL_SAND_VALLEY)
                 .add(Biomes.BASALT_DELTAS);
         tag(Tags.Biomes.IS_HOT_END);
-        tag(Tags.Biomes.IS_HOT).addTag(Tags.Biomes.IS_HOT_OVERWORLD).addTag(Tags.Biomes.IS_HOT_NETHER).addOptionalTag(Tags.Biomes.IS_HOT_END.location());
+        tag(Tags.Biomes.IS_HOT).addTag(Tags.Biomes.IS_HOT_OVERWORLD).addTag(Tags.Biomes.IS_HOT_NETHER).addTag(Tags.Biomes.IS_HOT_END);
 
         tag(Tags.Biomes.IS_COLD_OVERWORLD)
                 .add(Biomes.TAIGA)
@@ -86,7 +85,25 @@ protected void addTags(HolderLookup.Provider lookupProvider) {
                 .add(Biomes.END_MIDLANDS)
                 .add(Biomes.END_HIGHLANDS)
                 .add(Biomes.END_BARRENS);
-        tag(Tags.Biomes.IS_COLD).addTag(Tags.Biomes.IS_COLD_OVERWORLD).addOptionalTag(Tags.Biomes.IS_COLD_NETHER.location()).addTag(Tags.Biomes.IS_COLD_END);
+        tag(Tags.Biomes.IS_COLD).addTag(Tags.Biomes.IS_COLD_OVERWORLD).addTag(Tags.Biomes.IS_COLD_NETHER).addTag(Tags.Biomes.IS_COLD_END);
+
+        tag(Tags.Biomes.IS_TEMPERATE_OVERWORLD)
+                .add(Biomes.PLAINS)
+                .add(Biomes.SUNFLOWER_PLAINS)
+                .add(Biomes.FOREST)
+                .add(Biomes.FLOWER_FOREST)
+                .add(Biomes.BIRCH_FOREST)
+                .add(Biomes.OLD_GROWTH_BIRCH_FOREST)
+                .add(Biomes.DARK_FOREST)
+                .add(Biomes.CHERRY_GROVE)
+                .add(Biomes.MEADOW)
+                .add(Biomes.SWAMP)
+                .add(Biomes.BEACH)
+                .add(Biomes.OCEAN)
+                .add(Biomes.DEEP_OCEAN);
+        tag(Tags.Biomes.IS_TEMPERATE_NETHER);
+        tag(Tags.Biomes.IS_TEMPERATE_END);
+        tag(Tags.Biomes.IS_TEMPERATE).addTag(Tags.Biomes.IS_TEMPERATE_OVERWORLD).addTag(Tags.Biomes.IS_TEMPERATE_NETHER).addTag(Tags.Biomes.IS_TEMPERATE_END);
 
         tag(Tags.Biomes.IS_SPARSE_VEGETATION_OVERWORLD)
                 .add(Biomes.WOODED_BADLANDS)
@@ -102,7 +119,7 @@ protected void addTags(HolderLookup.Provider lookupProvider) {
                 .add(Biomes.FROZEN_PEAKS);
         tag(Tags.Biomes.IS_SPARSE_VEGETATION_NETHER);
         tag(Tags.Biomes.IS_SPARSE_VEGETATION_END);
-        tag(Tags.Biomes.IS_SPARSE_VEGETATION).addTag(Tags.Biomes.IS_SPARSE_VEGETATION_OVERWORLD).addOptionalTag(Tags.Biomes.IS_SPARSE_VEGETATION_NETHER.location()).addOptionalTag(Tags.Biomes.IS_SPARSE_VEGETATION_END.location());
+        tag(Tags.Biomes.IS_SPARSE_VEGETATION).addTag(Tags.Biomes.IS_SPARSE_VEGETATION_OVERWORLD).addTag(Tags.Biomes.IS_SPARSE_VEGETATION_NETHER).addTag(Tags.Biomes.IS_SPARSE_VEGETATION_END);
 
         tag(Tags.Biomes.IS_DENSE_VEGETATION_OVERWORLD)
                 .add(Biomes.DARK_FOREST)
@@ -113,7 +130,7 @@ protected void addTags(HolderLookup.Provider lookupProvider) {
                 .add(Biomes.MANGROVE_SWAMP);
         tag(Tags.Biomes.IS_DENSE_VEGETATION_NETHER);
         tag(Tags.Biomes.IS_DENSE_VEGETATION_END);
-        tag(Tags.Biomes.IS_DENSE_VEGETATION).addTag(Tags.Biomes.IS_DENSE_VEGETATION_OVERWORLD).addOptionalTag(Tags.Biomes.IS_DENSE_VEGETATION_NETHER.location()).addOptionalTag(Tags.Biomes.IS_DENSE_VEGETATION_END.location());
+        tag(Tags.Biomes.IS_DENSE_VEGETATION).addTag(Tags.Biomes.IS_DENSE_VEGETATION_OVERWORLD).addTag(Tags.Biomes.IS_DENSE_VEGETATION_NETHER).addTag(Tags.Biomes.IS_DENSE_VEGETATION_END);
 
         tag(Tags.Biomes.IS_WET_OVERWORLD)
                 .add(Biomes.SWAMP)
@@ -126,7 +143,7 @@ protected void addTags(HolderLookup.Provider lookupProvider) {
                 .add(Biomes.DRIPSTONE_CAVES);
         tag(Tags.Biomes.IS_WET_NETHER);
         tag(Tags.Biomes.IS_WET_END);
-        tag(Tags.Biomes.IS_WET).addTag(Tags.Biomes.IS_WET_OVERWORLD).addOptionalTag(Tags.Biomes.IS_WET_NETHER.location()).addOptionalTag(Tags.Biomes.IS_WET_END.location());
+        tag(Tags.Biomes.IS_WET).addTag(Tags.Biomes.IS_WET_OVERWORLD).addTag(Tags.Biomes.IS_WET_NETHER).addTag(Tags.Biomes.IS_WET_END);
 
         tag(Tags.Biomes.IS_DRY_OVERWORLD)
                 .add(Biomes.DESERT)

src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java

@@ -196,6 +196,7 @@ public void addTags(HolderLookup.Provider lookupProvider) {
         copy(Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.ORES_IN_GROUND_STONE);
         copy(Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES, Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES);
         copy(Tags.Blocks.PLAYER_WORKSTATIONS_FURNACES, Tags.Items.PLAYER_WORKSTATIONS_FURNACES);
+        tag(Tags.Items.POTIONS).add(Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION);
         tag(Tags.Items.RAW_MATERIALS).addTags(Tags.Items.RAW_MATERIALS_COPPER, Tags.Items.RAW_MATERIALS_GOLD, Tags.Items.RAW_MATERIALS_IRON);
         tag(Tags.Items.RAW_MATERIALS_COPPER).add(Items.RAW_COPPER);
         tag(Tags.Items.RAW_MATERIALS_GOLD).add(Items.RAW_GOLD);

src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java

@@ -274,6 +274,7 @@ protected void addTranslations() {
         add(Tags.Items.ORES_IN_GROUND_STONE, "Stone Ores In Ground");
         add(Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES, "Crafting Tables");
         add(Tags.Items.PLAYER_WORKSTATIONS_FURNACES, "Furnaces");
+        add(Tags.Items.POTIONS, "Potions");
         add(Tags.Items.RAW_MATERIALS, "Raw Materials");
         add(Tags.Items.RAW_MATERIALS_COPPER, "Copper Raw Materials");
         add(Tags.Items.RAW_MATERIALS_GOLD, "Gold Raw Materials");
@@ -384,6 +385,10 @@ protected void addTranslations() {
         add(Tags.Biomes.IS_COLD_OVERWORLD, "Cold Overworld");
         add(Tags.Biomes.IS_COLD_NETHER, "Cold Nether");
         add(Tags.Biomes.IS_COLD_END, "Cold End");
+        add(Tags.Biomes.IS_TEMPERATE, "Temperate");
+        add(Tags.Biomes.IS_TEMPERATE_OVERWORLD, "Temperate Overworld");
+        add(Tags.Biomes.IS_TEMPERATE_NETHER, "Temperate Nether");
+        add(Tags.Biomes.IS_TEMPERATE_END, "Temperate End");
         add(Tags.Biomes.IS_SPARSE_VEGETATION, "Sparse Vegetation");
         add(Tags.Biomes.IS_SPARSE_VEGETATION_OVERWORLD, "Sparse Overworld Vegetation");
         add(Tags.Biomes.IS_SPARSE_VEGETATION_NETHER, "Sparse Nether Vegetation");