Merge branch 'main' of https://github.com/CTNStudio/Future-Food

Author: Du-stt

src/generated/resources/.cache/34d21386915eed570c73c4b9e3f5f51c4ec8c9d7

@@ -1,9 +1,21 @@
-// 1.21.1	2025-10-07T19:57:49.1616654	Item Models: futurefood
+// 1.21.1	2025-10-10T16:18:44.1216384	Item Models: futurefood
+66684eb356b1463e5b38e36b309206e7968c3d4a assets/futurefood/models/item/antimatter_snack.json
+fcf4bfffde1b1679c846c63b7bd6d6f74079bf27 assets/futurefood/models/item/atom_cola.json
 8f780145ad2000b0300eb2dfb01eb5f356276c2e assets/futurefood/models/item/battery.json
+62ef6d666a86540db90c7ee3cdbab1e25769a29f assets/futurefood/models/item/black_hole_cake.json
 d0a59be612dbaf93cb4d5963ff91c314b55fde23 assets/futurefood/models/item/cyber_wrench.json
-939de49376d8b37f26c3602097e6469f28ca3333 assets/futurefood/models/item/food_essence.json
+ff3d03ebf37b304e0ea3e99381627eb8a4ee898b assets/futurefood/models/item/entropy_stew.json
+9a7633c527c0e8844bacf67659be721449eaa758 assets/futurefood/models/item/food_essence.json
 558b99d41471bba5ece3ff7c757173383db95d30 assets/futurefood/models/item/food_essence1.json
 92955f95517826b1a46f49009ebf9252b894998d assets/futurefood/models/item/gluttony.json
 8f780145ad2000b0300eb2dfb01eb5f356276c2e assets/futurefood/models/item/infinite_battery.json
+9ef9bc3ecb1c23a32b3a1c46f2e5344e90cb8d31 assets/futurefood/models/item/leyden_jar.json
+3b535f8af8a4c846ccbc130a7ea5d1be439c54ad assets/futurefood/models/item/powered_milk.json
 cf22bfb9e3b1a3f6751185b38846e707c90e2b8e assets/futurefood/models/item/quantum_energy_diffuser.json
 ebe5021677af67de7a7528e7cb59bc3cd1b0cab7 assets/futurefood/models/item/quantum_energy_receiver.json
+1d55cf75878f0f7e1e6b945a64b16d4bf0c0adef assets/futurefood/models/item/schrodingers_can.json
+ae9cfd849255f094175cf3518712d81e68ba6e48 assets/futurefood/models/item/stronglg_interacting_bread.json
+2e7e88c84ffdcdafe3fe68c6a2b8036637865aa5 assets/futurefood/models/item/unpredictable_chorus_fruit.json
+45b71b87193d7765696d6dbc1d42e9364a1a9533 assets/futurefood/models/item/weakly_interacting_water_bottle.json
+4c7d838a82ce513484c6b9e7be03214d32642290 assets/futurefood/models/item/white_hole_cake.json
+60300c749a150fb2b7fa66ae56288d22afa2eb41 assets/futurefood/models/item/wormhole_cookie.json

src/generated/resources/.cache/ecaeec27a0c7b6ae6a8e22b771ccf8b17ccd37a6

@@ -1,2 +1,2 @@
-// 1.21.1	2025-10-07T19:57:49.1661775	Languages: zh_cn for mod: futurefood
-cfc1f6d7fcf75780cb0810a7ba743793a8622adf assets/futurefood/lang/zh_cn.json
+// 1.21.1	2025-10-10T16:18:44.1226376	Languages: zh_cn for mod: futurefood
+591627e1677822f4fadf449efc77485b5aaf8d79 assets/futurefood/lang/zh_cn.json

src/generated/resources/assets/futurefood/lang/zh_cn.json

@@ -5,6 +5,18 @@
   "block.futurefood.particle_collider": "粒子对撞器",
   "block.futurefood.quantum_energy_diffuser": "量子能源扩散器",
   "block.futurefood.quantum_energy_receiver": "量子能源接收器",
+  "food.futurefood.antimatter_snack.info": "一种非常美味的小吃，能量密度极高。如果你一口没有吃饱，那么可能会在你的胃里膨胀。",
+  "food.futurefood.atom_cola.info": "BONK!",
+  "food.futurefood.black_hole_cake.info": "有东西想把你吸进去。",
+  "food.futurefood.entropy_stew.info": "吃下它，你会感觉到一种从未有过的混乱感。",
+  "food.futurefood.leyden_jar.info": "一种古老的电学实验器材，里面装满了电。或许不应该用来吃。",
+  "food.futurefood.powered_milk.info": "它足够充实，以至于根本无从下口。",
+  "food.futurefood.schrodingers_can.info": "你永远不知道你打开它会发生什么。",
+  "food.futurefood.stronglg_interacting_bread.info": "在你吃面包的时候，面包也在吃你。",
+  "food.futurefood.unpredictable_chorus_fruit.info": "它比一般的紫颂果更危险，它会随意带你到任何地方。",
+  "food.futurefood.weakly_interacting_water_bottle.info": "喝下它，你会感觉到一种从未有过的清凉感。但是你真的在喝吗？",
+  "food.futurefood.white_hole_cake.info": "有东西想把你吐出来。",
+  "food.futurefood.wormhole_cookie.info": "它会穿越。",
   "futurefood.cyber_wrench.binding.cancel": "已取消绑定，坐标： x %s y %s z %s",
   "futurefood.cyber_wrench.binding.failure": "绑定失败，坐标： x %s y %s z %s",
   "futurefood.cyber_wrench.binding.success": "绑定成功，坐标： x %s y %s z %s",
@@ -18,7 +30,19 @@
   "futurefood.item.tooltip.energyStorage": "能量存储：%s/%s",
   "futurefood.item.tooltip.position": "绑定的方块坐标：%s %s %s",
   "futurefood.item.tooltip.position.empty": "没有绑定方块坐标",
+  "item.futurefood.antimatter_snack": "反物质小吃",
+  "item.futurefood.atom_cola": "原子可乐",
+  "item.futurefood.black_hole_cake": "黑洞蛋糕",
   "item.futurefood.cyber_wrench": "赛博扳手",
+  "item.futurefood.entropy_stew": "增熵炖菜",
   "item.futurefood.food_essence": "食物源质",
+  "item.futurefood.leyden_jar": "莱顿瓶",
+  "item.futurefood.powered_milk": "凝固牛奶",
+  "item.futurefood.schrodingers_can": "薛定谔的罐头",
+  "item.futurefood.stronglg_interacting_bread": "强相互作用面包",
+  "item.futurefood.unpredictable_chorus_fruit": "不可预测的紫颂果",
+  "item.futurefood.weakly_interacting_water_bottle": "弱相互作用水瓶",
+  "item.futurefood.white_hole_cake": "白洞蛋糕",
+  "item.futurefood.wormhole_cookie": "虫洞曲奇",
   "itemGroup.futurefood": "未来食物"
 }

src/generated/resources/assets/futurefood/models/item/antimatter_snack.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "futurefood:item/antimatter_snack"
+  }
+}

src/generated/resources/assets/futurefood/models/item/atom_cola.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "futurefood:item/atom_cola"
+  }
+}

src/generated/resources/assets/futurefood/models/item/black_hole_cake.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "futurefood:item/black_hole_cake"
+  }
+}

src/generated/resources/assets/futurefood/models/item/entropy_stew.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "futurefood:item/entropy_stew"
+  }
+}

src/generated/resources/assets/futurefood/models/item/food_essence.json

@@ -2,15 +2,15 @@
   "parent": "minecraft:item/generated",
   "overrides": [
     {
-      "model": "futurefood:item/food_essence",
+      "model": "futurefood:item/food_essence1",
       "predicate": {
-        "futurefood:stacking": 0.0
+        "futurefood:stacking": 0.07
       }
     },
     {
-      "model": "futurefood:item/food_essence1",
+      "model": "futurefood:item/food_essence",
       "predicate": {
-        "futurefood:stacking": 0.07
+        "futurefood:stacking": 0.0
       }
     }
   ],

src/generated/resources/assets/futurefood/models/item/leyden_jar.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "futurefood:item/leyden_jar"
+  }
+}

src/generated/resources/assets/futurefood/models/item/powered_milk.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "futurefood:item/powered_milk"
+  }
+}