FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-03-25 22:39:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions2

Add c:animal_foods tag ()

Browse source 
* Add `c:animal_foods` tag

* checkstyle

* Spotless

* Add to lang generator

* Actually use the generated lang file

---------

Co-authored-by: modmuss50 <modmuss50@gmail.com>
This commit is contained in:
TelepathicGrunt 2024-09-10 08:15:13 -04:00 • committed by GitHub
parent f054fb578a
commit 3d2379b573
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 133 additions and 0 deletions
fabric-convention-tags-v2/src
datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators
EnglishTagLangGenerator.javaItemTagGenerator.java
generated/resources
assets/fabric-convention-tags-v2/lang
en_us.json
data/c/tags/item
animal_foods.json
main/java/net/fabricmc/fabric/api/tag/convention/v2
ConventionalItemTags.java

1
fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java
View file

@ -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");

26
fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java
View file

@ -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)

1
fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json
View file

@ -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",

100
fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/animal_foods.json Normal file
View file

@ -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
}
]
}

5
fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
View file

@ -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.