diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/part/annihilation_plane.json index 3435fb077..0d881f75e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/annihilation_plane.json @@ -2,70 +2,33 @@ "parent": "appliedenergistics2:item/part/part", "textures": { "sides": "appliedenergistics2:parts/plane_sides", - "plane": "appliedenergistics2:items/part/annihilation_plane" + "plane": "appliedenergistics2:items/part/annihilation_plane", + "back": "appliedenergistics2:parts/transition_plane_back" }, "elements": [ { "name": "Front", - "from": [ - 1, - 1, - 8 - ], - "to": [ - 15, - 15, - 9 - ], + "from": [1, 1, 8], + "to": [15, 15, 9], "faces": { - "north": { - "texture": "plane" - }, - "south": { - "texture": "sides" - }, - "east": { - "texture": "sides" - }, - "west": { - "texture": "sides" - }, - "up": { - "texture": "sides" - }, - "down": { - "texture": "sides" - } + "north": { "uv": [1, 1, 15, 15], "texture": "plane" }, + "east": { "uv": [15, 1, 16, 15], "texture": "sides" }, + "south": { "uv": [1, 1, 15, 15], "texture": "back" }, + "west": { "uv": [0, 1, 1, 15], "texture": "sides" }, + "up": { "uv": [1, 0, 15, 1], "texture": "sides" }, + "down": { "uv": [1, 15, 15, 16], "texture": "sides" } } }, { "name": "Back", - "from": [ - 5, - 5, - 9 - ], - "to": [ - 11, - 11, - 10 - ], + "from": [5, 5, 9], + "to": [11, 11, 10], "faces": { - "east": { - "texture": "sides" - }, - "south": { - "texture": "sides" - }, - "west": { - "texture": "sides" - }, - "up": { - "texture": "sides" - }, - "down": { - "texture": "sides" - } + "east": { "uv": [14, 5, 15, 11], "texture": "sides" }, + "south": { "uv": [5, 5, 11, 11],"texture": "sides" }, + "west": { "uv": [1, 5, 2, 11], "texture": "sides" }, + "up": { "uv": [5, 1, 11, 2], "texture": "sides" }, + "down": { "uv":[5, 14, 11, 15], "texture": "sides" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/display.json b/src/main/resources/assets/appliedenergistics2/models/item/part/display.json index ee5f8e3b4..6058728da 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/display.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/display.json @@ -3,146 +3,78 @@ "textures": { "sides": "appliedenergistics2:parts/monitor_sides", "back": "appliedenergistics2:parts/monitor_back", + "front_base": "appliedenergistics2:parts/monitor_front", "front_medium_bright": "appliedenergistics2:parts/monitor_colored" }, "elements": [ { - "name": "Front", - "from": [ - 2, - 2, - 8 - ], - "to": [ - 14, - 14, - 9 - ], + "name": "Front Base", + "from": [2, 2, 7], + "to": [14, 14, 9], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [2, 2, 14, 14], "texture": "#front_base" }, + "east": { "uv": [14, 2, 16, 14], "texture": "#sides" }, + "south": { "uv": [2, 2, 14, 14], "texture": "#back" }, + "west": { "uv": [0, 2, 2, 14], "texture": "#sides" }, + "up": { "uv": [2, 0, 14, 2], "texture": "#sides" }, + "down": { "uv": [2, 14, 14, 16], "texture": "#sides" } + } + }, + { + "name": "Front", + "from": [3, 3, 7], + "to": [13, 13, 8], + "faces": { + "north": { "uv": [3, 3, 13, 13], "texture": "#front" }, + "east": { "uv": [14, 3, 16, 13], "texture": "#sides" }, + "south": { "uv": [3, 3, 13, 13], "texture": "#back" }, + "west": { "uv": [0, 3, 2, 13], "texture": "#sides" }, + "up": { "uv": [3, 0, 13, 2], "texture": "#sides" }, + "down": { "uv": [3, 14, 13, 16], "texture": "#sides" } } }, { "name": "Front Bright", - "from": [ - 2, - 2, - 8 - ], - "to": [ - 14, - 14, - 9 - ], + "from": [2, 2, 7], + "to": [14, 14, 8], "faces": { - "north": { - "texture": "#front_bright", - "tintindex": 3 - } + "north": { "uv": [2, 2, 14, 14], "texture": "#front_bright", "tintindex": 3 } } }, { "name": "Front Medium Bright", - "from": [ - 2, - 2, - 8 - ], - "to": [ - 14, - 14, - 9 - ], + "from": [2, 2, 7], + "to": [14, 14, 8], "faces": { - "north": { - "texture": "#front_medium_bright", - "tintindex": 4 - } + "north": { "uv": [2, 2, 14, 14], "texture": "#front_medium_bright", "tintindex": 4 } } }, { "name": "Front Medium", - "from": [ - 2, - 2, - 8 - ], - "to": [ - 14, - 14, - 9 - ], + "from": [2, 2, 7], + "to": [14, 14, 8], "faces": { - "north": { - "texture": "#front_medium", - "tintindex": 2 - } + "north": { "uv": [2, 2, 14, 14], "texture": "#front_medium", "tintindex": 2 } } }, { "name": "Front Dark", - "from": [ - 2, - 2, - 8 - ], - "to": [ - 14, - 14, - 9 - ], + "from": [2, 2, 7], + "to": [14, 14, 8], "faces": { - "north": { - "texture": "#front_dark", - "tintindex": 1 - } + "north": { "uv": [2, 2, 14, 14], "texture": "#front_dark", "tintindex": 1 } } }, { "name": "Back", - "from": [ - 4, - 4, - 9 - ], - "to": [ - 12, - 12, - 10 - ], + "from": [4, 4, 9], + "to": [12, 12, 10], "faces": { - "east": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "east": { "uv": [6, 4, 7, 12], "texture": "#sides" }, + "south": { "uv": [4, 4, 12, 12], "texture": "#back" }, + "west": { "uv": [9, 4, 10, 12], "texture": "#sides" }, + "up": { "uv": [4, 9, 12, 10], "texture": "#sides" }, + "down": { "uv": [4, 6, 12, 7], "texture": "#sides" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/export_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/part/export_bus.json index 3b3c94b24..9a4b86af7 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/export_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/export_bus.json @@ -2,104 +2,43 @@ "parent": "appliedenergistics2:item/part/part", "textures": { "sides": "appliedenergistics2:parts/export_bus_sides", - "back": "appliedenergistics2:parts/monitor_back", "front": "appliedenergistics2:items/part/export_bus" }, "elements": [ { - "from": [ - 4, - 4, - 8 - ], - "to": [ - 12, - 12, - 10 - ], + "from": [4, 4, 8], + "to": [12, 12, 10], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [4, 4, 12, 12], "texture": "#front" }, + "east": { "uv": [2, 4, 4, 12], "rotation": 180, "texture": "#sides" }, + "south": { "uv": [4, 4, 12, 12], "texture": "#sides" }, + "west": { "uv": [12, 4, 14, 12], "rotation": 180, "texture": "#sides" }, + "up": { "uv": [4, 2, 12, 4], "texture": "#sides" }, + "down": { "uv": [4, 12, 12, 14], "texture": "#sides" } } }, { - "from": [ - 5, - 5, - 7 - ], - "to": [ - 11, - 11, - 8 - ], + "from": [5, 5, 7], + "to": [11, 11, 8], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [5, 5, 11, 11], "texture": "#front" }, + "east": { "uv": [1, 5, 2, 11], "texture": "#sides" }, + "south": { "uv": [5, 5, 11, 11], "texture": "#sides" }, + "west": { "uv": [14, 5, 15, 11], "texture": "#sides" }, + "up": { "uv": [5, 2, 11, 3], "texture": "#sides" }, + "down": { "uv": [5, 14, 11, 15], "texture": "#sides" } } }, { - "from": [ - 6, - 6, - 6 - ], - "to": [ - 10, - 10, - 7 - ], + "from": [6, 6, 6], + "to": [10, 10, 7], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [6, 6, 10, 10], "texture": "#front" }, + "east": { "uv": [0, 6, 1, 10], "texture": "#sides" }, + "south": { "uv": [6, 6, 10, 10], "texture": "#sides" }, + "west": { "uv": [15, 6, 16, 10], "texture": "#sides" }, + "up": { "uv": [6, 0, 10, 1], "texture": "#sides" }, + "down": { "uv": [6, 15, 10, 16], "texture": "#sides" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_annihilation_plane.json index 6604db0a6..dd3ad4f51 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_annihilation_plane.json @@ -1,72 +1,6 @@ { - "parent": "appliedenergistics2:item/part/part", + "parent": "appliedenergistics2:item/part/annihilation_plane", "textures": { - "sides": "appliedenergistics2:parts/plane_sides", "plane": "appliedenergistics2:items/part/fluid_annihilation_plane" - }, - "elements": [ - { - "name": "Front", - "from": [ - 1, - 1, - 8 - ], - "to": [ - 15, - 15, - 9 - ], - "faces": { - "north": { - "texture": "plane" - }, - "south": { - "texture": "sides" - }, - "east": { - "texture": "sides" - }, - "west": { - "texture": "sides" - }, - "up": { - "texture": "sides" - }, - "down": { - "texture": "sides" - } - } - }, - { - "name": "Back", - "from": [ - 5, - 5, - 9 - ], - "to": [ - 11, - 11, - 10 - ], - "faces": { - "east": { - "texture": "sides" - }, - "south": { - "texture": "sides" - }, - "west": { - "texture": "sides" - }, - "up": { - "texture": "sides" - }, - "down": { - "texture": "sides" - } - } - } - ] + } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_export_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_export_bus.json index 254a9331a..5d5566d56 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_export_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_export_bus.json @@ -2,104 +2,43 @@ "parent": "appliedenergistics2:item/part/part", "textures": { "sides": "appliedenergistics2:parts/export_bus_sides", - "back": "appliedenergistics2:parts/monitor_back", "front": "appliedenergistics2:items/part/fluid_export_bus" }, "elements": [ { - "from": [ - 4, - 4, - 8 - ], - "to": [ - 12, - 12, - 10 - ], + "from": [4, 4, 8], + "to": [12, 12, 10], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [4, 4, 12, 12], "texture": "#front" }, + "east": { "uv": [2, 4, 4, 12], "rotation": 180, "texture": "#sides" }, + "south": { "uv": [4, 4, 12, 12], "texture": "#sides" }, + "west": { "uv": [12, 4, 14, 12], "rotation": 180, "texture": "#sides" }, + "up": { "uv": [4, 2, 12, 4], "texture": "#sides" }, + "down": { "uv": [4, 12, 12, 14], "texture": "#sides" } } }, { - "from": [ - 5, - 5, - 7 - ], - "to": [ - 11, - 11, - 8 - ], + "from": [5, 5, 7], + "to": [11, 11, 8], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [5, 5, 11, 11], "texture": "#front" }, + "east": { "uv": [1, 5, 2, 11], "texture": "#sides" }, + "south": { "uv": [5, 5, 11, 11], "texture": "#sides" }, + "west": { "uv": [14, 5, 15, 11], "texture": "#sides" }, + "up": { "uv": [5, 2, 11, 3], "texture": "#sides" }, + "down": { "uv": [5, 14, 11, 15], "texture": "#sides" } } }, { - "from": [ - 6, - 6, - 6 - ], - "to": [ - 10, - 10, - 7 - ], + "from": [6, 6, 6], + "to": [10, 10, 7], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [6, 6, 10, 10], "texture": "#front" }, + "east": { "uv": [0, 6, 1, 10], "texture": "#sides" }, + "south": { "uv": [6, 6, 10, 10], "texture": "#sides" }, + "west": { "uv": [15, 6, 16, 10], "texture": "#sides" }, + "up": { "uv": [6, 0, 10, 1], "texture": "#sides" }, + "down": { "uv": [6, 15, 10, 16], "texture": "#sides" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_import_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_import_bus.json index 7adde9f95..6fb7874ed 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_import_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_import_bus.json @@ -2,104 +2,43 @@ "parent": "appliedenergistics2:item/part/part", "textures": { "sides": "appliedenergistics2:parts/import_bus_sides", - "back": "appliedenergistics2:parts/monitor_back", "front": "appliedenergistics2:items/part/fluid_import_bus" }, "elements": [ { - "from": [ - 3, - 3, - 8 - ], - "to": [ - 13, - 13, - 9 - ], + "from": [4, 4, 7], + "to": [12, 12, 9], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [4, 4, 12, 12], "texture": "#front" }, + "east": { "uv": [0, 4, 2, 12], "rotation": 180, "texture": "#sides" }, + "south": { "uv": [4, 4, 12, 12], "texture": "#sides" }, + "west": { "uv": [14, 4, 16, 12], "rotation": 180, "texture": "#sides" }, + "up": { "uv": [4, 0, 12, 2], "texture": "#sides" }, + "down": { "uv": [4, 14, 12, 16], "texture": "#sides" } } }, { - "from": [ - 4, - 4, - 9 - ], - "to": [ - 12, - 12, - 10 - ], + "from": [5, 5, 9], + "to": [11, 11, 10], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [5, 5, 11, 11], "texture": "#front" }, + "east": { "uv": [13, 5, 14, 11], "texture": "#sides" }, + "south": { "uv": [5, 5, 11, 11], "texture": "#sides" }, + "west": { "uv": [2, 5, 3, 11], "texture": "#sides" }, + "up": { "uv": [5, 2, 11, 3], "texture": "#sides" }, + "down": { "uv": [5, 13, 11, 14], "texture": "#sides" } } }, { - "from": [ - 5, - 5, - 10 - ], - "to": [ - 11, - 11, - 11 - ], + "from": [6, 6, 10], + "to": [10, 10, 11], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [6, 6, 10, 10], "texture": "#front" }, + "east": { "uv": [3, 6, 4, 10], "texture": "#sides" }, + "south": { "uv": [6, 6, 10, 10], "texture": "#sides" }, + "west": { "uv": [12, 6, 13, 10], "texture": "#sides" }, + "up": { "uv": [6, 12, 10, 13], "texture": "#sides" }, + "down": { "uv": [6, 3, 10, 4], "texture": "#sides" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_interface.json b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_interface.json index c7fda9e65..2a7e474fc 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_interface.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_interface.json @@ -1,105 +1,45 @@ { "parent": "appliedenergistics2:item/part/part", "textures": { - "sides": "appliedenergistics2:parts/monitor_sides", - "back": "appliedenergistics2:parts/monitor_back", + "sides": "appliedenergistics2:parts/fluid_interface_sides", + "back": "appliedenergistics2:parts/fluid_interface_back", "front": "appliedenergistics2:items/part/fluid_interface" }, "elements": [ { - "from": [ - 2, - 2, - 7 - ], - "to": [ - 14, - 14, - 9 - ], + "from": [2, 2, 7], + "to": [14, 14, 9], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [2, 2, 14, 14], "texture": "#front" }, + "east": { "uv": [14, 2, 16, 14], "texture": "#sides" }, + "south": { "uv": [2, 2, 14, 14], "texture": "#back" }, + "west": { "uv": [0, 2, 2, 14], "texture": "#sides" }, + "up": { "uv": [2, 0, 14, 2], "texture": "#sides" }, + "down": { "uv": [2, 14, 14, 16], "texture": "#sides" } } }, { - "from": [ - 5, - 5, - 10 - ], - "to": [ - 11, - 11, - 11 - ], + "from": [5, 5, 10], + "to": [11, 11, 11], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [5, 5, 11, 11], "texture": "#front" }, + "east": { "uv": [5, 5, 6, 11], "texture": "#sides" }, + "south": { "uv": [5, 5, 11, 11], "texture": "#back" }, + "west": { "uv": [10, 5, 11, 11], "texture": "#sides" }, + "up": { "uv": [5, 10, 11, 11], "texture": "#sides" }, + "down": { "uv": [5, 5, 11, 6], "texture": "#sides" } } }, { - "from": [ - 5, - 5, - 9 - ], - "to": [ - 11, - 11, - 10 - ], + "from": [5, 5, 9], + "to": [11, 11, 10], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [5, 5, 11, 11], "texture": "#front" }, + "east": { "uv": [6, 5, 7, 11], "texture": "#sides" }, + "south": { "uv": [5, 5, 11, 11], "texture": "#back" }, + "west": { "uv": [9, 5, 10, 11], "texture": "#sides" }, + "up": { "uv": [5, 9, 11, 10], "texture": "#sides" }, + "down": { "uv": [5, 6, 11, 7], "texture": "#sides" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_storage_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_storage_bus.json index 2a8d25e71..0c199b432 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/fluid_storage_bus.json @@ -7,99 +7,39 @@ }, "elements": [ { - "from": [ - 3, - 3, - 6 - ], - "to": [ - 13, - 13, - 7 - ], + "from": [3, 3, 6], + "to": [13, 13, 7], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [3, 3, 13, 13], "texture": "#front" }, + "east": { "uv": [15, 3, 16, 13], "texture": "#sides" }, + "south": { "uv": [3, 3, 13, 13], "texture": "#back" }, + "west": { "uv": [0, 3, 1, 13], "texture": "#sides" }, + "up": { "uv": [3, 0, 13, 1], "texture": "#sides" }, + "down": { "uv": [3, 15, 13, 16], "texture": "#sides" } } }, { - "from": [ - 2, - 2, - 7 - ], - "to": [ - 14, - 14, - 8 - ], + "from": [2, 2, 7], + "to": [14, 14, 8], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [2, 2, 14, 14], "texture": "#front" }, + "east": { "uv": [14, 2, 15, 14], "texture": "#sides" }, + "south": { "uv": [2, 2, 14, 14], "texture": "#back" }, + "west": { "uv": [1, 2, 2, 14], "texture": "#sides" }, + "up": { "uv": [2, 1, 14, 2], "texture": "#sides" }, + "down": { "uv": [2, 14, 14, 15], "texture": "#sides" } } }, { - "from": [ - 5, - 5, - 8 - ], - "to": [ - 11, - 11, - 10 - ], + "from": [5, 5, 8], + "to": [11, 11, 10], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [5, 5, 11, 11], "texture": "#front" }, + "east": { "uv": [6, 5, 8, 11], "texture": "#sides" }, + "south": { "uv": [5, 5, 11, 11], "texture": "#back" }, + "west": { "uv": [8, 5, 10, 11], "texture": "#sides" }, + "up": { "uv": [5, 8, 11, 10], "texture": "#sides" }, + "down": { "uv": [5, 6, 11, 8], "texture": "#sides" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/import_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/part/import_bus.json index cd019540e..9a49b077d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/import_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/import_bus.json @@ -2,104 +2,43 @@ "parent": "appliedenergistics2:item/part/part", "textures": { "sides": "appliedenergistics2:parts/import_bus_sides", - "back": "appliedenergistics2:parts/monitor_back", "front": "appliedenergistics2:items/part/import_bus" }, "elements": [ { - "from": [ - 3, - 3, - 8 - ], - "to": [ - 13, - 13, - 9 - ], + "from": [4, 4, 7], + "to": [12, 12, 9], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [4, 4, 12, 12], "texture": "#front" }, + "east": { "uv": [0, 4, 2, 12], "rotation": 180, "texture": "#sides" }, + "south": { "uv": [4, 4, 12, 12], "texture": "#sides" }, + "west": { "uv": [14, 4, 16, 12], "rotation": 180, "texture": "#sides" }, + "up": { "uv": [4, 0, 12, 2], "texture": "#sides" }, + "down": { "uv": [4, 14, 12, 16], "texture": "#sides" } } }, { - "from": [ - 4, - 4, - 9 - ], - "to": [ - 12, - 12, - 10 - ], + "from": [5, 5, 9], + "to": [11, 11, 10], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [5, 5, 11, 11], "texture": "#front" }, + "east": { "uv": [13, 5, 14, 11], "texture": "#sides" }, + "south": { "uv": [5, 5, 11, 11], "texture": "#sides" }, + "west": { "uv": [2, 5, 3, 11], "texture": "#sides" }, + "up": { "uv": [5, 2, 11, 3], "texture": "#sides" }, + "down": { "uv": [5, 13, 11, 14], "texture": "#sides" } } }, { - "from": [ - 5, - 5, - 10 - ], - "to": [ - 11, - 11, - 11 - ], + "from": [6, 6, 10], + "to": [10, 10, 11], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [6, 6, 10, 10], "texture": "#front" }, + "east": { "uv": [3, 6, 4, 10], "texture": "#sides" }, + "south": { "uv": [6, 6, 10, 10], "texture": "#sides" }, + "west": { "uv": [12, 6, 13, 10], "texture": "#sides" }, + "up": { "uv": [6, 12, 10, 13], "texture": "#sides" }, + "down": { "uv": [6, 3, 10, 4], "texture": "#sides" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/interface.json b/src/main/resources/assets/appliedenergistics2/models/item/part/interface.json index 8810a7578..94663e497 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/interface.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/interface.json @@ -1,105 +1,45 @@ { "parent": "appliedenergistics2:item/part/part", "textures": { - "sides": "appliedenergistics2:parts/monitor_sides", - "back": "appliedenergistics2:parts/monitor_back", + "sides": "appliedenergistics2:parts/interface_sides", + "back": "appliedenergistics2:parts/interface_back", "front": "appliedenergistics2:items/part/interface" }, "elements": [ { - "from": [ - 2, - 2, - 7 - ], - "to": [ - 14, - 14, - 9 - ], + "from": [2, 2, 7], + "to": [14, 14, 9], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [2, 2, 14, 14], "texture": "#front" }, + "east": { "uv": [14, 2, 16, 14], "texture": "#sides" }, + "south": { "uv": [2, 2, 14, 14], "texture": "#back" }, + "west": { "uv": [0, 2, 2, 14], "texture": "#sides" }, + "up": { "uv": [2, 0, 14, 2], "texture": "#sides" }, + "down": { "uv": [2, 14, 14, 16], "texture": "#sides" } } }, { - "from": [ - 5, - 5, - 10 - ], - "to": [ - 11, - 11, - 11 - ], + "from": [5, 5, 10], + "to": [11, 11, 11], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [5, 5, 11, 11], "texture": "#front" }, + "east": { "uv": [5, 5, 6, 11], "texture": "#sides" }, + "south": { "uv": [5, 5, 11, 11], "texture": "#back" }, + "west": { "uv": [10, 5, 11, 11], "texture": "#sides" }, + "up": { "uv": [5, 10, 11, 11], "texture": "#sides" }, + "down": { "uv": [5, 5, 11, 6], "texture": "#sides" } } }, { - "from": [ - 5, - 5, - 9 - ], - "to": [ - 11, - 11, - 10 - ], + "from": [5, 5, 9], + "to": [11, 11, 10], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [5, 5, 11, 11], "texture": "#front" }, + "east": { "uv": [6, 5, 7, 11], "texture": "#sides" }, + "south": { "uv": [5, 5, 11, 11], "texture": "#back" }, + "west": { "uv": [9, 5, 10, 11], "texture": "#sides" }, + "up": { "uv": [5, 9, 11, 10], "texture": "#sides" }, + "down": { "uv": [5, 6, 11, 7], "texture": "#sides" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/oredict_storage_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/part/oredict_storage_bus.json index 80d1dd036..f1e1cdb03 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/oredict_storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/oredict_storage_bus.json @@ -7,99 +7,39 @@ }, "elements": [ { - "from": [ - 3, - 3, - 6 - ], - "to": [ - 13, - 13, - 7 - ], + "from": [3, 3, 6], + "to": [13, 13, 7], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [3, 3, 13, 13], "texture": "#front" }, + "east": { "uv": [15, 3, 16, 13], "texture": "#sides" }, + "south": { "uv": [3, 3, 13, 13], "texture": "#back" }, + "west": { "uv": [0, 3, 1, 13], "texture": "#sides" }, + "up": { "uv": [3, 0, 13, 1], "texture": "#sides" }, + "down": { "uv": [3, 15, 13, 16], "texture": "#sides" } } }, { - "from": [ - 2, - 2, - 7 - ], - "to": [ - 14, - 14, - 8 - ], + "from": [2, 2, 7], + "to": [14, 14, 8], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [2, 2, 14, 14], "texture": "#front" }, + "east": { "uv": [14, 2, 15, 14], "texture": "#sides" }, + "south": { "uv": [2, 2, 14, 14], "texture": "#back" }, + "west": { "uv": [1, 2, 2, 14], "texture": "#sides" }, + "up": { "uv": [2, 1, 14, 2], "texture": "#sides" }, + "down": { "uv": [2, 14, 14, 15], "texture": "#sides" } } }, { - "from": [ - 5, - 5, - 8 - ], - "to": [ - 11, - 11, - 10 - ], + "from": [5, 5, 8], + "to": [11, 11, 10], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [5, 5, 11, 11], "texture": "#front" }, + "east": { "uv": [6, 5, 8, 11], "texture": "#sides" }, + "south": { "uv": [5, 5, 11, 11], "texture": "#back" }, + "west": { "uv": [8, 5, 10, 11], "texture": "#sides" }, + "up": { "uv": [5, 8, 11, 10], "texture": "#sides" }, + "down": { "uv": [5, 6, 11, 8], "texture": "#sides" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/p2p_tunnel.json b/src/main/resources/assets/appliedenergistics2/models/item/part/p2p_tunnel.json index f4fde3288..20b239349 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/p2p_tunnel.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/p2p_tunnel.json @@ -8,52 +8,64 @@ }, "elements": [ { - "from": [ - 2, - 2, - 7 - ], - "to": [ - 14, - 14, - 9 - ], + "from": [2, 2, 7], + "to": [14, 14, 9], "faces": { - "north": { - "texture": "#type" - } + "north": { "texture": "#type" } } }, { - "from": [ - 2, - 2, - 7 - ], - "to": [ - 14, - 14, - 9 - ], + "from": [2, 2, 7], + "to": [14, 14, 9], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [2, 2, 14, 14], "texture": "#front" }, + "east": { "uv": [14, 2, 16, 14], "texture": "#sides" }, + "south": { "uv": [2, 2, 14, 14], "texture": "#back" }, + "west": { "uv": [0, 2, 2, 14], "texture": "#sides" }, + "up": { "uv": [2, 0, 14, 2], "texture": "#sides" }, + "down": { "uv": [2, 14, 14, 16], "texture": "#sides" } + } + }, + { + "from": [3, 3, 9], + "to": [13, 13, 10], + "faces": { + "east": { "uv" : [6, 3, 7, 13], "texture": "#sides" }, + "south": { "uv": [3, 3, 13, 13], "texture": "#back" }, + "west": { "uv": [9, 3, 10, 13], "texture": "#sides" }, + "up": { "uv": [3, 9, 13, 10], "texture": "#sides" }, + "down": { "uv": [3, 6, 13, 7], "texture": "#sides" } + } + }, + { + "from": [6, 5, 10], + "to": [10, 11, 11], + "faces": { + "east": { "uv": [5, 5, 6, 11], "texture": "#sides" }, + "south": { "uv": [6, 5, 10, 11], "texture": "#back" }, + "west": { "uv": [5, 5, 10, 11], "texture": "#sides" }, + "up": { "uv": [6, 3, 10, 4], "texture": "#sides" }, + "down": { "uv": [6, 12, 10, 13], "texture": "#sides" } + } + }, + { + "from": [5, 6, 10], + "to": [6, 10, 11], + "faces": { + "south": { "uv": [5, 6, 6, 10], "texture": "#back" }, + "west": { "uv": [4, 7, 4, 11], "texture": "#sides" }, + "up": { "uv": [3, 5, 4, 6], "texture": "#sides" }, + "down": { "uv": [3, 10, 4, 11], "texture": "#sides" } + } + }, + { + "from": [10, 6, 10], + "to": [11, 10, 11], + "faces": { + "east": { "uv" : [12, 7, 13, 11], "texture": "#sides" }, + "south": { "uv": [10, 6, 11, 10], "texture": "#back" }, + "up": { "uv": [12, 5, 13, 6], "texture": "#sides" }, + "down": { "uv": [12, 10, 13, 11], "texture": "#sides" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/p2p_tunnel_gteu.json b/src/main/resources/assets/appliedenergistics2/models/item/part/p2p_tunnel_gteu.json index 36925ad3c..fc63fa62c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/p2p_tunnel_gteu.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/p2p_tunnel_gteu.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/part/p2p_tunnel", "textures": { - "type": "appliedenergistics2:parts/p2p/power_gteu" + "type": "minecraft:blocks/obsidian" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/part/storage_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/part/storage_bus.json index 464df4cea..b97922800 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/part/storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/part/storage_bus.json @@ -7,99 +7,39 @@ }, "elements": [ { - "from": [ - 3, - 3, - 6 - ], - "to": [ - 13, - 13, - 7 - ], + "from": [3, 3, 6], + "to": [13, 13, 7], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [3, 3, 13, 13], "texture": "#front" }, + "east": { "uv": [15, 3, 16, 13], "texture": "#sides" }, + "south": { "uv": [3, 3, 13, 13], "texture": "#back" }, + "west": { "uv": [0, 3, 1, 13], "texture": "#sides" }, + "up": { "uv": [3, 0, 13, 1], "texture": "#sides" }, + "down": { "uv": [3, 15, 13, 16], "texture": "#sides" } } }, { - "from": [ - 2, - 2, - 7 - ], - "to": [ - 14, - 14, - 8 - ], + "from": [2, 2, 7], + "to": [14, 14, 8], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [2, 2, 14, 14], "texture": "#front" }, + "east": { "uv": [14, 2, 15, 14], "texture": "#sides" }, + "south": { "uv": [2, 2, 14, 14], "texture": "#back" }, + "west": { "uv": [1, 2, 2, 14], "texture": "#sides" }, + "up": { "uv": [2, 1, 14, 2], "texture": "#sides" }, + "down": { "uv": [2, 14, 14, 15], "texture": "#sides" } } }, { - "from": [ - 5, - 5, - 8 - ], - "to": [ - 11, - 11, - 10 - ], + "from": [5, 5, 8], + "to": [11, 11, 10], "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } + "north": { "uv": [5, 5, 11, 11], "texture": "#front" }, + "east": { "uv": [6, 5, 8, 11], "texture": "#sides" }, + "south": { "uv": [5, 5, 11, 11], "texture": "#back" }, + "west": { "uv": [8, 5, 10, 11], "texture": "#sides" }, + "up": { "uv": [5, 8, 11, 10], "texture": "#sides" }, + "down": { "uv": [5, 6, 11, 8], "texture": "#sides" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json index e9bae6587..775e16236 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json @@ -1,10 +1,10 @@ { "textures": { - "sides": "appliedenergistics2:parts/export_bus_sides", + "sides": "appliedenergistics2:parts/fluid_interface_sides", "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", - "back": "appliedenergistics2:parts/monitor_back", + "back": "appliedenergistics2:parts/fluid_interface_back", "front": "appliedenergistics2:items/part/fluid_interface", - "particle": "appliedenergistics2:parts/monitor_back" + "particle": "appliedenergistics2:parts/fluid_interface_back" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json index 2e153e16e..96d4545a0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json @@ -1,10 +1,10 @@ { "textures": { - "sides": "appliedenergistics2:parts/export_bus_sides", + "sides": "appliedenergistics2:parts/interface_sides", "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", - "back": "appliedenergistics2:parts/monitor_back", + "back": "appliedenergistics2:parts/interface_back", "front": "appliedenergistics2:items/part/interface", - "particle": "appliedenergistics2:parts/monitor_back" + "particle": "appliedenergistics2:parts/interface_back" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json index e1ae2f3e4..ddd739688 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json @@ -1,6 +1,7 @@ { "parent": "appliedenergistics2:part/toggle_bus_base", "textures": { - "bus": "appliedenergistics2:items/part/inverted_toggle_bus" + "bus": "appliedenergistics2:items/part/inverted_toggle_bus", + "particle": "appliedenergistics2:items/part/inverted_toggle_bus" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_gteu.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_gteu.json index d9bae5c72..324b1d577 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_gteu.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_gteu.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:part/p2p/p2p_tunnel_base", "textures": { - "type": "appliedenergistics2:parts/p2p/power_gteu" + "type": "minecraft:blocks/obsidian" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_redstone.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_redstone.json index 8e523bb51..1c206f827 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_redstone.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_redstone.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:part/p2p/p2p_tunnel_base", "textures": { - "type": "appliedenergistics2:blocks/redstone_p2p" + "type": "minecraft:blocks/redstone_block" } } diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/export_bus.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/export_bus.png index dccd04a41..162953397 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/export_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/export_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_export_bus.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_export_bus.png index fa8afa503..1983b0229 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_export_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_export_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_import_bus.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_import_bus.png index f39d2415d..649c4f9e5 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_import_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_import_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_interface.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_interface.png index 2529a9b7e..814c6af8c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_interface.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_interface.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_storage_bus.png index bd13196d8..a5dda9750 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_storage_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/fluid_storage_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/import_bus.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/import_bus.png index f0efb7c6a..42a289fb4 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/import_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/import_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/interface.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/interface.png index dccd04a41..b2485d90a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/interface.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/interface.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/oredict_storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/oredict_storage_bus.png index ba24c0448..3a78fcdbd 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/oredict_storage_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/oredict_storage_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/p2p_tunnel_back.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/p2p_tunnel_back.png index 51430e6aa..4a8eadc9e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/p2p_tunnel_back.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/p2p_tunnel_back.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/p2p_tunnel_back2.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/p2p_tunnel_back2.png index ceffe1de6..cab2ccfe0 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/p2p_tunnel_back2.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/p2p_tunnel_back2.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/p2p_tunnel_front.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/p2p_tunnel_front.png index 08c32b198..768eefd15 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/p2p_tunnel_front.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/p2p_tunnel_front.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/part/storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/items/part/storage_bus.png index efa98de88..85388303d 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/part/storage_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/items/part/storage_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/export_bus_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/export_bus_sides.png index 8b1f6f9f3..1dc2dcb33 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/export_bus_sides.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/export_bus_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_back.png new file mode 100644 index 000000000..957a5c62d Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_back.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_sides.png new file mode 100644 index 000000000..854cc893b Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/import_bus_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/import_bus_sides.png index 8b1f6f9f3..e8934b4b5 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/import_bus_sides.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/import_bus_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/interface_back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/interface_back.png new file mode 100644 index 000000000..d54feccbe Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/interface_back.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/interface_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/interface_sides.png new file mode 100644 index 000000000..1d3d84a01 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/parts/interface_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_back.png index f225dcf4b..77b9633bf 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_back.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_back.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_front.png b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_front.png index c5c2a4c1e..1bac9e1f6 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_front.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_front.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides.png index 8b1f6f9f3..61e123ba4 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_sides.png index 8b1f6f9f3..4ec8dc3df 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_sides.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/plane_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/plane_sides.png index 8b1f6f9f3..8a9bd53d1 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/plane_sides.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/plane_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_back.png index f225dcf4b..c0b8eb9ea 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_back.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_back.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_sides.png index 8b1f6f9f3..280fc8bcf 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_sides.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/transition_plane_back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/transition_plane_back.png index d0b4e2a82..98d56ff7c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/transition_plane_back.png and b/src/main/resources/assets/appliedenergistics2/textures/parts/transition_plane_back.png differ