dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dynamic portable grid model

Browse Source
This commit is contained in:
raoulvdberge
2017-06-12 23:38:06 +02:00
parent 3bc96f50f6
commit 4f3566ba19
23 changed files with 671 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/main/resources/assets/refinedstorage/blockstates/portable_grid.json
View File

@@ -3,16 +3,16 @@
"defaults": {
"model": "refinedstorage:portable_grid",
"textures": {
"texture0": "refinedstorage:blocks/portable_grid_0",
"texture1": "refinedstorage:blocks/portable_grid_1",
"texture2": "refinedstorage:blocks/portable_grid_2",
"texture3": "refinedstorage:blocks/portable_grid_3",
"texture4": "refinedstorage:blocks/portable_grid_4",
"texture5": "refinedstorage:blocks/portable_grid_5",
"texture6": "refinedstorage:blocks/portable_grid_6",
"texture7": "refinedstorage:blocks/portable_grid_7",
"particle": "refinedstorage:blocks/portable_grid_0"
"particle": "refinedstorage:blocks/portable_grid_1",
"texture0": "refinedstorage:blocks/portable_grid_1",
"texture2": "refinedstorage:blocks/portable_grid_3",
"texture3": "refinedstorage:blocks/portable_grid_4",
"texture4": "refinedstorage:blocks/portable_grid_5",
"texture5": "refinedstorage:blocks/portable_grid_6",
"texture6": "refinedstorage:blocks/portable_grid_7",
"texture7": "refinedstorage:blocks/portable_grid_8"
},
"transform": "forge:default-block",
"uvlock": false
},
"variants": {
@@ -21,6 +21,50 @@
"transform": "forge:default-block"
}
],
"disk_state": {
"normal": {
"textures": {
"disk0": "refinedstorage:blocks/portable_grid_disk",
"disk1": "refinedstorage:blocks/portable_grid_disk"
},
"submodel": "refinedstorage:portable_grid_disk"
},
"near_capacity": {
"textures": {
"disk0": "refinedstorage:blocks/portable_grid_disk_near_capacity",
"disk1": "refinedstorage:blocks/portable_grid_disk_near_capacity"
},
"submodel": "refinedstorage:portable_grid_disk"
},
"full": {
"textures": {
"disk0": "refinedstorage:blocks/portable_grid_disk_full",
"disk1": "refinedstorage:blocks/portable_grid_disk_full"
},
"submodel": "refinedstorage:portable_grid_disk"
},
"disconnected": {
"textures": {
"disk0": "refinedstorage:blocks/portable_grid_disk_disconnected",
"disk1": "refinedstorage:blocks/portable_grid_disk_disconnected"
},
"submodel": "refinedstorage:portable_grid_disk"
},
"none": {
}
},
"connected": {
"true": {
"textures": {
"texture1": "refinedstorage:blocks/portable_grid_2"
}
},
"false": {
"textures": {
"texture1": "refinedstorage:blocks/portable_grid_2_disconnected"
}
}
},
"direction": {
"north": {
"y": 0

630
src/main/resources/assets/refinedstorage/models/block/portable_grid.json
View File

@@ -1,54 +1,20 @@
{
"elements": [
{
"name": "cube",
"from": [
0.0,
6.0,
9.0
0,
6,
5
],
"to": [
16.0,
13.0,
11.0
16,
13,
7
],
"rotation": {
"origin": [
8.0,
6.0,
9.0
],
"axis": "x",
"angle": -22.5
},
"shade": true,
"faces": {
"down": {
"uv": [
0,
14,
16,
16
],
"texture": "#texture1"
},
"up": {
"uv": [
0,
14,
16,
16
],
"texture": "#texture0"
},
"north": {
"uv": [
0,
0,
16,
7
],
"texture": "#texture0"
},
"south": {
"uv": [
0,
7,
@@ -57,16 +23,25 @@
],
"texture": "#texture0"
},
"east": {
"uv": [
0,
7,
2,
14
],
"texture": "#texture1"
},
"south": {
"uv": [
0,
0,
16,
7
],
"texture": "#texture0"
},
"west": {
"uv": [
0,
7,
2,
14
],
"texture": "#texture1"
},
"east": {
"uv": [
0,
0,
@@ -74,97 +49,87 @@
7
],
"texture": "#texture1"
}
}
},
{
"from": [
16.0,
2.0,
2.0
],
"to": [
17.0,
4.0,
7.0
],
"faces": {
"down": {
"uv": [
3,
8,
4,
13
],
"texture": "#texture1"
},
"up": {
"uv": [
2,
8,
3,
13
],
"texture": "#texture1"
},
"north": {
"uv": [
2,
0,
3,
0,
16,
2
],
"texture": "#texture1"
"texture": "#texture0",
"rotation": 180
},
"south": {
"down": {
"uv": [
0,
13,
16,
15
],
"texture": "#texture1",
"rotation": 180
}
},
"rotation": {
"origin": [
8,
6,
7
],
"axis": "x",
"angle": 22.5
}
},
{
"name": "cube",
"from": [
0,
4,
7
],
"to": [
16,
6,
16
],
"shade": true,
"faces": {
"north": {
"uv": [
0,
14,
16,
16
],
"texture": "#texture0"
},
"east": {
"uv": [
2,
2,
3,
2,
12,
4
],
"texture": "#texture1"
},
"west": {
"uv": [
2,
6,
7,
8
],
"texture": "#texture1"
},
"east": {
"uv": [
2,
4,
7,
6
],
"texture": "#texture1"
}
}
},
{
"from": [
0.0,
4.0,
0.0
],
"to": [
16.0,
6.0,
9.0
],
"faces": {
"down": {
"south": {
"uv": [
0,
0,
16,
9
2
],
"texture": "#texture3"
"texture": "#texture2"
},
"west": {
"uv": [
3,
0,
12,
2
],
"texture": "#texture1"
},
"up": {
"uv": [
@@ -173,86 +138,36 @@
16,
11
],
"texture": "#texture2"
"texture": "#texture2",
"rotation": 180
},
"north": {
"uv": [
0,
0,
16,
2
],
"texture": "#texture2"
},
"south": {
"uv": [
0,
14,
16,
16
],
"texture": "#texture0"
},
"west": {
"uv": [
3,
2,
12,
4
],
"texture": "#texture1"
},
"east": {
"uv": [
3,
0,
12,
2
],
"texture": "#texture1"
}
}
},
{
"from": [
0.0,
0.0,
0.0
],
"to": [
16.0,
4.0,
16.0
],
"faces": {
"down": {
"uv": [
0,
0,
16,
16
9
],
"texture": "#texture6"
},
"up": {
"uv": [
0,
0,
16,
16
],
"texture": "#texture5"
},
"texture": "#texture3",
"rotation": 180
}
}
},
{
"name": "cube",
"from": [
0,
0,
0
],
"to": [
16,
4,
16
],
"shade": true,
"faces": {
"north": {
"uv": [
0,
11,
16,
15
],
"texture": "#texture2"
},
"south": {
"uv": [
0,
9,
@@ -261,7 +176,7 @@
],
"texture": "#texture3"
},
"west": {
"east": {
"uv": [
0,
4,
@@ -270,7 +185,16 @@
],
"texture": "#texture4"
},
"east": {
"south": {
"uv": [
0,
11,
16,
15
],
"texture": "#texture2"
},
"west": {
"uv": [
0,
0,
@@ -278,49 +202,44 @@
4
],
"texture": "#texture4"
}
}
},
{
"from": [
1.0,
4.0,
9.0
],
"to": [
15.0,
5.0,
15.0
],
"faces": {
"down": {
"uv": [
0,
0,
14,
6
],
"texture": "#texture7"
},
"up": {
"uv": [
0,
8,
14,
14
],
"texture": "#texture4"
},
"north": {
"uv": [
2,
13,
0,
16,
14
16
],
"texture": "#texture1"
"texture": "#texture5",
"rotation": 180
},
"south": {
"down": {
"uv": [
0,
0,
16,
16
],
"texture": "#texture6",
"rotation": 180
}
}
},
{
"name": "cube",
"from": [
1,
4,
1
],
"to": [
15,
5,
7
],
"shade": true,
"faces": {
"north": {
"uv": [
0,
15,
@@ -329,7 +248,7 @@
],
"texture": "#texture2"
},
"west": {
"east": {
"uv": [
4,
9,
@@ -338,7 +257,16 @@
],
"texture": "#texture1"
},
"east": {
"south": {
"uv": [
2,
13,
16,
14
],
"texture": "#texture1"
},
"west": {
"uv": [
4,
8,
@@ -346,21 +274,89 @@
9
],
"texture": "#texture1"
},
"up": {
"uv": [
0,
8,
14,
14
],
"texture": "#texture4",
"rotation": 180
},
"down": {
"uv": [
0,
0,
14,
6
],
"texture": "#texture7",
"rotation": 180
}
}
},
{
"name": "cube",
"from": [
12.0,
3,
4.5,
8.0
6
],
"to": [
13.0,
4,
6.5,
10.0
8
],
"shade": true,
"faces": {
"north": {
"uv": [
5,
10,
6,
12
],
"texture": "#texture1"
},
"east": {
"uv": [
7,
4,
9,
6
],
"texture": "#texture1"
},
"south": {
"uv": [
4,
10,
5,
12
],
"texture": "#texture1"
},
"west": {
"uv": [
6,
10,
8,
12
],
"texture": "#texture1"
},
"up": {
"uv": [
7,
6,
8,
8
],
"texture": "#texture1",
"rotation": 180
},
"down": {
"uv": [
8,
@@ -368,6 +364,59 @@
9,
8
],
"texture": "#texture1",
"rotation": 180
}
}
},
{
"name": "cube",
"from": [
12,
4.5,
6
],
"to": [
13,
6.5,
8
],
"shade": true,
"faces": {
"north": {
"uv": [
9,
4,
10,
6
],
"texture": "#texture1"
},
"east": {
"uv": [
9,
10,
11,
12
],
"texture": "#texture1"
},
"south": {
"uv": [
8,
10,
9,
12
],
"texture": "#texture1"
},
"west": {
"uv": [
9,
6,
11,
8
],
"texture": "#texture1"
},
"up": {
@@ -377,58 +426,9 @@
8,
8
],
"texture": "#texture1"
"texture": "#texture1",
"rotation": 180
},
"north": {
"uv": [
4,
10,
5,
12
],
"texture": "#texture1"
},
"south": {
"uv": [
5,
10,
6,
12
],
"texture": "#texture1"
},
"west": {
"uv": [
7,
4,
9,
6
],
"texture": "#texture1"
},
"east": {
"uv": [
6,
10,
8,
12
],
"texture": "#texture1"
}
}
},
{
"from": [
3.0,
4.5,
8.0
],
"to": [
4.0,
6.5,
10.0
],
"faces": {
"down": {
"uv": [
8,
@@ -436,52 +436,8 @@
9,
8
],
"texture": "#texture1"
},
"up": {
"uv": [
7,
6,
8,
8
],
"texture": "#texture1"
},
"north": {
"uv": [
8,
10,
9,
12
],
"texture": "#texture1"
},
"south": {
"uv": [
9,
4,
10,
6
],
"texture": "#texture1"
},
"west": {
"uv": [
9,
10,
11,
12
],
"texture": "#texture1"
},
"east": {
"uv": [
9,
6,
11,
8
],
"texture": "#texture1"
"texture": "#texture1",
"rotation": 180
}
}
}

110
src/main/resources/assets/refinedstorage/models/block/portable_grid_disk.json Normal file
View File

@@ -0,0 +1,110 @@
{
"elements": [
{
"name": "disk",
"from": [
-1,
2,
9
],
"to": [
0,
4,
14
],
"shade": true,
"faces": {
"north": {
"uv": [
5,
5,
6,
7
],
"texture": "#disk1"
},
"east": {
"uv": [
0,
5,
5,
7
],
"texture": "#disk1"
},
"south": {
"uv": [
11,
5,
12,
7
],
"texture": "#disk1"
},
"west": {
"uv": [
6,
5,
11,
7
],
"texture": "#disk1"
},
"up": {
"uv": [
5,
0,
6,
5
],
"texture": "#disk1",
"rotation": 180
},
"down": {
"uv": [
6,
0,
7,
5
],
"texture": "#disk1",
"rotation": 180
}
}
},
{
"name": "disk_led",
"from": [
-1.05,
2,
12
],
"to": [
-0.050000000000000044,
3,
13
],
"shade": true,
"faces": {
"east": {
"uv": [
2,
1,
3,
2
],
"texture": "#disk1"
},
"west": {
"uv": [
2,
1,
3,
2
],
"texture": "#disk0"
}
}
}
]
}

BIN
src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 439 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 462 B

After

Width:  |  Height:  |  Size: 439 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 616 B

After

Width:  |  Height:  |  Size: 462 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_2_disconnected.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 557 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 324 B

After

Width:  |  Height:  |  Size: 616 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 485 B

After

Width:  |  Height:  |  Size: 324 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 485 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_6.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 522 B

After

Width:  |  Height:  |  Size: 220 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_7.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 150 B

After

Width:  |  Height:  |  Size: 522 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_8.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 150 B

BIN
src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_disconnected.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_full.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/main/resources/assets/refinedstorage/textures/blocks/portable_grid_disk_near_capacity.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB