diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 337010263..085961367 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -177,6 +177,7 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider { translationBuilder.add(ConventionalItemTags.COAL, "Coal"); translationBuilder.add(ConventionalItemTags.POTIONS, "Potions"); translationBuilder.add(ConventionalItemTags.FOODS, "Foods"); + translationBuilder.add(ConventionalItemTags.ANIMAL_FOODS, "Animal Foods"); translationBuilder.add(ConventionalItemTags.FRUIT_FOODS, "Fruits"); translationBuilder.add(ConventionalItemTags.VEGETABLE_FOODS, "Vegetables"); translationBuilder.add(ConventionalItemTags.BERRY_FOODS, "Berries"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 7b1afd983..658784c00 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -296,6 +296,32 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider { .add(Items.CHICKEN) .add(Items.ROTTEN_FLESH); + getOrCreateTagBuilder(ConventionalItemTags.ANIMAL_FOODS) + .addOptionalTag(ItemTags.ARMADILLO_FOOD) + .addOptionalTag(ItemTags.AXOLOTL_FOOD) + .addOptionalTag(ItemTags.BEE_FOOD) + .addOptionalTag(ItemTags.CAMEL_FOOD) + .addOptionalTag(ItemTags.CAT_FOOD) + .addOptionalTag(ItemTags.CHICKEN_FOOD) + .addOptionalTag(ItemTags.COW_FOOD) + .addOptionalTag(ItemTags.FOX_FOOD) + .addOptionalTag(ItemTags.FROG_FOOD) + .addOptionalTag(ItemTags.GOAT_FOOD) + .addOptionalTag(ItemTags.HOGLIN_FOOD) + .addOptionalTag(ItemTags.HORSE_FOOD) + .addOptionalTag(ItemTags.LLAMA_FOOD) + .addOptionalTag(ItemTags.OCELOT_FOOD) + .addOptionalTag(ItemTags.PANDA_FOOD) + .addOptionalTag(ItemTags.PARROT_FOOD) + .addOptionalTag(ItemTags.PIG_FOOD) + .addOptionalTag(ItemTags.PIGLIN_FOOD) + .addOptionalTag(ItemTags.RABBIT_FOOD) + .addOptionalTag(ItemTags.SHEEP_FOOD) + .addOptionalTag(ItemTags.SNIFFER_FOOD) + .addOptionalTag(ItemTags.STRIDER_FOOD) + .addOptionalTag(ItemTags.TURTLE_FOOD) + .addOptionalTag(ItemTags.WOLF_FOOD); + getOrCreateTagBuilder(ConventionalItemTags.FOODS) .add(Items.BAKED_POTATO) .add(Items.PUMPKIN_PIE) diff --git a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json index f22d41bbb..8f7779ff6 100644 --- a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json +++ b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json @@ -90,6 +90,7 @@ "tag.fluid.c.lava": "Lava", "tag.fluid.c.milk": "Milk", "tag.fluid.c.water": "Water", + "tag.item.c.animal_foods": "Animal Foods", "tag.item.c.armors": "Armors", "tag.item.c.barrels": "Barrels", "tag.item.c.barrels.wooden": "Wooden Barrels", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/animal_foods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/animal_foods.json new file mode 100644 index 000000000..fdf709313 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/animal_foods.json @@ -0,0 +1,100 @@ +{ + "values": [ + { + "id": "#minecraft:armadillo_food", + "required": false + }, + { + "id": "#minecraft:axolotl_food", + "required": false + }, + { + "id": "#minecraft:bee_food", + "required": false + }, + { + "id": "#minecraft:camel_food", + "required": false + }, + { + "id": "#minecraft:cat_food", + "required": false + }, + { + "id": "#minecraft:chicken_food", + "required": false + }, + { + "id": "#minecraft:cow_food", + "required": false + }, + { + "id": "#minecraft:fox_food", + "required": false + }, + { + "id": "#minecraft:frog_food", + "required": false + }, + { + "id": "#minecraft:goat_food", + "required": false + }, + { + "id": "#minecraft:hoglin_food", + "required": false + }, + { + "id": "#minecraft:horse_food", + "required": false + }, + { + "id": "#minecraft:llama_food", + "required": false + }, + { + "id": "#minecraft:ocelot_food", + "required": false + }, + { + "id": "#minecraft:panda_food", + "required": false + }, + { + "id": "#minecraft:parrot_food", + "required": false + }, + { + "id": "#minecraft:pig_food", + "required": false + }, + { + "id": "#minecraft:piglin_food", + "required": false + }, + { + "id": "#minecraft:rabbit_food", + "required": false + }, + { + "id": "#minecraft:sheep_food", + "required": false + }, + { + "id": "#minecraft:sniffer_food", + "required": false + }, + { + "id": "#minecraft:strider_food", + "required": false + }, + { + "id": "#minecraft:turtle_food", + "required": false + }, + { + "id": "#minecraft:wolf_food", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 3e57905b9..74d8468e2 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -18,6 +18,7 @@ package net.fabricmc.fabric.api.tag.convention.v2; import net.minecraft.item.Item; import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.ItemTags; import net.minecraft.registry.tag.TagKey; import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; @@ -134,6 +135,10 @@ public final class ConventionalItemTags { // Foods public static final TagKey<Item> FOODS = register("foods"); + /** + * All foods edible by animals excluding poisonous foods. (Does not include {@link ItemTags#PARROT_POISONOUS_FOOD}) + */ + public static final TagKey<Item> ANIMAL_FOODS = register("animal_foods"); /** * Apples and other foods that are considered fruits in the culinary field belong in this tag. * Cherries would go here as they are considered a "stone fruit" within culinary fields.