From 996698c0228823fbbbf6e4c921bfd4bb9780d44e Mon Sep 17 00:00:00 2001 From: yueh Date: Fri, 18 Sep 2020 20:40:51 +0200 Subject: [PATCH] Update models for unlit loader --- .../blockstates/charged_quartz_ore.json | 16 +++++----- .../blockstates/quartz_ore.json | 18 +++++------ .../models/block/charged_quartz_ore0.json | 31 ++++--------------- .../models/block/charged_quartz_ore1.json | 31 ++++--------------- .../models/block/charged_quartz_ore2.json | 31 ++++--------------- .../models/block/chest/lights_on.json | 16 ++-------- .../controller_block_conflicted.json | 31 ++++--------------- .../controller/controller_block_online.json | 31 ++++--------------- .../controller_column_conflicted.json | 31 ++++--------------- .../controller/controller_column_online.json | 31 ++++--------------- .../block/molecular_assembler_lights.json | 31 ++++--------------- .../models/block/security_station_on.json | 16 ++-------- .../block/wireless_access_point_on.json | 26 +++------------- ...eless_access_point_status_has_channel.json | 20 +++--------- .../wireless_access_point_status_on.json | 20 +++--------- .../part/conversion_monitor_locked_on.json | 16 ++-------- .../models/part/conversion_monitor_on.json | 16 ++-------- .../models/part/crafting_terminal_on.json | 16 ++-------- .../part/display_status_has_channel.json | 21 +++---------- .../models/part/display_status_on.json | 21 +++---------- .../models/part/export_bus_has_channel.json | 21 +++---------- .../models/part/export_bus_on.json | 21 +++---------- .../part/fluid_export_bus_has_channel.json | 21 +++---------- .../models/part/fluid_export_bus_on.json | 21 +++---------- .../part/fluid_import_bus_has_channel.json | 21 +++---------- .../models/part/fluid_import_bus_on.json | 21 +++---------- .../part/fluid_interface_has_channel.json | 21 +++---------- .../models/part/fluid_interface_on.json | 21 +++---------- .../part/fluid_storage_bus_has_channel.json | 21 +++---------- .../models/part/fluid_storage_bus_on.json | 21 +++---------- .../models/part/fluid_terminal_on.json | 16 ++-------- .../models/part/import_bus_has_channel.json | 21 +++---------- .../models/part/import_bus_on.json | 21 +++---------- .../models/part/interface_has_channel.json | 21 +++---------- .../models/part/interface_on.json | 21 +++---------- .../models/part/interface_terminal_on.json | 16 ++-------- .../models/part/level_emitter_base_on.json | 26 +++------------- .../level_emitter_status_has_channel.json | 21 +++---------- .../models/part/level_emitter_status_on.json | 21 +++---------- .../models/part/monitor_base.json | 1 - .../models/part/monitor_bright_on.json | 6 +--- .../models/part/monitor_dark_on.json | 6 +--- .../models/part/monitor_medium_on.json | 6 +--- .../p2p/p2p_tunnel_status_has_channel.json | 21 +++---------- .../models/part/p2p/p2p_tunnel_status_on.json | 21 +++---------- .../models/part/pattern_terminal_on.json | 16 ++-------- .../models/part/storage_bus_has_channel.json | 21 +++---------- .../models/part/storage_bus_on.json | 21 +++---------- .../part/storage_monitor_locked_on.json | 16 ++-------- .../models/part/storage_monitor_on.json | 16 ++-------- .../models/part/terminal_on.json | 16 ++-------- .../part/toggle_bus_status_has_channel.json | 21 +++---------- .../models/part/toggle_bus_status_on.json | 21 +++---------- .../part/transition_plane_has_channel.json | 21 +++---------- .../models/part/transition_plane_on.json | 21 +++---------- 55 files changed, 223 insertions(+), 892 deletions(-) diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json index d5bdd47fc..244f95763 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json @@ -1,9 +1,9 @@ { - "variants": { - "": [ - { "model": "appliedenergistics2:block/charged_quartz_ore0", "weight":1 }, - { "model": "appliedenergistics2:block/charged_quartz_ore1", "weight":1 }, - { "model": "appliedenergistics2:block/charged_quartz_ore2", "weight":1 } - ] - } -} \ No newline at end of file + "variants": { + "": [ + { "model": "appliedenergistics2:block/charged_quartz_ore0", "weight": 1 }, + { "model": "appliedenergistics2:block/charged_quartz_ore1", "weight": 1 }, + { "model": "appliedenergistics2:block/charged_quartz_ore2", "weight": 1 } + ] + } +} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json index 50dd9835b..65cf5bcae 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json @@ -1,10 +1,10 @@ { - "variants": { - "": [ - { "model": "appliedenergistics2:block/quartz_ore0", "weight":1 }, - { "model": "appliedenergistics2:block/quartz_ore1", "weight":1 }, - { "model": "appliedenergistics2:block/quartz_ore2", "weight":1 }, - { "model": "appliedenergistics2:block/quartz_ore3", "weight":1 } - ] - } -} \ No newline at end of file + "variants": { + "": [ + { "model": "appliedenergistics2:block/quartz_ore0", "weight": 1 }, + { "model": "appliedenergistics2:block/quartz_ore1", "weight": 1 }, + { "model": "appliedenergistics2:block/quartz_ore2", "weight": 1 }, + { "model": "appliedenergistics2:block/quartz_ore3", "weight": 1 } + ] + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore0.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore0.json index 61ab738f5..e4b0601ad 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore0.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore0.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "block/stone", @@ -42,50 +41,32 @@ "down": { "texture": "#quartz", "cullface": "down", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "east": { "texture": "#quartz", "cullface": "east", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "north": { "texture": "#quartz", "cullface": "north", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "south": { "texture": "#quartz", "cullface": "south", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "up": { "texture": "#quartz", "cullface": "up", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "west": { "texture": "#quartz", "cullface": "west", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore1.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore1.json index adff33729..60ce29668 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore1.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore1.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "block/stone", @@ -42,50 +41,32 @@ "down": { "texture": "#quartz", "cullface": "down", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "east": { "texture": "#quartz", "cullface": "east", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "north": { "texture": "#quartz", "cullface": "north", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "south": { "texture": "#quartz", "cullface": "south", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "up": { "texture": "#quartz", "cullface": "up", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "west": { "texture": "#quartz", "cullface": "west", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore2.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore2.json index 831580877..2a92411b7 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore2.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore2.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "block/stone", @@ -42,50 +41,32 @@ "down": { "texture": "#quartz", "cullface": "down", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "east": { "texture": "#quartz", "cullface": "east", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "north": { "texture": "#quartz", "cullface": "north", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "south": { "texture": "#quartz", "cullface": "south", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "up": { "texture": "#quartz", "cullface": "up", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "west": { "texture": "#quartz", "cullface": "west", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json index 121d8258e..66d754592 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lights_bright": "appliedenergistics2:block/chest/lights_on_bright", "lights_medium": "appliedenergistics2:block/chest/lights_on_medium", @@ -13,10 +12,7 @@ "up": { "texture": "#lights_bright", "tintindex": 3, - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "up": { "texture": "#lights_medium", "tintindex": 2, - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "up": { "texture": "#lights_dark", "tintindex": 1, - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json index 0038cf7a1..f917657ed 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "appliedenergistics2:block/controller_powered", @@ -12,50 +11,32 @@ "down": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "east": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "north": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "south": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "up": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "west": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json index 0ed472fd0..655b3d4b0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "appliedenergistics2:block/controller_powered", @@ -12,50 +11,32 @@ "down": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "east": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "north": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "south": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "up": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "west": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json index 50e506dfd..779ffc3b4 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "appliedenergistics2:block/controller_column_powered", @@ -12,50 +11,32 @@ "down": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "east": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "north": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "south": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "up": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "west": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json index 9b7c7527f..caa9e3c36 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "appliedenergistics2:block/controller_column_powered", @@ -12,50 +11,32 @@ "down": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "east": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "north": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "south": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "up": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "west": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json b/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json index 14d4e092f..06f2d9fc3 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "all": "appliedenergistics2:block/molecular_assembler_lights" @@ -13,55 +12,37 @@ "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "down", - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "up", - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "north": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "north", - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "south": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "south", - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "west", - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "east", - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json b/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json index b654e4592..c25b3b786 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "particle": "appliedenergistics2:block/security_station_side", @@ -42,10 +41,7 @@ "up": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -56,10 +52,7 @@ "up": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -70,10 +63,7 @@ "up": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json index 60be1d40c..c177c621d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "ambientocclusion": false, "textures": { "torch": "appliedenergistics2:block/wireless_access_point_on" @@ -39,10 +38,7 @@ "texture": "#torch", "uv": [7, 7, 9, 9], "rotation": 270, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -55,19 +51,13 @@ "texture": "#torch", "uv": [6, 6, 10, 10], "rotation": 90, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "down": { "texture": "#torch", "uv": [6, 6, 10, 10], "rotation": 270, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -79,19 +69,13 @@ "west": { "texture": "#torch", "uv": [6, 6, 10, 10], - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#torch", "uv": [6, 6, 10, 10], "rotation": 180, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json index 22a9db566..dbc069977 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json @@ -10,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json index 784ba620c..e3be67738 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json @@ -10,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json index dc374107a..9ded490b6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/conversion_monitor_bright", "lightsMedium": "appliedenergistics2:part/conversion_monitor_medium_locked", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json index d606f38cf..8f8d8db46 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/conversion_monitor_bright", "lightsMedium": "appliedenergistics2:part/conversion_monitor_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json index b3b37bf99..a6bff04dd 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/crafting_terminal_bright", "lightsMedium": "appliedenergistics2:part/crafting_terminal_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json index a3c08b8e5..2332c0c1f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json index 5ea6cdd15..ff9a34fd1 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json index 0f6fe350a..3da73d935 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json index 9444d89aa..a20d4889b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json index 0f6fe350a..3da73d935 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json index 9444d89aa..a20d4889b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json index 0f6fe350a..3da73d935 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json index 9444d89aa..a20d4889b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json index b87024a70..3f5b0904c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json index 88c28f857..bbe1ed528 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json index b87024a70..3f5b0904c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json index 88c28f857..bbe1ed528 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json index 39624a853..f570ba3ae 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/fluid_terminal_bright", "lightsMedium": "appliedenergistics2:part/fluid_terminal_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json index 0f6fe350a..3da73d935 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json index 9444d89aa..a20d4889b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json index b87024a70..3f5b0904c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json index 88c28f857..bbe1ed528 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json index f88c8cec0..95b3b485c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/interface_terminal_bright", "lightsMedium": "appliedenergistics2:part/interface_terminal_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json index 3a8418500..cac0bbcf2 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "ambientocclusion": false, "textures": { "emitter": "appliedenergistics2:part/level_emitter_on", @@ -40,10 +39,7 @@ "texture": "#emitter", "uv": [6, 7, 8, 9], "rotation": 270, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -56,19 +52,13 @@ "texture": "#emitter", "uv": [5, 6, 9, 10], "rotation": 90, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "down": { "texture": "#emitter", "uv": [5, 6, 9, 10], "rotation": 270, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -80,19 +70,13 @@ "west": { "texture": "#emitter", "uv": [5, 6, 9, 10], - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#emitter", "uv": [5, 6, 9, 10], "rotation": 180, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json index 459e7a6d8..ace6ff599 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json index edfc24671..3469d5d19 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json index 36412650d..0408175a1 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "sides": "appliedenergistics2:part/monitor_sides", "back": "appliedenergistics2:part/monitor_back", diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json index 6686c7dc7..5d79e20b0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "ambientocclusion": false, "textures": { "lights": "appliedenergistics2:part/monitor_light" @@ -13,10 +12,7 @@ "north": { "texture": "#lights", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json index 361b7cd80..749be0e5f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lights": "appliedenergistics2:part/monitor_light" }, @@ -11,10 +10,7 @@ "north": { "texture": "#lights", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json index f4477877a..6dd1ca6ba 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lights": "appliedenergistics2:part/monitor_light" }, @@ -11,10 +10,7 @@ "north": { "texture": "#lights", "tintindex": 4, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json index 32f2e7f9d..12ca1ea90 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json index 745408f15..3b9fda716 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json index 773395bfe..e792d4ca8 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/pattern_terminal_bright", "lightsMedium": "appliedenergistics2:part/pattern_terminal_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json index b87024a70..3f5b0904c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json index 88c28f857..bbe1ed528 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json index 2512544c5..de562aa44 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/storage_monitor_bright", "lightsMedium": "appliedenergistics2:part/storage_monitor_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json index 994f39b27..86325bf35 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/storage_monitor_bright", "lightsMedium": "appliedenergistics2:part/storage_monitor_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json index 61f131c5b..d9585f270 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/terminal_bright", "lightsMedium": "appliedenergistics2:part/terminal_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json index 9f2640024..9c8a2c25f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json index 444e5f7fe..2c017321f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json index 412232729..2a0068f07 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "sides": "appliedenergistics2:part/monitor_sides_status", "back": "appliedenergistics2:part/transition_plane_back", @@ -34,34 +33,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json index 22d22c288..447de5476 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "sides": "appliedenergistics2:part/monitor_sides_status", "back": "appliedenergistics2:part/transition_plane_back", @@ -35,34 +34,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }