添加煮锅~！

feat. 0.0.9e
HiedaCamellia · Aug 23, 2024 · 731dc82 · 731dc82
1 parent abcef96
commit 731dc82
Show file tree

Hide file tree

Showing 10 changed files with 170 additions and 7 deletions.
diff --git a/src/generated/resources/.cache/2611b8bba2585eac94969557d205b96f67d97065 b/src/generated/resources/.cache/2611b8bba2585eac94969557d205b96f67d97065
@@ -1,4 +1,5 @@
-// 1.21	2024-08-22T15:20:10.5920286	Block States: mystias_izakaya
+// 1.21	2024-08-23T11:52:53.3090057	Block States: mystias_izakaya
+942cf07c95d461a9cbcd4ae9f7a53fe222c490c8 assets/mystias_izakaya/blockstates/boiling_pot.json
 dc562cb249ccb18854fc89c4c9ec3dc7e0665e98 assets/mystias_izakaya/blockstates/cutting_board.json
 08d228d0dd919e8a3b9d07ebc1e4682e0cba2aee assets/mystias_izakaya/blockstates/frying_pan.json
 65573655c0c9851b5e7106c1cab4e11423f9cfdc assets/mystias_izakaya/blockstates/grill.json

diff --git a/src/generated/resources/.cache/4d80d66209c237eb485b194bd690dcf7e272ba36 b/src/generated/resources/.cache/4d80d66209c237eb485b194bd690dcf7e272ba36
@@ -1,2 +1,2 @@
-// 1.21	2024-08-13T17:23:53.9147224	Languages: zh_cn for mod: mystias_izakaya
-6204b13faaa1b6ec57513409dd46b79f235012d6 assets/mystias_izakaya/lang/zh_cn.json
+// 1.21	2024-08-23T11:50:12.070197	Languages: zh_cn for mod: mystias_izakaya
+c626ee2ccd51a4c4b2d2879e7ba9e4df035162b1 assets/mystias_izakaya/lang/zh_cn.json
diff --git a/src/generated/resources/.cache/51e7974fc121251e1ad37761566173ab4e2c1b25 b/src/generated/resources/.cache/51e7974fc121251e1ad37761566173ab4e2c1b25
@@ -1,2 +1,2 @@
-// 1.21	2024-08-22T15:20:10.5890274	Languages: en_us for mod: mystias_izakaya
-d5fc9697ab862d89d5db414ae2515730fc38b726 assets/mystias_izakaya/lang/en_us.json
+// 1.21	2024-08-23T11:50:12.0721974	Languages: en_us for mod: mystias_izakaya
+0f475e7c596970c9a4bfa44f0b3ae3eb9bc172a3 assets/mystias_izakaya/lang/en_us.json
diff --git a/src/generated/resources/assets/mystias_izakaya/blockstates/boiling_pot.json b/src/generated/resources/assets/mystias_izakaya/blockstates/boiling_pot.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mystias_izakaya:block/boiling_pot"
+    }
+  }
+}
diff --git a/src/generated/resources/assets/mystias_izakaya/lang/en_us.json b/src/generated/resources/assets/mystias_izakaya/lang/en_us.json
@@ -17,6 +17,7 @@
   "gui.mystias_izakaya.donation_ui.button_take_out": "take out",
   "gui.mystias_izakaya.donation_ui.donation": "Donation",
   "gui.mystias_izakaya.donation_ui.input": "10",
+  "gui.mystias_izakaya.ledger_ui.ledger": "Ledger",
   "item.mystias_izakaya.a_fu_jia_duo": "Affogato",
   "item.mystias_izakaya.ba_mu_man": "Lamprey",
   "item.mystias_izakaya.ba_si_di_gua": "Candied Sweet Potato",

diff --git a/src/generated/resources/assets/mystias_izakaya/lang/zh_cn.json b/src/generated/resources/assets/mystias_izakaya/lang/zh_cn.json
@@ -15,6 +15,7 @@
   "gui.mystias_izakaya.donation_ui.button_take_out": "取出",
   "gui.mystias_izakaya.donation_ui.donation": "赛钱箱",
   "gui.mystias_izakaya.donation_ui.input": "10",
+  "gui.mystias_izakaya.ledger_ui.ledger": "账本",
   "item.mystias_izakaya.a_fu_jia_duo": "阿芙加朵",
   "item.mystias_izakaya.ba_mu_man": "八目鳗",
   "item.mystias_izakaya.ba_si_di_gua": "拔丝地瓜",

diff --git a/src/main/java/org/hiedacamellia/mystiasizakaya/content/common/block/blocks/Kitchenwares.java b/src/main/java/org/hiedacamellia/mystiasizakaya/content/common/block/blocks/Kitchenwares.java
@@ -115,7 +115,7 @@ public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, Co
         //Debug.send(state.getBlock().getDescriptionId());
         return switch (state.getBlock().getDescriptionId()) {
             case "block.mystias_izakaya.cutting_board" -> Shapes.join(box(1,0,3,15,1,13),box(0,0,0,0,0,0),BooleanOp.FIRST);
-            case "block.mystias_izakaya.boiling_pot" -> Shapes.block();
+            case "block.mystias_izakaya.boiling_pot" -> Shapes.join(box(3,0,3,13,6,13),box(0,0,0,0,0,0), BooleanOp.FIRST);
             case "block.mystias_izakaya.frying_pan" -> Shapes.join(box(3,0,1,13,2,11),box(7.25,1,11,8.75,2,17), BooleanOp.OR);
             case "block.mystias_izakaya.steamer" -> Shapes.join(box(2,0,3,14,4,14),box(0,0,0,0,0,0), BooleanOp.FIRST);
             case "block.mystias_izakaya.grill" -> Shapes.join(box(1,0,3,15,4,14),box(0,0,0,0,0,0), BooleanOp.FIRST);

diff --git a/src/main/java/org/hiedacamellia/mystiasizakaya/core/data/provider/StateProvider.java b/src/main/java/org/hiedacamellia/mystiasizakaya/core/data/provider/StateProvider.java
@@ -18,7 +18,7 @@ protected void registerStatesAndModels() {
         simpleBlockItem(MIBlock.CUTTING_BOARD.get(),models().getExistingFile(modLoc("item/liao_li_tai")));
         simpleBlock(MIBlock.GRILL.get(),models().getExistingFile(modLoc("block/grill")));
         simpleBlockItem(MIBlock.GRILL.get(),models().getExistingFile(modLoc("item/shao_kao_jia")));
-//        simpleBlock(MIBlock.BOILING_POT.get(),models().getExistingFile(modLoc("block/boiling_pot")));
+        simpleBlock(MIBlock.BOILING_POT.get(),models().getExistingFile(modLoc("block/boiling_pot")));
         simpleBlockItem(MIBlock.BOILING_POT.get(),models().getExistingFile(modLoc("item/zhu_guo")));
         simpleBlock(MIBlock.STEAMER.get(),models().getExistingFile(modLoc("block/steamer")));
         simpleBlockItem(MIBlock.STEAMER.get(),models().getExistingFile(modLoc("item/zheng_guo")));

diff --git a/src/main/resources/assets/mystias_izakaya/models/block/boiling_pot.json b/src/main/resources/assets/mystias_izakaya/models/block/boiling_pot.json
@@ -0,0 +1,153 @@
+{
+	"credit": "Made with Blockbench",
+	"texture_size": [32, 32],
+	"textures": {
+		"0": "mystias_izakaya:block/boiling_pot",
+		"particle": "mystias_izakaya:block/boiling_pot"
+	},
+	"elements": [
+		{
+			"from": [4, 0, 5],
+			"to": [5, 3, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 4]},
+			"faces": {
+				"north": {"uv": [12, 11.5, 12.5, 13], "texture": "#0"},
+				"east": {"uv": [5, 8, 8, 9.5], "texture": "#0"},
+				"south": {"uv": [1, 12.5, 1.5, 14], "texture": "#0"},
+				"west": {"uv": [8, 8, 11, 9.5], "texture": "#0"},
+				"up": {"uv": [5.5, 13.5, 5, 10.5], "texture": "#0"},
+				"down": {"uv": [6, 10.5, 5.5, 13.5], "texture": "#0"}
+			}
+		},
+		{
+			"from": [3, 3, 5],
+			"to": [5, 5, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [4, 3, 4]},
+			"faces": {
+				"north": {"uv": [2, 11.5, 3, 12.5], "texture": "#0"},
+				"east": {"uv": [9, 6.5, 12, 7.5], "texture": "#0"},
+				"south": {"uv": [8, 11.5, 9, 12.5], "texture": "#0"},
+				"west": {"uv": [3, 9.5, 6, 10.5], "texture": "#0"},
+				"up": {"uv": [7, 12.5, 6, 9.5], "texture": "#0"},
+				"down": {"uv": [8, 9.5, 7, 12.5], "texture": "#0"}
+			}
+		},
+		{
+			"from": [11, 0, 5],
+			"to": [12, 3, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 4]},
+			"faces": {
+				"north": {"uv": [1.5, 12.5, 2, 14], "texture": "#0"},
+				"east": {"uv": [0, 9, 3, 10.5], "texture": "#0"},
+				"south": {"uv": [2, 12.5, 2.5, 14], "texture": "#0"},
+				"west": {"uv": [9, 5, 12, 6.5], "texture": "#0"},
+				"up": {"uv": [0.5, 14.5, 0, 11.5], "texture": "#0"},
+				"down": {"uv": [1, 11.5, 0.5, 14.5], "texture": "#0"}
+			}
+		},
+		{
+			"from": [11, 3, 5],
+			"to": [13, 5, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [11, 3, 4]},
+			"faces": {
+				"north": {"uv": [9, 11.5, 10, 12.5], "texture": "#0"},
+				"east": {"uv": [8, 9.5, 11, 10.5], "texture": "#0"},
+				"south": {"uv": [10, 11.5, 11, 12.5], "texture": "#0"},
+				"west": {"uv": [0, 10.5, 3, 11.5], "texture": "#0"},
+				"up": {"uv": [4, 13.5, 3, 10.5], "texture": "#0"},
+				"down": {"uv": [5, 10.5, 4, 13.5], "texture": "#0"}
+			}
+		},
+		{
+			"from": [4, 0, 4],
+			"to": [12, 3, 5],
+			"rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 4]},
+			"faces": {
+				"north": {"uv": [4, 0, 8, 1.5], "texture": "#0"},
+				"east": {"uv": [2.5, 12.5, 3, 14], "texture": "#0"},
+				"south": {"uv": [4, 1.5, 8, 3], "texture": "#0"},
+				"west": {"uv": [6, 12.5, 6.5, 14], "texture": "#0"},
+				"up": {"uv": [13, 8, 9, 7.5], "texture": "#0"},
+				"down": {"uv": [12, 10.5, 8, 11], "texture": "#0"}
+			}
+		},
+		{
+			"from": [3, 3, 3],
+			"to": [13, 5, 5],
+			"rotation": {"angle": 0, "axis": "y", "origin": [4, 3, 4]},
+			"faces": {
+				"north": {"uv": [4, 6, 9, 7], "texture": "#0"},
+				"east": {"uv": [11, 11.5, 12, 12.5], "texture": "#0"},
+				"south": {"uv": [4, 7, 9, 8], "texture": "#0"},
+				"west": {"uv": [12, 5, 13, 6], "texture": "#0"},
+				"up": {"uv": [5, 9, 0, 8], "texture": "#0"},
+				"down": {"uv": [13, 0, 8, 1], "texture": "#0"}
+			}
+		},
+		{
+			"from": [4, 0, 11],
+			"to": [12, 3, 12],
+			"rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 11]},
+			"faces": {
+				"north": {"uv": [4, 3, 8, 4.5], "texture": "#0"},
+				"east": {"uv": [6.5, 12.5, 7, 14], "texture": "#0"},
+				"south": {"uv": [4, 4.5, 8, 6], "texture": "#0"},
+				"west": {"uv": [7, 12.5, 7.5, 14], "texture": "#0"},
+				"up": {"uv": [12, 11.5, 8, 11], "texture": "#0"},
+				"down": {"uv": [15, 8, 11, 8.5], "texture": "#0"}
+			}
+		},
+		{
+			"from": [3, 3, 11],
+			"to": [13, 5, 13],
+			"rotation": {"angle": 0, "axis": "y", "origin": [4, 3, 11]},
+			"faces": {
+				"north": {"uv": [8, 1, 13, 2], "texture": "#0"},
+				"east": {"uv": [12, 6, 13, 7], "texture": "#0"},
+				"south": {"uv": [8, 2, 13, 3], "texture": "#0"},
+				"west": {"uv": [12, 10.5, 13, 11.5], "texture": "#0"},
+				"up": {"uv": [13, 4, 8, 3], "texture": "#0"},
+				"down": {"uv": [13, 4, 8, 5], "texture": "#0"}
+			}
+		},
+		{
+			"from": [4, 5, 4],
+			"to": [12, 6, 12],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 9]},
+			"faces": {
+				"north": {"uv": [11, 8.5, 15, 9], "texture": "#0"},
+				"east": {"uv": [11, 9, 15, 9.5], "texture": "#0"},
+				"south": {"uv": [11, 9.5, 15, 10], "texture": "#0"},
+				"west": {"uv": [11, 10, 15, 10.5], "texture": "#0"},
+				"up": {"uv": [4, 4, 0, 0], "texture": "#0"},
+				"down": {"uv": [4, 4, 0, 8], "texture": "#0"}
+			}
+		},
+		{
+			"from": [5, 0, 5],
+			"to": [11, 1, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 10]},
+			"faces": {
+				"north": {"uv": [11, 8.5, 15, 9], "texture": "#0"},
+				"east": {"uv": [11, 9, 15, 9.5], "texture": "#0"},
+				"south": {"uv": [11, 9.5, 15, 10], "texture": "#0"},
+				"west": {"uv": [11, 10, 15, 10.5], "texture": "#0"},
+				"up": {"uv": [4, 4, 0, 0], "texture": "#0"},
+				"down": {"uv": [3, 4, 0, 7], "texture": "#0"}
+			}
+		},
+		{
+			"from": [7, 6, 7],
+			"to": [9, 7, 9],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5, 6, 9]},
+			"faces": {
+				"north": {"uv": [3, 9, 4, 9.5], "texture": "#0"},
+				"east": {"uv": [4, 9, 5, 9.5], "texture": "#0"},
+				"south": {"uv": [12, 7, 13, 7.5], "texture": "#0"},
+				"west": {"uv": [7.5, 12.5, 8.5, 13], "texture": "#0"},
+				"up": {"uv": [9, 6, 8, 5], "texture": "#0"},
+				"down": {"uv": [2, 11.5, 1, 12.5], "texture": "#0"}
+			}
+		}
+	]
+}
diff --git a/src/main/resources/assets/mystias_izakaya/textures/block/boiling_pot.png b/src/main/resources/assets/mystias_izakaya/textures/block/boiling_pot.png