diff --git a/src/main/generated/data/c/tags/item/foods.json b/src/main/generated/data/c/tags/item/foods.json index f3b9418c8b..b3bcd132cb 100644 --- a/src/main/generated/data/c/tags/item/foods.json +++ b/src/main/generated/data/c/tags/item/foods.json @@ -15,7 +15,7 @@ "#c:foods/cooked_fish", "#c:foods/soup", "#c:foods/candy", - "#forge:foods/pie", + "#c:foods/pie", "#c:foods/golden", "#c:foods/edible_when_placed", "#c:foods/food_poisoning" diff --git a/src/main/generated/data/c/tags/item/foods/pie.json b/src/main/generated/data/c/tags/item/foods/pie.json new file mode 100644 index 0000000000..35482dd5e2 --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/pie.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:pumpkin_pie", + { + "id": "#forge:foods/pie", + "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 58a942a784..865df2b532 100644 --- a/src/main/java/net/minecraftforge/common/TagConventionMappings.java +++ b/src/main/java/net/minecraftforge/common/TagConventionMappings.java @@ -137,6 +137,8 @@ public final class TagConventionMappings { legacyToCommon(Registries.ITEM, forgeRl("ender_pearls"), Tags.Items.ENDER_PEARLS), + legacyToCommon(Registries.ITEM, forgeRl("foods/pie"), Tags.Items.FOODS_PIE), + legacyToCommon(Registries.ITEM, forgeRl("gems"), Tags.Items.GEMS), legacyToCommon(Registries.ITEM, forgeRl("gems/diamond"), Tags.Items.GEMS_DIAMOND), legacyToCommon(Registries.ITEM, forgeRl("gems/emerald"), Tags.Items.GEMS_EMERALD), diff --git a/src/main/java/net/minecraftforge/common/Tags.java b/src/main/java/net/minecraftforge/common/Tags.java index 51b07819cf..7d6cd5e1af 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -502,10 +502,6 @@ public class Tags { @Deprecated(forRemoval = true, since = "1.21") public static final TagKey DUSTS_PRISMARINE = forgeTag("dusts/prismarine"); - /** - * Pies and other pie-like foods belong in this tag. - */ - public static final TagKey FOODS_PIE = forgeTag("foods/pie"); //endregion //region `c` tags for common conventions @@ -646,6 +642,10 @@ public class Tags { * Sweets and candies like lollipops or chocolate belong in this tag. */ public static final TagKey FOODS_CANDY = cTag("foods/candy"); + /** + * Pies and other pie-like foods belong in this tag. + */ + public static final TagKey FOODS_PIE = cTag("foods/pie"); /** * Any gold-based foods would go in this tag. Such as Golden Apples or Glistering Melon Slice. */ diff --git a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java index 96a1f8cc03..5dadbd70c8 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java @@ -144,7 +144,7 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider { tag(Tags.Items.FOODS_COOKED_FISH).add(Items.COOKED_COD, Items.COOKED_SALMON); tag(Tags.Items.FOODS_SOUP).add(Items.BEETROOT_SOUP, Items.MUSHROOM_STEW, Items.RABBIT_STEW, Items.SUSPICIOUS_STEW); tag(Tags.Items.FOODS_CANDY); - tag(Tags.Items.FOODS_PIE).add(Items.PUMPKIN_PIE); // Todo: Move tag to `c:foods/pie` when Fabric#4144 is merged + tag(Tags.Items.FOODS_PIE).add(Items.PUMPKIN_PIE).addOptionalTag(forgeItemTagKey("foods/pie")); tag(Tags.Items.FOODS_EDIBLE_WHEN_PLACED).add(Items.CAKE); tag(Tags.Items.FOODS_FOOD_POISONING).add(Items.POISONOUS_POTATO, Items.PUFFERFISH, Items.SPIDER_EYE, Items.CHICKEN, Items.ROTTEN_FLESH); tag(Tags.Items.FOODS_GOLDEN).add(Items.GOLDEN_APPLE, Items.ENCHANTED_GOLDEN_APPLE, Items.GOLDEN_CARROT); @@ -389,6 +389,7 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider { tag(forgeItemTagKey("crops/nether_wart")).add(Items.NETHER_WART); tag(forgeItemTagKey("crops/potato")).add(Items.POTATO); tag(forgeItemTagKey("crops/wheat")).add(Items.WHEAT); + tag(forgeItemTagKey("foods/pie")).add(Items.PUMPKIN_PIE); tag(forgeItemTagKey("dusts")).addTags(forgeItemTagKey("dusts/glowstone"), Tags.Items.DUSTS_PRISMARINE, forgeItemTagKey("dusts/redstone")); tag(forgeItemTagKey("dusts/glowstone")).add(Items.GLOWSTONE_DUST); tag(forgeItemTagKey("dusts/prismarine")).add(Items.PRISMARINE_SHARD);