添加：平底锅加热配方添加，食物煎鸡蛋，相关合成表，渲染调整

MCZME · Aug 21, 2024 · 0044742 · 0044742
1 parent 5d1994e
commit 0044742
Show file tree

Hide file tree

Showing 57 changed files with 982 additions and 42 deletions.
diff --git a/src/generated/resources/.cache/58503a955f2b64805747dc412de304e67eaffc8e b/src/generated/resources/.cache/58503a955f2b64805747dc412de304e67eaffc8e
@@ -1,2 +1,2 @@
-// 1.21	2024-08-11T21:36:53.8731756	Tags for minecraft:item mod id lingshi
+// 1.21	2024-08-21T06:28:09.8754652	Tags for minecraft:item mod id lingshi
 769d1ceef14cb7c493ce5e9c32d87dbc633472ba data/neoforge/tags/item/knife.json
diff --git a/src/generated/resources/.cache/71e72dbdeb626cc835aaccd2ae47fd3d8794cd24 b/src/generated/resources/.cache/71e72dbdeb626cc835aaccd2ae47fd3d8794cd24
@@ -1,5 +1,6 @@
-// 1.21	2024-08-20T17:21:47.1347182	Item Models: lingshi
+// 1.21	2024-08-21T06:28:09.8764642	Item Models: lingshi
 bad0cb5e093fa42331c2d4a1157d1a7b5b3fc588 assets/lingshi/models/item/chopping_board.json
+014b17c43a62c41d623a0d944e434cf1ac3986be assets/lingshi/models/item/fried_egg.json
 249957a6811e300efca306db358e468855851d73 assets/lingshi/models/item/iron_knife.json
 b767fc7952daf0eff3485fe4d8c06c5bba930c22 assets/lingshi/models/item/oil_bucket.json
 496d711c2d4af0f851d40f859b102da69188089d assets/lingshi/models/item/rice.json

diff --git a/src/generated/resources/.cache/85f12f813aff948f91f5cd129c0ffa86bcb17361 b/src/generated/resources/.cache/85f12f813aff948f91f5cd129c0ffa86bcb17361
@@ -1,2 +1,2 @@
-// 1.21	2024-08-18T21:30:07.1416504	Languages: zh_cn for mod: lingshi
-dbec1f3db6638e67900f8e7501a5ca049ec75339 assets/lingshi/lang/zh_cn.json
+// 1.21	2024-08-21T06:16:10.9126133	Languages: zh_cn for mod: lingshi
+18193d8163c50d2682857150071f4b38892474cb assets/lingshi/lang/zh_cn.json
diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,10 +1,28 @@
-// 1.21	2024-08-20T05:59:15.3133646	Recipes
-30317ddefa8c34feeae2fb9b47b40dae9a2c1335 data/lingshi/advancement/recipes/skillet/rice_apple.json
-60b5c5b8536660e2fc3758499991b48002d68196 data/lingshi/advancement/recipes/skillet/test01.json
-24367c601743c0d2f9df76c4a1e59f6650f0de4a data/lingshi/advancement/recipes/skillet/test02.json
-b97f9dc99489844bbfeaf5f329ec4a6e793530d2 data/lingshi/advancement/recipes/skillet/test03.json
+// 1.21	2024-08-21T06:32:40.2517736	Recipes
+6a319c97da924f9ab21b5d264c18cb8ad9da8755 data/lingshi/advancement/recipes/decorations/chopping_board.json
+0a4b54bfda8aa98f1a26bbf1d8231c76ed12e770 data/lingshi/advancement/recipes/decorations/skillet.json
+90e465ef819e2007fb2b023b2970095ecce8b79a data/lingshi/advancement/recipes/skillet/baked_potato.json
+270b8d1827bb4d94559088a008f9f2b887d3cf79 data/lingshi/advancement/recipes/skillet/cooked_beef.json
+3da01b8b1fa7548e7f2b7992450356eed7c3f638 data/lingshi/advancement/recipes/skillet/cooked_chicken.json
+61c5eeeda0e4c82b459978a7ace05bac2ae3a724 data/lingshi/advancement/recipes/skillet/cooked_cod.json
+0d382e904771b12b539540f8bfe3aba5a316288b data/lingshi/advancement/recipes/skillet/cooked_mutton.json
+7dac12da1bf40c7246fff7b3f5d3ad3395ca7fee data/lingshi/advancement/recipes/skillet/cooked_porkchop.json
+dd85a62c2968cd2bfa854faa7b3251ec7f3ff3a1 data/lingshi/advancement/recipes/skillet/cooked_rabbit.json
+90acc516d2ea75e5ff8ab2117d4570b6f4f37137 data/lingshi/advancement/recipes/skillet/cooked_salmon.json
+84acc8c3c7e0177a6a39a017a2b688d9e95c7fbb data/lingshi/advancement/recipes/skillet/fried_egg.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
 3e41620c4ec5b19f87046dad7fe5c7ed6ede21c2 data/lingshi/recipe/chopping_board/rice.json
-a25f37985d35ec9c738209ef29f82c466a34f01c data/lingshi/recipe/skillet/rice_apple.json
-c80602ecff2ea09399aff222a6d36c7b28d0164f data/lingshi/recipe/skillet/test01.json
-89bc0e33a11e930f7b69c4d726d92b4f9446b3d3 data/lingshi/recipe/skillet/test02.json
-6d216286873ffd9df6b685d798129aa5720e061b data/lingshi/recipe/skillet/test03.json
+e6daac4cca245fc9e220e2fcb1f2b27e410ba503 data/lingshi/recipe/iron_knife.json
+6971547c4e197d1f259c4599e8bd99fa9a565095 data/lingshi/recipe/skillet.json
+26590681b1777b3be492a971dfc95a36af346fee data/lingshi/recipe/skillet/baked_potato.json
+91bf1f4b8acf5c536598059691981e665838ea17 data/lingshi/recipe/skillet/cooked_beef.json
+27b62cedc03d158bf611f528d405dd7cfe39b429 data/lingshi/recipe/skillet/cooked_chicken.json
+88368af861afa365e968533c265c89b65019b049 data/lingshi/recipe/skillet/cooked_cod.json
+93fa44daf3296aff85255b2e05a89fda9fbdc69f data/lingshi/recipe/skillet/cooked_mutton.json
+920d7c639da2cb840174d1a9c932349a0d85dee5 data/lingshi/recipe/skillet/cooked_porkchop.json
+5565fa5a338b2fefe8369d4cec4e28dd7c3481c3 data/lingshi/recipe/skillet/cooked_rabbit.json
+524f6c88e228427667c5201e43752957f7bbd649 data/lingshi/recipe/skillet/cooked_salmon.json
+1c104eed6daaa90da2777ec06f29089caf0446d3 data/lingshi/recipe/skillet/fried_egg.json
+3563171190654e76637de2fa78a6c750389674d7 data/lingshi/recipe/spatula.json
diff --git a/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f b/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f
@@ -1,3 +1,3 @@
-// 1.21	2024-08-20T05:59:15.3113644	Data Maps
+// 1.21	2024-08-21T06:16:10.9086119	Data Maps
 f8714336008bf2256e4e28ae34f31dd942431f35 data/lingshi/data_maps/fluid/cooking_food_fliud.json
-7efa3dffa87b902d4fac709bea335215c17fdf2a data/lingshi/data_maps/item/cooking_food_item.json
+0668ddaaa072cb34bd87eb6d4cf07b023dfe3ba7 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
@@ -5,9 +5,11 @@
   "block.lingshi.skillet": "平底锅",
   "block.lingshi.tea_tree": "茶树",
   "gui.lingshi.skillet_menu": "平底锅",
+  "item.lingshi.fried_egg": "煎鸡蛋",
   "item.lingshi.iron_knife": "铁菜刀",
   "item.lingshi.oil_bucket": "油桶",
   "item.lingshi.rice_of_ear": "稻穗",
+  "item.lingshi.spatula": "锅铲",
   "item.lingshi.tea_leaf": "茶叶",
   "lingshi.lingshi_tab": "灵食"
 }
diff --git a/src/generated/resources/assets/lingshi/models/item/fried_egg.json b/src/generated/resources/assets/lingshi/models/item/fried_egg.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "lingshi:item/fried_egg"
+  }
+}
diff --git a/src/generated/resources/assets/lingshi/models/item/spatula.json b/src/generated/resources/assets/lingshi/models/item/spatula.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "lingshi:item/spatula"
+  }
+}
diff --git a/src/generated/resources/data/lingshi/advancement/recipes/decorations/chopping_board.json b/src/generated/resources/data/lingshi/advancement/recipes/decorations/chopping_board.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_iron_ingot": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:stick"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "lingshi:chopping_board"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_iron_ingot"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "lingshi:chopping_board"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/lingshi/advancement/recipes/decorations/skillet.json b/src/generated/resources/data/lingshi/advancement/recipes/decorations/skillet.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_iron_ingot": {
+      "conditions": {
+        "items": [
+          {
+            "items": "#minecraft:planks"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "lingshi:skillet"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_iron_ingot"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "lingshi:skillet"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/lingshi/advancement/recipes/skillet/baked_potato.json b/src/generated/resources/data/lingshi/advancement/recipes/skillet/baked_potato.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_skillet": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:baked_potato"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "lingshi:skillet/baked_potato"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_skillet"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "lingshi:skillet/baked_potato"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/lingshi/advancement/recipes/skillet/cooked_beef.json b/src/generated/resources/data/lingshi/advancement/recipes/skillet/cooked_beef.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_skillet": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:cooked_beef"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "lingshi:skillet/cooked_beef"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_skillet"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "lingshi:skillet/cooked_beef"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/lingshi/advancement/recipes/skillet/cooked_chicken.json b/src/generated/resources/data/lingshi/advancement/recipes/skillet/cooked_chicken.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_skillet": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:cooked_chicken"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "lingshi:skillet/cooked_chicken"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_skillet"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "lingshi:skillet/cooked_chicken"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/lingshi/advancement/recipes/skillet/cooked_cod.json b/src/generated/resources/data/lingshi/advancement/recipes/skillet/cooked_cod.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_skillet": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:cooked_cod"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "lingshi:skillet/cooked_cod"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_skillet"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "lingshi:skillet/cooked_cod"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/lingshi/advancement/recipes/skillet/cooked_mutton.json b/src/generated/resources/data/lingshi/advancement/recipes/skillet/cooked_mutton.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_skillet": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:cooked_mutton"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "lingshi:skillet/cooked_mutton"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_skillet"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "lingshi:skillet/cooked_mutton"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/lingshi/advancement/recipes/skillet/cooked_porkchop.json b/src/generated/resources/data/lingshi/advancement/recipes/skillet/cooked_porkchop.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_skillet": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:cooked_porkchop"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "lingshi:skillet/cooked_porkchop"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_skillet"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "lingshi:skillet/cooked_porkchop"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/lingshi/advancement/recipes/skillet/cooked_rabbit.json b/src/generated/resources/data/lingshi/advancement/recipes/skillet/cooked_rabbit.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_skillet": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:cooked_rabbit"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "lingshi:skillet/cooked_rabbit"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_skillet"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "lingshi:skillet/cooked_rabbit"
+    ]
+  }
+}