Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update textures and models-贴图模型修改 #1559

Merged
merged 1 commit into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,11 @@
"to": [14, 15, 14.5],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 12, 11.5]},
"faces": {
"north": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "north"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "east"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "south"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "up"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "up"},
"north": {"uv": [7, 0, 10, 6], "texture": "#3"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3"},
"down": {"uv": [7, 0, 10, 6], "texture": "#3"}
}
},
Expand All @@ -156,11 +156,11 @@
"to": [11, 15, 14.5],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 12, 11.5]},
"faces": {
"north": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "north"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "east"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "south"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "up"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "up"},
"north": {"uv": [7, 0, 10, 6], "texture": "#3"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3"},
"down": {"uv": [7, 0, 10, 6], "texture": "#3"}
}
},
Expand All @@ -169,11 +169,11 @@
"to": [8, 15, 14.5],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 12, 11.5]},
"faces": {
"north": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "north"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "east"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "south"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "up"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "up"},
"north": {"uv": [7, 0, 10, 6], "texture": "#3"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3"},
"down": {"uv": [7, 0, 10, 6], "texture": "#3"}
}
},
Expand All @@ -182,11 +182,11 @@
"to": [5, 15, 14.5],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 12, 11.5]},
"faces": {
"north": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "north"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "east"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "south"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "up"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "up"},
"north": {"uv": [7, 0, 10, 6], "texture": "#3"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3"},
"down": {"uv": [7, 0, 10, 6], "texture": "#3"}
}
},
Expand All @@ -195,11 +195,11 @@
"to": [5, 15, 7.5],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 12, 4.5]},
"faces": {
"north": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "north"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "east"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "south"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "up"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "up"},
"north": {"uv": [7, 0, 10, 6], "texture": "#3"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3"},
"down": {"uv": [7, 0, 10, 6], "texture": "#3"}
}
},
Expand All @@ -208,11 +208,11 @@
"to": [8, 15, 7.5],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 12, 4.5]},
"faces": {
"north": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "north"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "east"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "south"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "up"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "up"},
"north": {"uv": [7, 0, 10, 6], "texture": "#3"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3"},
"down": {"uv": [7, 0, 10, 6], "texture": "#3"}
}
},
Expand All @@ -221,11 +221,11 @@
"to": [11, 15, 7.5],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 12, 4.5]},
"faces": {
"north": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "north"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "east"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "south"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "up"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "up"},
"north": {"uv": [7, 0, 10, 6], "texture": "#3"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3"},
"down": {"uv": [7, 0, 10, 6], "texture": "#3"}
}
},
Expand All @@ -234,11 +234,11 @@
"to": [14, 15, 7.5],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 12, 4.5]},
"faces": {
"north": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "north"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "east"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "south"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3", "cullface": "up"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3", "cullface": "up"},
"north": {"uv": [7, 0, 10, 6], "texture": "#3"},
"east": {"uv": [0, 0, 6, 6], "texture": "#3"},
"south": {"uv": [7, 0, 10, 6], "texture": "#3"},
"west": {"uv": [0, 0, 6, 6], "texture": "#3"},
"up": {"uv": [7, 0, 10, 6], "texture": "#3"},
"down": {"uv": [7, 0, 10, 6], "texture": "#3"}
}
}
Expand Down
66 changes: 34 additions & 32 deletions src/main/resources/assets/anvilcraft/models/block/heater.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,43 @@
"layer": "anvilcraft:block/heater_top_layer"
},
"elements": [
{
"from": [0.9, 13, 0.9],
"to": [15.1, 15, 15.1],
"faces": {
"north": {"uv": [1, 1, 15, 3], "texture": "#side"},
"east": {"uv": [1, 1, 15, 3], "texture": "#side"},
"south": {"uv": [1, 1, 15, 3], "texture": "#side"},
"west": {"uv": [1, 1, 15, 3], "texture": "#side"},
"up": {"uv": [1, 1, 15, 15], "texture": "#layer"}
}
},
{
"name": "cube inverted",
"from": [15.1, 15, 15.1],
"to": [0.9, 13, 0.9],
"faces": {
"north": {"uv": [1, 3, 15, 1], "texture": "#side"},
"east": {"uv": [1, 3, 15, 1], "texture": "#side"},
"south": {"uv": [1, 3, 15, 1], "texture": "#side"},
"west": {"uv": [1, 3, 15, 1], "texture": "#side"},
"down": {"uv": [15, 1, 1, 15], "texture": "#layer"}
}
},
{
"from": [1, 12.8, 1],
"to": [15, 14.8, 15],
"faces": {
"north": {"uv": [1, 14, 15, 16], "texture": "#top"},
"east": {"uv": [15, 14, 1, 16], "texture": "#top"},
"south": {"uv": [1, 14, 15, 16], "texture": "#top"},
"west": {"uv": [15, 14, 1, 16], "texture": "#top"},
"up": {"uv": [1, 1, 15, 15], "texture": "#top"}
}
},
{
"from": [1, 0, 1],
"to": [15, 2, 15],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [1, 14, 15, 16], "texture": "#side"},
"east": {"uv": [1, 14, 15, 16], "texture": "#side"},
Expand All @@ -26,7 +59,6 @@
{
"from": [0, 2, 0],
"to": [16, 10, 16],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 6, 16, 14], "texture": "#side", "cullface": "north"},
"east": {"uv": [0, 6, 16, 14], "texture": "#side", "cullface": "east"},
Expand All @@ -39,7 +71,6 @@
{
"from": [0, 11, 0],
"to": [16, 13, 16],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 3, 16, 5], "texture": "#side", "cullface": "north"},
"east": {"uv": [0, 3, 16, 5], "texture": "#side", "cullface": "east"},
Expand All @@ -49,22 +80,9 @@
"down": {"uv": [0, 0, 16, 16], "texture": "#bottom"}
}
},
{
"from": [1, 13, 1],
"to": [15, 15, 15],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [1, 1, 15, 3], "texture": "#side"},
"east": {"uv": [1, 1, 15, 3], "texture": "#side"},
"south": {"uv": [1, 1, 15, 3], "texture": "#side"},
"west": {"uv": [1, 1, 15, 3], "texture": "#side"},
"up": {"uv": [1, 1, 15, 15], "texture": "#layer"}
}
},
{
"from": [14, 13, 0],
"to": [16, 16, 4],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 0, 2, 3], "texture": "#side", "cullface": "north"},
"east": {"uv": [12, 0, 16, 3], "texture": "#side", "cullface": "east"},
Expand All @@ -76,7 +94,6 @@
{
"from": [12, 13, 0],
"to": [14, 16, 2],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [2, 0, 4, 3], "texture": "#side", "cullface": "north"},
"south": {"uv": [12, 0, 14, 3], "texture": "#side"},
Expand All @@ -87,7 +104,6 @@
{
"from": [0, 13, 0],
"to": [4, 16, 2],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [12, 0, 16, 3], "texture": "#side", "cullface": "north"},
"east": {"uv": [14, 0, 16, 3], "texture": "#side"},
Expand All @@ -99,7 +115,6 @@
{
"from": [0, 13, 2],
"to": [2, 16, 4],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]},
"faces": {
"east": {"uv": [12, 0, 14, 3], "texture": "#side"},
"south": {"uv": [0, 0, 2, 3], "texture": "#side"},
Expand All @@ -110,7 +125,6 @@
{
"from": [0, 13, 12],
"to": [2, 16, 16],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [14, 0, 16, 3], "texture": "#side"},
"east": {"uv": [0, 0, 4, 3], "texture": "#side"},
Expand All @@ -122,7 +136,6 @@
{
"from": [2, 13, 14],
"to": [4, 16, 16],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [12, 0, 14, 3], "texture": "#side"},
"east": {"uv": [0, 0, 2, 3], "texture": "#side"},
Expand All @@ -133,7 +146,6 @@
{
"from": [12, 13, 14],
"to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 0, 4, 3], "texture": "#side"},
"east": {"uv": [0, 0, 2, 3], "texture": "#side", "cullface": "east"},
Expand All @@ -145,26 +157,16 @@
{
"from": [14, 13, 12],
"to": [16, 16, 14],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 0, 2, 3], "texture": "#side"},
"east": {"uv": [2, 0, 4, 3], "texture": "#side", "cullface": "east"},
"west": {"uv": [12, 0, 14, 3], "texture": "#side"},
"up": {"uv": [14, 12, 16, 14], "texture": "#top", "cullface": "up"}
}
},
{
"from": [1, 14.8, 1],
"to": [15, 14.8, 15],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]},
"faces": {
"up": {"uv": [1, 1, 15, 15], "texture": "#top"}
}
},
{
"from": [1, 10, 1],
"to": [15, 11, 15],
"rotation": {"angle": 0, "axis": "z", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [1, 5, 15, 6], "texture": "#side"},
"east": {"uv": [1, 5, 15, 6], "texture": "#side"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,44 @@
}
},
{
"from": [2, 10, 2],
"from": [12, 10, 0],
"to": [14, 12, 14],
"faces": {
"up": {"uv": [2, 2, 14, 14], "texture": "#0", "cullface": "up"},
"down": {"uv": [2, 2, 14, 14], "texture": "#1"}
"north": {"uv": [2, 4, 4, 6], "texture": "#2"},
"west": {"uv": [0, 4, 14, 6], "texture": "#1"},
"up": {"uv": [12, 0, 14, 14], "texture": "#0", "cullface": "up"},
"down": {"uv": [12, 2, 14, 16], "texture": "#1"}
}
},
{
"from": [4, 10, 7],
"to": [12, 12, 14],
"faces": {
"north": {"uv": [4, 4, 12, 6], "texture": "#1"},
"up": {"uv": [4, 7, 12, 14], "texture": "#0", "cullface": "up"},
"down": {"uv": [4, 2, 12, 9], "texture": "#1"}
}
},
{
"from": [4, 10, 0],
"to": [12, 12, 7],
"rotation": {"angle": -22.5, "axis": "x", "origin": [4, 12, 7]},
"faces": {
"north": {"uv": [4, 0, 12, 2], "texture": "#2"},
"east": {"uv": [9, 4, 16, 6], "texture": "#2"},
"west": {"uv": [0, 4, 7, 6], "texture": "#2"},
"up": {"uv": [4, 0, 12, 7], "texture": "#0", "cullface": "up"},
"down": {"uv": [4, 9, 12, 16], "texture": "#1"}
}
},
{
"from": [2, 10, 0],
"to": [4, 12, 14],
"faces": {
"north": {"uv": [12, 4, 14, 6], "texture": "#2"},
"east": {"uv": [2, 4, 16, 6], "texture": "#1"},
"up": {"uv": [2, 0, 4, 14], "texture": "#0", "cullface": "up"},
"down": {"uv": [2, 2, 4, 16], "texture": "#1"}
}
},
{
Expand All @@ -42,11 +75,11 @@
}
},
{
"from": [2, 10, 0],
"from": [2, 12, 0],
"to": [14, 16, 2],
"faces": {
"north": {"uv": [2, 0, 14, 6], "texture": "#2", "cullface": "north"},
"south": {"uv": [2, 0, 14, 6], "texture": "#2", "cullface": "up"},
"north": {"uv": [2, 0, 14, 4], "texture": "#2", "cullface": "north"},
"south": {"uv": [2, 0, 14, 4], "texture": "#2", "cullface": "up"},
"up": {"uv": [2, 0, 14, 2], "texture": "#0", "cullface": "up"},
"down": {"uv": [2, 14, 14, 16], "texture": "#1"}
}
Expand Down
Loading