From cd00321cabc6d27e4e7aadf6d6f6302bda282c94 Mon Sep 17 00:00:00 2001 From: MCZME <13183052+mczme@user.noreply.gitee.com> Date: Wed, 11 Sep 2024 17:18:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E7=85=8E=E9=B1=BC?= =?UTF-8?q?=20=E8=B0=83=E6=95=B4data=E6=96=87=E4=BB=B6=E7=BB=93=E6=9E=84?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8Dhud=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../71e72dbdeb626cc835aaccd2ae47fd3d8794cd24 | 3 +- .../85f12f813aff948f91f5cd129c0ffa86bcb17361 | 4 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 8 +- .../a189ba72f94c72036c5b4a6381591ea76d224567 | 3 +- .../lingshi/blockstates/fried_fish.json | 34 +++ .../resources/assets/lingshi/lang/zh_cn.json | 1 + .../lingshi/models/item/fried_fish.json | 6 + .../recipes/decorations/glass_jar.json | 32 +++ .../recipes/skillet/fried_fish.json | 32 +++ .../data/lingshi/recipe/glass_jar.json | 21 ++ .../lingshi/recipe/skillet/fried_egg.json | 2 +- .../lingshi/recipe/skillet/fried_fish.json | 25 ++ .../block/entity/CookingPotBlockEntity.java | 3 + .../block/entity/SkilletBlockEntity.java | 22 +- .../lingshi/common/registry/ModBlocks.java | 1 + .../lingshi/common/registry/ModItems.java | 3 + .../{common => }/data/BlockStates.java | 3 +- .../{common => }/data/CookingFoodDataGen.java | 2 +- .../{common => }/data/DataGenerators.java | 12 +- .../lingshi/{common => }/data/ItemModels.java | 3 +- .../builder/ChoppingBoardRecipeBuilder.java | 2 +- .../data/builder/CookingPotRecipeBuilder.java | 2 +- .../data/builder/SkilletRecipeBuilder.java | 2 +- .../data/lang/ChineseLanguageProvider.java | 3 +- .../{common => }/data/loot/BlockLoot.java | 2 +- .../recipe/ChoppingBoardRecipeDatagen.java | 4 +- .../data/recipe/CookingPotRecipeDataGen.java | 6 +- .../data/recipe/CraftingRecipeDataGen.java | 13 +- .../{common => }/data/recipe/Recipes.java | 2 +- .../data/recipe/SkilletRecipeDatagen.java | 11 +- .../{common => }/data/tag/BlockTags.java | 2 +- .../{common => }/data/tag/ItemTags.java | 2 +- .../lingshi/models/block/fried_fish.json | 240 ++++++++++++++++++ .../lingshi/textures/block/fried_fish.png | Bin 0 -> 582 bytes .../lingshi/textures/item/fried_fish.png | Bin 0 -> 385 bytes 35 files changed, 467 insertions(+), 44 deletions(-) create mode 100644 src/generated/resources/assets/lingshi/blockstates/fried_fish.json create mode 100644 src/generated/resources/assets/lingshi/models/item/fried_fish.json create mode 100644 src/generated/resources/data/lingshi/advancement/recipes/decorations/glass_jar.json create mode 100644 src/generated/resources/data/lingshi/advancement/recipes/skillet/fried_fish.json create mode 100644 src/generated/resources/data/lingshi/recipe/glass_jar.json create mode 100644 src/generated/resources/data/lingshi/recipe/skillet/fried_fish.json rename src/main/java/mczme/lingshi/{common => }/data/BlockStates.java (95%) rename src/main/java/mczme/lingshi/{common => }/data/CookingFoodDataGen.java (98%) rename src/main/java/mczme/lingshi/{common => }/data/DataGenerators.java (90%) rename src/main/java/mczme/lingshi/{common => }/data/ItemModels.java (96%) rename src/main/java/mczme/lingshi/{common => }/data/builder/ChoppingBoardRecipeBuilder.java (97%) rename src/main/java/mczme/lingshi/{common => }/data/builder/CookingPotRecipeBuilder.java (98%) rename src/main/java/mczme/lingshi/{common => }/data/builder/SkilletRecipeBuilder.java (98%) rename src/main/java/mczme/lingshi/{common => }/data/lang/ChineseLanguageProvider.java (96%) rename src/main/java/mczme/lingshi/{common => }/data/loot/BlockLoot.java (96%) rename src/main/java/mczme/lingshi/{common => }/data/recipe/ChoppingBoardRecipeDatagen.java (92%) rename src/main/java/mczme/lingshi/{common => }/data/recipe/CookingPotRecipeDataGen.java (96%) rename src/main/java/mczme/lingshi/{common => }/data/recipe/CraftingRecipeDataGen.java (84%) rename src/main/java/mczme/lingshi/{common => }/data/recipe/Recipes.java (97%) rename src/main/java/mczme/lingshi/{common => }/data/recipe/SkilletRecipeDatagen.java (89%) rename src/main/java/mczme/lingshi/{common => }/data/tag/BlockTags.java (97%) rename src/main/java/mczme/lingshi/{common => }/data/tag/ItemTags.java (97%) create mode 100644 src/main/resources/assets/lingshi/models/block/fried_fish.json create mode 100644 src/main/resources/assets/lingshi/textures/block/fried_fish.png create mode 100644 src/main/resources/assets/lingshi/textures/item/fried_fish.png diff --git a/src/generated/resources/.cache/71e72dbdeb626cc835aaccd2ae47fd3d8794cd24 b/src/generated/resources/.cache/71e72dbdeb626cc835aaccd2ae47fd3d8794cd24 index f8814ce..00f9317 100644 --- a/src/generated/resources/.cache/71e72dbdeb626cc835aaccd2ae47fd3d8794cd24 +++ b/src/generated/resources/.cache/71e72dbdeb626cc835aaccd2ae47fd3d8794cd24 @@ -1,4 +1,4 @@ -// 1.21 2024-09-09T22:04:36.2459739 Item Models: lingshi +// 1.21 2024-09-11T16:41:07.9791561 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 @@ -10,6 +10,7 @@ a2eecf0a3a6c93ab1c418b7953b4080059274277 assets/lingshi/models/item/egg_added_st 37db2e9897cd20f19d58456cafcb898f113c1d4b assets/lingshi/models/item/egg_fried_rice.json 3492c131525851e1fa451f33349d2686d2ff1fc0 assets/lingshi/models/item/flour.json 014b17c43a62c41d623a0d944e434cf1ac3986be assets/lingshi/models/item/fried_egg.json +4d872e0d2b22e00bc1e83385ec690b91852ac799 assets/lingshi/models/item/fried_fish.json bb65673aded0d1674c4329547af6263f100a1e6b assets/lingshi/models/item/glass_jar.json 249957a6811e300efca306db358e468855851d73 assets/lingshi/models/item/iron_knife.json 8889a4deb394774a900a518a3d4849db21da3370 assets/lingshi/models/item/noodles.json diff --git a/src/generated/resources/.cache/85f12f813aff948f91f5cd129c0ffa86bcb17361 b/src/generated/resources/.cache/85f12f813aff948f91f5cd129c0ffa86bcb17361 index ab6beac..8c50dd3 100644 --- a/src/generated/resources/.cache/85f12f813aff948f91f5cd129c0ffa86bcb17361 +++ b/src/generated/resources/.cache/85f12f813aff948f91f5cd129c0ffa86bcb17361 @@ -1,2 +1,2 @@ -// 1.21 2024-09-08T13:11:17.1194972 Languages: zh_cn for mod: lingshi -c3200bf00b6b972fe1d324853da84e5a4d632b71 assets/lingshi/lang/zh_cn.json +// 1.21 2024-09-11T16:41:07.985159 Languages: zh_cn for mod: lingshi +3af0560adaf650552afc0d5598a33c18ef001aed assets/lingshi/lang/zh_cn.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 1e45d7e..4d41b96 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.21 2024-09-06T08:35:30.5005652 Recipes +// 1.21 2024-09-11T16:41:07.9821614 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 @@ -7,6 +7,7 @@ d918a2369d899974ffa38d6a363553af9e97fdee data/lingshi/advancement/recipes/cookin 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 +6590069c0dd94d0c627ade3700b0e59d995c7826 data/lingshi/advancement/recipes/decorations/glass_jar.json 0486b842988b1d1ac0abb797a91d26077583679e data/lingshi/advancement/recipes/decorations/pot_lid.json 0a4b54bfda8aa98f1a26bbf1d8231c76ed12e770 data/lingshi/advancement/recipes/decorations/skillet.json 129f0de548d7a7b62ee9dcaeb54da65d7095a009 data/lingshi/advancement/recipes/decorations/stove.json @@ -21,6 +22,7 @@ de37dcaf7e9f79459492cd69ddb81d8d27406f99 data/lingshi/advancement/recipes/skille 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 +80e9965c7ee31089a18f9c11cfbb08bdc5b1c090 data/lingshi/advancement/recipes/skillet/fried_fish.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 @@ -38,6 +40,7 @@ d0f1076aaf14e4191918a911196f1aeac7d7a59d data/lingshi/recipe/cooking_pot/cooked_ 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 +6939bc4dbaf8516c0f496369032353a353704949 data/lingshi/recipe/glass_jar.json e6daac4cca245fc9e220e2fcb1f2b27e410ba503 data/lingshi/recipe/iron_knife.json dba470601fa51254c73ae3c63fa858de333a48c2 data/lingshi/recipe/pot_lid.json a0c7fd85028ea7997689d7bc093b9d025c522ea6 data/lingshi/recipe/skillet.json @@ -51,7 +54,8 @@ c60918f7fafeb03f1c8244417c151ea7a5e44a31 data/lingshi/recipe/skillet/cooked_rabb e72067c16cd3f5e2ec6a11abb0c7a9e41d3e3fd4 data/lingshi/recipe/skillet/cooked_salmon.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 +94e2e5b3687b5e2dcbf9cb99fd817ebcb8a3580d data/lingshi/recipe/skillet/fried_egg.json +fe5d9e40862da49ec28457afb189103da4288249 data/lingshi/recipe/skillet/fried_fish.json 140dcebcd3163fc850baf9601ea2e9364f4b0437 data/lingshi/recipe/skillet/sauteed_seasonal_vegetable.json fdba5b9f3c24313b753271e755d317990919bc07 data/lingshi/recipe/skillet/stewed_noodles.json 3563171190654e76637de2fa78a6c750389674d7 data/lingshi/recipe/spatula.json diff --git a/src/generated/resources/.cache/a189ba72f94c72036c5b4a6381591ea76d224567 b/src/generated/resources/.cache/a189ba72f94c72036c5b4a6381591ea76d224567 index f69f039..21f8df9 100644 --- a/src/generated/resources/.cache/a189ba72f94c72036c5b4a6381591ea76d224567 +++ b/src/generated/resources/.cache/a189ba72f94c72036c5b4a6381591ea76d224567 @@ -1,4 +1,5 @@ -// 1.21 2024-09-08T13:11:17.1214938 Block States: lingshi +// 1.21 2024-09-11T16:41:07.9871608 Block States: lingshi c5265867b72222a7b9a0c319c8593c91a69953ab assets/lingshi/blockstates/chopping_board.json +5a97e2294b02d54bf2ea8ebde233dfde1f678cd2 assets/lingshi/blockstates/fried_fish.json 853092c1c42ba5c9b5c021b2035d8ea9b6d813cb assets/lingshi/blockstates/glass_jar.json cf0f8d1e27a4b3d6af3697ad29c93125328b6213 assets/lingshi/blockstates/sauteed_seasonal_vegetable.json diff --git a/src/generated/resources/assets/lingshi/blockstates/fried_fish.json b/src/generated/resources/assets/lingshi/blockstates/fried_fish.json new file mode 100644 index 0000000..d579cec --- /dev/null +++ b/src/generated/resources/assets/lingshi/blockstates/fried_fish.json @@ -0,0 +1,34 @@ +{ + "variants": { + "amount=0,facing=east": { + "model": "lingshi:block/plate", + "y": 270 + }, + "amount=0,facing=north": { + "model": "lingshi:block/plate", + "y": 180 + }, + "amount=0,facing=south": { + "model": "lingshi:block/plate" + }, + "amount=0,facing=west": { + "model": "lingshi:block/plate", + "y": 90 + }, + "amount=1,facing=east": { + "model": "lingshi:block/fried_fish", + "y": 270 + }, + "amount=1,facing=north": { + "model": "lingshi:block/fried_fish", + "y": 180 + }, + "amount=1,facing=south": { + "model": "lingshi:block/fried_fish" + }, + "amount=1,facing=west": { + "model": "lingshi:block/fried_fish", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/lingshi/lang/zh_cn.json b/src/generated/resources/assets/lingshi/lang/zh_cn.json index a79a5e3..0729752 100644 --- a/src/generated/resources/assets/lingshi/lang/zh_cn.json +++ b/src/generated/resources/assets/lingshi/lang/zh_cn.json @@ -2,6 +2,7 @@ "block.lingshi.cabbage": "白菜种子", "block.lingshi.chopping_board": "砧板", "block.lingshi.cooking_pot": "烹饪锅", + "block.lingshi.fried_fish": "煎鱼", "block.lingshi.glass_jar": "玻璃罐", "block.lingshi.pork_feet_rice": "猪脚饭", "block.lingshi.rice": "稻米", diff --git a/src/generated/resources/assets/lingshi/models/item/fried_fish.json b/src/generated/resources/assets/lingshi/models/item/fried_fish.json new file mode 100644 index 0000000..310c895 --- /dev/null +++ b/src/generated/resources/assets/lingshi/models/item/fried_fish.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lingshi:item/fried_fish" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/lingshi/advancement/recipes/decorations/glass_jar.json b/src/generated/resources/data/lingshi/advancement/recipes/decorations/glass_jar.json new file mode 100644 index 0000000..76bd888 --- /dev/null +++ b/src/generated/resources/data/lingshi/advancement/recipes/decorations/glass_jar.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glass_panes": { + "conditions": { + "items": [ + { + "items": "#c:glass_panes" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "lingshi:glass_jar" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_glass_panes" + ] + ], + "rewards": { + "recipes": [ + "lingshi:glass_jar" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/lingshi/advancement/recipes/skillet/fried_fish.json b/src/generated/resources/data/lingshi/advancement/recipes/skillet/fried_fish.json new file mode 100644 index 0000000..63824a9 --- /dev/null +++ b/src/generated/resources/data/lingshi/advancement/recipes/skillet/fried_fish.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/fried_fish" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_skillet" + ] + ], + "rewards": { + "recipes": [ + "lingshi:skillet/fried_fish" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/lingshi/recipe/glass_jar.json b/src/generated/resources/data/lingshi/recipe/glass_jar.json new file mode 100644 index 0000000..aa5a8b7 --- /dev/null +++ b/src/generated/resources/data/lingshi/recipe/glass_jar.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "tag": "minecraft:wooden_slabs" + }, + "X": { + "tag": "c:glass_panes" + } + }, + "pattern": [ + " A ", + "X X", + " X " + ], + "result": { + "count": 1, + "id": "lingshi:glass_jar" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/lingshi/recipe/skillet/fried_egg.json b/src/generated/resources/data/lingshi/recipe/skillet/fried_egg.json index 703df1e..f7e5af2 100644 --- a/src/generated/resources/data/lingshi/recipe/skillet/fried_egg.json +++ b/src/generated/resources/data/lingshi/recipe/skillet/fried_egg.json @@ -1,7 +1,7 @@ { "type": "lingshi:skillet", "fluid": { - "amount": 100, + "amount": 250, "id": "lingshi:oil_source" }, "group": "", diff --git a/src/generated/resources/data/lingshi/recipe/skillet/fried_fish.json b/src/generated/resources/data/lingshi/recipe/skillet/fried_fish.json new file mode 100644 index 0000000..15e568f --- /dev/null +++ b/src/generated/resources/data/lingshi/recipe/skillet/fried_fish.json @@ -0,0 +1,25 @@ +{ + "type": "lingshi:skillet", + "container": { + "container": { + "count": 1, + "id": "minecraft:bowl" + }, + "stir_fry_count": 1 + }, + "fluid": { + "amount": 250, + "id": "lingshi:oil_source" + }, + "group": "", + "ingredients": [ + { + "item": "minecraft:cod" + } + ], + "label": "pan_fry", + "result": { + "count": 1, + "id": "lingshi:fried_fish" + } +} \ No newline at end of file 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 e79e8d1..14cbd70 100644 --- a/src/main/java/mczme/lingshi/common/block/entity/CookingPotBlockEntity.java +++ b/src/main/java/mczme/lingshi/common/block/entity/CookingPotBlockEntity.java @@ -205,6 +205,7 @@ public CompoundTag getUpdateTag(HolderLookup.Provider pRegistries) { tag.put("result", result.save(pRegistries)); } tag.putInt("count", stewingTime); + tag.putInt("stew_time", stewTime); return tag; } @@ -225,6 +226,7 @@ protected void loadAdditional(CompoundTag pTag, HolderLookup.Provider pRegistrie result = ItemStack.EMPTY; } stewingTime = pTag.getInt("count"); + stewTime = pTag.getInt("stew_time"); } @Override @@ -239,6 +241,7 @@ protected void saveAdditional(CompoundTag pTag, HolderLookup.Provider pRegistrie pTag.put("result", result.save(pRegistries)); } pTag.putInt("count", stewingTime); + pTag.putInt("stew_time",stewTime); } private void saveCookingTime(CompoundTag nbt) { 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 f0b3a82..5f0b519 100644 --- a/src/main/java/mczme/lingshi/common/block/entity/SkilletBlockEntity.java +++ b/src/main/java/mczme/lingshi/common/block/entity/SkilletBlockEntity.java @@ -43,11 +43,11 @@ public class SkilletBlockEntity extends BlockEntity implements MenuProvider, ICa private final int MAX_SLOT = 5; private FluidStack fluidStacks = FluidStack.EMPTY; - private final CookingItemStackHandler itemStackHandler = new CookingItemStackHandler(MAX_SLOT + 2,1); + private final CookingItemStackHandler itemStackHandler = new CookingItemStackHandler(MAX_SLOT + 2, 1); private final int[] cookingTime = new int[MAX_SLOT + 1]; public int stirFryCount = 0; - public int stirFry =0; + public int stirFry = 0; public ItemStack result = ItemStack.EMPTY; @@ -150,7 +150,7 @@ public int getMAX() { } @Override - public int getMaxAmount(){ + public int getMaxAmount() { return 250; } @@ -171,6 +171,7 @@ public Packet getUpdatePacket() { tag.put("result", result.save(pRegistries)); } tag.putInt("count", stirFryCount); + tag.putInt("stir_fry", stirFry); return tag; } @@ -191,6 +192,7 @@ protected void loadAdditional(CompoundTag pTag, HolderLookup.@NotNull Provider p result = ItemStack.EMPTY; } stirFryCount = pTag.getInt("count"); + stirFry = pTag.getInt("stir_fry"); } @Override @@ -205,6 +207,7 @@ protected void saveAdditional(@NotNull CompoundTag pTag, HolderLookup.@NotNull P pTag.put("result", result.save(pRegistries)); } pTag.putInt("count", stirFryCount); + pTag.putInt("stir_fry", stirFry); } private void saveCookingTime(CompoundTag nbt) { @@ -245,7 +248,7 @@ public static void serverTick(Level pLevel, BlockPos pPo if (!flag) { int cookedTime = 0, burntTime = 0; int cooked_size = 0, burnt_size = 0; - boolean fluid_heated= blockEntity.getFluid().isEmpty(); + boolean fluid_heated = blockEntity.getFluid().isEmpty(); // cookProgress for (int i = 0; i < MAX_SLOT + 1; i++) { // fluid @@ -299,21 +302,22 @@ public static void serverTick(Level pLevel, BlockPos pPo blockEntity.stirFry = optional.map(RecipeHolder::value) .map(e -> e.getContainer().stirFryCount()) .orElse(0); + 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)); - if(itemStackHandler.getStackInSlot(5).isEmpty()){ - itemStackHandler.setStackInSlot(5,new ItemStack(ModItems.SPATULA.get())); + if (itemStackHandler.getStackInSlot(5).isEmpty()) { + itemStackHandler.setStackInSlot(5, new ItemStack(ModItems.SPATULA.get())); } - itemStackHandler.setStackInSlot(6,blockEntity.result); + itemStackHandler.setStackInSlot(6, blockEntity.result); } else if (burnt_size > 0) { blockEntity.result = new ItemStack(ModItems.STRANGE_FOOD.get()); - itemStackHandler.setStackInSlot(5,new ItemStack(ModItems.SPATULA.get())); + itemStackHandler.setStackInSlot(5, new ItemStack(ModItems.SPATULA.get())); } } else { blockEntity.clearTime(); - itemStackHandler.setStackInSlot(5,ItemStack.EMPTY); + itemStackHandler.setStackInSlot(5, ItemStack.EMPTY); blockEntity.result = ItemStack.EMPTY; blockEntity.stirFryCount = 0; diff --git a/src/main/java/mczme/lingshi/common/registry/ModBlocks.java b/src/main/java/mczme/lingshi/common/registry/ModBlocks.java index e3460d8..470f8d6 100644 --- a/src/main/java/mczme/lingshi/common/registry/ModBlocks.java +++ b/src/main/java/mczme/lingshi/common/registry/ModBlocks.java @@ -48,6 +48,7 @@ public class ModBlocks { 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 STEWED_NOODLES = BLOCKS.register("stewed_noodles", () -> new StewedNoodles(BlockBehaviour.Properties.of().destroyTime(0.3F))); + public static final Supplier FRIED_FISH = BLOCKS.register("fried_fish", () -> new PlateFoodBlock(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 4eb6586..89c5f09 100644 --- a/src/main/java/mczme/lingshi/common/registry/ModItems.java +++ b/src/main/java/mczme/lingshi/common/registry/ModItems.java @@ -72,6 +72,9 @@ public class ModItems { .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()))); + public static final Supplier FRIED_FISH = registerWithCreateTab("fried_fish", () -> new FoodBlockItem(ModBlocks.FRIED_FISH.get(), new Item.Properties() + .food(new FoodProperties.Builder().usingConvertsTo(Items.BOWL).nutrition(6).saturationModifier(6f) + .effect(() -> new MobEffectInstance(MobEffects.REGENERATION, 2 * 20, 0), 1.0F).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/data/BlockStates.java b/src/main/java/mczme/lingshi/data/BlockStates.java similarity index 95% rename from src/main/java/mczme/lingshi/common/data/BlockStates.java rename to src/main/java/mczme/lingshi/data/BlockStates.java index cab3f78..a1e7da1 100644 --- a/src/main/java/mczme/lingshi/common/data/BlockStates.java +++ b/src/main/java/mczme/lingshi/data/BlockStates.java @@ -1,4 +1,4 @@ -package mczme.lingshi.common.data; +package mczme.lingshi.data; import mczme.lingshi.common.registry.ModBlocks; import mczme.lingshi.lingshi; @@ -27,6 +27,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"); + horizontalBlock(ModBlocks.FRIED_FISH.get(),"block/plate","block/fried_fish"); simpleBlock(ModBlocks.GLASS_JAR.get(),modelFile("block/glass_jar")); } diff --git a/src/main/java/mczme/lingshi/common/data/CookingFoodDataGen.java b/src/main/java/mczme/lingshi/data/CookingFoodDataGen.java similarity index 98% rename from src/main/java/mczme/lingshi/common/data/CookingFoodDataGen.java rename to src/main/java/mczme/lingshi/data/CookingFoodDataGen.java index e070f9c..7a22fa2 100644 --- a/src/main/java/mczme/lingshi/common/data/CookingFoodDataGen.java +++ b/src/main/java/mczme/lingshi/data/CookingFoodDataGen.java @@ -1,4 +1,4 @@ -package mczme.lingshi.common.data; +package mczme.lingshi.data; import mczme.lingshi.common.datamap.ingredient.CookingFoodData; import mczme.lingshi.common.registry.ModFluids; diff --git a/src/main/java/mczme/lingshi/common/data/DataGenerators.java b/src/main/java/mczme/lingshi/data/DataGenerators.java similarity index 90% rename from src/main/java/mczme/lingshi/common/data/DataGenerators.java rename to src/main/java/mczme/lingshi/data/DataGenerators.java index 5713f6b..f2155fe 100644 --- a/src/main/java/mczme/lingshi/common/data/DataGenerators.java +++ b/src/main/java/mczme/lingshi/data/DataGenerators.java @@ -1,10 +1,10 @@ -package mczme.lingshi.common.data; +package mczme.lingshi.data; -import mczme.lingshi.common.data.lang.ChineseLanguageProvider; -import mczme.lingshi.common.data.loot.BlockLoot; -import mczme.lingshi.common.data.recipe.Recipes; -import mczme.lingshi.common.data.tag.BlockTags; -import mczme.lingshi.common.data.tag.ItemTags; +import mczme.lingshi.data.lang.ChineseLanguageProvider; +import mczme.lingshi.data.loot.BlockLoot; +import mczme.lingshi.data.recipe.Recipes; +import mczme.lingshi.data.tag.BlockTags; +import mczme.lingshi.data.tag.ItemTags; import mczme.lingshi.lingshi; import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; diff --git a/src/main/java/mczme/lingshi/common/data/ItemModels.java b/src/main/java/mczme/lingshi/data/ItemModels.java similarity index 96% rename from src/main/java/mczme/lingshi/common/data/ItemModels.java rename to src/main/java/mczme/lingshi/data/ItemModels.java index b3755ba..029a16d 100644 --- a/src/main/java/mczme/lingshi/common/data/ItemModels.java +++ b/src/main/java/mczme/lingshi/data/ItemModels.java @@ -1,4 +1,4 @@ -package mczme.lingshi.common.data; +package mczme.lingshi.data; import mczme.lingshi.common.registry.ModItems; import mczme.lingshi.lingshi; @@ -23,6 +23,7 @@ protected void registerModels() { basicItem(ModItems.SAUTEED_SEASONAL_VEGETABLE.get()); basicItem(ModItems.STEWED_NOODLES.get()); basicItem(ModItems.EGG_ADDED_STEWED_NOODLES.get()); + basicItem(ModItems.FRIED_FISH.get()); basicItem(ModItems.FRIED_EGG.get()); basicItem(ModItems.COOKED_RICE.get()); diff --git a/src/main/java/mczme/lingshi/common/data/builder/ChoppingBoardRecipeBuilder.java b/src/main/java/mczme/lingshi/data/builder/ChoppingBoardRecipeBuilder.java similarity index 97% rename from src/main/java/mczme/lingshi/common/data/builder/ChoppingBoardRecipeBuilder.java rename to src/main/java/mczme/lingshi/data/builder/ChoppingBoardRecipeBuilder.java index 953dbe3..db1427e 100644 --- a/src/main/java/mczme/lingshi/common/data/builder/ChoppingBoardRecipeBuilder.java +++ b/src/main/java/mczme/lingshi/data/builder/ChoppingBoardRecipeBuilder.java @@ -1,4 +1,4 @@ -package mczme.lingshi.common.data.builder; +package mczme.lingshi.data.builder; import mczme.lingshi.common.recipe.ChoppingBoardRecipe; import mczme.lingshi.lingshi; diff --git a/src/main/java/mczme/lingshi/common/data/builder/CookingPotRecipeBuilder.java b/src/main/java/mczme/lingshi/data/builder/CookingPotRecipeBuilder.java similarity index 98% rename from src/main/java/mczme/lingshi/common/data/builder/CookingPotRecipeBuilder.java rename to src/main/java/mczme/lingshi/data/builder/CookingPotRecipeBuilder.java index e00b1ad..4995da1 100644 --- a/src/main/java/mczme/lingshi/common/data/builder/CookingPotRecipeBuilder.java +++ b/src/main/java/mczme/lingshi/data/builder/CookingPotRecipeBuilder.java @@ -1,4 +1,4 @@ -package mczme.lingshi.common.data.builder; +package mczme.lingshi.data.builder; import mczme.lingshi.client.recipebook.CookingFoodRecipeLabel; import mczme.lingshi.common.recipe.CookingPotRecipe; diff --git a/src/main/java/mczme/lingshi/common/data/builder/SkilletRecipeBuilder.java b/src/main/java/mczme/lingshi/data/builder/SkilletRecipeBuilder.java similarity index 98% rename from src/main/java/mczme/lingshi/common/data/builder/SkilletRecipeBuilder.java rename to src/main/java/mczme/lingshi/data/builder/SkilletRecipeBuilder.java index 3e9f39b..e5193ca 100644 --- a/src/main/java/mczme/lingshi/common/data/builder/SkilletRecipeBuilder.java +++ b/src/main/java/mczme/lingshi/data/builder/SkilletRecipeBuilder.java @@ -1,4 +1,4 @@ -package mczme.lingshi.common.data.builder; +package mczme.lingshi.data.builder; import mczme.lingshi.client.recipebook.CookingFoodRecipeLabel; import mczme.lingshi.common.recipe.SkilletRecipe; diff --git a/src/main/java/mczme/lingshi/common/data/lang/ChineseLanguageProvider.java b/src/main/java/mczme/lingshi/data/lang/ChineseLanguageProvider.java similarity index 96% rename from src/main/java/mczme/lingshi/common/data/lang/ChineseLanguageProvider.java rename to src/main/java/mczme/lingshi/data/lang/ChineseLanguageProvider.java index 089a22e..d72af80 100644 --- a/src/main/java/mczme/lingshi/common/data/lang/ChineseLanguageProvider.java +++ b/src/main/java/mczme/lingshi/data/lang/ChineseLanguageProvider.java @@ -1,4 +1,4 @@ -package mczme.lingshi.common.data.lang; +package mczme.lingshi.data.lang; import mczme.lingshi.common.registry.ModItems; import net.minecraft.data.PackOutput; @@ -50,6 +50,7 @@ protected void addTranslations() { this.add(ModItems.SAUTEED_SEASONAL_VEGETABLE.get(),"炒时蔬"); this.add(ModItems.STEWED_NOODLES.get(), "煮面条"); this.add("item.lingshi.egg_added_stewed_noodles","加蛋煮面条"); + this.add(ModItems.FRIED_FISH.get(), "煎鱼"); } } diff --git a/src/main/java/mczme/lingshi/common/data/loot/BlockLoot.java b/src/main/java/mczme/lingshi/data/loot/BlockLoot.java similarity index 96% rename from src/main/java/mczme/lingshi/common/data/loot/BlockLoot.java rename to src/main/java/mczme/lingshi/data/loot/BlockLoot.java index b266d7c..fcc945b 100644 --- a/src/main/java/mczme/lingshi/common/data/loot/BlockLoot.java +++ b/src/main/java/mczme/lingshi/data/loot/BlockLoot.java @@ -1,4 +1,4 @@ -package mczme.lingshi.common.data.loot; +package mczme.lingshi.data.loot; import mczme.lingshi.common.registry.ModBlocks; import mczme.lingshi.common.registry.ModItems; diff --git a/src/main/java/mczme/lingshi/common/data/recipe/ChoppingBoardRecipeDatagen.java b/src/main/java/mczme/lingshi/data/recipe/ChoppingBoardRecipeDatagen.java similarity index 92% rename from src/main/java/mczme/lingshi/common/data/recipe/ChoppingBoardRecipeDatagen.java rename to src/main/java/mczme/lingshi/data/recipe/ChoppingBoardRecipeDatagen.java index 5cfa809..4e6fc79 100644 --- a/src/main/java/mczme/lingshi/common/data/recipe/ChoppingBoardRecipeDatagen.java +++ b/src/main/java/mczme/lingshi/data/recipe/ChoppingBoardRecipeDatagen.java @@ -1,6 +1,6 @@ -package mczme.lingshi.common.data.recipe; +package mczme.lingshi.data.recipe; -import mczme.lingshi.common.data.builder.ChoppingBoardRecipeBuilder; +import mczme.lingshi.data.builder.ChoppingBoardRecipeBuilder; import mczme.lingshi.common.registry.ModItems; import mczme.lingshi.common.tag.NeoforgeTags; import net.minecraft.data.recipes.RecipeOutput; diff --git a/src/main/java/mczme/lingshi/common/data/recipe/CookingPotRecipeDataGen.java b/src/main/java/mczme/lingshi/data/recipe/CookingPotRecipeDataGen.java similarity index 96% rename from src/main/java/mczme/lingshi/common/data/recipe/CookingPotRecipeDataGen.java rename to src/main/java/mczme/lingshi/data/recipe/CookingPotRecipeDataGen.java index e7fd699..61411d5 100644 --- a/src/main/java/mczme/lingshi/common/data/recipe/CookingPotRecipeDataGen.java +++ b/src/main/java/mczme/lingshi/data/recipe/CookingPotRecipeDataGen.java @@ -1,7 +1,7 @@ -package mczme.lingshi.common.data.recipe; +package mczme.lingshi.data.recipe; import mczme.lingshi.client.recipebook.CookingFoodRecipeLabel; -import mczme.lingshi.common.data.builder.CookingPotRecipeBuilder; +import mczme.lingshi.data.builder.CookingPotRecipeBuilder; import mczme.lingshi.common.recipe.CookingPotRecipe; import mczme.lingshi.common.registry.ModItems; import mczme.lingshi.lingshi; @@ -15,7 +15,7 @@ import java.util.List; -import static mczme.lingshi.common.data.recipe.Recipes.has; +import static mczme.lingshi.data.recipe.Recipes.has; public class CookingPotRecipeDataGen { public CookingPotRecipeDataGen(RecipeOutput output) { diff --git a/src/main/java/mczme/lingshi/common/data/recipe/CraftingRecipeDataGen.java b/src/main/java/mczme/lingshi/data/recipe/CraftingRecipeDataGen.java similarity index 84% rename from src/main/java/mczme/lingshi/common/data/recipe/CraftingRecipeDataGen.java rename to src/main/java/mczme/lingshi/data/recipe/CraftingRecipeDataGen.java index e1ff074..ea3b2e2 100644 --- a/src/main/java/mczme/lingshi/common/data/recipe/CraftingRecipeDataGen.java +++ b/src/main/java/mczme/lingshi/data/recipe/CraftingRecipeDataGen.java @@ -1,4 +1,4 @@ -package mczme.lingshi.common.data.recipe; +package mczme.lingshi.data.recipe; import mczme.lingshi.common.registry.ModItems; import net.minecraft.data.recipes.RecipeCategory; @@ -6,8 +6,9 @@ import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Items; +import net.neoforged.neoforge.common.Tags; -import static mczme.lingshi.common.data.recipe.Recipes.has; +import static mczme.lingshi.data.recipe.Recipes.has; public class CraftingRecipeDataGen { @@ -67,6 +68,14 @@ protected void buildRecipes(RecipeOutput output) { .define('A', Items.CAMPFIRE) .unlockedBy("has_iron_ingot", has(Items.MUD_BRICKS)) .save(output); + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, ModItems.GLASS_JAR.get()) + .pattern(" A ") + .pattern("X X") + .pattern(" X ") + .define('X', Tags.Items.GLASS_PANES) + .define('A', ItemTags.WOODEN_SLABS) + .unlockedBy("has_glass_panes", has(Tags.Items.GLASS_PANES)) + .save(output); } } diff --git a/src/main/java/mczme/lingshi/common/data/recipe/Recipes.java b/src/main/java/mczme/lingshi/data/recipe/Recipes.java similarity index 97% rename from src/main/java/mczme/lingshi/common/data/recipe/Recipes.java rename to src/main/java/mczme/lingshi/data/recipe/Recipes.java index 5a63962..2a61a75 100644 --- a/src/main/java/mczme/lingshi/common/data/recipe/Recipes.java +++ b/src/main/java/mczme/lingshi/data/recipe/Recipes.java @@ -1,4 +1,4 @@ -package mczme.lingshi.common.data.recipe; +package mczme.lingshi.data.recipe; import net.minecraft.advancements.Criterion; import net.minecraft.advancements.critereon.InventoryChangeTrigger; diff --git a/src/main/java/mczme/lingshi/common/data/recipe/SkilletRecipeDatagen.java b/src/main/java/mczme/lingshi/data/recipe/SkilletRecipeDatagen.java similarity index 89% rename from src/main/java/mczme/lingshi/common/data/recipe/SkilletRecipeDatagen.java rename to src/main/java/mczme/lingshi/data/recipe/SkilletRecipeDatagen.java index 17acd64..f93c362 100644 --- a/src/main/java/mczme/lingshi/common/data/recipe/SkilletRecipeDatagen.java +++ b/src/main/java/mczme/lingshi/data/recipe/SkilletRecipeDatagen.java @@ -1,7 +1,7 @@ -package mczme.lingshi.common.data.recipe; +package mczme.lingshi.data.recipe; import mczme.lingshi.client.recipebook.CookingFoodRecipeLabel; -import mczme.lingshi.common.data.builder.SkilletRecipeBuilder; +import mczme.lingshi.data.builder.SkilletRecipeBuilder; import mczme.lingshi.common.recipe.SkilletRecipe; import mczme.lingshi.common.registry.ModFluids; import mczme.lingshi.common.registry.ModItems; @@ -17,7 +17,7 @@ import java.util.List; -import static mczme.lingshi.common.data.recipe.Recipes.has; +import static mczme.lingshi.data.recipe.Recipes.has; import static mczme.lingshi.common.tag.NeoforgeTags.CROPS_CABBAGE; public class SkilletRecipeDatagen { @@ -44,8 +44,11 @@ protected void buildRecipes(RecipeOutput output) { build(List.of(Ingredient.of(Items.SALMON)),null,new ItemStack(Items.COOKED_SALMON)) .setLabel(CookingFoodRecipeLabel.HEAT).save(output,create("cooked_salmon")); // 煎 - build(List.of(Ingredient.of(Items.EGG)),new FluidStack(ModFluids.OIL_SOURCE.get(),100),new ItemStack(ModItems.FRIED_EGG.get())) + build(List.of(Ingredient.of(Items.EGG)),new FluidStack(ModFluids.OIL_SOURCE.get(),250),new ItemStack(ModItems.FRIED_EGG.get())) .setLabel(CookingFoodRecipeLabel.PAN_FRY).save(output,create("fried_egg")); + build(List.of(Ingredient.of(Items.COD)),new FluidStack(ModFluids.OIL_SOURCE.get(),250),new ItemStack(ModItems.FRIED_FISH.get())) + .setContainer(new SkilletRecipe.SkilletCookingContainer(new ItemStack(Items.BOWL),1)) + .setLabel(CookingFoodRecipeLabel.PAN_FRY).save(output,create("fried_fish")); // 炒 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.STIR_FRY) diff --git a/src/main/java/mczme/lingshi/common/data/tag/BlockTags.java b/src/main/java/mczme/lingshi/data/tag/BlockTags.java similarity index 97% rename from src/main/java/mczme/lingshi/common/data/tag/BlockTags.java rename to src/main/java/mczme/lingshi/data/tag/BlockTags.java index be522d9..73a1483 100644 --- a/src/main/java/mczme/lingshi/common/data/tag/BlockTags.java +++ b/src/main/java/mczme/lingshi/data/tag/BlockTags.java @@ -1,4 +1,4 @@ -package mczme.lingshi.common.data.tag; +package mczme.lingshi.data.tag; import mczme.lingshi.common.registry.ModBlocks; import mczme.lingshi.lingshi; diff --git a/src/main/java/mczme/lingshi/common/data/tag/ItemTags.java b/src/main/java/mczme/lingshi/data/tag/ItemTags.java similarity index 97% rename from src/main/java/mczme/lingshi/common/data/tag/ItemTags.java rename to src/main/java/mczme/lingshi/data/tag/ItemTags.java index 0998593..97bcb21 100644 --- a/src/main/java/mczme/lingshi/common/data/tag/ItemTags.java +++ b/src/main/java/mczme/lingshi/data/tag/ItemTags.java @@ -1,4 +1,4 @@ -package mczme.lingshi.common.data.tag; +package mczme.lingshi.data.tag; import mczme.lingshi.common.registry.ModItems; import mczme.lingshi.lingshi; diff --git a/src/main/resources/assets/lingshi/models/block/fried_fish.json b/src/main/resources/assets/lingshi/models/block/fried_fish.json new file mode 100644 index 0000000..12ab176 --- /dev/null +++ b/src/main/resources/assets/lingshi/models/block/fried_fish.json @@ -0,0 +1,240 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "lingshi:block/plate", + "1": "lingshi:block/fried_fish", + "particle": "lingshi:block/plate" + }, + "elements": [ + { + "from": [2, 0, 2], + "to": [14, 1, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 7]}, + "faces": { + "north": {"uv": [0, 14, 12, 15], "texture": "#0"}, + "east": {"uv": [0, 14, 12, 15], "texture": "#0"}, + "south": {"uv": [0, 14, 12, 15], "texture": "#0"}, + "west": {"uv": [0, 14, 12, 15], "texture": "#0"}, + "up": {"uv": [0, 0, 12, 12], "texture": "#0"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#0"} + } + }, + { + "from": [1, 1, 1], + "to": [15, 2, 2], + "faces": { + "north": {"uv": [0, 12, 14, 13], "texture": "#0"}, + "east": {"uv": [13, 12, 14, 13], "texture": "#0"}, + "south": {"uv": [0, 13, 14, 14], "texture": "#0"}, + "west": {"uv": [0, 12, 1, 13], "texture": "#0"}, + "up": {"uv": [0, 12, 14, 13], "texture": "#0"}, + "down": {"uv": [0, 12, 14, 13], "texture": "#0"} + } + }, + { + "from": [1, 1, 14], + "to": [15, 2, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 13]}, + "faces": { + "north": {"uv": [0, 13, 14, 14], "texture": "#0"}, + "east": {"uv": [0, 12, 1, 13], "texture": "#0"}, + "south": {"uv": [0, 12, 14, 13], "texture": "#0"}, + "west": {"uv": [13, 12, 14, 13], "texture": "#0"}, + "up": {"uv": [0, 12, 14, 13], "texture": "#0"}, + "down": {"uv": [0, 12, 14, 13], "texture": "#0"} + } + }, + { + "from": [1, 1, 2], + "to": [2, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 0]}, + "faces": { + "east": {"uv": [0, 13, 12, 14], "texture": "#0"}, + "west": {"uv": [0, 12, 12, 13], "texture": "#0"}, + "up": {"uv": [0, 12, 12, 13], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 12, 12, 13], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [14, 1, 2], + "to": [15, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, + "faces": { + "east": {"uv": [0, 12, 12, 13], "texture": "#0"}, + "west": {"uv": [0, 13, 12, 14], "texture": "#0"}, + "up": {"uv": [0, 12, 12, 13], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 12, 12, 13], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [2, 1.2, 3], + "to": [14, 1.2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 1, 3]}, + "faces": { + "north": {"uv": [0, 0, 12, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 11, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 12, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 11, 0], "texture": "#missing"}, + "up": {"uv": [0, 0, 12, 11], "texture": "#1"}, + "down": {"uv": [0, 0, 12, 11], "texture": "#missing"} + } + }, + { + "from": [9, 1, 9], + "to": [13, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 1, 10]}, + "faces": { + "north": {"uv": [0, 14, 4, 15], "texture": "#1"}, + "east": {"uv": [0, 11, 1, 15], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 11, 4, 12], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 12, 4, 13], "texture": "#1"}, + "up": {"uv": [0, 11, 4, 15], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#missing"} + } + }, + { + "from": [6, 1, 6], + "to": [9, 2, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 1, 7]}, + "faces": { + "north": {"uv": [9, 13, 12, 14], "texture": "#1"}, + "east": {"uv": [7, 13, 10, 14], "texture": "#1"}, + "south": {"uv": [0, 0, 3, 1], "texture": "#missing"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#missing"}, + "up": {"uv": [9, 11, 12, 14], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#missing"} + } + }, + { + "from": [9, 1, 7], + "to": [11, 2, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 7]}, + "faces": { + "north": {"uv": [6, 11, 8, 12], "rotation": 180, "texture": "#1"}, + "east": {"uv": [7, 12, 9, 13], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "up": {"uv": [6, 11, 8, 13], "texture": "#1"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#missing"} + } + }, + { + "from": [6, 1, 5], + "to": [8, 2, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 1, 4]}, + "faces": { + "north": {"uv": [0, 15, 2, 16], "rotation": 180, "texture": "#1"}, + "east": {"uv": [0, 15, 1, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "up": {"uv": [0, 15, 2, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#missing"} + } + }, + { + "from": [7, 1, 9], + "to": [9, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 1, 9]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#missing"}, + "south": {"uv": [4, 13, 6, 14], "texture": "#1"}, + "west": {"uv": [3, 11, 6, 12], "texture": "#1"}, + "up": {"uv": [4, 11, 6, 14], "texture": "#1"}, + "down": {"uv": [0, 0, 2, 3], "texture": "#missing"} + } + }, + { + "from": [4, 1, 4], + "to": [6, 2, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 1, 7]}, + "faces": { + "north": {"uv": [12, 15, 14, 16], "texture": "#1"}, + "east": {"uv": [8, 15, 13, 16], "texture": "#1"}, + "south": {"uv": [12, 11, 14, 12], "texture": "#1"}, + "west": {"uv": [12, 11, 13, 16], "rotation": 90, "texture": "#1"}, + "up": {"uv": [12, 11, 14, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 2, 5], "texture": "#missing"} + } + }, + { + "from": [3, 1, 4], + "to": [4, 2, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 1, 5]}, + "faces": { + "north": {"uv": [14, 15, 15, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "south": {"uv": [14, 15, 15, 16], "texture": "#1"}, + "west": {"uv": [14, 13, 15, 16], "rotation": 90, "texture": "#1"}, + "up": {"uv": [14, 13, 15, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#missing"} + } + }, + { + "from": [2, 1, 5], + "to": [3, 2, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 1, 5]}, + "faces": { + "north": {"uv": [5, 15, 6, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "south": {"uv": [5, 15, 6, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "up": {"uv": [5, 15, 6, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [4, 1, 3], + "to": [5, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 1, 3]}, + "faces": { + "north": {"uv": [2, 15, 3, 16], "texture": "#1"}, + "east": {"uv": [2, 15, 3, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [2, 15, 3, 16], "texture": "#1"}, + "up": {"uv": [2, 15, 3, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [5, 1, 9], + "to": [6, 2, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 1, 9]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "south": {"uv": [3, 15, 4, 16], "texture": "#1"}, + "west": {"uv": [3, 15, 4, 16], "texture": "#1"}, + "up": {"uv": [3, 15, 4, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "from": [6, 1, 9], + "to": [7, 2, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 2, 9]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "south": {"uv": [8, 12, 9, 13], "texture": "#1"}, + "west": {"uv": [7, 12, 9, 13], "texture": "#1"}, + "up": {"uv": [8, 11, 9, 13], "texture": "#1"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#missing"} + } + } + ], + "groups": [ + { + "name": "plate", + "origin": [15, 0, 0], + "color": 0, + "children": [0, 1, 2, 3, 4] + }, + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "children": [5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/lingshi/textures/block/fried_fish.png b/src/main/resources/assets/lingshi/textures/block/fried_fish.png new file mode 100644 index 0000000000000000000000000000000000000000..e9970b3488500cd51de5962778644b1da4e93761 GIT binary patch literal 582 zcmV-M0=fN(P)xR6On{|asesL z4~s}bzE6*cNJ8eunpfg65s3*KOcAw9aD~^oQu?J0!nXZj@6~ z!4=jyZ%V^BZ+#2-2>kg*64v@UlFRl72VJ zhllrYG`s2W1`xBAH@ExAPNivRJx%Aen^>(1FK%4a>4dslB-Gs^&x7aXXYr%Fy?>?p z-&nEuK#ypjMrGo0p8%LTI#1Ag^bqFVJ9+@~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lingshi/textures/item/fried_fish.png b/src/main/resources/assets/lingshi/textures/item/fried_fish.png new file mode 100644 index 0000000000000000000000000000000000000000..40c81cd462887c76c47b6642a5b7e008b88d96f6 GIT binary patch literal 385 zcmV-{0e=38P)uP%=iVs($#8iRG|JIw*AkPE8d_2jwO6jMdS>`DT=yUgl~m zPVVdocPLEfppR_6$lLRREMeO_g4)k@(>raKXxCjMU9NQ*(;|SQ?C^PY=)n z69DWl%+h7E(K|YT#}h