Skip to content

Commit

Permalink
Cook rework (#10368)
Browse files Browse the repository at this point in the history 
Lot's of new Food options
4 New crops
Food Happiness adjusted to quality + diversity
-> At least building level-2 high tier foods in an interval of 10 foods
-> At least building level different foods in an interval of 10 foods
Adjusted cook handout based on that
Make the cook regularly go back to work even if hungry (discussion, should eating be actually part of the cook AI)
Restaurant Menu and Menu at the netherminer are now opt-in
Tier 1+2 foods are now player craftable
Tier 3 foods need a level 4 cookery
  • Loading branch information
@Raycoms
Raycoms authored Nov 10, 2024
1 parent 85264ec commit 92b1177
Show file tree
Hide file tree
Showing 410 changed files with 6,591 additions and 1,195 deletions.
2 changes: 1 addition & 1 deletion ...minecolonies/models/item/raw_noodles.json → ...s/minecolonies/models/item/apple_pie.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/raw_noodles"
"layer0": "minecolonies:item/food/apple_pie"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/baked_salmon.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/baked_salmon"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/borscht.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/borscht"
}
}
0 ...sets/minecolonies/models/item/butter.json → ...sets/minecolonies/models/item/butter.json
View file
File renamed without changes.
0 ...ts/minecolonies/models/item/cabochis.json → ...ts/minecolonies/models/item/cabochis.json
View file
File renamed without changes.
0 ...ecolonies/models/item/cheddar_cheese.json → ...ecolonies/models/item/cheddar_cheese.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/cheese_pizza.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/cheese_pizza"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/cheese_ravioli.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/cheese_ravioli"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/chicken_broth.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/chicken_broth"
}
}
0 ...sets/minecolonies/models/item/congee.json → ...sets/minecolonies/models/item/congee.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/cooked_rice.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/cooked_rice"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/corn_chowder.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/corn_chowder"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/cornmeal.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/cornmeal"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/creamcheese.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/creamcheese"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/eggdrop_soup.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/eggdrop_soup"
}
}
0 ...ecolonies/models/item/eggplant_dolma.json → ...ecolonies/models/item/eggplant_dolma.json
View file
File renamed without changes.
0 ...minecolonies/models/item/feta_cheese.json → ...minecolonies/models/item/feta_cheese.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/fish_dinner.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/fish_dinner"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/fish_n_chips.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/fish_n_chips"
}
}
0 ...s/minecolonies/models/item/flatbread.json → ...s/minecolonies/models/item/flatbread.json
View file
File renamed without changes.
0 ...ts/minecolonies/models/item/hand_pie.json → ...ts/minecolonies/models/item/hand_pie.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/kebab.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/kebab"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/kimchi.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/kimchi"
}
}
0 ...s/minecolonies/models/item/lamb_stew.json → ...s/minecolonies/models/item/lamb_stew.json
View file
File renamed without changes.
0 ...inecolonies/models/item/lembas_scone.json → ...inecolonies/models/item/lembas_scone.json
View file
File renamed without changes.
0 ...necolonies/models/item/manchet_bread.json → ...necolonies/models/item/manchet_bread.json
View file
File renamed without changes.
0 ...necolonies/models/item/manchet_dough.json → ...necolonies/models/item/manchet_dough.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/meat_ravioli.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/meat_ravioli"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/mint_jelly.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/mint_jelly"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/mint_tea.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/mint_tea"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/mintchoco_cheesecake.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/mintchoco_cheesecake"
}
}
0 ...sets/minecolonies/models/item/muffin.json → ...sets/minecolonies/models/item/muffin.json
View file
File renamed without changes.
0 ...inecolonies/models/item/muffin_dough.json → ...inecolonies/models/item/muffin_dough.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/mushroom_pizza.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/mushroom_pizza"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/mutton_dinner.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/mutton_dinner"
}
}
0 ...minecolonies/models/item/pasta_plain.json → ...minecolonies/models/item/pasta_plain.json
View file
File renamed without changes.
0 ...inecolonies/models/item/pasta_tomato.json → ...inecolonies/models/item/pasta_tomato.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/pea_soup.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/pea_soup"
}
}
0 ...necolonies/models/item/pepper_hummus.json → ...necolonies/models/item/pepper_hummus.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/pierogi.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/pierogi"
}
}
0 ...minecolonies/models/item/pita_hummus.json → ...minecolonies/models/item/pita_hummus.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/plain_cheesecake.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/plain_cheesecake"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/polenta.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/polenta"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/potato_soup.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/potato_soup"
}
}
0 ...ets/minecolonies/models/item/pottage.json → ...ets/minecolonies/models/item/pottage.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/ramen.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/ramen"
}
}
0 .../minecolonies/models/item/raw_noodle.json → .../minecolonies/models/item/raw_noodle.json
View file
File renamed without changes.
0 ...s/minecolonies/models/item/rice_ball.json → ...s/minecolonies/models/item/rice_ball.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/schnitzel.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/schnitzel"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/soysauce.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/soysauce"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/spicy_eggplant.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/spicy_eggplant"
}
}
6 changes: 6 additions & 0 deletions ...datagen/generated/minecolonies/assets/minecolonies/models/item/spicy_grilled_chicken.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/spicy_grilled_chicken"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/squash_soup.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/squash_soup"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/steak_dinner.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/steak_dinner"
}
}
0 ...necolonies/models/item/stew_trencher.json → ...necolonies/models/item/stew_trencher.json
View file
File renamed without changes.
0 ...ecolonies/models/item/stuffed_pepper.json → ...ecolonies/models/item/stuffed_pepper.json
View file
File renamed without changes.
0 ...inecolonies/models/item/stuffed_pita.json → ...inecolonies/models/item/stuffed_pita.json
View file
File renamed without changes.
0 .../minecolonies/models/item/sushi_roll.json → .../minecolonies/models/item/sushi_roll.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/tacos.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/tacos"
}
}
0 ...assets/minecolonies/models/item/tofu.json → ...assets/minecolonies/models/item/tofu.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/tortillas.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/tortillas"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/veggie_quiche.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/veggie_quiche"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/veggie_ravioli.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/veggie_ravioli"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/veggie_soup.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/veggie_soup"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/yogurt.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/yogurt"
}
}
6 changes: 6 additions & 0 deletions src/datagen/generated/minecolonies/assets/minecolonies/models/item/yogurt_with_berries.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecolonies:item/food/yogurt_with_berries"
}
}
35 changes: 35 additions & 0 deletions ...datagen/generated/minecolonies/data/minecolonies/advancements/recipes/food/apple_pie.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_apple": {
"conditions": {
"items": [
{
"items": [
"minecraft:apple"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecolonies:apple_pie"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_apple",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecolonies:apple_pie"
]
},
"sends_telemetry_event": false
}
35 changes: 35 additions & 0 deletions ...agen/generated/minecolonies/data/minecolonies/advancements/recipes/food/baked_salmon.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_garlic": {
"conditions": {
"items": [
{
"items": [
"minecolonies:garlic"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecolonies:baked_salmon"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_garlic",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecolonies:baked_salmon"
]
},
"sends_telemetry_event": false
}
Loading

0 comments on commit 92b1177

Please sign in to comment.