Merge branch '1.21.x' into SyncToFabricTags

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

@@ -110,6 +110,8 @@
   "tag.block.c.storage_blocks.redstone": "Redstone Storage Blocks",
   "tag.block.c.storage_blocks.slime": "Slime Storage Blocks",
   "tag.block.c.storage_blocks.wheat": "Wheat Storage Blocks",
+  "tag.block.c.stripped_logs": "Stripped Logs",
+  "tag.block.c.stripped_woods": "Stripped Woods",
   "tag.block.c.villager_job_sites": "Villager Job Sites",
   "tag.block.neoforge.enderman_place_on_blacklist": "Enderman Place On Blacklist",
   "tag.block.neoforge.needs_gold_tool": "Needs Gold Tools",
@@ -128,6 +130,7 @@
   "tag.entity_type.c.minecarts": "Minecarts",
   "tag.entity_type.c.teleporting_not_supported": "Teleporting Not Supported",
   "tag.fluid.c.beetroot_soup": "Beetroot Soup",
+  "tag.fluid.c.experience": "Experience",
   "tag.fluid.c.gaseous": "Gaseous",
   "tag.fluid.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers",
   "tag.fluid.c.honey": "Honey",
@@ -350,6 +353,8 @@
   "tag.item.c.storage_blocks.slime": "Slime Storage Blocks",
   "tag.item.c.storage_blocks.wheat": "Wheat Storage Blocks",
   "tag.item.c.strings": "Strings",
+  "tag.item.c.stripped_logs": "Stripped Log Blocks",
+  "tag.item.c.stripped_woods": "Stripped Wood Blocks",
   "tag.item.c.tools": "Tools",
   "tag.item.c.tools.bow": "Bows",
   "tag.item.c.tools.brush": "Brushes",

src/generated/resources/data/c/tags/block/stripped_logs.json

@@ -0,0 +1,13 @@
+{
+  "values": [
+    "minecraft:stripped_acacia_log",
+    "minecraft:stripped_bamboo_block",
+    "minecraft:stripped_birch_log",
+    "minecraft:stripped_cherry_log",
+    "minecraft:stripped_dark_oak_log",
+    "minecraft:stripped_jungle_log",
+    "minecraft:stripped_mangrove_log",
+    "minecraft:stripped_oak_log",
+    "minecraft:stripped_spruce_log"
+  ]
+}

src/generated/resources/data/c/tags/block/stripped_woods.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    "minecraft:stripped_acacia_wood",
+    "minecraft:stripped_birch_wood",
+    "minecraft:stripped_cherry_wood",
+    "minecraft:stripped_dark_oak_wood",
+    "minecraft:stripped_jungle_wood",
+    "minecraft:stripped_mangrove_wood",
+    "minecraft:stripped_oak_wood",
+    "minecraft:stripped_spruce_wood"
+  ]
+}

src/generated/resources/data/c/tags/fluid/experience.json

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

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

@@ -0,0 +1,13 @@
+{
+  "values": [
+    "minecraft:stripped_acacia_log",
+    "minecraft:stripped_bamboo_block",
+    "minecraft:stripped_birch_log",
+    "minecraft:stripped_cherry_log",
+    "minecraft:stripped_dark_oak_log",
+    "minecraft:stripped_jungle_log",
+    "minecraft:stripped_mangrove_log",
+    "minecraft:stripped_oak_log",
+    "minecraft:stripped_spruce_log"
+  ]
+}

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

@@ -0,0 +1,12 @@
+{
+  "values": [
+    "minecraft:stripped_acacia_wood",
+    "minecraft:stripped_birch_wood",
+    "minecraft:stripped_cherry_wood",
+    "minecraft:stripped_dark_oak_wood",
+    "minecraft:stripped_jungle_wood",
+    "minecraft:stripped_mangrove_wood",
+    "minecraft:stripped_oak_wood",
+    "minecraft:stripped_spruce_wood"
+  ]
+}

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

@@ -420,6 +420,8 @@ public enum LogWarningMode {
             createForgeMapEntry(Registries.FLUID, "milk", Tags.Fluids.MILK),
             createForgeMapEntry(Registries.FLUID, "gaseous", Tags.Fluids.GASEOUS),
             createForgeMapEntry(Registries.FLUID, "honey", Tags.Fluids.HONEY),
+            createForgeMapEntry(Registries.FLUID, "xp", Tags.Fluids.EXPERIENCE),
+            createForgeMapEntry(Registries.FLUID, "experience", Tags.Fluids.EXPERIENCE),
             createForgeMapEntry(Registries.FLUID, "potion", Tags.Fluids.POTION),
             createForgeMapEntry(Registries.FLUID, "plantoil", "plant_oil"),
 

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

@@ -227,6 +227,8 @@ public static class Blocks {
         public static final TagKey<Block> STORAGE_BLOCKS_REDSTONE = tag("storage_blocks/redstone");
         public static final TagKey<Block> STORAGE_BLOCKS_SLIME = tag("storage_blocks/slime");
         public static final TagKey<Block> STORAGE_BLOCKS_WHEAT = tag("storage_blocks/wheat");
+        public static final TagKey<Block> STRIPPED_LOGS = tag("stripped_logs");
+        public static final TagKey<Block> STRIPPED_WOODS = tag("stripped_woods");
         public static final TagKey<Block> VILLAGER_JOB_SITES = tag("villager_job_sites");
 
         /**
@@ -652,6 +654,8 @@ public static class Items {
         public static final TagKey<Item> STORAGE_BLOCKS_SLIME = tag("storage_blocks/slime");
         public static final TagKey<Item> STORAGE_BLOCKS_WHEAT = tag("storage_blocks/wheat");
         public static final TagKey<Item> STRINGS = tag("strings");
+        public static final TagKey<Item> STRIPPED_LOGS = tag("stripped_logs");
+        public static final TagKey<Item> STRIPPED_WOODS = tag("stripped_woods");
         public static final TagKey<Item> VILLAGER_JOB_SITES = tag("villager_job_sites");
 
         // Tools and Armors
@@ -793,12 +797,12 @@ private static TagKey<Item> neoforgeTag(String name) {
      */
     public static class Fluids {
         /**
-         * Holds all fluids related to water.
+         * Holds all fluids related to water.<p>
          * This tag is done to help out multi-loader mods/datapacks where the vanilla water tag has attached behaviors outside Neo.
          */
         public static final TagKey<Fluid> WATER = tag("water");
         /**
-         * Holds all fluids related to lava.
+         * Holds all fluids related to lava.<p>
          * This tag is done to help out multi-loader mods/datapacks where the vanilla lava tag has attached behaviors outside Neo.
          */
         public static final TagKey<Fluid> LAVA = tag("lava");
@@ -811,36 +815,48 @@ public static class Fluids {
          */
         public static final TagKey<Fluid> GASEOUS = tag("gaseous");
         /**
-         * Holds all fluids related to honey.<br></br>
+         * Holds all fluids related to honey.
+         * <p>
          * (Standard unit for honey bottle is 250mb per bottle)
          */
         public static final TagKey<Fluid> HONEY = tag("honey");
         /**
-         * Holds all fluids related to potions. The effects of the potion fluid should be read from NBT.
+         * Holds all fluids related to experience.
+         * <p>
+         * (Standard unit for experience is 20mb per 1 experience. However, extraction from Bottle o' Enchanting should yield 250mb while smashing yields less)
+         */
+        public static final TagKey<Fluid> EXPERIENCE = tag("experience");
+        /**
+         * Holds all fluids related to potions. The effects of the potion fluid should be read from DataComponents.
          * The effects and color of the potion fluid should be read from {@link net.minecraft.core.component.DataComponents#POTION_CONTENTS}
-         * component that people should be attaching to the fluidstack of this fluid.<br></br>
+         * component that people should be attaching to the fluidstack of this fluid.
+         * <p>
          * (Standard unit for potions is 250mb per bottle)
          */
         public static final TagKey<Fluid> POTION = tag("potion");
         /**
          * Holds all fluids related to Suspicious Stew.
          * The effects of the suspicious stew fluid should be read from {@link net.minecraft.core.component.DataComponents#SUSPICIOUS_STEW_EFFECTS}
-         * component that people should be attaching to the fluidstack of this fluid.<br></br>
+         * component that people should be attaching to the fluidstack of this fluid.
+         * <p>
          * (Standard unit for suspicious stew is 250mb per bowl)
          */
         public static final TagKey<Fluid> SUSPICIOUS_STEW = tag("suspicious_stew");
         /**
-         * Holds all fluids related to Mushroom Stew.<br></br>
+         * Holds all fluids related to Mushroom Stew.
+         * <p>
          * (Standard unit for mushroom stew is 250mb per bowl)
          */
         public static final TagKey<Fluid> MUSHROOM_STEW = tag("mushroom_stew");
         /**
-         * Holds all fluids related to Rabbit Stew.<br></br>
+         * Holds all fluids related to Rabbit Stew.
+         * <p>
          * (Standard unit for rabbit stew is 250mb per bowl)
          */
         public static final TagKey<Fluid> RABBIT_STEW = tag("rabbit_stew");
         /**
-         * Holds all fluids related to Beetroot Soup.<br></br>
+         * Holds all fluids related to Beetroot Soup.
+         * <p>
          * (Standard unit for beetroot soup is 250mb per bowl)
          */
         public static final TagKey<Fluid> BEETROOT_SOUP = tag("beetroot_soup");

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

@@ -144,6 +144,14 @@ public void addTags(HolderLookup.Provider p_256380_) {
         tag(Tags.Blocks.STORAGE_BLOCKS_REDSTONE).add(Blocks.REDSTONE_BLOCK);
         tag(Tags.Blocks.STORAGE_BLOCKS_SLIME).add(Blocks.SLIME_BLOCK);
         tag(Tags.Blocks.STORAGE_BLOCKS_WHEAT).add(Blocks.HAY_BLOCK);
+        tag(Tags.Blocks.STRIPPED_LOGS).add(
+                Blocks.STRIPPED_ACACIA_LOG, Blocks.STRIPPED_BAMBOO_BLOCK, Blocks.STRIPPED_BIRCH_LOG,
+                Blocks.STRIPPED_CHERRY_LOG, Blocks.STRIPPED_DARK_OAK_LOG, Blocks.STRIPPED_JUNGLE_LOG,
+                Blocks.STRIPPED_MANGROVE_LOG, Blocks.STRIPPED_OAK_LOG, Blocks.STRIPPED_SPRUCE_LOG);
+        tag(Tags.Blocks.STRIPPED_WOODS).add(
+                Blocks.STRIPPED_ACACIA_WOOD, Blocks.STRIPPED_BIRCH_WOOD, Blocks.STRIPPED_CHERRY_WOOD,
+                Blocks.STRIPPED_DARK_OAK_WOOD, Blocks.STRIPPED_JUNGLE_WOOD, Blocks.STRIPPED_MANGROVE_WOOD,
+                Blocks.STRIPPED_OAK_WOOD, Blocks.STRIPPED_SPRUCE_WOOD);
         tag(Tags.Blocks.VILLAGER_JOB_SITES).add(
                 Blocks.BARREL, Blocks.BLAST_FURNACE, Blocks.BREWING_STAND, Blocks.CARTOGRAPHY_TABLE,
                 Blocks.CAULDRON, Blocks.WATER_CAULDRON, Blocks.LAVA_CAULDRON, Blocks.POWDER_SNOW_CAULDRON,

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

@@ -29,6 +29,7 @@ public void addTags(HolderLookup.Provider lookupProvider) {
         tag(Fluids.MILK).addOptional(NeoForgeMod.MILK.getId()).addOptional(NeoForgeMod.FLOWING_MILK.getId());
         tag(Fluids.GASEOUS);
         tag(Fluids.HONEY);
+        tag(Fluids.EXPERIENCE);
         tag(Fluids.POTION);
         tag(Fluids.SUSPICIOUS_STEW);
         tag(Fluids.MUSHROOM_STEW);

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

@@ -253,6 +253,8 @@ public void addTags(HolderLookup.Provider lookupProvider) {
         copy(Tags.Blocks.STORAGE_BLOCKS_SLIME, Tags.Items.STORAGE_BLOCKS_SLIME);
         copy(Tags.Blocks.STORAGE_BLOCKS_WHEAT, Tags.Items.STORAGE_BLOCKS_WHEAT);
         tag(Tags.Items.STRINGS).add(Items.STRING);
+        copy(Tags.Blocks.STRIPPED_LOGS, Tags.Items.STRIPPED_LOGS);
+        copy(Tags.Blocks.STRIPPED_WOODS, Tags.Items.STRIPPED_WOODS);
         tag(Tags.Items.VILLAGER_JOB_SITES).add(
                 Items.BARREL, Items.BLAST_FURNACE, Items.BREWING_STAND, Items.CARTOGRAPHY_TABLE,
                 Items.CAULDRON, Items.COMPOSTER, Items.FLETCHING_TABLE, Items.GRINDSTONE,

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

@@ -125,6 +125,8 @@ protected void addTranslations() {
         add(Tags.Blocks.STORAGE_BLOCKS_REDSTONE, "Redstone Storage Blocks");
         add(Tags.Blocks.STORAGE_BLOCKS_SLIME, "Slime Storage Blocks");
         add(Tags.Blocks.STORAGE_BLOCKS_WHEAT, "Wheat Storage Blocks");
+        add(Tags.Blocks.STRIPPED_LOGS, "Stripped Logs");
+        add(Tags.Blocks.STRIPPED_WOODS, "Stripped Woods");
         add(Tags.Blocks.VILLAGER_JOB_SITES, "Villager Job Sites");
         add(Tags.Blocks.VILLAGER_FARMLANDS, "Villager Farmlands");
 
@@ -325,6 +327,8 @@ protected void addTranslations() {
         add(Tags.Items.STORAGE_BLOCKS_SLIME, "Slime Storage Blocks");
         add(Tags.Items.STORAGE_BLOCKS_WHEAT, "Wheat Storage Blocks");
         add(Tags.Items.STRINGS, "Strings");
+        add(Tags.Items.STRIPPED_LOGS, "Stripped Log Blocks");
+        add(Tags.Items.STRIPPED_WOODS, "Stripped Wood Blocks");
         add(Tags.Items.VILLAGER_JOB_SITES, "Villager Job Sites");
         add(Tags.Items.TOOLS_SHEAR, "Shears");
         add(Tags.Items.TOOLS_SHIELD, "Shields");
@@ -348,6 +352,7 @@ protected void addTranslations() {
         add(Tags.Fluids.MILK, "Milk");
         add(Tags.Fluids.GASEOUS, "Gaseous");
         add(Tags.Fluids.HONEY, "Honey");
+        add(Tags.Fluids.EXPERIENCE, "Experience");
         add(Tags.Fluids.POTION, "Potion");
         add(Tags.Fluids.SUSPICIOUS_STEW, "Suspicious Stew");
         add(Tags.Fluids.MUSHROOM_STEW, "Mushroom Stew");