diff --git a/src/generated/resources/.cache/71e72dbdeb626cc835aaccd2ae47fd3d8794cd24 b/src/generated/resources/.cache/71e72dbdeb626cc835aaccd2ae47fd3d8794cd24 index 8aeeb35..52e978a 100644 --- a/src/generated/resources/.cache/71e72dbdeb626cc835aaccd2ae47fd3d8794cd24 +++ b/src/generated/resources/.cache/71e72dbdeb626cc835aaccd2ae47fd3d8794cd24 @@ -1,4 +1,4 @@ -// 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 @@ -6,6 +6,7 @@ bad0cb5e093fa42331c2d4a1157d1a7b5b3fc588 assets/lingshi/models/item/chopping_boa 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 @@ -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 diff --git a/src/generated/resources/.cache/85f12f813aff948f91f5cd129c0ffa86bcb17361 b/src/generated/resources/.cache/85f12f813aff948f91f5cd129c0ffa86bcb17361 index 1ff4a9e..51fecc6 100644 --- a/src/generated/resources/.cache/85f12f813aff948f91f5cd129c0ffa86bcb17361 +++ b/src/generated/resources/.cache/85f12f813aff948f91f5cd129c0ffa86bcb17361 @@ -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 diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 0e45974..1e45d7e 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/src/generated/resources/.cache/a189ba72f94c72036c5b4a6381591ea76d224567 b/src/generated/resources/.cache/a189ba72f94c72036c5b4a6381591ea76d224567 index 887eb92..dea8af8 100644 --- a/src/generated/resources/.cache/a189ba72f94c72036c5b4a6381591ea76d224567 +++ b/src/generated/resources/.cache/a189ba72f94c72036c5b4a6381591ea76d224567 @@ -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 diff --git a/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f b/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f index ff40ff5..79d75fd 100644 --- a/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f +++ b/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f @@ -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 diff --git a/src/generated/resources/assets/lingshi/lang/zh_cn.json b/src/generated/resources/assets/lingshi/lang/zh_cn.json index 33c95bb..e082293 100644 --- a/src/generated/resources/assets/lingshi/lang/zh_cn.json +++ b/src/generated/resources/assets/lingshi/lang/zh_cn.json @@ -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": "烹饪锅", @@ -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": "煎鸡蛋", diff --git a/src/generated/resources/assets/lingshi/models/item/egg_added_stewed_noodles.json b/src/generated/resources/assets/lingshi/models/item/egg_added_stewed_noodles.json new file mode 100644 index 0000000..a2189b4 --- /dev/null +++ b/src/generated/resources/assets/lingshi/models/item/egg_added_stewed_noodles.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lingshi:item/egg_added_stewed_noodles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/lingshi/models/item/stewed_noodles.json b/src/generated/resources/assets/lingshi/models/item/stewed_noodles.json new file mode 100644 index 0000000..3364a8e --- /dev/null +++ b/src/generated/resources/assets/lingshi/models/item/stewed_noodles.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lingshi:item/stewed_noodles" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/lingshi/advancement/recipes/cooking_pot/egg_added_stewed_noodles.json b/src/generated/resources/data/lingshi/advancement/recipes/cooking_pot/egg_added_stewed_noodles.json new file mode 100644 index 0000000..8146672 --- /dev/null +++ b/src/generated/resources/data/lingshi/advancement/recipes/cooking_pot/egg_added_stewed_noodles.json @@ -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" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/lingshi/advancement/recipes/cooking_pot/stewed_noodles.json b/src/generated/resources/data/lingshi/advancement/recipes/cooking_pot/stewed_noodles.json new file mode 100644 index 0000000..51c866c --- /dev/null +++ b/src/generated/resources/data/lingshi/advancement/recipes/cooking_pot/stewed_noodles.json @@ -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" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/lingshi/advancement/recipes/skillet/egg_added_stewed_noodles.json b/src/generated/resources/data/lingshi/advancement/recipes/skillet/egg_added_stewed_noodles.json new file mode 100644 index 0000000..64f1f98 --- /dev/null +++ b/src/generated/resources/data/lingshi/advancement/recipes/skillet/egg_added_stewed_noodles.json @@ -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" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/lingshi/advancement/recipes/skillet/stewed_noodles.json b/src/generated/resources/data/lingshi/advancement/recipes/skillet/stewed_noodles.json new file mode 100644 index 0000000..5e8dad1 --- /dev/null +++ b/src/generated/resources/data/lingshi/advancement/recipes/skillet/stewed_noodles.json @@ -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" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/lingshi/data_maps/item/cooking_food_item.json b/src/generated/resources/data/lingshi/data_maps/item/cooking_food_item.json index 5b7cb22..5d9f1e6 100644 --- a/src/generated/resources/data/lingshi/data_maps/item/cooking_food_item.json +++ b/src/generated/resources/data/lingshi/data_maps/item/cooking_food_item.json @@ -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 diff --git a/src/generated/resources/data/lingshi/recipe/cooking_pot/egg_added_stewed_noodles.json b/src/generated/resources/data/lingshi/recipe/cooking_pot/egg_added_stewed_noodles.json new file mode 100644 index 0000000..0443c33 --- /dev/null +++ b/src/generated/resources/data/lingshi/recipe/cooking_pot/egg_added_stewed_noodles.json @@ -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" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/lingshi/recipe/cooking_pot/stewed_noodles.json b/src/generated/resources/data/lingshi/recipe/cooking_pot/stewed_noodles.json new file mode 100644 index 0000000..4334f6e --- /dev/null +++ b/src/generated/resources/data/lingshi/recipe/cooking_pot/stewed_noodles.json @@ -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" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/lingshi/recipe/skillet/egg_added_stewed_noodles.json b/src/generated/resources/data/lingshi/recipe/skillet/egg_added_stewed_noodles.json new file mode 100644 index 0000000..b2118e9 --- /dev/null +++ b/src/generated/resources/data/lingshi/recipe/skillet/egg_added_stewed_noodles.json @@ -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" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/lingshi/recipe/skillet/egg_fried_rice.json b/src/generated/resources/data/lingshi/recipe/skillet/egg_fried_rice.json index 30aca6f..6396c0d 100644 --- a/src/generated/resources/data/lingshi/recipe/skillet/egg_fried_rice.json +++ b/src/generated/resources/data/lingshi/recipe/skillet/egg_fried_rice.json @@ -20,7 +20,7 @@ "item": "lingshi:rice" } ], - "label": "pan_fry", + "label": "stir_fry", "result": { "count": 1, "id": "lingshi:egg_fried_rice" diff --git a/src/generated/resources/data/lingshi/recipe/skillet/sauteed_seasonal_vegetable.json b/src/generated/resources/data/lingshi/recipe/skillet/sauteed_seasonal_vegetable.json index 1858c7c..90f4657 100644 --- a/src/generated/resources/data/lingshi/recipe/skillet/sauteed_seasonal_vegetable.json +++ b/src/generated/resources/data/lingshi/recipe/skillet/sauteed_seasonal_vegetable.json @@ -26,7 +26,7 @@ "tag": "c:mushrooms" } ], - "label": "pan_fry", + "label": "stir_fry", "result": { "count": 1, "id": "lingshi:sauteed_seasonal_vegetable" diff --git a/src/generated/resources/data/lingshi/recipe/skillet/stewed_noodles.json b/src/generated/resources/data/lingshi/recipe/skillet/stewed_noodles.json new file mode 100644 index 0000000..8cb8921 --- /dev/null +++ b/src/generated/resources/data/lingshi/recipe/skillet/stewed_noodles.json @@ -0,0 +1,25 @@ +{ + "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" + } + ], + "label": "boil", + "result": { + "count": 1, + "id": "lingshi:stewed_noodles" + } +} \ No newline at end of file diff --git a/src/main/java/mczme/lingshi/ModEnumParams.java b/src/main/java/mczme/lingshi/ModEnumParams.java index 3199150..0af24be 100644 --- a/src/main/java/mczme/lingshi/ModEnumParams.java +++ b/src/main/java/mczme/lingshi/ModEnumParams.java @@ -13,17 +13,17 @@ public class ModEnumParams { public static final EnumProxy SKILLET_SEARCH_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(Items.COMPASS) ); - public static final EnumProxy SKILLET_HEAT_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(ModItems.RICE_OF_EAR.get())); - public static final EnumProxy PAN_FRY_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(ModItems.RICE.get())); - public static final EnumProxy STIR_FRY_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(ModItems.IRON_KNIFE.get())); - public static final EnumProxy BOIL_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(Items.WHEAT)); + public static final EnumProxy SKILLET_HEAT_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(Items.COOKED_BEEF)); + public static final EnumProxy PAN_FRY_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(ModItems.OIL_BUCKET.get())); + public static final EnumProxy STIR_FRY_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(ModItems.SPATULA.get())); + public static final EnumProxy BOIL_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(Items.WATER_BUCKET)); public static final EnumProxy MISC_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(Items.BUCKET)); public static final EnumProxy COOKING_POT_SEARCH_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(Items.COMPASS) ); - public static final EnumProxy COOKING_POT_BOIL_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(ModItems.RICE_OF_EAR.get())); - public static final EnumProxy COOKING_POT_STEW_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(ModItems.RICE.get())); - public static final EnumProxy COOKING_POT_DEEP_FRY_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(ModItems.IRON_KNIFE.get())); - public static final EnumProxy COOKING_POT_MISC_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(Items.WHEAT)); + public static final EnumProxy COOKING_POT_BOIL_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(Items.WATER_BUCKET)); + public static final EnumProxy COOKING_POT_STEW_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(ModItems.POT_LID.get())); + public static final EnumProxy COOKING_POT_DEEP_FRY_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(ModItems.OIL_BUCKET.get())); + public static final EnumProxy COOKING_POT_MISC_ENUM_PROXY = new EnumProxy<>(RecipeBookCategories.class, params(Items.BUCKET)); private static Supplier> params(Item item){ diff --git a/src/main/java/mczme/lingshi/client/event/Registry.java b/src/main/java/mczme/lingshi/client/event/Registry.java index 5bb43a8..8f4dd39 100644 --- a/src/main/java/mczme/lingshi/client/event/Registry.java +++ b/src/main/java/mczme/lingshi/client/event/Registry.java @@ -10,6 +10,7 @@ import mczme.lingshi.client.screen.CookingHud; import mczme.lingshi.client.screen.CookingPotScreen; import mczme.lingshi.client.screen.SkilletScreen; +import mczme.lingshi.common.recipe.CookingPotRecipe; import mczme.lingshi.common.recipe.SkilletRecipe; import mczme.lingshi.common.registry.BlockEntityTypes; import mczme.lingshi.common.registry.ModFluids; @@ -82,7 +83,7 @@ public static void registerRecipeBook(RegisterRecipeBookCategoriesEvent event) { event.registerAggregateCategory(COOKING_POT_SEARCH.get(), ImmutableList.of(COOKING_POT_POT_BOIL.get(), COOKING_POT_STEW.get(), COOKING_POT_DEEP_FRY.get(), COOKING_POT_MISC.get())); event.registerRecipeCategoryFinder(ModRecipes.COOKING_POT_RECIPE.get(), recipe -> { - if (recipe.value() instanceof SkilletRecipe Recipe) { + if (recipe.value() instanceof CookingPotRecipe Recipe) { CookingFoodRecipeLabel label = Recipe.getLabel(); return switch (label) { case BOIL -> COOKING_POT_POT_BOIL.get(); diff --git a/src/main/java/mczme/lingshi/client/screen/CookingHud.java b/src/main/java/mczme/lingshi/client/screen/CookingHud.java index 0088d6a..6441211 100644 --- a/src/main/java/mczme/lingshi/client/screen/CookingHud.java +++ b/src/main/java/mczme/lingshi/client/screen/CookingHud.java @@ -33,6 +33,7 @@ public class CookingHud implements LayeredDraw.Layer { private FluidStack fluidStack = FluidStack.EMPTY; private ItemStack container = ItemStack.EMPTY; private int Count; + private int Count_ing; private int[] cookingTime; private ItemStack result = ItemStack.EMPTY; private int MAX_SLOT; @@ -49,12 +50,12 @@ public void render(@NotNull GuiGraphics pGuiGraphics, @NotNull DeltaTracker pDel } this.player = Minecraft.getInstance().player; if (player != null && getHitResult(BlockEntityTypes.SKILLET_BLOCKENTITY.get())) { - getData((SkilletBlockEntity)Minecraft.getInstance().level.getBlockEntity(blockPos)); + getData((SkilletBlockEntity) Minecraft.getInstance().level.getBlockEntity(blockPos)); int j = 0; if (!result.isEmpty()) { pGuiGraphics.renderItem(result, X - 18, Y); - pGuiGraphics.blit(HUD_Sprite, X, Y , 16, 16, 0, 36,16,16, 64, 64); - pGuiGraphics.drawCenteredString(Minecraft.getInstance().font, String.valueOf(Count), X + 24, Y + 6, 0xffffff); + pGuiGraphics.blit(HUD_Sprite, X, Y, 16, 16, 0, 36, 16, 16, 64, 64); + pGuiGraphics.drawCenteredString(Minecraft.getInstance().font, Count_ing + "/" + Count, X + 26, Y + 6, 0xffffff); if (!container.isEmpty()) { pGuiGraphics.renderItem(container, X + 36, Y); } @@ -77,17 +78,17 @@ public void render(@NotNull GuiGraphics pGuiGraphics, @NotNull DeltaTracker pDel } } } else if (player != null && getHitResult(BlockEntityTypes.COOKING_POT_BLOCKENTITY.get())) { - getData((CookingPotBlockEntity)Minecraft.getInstance().level.getBlockEntity(blockPos)); + getData((CookingPotBlockEntity) Minecraft.getInstance().level.getBlockEntity(blockPos)); int j = 0; - if (!result.isEmpty()||!itemStackHandler.getStackInSlot(7).isEmpty()) { - if(!result.isEmpty()){ - pGuiGraphics.renderItem(result, X+12, Y); + if (!result.isEmpty() || !itemStackHandler.getStackInSlot(7).isEmpty()) { + if (!result.isEmpty()) { + pGuiGraphics.renderItem(result, X + 16, Y); } else if (!itemStackHandler.getStackInSlot(7).isEmpty()) { - pGuiGraphics.renderItem(itemStackHandler.getStackInSlot(7), X + 12, Y); + pGuiGraphics.renderItem(itemStackHandler.getStackInSlot(7), X + 16, Y); } pGuiGraphics.drawCenteredString(Minecraft.getInstance().font, String.valueOf(itemStackHandler.getStackInSlot(7).getCount()), X + 36, Y + 6, 0xffffff); - pGuiGraphics.blit(HUD_Sprite, X-18, Y , 16, 16, 16, 36,16,16, 64, 64); - pGuiGraphics.drawCenteredString(Minecraft.getInstance().font, String.valueOf(Count/20), X + 6, Y + 6, 0xffffff); + pGuiGraphics.blit(HUD_Sprite, X - 18, Y, 16, 16, 16, 36, 16, 16, 64, 64); + pGuiGraphics.drawCenteredString(Minecraft.getInstance().font, Count_ing / 20 + "/" + Count, X + 6, Y + 6, 0xffffff); if (!container.isEmpty()) { pGuiGraphics.renderItem(container, X + 48, Y); } @@ -120,10 +121,13 @@ private void getData(T blockEntity) { this.MAX_SLOT = blockEntity.getMAX(); this.result = blockEntity.getResult(); this.container = itemStackHandler.getStackInSlot(MAX_SLOT); - if(blockEntity instanceof SkilletBlockEntity blockEntity1){ - this.Count = blockEntity1.stirFryCount; - }else if (blockEntity instanceof CookingPotBlockEntity blockEntity1){ - this.Count = blockEntity1.stewingTime; + if (blockEntity instanceof SkilletBlockEntity blockEntity1) { + this.Count = blockEntity1.stirFry; + this.Count_ing = blockEntity1.stirFryCount; + } else if (blockEntity instanceof CookingPotBlockEntity blockEntity1) { + this.Count = blockEntity1.stewTime; + this.Count_ing = blockEntity1.stewingTime; + } } } @@ -153,8 +157,8 @@ private void drawFluidProgress(GuiGraphics pGuiGraphics, CookingFoodData cooking if (!bucket.isEmpty()) { pGuiGraphics.renderItem(bucket, X - 18, Y + j * 18); } - pGuiGraphics.blit(HUD_Sprite, X, Y + j * 18+ 7, cookingFoodData.cookedTime() * 2, pHeight, 0, 0, cookingFoodData.cookedTime() * 2 + 2, pHeight, 64, 64); - pGuiGraphics.blit(HUD_Sprite, X + cookingFoodData.cookedTime() * 2, Y + j * 18+ 7, 62 - cookingFoodData.cookedTime() * 2, pHeight, cookingFoodData.cookedTime() * 2 + 2, 16, 62 - cookingFoodData.cookedTime() * 2, pHeight, 64, 64); + pGuiGraphics.blit(HUD_Sprite, X, Y + j * 18 + 7, cookingFoodData.cookedTime() * 2, pHeight, 0, 0, cookingFoodData.cookedTime() * 2 + 2, pHeight, 64, 64); + pGuiGraphics.blit(HUD_Sprite, X + cookingFoodData.cookedTime() * 2, Y + j * 18 + 7, 62 - cookingFoodData.cookedTime() * 2, pHeight, cookingFoodData.cookedTime() * 2 + 2, 16, 62 - cookingFoodData.cookedTime() * 2, pHeight, 64, 64); pGuiGraphics.blit(HUD_Sprite, X + progress / 10, Y + j * 18 + 9, 4, 4, 0, 32, 4, 4, 64, 64); } diff --git a/src/main/java/mczme/lingshi/common/block/CabbageBlock.java b/src/main/java/mczme/lingshi/common/block/CabbageBlock.java new file mode 100644 index 0000000..aec4110 --- /dev/null +++ b/src/main/java/mczme/lingshi/common/block/CabbageBlock.java @@ -0,0 +1,16 @@ +package mczme.lingshi.common.block; + +import mczme.lingshi.common.registry.ModItems; +import net.minecraft.world.level.ItemLike; +import org.jetbrains.annotations.NotNull; + +public class CabbageBlock extends ModCropBlock { + public CabbageBlock(Properties properties) { + super(properties); + } + + @Override + protected @NotNull ItemLike getBaseSeedId() { + return ModItems.CABBAGE_SEED.get(); + } +} diff --git a/src/main/java/mczme/lingshi/common/block/FoodBlock.java b/src/main/java/mczme/lingshi/common/block/FoodBlock.java index a76c1ed..ab56957 100644 --- a/src/main/java/mczme/lingshi/common/block/FoodBlock.java +++ b/src/main/java/mczme/lingshi/common/block/FoodBlock.java @@ -32,7 +32,7 @@ public class FoodBlock extends Block { public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; public static final IntegerProperty AMOUNT = IntegerProperty.create("amount", 0, 1); public static final VoxelShape SHAPE = Shapes.or(Block.box(6, 0, 6, 10, 1, 10), - Block.box(5, 1, 5, 9, 2, 9), + Block.box(6, 1, 6, 10, 2, 10), Block.box(2, 2, 2, 14, 6, 14)); public FoodBlock(Properties properties) { @@ -46,12 +46,11 @@ public ItemInteractionResult useItemOn(ItemStack pStack, BlockState pState, Leve } else { if (pPlayer.canEat(false)) { pLevel.setBlock(pPos, pState.setValue(AMOUNT, 0), Block.UPDATE_CLIENTS); + pPlayer.eat(pLevel, new ItemStack(pState.getBlock().asItem())); if (pPlayer.hasEffect(ModEffects.GRATIFICATION_EFFECT)) { ItemStack itemStack = new ItemStack(pState.getBlock().asItem()); FoodProperties foodData = itemStack.get(DataComponents.FOOD); - pPlayer.eat(pLevel, itemStack, new FoodProperties.Builder().nutrition(foodData.nutrition()).saturationModifier(foodData.saturation() * 2).build()); - } else { - pPlayer.eat(pLevel, new ItemStack(pState.getBlock().asItem())); + pPlayer.eat(pLevel, itemStack, new FoodProperties.Builder().nutrition(0).saturationModifier(foodData.saturation()).build()); } return ItemInteractionResult.SUCCESS; diff --git a/src/main/java/mczme/lingshi/common/block/PlateFoodBlock.java b/src/main/java/mczme/lingshi/common/block/PlateFoodBlock.java index aed6f11..563d3ac 100644 --- a/src/main/java/mczme/lingshi/common/block/PlateFoodBlock.java +++ b/src/main/java/mczme/lingshi/common/block/PlateFoodBlock.java @@ -11,7 +11,7 @@ public class PlateFoodBlock extends FoodBlock { public static final VoxelShape SHAPE = Shapes.or(Block.box(2, 0, 2, 14, 3, 14), - Block.box(1,1,1,15,1,16) + Block.box(1,1,1,15,1,15) ); public PlateFoodBlock(Properties properties) { diff --git a/src/main/java/mczme/lingshi/common/block/RiceBlock.java b/src/main/java/mczme/lingshi/common/block/RiceBlock.java new file mode 100644 index 0000000..3747ff1 --- /dev/null +++ b/src/main/java/mczme/lingshi/common/block/RiceBlock.java @@ -0,0 +1,7 @@ +package mczme.lingshi.common.block; + +public class RiceBlock extends ModCropBlock { + public RiceBlock(Properties properties) { + super(properties); + } +} diff --git a/src/main/java/mczme/lingshi/common/block/StewedNoodles.java b/src/main/java/mczme/lingshi/common/block/StewedNoodles.java new file mode 100644 index 0000000..a226226 --- /dev/null +++ b/src/main/java/mczme/lingshi/common/block/StewedNoodles.java @@ -0,0 +1,70 @@ +package mczme.lingshi.common.block; + +import mczme.lingshi.common.registry.ModEffects; +import mczme.lingshi.common.registry.ModItems; +import net.minecraft.core.BlockPos; +import net.minecraft.core.component.DataComponents; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.food.FoodProperties; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.BooleanProperty; +import net.minecraft.world.phys.BlockHitResult; + +public class StewedNoodles extends FoodBlock { + + public static final BooleanProperty EGG = BooleanProperty.create("egg"); + + public StewedNoodles(Properties properties) { + super(properties); + this.defaultBlockState().setValue(EGG, false); + } + + public ItemInteractionResult useItemOn(ItemStack pStack, BlockState pState, Level pLevel, BlockPos pPos, Player pPlayer, InteractionHand pHand, BlockHitResult pHitResult) { + if(pStack.is(ModItems.FRIED_EGG.get())&& !pState.getValue(EGG)) { + pStack.consumeAndReturn(1,pPlayer); + pLevel.setBlock(pPos, pState.setValue(EGG, true), Block.UPDATE_CLIENTS); + return ItemInteractionResult.SUCCESS; + } + ItemStack itemStack = new ItemStack(pState.getBlock().asItem()); + if(pState.getValue(EGG)) { + itemStack = new ItemStack(ModItems.EGG_ADDED_STEWED_NOODLES.get()); + } + if (pState.getValue(AMOUNT) == 0) { + pLevel.destroyBlock(pPos, true); + return ItemInteractionResult.SUCCESS; + } else { + if (pPlayer.canEat(false)) { + pLevel.setBlock(pPos, pState.setValue(AMOUNT, 0), Block.UPDATE_CLIENTS); + pPlayer.eat(pLevel, itemStack.copy()); + if (pPlayer.hasEffect(ModEffects.GRATIFICATION_EFFECT)) { + FoodProperties foodData = itemStack.get(DataComponents.FOOD); + pPlayer.eat(pLevel, itemStack, new FoodProperties.Builder().nutrition(0).saturationModifier(foodData.saturation()).build()); + } + + return ItemInteractionResult.SUCCESS; + } + } + return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + } + + @Override + public BlockState getStateForPlacement(BlockPlaceContext pContext) { + boolean egg = pContext.getItemInHand().is(ModItems.EGG_ADDED_STEWED_NOODLES.get()); + return this.defaultBlockState().setValue(FACING, pContext.getHorizontalDirection()).setValue(AMOUNT, 1).setValue(EGG, egg); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder pBuilder) { + super.createBlockStateDefinition(pBuilder); + pBuilder.add(EGG); + } +} diff --git a/src/main/java/mczme/lingshi/common/block/entity/CookingPotBlockEntity.java b/src/main/java/mczme/lingshi/common/block/entity/CookingPotBlockEntity.java index 6296f73..391b3ba 100644 --- a/src/main/java/mczme/lingshi/common/block/entity/CookingPotBlockEntity.java +++ b/src/main/java/mczme/lingshi/common/block/entity/CookingPotBlockEntity.java @@ -51,6 +51,7 @@ public class CookingPotBlockEntity extends BlockEntity implements ICanBeHeated, private final int[] cookingTime = new int[MAX_SLOT + 1]; public ItemStack result = ItemStack.EMPTY; public int stewingTime = 0; + public int stewTime=0; public CookingPotBlockEntity(BlockPos pPos, BlockState pBlockState) { super(BlockEntityTypes.COOKING_POT_BLOCKENTITY.get(), pPos, pBlockState); @@ -288,7 +289,7 @@ public static void serverTick(Level pLevel, BlockPos pPo ItemStack result1 = optional.map(RecipeHolder::value) .map(e -> e.assemble(input, pLevel.registryAccess())) .orElse(ItemStack.EMPTY); - int stewTime = optional.map(RecipeHolder::value) + blockEntity.stewTime = optional.map(RecipeHolder::value) .map(e -> e.getContainer().braisingTime()) .orElse(0); //cookProgress @@ -333,7 +334,7 @@ public static void serverTick(Level pLevel, BlockPos pPo } // 结果判断 blockEntity.result = result1; - if (cooked_size == blockEntity.size() && !blockEntity.result.isEmpty() && fluid_heated && itemStackHandler.getStackInSlot(7).getCount() <= 64 && blockEntity.stewingTime / 20 >= stewTime) { + if (cooked_size == blockEntity.size() && !blockEntity.result.isEmpty() && fluid_heated && itemStackHandler.getStackInSlot(7).getCount() <= 64 && blockEntity.stewingTime / 20 >= blockEntity.stewTime) { itemStackHandler.setStackInSlot(6, optional.map(RecipeHolder::value) .map(e -> e.getContainer().container()) .orElse(ItemStack.EMPTY)); diff --git a/src/main/java/mczme/lingshi/common/block/entity/SkilletBlockEntity.java b/src/main/java/mczme/lingshi/common/block/entity/SkilletBlockEntity.java index cc24d51..fcac96a 100644 --- a/src/main/java/mczme/lingshi/common/block/entity/SkilletBlockEntity.java +++ b/src/main/java/mczme/lingshi/common/block/entity/SkilletBlockEntity.java @@ -47,6 +47,7 @@ public class SkilletBlockEntity extends BlockEntity implements MenuProvider, ICa private final int[] cookingTime = new int[MAX_SLOT + 1]; public int stirFryCount = 0; + public int stirFry =0; public ItemStack result = ItemStack.EMPTY; @@ -288,10 +289,10 @@ public static void serverTick(Level pLevel, BlockPos pPo blockEntity.result = optional.map(RecipeHolder::value) .map(e -> e.assemble(input, pLevel.registryAccess())) .orElse(ItemStack.EMPTY); - int stirFryCount1 = optional.map(RecipeHolder::value) + blockEntity.stirFry = optional.map(RecipeHolder::value) .map(e -> e.getContainer().stirFryCount()) .orElse(0); - if (cooked_size == blockEntity.size() && blockEntity.stirFryCount >= stirFryCount1 && !blockEntity.result.isEmpty() && fluid_heated) { + if (cooked_size == blockEntity.size() && blockEntity.stirFryCount >= blockEntity.stirFry && !blockEntity.result.isEmpty() && fluid_heated) { itemStackHandler.setStackInSlot(5, optional.map(RecipeHolder::value) .map(e -> e.getContainer().container()) .orElse(ItemStack.EMPTY)); diff --git a/src/main/java/mczme/lingshi/common/data/BlockStates.java b/src/main/java/mczme/lingshi/common/data/BlockStates.java index 0729e99..d9eb6cc 100644 --- a/src/main/java/mczme/lingshi/common/data/BlockStates.java +++ b/src/main/java/mczme/lingshi/common/data/BlockStates.java @@ -26,6 +26,7 @@ protected void registerStatesAndModels() { horizontalBlock(ModBlocks.CHOPPING_BOARD.get(), "block/chopping_board"); horizontalBlock(ModBlocks.SAUTEED_SEASONAL_VEGETABLE.get(),"block/plate","block/sauteed_seasonal_vegetable"); +// horizontalBlock(ModBlocks.STEWED_NOODLES.get(),"block/bowl","block/sauteed_seasonal_vegetable"); } private void horizontalBlock(Block block, String modelLocation) { diff --git a/src/main/java/mczme/lingshi/common/data/CookingFoodDataGen.java b/src/main/java/mczme/lingshi/common/data/CookingFoodDataGen.java index 8b00d69..e070f9c 100644 --- a/src/main/java/mczme/lingshi/common/data/CookingFoodDataGen.java +++ b/src/main/java/mczme/lingshi/common/data/CookingFoodDataGen.java @@ -43,6 +43,7 @@ protected void gather() { addCookingFood(Items.RED_MUSHROOM,3,12); addCookingFood(Items.BROWN_MUSHROOM,3,12); addCookingFood(Items.BEETROOT,3,12); + addCookingFood(ModItems.NOODLES.get(),5,20); addCookingFood(Fluids.WATER,15); builder(COOKING_FOOD_FLUID).add(ModFluids.OIL_SOURCE.get().builtInRegistryHolder(), new CookingFoodData(8,30),false); diff --git a/src/main/java/mczme/lingshi/common/data/ItemModels.java b/src/main/java/mczme/lingshi/common/data/ItemModels.java index 07c42dd..946b832 100644 --- a/src/main/java/mczme/lingshi/common/data/ItemModels.java +++ b/src/main/java/mczme/lingshi/common/data/ItemModels.java @@ -21,6 +21,8 @@ protected void registerModels() { basicItem(ModItems.CABBAGE_LEAF.get()); basicItem(ModItems.PORK_FEET_RICE.get()); basicItem(ModItems.SAUTEED_SEASONAL_VEGETABLE.get()); + basicItem(ModItems.STEWED_NOODLES.get()); + basicItem(ModItems.EGG_ADDED_STEWED_NOODLES.get()); basicItem(ModItems.FRIED_EGG.get()); basicItem(ModItems.COOKED_RICE.get()); diff --git a/src/main/java/mczme/lingshi/common/data/lang/ChineseLanguageProvider.java b/src/main/java/mczme/lingshi/common/data/lang/ChineseLanguageProvider.java index b2f846c..9c9f896 100644 --- a/src/main/java/mczme/lingshi/common/data/lang/ChineseLanguageProvider.java +++ b/src/main/java/mczme/lingshi/common/data/lang/ChineseLanguageProvider.java @@ -47,6 +47,8 @@ protected void addTranslations() { this.add(ModItems.PIG_FEET.get(), "猪蹄"); this.add(ModItems.PORK_FEET_RICE.get(), "猪脚饭"); this.add(ModItems.SAUTEED_SEASONAL_VEGETABLE.get(),"炒时蔬"); + this.add(ModItems.STEWED_NOODLES.get(), "煮面条"); + this.add("item.lingshi.egg_added_stewed_noodles","加蛋煮面条"); } } diff --git a/src/main/java/mczme/lingshi/common/data/recipe/CookingPotRecipeDataGen.java b/src/main/java/mczme/lingshi/common/data/recipe/CookingPotRecipeDataGen.java index 8bdf970..e7fd699 100644 --- a/src/main/java/mczme/lingshi/common/data/recipe/CookingPotRecipeDataGen.java +++ b/src/main/java/mczme/lingshi/common/data/recipe/CookingPotRecipeDataGen.java @@ -23,19 +23,35 @@ public CookingPotRecipeDataGen(RecipeOutput output) { } protected void buildRecipes(RecipeOutput output) { - build(List.of(Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get())),new FluidStack(Fluids.WATER,1000),new ItemStack(ModItems.COOKED_RICE.get(),8),CookingFoodRecipeLabel.BOIL) +// 煮 + build(List.of(Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get())),new FluidStack(Fluids.WATER,1000),new ItemStack(ModItems.COOKED_RICE.get(),8) + ,CookingFoodRecipeLabel.BOIL) .unlockedBy("has_rice", has(ModItems.RICE.get())).group("rice") .setContainer(new CookingPotRecipe.CookingPotContainer(new ItemStack(Items.BOWL),0)) .save(output,create("cooked_rice")); - build(List.of(Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get())),new FluidStack(Fluids.WATER,1000),new ItemStack(ModItems.COOKED_RICE.get(),10),CookingFoodRecipeLabel.BOIL) + build(List.of(Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get())),new FluidStack(Fluids.WATER,1000),new ItemStack(ModItems.COOKED_RICE.get(),10) + ,CookingFoodRecipeLabel.BOIL) .unlockedBy("has_rice", has(ModItems.RICE.get())).group("rice") .setContainer(new CookingPotRecipe.CookingPotContainer(new ItemStack(Items.BOWL),0)) .save(output,create("cooked_rice_1")); - build(List.of(Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get())),new FluidStack(Fluids.WATER,1000),new ItemStack(ModItems.COOKED_RICE.get(),12),CookingFoodRecipeLabel.BOIL) + build(List.of(Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get())),new FluidStack(Fluids.WATER,1000),new ItemStack(ModItems.COOKED_RICE.get(),12) + ,CookingFoodRecipeLabel.BOIL) .unlockedBy("has_rice", has(ModItems.RICE.get())).group("rice") .setContainer(new CookingPotRecipe.CookingPotContainer(new ItemStack(Items.BOWL),0)) .save(output,create("cooked_rice_2")); - build(List.of(Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.CABBAGE_LEAF.get()),Ingredient.of(ModItems.PIG_FEET.get())),new FluidStack(Fluids.WATER,1000),new ItemStack(ModItems.PORK_FEET_RICE.get(),2),CookingFoodRecipeLabel.STEW) + build(List.of(Ingredient.of(ModItems.NOODLES.get()),Ingredient.of(ModItems.NOODLES.get()),Ingredient.of(ModItems.NOODLES.get())),new FluidStack(Fluids.WATER,1000),new ItemStack(ModItems.STEWED_NOODLES.get(),6) + ,CookingFoodRecipeLabel.BOIL) + .unlockedBy("has_noodles", has(ModItems.NOODLES.get())) + .setContainer(new CookingPotRecipe.CookingPotContainer(new ItemStack(Items.BOWL),0)) + .save(output,create("stewed_noodles")); + build(List.of(Ingredient.of(ModItems.NOODLES.get()),Ingredient.of(ModItems.NOODLES.get()),Ingredient.of(ModItems.NOODLES.get()),Ingredient.of(Items.EGG)),new FluidStack(Fluids.WATER,1000),new ItemStack(ModItems.EGG_ADDED_STEWED_NOODLES.get(),6) + ,CookingFoodRecipeLabel.BOIL) + .unlockedBy("has_noodles", has(ModItems.NOODLES.get())) + .setContainer(new CookingPotRecipe.CookingPotContainer(new ItemStack(Items.BOWL),0)) + .save(output,create("egg_added_stewed_noodles")); +// 炖 + build(List.of(Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.RICE.get()),Ingredient.of(ModItems.CABBAGE_LEAF.get()),Ingredient.of(ModItems.PIG_FEET.get())),new FluidStack(Fluids.WATER,1000),new ItemStack(ModItems.PORK_FEET_RICE.get(),2) + ,CookingFoodRecipeLabel.STEW) .unlockedBy("has_pig_feet", has(ModItems.PIG_FEET.get())) .setContainer(new CookingPotRecipe.CookingPotContainer(new ItemStack(Items.BOWL),5)) .save(output,create("pork_feet_rice")); diff --git a/src/main/java/mczme/lingshi/common/data/recipe/SkilletRecipeDatagen.java b/src/main/java/mczme/lingshi/common/data/recipe/SkilletRecipeDatagen.java index f050b9c..17acd64 100644 --- a/src/main/java/mczme/lingshi/common/data/recipe/SkilletRecipeDatagen.java +++ b/src/main/java/mczme/lingshi/common/data/recipe/SkilletRecipeDatagen.java @@ -11,6 +11,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.material.Fluids; import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.fluids.FluidStack; @@ -47,14 +48,22 @@ protected void buildRecipes(RecipeOutput output) { .setLabel(CookingFoodRecipeLabel.PAN_FRY).save(output,create("fried_egg")); // 炒 build(List.of(Ingredient.of(Items.EGG),Ingredient.of(ModItems.RICE.get())),new FluidStack(ModFluids.OIL_SOURCE.get(),100),new ItemStack(ModItems.EGG_FRIED_RICE.get())) - .setLabel(CookingFoodRecipeLabel.PAN_FRY) + .setLabel(CookingFoodRecipeLabel.STIR_FRY) .setContainer(new SkilletRecipe.SkilletCookingContainer(new ItemStack(Items.BOWL),3)) .save(output,create("egg_fried_rice")); build(List.of(Ingredient.of(CROPS_CABBAGE),Ingredient.of(Items.CARROT),Ingredient.of(Items.BEETROOT),Ingredient.of(Tags.Items.MUSHROOMS)),new FluidStack(ModFluids.OIL_SOURCE.get(),100),new ItemStack(ModItems.SAUTEED_SEASONAL_VEGETABLE.get())) - .setLabel(CookingFoodRecipeLabel.PAN_FRY) + .setLabel(CookingFoodRecipeLabel.STIR_FRY) .setContainer(new SkilletRecipe.SkilletCookingContainer(new ItemStack(Items.BOWL),2)) .save(output,create("sauteed_seasonal_vegetable")); // 煮 + build(List.of(Ingredient.of(ModItems.NOODLES.get())),new FluidStack(Fluids.WATER,250),new ItemStack(ModItems.STEWED_NOODLES.get())) + .setLabel(CookingFoodRecipeLabel.BOIL) + .setContainer(new SkilletRecipe.SkilletCookingContainer(new ItemStack(Items.BOWL),0)) + .save(output,create("stewed_noodles")); + build(List.of(Ingredient.of(ModItems.NOODLES.get()),Ingredient.of(Items.EGG)),new FluidStack(Fluids.WATER,250),new ItemStack(ModItems.EGG_ADDED_STEWED_NOODLES.get())) + .setLabel(CookingFoodRecipeLabel.BOIL) + .setContainer(new SkilletRecipe.SkilletCookingContainer(new ItemStack(Items.BOWL),0)) + .save(output,create("egg_added_stewed_noodles")); } private SkilletRecipeBuilder build(List items, FluidStack fluid, ItemStack result){ diff --git a/src/main/java/mczme/lingshi/common/registry/ModBlocks.java b/src/main/java/mczme/lingshi/common/registry/ModBlocks.java index e70acc6..e48ded2 100644 --- a/src/main/java/mczme/lingshi/common/registry/ModBlocks.java +++ b/src/main/java/mczme/lingshi/common/registry/ModBlocks.java @@ -19,13 +19,13 @@ public class ModBlocks { public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(lingshi.MODID); - public static final Supplier RICE = BLOCKS.registerBlock("rice", ModCropBlock::new, + public static final Supplier RICE = BLOCKS.registerBlock("rice", RiceBlock::new, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.CROP).pushReaction(PushReaction.DESTROY)); public static final Supplier RICE_SEEDLING = BLOCKS.registerBlock("rice_seedling", RiceSeedlingBlock::new, BlockBehaviour.Properties.of().noCollission().mapColor(MapColor.PLANT).instabreak().sound(SoundType.CROP).pushReaction(PushReaction.DESTROY).randomTicks()); public static final Supplier RICE_SEEDING_TOP = BLOCKS.registerBlock("rice_seedling_top", RiceSeedlingTopBlock::new, BlockBehaviour.Properties.of().noCollission().mapColor(MapColor.PLANT).instabreak().sound(SoundType.CROP).pushReaction(PushReaction.DESTROY).randomTicks()); - public static final Supplier CABBAGE = BLOCKS.registerBlock("cabbage", ModCropBlock::new, + public static final Supplier CABBAGE = BLOCKS.registerBlock("cabbage", CabbageBlock::new, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().randomTicks().instabreak().sound(SoundType.CROP).pushReaction(PushReaction.DESTROY)); public static final Supplier TEA_TREE = BLOCKS.registerBlock("tea_tree", TeaTreeBlock::new, @@ -44,7 +44,8 @@ public class ModBlocks { public static final Supplier STOVE = BLOCKS.register("stove", ()->new StoveBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.FURNACE))); // 可放置食物 public static final Supplier PORK_FEET_RICE = BLOCKS.register("pork_feet_rice", ()->new FoodBlock(BlockBehaviour.Properties.of().destroyTime(0.3F))); - public static final Supplier SAUTEED_SEASONAL_VEGETABLE = BLOCKS.register("sauteed_seasonal_vegetable", ()->new PlateFoodBlock(BlockBehaviour.Properties.of().destroyTime(0.3F))); + public static final Supplier SAUTEED_SEASONAL_VEGETABLE = BLOCKS.register("sauteed_seasonal_vegetable", ()->new PlateFoodBlock(BlockBehaviour.Properties.of().destroyTime(0.3F))); + public static final Supplier STEWED_NOODLES = BLOCKS.register("stewed_noodles", ()->new StewedNoodles(BlockBehaviour.Properties.of().destroyTime(0.3F))); public static void register(IEventBus modEventBus) { BLOCKS.register(modEventBus); diff --git a/src/main/java/mczme/lingshi/common/registry/ModItems.java b/src/main/java/mczme/lingshi/common/registry/ModItems.java index 5ae7ccf..b5c3d8d 100644 --- a/src/main/java/mczme/lingshi/common/registry/ModItems.java +++ b/src/main/java/mczme/lingshi/common/registry/ModItems.java @@ -5,6 +5,7 @@ import mczme.lingshi.common.item.PotLid; import mczme.lingshi.common.item.SpatulaItem; import mczme.lingshi.lingshi; +import net.minecraft.network.chat.Component; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.food.FoodProperties; @@ -16,6 +17,8 @@ import java.util.List; import java.util.function.Supplier; +import static net.minecraft.core.component.DataComponents.ITEM_NAME; + public class ModItems { public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(lingshi.MODID); public static final List> ITEMS_LIST = new ArrayList<>(); @@ -26,7 +29,7 @@ public class ModItems { public static final Supplier CABBAGE_SEED = registerWithCreateTab("cabbage_seed", () -> new BlockItem(ModBlocks.CABBAGE.get(), new Item.Properties())); public static final Supplier CABBAGE = registerWithCreateTab("cabbage", () -> new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(3).saturationModifier(2.4f).build()))); - public static final Supplier CABBAGE_LEAF = registerWithCreateTab("cabbage_leaf", () -> new Item( new Item.Properties().food(new FoodProperties.Builder() + public static final Supplier CABBAGE_LEAF = registerWithCreateTab("cabbage_leaf", () -> new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(1).saturationModifier(0.8f).build()))); public static final Supplier TEA_TREE = registerWithCreateTab("tea_tree", () -> new BlockItem(ModBlocks.TEA_TREE.get(), new Item.Properties())); @@ -44,7 +47,7 @@ public class ModItems { public static final Supplier STOVE = registerWithCreateTab("stove", () -> new BlockItem(ModBlocks.STOVE.get(), new Item.Properties())); public static final Supplier OIL_BUCKET = registerWithCreateTab("oil_bucket", () -> new BucketItem(ModFluids.OIL_SOURCE.get(), new Item.Properties() .craftRemainder(Items.BUCKET).stacksTo(1))); -//食物 + //食物 public static final Supplier STRANGE_FOOD = registerWithCreateTab("strange_food", () -> new Item(new Item.Properties())); public static final Supplier FRIED_EGG = registerWithCreateTab("fried_egg", () -> new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(4).saturationModifier(3.2f).build()))); @@ -58,13 +61,19 @@ public class ModItems { .nutrition(2).saturationModifier(1f).build()))); public static final Supplier PIG_FEET = registerWithCreateTab("pig_feet", () -> new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(5).saturationModifier(3f).build()))); -//可放置食物 - public static final Supplier PORK_FEET_RICE = registerWithCreateTab("pork_feet_rice",()-> new FoodBlockItem(ModBlocks.PORK_FEET_RICE.get(), new Item.Properties() - .food(new FoodProperties.Builder().usingConvertsTo(Items.BOWL).nutrition(12).saturationModifier(9.4f) - .effect(()-> new MobEffectInstance(ModEffects.GRATIFICATION_EFFECT,5*60*20),1.0F).build()))); - public static final Supplier SAUTEED_SEASONAL_VEGETABLE = registerWithCreateTab("sauteed_seasonal_vegetable",()-> new FoodBlockItem(ModBlocks.SAUTEED_SEASONAL_VEGETABLE.get(), new Item.Properties() + //可放置食物 + public static final Supplier PORK_FEET_RICE = registerWithCreateTab("pork_feet_rice", () -> new FoodBlockItem(ModBlocks.PORK_FEET_RICE.get(), new Item.Properties() + .food(new FoodProperties.Builder().usingConvertsTo(Items.BOWL).nutrition(12).saturationModifier(9.4f) + .effect(() -> new MobEffectInstance(ModEffects.GRATIFICATION_EFFECT, 5 * 60 * 20), 1.0F).build()))); + public static final Supplier SAUTEED_SEASONAL_VEGETABLE = registerWithCreateTab("sauteed_seasonal_vegetable", () -> new FoodBlockItem(ModBlocks.SAUTEED_SEASONAL_VEGETABLE.get(), new Item.Properties() .food(new FoodProperties.Builder().usingConvertsTo(Items.BOWL).nutrition(6).saturationModifier(7.2f) - .effect(()-> new MobEffectInstance(MobEffects.DAMAGE_BOOST,60*20,0),1.0F).build()))); + .effect(() -> new MobEffectInstance(MobEffects.DAMAGE_BOOST, 60 * 20, 0), 1.0F).build()))); + public static final Supplier EGG_ADDED_STEWED_NOODLES = registerWithCreateTab("egg_added_stewed_noodles", () -> new FoodBlockItem(ModBlocks.STEWED_NOODLES.get(), new Item.Properties() + .food(new FoodProperties.Builder().usingConvertsTo(Items.BOWL).nutrition(8).saturationModifier(8f) + .effect(() -> new MobEffectInstance(MobEffects.REGENERATION, 5 * 20, 0), 1.0F).build()) + .component(ITEM_NAME, Component.translatable("item.lingshi.egg_added_stewed_noodles")))); + public static final Supplier STEWED_NOODLES = registerWithCreateTab("stewed_noodles", () -> new FoodBlockItem(ModBlocks.STEWED_NOODLES.get(), new Item.Properties() + .food(new FoodProperties.Builder().usingConvertsTo(Items.BOWL).nutrition(6).saturationModifier(5f).build()))); private static Supplier registerWithCreateTab(String item_name, Supplier itemSupplier) { Supplier item = ITEMS.register(item_name, itemSupplier); diff --git a/src/main/java/mczme/lingshi/common/util/ListUtil.java b/src/main/java/mczme/lingshi/common/util/ListUtil.java deleted file mode 100644 index be43107..0000000 --- a/src/main/java/mczme/lingshi/common/util/ListUtil.java +++ /dev/null @@ -1,17 +0,0 @@ -package mczme.lingshi.common.util; - -import net.minecraft.world.item.ItemStack; - -import java.util.ArrayList; -import java.util.List; - -public class ListUtil { - - public static List copy(List list){ - List newList = new ArrayList<>(); - for (ItemStack t : list) { - newList.add(t.copy()); - } - return newList; - } -} diff --git a/src/main/resources/assets/lingshi/blockstates/stewed_noodles.json b/src/main/resources/assets/lingshi/blockstates/stewed_noodles.json new file mode 100644 index 0000000..40036ff --- /dev/null +++ b/src/main/resources/assets/lingshi/blockstates/stewed_noodles.json @@ -0,0 +1,64 @@ +{ + "variants": { + "amount=0,egg=false,facing=east": { + "model": "lingshi:block/bowl", + "y": 270 + }, + "amount=0,egg=false,facing=north": { + "model": "lingshi:block/bowl", + "y": 180 + }, + "amount=0,egg=false,facing=south": { + "model": "lingshi:block/bowl" + }, + "amount=0,egg=false,facing=west": { + "model": "lingshi:block/bowl", + "y": 90 + }, + "amount=0,egg=true,facing=east": { + "model": "lingshi:block/bowl", + "y": 270 + }, + "amount=0,egg=true,facing=north": { + "model": "lingshi:block/bowl", + "y": 180 + }, + "amount=0,egg=true,facing=south": { + "model": "lingshi:block/bowl" + }, + "amount=0,egg=true,facing=west": { + "model": "lingshi:block/bowl", + "y": 90 + }, + "amount=1,egg=false,facing=east": { + "model": "lingshi:block/stewed_noodles", + "y": 270 + }, + "amount=1,egg=false,facing=north": { + "model": "lingshi:block/stewed_noodles", + "y": 180 + }, + "amount=1,egg=false,facing=south": { + "model": "lingshi:block/stewed_noodles" + }, + "amount=1,egg=false,facing=west": { + "model": "lingshi:block/stewed_noodles", + "y": 90 + }, + "amount=1,egg=true,facing=east": { + "model": "lingshi:block/egg_added_stewed_noodles", + "y": 270 + }, + "amount=1,egg=true,facing=north": { + "model": "lingshi:block/egg_added_stewed_noodles", + "y": 180 + }, + "amount=1,egg=true,facing=south": { + "model": "lingshi:block/egg_added_stewed_noodles" + }, + "amount=1,egg=true,facing=west": { + "model": "lingshi:block/egg_added_stewed_noodles", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lingshi/models/block/egg_added_stewed_noodles.json b/src/main/resources/assets/lingshi/models/block/egg_added_stewed_noodles.json new file mode 100644 index 0000000..af2deb2 --- /dev/null +++ b/src/main/resources/assets/lingshi/models/block/egg_added_stewed_noodles.json @@ -0,0 +1,336 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "lingshi:block/bowl", + "1": "lingshi:block/stewed_noodles", + "particle": "lingshi:block/bowl" + }, + "elements": [ + { + "from": [6, 1, 10], + "to": [10, 2, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 1, 10]}, + "faces": { + "north": {"uv": [12, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [11, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [11, 1, 15, 2], "texture": "#0"}, + "down": {"uv": [11, 0, 15, 1], "texture": "#0"} + } + }, + { + "from": [6, 0, 6], + "to": [10, 1, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 6]}, + "faces": { + "north": {"uv": [0, 8, 4, 9], "texture": "#0"}, + "east": {"uv": [0, 8, 4, 9], "texture": "#0"}, + "south": {"uv": [0, 8, 4, 9], "texture": "#0"}, + "west": {"uv": [0, 8, 4, 9], "texture": "#0"}, + "up": {"uv": [0, 4, 4, 8], "texture": "#0"}, + "down": {"uv": [0, 4, 4, 8], "texture": "#0"} + } + }, + { + "from": [6, 1, 5], + "to": [10, 2, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 1, 5]}, + "faces": { + "north": {"uv": [11, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [12, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [11, 1, 15, 2], "texture": "#0"}, + "down": {"uv": [11, 0, 15, 1], "texture": "#0"} + } + }, + { + "from": [5, 1, 5], + "to": [6, 2, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 1, 7]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [10, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [10, 0, 11, 1], "texture": "#0"}, + "west": {"uv": [10, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [10, 1, 16, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10, 0, 16, 1], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [10, 1, 5], + "to": [11, 2, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 1, 7]}, + "faces": { + "north": {"uv": [10, 0, 11, 1], "texture": "#0"}, + "east": {"uv": [10, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [10, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [10, 1, 16, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10, 0, 16, 1], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [3, 2, 3], + "to": [5, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 2, 7]}, + "faces": { + "north": {"uv": [0, 0, 2, 0], "texture": "#0"}, + "up": {"uv": [6, 11, 16, 13], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 9, 10, 11], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [5, 2, 3], + "to": [11, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 2, 4]}, + "faces": { + "north": {"uv": [0, 0, 6, 0], "texture": "#0"}, + "up": {"uv": [8, 11, 14, 13], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 13, 6, 15], "texture": "#0"} + } + }, + { + "from": [5, 2, 11], + "to": [11, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 2, 11]}, + "faces": { + "north": {"uv": [0, 9, 6, 9], "texture": "#0"}, + "up": {"uv": [8, 11, 14, 13], "texture": "#0"}, + "down": {"uv": [0, 11, 6, 13], "texture": "#0"} + } + }, + { + "from": [2, 2, 3], + "to": [3, 6, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 4, 7]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "east": {"uv": [4, 4, 14, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 10, 0], "texture": "#0"} + } + }, + { + "from": [13, 2, 3], + "to": [14, 6, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 4, 7]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "west": {"uv": [4, 4, 14, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 13], + "to": [13, 6, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 4, 13]}, + "faces": { + "north": {"uv": [4, 4, 14, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 2], + "to": [13, 6, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 4, 2]}, + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "south": {"uv": [4, 4, 14, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [11, 2, 3], + "to": [13, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 2, 7]}, + "faces": { + "north": {"uv": [0, 0, 2, 0], "texture": "#0"}, + "up": {"uv": [6, 11, 16, 13], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 9, 10, 11], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [3, 5, 3], + "to": [13, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 4, 4]}, + "faces": { + "up": {"uv": [0, 0, 10, 10], "texture": "#1"} + } + }, + { + "from": [4.8, 4.8, 8], + "to": [11.8, 5.8, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 5, 8]}, + "faces": { + "north": {"uv": [0, 12, 7, 13], "texture": "#1"}, + "south": {"uv": [0, 11, 7, 12], "texture": "#1"}, + "west": {"uv": [6, 10, 7, 11], "texture": "#1"}, + "up": {"uv": [0, 10, 7, 11], "texture": "#1"} + } + }, + { + "from": [4, 4.8, 7], + "to": [11, 5.8, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 5, 7]}, + "faces": { + "north": {"uv": [7, 10, 14, 11], "texture": "#1"}, + "south": {"uv": [7, 10, 14, 11], "texture": "#1"}, + "west": {"uv": [13, 10, 14, 11], "texture": "#1"}, + "up": {"uv": [7, 10, 14, 11], "texture": "#1"} + } + }, + { + "from": [4, 4.6, 5], + "to": [11, 5.6, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 5, 5]}, + "faces": { + "north": {"uv": [7, 10, 14, 11], "texture": "#1"}, + "east": {"uv": [13, 10, 14, 11], "texture": "#1"}, + "south": {"uv": [7, 10, 14, 11], "texture": "#1"}, + "west": {"uv": [7, 10, 8, 11], "texture": "#1"}, + "up": {"uv": [7, 10, 14, 11], "texture": "#1"} + } + }, + { + "from": [8, 4.5, 4], + "to": [12, 5.5, 5], + "rotation": {"angle": 22.5, "axis": "y", "origin": [9, 5, 4]}, + "faces": { + "north": {"uv": [10, 0, 14, 1], "texture": "#1"}, + "east": {"uv": [13, 0, 14, 1], "texture": "#1"}, + "south": {"uv": [10, 0, 14, 1], "texture": "#1"}, + "west": {"uv": [10, 0, 11, 1], "texture": "#1"}, + "up": {"uv": [10, 0, 14, 1], "texture": "#1"} + } + }, + { + "from": [4, 4.7, 9], + "to": [8, 5.7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 9]}, + "faces": { + "north": {"uv": [10, 0, 14, 1], "texture": "#1"}, + "south": {"uv": [10, 0, 14, 1], "texture": "#1"}, + "west": {"uv": [10, 0, 11, 1], "texture": "#1"}, + "up": {"uv": [10, 0, 14, 1], "texture": "#1"} + } + }, + { + "from": [4, 4.7, 11], + "to": [8, 5.7, 12], + "rotation": {"angle": -22.5, "axis": "y", "origin": [5, 5, 11]}, + "faces": { + "north": {"uv": [10, 0, 14, 1], "texture": "#1"}, + "east": {"uv": [13, 0, 14, 1], "texture": "#1"}, + "south": {"uv": [10, 0, 14, 1], "texture": "#1"}, + "west": {"uv": [10, 0, 11, 1], "texture": "#1"}, + "up": {"uv": [10, 0, 14, 1], "texture": "#1"} + } + }, + { + "from": [5, 4.8, 6], + "to": [12, 5.8, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 5, 6]}, + "faces": { + "north": {"uv": [0, 12, 7, 13], "rotation": 180, "texture": "#1"}, + "east": {"uv": [6, 10, 7, 11], "texture": "#1"}, + "south": {"uv": [0, 11, 7, 12], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 10, 1, 11], "texture": "#1"}, + "up": {"uv": [0, 10, 7, 11], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [7, 5, 8], + "to": [8, 6, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 5, 8]}, + "faces": { + "south": {"uv": [10, 5, 11, 6], "texture": "#1"}, + "west": {"uv": [10, 5, 13, 6], "texture": "#1"}, + "up": {"uv": [10, 5, 13, 6], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [8, 5, 7], + "to": [12, 6, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 7]}, + "faces": { + "north": {"uv": [10, 1, 14, 2], "texture": "#1"}, + "east": {"uv": [10, 4, 14, 5], "texture": "#1"}, + "south": {"uv": [10, 1, 14, 2], "texture": "#1"}, + "west": {"uv": [10, 4, 14, 5], "texture": "#1"}, + "up": {"uv": [10, 1, 14, 5], "texture": "#1"} + } + }, + { + "from": [8, 5, 11], + "to": [11, 6, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 5, 11]}, + "faces": { + "east": {"uv": [11, 6, 10, 7], "texture": "#1"}, + "south": {"uv": [10, 6, 13, 7], "texture": "#1"}, + "west": {"uv": [12, 6, 13, 7], "texture": "#1"}, + "up": {"uv": [10, 6, 13, 7], "texture": "#1"} + } + }, + { + "from": [9, 5, 6.2], + "to": [11, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 6]}, + "faces": { + "north": {"uv": [10, 5, 12, 6], "texture": "#1"}, + "east": {"uv": [10, 5, 11, 6], "texture": "#1"}, + "west": {"uv": [10, 5, 11, 6], "texture": "#1"}, + "up": {"uv": [10, 5, 12, 6], "texture": "#1"} + } + }, + { + "from": [12, 5, 8], + "to": [13, 6, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 5, 8]}, + "faces": { + "north": {"uv": [11, 5, 12, 6], "texture": "#1"}, + "south": {"uv": [10, 5, 11, 6], "texture": "#1"}, + "up": {"uv": [10, 5, 12, 6], "rotation": 90, "texture": "#1"} + } + } + ], + "display": {}, + "groups": [ + { + "name": "bowl", + "origin": [11, 2, 7], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] + }, + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "children": [ + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + { + "name": "egg", + "origin": [11, 5, 8], + "color": 0, + "children": [21, 22, 23, 24, 25] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/lingshi/models/block/sauteed_seasonal_vegetable.json b/src/main/resources/assets/lingshi/models/block/sauteed_seasonal_vegetable.json index 6a3ba45..d96a1f2 100644 --- a/src/main/resources/assets/lingshi/models/block/sauteed_seasonal_vegetable.json +++ b/src/main/resources/assets/lingshi/models/block/sauteed_seasonal_vegetable.json @@ -63,7 +63,7 @@ }, { "from": [2, 1, 2], - "to": [14, 3, 14], + "to": [14, 2, 14], "rotation": {"angle": 0, "axis": "y", "origin": [2, 1, 2]}, "faces": { "north": {"uv": [12, 0, 14, 12], "rotation": 90, "texture": "#1"}, @@ -72,6 +72,115 @@ "west": {"uv": [14, 0, 16, 12], "rotation": 90, "texture": "#1"}, "up": {"uv": [0, 2, 12, 14], "texture": "#1"} } + }, + { + "from": [11, 2, 4], + "to": [13, 2.5, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 2, 4]}, + "faces": { + "north": {"uv": [9, 4, 11, 4.5], "texture": "#1"}, + "east": {"uv": [9, 5, 11, 5.5], "texture": "#1"}, + "south": {"uv": [9, 5, 11, 5.5], "texture": "#1"}, + "west": {"uv": [9, 5, 11, 5.5], "texture": "#1"}, + "up": {"uv": [9, 4, 11, 6], "texture": "#1"} + } + }, + { + "from": [2, 2, 2], + "to": [4, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 2, 2]}, + "faces": { + "north": {"uv": [0, 2, 2, 3], "rotation": 180, "texture": "#1"}, + "east": {"uv": [1, 2, 2, 4], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 3, 2, 4], "texture": "#1"}, + "west": {"uv": [0, 2, 1, 4], "rotation": 270, "texture": "#1"}, + "up": {"uv": [0, 2, 2, 4], "texture": "#1"} + } + }, + { + "from": [4, 2, 6], + "to": [7, 3, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 2, 6]}, + "faces": { + "north": {"uv": [2, 6, 5, 7], "rotation": 180, "texture": "#1"}, + "east": {"uv": [4, 6, 5, 9], "rotation": 90, "texture": "#1"}, + "south": {"uv": [2, 8, 5, 9], "texture": "#1"}, + "west": {"uv": [2, 6, 3, 9], "rotation": 270, "texture": "#1"}, + "up": {"uv": [2, 6, 5, 9], "texture": "#1"} + } + }, + { + "from": [2, 2, 12], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 2, 12]}, + "faces": { + "north": {"uv": [0, 12, 2, 13], "texture": "#1"}, + "east": {"uv": [1, 12, 2, 14], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 13, 2, 14], "texture": "#1"}, + "west": {"uv": [0, 12, 1, 14], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 12, 2, 14], "texture": "#1"} + } + }, + { + "from": [6, 2, 11], + "to": [9, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 2, 11]}, + "faces": { + "north": {"uv": [4, 11, 7, 12], "texture": "#1"}, + "east": {"uv": [6, 11, 7, 13], "rotation": 90, "texture": "#1"}, + "south": {"uv": [4, 12, 7, 13], "texture": "#1"}, + "west": {"uv": [4, 11, 5, 13], "rotation": 90, "texture": "#1"}, + "up": {"uv": [4, 11, 7, 13], "texture": "#1"} + } + }, + { + "from": [7, 2, 13], + "to": [8, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 2, 12]}, + "faces": { + "north": {"uv": [5, 13, 6, 14], "texture": "#1"}, + "east": {"uv": [5, 13, 6, 14], "texture": "#1"}, + "south": {"uv": [5, 13, 6, 14], "texture": "#1"}, + "west": {"uv": [5, 13, 6, 14], "texture": "#1"}, + "up": {"uv": [5, 13, 6, 14], "texture": "#1"}, + "down": {"uv": [5, 13, 6, 14], "texture": "#1"} + } + }, + { + "from": [9, 2, 6], + "to": [11, 3, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 2, 6]}, + "faces": { + "north": {"uv": [7, 6, 9, 7], "texture": "#1"}, + "east": {"uv": [7, 6, 9, 7], "texture": "#1"}, + "south": {"uv": [7, 7, 9, 8], "texture": "#1"}, + "west": {"uv": [7, 6, 9, 7], "texture": "#1"}, + "up": {"uv": [7, 6, 9, 8], "texture": "#1"} + } + }, + { + "from": [11, 2, 11], + "to": [13, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 2, 11]}, + "faces": { + "north": {"uv": [9, 12, 11, 13], "texture": "#1"}, + "east": {"uv": [10, 11, 11, 13], "rotation": 90, "texture": "#1"}, + "south": {"uv": [9, 12, 11, 13], "texture": "#1"}, + "west": {"uv": [9, 11, 10, 13], "rotation": 90, "texture": "#1"}, + "up": {"uv": [9, 11, 11, 13], "texture": "#1"} + } + }, + { + "from": [7, 2, 2], + "to": [9, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 2, 2]}, + "faces": { + "north": {"uv": [5, 2, 6, 4], "rotation": 90, "texture": "#1"}, + "east": {"uv": [6, 2, 7, 4], "rotation": 90, "texture": "#1"}, + "south": {"uv": [5, 3, 7, 4], "texture": "#1"}, + "west": {"uv": [5, 2, 7, 3], "texture": "#1"}, + "up": {"uv": [5, 2, 7, 4], "texture": "#1"} + } } ], "groups": [ @@ -85,7 +194,7 @@ "name": "group", "origin": [8, 8, 8], "color": 0, - "children": [5] + "children": [5, 6, 7, 8, 9, 10, 11, 12, 13, 14] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/lingshi/models/block/stewed_noodles.json b/src/main/resources/assets/lingshi/models/block/stewed_noodles.json new file mode 100644 index 0000000..d1de896 --- /dev/null +++ b/src/main/resources/assets/lingshi/models/block/stewed_noodles.json @@ -0,0 +1,282 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "lingshi:block/bowl", + "1": "lingshi:block/stewed_noodles", + "particle": "lingshi:block/bowl" + }, + "elements": [ + { + "from": [6, 1, 10], + "to": [10, 2, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 1, 10]}, + "faces": { + "north": {"uv": [12, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [11, 0, 15, 1], "texture": "#0"}, + "up": {"uv": [11, 1, 15, 2], "texture": "#0"}, + "down": {"uv": [11, 0, 15, 1], "texture": "#0"} + } + }, + { + "from": [6, 0, 6], + "to": [10, 1, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 6]}, + "faces": { + "north": {"uv": [0, 8, 4, 9], "texture": "#0"}, + "east": {"uv": [0, 8, 4, 9], "texture": "#0"}, + "south": {"uv": [0, 8, 4, 9], "texture": "#0"}, + "west": {"uv": [0, 8, 4, 9], "texture": "#0"}, + "up": {"uv": [0, 4, 4, 8], "texture": "#0"}, + "down": {"uv": [0, 4, 4, 8], "texture": "#0"} + } + }, + { + "from": [6, 1, 5], + "to": [10, 2, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 1, 5]}, + "faces": { + "north": {"uv": [11, 0, 15, 1], "texture": "#0"}, + "south": {"uv": [12, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [11, 1, 15, 2], "texture": "#0"}, + "down": {"uv": [11, 0, 15, 1], "texture": "#0"} + } + }, + { + "from": [5, 1, 5], + "to": [6, 2, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 1, 7]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [10, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [10, 0, 11, 1], "texture": "#0"}, + "west": {"uv": [10, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [10, 1, 16, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10, 0, 16, 1], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [10, 1, 5], + "to": [11, 2, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 1, 7]}, + "faces": { + "north": {"uv": [10, 0, 11, 1], "texture": "#0"}, + "east": {"uv": [10, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [10, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [10, 1, 16, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10, 0, 16, 1], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [3, 2, 3], + "to": [5, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 2, 7]}, + "faces": { + "north": {"uv": [0, 0, 2, 0], "texture": "#0"}, + "up": {"uv": [6, 11, 16, 13], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 9, 10, 11], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [5, 2, 3], + "to": [11, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 2, 4]}, + "faces": { + "north": {"uv": [0, 0, 6, 0], "texture": "#0"}, + "up": {"uv": [8, 11, 14, 13], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 13, 6, 15], "texture": "#0"} + } + }, + { + "from": [5, 2, 11], + "to": [11, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 2, 11]}, + "faces": { + "north": {"uv": [0, 9, 6, 9], "texture": "#0"}, + "up": {"uv": [8, 11, 14, 13], "texture": "#0"}, + "down": {"uv": [0, 11, 6, 13], "texture": "#0"} + } + }, + { + "from": [2, 2, 3], + "to": [3, 6, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 4, 7]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "east": {"uv": [4, 4, 14, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 4], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 10, 0], "texture": "#0"} + } + }, + { + "from": [13, 2, 3], + "to": [14, 6, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 4, 7]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "west": {"uv": [4, 4, 14, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 13], + "to": [13, 6, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 4, 13]}, + "faces": { + "north": {"uv": [4, 4, 14, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 10, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 2], + "to": [13, 6, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 4, 2]}, + "faces": { + "north": {"uv": [0, 0, 10, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "south": {"uv": [4, 4, 14, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [11, 2, 3], + "to": [13, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 2, 7]}, + "faces": { + "north": {"uv": [0, 0, 2, 0], "texture": "#0"}, + "up": {"uv": [6, 11, 16, 13], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 9, 10, 11], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [3, 5, 3], + "to": [13, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 4, 4]}, + "faces": { + "up": {"uv": [0, 0, 10, 10], "texture": "#1"} + } + }, + { + "from": [5, 5, 8], + "to": [12, 6, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 5, 8]}, + "faces": { + "north": {"uv": [0, 12, 7, 13], "texture": "#1"}, + "east": {"uv": [0, 10, 1, 11], "texture": "#1"}, + "south": {"uv": [0, 11, 7, 12], "texture": "#1"}, + "west": {"uv": [6, 10, 7, 11], "texture": "#1"}, + "up": {"uv": [0, 10, 7, 11], "texture": "#1"} + } + }, + { + "from": [4, 4.8, 7], + "to": [11, 5.8, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 5, 7]}, + "faces": { + "north": {"uv": [7, 10, 14, 11], "texture": "#1"}, + "east": {"uv": [7, 10, 8, 11], "texture": "#1"}, + "south": {"uv": [7, 10, 14, 11], "texture": "#1"}, + "west": {"uv": [13, 10, 14, 11], "texture": "#1"}, + "up": {"uv": [7, 10, 14, 11], "texture": "#1"} + } + }, + { + "from": [4, 4.8, 5], + "to": [11, 5.8, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 5, 5]}, + "faces": { + "north": {"uv": [7, 10, 14, 11], "texture": "#1"}, + "east": {"uv": [13, 10, 14, 11], "texture": "#1"}, + "south": {"uv": [7, 10, 14, 11], "texture": "#1"}, + "west": {"uv": [7, 10, 8, 11], "texture": "#1"}, + "up": {"uv": [7, 10, 14, 11], "texture": "#1"} + } + }, + { + "from": [8, 4.5, 4], + "to": [12, 5.5, 5], + "rotation": {"angle": 22.5, "axis": "y", "origin": [9, 5, 4]}, + "faces": { + "north": {"uv": [10, 0, 14, 1], "texture": "#1"}, + "east": {"uv": [13, 0, 14, 1], "texture": "#1"}, + "south": {"uv": [10, 0, 14, 1], "texture": "#1"}, + "west": {"uv": [10, 0, 11, 1], "texture": "#1"}, + "up": {"uv": [10, 0, 14, 1], "texture": "#1"} + } + }, + { + "from": [6, 4.7, 9], + "to": [10, 5.7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 5, 9]}, + "faces": { + "north": {"uv": [10, 0, 14, 1], "texture": "#1"}, + "east": {"uv": [14, 0, 13, 1], "texture": "#1"}, + "south": {"uv": [10, 0, 14, 1], "texture": "#1"}, + "west": {"uv": [10, 0, 11, 1], "texture": "#1"}, + "up": {"uv": [10, 0, 14, 1], "texture": "#1"} + } + }, + { + "from": [4, 4.7, 10], + "to": [8, 5.7, 11], + "rotation": {"angle": -22.5, "axis": "y", "origin": [5, 5, 10]}, + "faces": { + "north": {"uv": [10, 0, 14, 1], "texture": "#1"}, + "east": {"uv": [13, 0, 14, 1], "texture": "#1"}, + "south": {"uv": [10, 0, 14, 1], "texture": "#1"}, + "west": {"uv": [10, 0, 11, 1], "texture": "#1"}, + "up": {"uv": [10, 0, 14, 1], "texture": "#1"} + } + }, + { + "from": [11, 4.6, 10], + "to": [12, 5.6, 13], + "rotation": {"angle": -45, "axis": "y", "origin": [12, 5, 10]}, + "faces": { + "north": {"uv": [13, 0, 12, 1], "texture": "#1"}, + "east": {"uv": [10, 0, 13, 1], "texture": "#1"}, + "south": {"uv": [10, 0, 11, 1], "texture": "#1"}, + "west": {"uv": [10, 0, 13, 1], "texture": "#1"}, + "up": {"uv": [10, 0, 13, 1], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [5, 5, 6], + "to": [12, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 5, 6]}, + "faces": { + "north": {"uv": [0, 12, 7, 13], "rotation": 180, "texture": "#1"}, + "east": {"uv": [6, 10, 7, 11], "texture": "#1"}, + "south": {"uv": [0, 11, 7, 12], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 10, 1, 11], "texture": "#1"}, + "up": {"uv": [0, 10, 7, 11], "rotation": 180, "texture": "#1"} + } + } + ], + "display": {}, + "groups": [ + { + "name": "bowl", + "origin": [11, 2, 7], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] + }, + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "children": [13, 14, 15, 16, 17, 18, 19, 20, 21] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/lingshi/textures/block/stewed_noodles.png b/src/main/resources/assets/lingshi/textures/block/stewed_noodles.png new file mode 100644 index 0000000..52d302b Binary files /dev/null and b/src/main/resources/assets/lingshi/textures/block/stewed_noodles.png differ diff --git a/src/main/resources/assets/lingshi/textures/item/egg_added_stewed_noodles.png b/src/main/resources/assets/lingshi/textures/item/egg_added_stewed_noodles.png new file mode 100644 index 0000000..d9e558e Binary files /dev/null and b/src/main/resources/assets/lingshi/textures/item/egg_added_stewed_noodles.png differ diff --git a/src/main/resources/assets/lingshi/textures/item/stewed_noodles.png b/src/main/resources/assets/lingshi/textures/item/stewed_noodles.png new file mode 100644 index 0000000..f4171de Binary files /dev/null and b/src/main/resources/assets/lingshi/textures/item/stewed_noodles.png differ diff --git a/src/main/resources/data/lingshi/loot_table/blocks/stewed_noodles.json b/src/main/resources/data/lingshi/loot_table/blocks/stewed_noodles.json new file mode 100644 index 0000000..839de91 --- /dev/null +++ b/src/main/resources/data/lingshi/loot_table/blocks/stewed_noodles.json @@ -0,0 +1,51 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "lingshi:stewed_noodles", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "lingshi:stewed_noodles", + "properties": { + "amount": "1", + "egg": "false" + } + } + ] + }, + { + "type": "minecraft:item", + "name": "lingshi:egg_added_stewed_noodles", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "lingshi:stewed_noodles", + "properties": { + "amount": "1", + "egg": "true" + } + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:bowl", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "lingshi:stewed_noodles", + "properties": { + "amount": "0" + } + } + ] + } + ] + } + ], + "random_sequence": "lingshi:stewed_noodles" +}