Skip to content

Commit

Permalink
Add Pie Item Tag c:foods/pie (#1560)
Browse files Browse the repository at this point in the history
Co-authored-by: TelepathicGrunt <[email protected]>
  • Loading branch information
JT122406 and TelepathicGrunt authored Sep 29, 2024
1 parent aad7f81 commit 85e7ec0
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/generated/resources/assets/c/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@
"tag.item.c.foods.food_poisoning": "Food Poisoning Foods",
"tag.item.c.foods.fruit": "Fruits",
"tag.item.c.foods.golden": "Golden Foods",
"tag.item.c.foods.pie": "Pies",
"tag.item.c.foods.raw_fish": "Raw Fishes",
"tag.item.c.foods.raw_meat": "Raw Meats",
"tag.item.c.foods.soup": "Soups",
Expand Down
1 change: 1 addition & 0 deletions src/generated/resources/data/c/tags/item/foods.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"#c:foods/cooked_fish",
"#c:foods/soup",
"#c:foods/candy",
"#c:foods/pie",
"#c:foods/golden",
"#c:foods/edible_when_placed",
"#c:foods/food_poisoning"
Expand Down
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/foods/pie.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:pumpkin_pie"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,9 @@ public enum LogWarningMode {
createForgeMapEntry(Registries.ITEM, "candy", Tags.Items.FOODS_CANDY),
createForgeMapEntry(Registries.ITEM, "candies", Tags.Items.FOODS_CANDY),
createMapEntry(Registries.ITEM, "c", "foods/candies", Tags.Items.FOODS_CANDY),
createForgeMapEntry(Registries.ITEM, "pie", Tags.Items.FOODS_PIE),
createForgeMapEntry(Registries.ITEM, "pies", Tags.Items.FOODS_PIE),
createMapEntry(Registries.ITEM, "c", "foods/pies", Tags.Items.FOODS_PIE),

createForgeMapEntry(Registries.FLUID, "water", Tags.Fluids.WATER),
createForgeMapEntry(Registries.FLUID, "lava", Tags.Fluids.LAVA),
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/net/neoforged/neoforge/common/Tags.java
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,10 @@ public static class Items {
* Sweets and candies like lollipops or chocolate belong in this tag.
*/
public static final TagKey<Item> FOODS_CANDY = tag("foods/candy");
/**
* Pies and other pie-like foods belong in this tag.
*/
public static final TagKey<Item> FOODS_PIE = tag("foods/pie");
/**
* Any gold-based foods would go in this tag. Such as Golden Apples or Glistering Melon Slice.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,15 @@ public void addTags(HolderLookup.Provider lookupProvider) {
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);
tag(Tags.Items.FOODS_GOLDEN).add(Items.GOLDEN_APPLE).add(Items.ENCHANTED_GOLDEN_APPLE).add(Items.GOLDEN_CARROT);
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)
.add(Items.BAKED_POTATO, Items.PUMPKIN_PIE, Items.HONEY_BOTTLE, Items.OMINOUS_BOTTLE, Items.DRIED_KELP)
.addTags(Tags.Items.FOODS_FRUIT, Tags.Items.FOODS_VEGETABLE, Tags.Items.FOODS_BERRY, Tags.Items.FOODS_BREAD, Tags.Items.FOODS_COOKIE,
Tags.Items.FOODS_RAW_MEAT, Tags.Items.FOODS_RAW_FISH, Tags.Items.FOODS_COOKED_MEAT, Tags.Items.FOODS_COOKED_FISH,
Tags.Items.FOODS_SOUP, Tags.Items.FOODS_CANDY, Tags.Items.FOODS_GOLDEN,
Tags.Items.FOODS_SOUP, Tags.Items.FOODS_CANDY, Tags.Items.FOODS_PIE, Tags.Items.FOODS_GOLDEN,
Tags.Items.FOODS_EDIBLE_WHEN_PLACED, Tags.Items.FOODS_FOOD_POISONING);
tag(Tags.Items.ANIMAL_FOODS)
.addTags(ItemTags.ARMADILLO_FOOD, ItemTags.AXOLOTL_FOOD, ItemTags.BEE_FOOD, ItemTags.CAMEL_FOOD,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ protected void addTranslations() {
add(Tags.Items.FOODS_BERRY, "Berries");
add(Tags.Items.FOODS_BREAD, "Breads");
add(Tags.Items.FOODS_CANDY, "Candies");
add(Tags.Items.FOODS_PIE, "Pies");
add(Tags.Items.FOODS_COOKED_FISH, "Cooked Fishes");
add(Tags.Items.FOODS_COOKED_MEAT, "Cooked Meats");
add(Tags.Items.FOODS_COOKIE, "Cookies");
Expand Down

0 comments on commit 85e7ec0

Please sign in to comment.