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

Controller Model (#33)

Browse Source 
* Implemented the controller models (using the UVL model loader to make the lights be fullbright at night).
This commit is contained in:
shartte
2016-08-15 10:28:45 +02:00
committed by Elix_x
parent a422de6adb
commit 24ddc0e574
24 changed files with 359 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockController.json
+36
View File
@@ -0,0 +1,36 @@
{
"multipart": [
{
"when": { "type": "block", "state": "offline" },
"apply": { "model": "appliedenergistics2:controller/controller_block_offline" }
},
{
"when": { "type": "block", "state": "online" },
"apply": { "model": "appliedenergistics2:controller/controller_block_online.uvl" }
},
{
"when": { "type": "block", "state": "conflicted" },
"apply": { "model": "appliedenergistics2:controller/controller_block_conflicted.uvl" }
},
{
"when": { "type": "column", "state": "offline" },
"apply": { "model": "appliedenergistics2:controller/controller_column_offline" }
},
{
"when": { "type": "column", "state": "online" },
"apply": { "model": "appliedenergistics2:controller/controller_column_online.uvl" }
},
{
"when": { "type": "column", "state": "conflicted" },
"apply": { "model": "appliedenergistics2:controller/controller_column_conflicted.uvl" }
},
{
"when": { "type": "inside_a", "state": "offline|online|conflicted" },
"apply": { "model": "appliedenergistics2:controller/controller_inside_a" }
},
{
"when": { "type": "inside_b", "state": "offline|online|conflicted" },
"apply": { "model": "appliedenergistics2:controller/controller_inside_b" }
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.uvl.json
+42
View File
@@ -0,0 +1,42 @@
{
"parent": "block/block",
"display": {
"firstperson_righthand": {
"rotation": [ 0, 135, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
},
"textures": {
"particle": "#block",
"block": "appliedenergistics2:blocks/BlockControllerPowered",
"lights": "appliedenergistics2:blocks/BlockControllerConflict"
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}
}
},
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_offline.json
+6
View File
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/BlockController"
}
}
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.uvl.json
+42
View File
@@ -0,0 +1,42 @@
{
"parent": "block/block",
"display": {
"firstperson_righthand": {
"rotation": [ 0, 135, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
},
"textures": {
"particle": "#block",
"block": "appliedenergistics2:blocks/BlockControllerPowered",
"lights": "appliedenergistics2:blocks/BlockControllerLights"
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}
}
},
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.uvl.json
+42
View File
@@ -0,0 +1,42 @@
{
"parent": "block/block",
"display": {
"firstperson_righthand": {
"rotation": [ 0, 135, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
},
"textures": {
"particle": "#block",
"block": "appliedenergistics2:blocks/BlockControllerColumnPowered",
"lights": "appliedenergistics2:blocks/BlockControllerColumnConflict"
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}
}
},
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json
+6
View File
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/BlockControllerColumn"
}
}
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.uvl.json
+42
View File
@@ -0,0 +1,42 @@
{
"parent": "block/block",
"display": {
"firstperson_righthand": {
"rotation": [ 0, 135, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
},
"textures": {
"particle": "#block",
"block": "appliedenergistics2:blocks/BlockControllerColumnPowered",
"lights": "appliedenergistics2:blocks/BlockControllerColumnLights"
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}
}
},
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_a.json
+6
View File
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/BlockControllerInsideA"
}
}
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_b.json
+6
View File
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/BlockControllerInsideB"
}
}
src/main/resources/assets/appliedenergistics2/models/item/tile.BlockController.json
+3
View File
@@ -0,0 +1,3 @@
{
"parent": "appliedenergistics2:block/controller/controller_block_offline"
}
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockController.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 307 B

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

After

Width:  |  Height:  |  Size: 268 B

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

After

Width:  |  Height:  |  Size: 264 B

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

After

Width:  |  Height:  |  Size: 1.2 KiB

src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumnLights.png.mcmeta
+19
View File
@@ -0,0 +1,19 @@
{
"animation": {
"frametime": 3,
"frames": [
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
0
]
}
}
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumnPowered.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 254 B

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

After

Width:  |  Height:  |  Size: 275 B

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

After

Width:  |  Height:  |  Size: 294 B

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

After

Width:  |  Height:  |  Size: 298 B

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

After

Width:  |  Height:  |  Size: 1.4 KiB

src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerLights.png.mcmeta
+19
View File
@@ -0,0 +1,19 @@
{
"animation": {
"frametime": 3,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11
]
}
}
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerPowered.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 279 B