Skip to content

Commit

Permalink
添加:煮面条 调整hud
Browse files Browse the repository at this point in the history
  • Loading branch information
MCZME committed Sep 6, 2024
1 parent 01aeb2a commit adc9c02
Show file tree
Hide file tree
Showing 46 changed files with 1,320 additions and 81 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// 1.21 2024-09-01T04:55:30.2853394 Item Models: lingshi
// 1.21 2024-09-06T10:03:20.9822913 Item Models: lingshi
14f86299910462582d98bcf699b35e34c615ee8e assets/lingshi/models/item/cabbage.json
0e18f939d46f6a164584f621fa97b024122785d9 assets/lingshi/models/item/cabbage_leaf.json
0bcbbc8c3377f7b20a37790cc33d36690c2044c7 assets/lingshi/models/item/cabbage_seed.json
bad0cb5e093fa42331c2d4a1157d1a7b5b3fc588 assets/lingshi/models/item/chopping_board.json
7bc27021669767547c0b0bd606195e5f80cea272 assets/lingshi/models/item/cooked_rice.json
8106af92df770f5e2062db0b6aaed967fe386d87 assets/lingshi/models/item/cooking_pot.json
1c45db1e6af3006c822037495e1197c9cd5cfb4e assets/lingshi/models/item/dough.json
a2eecf0a3a6c93ab1c418b7953b4080059274277 assets/lingshi/models/item/egg_added_stewed_noodles.json
37db2e9897cd20f19d58456cafcb898f113c1d4b assets/lingshi/models/item/egg_fried_rice.json
3492c131525851e1fa451f33349d2686d2ff1fc0 assets/lingshi/models/item/flour.json
014b17c43a62c41d623a0d944e434cf1ac3986be assets/lingshi/models/item/fried_egg.json
Expand All @@ -20,4 +21,5 @@ abe8ae1523c26af167289fe958382b2477d96ea1 assets/lingshi/models/item/rice_of_ear.
9150fce945d22c3c76b946d1aa13a9b16e50dbc3 assets/lingshi/models/item/sauteed_seasonal_vegetable.json
cff85c127954ba63ac8129929c0d7346bf8f305d assets/lingshi/models/item/skillet.json
da8fb27d7e9b15fbd96ca8a49b328776550bb2b3 assets/lingshi/models/item/spatula.json
eb856ffd13b91d52b910847159984f8a63b35cb5 assets/lingshi/models/item/stewed_noodles.json
24a37cc616a84374e2aa09a4eaee7d756a35fa10 assets/lingshi/models/item/stove.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21 2024-09-01T03:32:37.3971029 Languages: zh_cn for mod: lingshi
dd4b2d51488ffbfc9afc7673400b7eaa667d1a98 assets/lingshi/lang/zh_cn.json
// 1.21 2024-09-06T08:12:12.6930849 Languages: zh_cn for mod: lingshi
98c63919c052387839dc1f50808ac850011a4934 assets/lingshi/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
// 1.21 2024-09-01T04:54:48.0172948 Recipes
// 1.21 2024-09-06T08:35:30.5005652 Recipes
b8cb7428b718c0ca190af49165cd25554d27fa19 data/lingshi/advancement/recipes/cooking_pot/cooked_rice.json
7d0ef4cd02c38f4648e712a935f0ea32fb50aeff data/lingshi/advancement/recipes/cooking_pot/cooked_rice_1.json
d918a2369d899974ffa38d6a363553af9e97fdee data/lingshi/advancement/recipes/cooking_pot/cooked_rice_2.json
42b79b899fe026cd628d5838efb759e10b16c7b1 data/lingshi/advancement/recipes/cooking_pot/egg_added_stewed_noodles.json
5cc97ddff81d0a9274cb38f2e28b05aec86be255 data/lingshi/advancement/recipes/cooking_pot/pork_feet_rice.json
b324dfe8c51c5f2f94e08473d966192d14d40c5a data/lingshi/advancement/recipes/cooking_pot/stewed_noodles.json
6a319c97da924f9ab21b5d264c18cb8ad9da8755 data/lingshi/advancement/recipes/decorations/chopping_board.json
316ee6a89da986357d408cff58db9554636fc16a data/lingshi/advancement/recipes/decorations/cooking_pot.json
0486b842988b1d1ac0abb797a91d26077583679e data/lingshi/advancement/recipes/decorations/pot_lid.json
Expand All @@ -16,9 +18,11 @@ c9b88b929d6f4b7d68c10c6a3915182cb096d363 data/lingshi/advancement/recipes/skille
11c0e1c5c1fee50df7de493ee95764ca109b36f3 data/lingshi/advancement/recipes/skillet/cooked_porkchop.json
938ed8fe297341fd3b755b1381bae2e276a00eb3 data/lingshi/advancement/recipes/skillet/cooked_rabbit.json
de37dcaf7e9f79459492cd69ddb81d8d27406f99 data/lingshi/advancement/recipes/skillet/cooked_salmon.json
7a6163420d51a47990b3415927969c8a83ee97ac data/lingshi/advancement/recipes/skillet/egg_added_stewed_noodles.json
e6b8f09f653cc6c1180feb64eaf5b196543ae4f7 data/lingshi/advancement/recipes/skillet/egg_fried_rice.json
ee50d7e3c59e644ce93e46945ff090c3c68fda04 data/lingshi/advancement/recipes/skillet/fried_egg.json
e241bb59f1e7d265a9afbd0f38efdc05d5b325eb data/lingshi/advancement/recipes/skillet/sauteed_seasonal_vegetable.json
47116fef6fadd5ebb9231aee1717b2830949e776 data/lingshi/advancement/recipes/skillet/stewed_noodles.json
0e940fa2ba82aed478ee367c4b998f0bc7ead5c3 data/lingshi/advancement/recipes/tools/iron_knife.json
e511f76246f906a279fc1ec531922d8f70dfb68c data/lingshi/advancement/recipes/tools/spatula.json
bec1047337843fdd073fe87393c3b500ae11a1de data/lingshi/recipe/chopping_board.json
Expand All @@ -31,7 +35,9 @@ df6343e05449c8aded71e42701d18e37311ea0c9 data/lingshi/recipe/chopping_board/flou
2e23fcd215c647e72e989050fbfe466f419bed56 data/lingshi/recipe/cooking_pot/cooked_rice.json
d0f1076aaf14e4191918a911196f1aeac7d7a59d data/lingshi/recipe/cooking_pot/cooked_rice_1.json
1bb4304dfdcc5be7539818738d41ff2c0f17f1b7 data/lingshi/recipe/cooking_pot/cooked_rice_2.json
9f2a57c63666f89853bc85b73416c4172f4c17bf data/lingshi/recipe/cooking_pot/egg_added_stewed_noodles.json
62d3840084dd51eb8b305821add2a3daf75d976d data/lingshi/recipe/cooking_pot/pork_feet_rice.json
5cf82cc1c760154fd4fc1c686cae448e40a60903 data/lingshi/recipe/cooking_pot/stewed_noodles.json
e6daac4cca245fc9e220e2fcb1f2b27e410ba503 data/lingshi/recipe/iron_knife.json
dba470601fa51254c73ae3c63fa858de333a48c2 data/lingshi/recipe/pot_lid.json
a0c7fd85028ea7997689d7bc093b9d025c522ea6 data/lingshi/recipe/skillet.json
Expand All @@ -43,8 +49,10 @@ a7eb02ae67924077e8066c8cc2c5a05e02b5bb44 data/lingshi/recipe/skillet/cooked_chic
c3cfbc2afc0b4cec90a57fdac12ec3bc7b462b4f data/lingshi/recipe/skillet/cooked_porkchop.json
c60918f7fafeb03f1c8244417c151ea7a5e44a31 data/lingshi/recipe/skillet/cooked_rabbit.json
e72067c16cd3f5e2ec6a11abb0c7a9e41d3e3fd4 data/lingshi/recipe/skillet/cooked_salmon.json
1f718cba48b75cc98ae479a6765f76506c0eea3a data/lingshi/recipe/skillet/egg_fried_rice.json
f135d354583075761e6a774f9007cc9c0c377409 data/lingshi/recipe/skillet/egg_added_stewed_noodles.json
88b7de6efd83a1065897ffe5447d6cbba14e9123 data/lingshi/recipe/skillet/egg_fried_rice.json
0c39fdabe7970065856b4adc9e9f3eae7690ea2d data/lingshi/recipe/skillet/fried_egg.json
d6c10dbc6bc315bf535eadefcd22f7dcd7fb566d data/lingshi/recipe/skillet/sauteed_seasonal_vegetable.json
140dcebcd3163fc850baf9601ea2e9364f4b0437 data/lingshi/recipe/skillet/sauteed_seasonal_vegetable.json
fdba5b9f3c24313b753271e755d317990919bc07 data/lingshi/recipe/skillet/stewed_noodles.json
3563171190654e76637de2fa78a6c750389674d7 data/lingshi/recipe/spatula.json
94e898969747627f5a3d3be60b0b66fd528c13e9 data/lingshi/recipe/stove.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.21 2024-09-01T05:00:59.5506556 Block States: lingshi
// 1.21 2024-09-06T10:03:20.9852902 Block States: lingshi
c5265867b72222a7b9a0c319c8593c91a69953ab assets/lingshi/blockstates/chopping_board.json
cf0f8d1e27a4b3d6af3697ad29c93125328b6213 assets/lingshi/blockstates/sauteed_seasonal_vegetable.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.21 2024-09-01T04:54:48.015299 Data Maps
// 1.21 2024-09-06T08:35:30.498565 Data Maps
f8714336008bf2256e4e28ae34f31dd942431f35 data/lingshi/data_maps/fluid/cooking_food_fliud.json
ac182d9d4e03911f431e586748eb0f93a1560f27 data/lingshi/data_maps/item/cooking_food_item.json
5bffdd238512e20784274840ede448c507ec75db data/lingshi/data_maps/item/cooking_food_item.json
2 changes: 2 additions & 0 deletions src/generated/resources/assets/lingshi/lang/zh_cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"block.lingshi.rice_seedling": "稻苗",
"block.lingshi.sauteed_seasonal_vegetable": "炒时蔬",
"block.lingshi.skillet": "平底锅",
"block.lingshi.stewed_noodles": "煮面条",
"block.lingshi.stove": "炉灶",
"block.lingshi.tea_tree": "茶树",
"gui.lingshi.cooking_pot_menu": "烹饪锅",
Expand All @@ -15,6 +16,7 @@
"item.lingshi.cabbage_leaf": "白菜叶",
"item.lingshi.cooked_rice": "米饭",
"item.lingshi.dough": "面团",
"item.lingshi.egg_added_stewed_noodles": "加蛋煮面条",
"item.lingshi.egg_fried_rice": "蛋炒饭",
"item.lingshi.flour": "面粉",
"item.lingshi.fried_egg": "煎鸡蛋",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "lingshi:item/egg_added_stewed_noodles"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "lingshi:item/stewed_noodles"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_noodles": {
"conditions": {
"items": [
{
"items": "lingshi:noodles"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "lingshi:cooking_pot/egg_added_stewed_noodles"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_noodles"
]
],
"rewards": {
"recipes": [
"lingshi:cooking_pot/egg_added_stewed_noodles"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_noodles": {
"conditions": {
"items": [
{
"items": "lingshi:noodles"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "lingshi:cooking_pot/stewed_noodles"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_noodles"
]
],
"rewards": {
"recipes": [
"lingshi:cooking_pot/stewed_noodles"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_skillet": {
"conditions": {
"items": [
{
"items": "lingshi:skillet"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "lingshi:skillet/egg_added_stewed_noodles"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_skillet"
]
],
"rewards": {
"recipes": [
"lingshi:skillet/egg_added_stewed_noodles"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_skillet": {
"conditions": {
"items": [
{
"items": "lingshi:skillet"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "lingshi:skillet/stewed_noodles"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_skillet"
]
],
"rewards": {
"recipes": [
"lingshi:skillet/stewed_noodles"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"burnt_time": 12,
"cooked_time": 3
},
"lingshi:noodles": {
"burnt_time": 20,
"cooked_time": 5
},
"lingshi:pig_feet": {
"burnt_time": 20,
"cooked_time": 8
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"type": "lingshi:cooking_pot",
"container": {
"braising_time": 0,
"container": {
"count": 1,
"id": "minecraft:bowl"
}
},
"fluid": {
"amount": 1000,
"id": "minecraft:water"
},
"group": "",
"ingredients": [
{
"item": "lingshi:noodles"
},
{
"item": "lingshi:noodles"
},
{
"item": "lingshi:noodles"
},
{
"item": "minecraft:egg"
}
],
"label": "boil",
"result": {
"count": 6,
"id": "lingshi:egg_added_stewed_noodles"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"type": "lingshi:cooking_pot",
"container": {
"braising_time": 0,
"container": {
"count": 1,
"id": "minecraft:bowl"
}
},
"fluid": {
"amount": 1000,
"id": "minecraft:water"
},
"group": "",
"ingredients": [
{
"item": "lingshi:noodles"
},
{
"item": "lingshi:noodles"
},
{
"item": "lingshi:noodles"
}
],
"label": "boil",
"result": {
"count": 6,
"id": "lingshi:stewed_noodles"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type": "lingshi:skillet",
"container": {
"container": {
"count": 1,
"id": "minecraft:bowl"
},
"stir_fry_count": 0
},
"fluid": {
"amount": 250,
"id": "minecraft:water"
},
"group": "",
"ingredients": [
{
"item": "lingshi:noodles"
},
{
"item": "minecraft:egg"
}
],
"label": "boil",
"result": {
"count": 1,
"id": "lingshi:egg_added_stewed_noodles"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"item": "lingshi:rice"
}
],
"label": "pan_fry",
"label": "stir_fry",
"result": {
"count": 1,
"id": "lingshi:egg_fried_rice"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"tag": "c:mushrooms"
}
],
"label": "pan_fry",
"label": "stir_fry",
"result": {
"count": 1,
"id": "lingshi:sauteed_seasonal_vegetable"
Expand Down
Loading

0 comments on commit adc9c02

Please sign in to comment.