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

Implemented drive models. Fixed issues with the UVL model loader using a null model loader (and thus crashing).

Browse Source
This commit is contained in:
Sebastian Hartte
2016-08-26 13:46:52 +02:00
parent 576923a2f2
commit f3e10b1851
27 changed files with 810 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/blockstates/drive.json
+3 -18
View File
@@ -1,20 +1,5 @@
{
"variants": {
"facing=east": {
"model": "appliedenergistics2:drive",
"y": 270
},
"facing=north": {
"model": "appliedenergistics2:drive",
"y": 180
},
"facing=south": {
"model": "appliedenergistics2:drive",
"y": 0
},
"facing=west": {
"model": "appliedenergistics2:drive",
"y": 90
}
}
"variants": {
"normal": { "model": "appliedenergistics2:builtin/drive" }
}
}
src/main/resources/assets/appliedenergistics2/models/block/drive.json
+3 -3
View File
@@ -693,8 +693,8 @@
}
],
"textures": {
"0": "blocks/BlockDriveSide",
"1": "blocks/BlockDriveFront",
"2": "blocks/BlockDrive"
"0": "blocks/drive_side",
"1": "blocks/drive_front",
"2": "blocks/drive_top"
}
}
src/main/resources/assets/appliedenergistics2/models/block/drive_base.json
+77
View File
@@ -0,0 +1,77 @@
{
"parent": "block/block",
"textures": {
"side": "appliedenergistics2:blocks/drive_side",
"bottom": "appliedenergistics2:blocks/drive_bottom",
"top": "appliedenergistics2:blocks/drive_top",
"front": "appliedenergistics2:blocks/drive_front",
"inner": "appliedenergistics2:blocks/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
+119
View File
@@ -0,0 +1,119 @@
{
"parent": "block/block",
"textures": {
"side": "appliedenergistics2:blocks/drive_side",
"bottom": "appliedenergistics2:blocks/drive_bottom",
"top": "appliedenergistics2:blocks/drive_top",
"front": "appliedenergistics2:blocks/drive_front",
"inner": "appliedenergistics2:blocks/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
+16
View File
@@ -0,0 +1,16 @@
{
"uvlMarker": true,
"textures": {
"front": "appliedenergistics2:blocks/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
+24
View File
@@ -0,0 +1,24 @@
{
"uvlMarker": true,
"textures": {
"front": "appliedenergistics2:blocks/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
+15
View File
@@ -0,0 +1,15 @@
{
"textures": {
"front": "appliedenergistics2:blocks/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
+24
View File
@@ -0,0 +1,24 @@
{
"uvlMarker": true,
"textures": {
"front": "appliedenergistics2:blocks/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
+24
View File
@@ -0,0 +1,24 @@
{
"uvlMarker": true,
"textures": {
"front": "appliedenergistics2:blocks/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
+6
View File
@@ -0,0 +1,6 @@
{
"parent": "appliedenergistics2:block/drive_base",
"textures": {
"front": "appliedenergistics2:blocks/drive_front_flat"
}
}
src/main/resources/assets/appliedenergistics2/textures/blocks/drive_bottom.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 398 B

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

After

Width:  |  Height:  |  Size: 182 B

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

After

Width:  |  Height:  |  Size: 442 B

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

After

Width:  |  Height:  |  Size: 274 B

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

After

Width:  |  Height:  |  Size: 438 B

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

After

Width:  |  Height:  |  Size: 398 B