fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working on drive design.

Browse Source 
Several particle crash fixes.
This commit is contained in:
Sebastian Hartte
2020-06-15 22:20:29 +02:00
parent 2356a38898
commit d50dcc31fa
33 changed files with 748 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/models/block/drive/drive_base.json
+121
View File
@@ -0,0 +1,121 @@
{
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"4": "appliedenergistics2:block/drive/drive_inside",
"particle": "appliedenergistics2:block/drive/drive_side",
"side": "appliedenergistics2:block/drive/drive_side",
"bottom": "appliedenergistics2:block/drive/drive_bottom",
"top": "appliedenergistics2:block/drive/drive_top",
"front": "appliedenergistics2:block/drive/drive_front"
},
"elements": [
{
"name": "Right Side Panel",
"from": [0, 1, 0],
"to": [1.5, 15, 16],
"faces": {
"north": {"uv": [14, 1, 16, 15], "texture": "#front"},
"east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#4"},
"south": {"uv": [0, 1, 2, 15], "texture": "#side"},
"west": {"uv": [0, 1, 16, 15], "texture": "#side"}
}
},
{
"name": "Left Side Panel",
"from": [14.5, 1, 0],
"to": [16, 15, 16],
"faces": {
"north": {"uv": [0, 1, 2, 15], "texture": "#front"},
"east": {"uv": [0, 1, 16, 15], "texture": "#side"},
"south": {"uv": [14, 1, 16, 15], "texture": "#side"},
"west": {"uv": [0, 0, 16, 16], "texture": "#4"}
}
},
{
"name": "Back Panel",
"from": [1.5, 1, 6],
"to": [14.5, 15, 16],
"faces": {
"north": {"uv": [2, 1, 15, 15], "texture": "#4"},
"south": {"uv": [1.5, 1, 14.5, 15], "texture": "#side"}
}
},
{
"name": "Bottom Panel",
"from": [0, 0, 0],
"to": [16, 1, 16],
"faces": {
"north": {"uv": [0, 15, 16, 16], "texture": "#front"},
"east": {"uv": [0, 15, 16, 16], "texture": "#side"},
"south": {"uv": [0, 15, 16, 16], "texture": "#side"},
"west": {"uv": [0, 15, 16, 16], "texture": "#side"},
"up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#4"},
"down": {"uv": [0, 0, 16, 16], "texture": "#bottom"}
}
},
{
"name": "Top Panel",
"from": [0, 15, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 16, 1], "texture": "#front"},
"east": {"uv": [0, 0, 16, 1], "texture": "#side"},
"south": {"uv": [0, 0, 16, 1], "texture": "#side"},
"west": {"uv": [0, 0, 16, 1], "texture": "#side"},
"up": {"uv": [0, 0, 16, 16], "texture": "#top"},
"down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#4"}
}
},
{
"name": "Middle Strut",
"from": [7.5, 1, 0],
"to": [8.5, 15, 8],
"faces": {
"north": {"uv": [7, 1, 9, 15], "texture": "#front"},
"east": {"uv": [0, 0, 8, 14], "rotation": 180, "texture": "#4"},
"west": {"uv": [0, 1, 8, 15], "texture": "#4"}
}
},
{
"name": "Separator",
"from": [1.5, 3, 1],
"to": [14.5, 4, 8],
"faces": {
"north": {"uv": [1.5, 12, 14.5, 13], "texture": "#front"},
"up": {"uv": [2.5, 1, 13.5, 8], "texture": "#bottom"},
"down": {"uv": [2.5, 8, 13.5, 15], "texture": "#bottom"}
}
},
{
"name": "Separator",
"from": [1.5, 6, 1],
"to": [14.5, 7, 8],
"faces": {
"north": {"uv": [1.5, 9, 14.5, 10], "texture": "#front"},
"up": {"uv": [2.5, 1, 13.5, 8], "texture": "#bottom"},
"down": {"uv": [2.5, 8, 13.5, 15], "texture": "#bottom"}
}
},
{
"name": "Separator",
"from": [1.5, 9, 1],
"to": [14.5, 10, 8],
"faces": {
"north": {"uv": [1.5, 6, 14.5, 7], "texture": "#front"},
"up": {"uv": [2.5, 1, 13.5, 8], "texture": "#bottom"},
"down": {"uv": [2.5, 8, 13.5, 15], "texture": "#bottom"}
}
},
{
"name": "Separator",
"from": [1.5, 12, 1],
"to": [14.5, 13, 8],
"faces": {
"north": {"uv": [1.5, 3, 14.5, 4], "texture": "#front"},
"up": {"uv": [2.5, 1, 13.5, 8], "texture": "#bottom"},
"down": {"uv": [2.5, 8, 13.5, 15], "texture": "#bottom"}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_empty.json
+6
View File
@@ -0,0 +1,6 @@
{
"textures": {
},
"elements": [
]
}
src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_fluids.json
+49
View File
@@ -0,0 +1,49 @@
{
"textures": {
"front": "appliedenergistics2:block/drive/drive_cell_states"
},
"elements": [
{
"name": "Cell Backdrop",
"from": [
8.5,
13.0,
0.5
],
"to": [
14.5,
15.0,
2
],
"faces": {
"north": {
"texture": "#front",
"uv": [
0,
12,
5,
14
]
},
"up": {
"texture": "#front",
"uv": [
0,
12,
5,
14
]
},
"down": {
"texture": "#front",
"uv": [
0,
12,
5,
14
]
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_items.json
+49
View File
@@ -0,0 +1,49 @@
{
"textures": {
"front": "appliedenergistics2:block/drive/drive_cell_states"
},
"elements": [
{
"name": "Cell Backdrop",
"from": [
8.5,
13.0,
0.5
],
"to": [
14.5,
15.0,
2
],
"faces": {
"north": {
"texture": "#front",
"uv": [
0,
8,
5,
10
]
},
"up": {
"texture": "#front",
"uv": [
0,
8,
5,
10
]
},
"down": {
"texture": "#front",
"uv": [
0,
8,
5,
10
]
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_led_base.json
+88
View File
@@ -0,0 +1,88 @@
{
"loader": "appliedenergistics2:uvlightmap",
"textures": {
"front": "appliedenergistics2:block/drive/drive/cell_state_offline"
},
"elements": [
{
"name": "Cell Light",
"from": [
9.0,
13.0,
0.0
],
"to": [
14.0,
15.0,
1.0
],
"faces": {
"north": {
"texture": "#front",
"uv": [
0,
0,
16,
16
],
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"up": {
"texture": "#front",
"uv": [
0,
0,
16,
16
],
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"down": {
"texture": "#front",
"uv": [
0,
0,
16,
16
],
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"west": {
"texture": "#front",
"uv": [
0,
0,
16,
16
],
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
},
"east": {
"texture": "#front",
"uv": [
0,
0,
16,
16
],
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/drive_base.json
-172
View File
@@ -1,172 +0,0 @@
{
"parent": "block/block",
"textures": {
"particle": "appliedenergistics2:block/drive_side",
"side": "appliedenergistics2:block/drive_side",
"bottom": "appliedenergistics2:block/drive_bottom",
"top": "appliedenergistics2:block/drive_top",
"front": "appliedenergistics2:block/drive_front",
"inner": "appliedenergistics2:block/drive_bottom"
},
"elements": [
{
"name": "Right Side Panel",
"from": [
0.0,
1.0,
0.0
],
"to": [
2.0,
15.0,
16.0
],
"faces": {
"north": {
"texture": "#front"
},
"east": {
"texture": "#inner"
},
"south": {
"texture": "#side"
},
"west": {
"texture": "#side"
}
}
},
{
"name": "Left Side Panel",
"from": [
14.0,
1.0,
0.0
],
"to": [
16.0,
15.0,
16.0
],
"faces": {
"north": {
"texture": "#front"
},
"east": {
"texture": "#side"
},
"south": {
"texture": "#side"
},
"west": {
"texture": "#inner"
}
}
},
{
"name": "Back Panel",
"from": [
2.0,
1.0,
8.0
],
"to": [
14.0,
15.0,
16.0
],
"faces": {
"north": {
"texture": "#inner"
},
"south": {
"texture": "#side"
}
}
},
{
"name": "Bottom Panel",
"from": [
0.0,
0.0,
0.0
],
"to": [
16.0,
1.0,
16.0
],
"faces": {
"north": {
"texture": "#front"
},
"east": {
"texture": "#side"
},
"south": {
"texture": "#side"
},
"west": {
"texture": "#side"
},
"up": {
"texture": "#inner"
},
"down": {
"texture": "#bottom"
}
}
},
{
"name": "Top Panel",
"from": [
0.0,
15.0,
0.0
],
"to": [
16.0,
16.0,
16.0
],
"faces": {
"north": {
"texture": "#front"
},
"east": {
"texture": "#side"
},
"south": {
"texture": "#side"
},
"west": {
"texture": "#side"
},
"up": {
"texture": "#top"
},
"down": {
"texture": "#inner"
}
}
},
{
"name": "Front Panel",
"from": [
2.0,
1.0,
0.0
],
"to": [
14.0,
15.0,
8.0
],
"faces": {
"north": {
"texture": "#front"
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/drive_base_depth.json
-273
View File
@@ -1,273 +0,0 @@
{
"parent": "block/block",
"textures": {
"side": "appliedenergistics2:block/drive_side",
"bottom": "appliedenergistics2:block/drive_bottom",
"top": "appliedenergistics2:block/drive_top",
"front": "appliedenergistics2:block/drive_front",
"inner": "appliedenergistics2:block/drive_bottom"
},
"elements": [
{
"name": "Right Side Panel",
"from": [
0.0,
1.0,
0.0
],
"to": [
2.0,
15.0,
16.0
],
"faces": {
"north": {
"texture": "#front"
},
"east": {
"texture": "#inner"
},
"south": {
"texture": "#side"
},
"west": {
"texture": "#side"
}
}
},
{
"name": "Left Side Panel",
"from": [
14.0,
1.0,
0.0
],
"to": [
16.0,
15.0,
16.0
],
"faces": {
"north": {
"texture": "#front"
},
"east": {
"texture": "#side"
},
"south": {
"texture": "#side"
},
"west": {
"texture": "#inner"
}
}
},
{
"name": "Back Panel",
"from": [
2.0,
1.0,
8.0
],
"to": [
14.0,
15.0,
16.0
],
"faces": {
"north": {
"texture": "#inner"
},
"south": {
"texture": "#side"
}
}
},
{
"name": "Bottom Panel",
"from": [
0.0,
0.0,
0.0
],
"to": [
16.0,
1.0,
16.0
],
"faces": {
"north": {
"texture": "#front"
},
"east": {
"texture": "#side"
},
"south": {
"texture": "#side"
},
"west": {
"texture": "#side"
},
"up": {
"texture": "#inner"
},
"down": {
"texture": "#bottom"
}
}
},
{
"name": "Top Panel",
"from": [
0.0,
15.0,
0.0
],
"to": [
16.0,
16.0,
16.0
],
"faces": {
"north": {
"texture": "#front"
},
"east": {
"texture": "#side"
},
"south": {
"texture": "#side"
},
"west": {
"texture": "#side"
},
"up": {
"texture": "#top"
},
"down": {
"texture": "#inner"
}
}
},
{
"name": "Middle Strut",
"from": [
7.0,
1.0,
0.0
],
"to": [
9.0,
15.0,
8.0
],
"faces": {
"north": {
"texture": "#front"
},
"east": {
"texture": "#inner"
},
"west": {
"texture": "#inner"
}
}
},
{
"name": "Separator",
"from": [
2.0,
3.0,
1.0
],
"to": [
14.0,
4.0,
8.0
],
"faces": {
"north": {
"texture": "#front"
},
"up": {
"texture": "#inner"
},
"down": {
"texture": "#inner"
}
}
},
{
"name": "Separator",
"from": [
2.0,
6.0,
1.0
],
"to": [
14.0,
7.0,
8.0
],
"faces": {
"north": {
"texture": "#front"
},
"up": {
"texture": "#inner"
},
"down": {
"texture": "#inner"
}
}
},
{
"name": "Separator",
"from": [
2.0,
9.0,
1.0
],
"to": [
14.0,
10.0,
8.0
],
"faces": {
"north": {
"texture": "#front"
},
"up": {
"texture": "#inner"
},
"down": {
"texture": "#inner"
}
}
},
{
"name": "Separator",
"from": [
2.0,
12.0,
1.0
],
"to": [
14.0,
13.0,
8.0
],
"faces": {
"north": {
"texture": "#front"
},
"up": {
"texture": "#inner"
},
"down": {
"texture": "#inner"
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/drive_cell_empty.json
-32
View File
@@ -1,32 +0,0 @@
{
"loader": "appliedenergistics2:uvlightmap",
"textures": {
"front": "appliedenergistics2:block/drive_cell_states"
},
"elements": [
{
"name": "Cell Backdrop",
"from": [
9.0,
13.0,
0.0
],
"to": [
14.0,
15.0,
1.0
],
"faces": {
"north": {
"texture": "#front",
"uv": [
0,
10,
5,
12
]
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/drive_cell_full.json
-60
View File
@@ -1,60 +0,0 @@
{
"loader": "appliedenergistics2:uvlightmap",
"textures": {
"front": "appliedenergistics2:block/drive_cell_states"
},
"elements": [
{
"name": "Cell Backdrop",
"from": [
9.0,
13.0,
0.0
],
"to": [
14.0,
15.0,
1.0
],
"faces": {
"north": {
"texture": "#front",
"uv": [
0,
8,
5,
10
]
}
}
},
{
"name": "Cell Light",
"from": [
9.0,
13.0,
0.0
],
"to": [
14.0,
15.0,
1.0
],
"faces": {
"north": {
"texture": "#front",
"uv": [
0,
6,
5,
8
],
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/drive_cell_off.json
-31
View File
@@ -1,31 +0,0 @@
{
"textures": {
"front": "appliedenergistics2:block/drive_cell_states"
},
"elements": [
{
"name": "Cell",
"from": [
9.0,
13.0,
0.0
],
"to": [
14.0,
15.0,
1.0
],
"faces": {
"north": {
"texture": "#front",
"uv": [
0,
0,
5,
2
]
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/drive_cell_on.json
-60
View File
@@ -1,60 +0,0 @@
{
"loader": "appliedenergistics2:uvlightmap",
"textures": {
"front": "appliedenergistics2:block/drive_cell_states"
},
"elements": [
{
"name": "Cell Backdrop",
"from": [
9.0,
13.0,
0.0
],
"to": [
14.0,
15.0,
1.0
],
"faces": {
"north": {
"texture": "#front",
"uv": [
0,
8,
5,
10
]
}
}
},
{
"name": "Cell Light",
"from": [
9.0,
13.0,
0.0
],
"to": [
14.0,
15.0,
1.0
],
"faces": {
"north": {
"texture": "#front",
"uv": [
0,
2,
5,
4
],
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/drive_cell_types_full.json
-60
View File
@@ -1,60 +0,0 @@
{
"loader": "appliedenergistics2:uvlightmap",
"textures": {
"front": "appliedenergistics2:block/drive_cell_states"
},
"elements": [
{
"name": "Cell Backdrop",
"from": [
9.0,
13.0,
0.0
],
"to": [
14.0,
15.0,
1.0
],
"faces": {
"north": {
"texture": "#front",
"uv": [
0,
8,
5,
10
]
}
}
},
{
"name": "Cell Light",
"from": [
9.0,
13.0,
0.0
],
"to": [
14.0,
15.0,
1.0
],
"faces": {
"north": {
"texture": "#front",
"uv": [
0,
4,
5,
6
],
"uvlightmap": {
"sky": 0.007,
"block": 0.007
}
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/item/drive.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"parent": "appliedenergistics2:block/drive_base",
"parent": "appliedenergistics2:block/drive/drive_base",
"textures": {
"front": "appliedenergistics2:block/drive_front_flat"
"front": "appliedenergistics2:block/block/drive_front_flat"
}
}
src/main/resources/assets/appliedenergistics2/textures/block/drive_bottom.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 398 B

src/main/resources/assets/appliedenergistics2/textures/block/drive_cell_states.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 182 B

src/main/resources/assets/appliedenergistics2/textures/block/drive_front.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 442 B

src/main/resources/assets/appliedenergistics2/textures/block/drive_front_flat.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 274 B

src/main/resources/assets/appliedenergistics2/textures/block/drive_side.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 438 B

src/main/resources/assets/appliedenergistics2/textures/block/drive_top.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 398 B