Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
DBotThePony 2022-09-05 10:30:34 +07:00
commit ab2d4926ba
Signed by: DBot
GPG Key ID: DCC23B5715498507
4 changed files with 40 additions and 16 deletions

View File

@ -2,8 +2,8 @@
"parent": "block/cube_all",
"render_type": "translucent",
"textures": {
"0": "overdrive_that_matters:block/android_station",
"particle": "overdrive_that_matters:block/android_station"
"0": "overdrive_that_matters:block/android_station_offline",
"particle": "overdrive_that_matters:block/android_station_offline"
},
"elements": [
{

View File

@ -1,11 +1,10 @@
{
"parent": "block/block",
"texture_size": [32, 32],
"textures": {
"texture": "overdrive_that_matters:block/pattern_storage",
"particle": "overdrive_that_matters:block/pattern_storage"
},
"elements": [
"elements": [
{
"name": "base",
"from": [0, 0, 0],
@ -24,7 +23,7 @@
"from": [14, 2, 14],
"to": [16, 14, 16],
"faces": {
"north": {"uv": [1, 8, 7, 9], "rotation": 90, "texture": "#texture"},
"north": {"uv": [9, 8, 15, 9], "rotation": 90, "texture": "#texture"},
"east": {"uv": [0, 1, 1, 7], "texture": "#texture"},
"south": {"uv": [7, 1, 8, 7], "texture": "#texture"},
"west": {"uv": [1, 8, 7, 9], "rotation": 90, "texture": "#texture"},
@ -38,11 +37,11 @@
"to": [16, 16, 12],
"faces": {
"north": {"uv": [0, 9, 1, 9.5], "texture": "#texture"},
"east": {"uv": [0, 11.5, 6.5, 12], "rotation": 180, "texture": "#texture"},
"east": {"uv": [0, 11.5, 6, 12], "rotation": 180, "texture": "#texture"},
"south": {"uv": [0, 8.5, 1, 9], "texture": "#texture"},
"west": {"uv": [0, 11.5, 6.5, 12], "texture": "#texture"},
"up": {"uv": [0, 11.5, 6.5, 12.5], "rotation": 90, "texture": "#texture"},
"down": {"uv": [0, 11.5, 6.5, 12.5], "rotation": 270, "texture": "#texture"}
"west": {"uv": [0, 11.5, 6, 12.5], "texture": "#texture"},
"up": {"uv": [0, 11.5, 6, 12.5], "rotation": 90, "texture": "#texture"},
"down": {"uv": [0, 11.5, 6, 12.5], "rotation": 270, "texture": "#texture"}
}
},
{
@ -51,11 +50,11 @@
"to": [2, 16, 12],
"faces": {
"north": {"uv": [0, 9, 1, 9.5], "texture": "#texture"},
"east": {"uv": [0, 11.5, 6.5, 12], "rotation": 180, "texture": "#texture"},
"east": {"uv": [0, 11.5, 6, 12], "rotation": 180, "texture": "#texture"},
"south": {"uv": [0, 8.5, 1, 9], "texture": "#texture"},
"west": {"uv": [0, 11.5, 6.5, 12], "texture": "#texture"},
"up": {"uv": [0, 11.5, 6.5, 12.5], "rotation": 90, "texture": "#texture"},
"down": {"uv": [0, 11.5, 6.5, 12.5], "rotation": 270, "texture": "#texture"}
"west": {"uv": [0, 11.5, 6, 12], "texture": "#texture"},
"up": {"uv": [0, 11.5, 6, 12.5], "rotation": 90, "texture": "#texture"},
"down": {"uv": [0, 11.5, 6, 12.5], "rotation": 270, "texture": "#texture"}
}
},
{
@ -63,7 +62,7 @@
"from": [0, 2, 14],
"to": [2, 14, 16],
"faces": {
"north": {"uv": [1, 8, 7, 9], "rotation": 90, "texture": "#texture"},
"north": {"uv": [9, 8, 15, 9], "rotation": 90, "texture": "#texture"},
"east": {"uv": [1, 8, 7, 9], "rotation": 90, "texture": "#texture"},
"south": {"uv": [0, 1, 1, 7], "texture": "#texture"},
"west": {"uv": [7, 1, 8, 7], "texture": "#texture"},
@ -122,6 +121,31 @@
"up": {"uv": [0, 8, 8, 10], "texture": "#texture"},
"down": {"uv": [0, 8, 8, 10], "rotation": 180, "texture": "#texture"}
}
},
{
"name": "backpanel",
"from": [2, 2, 14.5],
"to": [14, 14, 15.5],
"faces": {
"north": {"uv": [1, 1, 7, 7], "texture": "#texture"},
"east": {"uv": [0, 0, 0.5, 6], "texture": "#missing"},
"south": {"uv": [1, 1, 7, 7], "texture": "#texture"},
"west": {"uv": [0, 0, 0.5, 6], "texture": "#missing"},
"up": {"uv": [0, 0, 6, 0.5], "texture": "#missing"},
"down": {"uv": [0, 0, 6, 0.5], "texture": "#missing"}
}
},
{
"from": [2, 15.2, 7],
"to": [14, 15.8, 12],
"faces": {
"north": {"uv": [1, 6.5, 7, 6.85], "texture": "#texture"},
"east": {"uv": [0, 0, 2.5, 0.35], "texture": "#missing"},
"south": {"uv": [0, 0, 6, 0.35], "texture": "#missing"},
"west": {"uv": [0, 0, 2.5, 0.35], "texture": "#missing"},
"up": {"uv": [1, 4.5, 7, 7], "rotation": 180, "texture": "#texture"},
"down": {"uv": [1, 4.5, 7, 7], "texture": "#texture"}
}
}
]
}

View File

@ -1,5 +1,5 @@
{
"loader": "forge:separate-perspective",
"loader": "forge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "minecraft:item/handheld",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 283 B

After

Width:  |  Height:  |  Size: 317 B