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

Added new Cell Rendering to ME Chest (#4464)

Browse Source 
Moved cell models to origin 0,0,0.
Implemented a TER to render cell models/LED in the ME chest as they are rendered in the drive.
This commit is contained in:
shartte
2020-07-17 20:37:07 +02:00
committed by GitHub
parent 08abd4a770
commit 8142eb90a6
18 changed files with 427 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/blockstates/chest.json
+2 -50
View File
@@ -7,7 +7,7 @@
},
{
"when": {
"slot_state": "empty|offline"
"lights_on": false
},
"apply": {
"model": "appliedenergistics2:block/chest/lights_off"
@@ -15,59 +15,11 @@
},
{
"when": {
"slot_state": "online|not_empty|types_full|full"
"lights_on": true
},
"apply": {
"model": "appliedenergistics2:block/chest/lights_on"
}
},
{
"when": {
"slot_state": "empty"
},
"apply": {
"model": "appliedenergistics2:block/chest/cell_state_empty"
}
},
{
"when": {
"slot_state": "offline"
},
"apply": {
"model": "appliedenergistics2:block/chest/cell_state_offline"
}
},
{
"when": {
"slot_state": "online"
},
"apply": {
"model": "appliedenergistics2:block/chest/cell_state_online"
}
},
{
"when": {
"slot_state": "not_empty"
},
"apply": {
"model": "appliedenergistics2:block/chest/cell_state_not_empty"
}
},
{
"when": {
"slot_state": "types_full"
},
"apply": {
"model": "appliedenergistics2:block/chest/cell_state_types_full"
}
},
{
"when": {
"slot_state": "full"
},
"apply": {
"model": "appliedenergistics2:block/chest/cell_state_full"
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/chest/base.json
+103 -6
View File
@@ -1,12 +1,109 @@
{
"parent": "block/cube",
"credit": "Made with Blockbench",
"textures": {
"particle": "appliedenergistics2:block/chest/side",
"4": "appliedenergistics2:block/drive/drive_inside",
"up": "appliedenergistics2:block/chest/top",
"down": "appliedenergistics2:block/chest/bottom",
"north": "appliedenergistics2:block/chest/front",
"east": "appliedenergistics2:block/chest/side",
"south": "appliedenergistics2:block/chest/side",
"west": "appliedenergistics2:block/chest/side"
}
"particle": "appliedenergistics2:block/chest/side",
"east": "appliedenergistics2:block/chest/side"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": { "uv": [0, 0, 16, 16], "texture": "#north" },
"east": { "uv": [0, 0, 16, 16], "texture": "#east" },
"south": { "uv": [0, 0, 16, 16], "texture": "#east" },
"west": { "uv": [0, 0, 16, 16], "texture": "#east" },
"up": { "uv": [0, 0, 16, 16], "texture": "#up" },
"down": { "uv": [0, 0, 16, 16], "texture": "#down" }
}
},
{
"name": "inside_back",
"from": [5, 4, 7],
"to": [11, 7, 10],
"rotation": { "angle": 0, "axis": "y", "origin": [19, 11, 8] },
"faces": {
"north": { "uv": [4, 1, 16, 14], "texture": "#4" }
}
},
{
"name": "inside_left",
"from": [11, 1, 1],
"to": [14, 12, 11],
"rotation": { "angle": 0, "axis": "y", "origin": [18, 11, 3] },
"faces": {
"north": { "uv": [2, 5, 2, 5], "texture": "#4" },
"west": { "uv": [5, 1, 14, 12], "texture": "#4" }
}
},
{
"name": "inside_top",
"from": [5, 6, 1],
"to": [11, 9, 11],
"rotation": { "angle": 0, "axis": "y", "origin": [15, 16, 3] },
"faces": {
"north": { "uv": [2, 7, 2, 7], "texture": "#4" },
"down": { "uv": [6, 4, 6, 4], "texture": "#4" }
}
},
{
"name": "inside_bottom",
"from": [5, 1, 1],
"to": [11, 4, 11],
"rotation": { "angle": 0, "axis": "y", "origin": [15, 11, 3] },
"faces": {
"north": { "uv": [2, 7, 2, 7], "texture": "#4" },
"up": { "uv": [6, 3, 6, 3], "texture": "#4" }
}
},
{
"name": "inside_border_bottom",
"from": [4, 0, 0],
"to": [12, 3, 9],
"rotation": { "angle": 0, "axis": "y", "origin": [15, 10, 1] },
"faces": {
"up": { "uv": [0, 4, 9, 13], "rotation": 90, "texture": "#4" }
}
},
{
"name": "inside_border_top",
"from": [5, 7, 0],
"to": [12, 10, 9],
"rotation": { "angle": 0, "axis": "y", "origin": [15, 17, 1] },
"faces": {
"down": { "uv": [0, 4, 9, 13], "rotation": 270, "texture": "#4" }
}
},
{
"name": "inside_border_left",
"from": [11, 3, 0],
"to": [12, 8, 1],
"rotation": { "angle": 0, "axis": "y", "origin": [15, 13, 1] },
"faces": {
"west": { "uv": [0, 8, 1, 13], "texture": "#4" }
}
},
{
"name": "inside_border_right",
"from": [4, 3, 0],
"to": [5, 8, 1],
"rotation": { "angle": 0, "axis": "y", "origin": [8, 13, 1] },
"faces": {
"east": { "uv": [0, 6, 1, 11], "rotation": 180, "texture": "#4" }
}
},
{
"name": "inside_right",
"from": [2, 1, 1],
"to": [5, 12, 11],
"rotation": { "angle": 0, "axis": "y", "origin": [9, 11, 3] },
"faces": {
"east": { "uv": [5, 2, 14, 13], "texture": "#4" }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_empty.json
-16
View File
@@ -1,16 +0,0 @@
{
"textures": {
"state": "appliedenergistics2:block/chest/cell_state_empty"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {
"texture": "#state"
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json
-31
View File
@@ -1,31 +0,0 @@
{
"loader": "appliedenergistics2:uvlightmap",
"textures": {
"backdrop": "appliedenergistics2:block/chest/cell_state_backdrop",
"state": "appliedenergistics2:block/chest/cell_state_full"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {
"texture": "#backdrop"
}
}
},
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {
"texture": "#state",
"uvlightmap": {
"block": 0.007,
"sky": 0.007
}
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_not_empty.json
-31
View File
@@ -1,31 +0,0 @@
{
"loader": "appliedenergistics2:uvlightmap",
"textures": {
"backdrop": "appliedenergistics2:block/chest/cell_state_backdrop",
"state": "appliedenergistics2:block/chest/cell_state_not_empty"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {
"texture": "#backdrop"
}
}
},
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {
"texture": "#state",
"uvlightmap": {
"block": 0.007,
"sky": 0.007
}
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json
-16
View File
@@ -1,16 +0,0 @@
{
"textures": {
"state": "appliedenergistics2:block/chest/cell_state_offline"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {
"texture": "#state"
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json
-31
View File
@@ -1,31 +0,0 @@
{
"loader": "appliedenergistics2:uvlightmap",
"textures": {
"backdrop": "appliedenergistics2:block/chest/cell_state_backdrop",
"state": "appliedenergistics2:block/chest/cell_state_online"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {
"texture": "#backdrop"
}
}
},
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {
"texture": "#state",
"uvlightmap": {
"block": 0.007,
"sky": 0.007
}
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json
-31
View File
@@ -1,31 +0,0 @@
{
"loader": "appliedenergistics2:uvlightmap",
"textures": {
"backdrop": "appliedenergistics2:block/chest/cell_state_backdrop",
"state": "appliedenergistics2:block/chest/cell_state_types_full"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {
"texture": "#backdrop"
}
}
},
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {
"texture": "#state",
"uvlightmap": {
"block": 0.007,
"sky": 0.007
}
}
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell.json
+3 -2
View File
@@ -1,12 +1,13 @@
{
"ambientocclusion": false,
"textures": {
"cell": "appliedenergistics2:block/drive/cells/default_cell"
},
"elements": [
{
"name": "Cell Backdrop",
"from": [9, 13, 1],
"to": [15, 15, 3],
"from": [0, 0, 0],
"to": [6, 2, 2],
"rotation": { "angle": 0, "axis": "y", "origin": [9, 8, 8] },
"faces": {
"north": {
src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_led_base.json
-55
View File
@@ -1,55 +0,0 @@
{
"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/textures/block/chest/front.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 375 B

After

Width:  |  Height:  |  Size: 315 B