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

Cables & parts and Baking pipeline

Browse Source 
- Added cables & parts rendering.
- Facades got a completely new way of rendering. Anvil facades are
totally a thing.
- Added baking pipeline for simplified, highly configurable quad baking.

NOTE: Yes, there are a lot of improvements to do, bugs to fix, stuff to
add. I'm just pushing it prior to code structure change, so it does not
get lost in stashes. But it actually works!
This commit is contained in:
elix-x
2016-08-19 22:45:27 +02:00
parent 8b9743f2bf
commit d7f32a985d
186 changed files with 2102 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/models/item/part/crafting_terminal.json
+3
View File
@@ -0,0 +1,3 @@
{
"parent": "appliedenergistics2:part/crafting_terminal"
}
src/main/resources/assets/appliedenergistics2/models/part/cable/covered/center.json
+20
View File
@@ -0,0 +1,20 @@
{
"textures": {
"base": "appliedenergistics2:parts/cable/covered/${color}"
},
"elements": [
{
"name": "Element",
"from": [ 5.0, 5.0, 5.0 ],
"to": [ 11.0, 11.0, 11.0 ],
"faces": {
"north": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] },
"east": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] },
"south": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] },
"west": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] },
"up": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] },
"down": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/cable/covered/connection.json
+20
View File
@@ -0,0 +1,20 @@
{
"textures": {
"base": "appliedenergistics2:parts/cable/covered/${color}"
},
"elements": [
{
"name": "Element",
"from": [ 6.0, 6.0, 0.0 ],
"to": [ 10.0, 10.0, 5.0 ],
"faces": {
"north": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] },
"east": { "texture": "#base", "uv": [ 11.0, 6.0, 16.0, 10.0 ] },
"south": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] },
"west": { "texture": "#base", "uv": [ 16.0, 6.0, 11.0, 10.0 ] },
"up": { "texture": "#base", "uv": [ 6.0, 0.0, 10.0, 5.0 ] },
"down": { "texture": "#base", "uv": [ 6.0, 11.0, 10.0, 16.0 ] }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/cable/covered/straight.json
+20
View File
@@ -0,0 +1,20 @@
{
"textures": {
"base": "appliedenergistics2:parts/cable/covered/${color}"
},
"elements": [
{
"name": "Element",
"from": [ 5.0, 5.0, 0.0 ],
"to": [ 11.0, 11.0, 16.0 ],
"faces": {
"north": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] },
"east": { "texture": "#base", "uv": [ 0.0, 5.0, 5.0, 11.0 ] },
"south": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] },
"west": { "texture": "#base", "uv": [ 5.0, 5.0, 0.0, 11.0 ] },
"up": { "texture": "#base", "uv": [ 5.0, 0.0, 11.0, 5.0 ] },
"down": { "texture": "#base", "uv": [ 5.0, 11.0, 11.0, 16.0 ] }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/cable/dense/center.json
+20
View File
@@ -0,0 +1,20 @@
{
"textures": {
"base": "appliedenergistics2:parts/cable/dense/${color}"
},
"elements": [
{
"name": "Base",
"from": [ 3.0, 3.0, 3.0 ],
"to": [ 13.0, 13.0, 13.0 ],
"faces": {
"north": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] },
"east": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] },
"south": { "texture": "#base", "uv": [ 10.5, 5.5, 5.5, 10.5 ] },
"west": { "texture": "#base", "uv": [ 10.5, 5.5, 5.5, 10.5 ] },
"up": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] },
"down": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/cable/dense/connection.json
+34
View File
@@ -0,0 +1,34 @@
{
"textures": {
"base": "appliedenergistics2:parts/cable/dense/${color}",
"channels": "appliedenergistics2:parts/cable/dense/${channels}"
},
"elements": [
{
"name": "Base",
"from": [ 4.0, 4.0, 0.0 ],
"to": [ 12.0, 12.0, 3.0 ],
"faces": {
"north": { "texture": "#base", "uv": [ 5.5, 5.5, 10.5, 10.5 ] },
"east": { "texture": "#base", "uv": [ 11.0, 5.5, 16.0, 10.5 ] },
"south": { "texture": "#base", "uv": [ 10.5, 10.5, 5.5, 5.5 ] },
"west": { "texture": "#base", "uv": [ 16.0, 5.5, 11.0, 10.5 ] },
"up": { "texture": "#base", "uv": [ 5.5, 0.0, 10.5, 5.0 ] },
"down": { "texture": "#base", "uv": [ 5.5, 11.0, 10.5, 16.0 ] }
}
},
{
"name": "Channels",
"from": [ 4.0, 4.0, 0.0 ],
"to": [ 12.0, 12.0, 3.0 ],
"faces": {
"north": { "texture": "#channels", "uv": [ 5.5, 5.5, 10.5, 10.5 ] },
"east": { "texture": "#channels", "uv": [ 11.0, 5.5, 16.0, 10.5 ] },
"south": { "texture": "#channels", "uv": [ 10.5, 10.5, 5.5, 5.5 ] },
"west": { "texture": "#channels", "uv": [ 16.0, 5.5, 11.0, 10.5 ] },
"up": { "texture": "#channels", "uv": [ 5.5, 0.0, 10.5, 5.0 ] },
"down": { "texture": "#channels", "uv": [ 5.5, 11.0, 10.5, 16.0 ] }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/cable/dense/straight.json
+34
View File
@@ -0,0 +1,34 @@
{
"textures": {
"base": "appliedenergistics2:parts/cable/dense/${color}",
"channels": "appliedenergistics2:parts/cable/dense/${channels}"
},
"elements": [
{
"name": "Base",
"from": [ 3.0, 3.0, 0.0 ],
"to": [ 13.0, 13.0, 16.0 ],
"faces": {
"north": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] },
"east": { "texture": "#base", "uv": [ 0.0, 5.0, 5.0, 11.0 ] },
"south": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] },
"west": { "texture": "#base", "uv": [ 5.0, 5.0, 0.0, 11.0 ] },
"up": { "texture": "#base", "uv": [ 5.0, 0.0, 11.0, 5.0 ] },
"down": { "texture": "#base", "uv": [ 5.0, 11.0, 11.0, 16.0 ] }
}
},
{
"name": "Channels",
"from": [ 3.0, 3.0, 0.0 ],
"to": [ 13.0, 13.0, 16.0 ],
"faces": {
"north": { "texture": "#channels", "uv": [ 5.0, 5.0, 11.0, 11.0 ] },
"east": { "texture": "#channels", "uv": [ 0.0, 5.0, 5.0, 11.0 ] },
"south": { "texture": "#channels", "uv": [ 11.0, 5.0, 5.0, 11.0 ] },
"west": { "texture": "#channels", "uv": [ 5.0, 5.0, 0.0, 11.0 ] },
"up": { "texture": "#channels", "uv": [ 5.0, 0.0, 11.0, 5.0 ] },
"down": { "texture": "#channels", "uv": [ 5.0, 11.0, 11.0, 16.0 ] }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/cable/glass/center.json
+20
View File
@@ -0,0 +1,20 @@
{
"textures": {
"base": "appliedenergistics2:parts/cable/glass/${color}"
},
"elements": [
{
"name": "Element",
"from": [ 6.0, 6.0, 6.0 ],
"to": [ 10.0, 10.0, 10.0 ],
"faces": {
"north": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] },
"east": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] },
"south": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] },
"west": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] },
"up": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] },
"down": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/cable/glass/connection.json
+20
View File
@@ -0,0 +1,20 @@
{
"textures": {
"base": "appliedenergistics2:parts/cable/glass/${color}"
},
"elements": [
{
"name": "Element",
"from": [ 6.0, 6.0, 0.0 ],
"to": [ 10.0, 10.0, 6.0 ],
"faces": {
"north": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] },
"east": { "texture": "#base", "uv": [ 10.0, 6.0, 16.0, 10.0 ] },
"south": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] },
"west": { "texture": "#base", "uv": [ 16.0, 6.0, 10.0, 10.0 ] },
"up": { "texture": "#base", "uv": [ 6.0, 0.0, 10.0, 6.0 ] },
"down": { "texture": "#base", "uv": [ 6.0, 10.0, 10.0, 16.0 ] }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/cable/glass/straight.json
+46
View File
@@ -0,0 +1,46 @@
{
"textures": {
"base": "appliedenergistics2:parts/cable/glass/${color}"
},
"elements": [
{
"name": "Element",
"from": [ 6.0, 6.0, 6.0 ],
"to": [ 10.0, 10.0, 10.0 ],
"faces": {
"north": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] },
"east": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] },
"south": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] },
"west": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] },
"up": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] },
"down": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }
}
},
{
"name": "Element",
"from": [ 6.0, 6.0, 0.0 ],
"to": [ 10.0, 10.0, 6.0 ],
"faces": {
"north": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] },
"east": { "texture": "#base", "uv": [ 10.0, 6.0, 16.0, 10.0 ] },
"south": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] },
"west": { "texture": "#base", "uv": [ 16.0, 6.0, 10.0, 10.0 ] },
"up": { "texture": "#base", "uv": [ 6.0, 0.0, 10.0, 6.0 ] },
"down": { "texture": "#base", "uv": [ 6.0, 10.0, 10.0, 16.0 ] }
}
},
{
"name": "Element",
"from": [ 6.0, 6.0, 10.0 ],
"to": [ 10.0, 10.0, 16.0 ],
"faces": {
"north": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] },
"east": { "texture": "#base", "uv": [ 0.0, 6.0, 6.0, 10.0 ] },
"south": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] },
"west": { "texture": "#base", "uv": [ 6.0, 6.0, 0.0, 10.0 ] },
"up": { "texture": "#base", "uv": [ 6.0, 10.0, 10.0, 16.0 ] },
"down": { "texture": "#base", "uv": [ 6.0, 0.0, 10.0, 6.0 ] }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/cable/smart/center.json
+20
View File
@@ -0,0 +1,20 @@
{
"textures": {
"base": "appliedenergistics2:parts/cable/smart/${color}"
},
"elements": [
{
"name": "Element",
"from": [ 5.0, 5.0, 5.0 ],
"to": [ 11.0, 11.0, 11.0 ],
"faces": {
"north": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] },
"east": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] },
"south": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] },
"west": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] },
"up": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] },
"down": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/cable/smart/connection.json
+34
View File
@@ -0,0 +1,34 @@
{
"textures": {
"base": "appliedenergistics2:parts/cable/smart/${color}",
"channels": "appliedenergistics2:parts/cable/smart/${channels}"
},
"elements": [
{
"name": "Element",
"from": [ 6.0, 6.0, 0.0 ],
"to": [ 10.0, 10.0, 5.0 ],
"faces": {
"north": { "texture": "#base", "uv": [ 6.0, 6.0, 10.0, 10.0 ] },
"east": { "texture": "#base", "uv": [ 11.0, 6.0, 16.0, 10.0 ] },
"south": { "texture": "#base", "uv": [ 10.0, 6.0, 6.0, 10.0 ] },
"west": { "texture": "#base", "uv": [ 16.0, 6.0, 11.0, 10.0 ] },
"up": { "texture": "#base", "uv": [ 6.0, 0.0, 10.0, 5.0 ] },
"down": { "texture": "#base", "uv": [ 6.0, 11.0, 10.0, 16.0 ] }
}
},
{
"name": "Channels",
"from": [ 6.0, 6.0, 0.0 ],
"to": [ 10.0, 10.0, 5.0 ],
"faces": {
"north": { "texture": "#channels", "uv": [ 6.0, 6.0, 10.0, 10.0 ] },
"east": { "texture": "#channels", "uv": [ 11.0, 6.0, 16.0, 10.0 ] },
"south": { "texture": "#channels", "uv": [ 10.0, 6.0, 6.0, 10.0 ] },
"west": { "texture": "#channels", "uv": [ 16.0, 6.0, 11.0, 10.0 ] },
"up": { "texture": "#channels", "uv": [ 6.0, 0.0, 10.0, 5.0 ] },
"down": { "texture": "#channels", "uv": [ 6.0, 11.0, 10.0, 16.0 ] }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/cable/smart/straight.json
+34
View File
@@ -0,0 +1,34 @@
{
"textures": {
"base": "appliedenergistics2:parts/cable/smart/${color}",
"channels": "appliedenergistics2:parts/cable/smart/${channels}"
},
"elements": [
{
"name": "Element",
"from": [ 5.0, 5.0, 0.0 ],
"to": [ 11.0, 11.0, 16.0 ],
"faces": {
"north": { "texture": "#base", "uv": [ 5.0, 5.0, 11.0, 11.0 ] },
"east": { "texture": "#base", "uv": [ 0.0, 5.0, 5.0, 11.0 ] },
"south": { "texture": "#base", "uv": [ 11.0, 5.0, 5.0, 11.0 ] },
"west": { "texture": "#base", "uv": [ 5.0, 5.0, 0.0, 11.0 ] },
"up": { "texture": "#base", "uv": [ 5.0, 0.0, 11.0, 5.0 ] },
"down": { "texture": "#base", "uv": [ 5.0, 11.0, 11.0, 16.0 ] }
}
},
{
"name": "Channels",
"from": [ 5.0, 5.0, 0.0 ],
"to": [ 11.0, 11.0, 16.0 ],
"faces": {
"north": { "texture": "#channels", "uv": [ 5.0, 5.0, 11.0, 11.0 ] },
"east": { "texture": "#channels", "uv": [ 0.0, 5.0, 5.0, 11.0 ] },
"south": { "texture": "#channels", "uv": [ 11.0, 5.0, 5.0, 11.0 ] },
"west": { "texture": "#channels", "uv": [ 5.0, 5.0, 0.0, 11.0 ] },
"up": { "texture": "#channels", "uv": [ 5.0, 0.0, 11.0, 5.0 ] },
"down": { "texture": "#channels", "uv": [ 5.0, 11.0, 11.0, 16.0 ] }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/cable_anchor.json
+20
View File
@@ -0,0 +1,20 @@
{
"textures": {
"0": "appliedenergistics2:parts/CableAnchor"
},
"elements": [
{
"name": "Element",
"from": [ 7.0, 7.0, 0.0 ],
"to": [ 9.0, 9.0, 6.0 ],
"faces": {
"north": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 2.0 ] },
"east": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 2.0 ] },
"south": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 2.0 ] },
"west": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 2.0 ] },
"up": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 6.0 ] },
"down": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 6.0 ] }
}
}
]
}
src/main/resources/assets/appliedenergistics2/models/part/cable_facade.json
+3
View File
@@ -0,0 +1,3 @@
{
"parent": "appliedenergistics2:parts/cableanchor"
}
src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json
+75
View File
@@ -0,0 +1,75 @@
{
"textures": {
"frame": "appliedenergistics2:parts/crafting_terminal/frame",
"sides": "appliedenergistics2:parts/crafting_terminal/sides",
"back": "appliedenergistics2:parts/crafting_terminal/back",
"l0": "appliedenergistics2:parts/crafting_terminal/l0",
"l1": "appliedenergistics2:parts/crafting_terminal/l1",
"l2": "appliedenergistics2:parts/crafting_terminal/l2",
"SidesStatus": "appliedenergistics2:parts/crafting_terminal/sidesstatus",
"Backlights": "appliedenergistics2:parts/crafting_terminal/backlights"
},
"elements": [
{
"name": "Base",
"from": [ 2.0, 2.0, 0.0 ],
"to": [ 14.0, 14.0, 1.0 ],
"faces": {
"north": { "texture": "frame", "uv": [ 2.0, 2.0, 14.0, 14.0 ] },
"east": { "texture": "sides", "uv": [ 0.0, 2.0, 1.0, 14.0 ] },
"south": { "texture": "back", "uv": [ 2.0, 2.0, 14.0, 14.0 ] },
"west": { "texture": "sides", "uv": [ 15.0, 2.0, 16.0, 14.0 ] },
"up": { "texture": "sides", "uv": [ 2.0, 0.0, 14.0, 1.0 ] },
"down": { "texture": "sides", "uv": [ 2.0, 15.0, 14.0, 16.0 ] }
}
},
{
"name": "l0",
"from": [ 2.0, 2.0, 0.0 ],
"to": [ 14.0, 14.0, 1.0 ],
"faces": {
"north": { "texture": "l0", "tintindex": 1, "uv": [ 2.0, 2.0, 14.0, 14.0 ] }
}
},
{
"name": "l1",
"from": [ 2.0, 2.0, 0.0 ],
"to": [ 14.0, 14.0, 1.0 ],
"faces": {
"north": { "texture": "l1", "tintindex": 2, "uv": [ 2.0, 2.0, 14.0, 14.0 ] }
}
},
{
"name": "l2",
"from": [ 2.0, 2.0, 0.0 ],
"to": [ 14.0, 14.0, 1.0 ],
"faces": {
"north": { "texture": "l2", "tintindex": 3, "uv": [ 2.0, 2.0, 14.0, 14.0 ] }
}
},
{
"name": "Back",
"from": [ 4.0, 4.0, 1.0 ],
"to": [ 12.0, 12.0, 2.0 ],
"faces": {
"north": { "texture": "back", "uv": [ 4.0, 4.0, 12.0, 12.0 ] },
"east": { "texture": "SidesStatus", "uv": [ 0.0, 4.0, 1.0, 12.0 ] },
"south": { "texture": "back", "uv": [ 4.0, 4.0, 12.0, 12.0 ] },
"west": { "texture": "SidesStatus", "uv": [ 15.0, 4.0, 16.0, 12.0 ] },
"up": { "texture": "SidesStatus", "uv": [ 4.0, 0.0, 12.0, 1.0 ] },
"down": { "texture": "SidesStatus", "uv": [ 4.0, 15.0, 12.0, 16.0 ] }
}
},
{
"name": "Backlights",
"from": [ 4.0, 4.0, 1.0 ],
"to": [ 12.0, 12.0, 2.0 ],
"faces": {
"east": { "texture": "Backlights", "tintindex": 0, "uv": [ 0.0, 4.0, 1.0, 12.0 ] },
"west": { "texture": "Backlights", "tintindex": 0, "uv": [ 15.0, 4.0, 16.0, 12.0 ] },
"up": { "texture": "Backlights", "tintindex": 0, "uv": [ 4.0, 0.0, 12.0, 1.0 ] },
"down": { "texture": "Backlights", "tintindex": 0, "uv": [ 4.0, 15.0, 12.0, 16.0 ] }
}
}
]
}