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

Fixes #2432: New model for wireless access point which includes status indicators, correct model rotation, and lit/unlit torch variants.

Browse Source
This commit is contained in:
Sebastian Hartte
2016-10-09 19:43:01 +02:00
parent 6369cef465
commit 3f6607028d
14 changed files with 424 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/blockstates/wireless_access_point.json
+36 -3
View File
@@ -1,8 +1,41 @@
{
"forge_marker": 1,
"defaults": {
"model": "appliedenergistics2:wireless_access_point_chassis",
"y": 180
},
"variants": {
"normal": {
"model": "appliedenergistics2:wireless_access_point",
"y": 180
"state": {
"off": {
"submodel": {
"state": {
"model": "appliedenergistics2:wireless_access_point_status_off"
},
"torch": {
"model": "appliedenergistics2:wireless_access_point_off"
}
}
},
"on": {
"submodel": {
"state": {
"model": "appliedenergistics2:wireless_access_point_status_on"
},
"torch": {
"model": "appliedenergistics2:wireless_access_point_off"
}
}
},
"has_channel": {
"submodel": {
"state": {
"model": "appliedenergistics2:wireless_access_point_status_has_channel"
},
"torch": {
"model": "appliedenergistics2:wireless_access_point_on"
}
}
}
}
}
}
src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point.json
-769
View File
@@ -1,769 +0,0 @@
{
"parent": "block/block",
"elements": [
{
"faces": {
"down": {
"texture": "#0",
"uv": [
4.0,
4.0,
12.0,
12.0
]
},
"east": {
"texture": "#0",
"uv": [
4.0,
0.0,
12.0,
2.0
]
},
"north": {
"texture": "#0",
"uv": [
4.0,
14.0,
12.0,
16.0
]
},
"south": {
"texture": "#0",
"uv": [
0.0,
0.0,
8.0,
2.0
]
},
"up": {
"texture": "#0",
"uv": [
4.0,
4.0,
12.0,
12.0
]
},
"west": {
"texture": "#0",
"uv": [
0.0,
0.0,
8.0,
2.0
]
}
},
"from": [
4.0,
0.0,
4.0
],
"name": "Base",
"to": [
12.0,
2.0,
12.0
]
},
{
"faces": {
"down": {
"texture": "#0",
"uv": [
5.0,
1.0,
11.0,
3.0
]
},
"east": {
"texture": "#0",
"uv": [
15.0,
7.0,
13.0,
5.0
]
},
"north": {
"texture": "#0",
"uv": [
0.0,
0.0,
6.0,
2.0
]
},
"south": {
"texture": "#0",
"uv": [
11.0,
3.0,
5.0,
5.0
]
},
"up": {
"texture": "#0",
"uv": [
5.0,
13.0,
11.0,
15.0
]
},
"west": {
"texture": "#0",
"uv": [
13.0,
3.0,
15.0,
5.0
]
}
},
"from": [
5.0,
2.0,
3.0
],
"name": "Front_B",
"to": [
11.0,
4.0,
5.0
]
},
{
"faces": {
"down": {
"texture": "#0",
"uv": [
5.0,
13.0,
11.0,
15.0
]
},
"east": {
"texture": "#0",
"uv": [
13.0,
4.0,
15.0,
6.0
]
},
"north": {
"texture": "#0",
"uv": [
10.0,
0.0,
16.0,
2.0
]
},
"south": {
"texture": "#0",
"uv": [
11.0,
11.0,
5.0,
13.0
]
},
"up": {
"texture": "#0",
"uv": [
5.0,
1.0,
11.0,
3.0
]
},
"west": {
"texture": "#0",
"uv": [
1.0,
4.0,
3.0,
6.0
]
}
},
"from": [
5.0,
2.0,
11.0
],
"name": "Back_B",
"to": [
11.0,
4.0,
13.0
]
},
{
"faces": {
"down": {
"texture": "#0",
"uv": [
1.0,
5.0,
3.0,
11.0
]
},
"east": {
"texture": "#0",
"uv": [
5.0,
11.0,
11.0,
13.0
]
},
"north": {
"texture": "#0",
"uv": [
13.0,
4.0,
15.0,
6.0
]
},
"south": {
"texture": "#0",
"uv": [
1.0,
6.0,
3.0,
8.0
]
},
"up": {
"texture": "#0",
"uv": [
1.0,
5.0,
3.0,
11.0
]
},
"west": {
"texture": "#0",
"uv": [
5.0,
3.0,
11.0,
5.0
]
}
},
"from": [
11.0,
2.0,
5.0
],
"name": "Left_B",
"to": [
13.0,
4.0,
11.0
]
},
{
"faces": {
"down": {
"texture": "#0",
"uv": [
13.0,
5.0,
15.0,
11.0
]
},
"east": {
"texture": "#0",
"uv": [
5.0,
11.0,
11.0,
13.0
]
},
"north": {
"texture": "#0",
"uv": [
1.0,
4.0,
3.0,
6.0
]
},
"south": {
"texture": "#0",
"uv": [
13.0,
6.0,
15.0,
8.0
]
},
"up": {
"texture": "#0",
"uv": [
13.0,
5.0,
15.0,
11.0
]
},
"west": {
"texture": "#0",
"uv": [
5.0,
3.0,
11.0,
5.0
]
}
},
"from": [
3.0,
2.0,
5.0
],
"name": "Right_B",
"to": [
5.0,
4.0,
11.0
]
},
{
"faces": {
"down": {
"texture": "#0",
"uv": [
0.0,
0.0,
2.0,
1.0
]
},
"east": {
"texture": "#0",
"uv": [
0.0,
5.0,
1.0,
10.0
]
},
"north": {
"texture": "#0",
"uv": [
0.0,
5.0,
2.0,
10.0
]
},
"south": {
"texture": "#0",
"uv": [
0.0,
5.0,
2.0,
10.0
]
},
"up": {
"texture": "#0",
"uv": [
0.0,
0.0,
2.0,
1.0
]
},
"west": {
"texture": "#0",
"uv": [
0.0,
5.0,
1.0,
10.0
]
}
},
"from": [
7.0,
3.0,
2.0
],
"name": "Front_S",
"to": [
9.0,
8.0,
3.0
]
},
{
"faces": {
"down": {
"texture": "#0",
"uv": [
14.0,
1.0,
16.0,
2.0
]
},
"east": {
"texture": "#0",
"uv": [
14.0,
2.0,
15.0,
7.0
]
},
"north": {
"texture": "#0",
"uv": [
14.0,
2.0,
16.0,
7.0
]
},
"south": {
"texture": "#0",
"uv": [
14.0,
2.0,
16.0,
7.0
]
},
"up": {
"texture": "#0",
"uv": [
14.0,
0.0,
16.0,
1.0
]
},
"west": {
"texture": "#0",
"uv": [
15.0,
2.0,
16.0,
7.0
]
}
},
"from": [
7.0,
3.0,
13.0
],
"name": "Back_S",
"to": [
9.0,
8.0,
14.0
]
},
{
"faces": {
"down": {
"texture": "#0",
"uv": [
11.0,
3.0,
12.0,
5.0
]
},
"east": {
"texture": "#0",
"uv": [
11.0,
3.0,
13.0,
8.0
]
},
"north": {
"texture": "#0",
"uv": [
12.0,
3.0,
13.0,
8.0
]
},
"south": {
"texture": "#0",
"uv": [
13.0,
3.0,
11.0,
8.0
]
},
"up": {
"texture": "#0",
"uv": [
12.0,
3.0,
13.0,
5.0
]
},
"west": {
"texture": "#0",
"uv": [
11.0,
3.0,
13.0,
8.0
]
}
},
"from": [
2.0,
3.0,
7.0
],
"name": "Left_S",
"to": [
3.0,
8.0,
9.0
]
},
{
"faces": {
"down": {
"texture": "#0",
"uv": [
0.0,
0.0,
1.0,
2.0
]
},
"east": {
"texture": "#0",
"uv": [
0.0,
0.0,
2.0,
5.0
]
},
"north": {
"texture": "#0",
"uv": [
0.0,
0.0,
1.0,
5.0
]
},
"south": {
"texture": "#0",
"uv": [
0.0,
0.0,
1.0,
5.0
]
},
"up": {
"texture": "#0",
"uv": [
0.0,
0.0,
1.0,
2.0
]
},
"west": {
"texture": "#0",
"uv": [
0.0,
0.0,
2.0,
5.0
]
}
},
"from": [
13.0,
3.0,
7.0
],
"name": "Right_S",
"to": [
14.0,
8.0,
9.0
]
},
{
"faces": {
"down": {
"texture": "#1",
"uv": [
7.0,
9.0,
9.0,
11.0
]
},
"east": {
"texture": "#1",
"uv": [
7.0,
9.0,
9.0,
15.0
]
},
"north": {
"texture": "#1",
"uv": [
7.0,
9.0,
9.0,
15.0
]
},
"south": {
"texture": "#1",
"uv": [
7.0,
9.0,
9.0,
15.0
]
},
"up": {
"texture": "#1",
"uv": [
7.0,
9.0,
9.0,
11.0
]
},
"west": {
"texture": "#1",
"uv": [
7.0,
9.0,
9.0,
15.0
]
}
},
"from": [
7.0,
2.0,
7.0
],
"name": "Torch_B",
"to": [
9.0,
8.0,
9.0
]
},
{
"faces": {
"down": {
"texture": "#1",
"uv": [
7.0,
7.0,
9.0,
9.0
]
},
"east": {
"texture": "#1",
"uv": [
7.0,
7.0,
9.0,
9.0
]
},
"north": {
"texture": "#1",
"uv": [
7.0,
7.0,
9.0,
9.0
]
},
"south": {
"texture": "#1",
"uv": [
7.0,
7.0,
9.0,
9.0
]
},
"up": {
"texture": "#1",
"uv": [
7.0,
7.0,
9.0,
9.0
]
},
"west": {
"texture": "#1",
"uv": [
7.0,
7.0,
9.0,
9.0
]
}
},
"from": [
7.0,
8.0,
7.0
],
"name": "Torch_Off",
"to": [
9.0,
10.0,
9.0
]
}
],
"textures": {
"particle": "appliedenergistics2:blocks/wireless_access_point_inside",
"0": "appliedenergistics2:blocks/wireless_access_point_inside",
"1": "appliedenergistics2:blocks/wireless_access_point"
}
}
src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_chassis.json
+140
View File
@@ -0,0 +1,140 @@
{
"parent": "block/block",
"textures": {
"particle": "appliedenergistics2:blocks/wireless_access_point_inside",
"inside": "appliedenergistics2:blocks/wireless_access_point_inside",
"1": "appliedenergistics2:blocks/wireless_access_point",
"sides": "appliedenergistics2:parts/monitor_sides",
"sidesStatus": "appliedenergistics2:parts/monitor_sides_status"
},
"elements": [
{
"from": [5, 5, 0],
"to": [11, 11, 1],
"faces": {
"north": { "texture": "#sides"},
"south": { "texture": "#sides"},
"east": { "texture": "#sidesStatus"},
"west": { "texture": "#sidesStatus"},
"up": { "texture": "#sidesStatus"},
"down": { "texture": "#sidesStatus"}
}
},
{
"from": [5, 5, 1],
"to": [11, 11, 2],
"faces": {
"north": { "texture": "#inside"},
"south": { "texture": "#inside"},
"east": { "texture": "#sides"},
"west": { "texture": "#sides"},
"up": { "texture": "#sides"},
"down": { "texture": "#sides"}
}
},
{
"name": "Side Antenna I Up",
"from": [6, 10, 2],
"to": [10, 12, 4],
"faces": {
"north": { "texture": "#inside"},
"south": { "texture": "#inside"},
"east": { "texture": "#sides"},
"west": { "texture": "#sides"},
"up": { "texture": "#sides"},
"down": { "texture": "#sides"}
}
},
{
"name": "Side Antenna I Down",
"from": [6, 4, 2],
"to": [10, 6, 4],
"faces": {
"north": { "texture": "#inside"},
"south": { "texture": "#inside"},
"east": { "texture": "#sides"},
"west": { "texture": "#sides"},
"up": { "texture": "#sides"},
"down": { "texture": "#sides"}
}
},
{
"name": "Side Antenna I West",
"from": [4, 6, 2],
"to": [6, 10, 4],
"faces": {
"north": { "texture": "#inside"},
"south": { "texture": "#inside"},
"east": { "texture": "#sides"},
"west": { "texture": "#sides"},
"up": { "texture": "#sides"},
"down": { "texture": "#sides"}
}
},
{
"name": "Side Antenna I East",
"from": [10, 6, 2],
"to": [12, 10, 4],
"faces": {
"north": { "texture": "#inside"},
"south": { "texture": "#inside"},
"east": { "texture": "#sides"},
"west": { "texture": "#sides"},
"up": { "texture": "#sides"},
"down": { "texture": "#sides"}
}
},
{
"name": "Side Antenna II Up",
"from": [7, 12, 3],
"to": [9, 13, 6],
"faces": {
"north": { "texture": "#inside"},
"south": { "texture": "#inside"},
"east": { "texture": "#sides"},
"west": { "texture": "#sides"},
"up": { "texture": "#sides"},
"down": { "texture": "#sides"}
}
},
{
"name": "Side Antenna II Down",
"from": [7, 3, 3],
"to": [9, 4, 6],
"faces": {
"north": { "texture": "#inside"},
"south": { "texture": "#inside"},
"east": { "texture": "#sides"},
"west": { "texture": "#sides"},
"up": { "texture": "#sides"},
"down": { "texture": "#sides"}
}
},
{
"name": "Side Antenna II West",
"from": [3, 7, 3],
"to": [4, 9, 6],
"faces": {
"north": { "texture": "#inside"},
"south": { "texture": "#inside"},
"east": { "texture": "#sides"},
"west": { "texture": "#sides"},
"up": { "texture": "#sides"},
"down": { "texture": "#sides"}
}
},
{
"name": "Side Antenna II East",
"from": [12, 7, 3],
"to": [13, 9, 6],
"faces": {
"north": { "texture": "#inside"},
"south": { "texture": "#inside"},
"east": { "texture": "#sides"},
"west": { "texture": "#sides"},
"up": { "texture": "#sides"},
"down": { "texture": "#sides"}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_off.json
+18
View File
@@ -0,0 +1,18 @@
{
"textures": {
"torch": "appliedenergistics2:blocks/wireless_access_point"
},
"elements": [
{
"from": [7, 7, 1],
"to": [9, 9, 9],
"faces": {
"up": { "texture": "#torch", "uv": [1, 7, 9, 9], "rotation": 90 },
"down": { "texture": "#torch", "uv": [1, 7, 9, 9], "rotation": 270 },
"east": { "texture": "#torch", "uv": [1, 7, 9, 9], "rotation": 180 },
"west": { "texture": "#torch", "uv": [1, 7, 9, 9] },
"south": { "texture": "#torch", "uv": [7, 7, 9, 9], "rotation": 270 }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json
+45
View File
@@ -0,0 +1,45 @@
{
"uvlMarker": true,
"ambientocclusion": false,
"textures": {
"torch": "appliedenergistics2:blocks/wireless_access_point_on"
},
"elements": [
{
"from": [7, 7, 1],
"to": [9, 9, 6],
"faces": {
"up": { "texture": "#torch", "uv": [1, 7, 6, 9], "rotation": 90 },
"down": { "texture": "#torch", "uv": [1, 7, 6, 9], "rotation": 270 },
"east": { "texture": "#torch", "uv": [1, 7, 6, 9], "rotation": 180 },
"west": { "texture": "#torch", "uv": [1, 7, 6, 9] }
}
},
{
"from": [7, 7, 7],
"to": [9, 9, 9],
"shade": false,
"faces": {
"south": { "texture": "#torch", "uv": [7, 7, 9, 9], "rotation": 270, "uvlightmap": { "sky": 0.007, "block": 0.007 } }
}
},
{
"from": [6, 7, 6],
"to": [10, 9, 10],
"shade": false,
"faces": {
"up": { "texture": "#torch", "uv": [6, 6, 10, 10], "rotation": 90, "uvlightmap": { "sky": 0.007, "block": 0.007 } },
"down": { "texture": "#torch", "uv": [6, 6, 10, 10], "rotation": 270, "uvlightmap": { "sky": 0.007, "block": 0.007 } }
}
},
{
"from": [7, 6, 6],
"to": [9, 10, 10],
"shade": false,
"faces": {
"west": { "texture": "#torch", "uv": [6, 6, 10, 10], "uvlightmap": { "sky": 0.007, "block": 0.007 } },
"east": { "texture": "#torch", "uv": [6, 6, 10, 10], "rotation": 180, "uvlightmap": { "sky": 0.007, "block": 0.007 } }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json
+17
View File
@@ -0,0 +1,17 @@
{
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
},
"elements": [
{
"from": [5, 5, 0],
"to": [11, 11, 1],
"faces": {
"down": { "texture": "#indicator", "tintindex": 1, "uvlightmap": { "sky": 0.007, "block": 0.007 } },
"up": { "texture": "#indicator", "tintindex": 1, "uvlightmap": { "sky": 0.007, "block": 0.007 } },
"east": { "texture": "#indicator", "tintindex": 1, "uvlightmap": { "sky": 0.007, "block": 0.007 } },
"west": { "texture": "#indicator", "tintindex": 1, "uvlightmap": { "sky": 0.007, "block": 0.007 } }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_off.json
+17
View File
@@ -0,0 +1,17 @@
{
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_off"
},
"elements": [
{
"from": [5, 5, 0],
"to": [11, 11, 1],
"faces": {
"down": { "texture": "#indicator" },
"up": { "texture": "#indicator" },
"east": { "texture": "#indicator" },
"west": { "texture": "#indicator" }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json
+17
View File
@@ -0,0 +1,17 @@
{
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_on"
},
"elements": [
{
"from": [5, 5, 0],
"to": [11, 11, 1],
"faces": {
"down": { "texture": "#indicator", "tintindex": 3, "uvlightmap": { "sky": 0.007, "block": 0.007 } },
"up": { "texture": "#indicator", "tintindex": 3, "uvlightmap": { "sky": 0.007, "block": 0.007 } },
"east": { "texture": "#indicator", "tintindex": 3, "uvlightmap": { "sky": 0.007, "block": 0.007 } },
"west": { "texture": "#indicator", "tintindex": 3, "uvlightmap": { "sky": 0.007, "block": 0.007 } }
}
}
]
}
src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_access_point.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 252 B

After

Width:  |  Height:  |  Size: 2.8 KiB

src/main/resources/assets/appliedenergistics2/textures/blocks/wireless_access_point_on.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 267 B

After

Width:  |  Height:  |  Size: 2.8 KiB