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.

Sign up for GitHub

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

Update previous food tags #10385

Merged
merged 6 commits into from
Nov 24, 2024
Merged

Update previous food tags #10385

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e718edf
Undone some of the previous tag work, brought code more in line with …
Thodor12 Oct 31, 2024
24241c5
Merge branch 'version/1.21' into fix/food_tags
Thodor12 Nov 17, 2024
5cc490e
Fixes
Thodor12 Nov 17, 2024
ec4afb5
Merge branch 'version/1.21' into fix/food_tags
marchermans Nov 19, 2024
7de777b
Remove breads
Thodor12 Nov 24, 2024
17ca837
Merge branch 'version/1.21' into fix/food_tags
Thodor12 Nov 24, 2024
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
8 changes: 6 additions & 2 deletions src/main/java/com/minecolonies/api/items/ModItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
import net.minecraft.world.item.Item;
import org.jetbrains.annotations.NotNull;

import java.util.List;

/**
* Class handling the registering of the mod items.
* <p>
Expand Down Expand Up @@ -185,6 +183,12 @@ public static Item[] getAllIngredients()
public static Item[] getAllFoods()
{
return new Item[] {
// Breads
milkyBread,
sugaryBread,
goldenBread,
chorusBread,

Thodor12 marked this conversation as resolved.
Show resolved Hide resolved
// Tier 1 Food
cheddar_cheese,
feta_cheese,
Expand Down
34 changes: 31 additions & 3 deletions src/main/java/com/minecolonies/core/generation/defaults/DefaultItemTagsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,14 +548,42 @@ protected void addTags(final @NotNull HolderLookup.Provider provider)
tag(ModTags.ignoreNBT)
.addTag(ItemTags.BANNERS);

tag(Tags.Items.FOODS)
.add(ModItems.milkyBread, ModItems.sugaryBread, ModItems.goldenBread, ModItems.chorusBread);
tag(Tags.Items.FOODS).add(ModItems.getAllFoods());

tag(Tags.Items.FOODS_BREAD)
.add(ModItems.milkyBread, ModItems.sugaryBread, ModItems.goldenBread, ModItems.chorusBread);
.add(ModItems.milkyBread,
ModItems.sugaryBread,
ModItems.goldenBread,
ModItems.chorusBread,
ModItems.flatbread,
ModItems.hand_pie,
ModItems.lembas_scone,
ModItems.manchet_bread,
ModItems.muffin,
ModItems.stew_trencher,
ModItems.stuffed_pita);

tag(Tags.Items.FOODS_CANDY)
.add(ModItems.hand_pie)
.add(ModItems.muffin);

tag(Tags.Items.FOODS_COOKED_MEAT)
.add(ModItems.lamb_stew);

tag(Tags.Items.FOODS_GOLDEN)
.add(ModItems.goldenBread);

tag(Tags.Items.FOODS_SOUP)
.add(ModItems.cabochis)
.add(ModItems.lamb_stew)
.add(ModItems.pottage);

tag(Tags.Items.FOODS_VEGETABLE)
.add(ModItems.cabochis)
.add(ModItems.eggplant_dolma)
.add(ModItems.pottage)
.add(ModItems.stuffed_pepper)
.add(ModItems.stuffed_pita);
}

@NotNull
Expand Down