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

Add disk manipulator model. Still needs to be more generic.

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-10-29 14:44:52 +02:00
parent e2d3047ddb
commit c2524c5689
23 changed files with 574 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/resources/assets/refinedstorage/blockstates/disk_manipulator.json
View File

@@ -1,47 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "orientable",
"textures": {
"side": "refinedstorage:blocks/side",
"top": "refinedstorage:blocks/side",
"front": "refinedstorage:blocks/disk_manipulator_disconnected"
}
},
"variants": {
"inventory": [
{
"y": 0
}
],
"connected": {
"true": {
"textures": {
"front": "refinedstorage:blocks/disk_manipulator_connected"
}
},
"false": {
}
},
"direction": {
"north": {
"y": 0
},
"east": {
"y": 90
},
"south": {
"y": 180
},
"west": {
"y": 270
},
"up": {
"x": 270
},
"down": {
"x": 90
}
}
}
}

48
src/main/resources/assets/refinedstorage/models/block/disk_drive_disk_full.json → src/main/resources/assets/refinedstorage/models/block/disk.json
View File

@@ -1,24 +1,24 @@
{
"__comment": "Model made by CyanideX",
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
"disk": "refinedstorage:blocks/disk_drive_disk_full"
},
"0": "refinedstorage:blocks/disk"
},
"elements": [
{
"name": "disk",
"from": [
9.0,
12.0,
11.0,
14.0,
-1.0
],
"to": [
14.0,
14.0,
16.0,
16.0,
0.0
],
"faces": {
"north": {
"texture": "#disk",
"texture": "#0",
"uv": [
3.0,
0.0,
@@ -27,7 +27,7 @@
]
},
"east": {
"texture": "#disk",
"texture": "#0",
"uv": [
2.0,
0.0,
@@ -36,7 +36,7 @@
]
},
"south": {
"texture": "#disk",
"texture": "#0",
"uv": [
9.0,
0.0,
@@ -45,7 +45,7 @@
]
},
"west": {
"texture": "#disk",
"texture": "#0",
"uv": [
8.0,
0.0,
@@ -54,7 +54,7 @@
]
},
"up": {
"texture": "#disk",
"texture": "#0",
"uv": [
3.0,
2.0,
@@ -63,7 +63,7 @@
]
},
"down": {
"texture": "#disk",
"texture": "#0",
"uv": [
3.0,
3.0,
@@ -72,22 +72,22 @@
]
}
}
},
},
{
"name": "led",
"from": [
10.0,
11.95,
12.0,
13.95,
-1.05
],
"to": [
11.0,
13.0,
15.0,
-0.10000000000000009
],
"faces": {
"north": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -96,7 +96,7 @@
]
},
"east": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -105,7 +105,7 @@
]
},
"south": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -114,7 +114,7 @@
]
},
"west": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -123,7 +123,7 @@
]
},
"up": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -132,7 +132,7 @@
]
},
"down": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -141,6 +141,6 @@
]
}
}
}
}
]
}

42
src/main/resources/assets/refinedstorage/models/block/disk_drive_disk_disconnected.json → src/main/resources/assets/refinedstorage/models/block/disk_disconnected.json
View File

@@ -1,24 +1,24 @@
{
"__comment": "Model made by CyanideX",
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
"disk": "refinedstorage:blocks/disk_drive_disk_disconnected"
"0": "refinedstorage:blocks/disk_disconnected"
},
"elements": [
{
"name": "disk",
"from": [
9.0,
12.0,
11.0,
14.0,
-1.0
],
"to": [
14.0,
14.0,
16.0,
16.0,
0.0
],
"faces": {
"north": {
"texture": "#disk",
"texture": "#0",
"uv": [
3.0,
0.0,
@@ -27,7 +27,7 @@
]
},
"east": {
"texture": "#disk",
"texture": "#0",
"uv": [
2.0,
0.0,
@@ -36,7 +36,7 @@
]
},
"south": {
"texture": "#disk",
"texture": "#0",
"uv": [
9.0,
0.0,
@@ -45,7 +45,7 @@
]
},
"west": {
"texture": "#disk",
"texture": "#0",
"uv": [
8.0,
0.0,
@@ -54,7 +54,7 @@
]
},
"up": {
"texture": "#disk",
"texture": "#0",
"uv": [
3.0,
2.0,
@@ -63,7 +63,7 @@
]
},
"down": {
"texture": "#disk",
"texture": "#0",
"uv": [
3.0,
3.0,
@@ -76,18 +76,18 @@
{
"name": "led",
"from": [
10.0,
11.95,
12.0,
13.95,
-1.05
],
"to": [
11.0,
13.0,
15.0,
-0.10000000000000009
],
"faces": {
"north": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -96,7 +96,7 @@
]
},
"east": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -105,7 +105,7 @@
]
},
"south": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -114,7 +114,7 @@
]
},
"west": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -123,7 +123,7 @@
]
},
"up": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -132,7 +132,7 @@
]
},
"down": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,

42
src/main/resources/assets/refinedstorage/models/block/disk_drive_disk.json → src/main/resources/assets/refinedstorage/models/block/disk_full.json
View File

@@ -1,24 +1,24 @@
{
"__comment": "Model made by CyanideX",
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
"disk": "refinedstorage:blocks/disk_drive_disk"
"0": "refinedstorage:blocks/disk_full"
},
"elements": [
{
"name": "disk",
"from": [
9.0,
12.0,
11.0,
14.0,
-1.0
],
"to": [
14.0,
14.0,
16.0,
16.0,
0.0
],
"faces": {
"north": {
"texture": "#disk",
"texture": "#0",
"uv": [
3.0,
0.0,
@@ -27,7 +27,7 @@
]
},
"east": {
"texture": "#disk",
"texture": "#0",
"uv": [
2.0,
0.0,
@@ -36,7 +36,7 @@
]
},
"south": {
"texture": "#disk",
"texture": "#0",
"uv": [
9.0,
0.0,
@@ -45,7 +45,7 @@
]
},
"west": {
"texture": "#disk",
"texture": "#0",
"uv": [
8.0,
0.0,
@@ -54,7 +54,7 @@
]
},
"up": {
"texture": "#disk",
"texture": "#0",
"uv": [
3.0,
2.0,
@@ -63,7 +63,7 @@
]
},
"down": {
"texture": "#disk",
"texture": "#0",
"uv": [
3.0,
3.0,
@@ -76,18 +76,18 @@
{
"name": "led",
"from": [
10.0,
11.95,
12.0,
13.95,
-1.05
],
"to": [
11.0,
13.0,
15.0,
-0.10000000000000009
],
"faces": {
"north": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -96,7 +96,7 @@
]
},
"east": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -105,7 +105,7 @@
]
},
"south": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -114,7 +114,7 @@
]
},
"west": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -123,7 +123,7 @@
]
},
"up": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,
@@ -132,7 +132,7 @@
]
},
"down": {
"texture": "#disk",
"texture": "#0",
"uv": [
14.0,
1.0,

50
src/main/resources/assets/refinedstorage/models/block/disk_manipulator_connected.json Executable file
View File

@@ -0,0 +1,50 @@
{
"parent": "block/block",
"textures": {
"particle": "refinedstorage:blocks/disk_manipulator_connected",
"front": "refinedstorage:blocks/disk_manipulator_connected",
"bottom": "refinedstorage:blocks/side",
"top": "refinedstorage:blocks/side",
"side": "refinedstorage:blocks/side"
},
"elements": [
{
"from": [
0,
0,
0
],
"to": [
16,
16,
16
],
"faces": {
"down": {
"texture": "#bottom",
"cullface": "down"
},
"up": {
"texture": "#top",
"cullface": "up"
},
"north": {
"texture": "#front",
"cullface": "north"
},
"south": {
"texture": "#side",
"cullface": "south"
},
"west": {
"texture": "#side",
"cullface": "west"
},
"east": {
"texture": "#side",
"cullface": "east"
}
}
}
]
}

50
src/main/resources/assets/refinedstorage/models/block/disk_manipulator_disconnected.json Executable file
View File

@@ -0,0 +1,50 @@
{
"parent": "block/block",
"textures": {
"particle": "refinedstorage:blocks/disk_manipulator_disconnected",
"front": "refinedstorage:blocks/disk_manipulator_disconnected",
"bottom": "refinedstorage:blocks/side",
"top": "refinedstorage:blocks/side",
"side": "refinedstorage:blocks/side"
},
"elements": [
{
"from": [
0,
0,
0
],
"to": [
16,
16,
16
],
"faces": {
"down": {
"texture": "#bottom",
"cullface": "down"
},
"up": {
"texture": "#top",
"cullface": "up"
},
"north": {
"texture": "#front",
"cullface": "north"
},
"south": {
"texture": "#side",
"cullface": "south"
},
"west": {
"texture": "#side",
"cullface": "west"
},
"east": {
"texture": "#side",
"cullface": "east"
}
}
}
]
}

0
src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_disk.png → src/main/resources/assets/refinedstorage/textures/blocks/disk.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_disk_disconnected.png → src/main/resources/assets/refinedstorage/textures/blocks/disk_disconnected.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_disk_full.png → src/main/resources/assets/refinedstorage/textures/blocks/disk_full.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 560 B

BIN
src/main/resources/assets/refinedstorage/textures/gui/disk_manipulator.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB