Merge pull request #86 from Gu-ZT/resource/1.20.1

修改一些模型

src/main/resources/assets/anvilcraft/models/block/chute.json

@@ -17,18 +17,7 @@
 				"south": {"uv": [2, 1, 14, 16], "texture": "#side"},
 				"west": {"uv": [2, 1, 14, 16], "texture": "#side"},
 				"up": {"uv": [2, 2, 14, 14], "texture": "#top"},
-				"down": {"uv": [2, 2, 14, 14], "texture": "#top"}
-			}
-		},
-		{
-			"from": [3.9, -2.1, 3.9],
-			"to": [12.1, 0, 12.1],
-			"faces": {
-				"north": {"uv": [11, 14, 3, 16], "texture": "#side"},
-				"east": {"uv": [11, 14, 3, 16], "texture": "#side"},
-				"south": {"uv": [11, 14, 3, 16], "texture": "#side"},
-				"west": {"uv": [11, 14, 3, 16], "texture": "#side"},
-				"down": {"uv": [4, 4, 12, 12], "texture": "#bottom"}
+				"down": {"uv": [2, 2, 14, 14], "texture": "#bottom"}
 			}
 		},
 		{

src/main/resources/assets/anvilcraft/models/block/chute_side.json

@@ -9,27 +9,38 @@
 	},
 	"elements": [
 		{
-			"from": [2, 0, 2],
+			"from": [2, 8, 2],
 			"to": [14, 15, 14],
 			"faces": {
-				"north": {"uv": [2, 1, 14, 16], "texture": "#side"},
-				"east": {"uv": [2, 1, 14, 16], "texture": "#side"},
-				"south": {"uv": [2, 1, 14, 16], "texture": "#side"},
-				"west": {"uv": [2, 1, 14, 16], "texture": "#side"},
+				"north": {"uv": [2, 9, 14, 16], "texture": "#side"},
+				"east": {"uv": [2, 9, 14, 16], "texture": "#side"},
+				"south": {"uv": [2, 9, 14, 16], "texture": "#side"},
+				"west": {"uv": [2, 9, 14, 16], "texture": "#side"},
 				"up": {"uv": [2, 2, 14, 14], "texture": "#top"},
 				"down": {"uv": [2, 4, 14, 16], "texture": "#side"}
 			}
 		},
 		{
-			"from": [3.9, 1.9, -2.1],
-			"to": [12.1, 10.1, 2],
+			"from": [3, 0.75, 6],
+			"to": [13, 9.25, 11],
+			"rotation": {"angle": 45, "axis": "x", "origin": [8, 5, 11]},
+			"faces": {
+				"east": {"uv": [3, 8, 8, 16], "texture": "#side"},
+				"south": {"uv": [3, 8, 13, 16], "texture": "#side"},
+				"west": {"uv": [3, 8, 8, 16], "texture": "#side"}
+			}
+		},
+		{
+			"from": [2.9, 1.9, -2.1],
+			"to": [13.1, 12.1, 8],
 			"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
 			"faces": {
-				"north": {"uv": [4, 12, 12, 4], "rotation": 180, "texture": "#bottom"},
-				"east": {"uv": [11, 12, 3, 16], "rotation": 270, "texture": "#side"},
-				"west": {"uv": [11, 12, 3, 16], "rotation": 90, "texture": "#side"},
-				"up": {"uv": [11, 12, 3, 16], "rotation": 180, "texture": "#side"},
-				"down": {"uv": [11, 12, 3, 16], "texture": "#side"}
+				"north": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#bottom"},
+				"east": {"uv": [3, 6, 13, 16], "rotation": 270, "texture": "#side"},
+				"south": {"uv": [3, 16, 13, 6], "rotation": 180, "texture": "#side"},
+				"west": {"uv": [13, 6, 3, 16], "rotation": 90, "texture": "#side"},
+				"up": {"uv": [13, 6, 3, 16], "rotation": 180, "texture": "#side"},
+				"down": {"uv": [13, 6, 3, 16], "texture": "#side"}
 			}
 		},
 		{

src/main/resources/assets/anvilcraft/models/block/royal_grindstone.json

@@ -12,22 +12,22 @@
 			"from": [12, 0, 6],
 			"to": [14, 7, 10],
 			"faces": {
-				"north": {"uv": [12, 0, 10, 7], "texture": "#pivot"},
+				"north": {"uv": [10, 0, 12, 7], "texture": "#pivot"},
 				"east": {"uv": [16, 7, 12, 0], "texture": "#pivot"},
-				"south": {"uv": [10, 0, 12, 7], "texture": "#pivot"},
+				"south": {"uv": [12, 0, 10, 7], "texture": "#pivot"},
 				"west": {"uv": [12, 0, 16, 7], "texture": "#pivot"},
-				"down": {"uv": [10, 0, 12, 4], "texture": "#pivot", "cullface": "down"}
+				"down": {"uv": [12, 0, 10, 4], "texture": "#pivot", "cullface": "down"}
 			}
 		},
 		{
 			"from": [2, 0, 6],
 			"to": [4, 7, 10],
 			"faces": {
-				"north": {"uv": [10, 0, 12, 7], "texture": "#pivot"},
+				"north": {"uv": [12, 0, 10, 7], "texture": "#pivot"},
 				"east": {"uv": [16, 7, 12, 0], "texture": "#pivot"},
-				"south": {"uv": [12, 0, 10, 7], "texture": "#pivot"},
+				"south": {"uv": [10, 0, 12, 7], "texture": "#pivot"},
 				"west": {"uv": [12, 0, 16, 7], "texture": "#pivot"},
-				"down": {"uv": [12, 0, 10, 4], "texture": "#pivot", "cullface": "down"}
+				"down": {"uv": [10, 0, 12, 4], "texture": "#pivot", "cullface": "down"}
 			}
 		},
 		{
@@ -36,16 +36,16 @@
 			"faces": {
 				"north": {"uv": [6, 0, 8, 6], "texture": "#pivot"},
 				"east": {"uv": [0, 0, 6, 6], "texture": "#pivot"},
-				"south": {"uv": [8, 0, 10, 6], "texture": "#pivot"},
-				"up": {"uv": [8, 0, 10, 6], "texture": "#pivot"},
-				"down": {"uv": [8, 0, 10, 6], "texture": "#pivot"}
+				"south": {"uv": [8, 0, 6, 6], "texture": "#pivot"},
+				"up": {"uv": [8, 0, 6, 6], "texture": "#pivot"},
+				"down": {"uv": [8, 0, 6, 6], "texture": "#pivot"}
 			}
 		},
 		{
 			"from": [2, 7, 5],
 			"to": [4, 13, 11],
 			"faces": {
-				"north": {"uv": [8, 0, 10, 6], "texture": "#pivot"},
+				"north": {"uv": [8, 0, 6, 6], "texture": "#pivot"},
 				"south": {"uv": [6, 0, 8, 6], "texture": "#pivot"},
 				"west": {"uv": [0, 0, 6, 6], "texture": "#pivot"},
 				"up": {"uv": [6, 0, 8, 6], "texture": "#pivot"},
@@ -77,14 +77,15 @@
 			}
 		},
 		{
-			"from": [7, 5, 3],
-			"to": [9, 15, 13],
+			"from": [7, 4.5, 2.5],
+			"to": [9, 15.5, 13.5],
 			"faces": {
-				"north": {"uv": [5, 1, 3, 11], "texture": "#round"},
-				"south": {"uv": [3, 1, 5, 11], "texture": "#round"},
-				"up": {"uv": [3, 1, 5, 11], "texture": "#round", "cullface": "up"},
-				"down": {"uv": [3, 1, 5, 11], "texture": "#round"}
+				"north": {"uv": [5, 0.5, 3, 11.5], "texture": "#round"},
+				"south": {"uv": [3, 0.5, 5, 11.5], "texture": "#round"},
+				"up": {"uv": [3, 0.5, 5, 11.5], "texture": "#round", "cullface": "up"},
+				"down": {"uv": [3, 0.5, 5, 11.5], "texture": "#round"}
 			}
 		}
-	]
+	],
+	"display": {}
 }

src/main/resources/assets/anvilcraft/models/item/royal_steel_pickaxe.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld",
   "textures": {
     "layer0": "anvilcraft:item/royal_steel_pickaxe"
   }