diff --git a/src/main/generated/data/c/tags/fluid/beetroot_soup.json b/src/main/generated/data/c/tags/fluid/beetroot_soup.json new file mode 100644 index 0000000000..df5cf20259 --- /dev/null +++ b/src/main/generated/data/c/tags/fluid/beetroot_soup.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#forge:beetroot_soup", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/fluid/experience.json b/src/main/generated/data/c/tags/fluid/experience.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/c/tags/fluid/experience.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/fluid/gaseous.json b/src/main/generated/data/c/tags/fluid/gaseous.json new file mode 100644 index 0000000000..37a9047e11 --- /dev/null +++ b/src/main/generated/data/c/tags/fluid/gaseous.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#forge:gaseous", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/fluid/mushroom_stew.json b/src/main/generated/data/c/tags/fluid/mushroom_stew.json new file mode 100644 index 0000000000..7f40246aad --- /dev/null +++ b/src/main/generated/data/c/tags/fluid/mushroom_stew.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#forge:mushroom_stew", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/fluid/potion.json b/src/main/generated/data/c/tags/fluid/potion.json new file mode 100644 index 0000000000..3c851413d4 --- /dev/null +++ b/src/main/generated/data/c/tags/fluid/potion.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#forge:potion", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/fluid/rabbit_stew.json b/src/main/generated/data/c/tags/fluid/rabbit_stew.json new file mode 100644 index 0000000000..fb82b6b59c --- /dev/null +++ b/src/main/generated/data/c/tags/fluid/rabbit_stew.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#forge:rabbit_stew", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/fluid/suspicious_stew.json b/src/main/generated/data/c/tags/fluid/suspicious_stew.json new file mode 100644 index 0000000000..3069b778c7 --- /dev/null +++ b/src/main/generated/data/c/tags/fluid/suspicious_stew.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#forge:suspicious_stew", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/java/net/minecraftforge/common/TagConventionMappings.java b/src/main/java/net/minecraftforge/common/TagConventionMappings.java index 865df2b532..40265d53f1 100644 --- a/src/main/java/net/minecraftforge/common/TagConventionMappings.java +++ b/src/main/java/net/minecraftforge/common/TagConventionMappings.java @@ -246,6 +246,12 @@ public final class TagConventionMappings { //region Fluids legacyToCommon(Registries.FLUID, forgeRl("milk"), Tags.Fluids.MILK), + legacyToCommon(Registries.FLUID, forgeRl("gaseous"), Tags.Fluids.GASEOUS), + legacyToCommon(Registries.FLUID, forgeRl("potion"), Tags.Fluids.POTION), + legacyToCommon(Registries.FLUID, forgeRl("suspicious_stew"), Tags.Fluids.SUSPICIOUS_STEW), + legacyToCommon(Registries.FLUID, forgeRl("mushroom_stew"), Tags.Fluids.MUSHROOM_STEW), + legacyToCommon(Registries.FLUID, forgeRl("rabbit_stew"), Tags.Fluids.RABBIT_STEW), + legacyToCommon(Registries.FLUID, forgeRl("beetroot_soup"), Tags.Fluids.BEETROOT_SOUP), //endregion //region Biomes diff --git a/src/main/java/net/minecraftforge/common/Tags.java b/src/main/java/net/minecraftforge/common/Tags.java index d2f40eaebd..b61ddba178 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -1068,39 +1068,6 @@ public class Tags { private static void init() {} //region `forge` tags for Forge-specific tags - /** - * Holds all fluids that are gaseous at room temperature. - */ - public static final TagKey GASEOUS = forgeTag("gaseous"); - /** - * Holds all fluids related to potions. The effects of the potion fluid should be read from NBT. - * 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.

- * (Standard unit for potions is 250mb per bottle) - */ - public static final TagKey POTION = forgeTag("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.

- * (Standard unit for suspicious stew is 250mb per bowl) - */ - public static final TagKey SUSPICIOUS_STEW = forgeTag("suspicious_stew"); - /** - * Holds all fluids related to Mushroom Stew.

- * (Standard unit for mushroom stew is 250mb per bowl) - */ - public static final TagKey MUSHROOM_STEW = forgeTag("mushroom_stew"); - /** - * Holds all fluids related to Rabbit Stew.

- * (Standard unit for rabbit stew is 250mb per bowl) - */ - public static final TagKey RABBIT_STEW = forgeTag("rabbit_stew"); - /** - * Holds all fluids related to Beetroot Soup.

- * (Standard unit for beetroot soup is 250mb per bowl) - */ - public static final TagKey BEETROOT_SOUP = forgeTag("beetroot_soup"); //endregion //region `c` tags for common conventions @@ -1120,11 +1087,50 @@ public class Tags { * Holds all fluids related to milk. */ public static final TagKey MILK = cTag("milk"); + /** + * Holds all fluids that are gaseous at room temperature. + */ + public static final TagKey GASEOUS = cTag("gaseous"); /** * Holds all fluids related to honey.

* (Standard unit for honey bottle is 250mb per bottle) */ public static final TagKey HONEY = cTag("honey"); + /** + * Holds all fluids related to experience. + *

(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 EXPERIENCE = cTag("experience"); + /** + * Holds all fluids related to potions. The effects of the potion fluid should be read from NBT. + * 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. + *

(Standard unit for potions is 250mb per bottle)

+ */ + public static final TagKey POTION = cTag("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. + *

(Standard unit for suspicious stew is 250mb per bowl)

+ */ + public static final TagKey SUSPICIOUS_STEW = cTag("suspicious_stew"); + /** + * Holds all fluids related to Mushroom Stew. + *

(Standard unit for mushroom stew is 250mb per bowl)

+ */ + public static final TagKey MUSHROOM_STEW = cTag("mushroom_stew"); + /** + * Holds all fluids related to Rabbit Stew.

+ *

(Standard unit for rabbit stew is 250mb per bowl)

+ */ + public static final TagKey RABBIT_STEW = cTag("rabbit_stew"); + /** + * Holds all fluids related to Beetroot Soup. + *

(Standard unit for beetroot soup is 250mb per bowl)

+ */ + public static final TagKey BEETROOT_SOUP = cTag("beetroot_soup"); /** * Tag that holds all fluids that recipe viewers should not show to users. */ @@ -1134,10 +1140,6 @@ public class Tags { private static TagKey cTag(String name) { return FluidTags.create(ResourceLocation.fromNamespaceAndPath("c", name)); } - - private static TagKey forgeTag(String name) { - return FluidTags.create(ResourceLocation.fromNamespaceAndPath("forge", name)); - } } public static class Enchantments { diff --git a/src/main/java/net/minecraftforge/common/data/ForgeFluidTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeFluidTagsProvider.java index 57c45daa01..113c3aeffa 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeFluidTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeFluidTagsProvider.java @@ -33,13 +33,14 @@ public final class ForgeFluidTagsProvider extends FluidTagsProvider { tag(WATER).add(net.minecraft.world.level.material.Fluids.WATER).add(net.minecraft.world.level.material.Fluids.FLOWING_WATER); tag(LAVA).add(net.minecraft.world.level.material.Fluids.LAVA).add(net.minecraft.world.level.material.Fluids.FLOWING_LAVA); tag(MILK).addOptional(ForgeMod.MILK.getId()).addOptional(ForgeMod.FLOWING_MILK.getId()); - tag(GASEOUS); + tag(GASEOUS).addOptionalTag(forgeTagKey("gaseous")); tag(HONEY); - tag(POTION); - tag(SUSPICIOUS_STEW); - tag(MUSHROOM_STEW); - tag(RABBIT_STEW); - tag(BEETROOT_SOUP); + tag(EXPERIENCE); + tag(POTION).addOptionalTag(forgeTagKey("potion")); + tag(SUSPICIOUS_STEW).addOptionalTag(forgeTagKey("suspicious_stew")); + tag(MUSHROOM_STEW).addOptionalTag(forgeTagKey("mushroom_stew")); + tag(RABBIT_STEW).addOptionalTag(forgeTagKey("rabbit_stew")); + tag(BEETROOT_SOUP).addOptionalTag(forgeTagKey("beetroot_soup")); tag(HIDDEN_FROM_RECIPE_VIEWERS); // Backwards compat definitions for pre-1.21 legacy `forge:` tags. @@ -47,6 +48,12 @@ public final class ForgeFluidTagsProvider extends FluidTagsProvider { tag(forgeTagKey("milk")) .addOptional(ForgeMod.MILK.getId()) .addOptional(ForgeMod.FLOWING_MILK.getId()); + tag(forgeTagKey("gaseous")); + tag(forgeTagKey("potion")); + tag(forgeTagKey("suspicious_stew")); + tag(forgeTagKey("mushroom_stew")); + tag(forgeTagKey("rabbit_stew")); + tag(forgeTagKey("beetroot_soup")); } private static TagKey forgeTagKey(String path) {