Merge pull request #1450 from XeKr/assets/1.21.1

修改流体炼药锅模型和方块状态
Anvil-Dev · Jan 4, 2025 · 21d4e74 · 21d4e74
2 parents e97a269 + f48a4f4
commit 21d4e74
Show file tree

Hide file tree

Showing 30 changed files with 1,144 additions and 29 deletions.
diff --git a/src/main/resources/assets/anvilcraft/blockstates/experience_cauldron.json b/src/main/resources/assets/anvilcraft/blockstates/experience_cauldron.json
@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "level=1": {
+      "model": "anvilcraft:block/experience_cauldron_level1"
+    },
+    "level=2": {
+      "model": "anvilcraft:block/experience_cauldron_level2"
+    },
+    "level=3": {
+      "model": "anvilcraft:block/experience_cauldron_level3"
+    },
+    "level=4": {
+      "model": "anvilcraft:block/experience_cauldron_full"
+    }
+  }
+}
diff --git a/src/main/resources/assets/anvilcraft/blockstates/fire_cauldron.json b/src/main/resources/assets/anvilcraft/blockstates/fire_cauldron.json
@@ -42,11 +42,27 @@
     },
     {
       "apply": {
-        "model": "anvilcraft:block/oil_cauldron_full"
+        "model": "anvilcraft:block/oil_cauldron_level3"
       },
       "when": {
         "level": "3"
       }
+    },
+	{
+      "apply": {
+        "model": "anvilcraft:block/fire_cauldron_fire4"
+      },
+      "when": {
+        "level": "4"
+      }
+    },
+    {
+      "apply": {
+        "model": "anvilcraft:block/oil_cauldron_full"
+      },
+      "when": {
+        "level": "4"
+      }
     }
   ]
 }
diff --git a/src/main/resources/assets/anvilcraft/blockstates/honey_cauldron.json b/src/main/resources/assets/anvilcraft/blockstates/honey_cauldron.json
@@ -7,6 +7,9 @@
       "model": "anvilcraft:block/honey_cauldron_level2"
     },
     "level=3": {
+      "model": "anvilcraft:block/honey_cauldron_level3"
+    },
+    "level=4": {
       "model": "anvilcraft:block/honey_cauldron_full"
     }
   }

diff --git a/src/main/resources/assets/anvilcraft/blockstates/lava_cauldron.json b/src/main/resources/assets/anvilcraft/blockstates/lava_cauldron.json
@@ -7,6 +7,9 @@
       "model": "anvilcraft:block/lava_cauldron_level2"
     },
     "level=3": {
+      "model": "anvilcraft:block/lava_cauldron_level3"
+    },
+    "level=4": {
       "model": "minecraft:block/lava_cauldron"
     }
   }

diff --git a/src/main/resources/assets/anvilcraft/blockstates/oil_cauldron.json b/src/main/resources/assets/anvilcraft/blockstates/oil_cauldron.json
@@ -7,6 +7,9 @@
       "model": "anvilcraft:block/oil_cauldron_level2"
     },
     "level=3": {
+      "model": "anvilcraft:block/oil_cauldron_level3"
+    },
+    "level=4": {
       "model": "anvilcraft:block/oil_cauldron_full"
     }
   }

diff --git a/src/main/resources/assets/anvilcraft/models/block/experience_cauldron_full.json b/src/main/resources/assets/anvilcraft/models/block/experience_cauldron_full.json
@@ -0,0 +1,11 @@
+{
+  "parent": "minecraft:block/template_cauldron_full",
+  "textures": {
+    "bottom": "minecraft:block/cauldron_bottom",
+    "content": "anvilcraft:block/experience_fluid",
+    "inside": "minecraft:block/cauldron_inner",
+    "particle": "minecraft:block/cauldron_side",
+    "side": "minecraft:block/cauldron_side",
+    "top": "minecraft:block/cauldron_top"
+  }
+}
diff --git a/src/main/resources/assets/anvilcraft/models/block/experience_cauldron_level1.json b/src/main/resources/assets/anvilcraft/models/block/experience_cauldron_level1.json
@@ -0,0 +1,11 @@
+{
+  "parent": "anvilcraft:block/template_cauldron_level1of4",
+  "textures": {
+    "bottom": "minecraft:block/cauldron_bottom",
+    "content": "anvilcraft:block/experience_fluid",
+    "inside": "minecraft:block/cauldron_inner",
+    "particle": "minecraft:block/cauldron_side",
+    "side": "minecraft:block/cauldron_side",
+    "top": "minecraft:block/cauldron_top"
+  }
+}
diff --git a/src/main/resources/assets/anvilcraft/models/block/experience_cauldron_level2.json b/src/main/resources/assets/anvilcraft/models/block/experience_cauldron_level2.json
@@ -0,0 +1,11 @@
+{
+  "parent": "anvilcraft:block/template_cauldron_level2of4",
+  "textures": {
+    "bottom": "minecraft:block/cauldron_bottom",
+    "content": "anvilcraft:block/experience_fluid",
+    "inside": "minecraft:block/cauldron_inner",
+    "particle": "minecraft:block/cauldron_side",
+    "side": "minecraft:block/cauldron_side",
+    "top": "minecraft:block/cauldron_top"
+  }
+}
diff --git a/src/main/resources/assets/anvilcraft/models/block/experience_cauldron_level3.json b/src/main/resources/assets/anvilcraft/models/block/experience_cauldron_level3.json
@@ -0,0 +1,11 @@
+{
+  "parent": "anvilcraft:block/template_cauldron_level3of4",
+  "textures": {
+    "bottom": "minecraft:block/cauldron_bottom",
+    "content": "anvilcraft:block/experience_fluid",
+    "inside": "minecraft:block/cauldron_inner",
+    "particle": "minecraft:block/cauldron_side",
+    "side": "minecraft:block/cauldron_side",
+    "top": "minecraft:block/cauldron_top"
+  }
+}
diff --git a/src/main/resources/assets/anvilcraft/models/block/fire_cauldron_fire1.json b/src/main/resources/assets/anvilcraft/models/block/fire_cauldron_fire1.json
@@ -8,20 +8,20 @@
 	},
 	"elements": [
 		{
-			"from": [8, 8, 0.8],
-			"to": [8, 24, 15.2],
+			"from": [8, 6, 0.8],
+			"to": [8, 22, 15.2],
 			"shade": false,
-			"rotation": {"angle": 45, "axis": "y", "origin": [8, 15, 8], "rescale": true},
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 13, 8], "rescale": true},
 			"faces": {
 				"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
 				"west": {"uv": [0, 0, 16, 16], "texture": "#0"}
 			}
 		},
 		{
-			"from": [0.8, 8, 8],
-			"to": [15.2, 24, 8],
+			"from": [0.8, 6, 8],
+			"to": [15.2, 22, 8],
 			"shade": false,
-			"rotation": {"angle": 45, "axis": "y", "origin": [8, 15, 8], "rescale": true},
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 13, 8], "rescale": true},
 			"faces": {
 				"north": {"uv": [0, 0, 16, 16], "texture": "#0"},
 				"south": {"uv": [0, 0, 16, 16], "texture": "#0"}

diff --git a/src/main/resources/assets/anvilcraft/models/block/fire_cauldron_fire2.json b/src/main/resources/assets/anvilcraft/models/block/fire_cauldron_fire2.json
@@ -3,25 +3,25 @@
 	"parent": "minecraft:block/campfire",
 	"render_type": "minecraft:cutout",
 	"textures": {
-		"0": "minecraft:block/campfire_fire",
-		"particle": "minecraft:block/campfire_fire"
+		"0": "block/campfire_fire",
+		"particle": "block/campfire_fire"
 	},
 	"elements": [
 		{
-			"from": [8, 12, 0.8],
-			"to": [8, 28, 15.2],
+			"from": [8, 9, 0.8],
+			"to": [8, 25, 15.2],
 			"shade": false,
-			"rotation": {"angle": 45, "axis": "y", "origin": [8, 19, 8], "rescale": true},
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 16, 8], "rescale": true},
 			"faces": {
 				"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
 				"west": {"uv": [0, 0, 16, 16], "texture": "#0"}
 			}
 		},
 		{
-			"from": [0.8, 12, 8],
-			"to": [15.2, 28, 8],
+			"from": [0.8, 9, 8],
+			"to": [15.2, 25, 8],
 			"shade": false,
-			"rotation": {"angle": 45, "axis": "y", "origin": [8, 19, 8], "rescale": true},
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 16, 8], "rescale": true},
 			"faces": {
 				"north": {"uv": [0, 0, 16, 16], "texture": "#0"},
 				"south": {"uv": [0, 0, 16, 16], "texture": "#0"}

diff --git a/src/main/resources/assets/anvilcraft/models/block/fire_cauldron_fire3.json b/src/main/resources/assets/anvilcraft/models/block/fire_cauldron_fire3.json
@@ -3,25 +3,25 @@
 	"parent": "minecraft:block/campfire",
 	"render_type": "minecraft:cutout",
 	"textures": {
-		"0": "minecraft:block/campfire_fire",
-		"particle": "minecraft:block/campfire_fire"
+		"0": "block/campfire_fire",
+		"particle": "block/campfire_fire"
 	},
 	"elements": [
 		{
-			"from": [8, 15, 0.8],
-			"to": [8, 31, 15.2],
+			"from": [8, 12, 0.8],
+			"to": [8, 28, 15.2],
 			"shade": false,
-			"rotation": {"angle": 45, "axis": "y", "origin": [8, 22, 8], "rescale": true},
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 19, 8], "rescale": true},
 			"faces": {
 				"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
 				"west": {"uv": [0, 0, 16, 16], "texture": "#0"}
 			}
 		},
 		{
-			"from": [0.8, 15, 8],
-			"to": [15.2, 31, 8],
+			"from": [0.8, 12, 8],
+			"to": [15.2, 28, 8],
 			"shade": false,
-			"rotation": {"angle": 45, "axis": "y", "origin": [8, 22, 8], "rescale": true},
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 19, 8], "rescale": true},
 			"faces": {
 				"north": {"uv": [0, 0, 16, 16], "texture": "#0"},
 				"south": {"uv": [0, 0, 16, 16], "texture": "#0"}

diff --git a/src/main/resources/assets/anvilcraft/models/block/fire_cauldron_fire4.json b/src/main/resources/assets/anvilcraft/models/block/fire_cauldron_fire4.json
@@ -0,0 +1,31 @@
+{
+	"credit": "Made by XeKr with Blockbench",
+	"parent": "minecraft:block/campfire",
+	"render_type": "minecraft:cutout",
+	"textures": {
+		"0": "minecraft:block/campfire_fire",
+		"particle": "minecraft:block/campfire_fire"
+	},
+	"elements": [
+		{
+			"from": [8, 15, 0.8],
+			"to": [8, 31, 15.2],
+			"shade": false,
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 22, 8], "rescale": true},
+			"faces": {
+				"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		},
+		{
+			"from": [0.8, 15, 8],
+			"to": [15.2, 31, 8],
+			"shade": false,
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 22, 8], "rescale": true},
+			"faces": {
+				"north": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		}
+	]
+}
diff --git a/src/main/resources/assets/anvilcraft/models/block/honey_cauldron_level1.json b/src/main/resources/assets/anvilcraft/models/block/honey_cauldron_level1.json
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:block/template_cauldron_level1",
+  "parent": "anvilcraft:block/template_cauldron_level1of4",
   "textures": {
     "bottom": "minecraft:block/cauldron_bottom",
     "content": "minecraft:block/honey_block_top",

diff --git a/src/main/resources/assets/anvilcraft/models/block/honey_cauldron_level2.json b/src/main/resources/assets/anvilcraft/models/block/honey_cauldron_level2.json
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:block/template_cauldron_level2",
+  "parent": "anvilcraft:block/template_cauldron_level2of4",
   "textures": {
     "bottom": "minecraft:block/cauldron_bottom",
     "content": "minecraft:block/honey_block_top",

diff --git a/src/main/resources/assets/anvilcraft/models/block/honey_cauldron_level3.json b/src/main/resources/assets/anvilcraft/models/block/honey_cauldron_level3.json
@@ -0,0 +1,11 @@
+{
+  "parent": "anvilcraft:block/template_cauldron_level3of4",
+  "textures": {
+    "bottom": "minecraft:block/cauldron_bottom",
+    "content": "minecraft:block/honey_block_top",
+    "inside": "minecraft:block/cauldron_inner",
+    "particle": "minecraft:block/cauldron_side",
+    "side": "minecraft:block/cauldron_side",
+    "top": "minecraft:block/cauldron_top"
+  }
+}
diff --git a/src/main/resources/assets/anvilcraft/models/block/lava_cauldron_level1.json b/src/main/resources/assets/anvilcraft/models/block/lava_cauldron_level1.json
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:block/template_cauldron_level1",
+  "parent": "anvilcraft:block/template_cauldron_level1of4",
   "textures": {
     "bottom": "minecraft:block/cauldron_bottom",
     "content": "minecraft:block/lava_still",

diff --git a/src/main/resources/assets/anvilcraft/models/block/lava_cauldron_level2.json b/src/main/resources/assets/anvilcraft/models/block/lava_cauldron_level2.json
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:block/template_cauldron_level2",
+  "parent": "anvilcraft:block/template_cauldron_level2of4",
   "textures": {
     "bottom": "minecraft:block/cauldron_bottom",
     "content": "minecraft:block/lava_still",

diff --git a/src/main/resources/assets/anvilcraft/models/block/lava_cauldron_level3.json b/src/main/resources/assets/anvilcraft/models/block/lava_cauldron_level3.json
@@ -0,0 +1,11 @@
+{
+  "parent": "anvilcraft:block/template_cauldron_level3of4",
+  "textures": {
+    "bottom": "minecraft:block/cauldron_bottom",
+    "content": "minecraft:block/lava_still",
+    "inside": "minecraft:block/cauldron_inner",
+    "particle": "minecraft:block/cauldron_side",
+    "side": "minecraft:block/cauldron_side",
+    "top": "minecraft:block/cauldron_top"
+  }
+}
diff --git a/src/main/resources/assets/anvilcraft/models/block/oil_cauldron_level1.json b/src/main/resources/assets/anvilcraft/models/block/oil_cauldron_level1.json
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:block/template_cauldron_level1",
+  "parent": "anvilcraft:block/template_cauldron_level1of4",
   "textures": {
     "bottom": "minecraft:block/cauldron_bottom",
     "content": "anvilcraft:block/oil",

diff --git a/src/main/resources/assets/anvilcraft/models/block/oil_cauldron_level2.json b/src/main/resources/assets/anvilcraft/models/block/oil_cauldron_level2.json
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:block/template_cauldron_level2",
+  "parent": "anvilcraft:block/template_cauldron_level2of4",
   "textures": {
     "bottom": "minecraft:block/cauldron_bottom",
     "content": "anvilcraft:block/oil",

diff --git a/src/main/resources/assets/anvilcraft/models/block/oil_cauldron_level3.json b/src/main/resources/assets/anvilcraft/models/block/oil_cauldron_level3.json
@@ -0,0 +1,11 @@
+{
+  "parent": "anvilcraft:block/template_cauldron_level3of4",
+  "textures": {
+    "bottom": "minecraft:block/cauldron_bottom",
+    "content": "anvilcraft:block/oil",
+    "inside": "minecraft:block/cauldron_inner",
+    "particle": "minecraft:block/cauldron_side",
+    "side": "minecraft:block/cauldron_side",
+    "top": "minecraft:block/cauldron_top"
+  }
+}