Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add c:animal_foods tag #4080

Merged
merged 5 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,32 @@ private void generateFoodTags() {
.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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
"tag.item.c.ender_pearls": "Ender Pearls",
"tag.item.c.fertilizers": "Fertilizers",
"tag.item.c.foods": "Foods",
"tag.item.c.animal_foods": "Animal Foods",
modmuss50 marked this conversation as resolved.
Show resolved Hide resolved
"tag.item.c.foods.berries": "Berries",
"tag.item.c.foods.berry": "Berries",
"tag.item.c.foods.bread": "Breads",
Expand Down Expand Up @@ -357,4 +358,4 @@
"tag.worldgen.biome.c.no_default_monsters": "No Default Monsters",
"tag.worldgen.structure.c.hidden_from_displayers": "Hidden From Displayers",
"tag.worldgen.structure.c.hidden_from_locator_selection": "Hidden From Locator Selection"
}
}
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

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;
Expand Down Expand Up @@ -134,6 +135,10 @@ private 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.
Expand Down
Loading