From 8af463147ed1b16f0ea49b61113ed4076c2d0703 Mon Sep 17 00:00:00 2001
From: XeKr <987820727@qq.com>
Date: Mon, 12 Aug 2024 15:57:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../minecraft/models/block/cauldron.json      | 64 ++++++++-----------
 .../models/block/template_cauldron_full.json  | 64 ++++++++-----------
 .../block/template_cauldron_level1.json       | 64 ++++++++-----------
 .../block/template_cauldron_level2.json       | 64 ++++++++-----------
 4 files changed, 112 insertions(+), 144 deletions(-)

diff --git a/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/cauldron.json b/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/cauldron.json
index 79a44fc1f..d98515925 100644
--- a/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/cauldron.json
+++ b/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/cauldron.json
@@ -22,15 +22,11 @@
 			}
 		},
 		{
-			"from": [0, 3, 0],
-			"to": [16, 4, 16],
+			"from": [2, 3, 2],
+			"to": [14, 4, 14],
 			"faces": {
-				"north": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "north"},
-				"east": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "east"},
-				"south": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "south"},
-				"west": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "west"},
-				"up": {"uv": [0, 0, 16, 16], "texture": "#inside"},
-				"down": {"uv": [0, 0, 16, 16], "texture": "#inside"}
+				"up": {"uv": [2, 2, 14, 14], "texture": "#inside"},
+				"down": {"uv": [2, 2, 14, 14], "texture": "#inside"}
 			}
 		},
 		{
@@ -66,51 +62,47 @@
 			}
 		},
 		{
-			"from": [0, 4, 0],
-			"to": [2, 7, 16],
+			"from": [0, 3, 4],
+			"to": [2, 7, 12],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [14, 9, 16, 12], "texture": "#side", "cullface": "north"},
-				"east": {"uv": [0, 9, 16, 12], "texture": "#side"},
-				"south": {"uv": [0, 9, 2, 12], "texture": "#side", "cullface": "south"},
-				"west": {"uv": [0, 9, 16, 12], "texture": "#side", "cullface": "west"},
-				"up": {"uv": [0, 0, 2, 16], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [0, 0, 2, 16], "texture": "#inside"}
+				"east": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"west": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "west"},
+				"up": {"uv": [0, 4, 2, 12], "texture": "#top"},
+				"down": {"uv": [0, 4, 2, 12], "texture": "#inside"}
 			}
 		},
 		{
-			"from": [2, 4, 0],
-			"to": [14, 7, 2],
+			"from": [4, 3, 0],
+			"to": [12, 7, 2],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [2, 9, 14, 12], "texture": "#side", "cullface": "north"},
-				"south": {"uv": [2, 9, 14, 12], "texture": "#side"},
-				"up": {"uv": [2, 0, 14, 2], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [2, 14, 14, 16], "texture": "#inside"}
+				"north": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "north"},
+				"south": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"up": {"uv": [4, 0, 12, 2], "texture": "#top"},
+				"down": {"uv": [4, 14, 12, 16], "texture": "#inside"}
 			}
 		},
 		{
-			"from": [14, 4, 0],
-			"to": [16, 7, 16],
+			"from": [14, 3, 4],
+			"to": [16, 7, 12],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [0, 9, 2, 12], "texture": "#side", "cullface": "north"},
-				"east": {"uv": [0, 9, 16, 12], "texture": "#side", "cullface": "east"},
-				"south": {"uv": [14, 9, 16, 12], "texture": "#side", "cullface": "south"},
-				"west": {"uv": [0, 9, 16, 12], "texture": "#side"},
-				"up": {"uv": [14, 0, 16, 16], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [14, 0, 16, 16], "texture": "#inside"}
+				"east": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "east"},
+				"west": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"up": {"uv": [14, 4, 16, 12], "texture": "#top"},
+				"down": {"uv": [14, 4, 16, 12], "texture": "#inside"}
 			}
 		},
 		{
-			"from": [2, 4, 14],
-			"to": [14, 7, 16],
+			"from": [4, 3, 14],
+			"to": [12, 7, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [2, 9, 14, 12], "texture": "#side"},
-				"south": {"uv": [2, 9, 14, 12], "texture": "#side", "cullface": "south"},
-				"up": {"uv": [2, 14, 14, 16], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [2, 0, 14, 2], "texture": "#inside"}
+				"north": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"south": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "south"},
+				"up": {"uv": [4, 14, 12, 16], "texture": "#top"},
+				"down": {"uv": [4, 0, 12, 2], "texture": "#inside"}
 			}
 		},
 		{
diff --git a/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/template_cauldron_full.json b/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/template_cauldron_full.json
index 6134655a3..089132a4b 100644
--- a/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/template_cauldron_full.json
+++ b/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/template_cauldron_full.json
@@ -22,15 +22,11 @@
 			}
 		},
 		{
-			"from": [0, 3, 0],
-			"to": [16, 4, 16],
+			"from": [2, 3, 2],
+			"to": [14, 4, 14],
 			"faces": {
-				"north": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "north"},
-				"east": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "east"},
-				"south": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "south"},
-				"west": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "west"},
-				"up": {"uv": [0, 0, 16, 16], "texture": "#inside"},
-				"down": {"uv": [0, 0, 16, 16], "texture": "#inside"}
+				"up": {"uv": [2, 2, 14, 14], "texture": "#inside"},
+				"down": {"uv": [2, 2, 14, 14], "texture": "#inside"}
 			}
 		},
 		{
@@ -66,51 +62,47 @@
 			}
 		},
 		{
-			"from": [2, 4, 0],
-			"to": [14, 7, 2],
+			"from": [4, 3, 0],
+			"to": [12, 7, 2],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [2, 9, 14, 12], "texture": "#side", "cullface": "north"},
-				"south": {"uv": [2, 9, 14, 12], "texture": "#side"},
-				"up": {"uv": [2, 0, 14, 2], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [2, 14, 14, 16], "texture": "#inside"}
+				"north": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "north"},
+				"south": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"up": {"uv": [4, 0, 12, 2], "texture": "#top"},
+				"down": {"uv": [4, 14, 12, 16], "texture": "#inside"}
 			}
 		},
 		{
-			"from": [0, 4, 0],
-			"to": [2, 7, 16],
+			"from": [0, 3, 4],
+			"to": [2, 7, 12],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [14, 9, 16, 12], "texture": "#side", "cullface": "north"},
-				"east": {"uv": [0, 9, 16, 12], "texture": "#side"},
-				"south": {"uv": [0, 9, 2, 12], "texture": "#side", "cullface": "south"},
-				"west": {"uv": [0, 9, 16, 12], "texture": "#side", "cullface": "west"},
-				"up": {"uv": [0, 0, 2, 16], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [0, 0, 2, 16], "texture": "#inside"}
+				"east": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"west": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "west"},
+				"up": {"uv": [0, 4, 2, 12], "texture": "#top"},
+				"down": {"uv": [0, 4, 2, 12], "texture": "#inside"}
 			}
 		},
 		{
-			"from": [2, 4, 14],
-			"to": [14, 7, 16],
+			"from": [4, 3, 14],
+			"to": [12, 7, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [2, 9, 14, 12], "texture": "#side"},
-				"south": {"uv": [2, 9, 14, 12], "texture": "#side", "cullface": "south"},
-				"up": {"uv": [2, 14, 14, 16], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [2, 0, 14, 2], "texture": "#inside"}
+				"north": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"south": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "south"},
+				"up": {"uv": [4, 14, 12, 16], "texture": "#top"},
+				"down": {"uv": [4, 0, 12, 2], "texture": "#inside"}
 			}
 		},
 		{
-			"from": [14, 4, 0],
-			"to": [16, 7, 16],
+			"from": [14, 3, 4],
+			"to": [16, 7, 12],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [0, 9, 2, 12], "texture": "#side", "cullface": "north"},
-				"east": {"uv": [0, 9, 16, 12], "texture": "#side", "cullface": "east"},
-				"south": {"uv": [14, 9, 16, 12], "texture": "#side", "cullface": "south"},
-				"west": {"uv": [0, 9, 16, 12], "texture": "#side"},
-				"up": {"uv": [14, 0, 16, 16], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [14, 0, 16, 16], "texture": "#inside"}
+				"east": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "east"},
+				"west": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"up": {"uv": [14, 4, 16, 12], "texture": "#top"},
+				"down": {"uv": [14, 4, 16, 12], "texture": "#inside"}
 			}
 		},
 		{
diff --git a/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/template_cauldron_level1.json b/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/template_cauldron_level1.json
index 1e6d225b1..674f91131 100644
--- a/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/template_cauldron_level1.json
+++ b/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/template_cauldron_level1.json
@@ -22,15 +22,11 @@
 			}
 		},
 		{
-			"from": [0, 3, 0],
-			"to": [16, 4, 16],
+			"from": [2, 3, 2],
+			"to": [14, 4, 14],
 			"faces": {
-				"north": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "north"},
-				"east": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "east"},
-				"south": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "south"},
-				"west": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "west"},
-				"up": {"uv": [0, 0, 16, 16], "texture": "#inside"},
-				"down": {"uv": [0, 0, 16, 16], "texture": "#inside"}
+				"up": {"uv": [2, 2, 14, 14], "texture": "#inside"},
+				"down": {"uv": [2, 2, 14, 14], "texture": "#inside"}
 			}
 		},
 		{
@@ -66,51 +62,47 @@
 			}
 		},
 		{
-			"from": [0, 4, 0],
-			"to": [2, 7, 16],
+			"from": [0, 3, 4],
+			"to": [2, 7, 12],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [14, 9, 16, 12], "texture": "#side", "cullface": "north"},
-				"east": {"uv": [0, 9, 16, 12], "texture": "#side"},
-				"south": {"uv": [0, 9, 2, 12], "texture": "#side", "cullface": "south"},
-				"west": {"uv": [0, 9, 16, 12], "texture": "#side", "cullface": "west"},
-				"up": {"uv": [0, 0, 2, 16], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [0, 0, 2, 16], "texture": "#inside"}
+				"east": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"west": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "west"},
+				"up": {"uv": [0, 4, 2, 12], "texture": "#top"},
+				"down": {"uv": [0, 4, 2, 12], "texture": "#inside"}
 			}
 		},
 		{
-			"from": [2, 4, 0],
-			"to": [14, 7, 2],
+			"from": [4, 3, 0],
+			"to": [12, 7, 2],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [2, 9, 14, 12], "texture": "#side", "cullface": "north"},
-				"south": {"uv": [2, 9, 14, 12], "texture": "#side"},
-				"up": {"uv": [2, 0, 14, 2], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [2, 14, 14, 16], "texture": "#inside"}
+				"north": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "north"},
+				"south": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"up": {"uv": [4, 0, 12, 2], "texture": "#top"},
+				"down": {"uv": [4, 14, 12, 16], "texture": "#inside"}
 			}
 		},
 		{
-			"from": [14, 4, 0],
-			"to": [16, 7, 16],
+			"from": [14, 3, 4],
+			"to": [16, 7, 12],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [0, 9, 2, 12], "texture": "#side", "cullface": "north"},
-				"east": {"uv": [0, 9, 16, 12], "texture": "#side", "cullface": "east"},
-				"south": {"uv": [14, 9, 16, 12], "texture": "#side", "cullface": "south"},
-				"west": {"uv": [0, 9, 16, 12], "texture": "#side"},
-				"up": {"uv": [14, 0, 16, 16], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [14, 0, 16, 16], "texture": "#inside"}
+				"east": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "east"},
+				"west": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"up": {"uv": [14, 4, 16, 12], "texture": "#top"},
+				"down": {"uv": [14, 4, 16, 12], "texture": "#inside"}
 			}
 		},
 		{
-			"from": [2, 4, 14],
-			"to": [14, 7, 16],
+			"from": [4, 3, 14],
+			"to": [12, 7, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [2, 9, 14, 12], "texture": "#side"},
-				"south": {"uv": [2, 9, 14, 12], "texture": "#side", "cullface": "south"},
-				"up": {"uv": [2, 14, 14, 16], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [2, 0, 14, 2], "texture": "#inside"}
+				"north": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"south": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "south"},
+				"up": {"uv": [4, 14, 12, 16], "texture": "#top"},
+				"down": {"uv": [4, 0, 12, 2], "texture": "#inside"}
 			}
 		},
 		{
diff --git a/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/template_cauldron_level2.json b/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/template_cauldron_level2.json
index f4286a6ae..896eb0d61 100644
--- a/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/template_cauldron_level2.json
+++ b/common/src/main/resources/resourcepacks/transparent_cauldron/assets/minecraft/models/block/template_cauldron_level2.json
@@ -22,15 +22,11 @@
 			}
 		},
 		{
-			"from": [0, 3, 0],
-			"to": [16, 4, 16],
+			"from": [2, 3, 2],
+			"to": [14, 4, 14],
 			"faces": {
-				"north": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "north"},
-				"east": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "east"},
-				"south": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "south"},
-				"west": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "west"},
-				"up": {"uv": [0, 0, 16, 16], "texture": "#inside"},
-				"down": {"uv": [0, 0, 16, 16], "texture": "#inside"}
+				"up": {"uv": [2, 2, 14, 14], "texture": "#inside"},
+				"down": {"uv": [2, 2, 14, 14], "texture": "#inside"}
 			}
 		},
 		{
@@ -66,51 +62,47 @@
 			}
 		},
 		{
-			"from": [0, 4, 0],
-			"to": [2, 7, 16],
+			"from": [0, 3, 4],
+			"to": [2, 7, 12],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [14, 9, 16, 12], "texture": "#side", "cullface": "north"},
-				"east": {"uv": [0, 9, 16, 12], "texture": "#side"},
-				"south": {"uv": [0, 9, 2, 12], "texture": "#side", "cullface": "south"},
-				"west": {"uv": [0, 9, 16, 12], "texture": "#side", "cullface": "west"},
-				"up": {"uv": [0, 0, 2, 16], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [0, 0, 2, 16], "texture": "#inside"}
+				"east": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"west": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "west"},
+				"up": {"uv": [0, 4, 2, 12], "texture": "#top"},
+				"down": {"uv": [0, 4, 2, 12], "texture": "#inside"}
 			}
 		},
 		{
-			"from": [2, 4, 0],
-			"to": [14, 7, 2],
+			"from": [4, 3, 0],
+			"to": [12, 7, 2],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [2, 9, 14, 12], "texture": "#side", "cullface": "north"},
-				"south": {"uv": [2, 9, 14, 12], "texture": "#side"},
-				"up": {"uv": [2, 0, 14, 2], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [2, 14, 14, 16], "texture": "#inside"}
+				"north": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "north"},
+				"south": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"up": {"uv": [4, 0, 12, 2], "texture": "#top"},
+				"down": {"uv": [4, 14, 12, 16], "texture": "#inside"}
 			}
 		},
 		{
-			"from": [14, 4, 0],
-			"to": [16, 7, 16],
+			"from": [14, 3, 4],
+			"to": [16, 7, 12],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [0, 9, 2, 12], "texture": "#side", "cullface": "north"},
-				"east": {"uv": [0, 9, 16, 12], "texture": "#side", "cullface": "east"},
-				"south": {"uv": [14, 9, 16, 12], "texture": "#side", "cullface": "south"},
-				"west": {"uv": [0, 9, 16, 12], "texture": "#side"},
-				"up": {"uv": [14, 0, 16, 16], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [14, 0, 16, 16], "texture": "#inside"}
+				"east": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "east"},
+				"west": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"up": {"uv": [14, 4, 16, 12], "texture": "#top"},
+				"down": {"uv": [14, 4, 16, 12], "texture": "#inside"}
 			}
 		},
 		{
-			"from": [2, 4, 14],
-			"to": [14, 7, 16],
+			"from": [4, 3, 14],
+			"to": [12, 7, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, -10, 0]},
 			"faces": {
-				"north": {"uv": [2, 9, 14, 12], "texture": "#side"},
-				"south": {"uv": [2, 9, 14, 12], "texture": "#side", "cullface": "south"},
-				"up": {"uv": [2, 14, 14, 16], "texture": "#top", "cullface": "up"},
-				"down": {"uv": [2, 0, 14, 2], "texture": "#inside"}
+				"north": {"uv": [4, 9, 12, 13], "texture": "#side"},
+				"south": {"uv": [4, 9, 12, 13], "texture": "#side", "cullface": "south"},
+				"up": {"uv": [4, 14, 12, 16], "texture": "#top"},
+				"down": {"uv": [4, 0, 12, 2], "texture": "#inside"}
 			}
 		},
 		{