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

Reimplemented cable and parts rendering.

Browse Source
This commit is contained in:
Sebastian Hartte
2016-08-29 09:47:17 +02:00
parent 0b756708d4
commit 7e027da804
358 changed files with 5964 additions and 1901 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/models/item/part/cable_covered_lightgray.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"parent": "appliedenergistics2:item/part/cable_covered_base",
"textures": {
"base": "appliedenergistics2:parts/cable/covered/lightgrey"
"base": "appliedenergistics2:parts/cable/covered/lightgray"
}
}
src/main/resources/assets/appliedenergistics2/models/item/part/cable_dense_lightgray.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"parent": "appliedenergistics2:item/part/cable_dense_base",
"textures": {
"base": "appliedenergistics2:parts/cable/dense/lightgrey"
"base": "appliedenergistics2:parts/cable/dense/lightgray"
}
}
src/main/resources/assets/appliedenergistics2/models/item/part/cable_glass_lightgray.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"parent": "appliedenergistics2:item/part/cable_glass_base",
"textures": {
"base": "appliedenergistics2:parts/cable/glass/lightgrey"
"base": "appliedenergistics2:parts/cable/glass/lightgray"
}
}
src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_base.json
+22 -8
View File
@@ -1,7 +1,8 @@
{
"parent": "appliedenergistics2:item/part/part",
"textures": {
"channels": "appliedenergistics2:parts/cable/smart/0"
"channelsOdd": "appliedenergistics2:parts/cable/smart/channels_00",
"channelsEven": "appliedenergistics2:parts/cable/smart/channels_10"
},
"elements": [
{
@@ -18,16 +19,29 @@
}
},
{
"name": "Channels",
"name": "Channels Odd",
"from": [ 5.0, 5.0, 2.0 ],
"to": [ 11.0, 11.0, 14.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 ] }
"north": { "texture": "#channelsOdd", "uv": [ 5.0, 5.0, 11.0, 11.0 ] },
"east": { "texture": "#channelsOdd", "uv": [ 0.0, 5.0, 5.0, 11.0 ] },
"south": { "texture": "#channelsOdd", "uv": [ 11.0, 5.0, 5.0, 11.0 ] },
"west": { "texture": "#channelsOdd", "uv": [ 5.0, 5.0, 0.0, 11.0 ] },
"up": { "texture": "#channelsOdd", "uv": [ 5.0, 0.0, 11.0, 5.0 ] },
"down": { "texture": "#channelsOdd", "uv": [ 5.0, 11.0, 11.0, 16.0 ] }
}
},
{
"name": "Channels Even",
"from": [ 5.0, 5.0, 2.0 ],
"to": [ 11.0, 11.0, 14.0 ],
"faces": {
"north": { "texture": "#channelsEven", "uv": [ 5.0, 5.0, 11.0, 11.0 ] },
"east": { "texture": "#channelsEven", "uv": [ 0.0, 5.0, 5.0, 11.0 ] },
"south": { "texture": "#channelsEven", "uv": [ 11.0, 5.0, 5.0, 11.0 ] },
"west": { "texture": "#channelsEven", "uv": [ 5.0, 5.0, 0.0, 11.0 ] },
"up": { "texture": "#channelsEven", "uv": [ 5.0, 0.0, 11.0, 5.0 ] },
"down": { "texture": "#channelsEven", "uv": [ 5.0, 11.0, 11.0, 16.0 ] }
}
}
]
src/main/resources/assets/appliedenergistics2/models/item/part/cable_smart_lightgray.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"parent": "appliedenergistics2:item/part/cable_smart_base",
"textures": {
"base": "appliedenergistics2:parts/cable/smart/lightgrey"
"base": "appliedenergistics2:parts/cable/smart/lightgray"
}
}
src/main/resources/assets/appliedenergistics2/models/item/part/crafting_terminal.json
+3 -3
View File
@@ -2,8 +2,8 @@
"parent": "appliedenergistics2:item/part/display",
"textures": {
"front": "appliedenergistics2:items/part/crafting_terminal",
"front_bright": "appliedenergistics2:parts/crafting_terminal/l2",
"front_medium": "appliedenergistics2:parts/crafting_terminal/l1",
"front_dark": "appliedenergistics2:parts/crafting_terminal/l0"
"front_bright": "appliedenergistics2:parts/crafting_terminal_bright",
"front_medium": "appliedenergistics2:parts/crafting_terminal_medium",
"front_dark": "appliedenergistics2:parts/crafting_terminal_dark"
}
}
src/main/resources/assets/appliedenergistics2/models/item/part/dark_monitor.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parent": "appliedenergistics2:item/part/display",
"textures": {
"front": "appliedenergistics2:items/part/crafting_terminal",
"front": "appliedenergistics2:parts/monitor_front",
"front_bright": "appliedenergistics2:parts/monitor_colored",
"front_medium": "appliedenergistics2:parts/monitor_bright",
"front_dark": "appliedenergistics2:parts/monitor_colored"
src/main/resources/assets/appliedenergistics2/models/item/part/display.json
+11 -2
View File
@@ -2,7 +2,8 @@
"parent": "appliedenergistics2:item/part/part",
"textures": {
"sides": "appliedenergistics2:parts/monitor_sides",
"back": "appliedenergistics2:parts/monitor_back"
"back": "appliedenergistics2:parts/monitor_back",
"front_medium_bright": "appliedenergistics2:parts/monitor_colored"
},
"elements": [
{
@@ -23,7 +24,15 @@
"from": [ 2, 2, 8 ],
"to": [ 14, 14, 9 ],
"faces": {
"north": { "texture": "#front_bright", "tintindex": 0 }
"north": { "texture": "#front_bright", "tintindex": 3 }
}
},
{
"name": "Front Medium Bright",
"from": [ 2, 2, 8 ],
"to": [ 14, 14, 9 ],
"faces": {
"north": { "texture": "#front_medium_bright", "tintindex": 4 }
}
},
{
src/main/resources/assets/appliedenergistics2/models/item/part/export_bus.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parent": "appliedenergistics2:item/part/part",
"textures": {
"sides": "appliedenergistics2:parts/export_sides",
"sides": "appliedenergistics2:parts/export_bus_sides",
"back": "appliedenergistics2:parts/monitor_back",
"front": "appliedenergistics2:items/part/export_bus"
},
src/main/resources/assets/appliedenergistics2/models/item/part/import_bus.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parent": "appliedenergistics2:item/part/part",
"textures": {
"sides": "appliedenergistics2:parts/import_sides",
"sides": "appliedenergistics2:parts/import_bus_sides",
"back": "appliedenergistics2:parts/monitor_back",
"front": "appliedenergistics2:items/part/import_bus"
},
src/main/resources/assets/appliedenergistics2/models/item/part/semi_dark_monitor.json
+3 -2
View File
@@ -1,9 +1,10 @@
{
"parent": "appliedenergistics2:item/part/display",
"textures": {
"front": "appliedenergistics2:items/part/crafting_terminal",
"front": "appliedenergistics2:parts/monitor_front",
"front_bright": "appliedenergistics2:parts/monitor_colored",
"front_medium_bright": "appliedenergistics2:parts/monitor_bright",
"front_medium": "appliedenergistics2:parts/monitor_colored",
"front_dark": "appliedenergistics2:parts/monitor_bright"
"front_dark": "appliedenergistics2:parts/monitor_colored"
}
}