From 8a20d3c1d75c77cc89a3078fe05296c45bdd37cb Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 15:00:46 +0200 Subject: [PATCH] Consolidated fluid models to reuse the item counterparts with different textures. --- .../models/item/cable_fluid_interface.json | 78 +------------- .../models/item/fluid_annihilation_plane.json | 53 +--------- .../models/item/fluid_export_bus.json | 78 +------------- .../models/item/fluid_import_bus.json | 78 +------------- .../models/item/fluid_level_emitter.json | 19 +--- .../models/item/fluid_storage_bus.json | 78 +------------- .../models/part/fluid_export_bus_base.json | 100 +----------------- .../models/part/fluid_import_bus_base.json | 98 +---------------- .../models/part/fluid_interface_base.json | 74 +------------ .../models/part/fluid_storage_bus_base.json | 92 +--------------- 10 files changed, 20 insertions(+), 728 deletions(-) diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json b/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json index 7d834414b..262546da6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json @@ -1,82 +1,8 @@ { - "parent": "appliedenergistics2:item/part_base", + "parent": "appliedenergistics2:item/cable_interface", "textures": { "sides": "appliedenergistics2:part/monitor_sides", "back": "appliedenergistics2:part/monitor_back", "front": "appliedenergistics2:part/fluid_interface" - }, - "elements": [ - { - "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" - } - } - }, - { - "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" - } - } - }, - { - "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" - } - } - } - ] + } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json index 1cc1eb6bb..63c56197d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json @@ -1,56 +1,7 @@ { - "parent": "appliedenergistics2:item/part_base", + "parent": "appliedenergistics2:item/annihilation_plane", "textures": { "sides": "appliedenergistics2:part/plane_sides", "plane": "appliedenergistics2: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/fluid_export_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json index 107d8242f..3257ae766 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json @@ -1,82 +1,8 @@ { - "parent": "appliedenergistics2:item/part_base", + "parent": "appliedenergistics2:item/export_bus", "textures": { "sides": "appliedenergistics2:part/export_bus_sides", "back": "appliedenergistics2:part/monitor_back", "front": "appliedenergistics2:part/fluid_export_bus" - }, - "elements": [ - { - "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" - } - } - }, - { - "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" - } - } - }, - { - "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" - } - } - } - ] + } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json index 9ed0a9c9e..cb2e2ffdc 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json @@ -1,82 +1,8 @@ { - "parent": "appliedenergistics2:item/part_base", + "parent": "appliedenergistics2:item/import_bus", "textures": { "sides": "appliedenergistics2:part/import_bus_sides", "back": "appliedenergistics2:part/monitor_back", "front": "appliedenergistics2:part/fluid_import_bus" - }, - "elements": [ - { - "from": [3, 3, 8], - "to": [13, 13, 9], - "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } - } - }, - { - "from": [4, 4, 9], - "to": [12, 12, 10], - "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } - } - }, - { - "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" - } - } - } - ] + } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json index 3e85e7147..9347ceeee 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json @@ -1,20 +1,3 @@ { - "parent": "appliedenergistics2:item/part_base", - "textures": { - "emitter": "appliedenergistics2:part/level_emitter_off" - }, - "elements": [ - { - "from": [7, 6, 7], - "to": [9, 10, 9], - "faces": { - "north": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, - "east": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, - "south": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, - "west": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, - "up": { "uv": [6, 7, 8, 9], "texture": "#emitter" }, - "down": { "uv": [8, 7, 10, 9], "texture": "#emitter" } - } - } - ] + "parent": "appliedenergistics2:item/level_emitter" } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json index e6fa64fb6..83b33b90e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json @@ -1,82 +1,8 @@ { - "parent": "appliedenergistics2:item/part_base", + "parent": "appliedenergistics2:item/storage_bus", "textures": { "sides": "appliedenergistics2:part/storage_bus_sides", "back": "appliedenergistics2:part/storage_bus_back", "front": "appliedenergistics2:part/fluid_storage_bus" - }, - "elements": [ - { - "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" - } - } - }, - { - "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" - } - } - }, - { - "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" - } - } - } - ] + } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json index 764d91141..d35b0c854 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json @@ -1,104 +1,10 @@ { + "parent": "appliedenergistics2:part/export_bus_base", "textures": { "sides": "appliedenergistics2:part/export_bus_sides", "sidesStatus": "appliedenergistics2:part/monitor_sides_status", "back": "appliedenergistics2:part/monitor_back", "front": "appliedenergistics2:part/fluid_export_bus", "particle": "appliedenergistics2:part/monitor_back" - }, - "elements": [ - { - "from": [4, 4, 2], - "to": [12, 12, 4], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 1], - "to": [11, 11, 2], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [6, 6, 0], - "to": [10, 10, 1], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [6, 6, 4], - "to": [10, 10, 5], - "faces": { - "down": { - "texture": "#sidesStatus" - }, - "up": { - "texture": "#sidesStatus" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sidesStatus" - }, - "west": { - "texture": "#sidesStatus" - } - } - } - ] -} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json index 9f8b04961..6e0969905 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json @@ -1,104 +1,10 @@ { + "parent": "appliedenergistics2:part/import_bus_base", "textures": { "sides": "appliedenergistics2:part/import_bus_sides", "sidesStatus": "appliedenergistics2:part/monitor_sides_status", "back": "appliedenergistics2:part/monitor_back", "front": "appliedenergistics2:part/fluid_import_bus", "particle": "appliedenergistics2:part/monitor_back" - }, - "elements": [ - { - "from": [4, 4, 0], - "to": [12, 12, 2], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 2], - "to": [11, 11, 3], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [6, 6, 3], - "to": [10, 10, 4], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [6, 6, 4], - "to": [10, 10, 5], - "faces": { - "down": { - "texture": "#sidesStatus" - }, - "up": { - "texture": "#sidesStatus" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sidesStatus" - }, - "west": { - "texture": "#sidesStatus" - } - } - } - ] + } } 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 57799b8bd..f57a20199 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,80 +1,10 @@ { + "parent": "appliedenergistics2:part/interface_base", "textures": { "sides": "appliedenergistics2:part/export_bus_sides", "sidesStatus": "appliedenergistics2:part/monitor_sides_status", "back": "appliedenergistics2:part/monitor_back", "front": "appliedenergistics2:part/fluid_interface", "particle": "appliedenergistics2:part/monitor_back" - }, - "elements": [ - { - "from": [2, 2, 0], - "to": [14, 14, 2], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 3], - "to": [11, 11, 4], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 2], - "to": [11, 11, 3], - "faces": { - "down": { - "texture": "#sidesStatus" - }, - "up": { - "texture": "#sidesStatus" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sidesStatus" - }, - "west": { - "texture": "#sidesStatus" - } - } - } - ] + } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json index 2b89c80c9..63e0a103f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json @@ -1,98 +1,10 @@ { + "parent": "appliedenergistics2:part/storage_bus_base", "textures": { "sides": "appliedenergistics2:part/storage_bus_sides", "sidesStatus": "appliedenergistics2:part/monitor_sides_status", "back": "appliedenergistics2:part/storage_bus_back", "front": "appliedenergistics2:part/fluid_storage_bus", "particle": "appliedenergistics2:part/storage_bus_back" - }, - "elements": [ - { - "from": [3, 3, 0], - "to": [13, 13, 1], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [2, 2, 1], - "to": [14, 14, 2], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 3], - "to": [11, 11, 4], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 2], - "to": [11, 11, 3], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - } - } - } - ] + } }