Skip to content

Commit

Permalink
添加：切好的猪肉和牛肉
Browse files Browse the repository at this point in the history
  • Loading branch information
MCZME committed Sep 12, 2024
1 parent cd00321 commit c45e592
Show file tree
Hide file tree
Showing 20 changed files with 129 additions and 51 deletions.
4 changes: 3 additions & 1 deletion src/generated/resources/.cache/71e72dbdeb626cc835aaccd2ae47fd3d8794cd24
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21 2024-09-11T16:41:07.9791561 Item Models: lingshi
// 1.21 2024-09-12T16:15:54.781192 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
Expand All @@ -22,6 +22,8 @@ abe8ae1523c26af167289fe958382b2477d96ea1 assets/lingshi/models/item/rice_of_ear.
57cfb1f90de649ab0f56f107cb56e1d0d2f87ae6 assets/lingshi/models/item/rice_seedling.json
9150fce945d22c3c76b946d1aa13a9b16e50dbc3 assets/lingshi/models/item/sauteed_seasonal_vegetable.json
cff85c127954ba63ac8129929c0d7346bf8f305d assets/lingshi/models/item/skillet.json
dc6ee699f39fab6a9044062b8d26d7b8330a9cd6 assets/lingshi/models/item/sliced_beef.json
44517515349bf9f89ad7329ce4d3d58f7b945229 assets/lingshi/models/item/sliced_pork.json
da8fb27d7e9b15fbd96ca8a49b328776550bb2b3 assets/lingshi/models/item/spatula.json
eb856ffd13b91d52b910847159984f8a63b35cb5 assets/lingshi/models/item/stewed_noodles.json
24a37cc616a84374e2aa09a4eaee7d756a35fa10 assets/lingshi/models/item/stove.json
4 changes: 2 additions & 2 deletions src/generated/resources/.cache/85f12f813aff948f91f5cd129c0ffa86bcb17361
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21 2024-09-11T16:41:07.985159 Languages: zh_cn for mod: lingshi
3af0560adaf650552afc0d5598a33c18ef001aed assets/lingshi/lang/zh_cn.json
// 1.21 2024-09-12T16:15:54.7871949 Languages: zh_cn for mod: lingshi
348c9b7804e49313430866cf2a4452af28e303b8 assets/lingshi/lang/zh_cn.json
4 changes: 3 additions & 1 deletion src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21 2024-09-11T16:41:07.9821614 Recipes
// 1.21 2024-09-12T16:15:54.7831919 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
Expand Down Expand Up @@ -33,6 +33,8 @@ dbe74c08be4c49a28a0f8bf9dd1ec1825c557d55 data/lingshi/recipe/chopping_board/doug
df6343e05449c8aded71e42701d18e37311ea0c9 data/lingshi/recipe/chopping_board/flour.json
771ae63028a23ade683357752f8152f0ebb2203b data/lingshi/recipe/chopping_board/noodles.json
3e41620c4ec5b19f87046dad7fe5c7ed6ede21c2 data/lingshi/recipe/chopping_board/rice.json
20eec978b731fd5911176390fca13d7107648c9e data/lingshi/recipe/chopping_board/sliced_beef.json
8abaaf136ecebe8470e08ffb36eece5b1bb28ca9 data/lingshi/recipe/chopping_board/sliced_pork.json
2bca8f59bf6fc074377fc44b2331427a96aea5d4 data/lingshi/recipe/cooking_pot.json
2e23fcd215c647e72e989050fbfe466f419bed56 data/lingshi/recipe/cooking_pot/cooked_rice.json
d0f1076aaf14e4191918a911196f1aeac7d7a59d data/lingshi/recipe/cooking_pot/cooked_rice_1.json
Expand Down
4 changes: 2 additions & 2 deletions src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.21 2024-09-06T08:35:30.498565 Data Maps
// 1.21 2024-09-12T16:15:54.7791924 Data Maps
f8714336008bf2256e4e28ae34f31dd942431f35 data/lingshi/data_maps/fluid/cooking_food_fliud.json
5bffdd238512e20784274840ede448c507ec75db data/lingshi/data_maps/item/cooking_food_item.json
394291a8b51d270b730ebfd7af2212d98a518116 data/lingshi/data_maps/item/cooking_food_item.json
2 changes: 2 additions & 0 deletions src/generated/resources/assets/lingshi/lang/zh_cn.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
"item.lingshi.pig_feet": "猪蹄",
"item.lingshi.pot_lid": "锅盖",
"item.lingshi.rice_of_ear": "稻穗",
"item.lingshi.sliced_beef": "切好的牛肉",
"item.lingshi.sliced_pork": "切好的猪肉",
"item.lingshi.spatula": "锅铲",
"item.lingshi.tea_leaf": "茶叶",
"lingshi.lingshi_tab": "零食"
Expand Down
6 changes: 6 additions & 0 deletions src/generated/resources/assets/lingshi/models/item/sliced_beef.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "lingshi:item/sliced_beef"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/lingshi/models/item/sliced_pork.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "lingshi:item/sliced_pork"
}
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/lingshi/data_maps/item/cooking_food_item.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@
"burnt_time": 25,
"cooked_time": 8
},
"lingshi:sliced_beef": {
"burnt_time": 15,
"cooked_time": 4
},
"lingshi:sliced_pork": {
"burnt_time": 15,
"cooked_time": 4
},
"minecraft:beef": {
"burnt_time": 20,
"cooked_time": 5
Expand Down
15 changes: 15 additions & 0 deletions src/generated/resources/data/lingshi/recipe/chopping_board/sliced_beef.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "lingshi:chopping_board",
"input": {
"item": "minecraft:beef"
},
"result": [
{
"count": 1,
"id": "lingshi:sliced_beef"
}
],
"tool": {
"tag": "neoforge:knife"
}
}
15 changes: 15 additions & 0 deletions src/generated/resources/data/lingshi/recipe/chopping_board/sliced_pork.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"type": "lingshi:chopping_board",
"input": {
"item": "minecraft:porkchop"
},
"result": [
{
"count": 1,
"id": "lingshi:sliced_pork"
}
],
"tool": {
"tag": "neoforge:knife"
}
}
4 changes: 4 additions & 0 deletions src/main/java/mczme/lingshi/common/registry/ModItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ public class ModItems {
.nutrition(2).saturationModifier(1f).build())));
public static final Supplier<Item> PIG_FEET = registerWithCreateTab("pig_feet", () -> new Item(new Item.Properties().food(new FoodProperties.Builder()
.nutrition(5).saturationModifier(3f).build())));
public static final Supplier<Item> SLICED_PORK = registerWithCreateTab("sliced_pork", () -> new Item(new Item.Properties().food(new FoodProperties.Builder()
.nutrition(2).saturationModifier(1.2f).build())));
public static final Supplier<Item> SLICED_BEEF = registerWithCreateTab("sliced_beef", () -> new Item(new Item.Properties().food(new FoodProperties.Builder()
.nutrition(2).saturationModifier(1.2f).build())));
//可放置食物
public static final Supplier<Item> 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)
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/mczme/lingshi/data/CookingFoodDataGen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ protected void gather() {
addCookingFood(Items.BROWN_MUSHROOM,3,12);
addCookingFood(Items.BEETROOT,3,12);
addCookingFood(ModItems.NOODLES.get(),5,20);
addCookingFood(ModItems.SLICED_PORK.get(),4,15);
addCookingFood(ModItems.SLICED_BEEF.get(),4,15);

addCookingFood(Fluids.WATER,15);
builder(COOKING_FOOD_FLUID).add(ModFluids.OIL_SOURCE.get().builtInRegistryHolder(), new CookingFoodData(8,30),false);
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/mczme/lingshi/data/ItemModels.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ protected void registerModels() {
basicItem(ModItems.DOUGH.get());
basicItem(ModItems.NOODLES.get());
basicItem(ModItems.PIG_FEET.get());
basicItem(ModItems.SLICED_PORK.get());
basicItem(ModItems.SLICED_BEEF.get());

basicItem(ModItems.OIL_BUCKET.get());

Expand Down
5 changes: 5 additions & 0 deletions src/main/java/mczme/lingshi/data/lang/ChineseLanguageProvider.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package mczme.lingshi.data.lang;

import mczme.lingshi.common.registry.ModEffects;
import mczme.lingshi.common.registry.ModItems;
import net.minecraft.data.PackOutput;
import net.neoforged.neoforge.common.data.LanguageProvider;
Expand Down Expand Up @@ -51,6 +52,10 @@ protected void addTranslations() {
this.add(ModItems.STEWED_NOODLES.get(), "煮面条");
this.add("item.lingshi.egg_added_stewed_noodles","加蛋煮面条");
this.add(ModItems.FRIED_FISH.get(), "煎鱼");
this.add(ModItems.SLICED_PORK.get(), "切好的猪肉");
this.add(ModItems.SLICED_BEEF.get(), "切好的牛肉");

this.add(ModEffects.GRATIFICATION_EFFECT.get(),"满足");

}
}
1 change: 1 addition & 0 deletions src/main/java/mczme/lingshi/data/loot/BlockLoot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ protected void generate() {
protected Iterable<Block> getKnownBlocks() {
return BLOCK;
}

}
3 changes: 3 additions & 0 deletions src/main/java/mczme/lingshi/data/recipe/ChoppingBoardRecipeDatagen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ protected void buildRecipes(RecipeOutput output) {
build(List.of(new ItemStack(ModItems.DOUGH.get())),Ingredient.of(Items.WATER_BUCKET),Ingredient.of(ModItems.FLOUR.get()),output,"dough");
build(List.of(new ItemStack(ModItems.NOODLES.get())),Ingredient.of(NeoforgeTags.KNIFE),Ingredient.of(ModItems.DOUGH.get()),output,"noodles");
build(List.of(new ItemStack(ModItems.CABBAGE_LEAF.get(),3)),Ingredient.of(NeoforgeTags.KNIFE),Ingredient.of(ModItems.CABBAGE.get()),output,"cabbage_leaf");
build(List.of(new ItemStack(ModItems.SLICED_PORK.get(),2)),Ingredient.of(NeoforgeTags.KNIFE),Ingredient.of(Items.PORKCHOP),output,"sliced_pork");
build(List.of(new ItemStack(ModItems.SLICED_BEEF.get(),2)),Ingredient.of(NeoforgeTags.KNIFE),Ingredient.of(Items.BEEF),output,"sliced_beef");

}

private void build(List<ItemStack> result, Ingredient tool, Ingredient inputItem,RecipeOutput output,String pid){
Expand Down
58 changes: 13 additions & 45 deletions src/main/resources/assets/lingshi/models/block/fried_fish.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"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"}
"down": {"uv": [0, 0, 12, 12], "texture": "#0", "cullface": "down"}
}
},
{
Expand Down Expand Up @@ -71,12 +71,7 @@
"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"}
"up": {"uv": [0, 0, 12, 11], "texture": "#1"}
}
},
{
Expand All @@ -88,8 +83,7 @@
"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"}
"up": {"uv": [0, 11, 4, 15], "rotation": 180, "texture": "#1"}
}
},
{
Expand All @@ -99,10 +93,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"}
"up": {"uv": [9, 11, 12, 14], "rotation": 180, "texture": "#1"}
}
},
{
Expand All @@ -112,10 +103,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"}
"up": {"uv": [6, 11, 8, 13], "texture": "#1"}
}
},
{
Expand All @@ -125,23 +113,17 @@
"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"}
"up": {"uv": [0, 15, 2, 16], "texture": "#1"}
}
},
{
"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"}
"up": {"uv": [4, 11, 6, 14], "texture": "#1"}
}
},
{
Expand All @@ -153,8 +135,7 @@
"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"}
"up": {"uv": [12, 11, 14, 16], "texture": "#1"}
}
},
{
Expand All @@ -163,11 +144,9 @@
"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"}
"up": {"uv": [14, 13, 15, 16], "texture": "#1"}
}
},
{
Expand All @@ -176,11 +155,8 @@
"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"}
"up": {"uv": [5, 15, 6, 16], "texture": "#1"}
}
},
{
Expand All @@ -190,36 +166,28 @@
"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"}
"up": {"uv": [2, 15, 3, 16], "texture": "#1"}
}
},
{
"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"}
"up": {"uv": [3, 15, 4, 16], "texture": "#1"}
}
},
{
"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"}
"up": {"uv": [8, 11, 9, 13], "texture": "#1"}
}
}
],
Expand Down
Binary file added src/main/resources/assets/lingshi/textures/item/sliced_beef.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/lingshi/textures/item/sliced_pork.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions src/main/resources/data/lingshi/loot_table/blocks/fried_fish.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "lingshi:fried_fish",
"conditions": [
{
"condition": "minecraft:block_state_property",
"block": "lingshi:fried_fish",
"properties": {
"amount": "1"
}
}
]
},
{
"type": "minecraft:item",
"name": "minecraft:bowl",
"conditions": [
{
"condition": "minecraft:block_state_property",
"block": "lingshi:fried_fish",
"properties": {
"amount": "0"
}
}
]
}
]
}
],
"random_sequence": "lingshi:fried_fish"
}

0 comments on commit c45e592

Please sign in to comment.