From d120c686fc434fe09cbf051dac939524012cac31 Mon Sep 17 00:00:00 2001 From: PaulGoersCode <102575758+PaulGoersCode@users.noreply.github.com> Date: Wed, 22 Mar 2023 15:33:01 -0500 Subject: [PATCH] Most Current New Resources Updated Advanced Campfire (both states), Advanced Candle (both states), and Solar Panel Textures and Models. Added Hanging Fire (both states), and Jack O' Lantern Trio. --- ..._base.json => advanced_campfire_base.json} | 2 +- ...t.json => advanced_campfire_base_off.json} | 2 +- .../models/block/advanced_candle_base.json | 203 +++++++++ .../block/advanced_candle_base_lit.json | 203 +++++++++ ..._campfire_lit.json => black_campfire.json} | 2 +- ...ire_unlit.json => black_campfire_off.json} | 2 +- ...e_campfire_lit.json => blue_campfire.json} | 2 +- ...fire_unlit.json => blue_campfire_off.json} | 2 +- ..._campfire_lit.json => brown_campfire.json} | 2 +- ...ire_unlit.json => brown_campfire_off.json} | 2 +- ...n_campfire_lit.json => cyan_campfire.json} | 2 +- ...fire_unlit.json => cyan_campfire_off.json} | 2 +- ...y_campfire_lit.json => gray_campfire.json} | 2 +- ...fire_unlit.json => gray_campfire_off.json} | 2 +- ..._campfire_lit.json => green_campfire.json} | 2 +- ...ire_unlit.json => green_campfire_off.json} | 2 +- ...fire_lit.json => light_blue_campfire.json} | 2 +- ...nlit.json => light_blue_campfire_off.json} | 2 +- ...fire_lit.json => light_gray_campfire.json} | 2 +- ...nlit.json => light_gray_campfire_off.json} | 2 +- ...e_campfire_lit.json => lime_campfire.json} | 2 +- ...fire_unlit.json => lime_campfire_off.json} | 2 +- ...ampfire_lit.json => magenta_campfire.json} | 2 +- ...e_unlit.json => magenta_campfire_off.json} | 2 +- ...campfire_lit.json => orange_campfire.json} | 2 +- ...re_unlit.json => orange_campfire_off.json} | 2 +- ...k_campfire_lit.json => pink_campfire.json} | 2 +- ...fire_unlit.json => pink_campfire_off.json} | 2 +- ...campfire_lit.json => purple_campfire.json} | 2 +- ...re_unlit.json => purple_campfire_off.json} | 2 +- ...ed_campfire_lit.json => red_campfire.json} | 2 +- ...pfire_unlit.json => red_campfire_off.json} | 2 +- ..._campfire_lit.json => white_campfire.json} | 2 +- ...ire_unlit.json => white_campfire_off.json} | 2 +- ...campfire_lit.json => yellow_campfire.json} | 2 +- ...re_unlit.json => yellow_campfire_off.json} | 2 +- .../models/block/candle/black_candle.json | 4 +- .../models/block/candle/black_candle_lit.json | 6 + .../models/block/candle/blue_candle.json | 4 +- .../models/block/candle/blue_candle_lit.json | 6 + .../models/block/candle/brown_candle.json | 4 +- .../models/block/candle/brown_candle_lit.json | 6 + .../models/block/candle/cyan_candle.json | 4 +- .../models/block/candle/cyan_candle_lit.json | 6 + .../models/block/candle/gray_candle.json | 5 +- .../models/block/candle/gray_candle_lit.json | 5 + .../models/block/candle/green_candle.json | 4 +- .../models/block/candle/green_candle_lit.json | 6 + .../block/candle/light_blue_candle.json | 4 +- .../block/candle/light_blue_candle_lit.json | 6 + .../block/candle/light_gray_candle.json | 4 +- .../block/candle/light_gray_candle_lit.json | 6 + .../models/block/candle/lime_candle.json | 4 +- .../models/block/candle/lime_candle_lit.json | 6 + .../models/block/candle/magenta_candle.json | 4 +- .../block/candle/magenta_candle_lit.json | 6 + .../models/block/candle/orange_candle.json | 4 +- .../block/candle/orange_candle_lit.json | 6 + .../models/block/candle/pink_candle.json | 4 +- .../models/block/candle/pink_candle_lit.json | 6 + .../models/block/candle/purple_candle.json | 4 +- .../block/candle/purple_candle_lit.json | 6 + .../models/block/candle/red_candle.json | 4 +- .../models/block/candle/red_candle_lit.json | 6 + .../models/block/candle/white_candle.json | 4 +- .../models/block/candle/white_candle_lit.json | 6 + .../models/block/candle/yellow_candle.json | 4 +- .../block/candle/yellow_candle_lit.json | 6 + .../models/block/candle_base.json | 50 -- .../models/block/hanging_fire.json | 427 ++++++++++++++++++ .../models/block/hanging_fire_off.json | 392 ++++++++++++++++ .../models/block/jacklantern_trio.json | 80 ++++ .../models/block/solar_panel.json | 28 +- .../block/candle/base/advanced_candle.png | Bin 0 -> 650 bytes .../candle/base/black_advanced_candle.png | Bin 0 -> 650 bytes .../candle/base/blue_advanced_candle.png | Bin 0 -> 646 bytes .../candle/base/brown_advanced_candle.png | Bin 0 -> 651 bytes .../candle/base/cyan_advanced_candle.png | Bin 0 -> 652 bytes .../candle/base/gray_advanced_candle.png | Bin 0 -> 644 bytes .../candle/base/green_advanced_candle.png | Bin 0 -> 651 bytes .../base/light_blue_advanced_candle.png | Bin 0 -> 652 bytes .../base/light_gray_advanced_candle.png | Bin 0 -> 647 bytes .../candle/base/lime_advanced_candle.png | Bin 0 -> 653 bytes .../candle/base/magenta_advanced_candle.png | Bin 0 -> 644 bytes .../candle/base/orange_advanced_candle.png | Bin 0 -> 650 bytes .../candle/base/pink_advanced_candle.png | Bin 0 -> 650 bytes .../candle/base/purple_advanced_candle.png | Bin 0 -> 653 bytes .../block/candle/base/red_advanced_candle.png | Bin 0 -> 651 bytes .../candle/base/white_advanced_candle.png | Bin 0 -> 648 bytes .../candle/base/yellow_advanced_candle.png | Bin 0 -> 649 bytes .../block/candle/lit/advanced_candle_lit.png | Bin 0 -> 687 bytes .../candle/lit/black_advanced_candle_lit.png | Bin 0 -> 708 bytes .../candle/lit/blue_advanced_candle_lit.png | Bin 0 -> 694 bytes .../candle/lit/brown_advanced_candle_lit.png | Bin 0 -> 688 bytes .../candle/lit/cyan_advanced_candle_lit.png | Bin 0 -> 702 bytes .../candle/lit/gray_advanced_candle_lit.png | Bin 0 -> 690 bytes .../candle/lit/green_advanced_candle_lit.png | Bin 0 -> 701 bytes .../lit/light_blue_advanced_candle_lit.png | Bin 0 -> 692 bytes .../lit/light_gray_advanced_candle_lit.png | Bin 0 -> 685 bytes .../candle/lit/lime_advanced_candle_lit.png | Bin 0 -> 698 bytes .../lit/magenta_advanced_candle_lit.png | Bin 0 -> 685 bytes .../candle/lit/orange_advanced_candle_lit.png | Bin 0 -> 705 bytes .../candle/lit/pink_advanced_candle_lit.png | Bin 0 -> 707 bytes .../candle/lit/purple_advanced_candle_lit.png | Bin 0 -> 708 bytes .../candle/lit/red_advanced_candle_lit.png | Bin 0 -> 701 bytes .../candle/lit/white_advanced_candle_lit.png | Bin 0 -> 703 bytes .../candle/lit/yellow_advanced_candle_lit.png | Bin 0 -> 697 bytes .../textures/block/small_carved_pumpkin.png | Bin 0 -> 877 bytes 108 files changed, 1467 insertions(+), 144 deletions(-) rename Common/src/main/resources/assets/hyperlighting/models/block/{campfire_base.json => advanced_campfire_base.json} (99%) rename Common/src/main/resources/assets/hyperlighting/models/block/{campfire_base_unlit.json => advanced_campfire_base_off.json} (99%) create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/advanced_candle_base.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/advanced_candle_base_lit.json rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{black_campfire_lit.json => black_campfire.json} (82%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{black_campfire_unlit.json => black_campfire_off.json} (70%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{blue_campfire_lit.json => blue_campfire.json} (82%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{blue_campfire_unlit.json => blue_campfire_off.json} (70%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{brown_campfire_lit.json => brown_campfire.json} (82%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{brown_campfire_unlit.json => brown_campfire_off.json} (70%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{cyan_campfire_lit.json => cyan_campfire.json} (82%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{cyan_campfire_unlit.json => cyan_campfire_off.json} (70%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{gray_campfire_lit.json => gray_campfire.json} (82%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{gray_campfire_unlit.json => gray_campfire_off.json} (70%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{green_campfire_lit.json => green_campfire.json} (82%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{green_campfire_unlit.json => green_campfire_off.json} (70%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{light_blue_campfire_lit.json => light_blue_campfire.json} (83%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{light_blue_campfire_unlit.json => light_blue_campfire_off.json} (72%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{light_gray_campfire_lit.json => light_gray_campfire.json} (83%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{light_gray_campfire_unlit.json => light_gray_campfire_off.json} (72%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{lime_campfire_lit.json => lime_campfire.json} (82%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{lime_campfire_unlit.json => lime_campfire_off.json} (70%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{magenta_campfire_lit.json => magenta_campfire.json} (83%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{magenta_campfire_unlit.json => magenta_campfire_off.json} (71%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{orange_campfire_lit.json => orange_campfire.json} (82%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{orange_campfire_unlit.json => orange_campfire_off.json} (71%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{pink_campfire_lit.json => pink_campfire.json} (82%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{pink_campfire_unlit.json => pink_campfire_off.json} (70%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{purple_campfire_lit.json => purple_campfire.json} (82%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{purple_campfire_unlit.json => purple_campfire_off.json} (71%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{red_campfire_lit.json => red_campfire.json} (82%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{red_campfire_unlit.json => red_campfire_off.json} (70%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{white_campfire_lit.json => white_campfire.json} (82%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{white_campfire_unlit.json => white_campfire_off.json} (70%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{yellow_campfire_lit.json => yellow_campfire.json} (82%) rename Common/src/main/resources/assets/hyperlighting/models/block/campfire/{yellow_campfire_unlit.json => yellow_campfire_off.json} (71%) create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/black_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/blue_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/brown_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/cyan_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/gray_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/green_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/light_blue_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/light_gray_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/lime_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/magenta_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/orange_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/pink_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/purple_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/red_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/white_candle_lit.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle/yellow_candle_lit.json delete mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/candle_base.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/hanging_fire.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/hanging_fire_off.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/jacklantern_trio.json create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/black_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/blue_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/brown_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/cyan_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/gray_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/green_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/light_blue_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/light_gray_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/lime_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/magenta_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/orange_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/pink_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/purple_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/red_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/white_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/yellow_advanced_candle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/black_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/blue_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/brown_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/cyan_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/gray_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/green_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/light_blue_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/light_gray_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/lime_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/magenta_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/orange_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/pink_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/purple_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/red_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/white_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/yellow_advanced_candle_lit.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/small_carved_pumpkin.png diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire_base.json b/Common/src/main/resources/assets/hyperlighting/models/block/advanced_campfire_base.json similarity index 99% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire_base.json rename to Common/src/main/resources/assets/hyperlighting/models/block/advanced_campfire_base.json index a97e04b..ff6a6a5 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire_base.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/advanced_campfire_base.json @@ -97,4 +97,4 @@ } } ] -} +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire_base_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/advanced_campfire_base_off.json similarity index 99% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire_base_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/advanced_campfire_base_off.json index d49ccdf..bc3f900 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire_base_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/advanced_campfire_base_off.json @@ -69,4 +69,4 @@ } } ] -} +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/advanced_candle_base.json b/Common/src/main/resources/assets/hyperlighting/models/block/advanced_candle_base.json new file mode 100644 index 0000000..dbc5881 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/advanced_candle_base.json @@ -0,0 +1,203 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "hyperlighting:block/candle/base/advanced_candle", + "particle": "hyperlighting:block/candle/base/advanced_candle" + }, + "elements": [ + { + "from": [6, 0, 5], + "to": [9, 10, 6], + "faces": { + "north": {"uv": [7, 0, 10, 10], "texture": "#0"}, + "east": {"uv": [6, 0, 7, 10], "texture": "#0"}, + "south": {"uv": [7, 0, 10, 10], "texture": "#0"}, + "west": {"uv": [5, 0, 6, 10], "texture": "#0"}, + "up": {"uv": [11, 0, 14, 1], "texture": "#0"}, + "down": {"uv": [0, 11, 3, 12], "texture": "#0"} + } + }, + { + "from": [6, 0, 9], + "to": [9, 10, 10], + "faces": { + "north": {"uv": [7, 0, 10, 10], "texture": "#0"}, + "east": {"uv": [5, 0, 6, 10], "texture": "#0"}, + "south": {"uv": [7, 0, 10, 10], "texture": "#0"}, + "west": {"uv": [6, 0, 7, 10], "texture": "#0"}, + "up": {"uv": [11, 4, 14, 5], "texture": "#0"}, + "down": {"uv": [0, 11, 3, 12], "texture": "#0"} + } + }, + { + "from": [6, 0, 6], + "to": [9, 10, 9], + "faces": { + "north": {"uv": [7, 0, 10, 10], "texture": "#0"}, + "east": {"uv": [2, 0, 5, 10], "texture": "#0"}, + "south": {"uv": [7, 0, 10, 10], "texture": "#0"}, + "west": {"uv": [2, 0, 5, 10], "texture": "#0"}, + "up": {"uv": [11, 1, 14, 4], "texture": "#0"}, + "down": {"uv": [0, 11, 3, 14], "texture": "#0"} + } + }, + { + "from": [5, 0, 6], + "to": [6, 10, 9], + "faces": { + "north": {"uv": [1, 0, 2, 10], "texture": "#0"}, + "east": {"uv": [2, 0, 5, 10], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "west": {"uv": [2, 0, 5, 10], "texture": "#0"}, + "up": {"uv": [10, 4, 11, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 11, 1, 14], "texture": "#0"} + } + }, + { + "from": [9, 0, 6], + "to": [10, 10, 9], + "faces": { + "north": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "east": {"uv": [2, 0, 5, 10], "texture": "#0"}, + "south": {"uv": [1, 0, 2, 10], "texture": "#0"}, + "west": {"uv": [2, 0, 5, 10], "texture": "#0"}, + "up": {"uv": [14, 1, 15, 4], "texture": "#0"}, + "down": {"uv": [0, 11, 1, 14], "texture": "#0"} + } + }, + { + "from": [10, 0, 6], + "to": [11, 1, 10], + "faces": { + "north": {"uv": [0, 10, 1, 11], "texture": "#0"}, + "east": {"uv": [0, 10, 4, 11], "texture": "#0"}, + "south": {"uv": [0, 10, 1, 11], "texture": "#0"}, + "west": {"uv": [0, 10, 4, 11], "texture": "#0"}, + "up": {"uv": [0, 10, 1, 14], "texture": "#0"}, + "down": {"uv": [0, 10, 1, 14], "texture": "#0"} + } + }, + { + "from": [4, 0, 5], + "to": [5, 1, 7], + "faces": { + "north": {"uv": [1, 11, 2, 12], "texture": "#0"}, + "east": {"uv": [1, 11, 3, 12], "texture": "#0"}, + "south": {"uv": [1, 11, 2, 12], "texture": "#0"}, + "west": {"uv": [1, 11, 3, 12], "texture": "#0"}, + "up": {"uv": [1, 11, 2, 13], "texture": "#0"}, + "down": {"uv": [1, 11, 2, 13], "texture": "#0"} + } + }, + { + "from": [7, 0, 10], + "to": [10, 1, 11], + "faces": { + "north": {"uv": [4, 10, 7, 11], "texture": "#0"}, + "east": {"uv": [4, 10, 5, 11], "texture": "#0"}, + "south": {"uv": [4, 10, 7, 11], "texture": "#0"}, + "west": {"uv": [4, 10, 5, 11], "texture": "#0"}, + "up": {"uv": [4, 10, 7, 11], "texture": "#0"}, + "down": {"uv": [4, 10, 7, 11], "texture": "#0"} + } + }, + { + "from": [5, 0, 4], + "to": [7, 1, 5], + "faces": { + "north": {"uv": [7, 10, 9, 11], "texture": "#0"}, + "east": {"uv": [7, 10, 8, 11], "texture": "#0"}, + "south": {"uv": [7, 10, 9, 11], "texture": "#0"}, + "west": {"uv": [7, 10, 8, 11], "texture": "#0"}, + "up": {"uv": [7, 10, 9, 11], "texture": "#0"}, + "down": {"uv": [7, 10, 9, 11], "texture": "#0"} + } + }, + { + "from": [9, 0, 5], + "to": [10, 1, 6], + "faces": { + "north": {"uv": [9, 10, 10, 11], "texture": "#0"}, + "east": {"uv": [9, 10, 10, 11], "texture": "#0"}, + "south": {"uv": [9, 10, 10, 11], "texture": "#0"}, + "west": {"uv": [9, 10, 10, 11], "texture": "#0"}, + "up": {"uv": [9, 10, 10, 11], "texture": "#0"}, + "down": {"uv": [9, 10, 10, 11], "texture": "#0"} + } + }, + { + "from": [5, 0, 5], + "to": [6, 1, 6], + "faces": { + "north": {"uv": [0, 11, 1, 12], "texture": "#0"}, + "east": {"uv": [0, 11, 1, 12], "texture": "#0"}, + "south": {"uv": [0, 11, 1, 12], "texture": "#0"}, + "west": {"uv": [0, 11, 1, 12], "texture": "#0"}, + "up": {"uv": [0, 11, 1, 12], "texture": "#0"}, + "down": {"uv": [0, 11, 1, 12], "texture": "#0"} + } + }, + { + "from": [9, 0, 9], + "to": [10, 1, 10], + "faces": { + "north": {"uv": [0, 13, 1, 14], "texture": "#0"}, + "east": {"uv": [0, 13, 1, 14], "texture": "#0"}, + "south": {"uv": [0, 13, 1, 14], "texture": "#0"}, + "west": {"uv": [0, 13, 1, 14], "texture": "#0"}, + "up": {"uv": [0, 13, 1, 14], "texture": "#0"}, + "down": {"uv": [0, 13, 1, 14], "texture": "#0"} + } + }, + { + "name": "wick", + "from": [7.5, 10, 7], + "to": [7.5, 12, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [7.5, 0, 7.5]}, + "faces": { + "north": {"uv": [4, 11, 4, 13], "texture": "#0"}, + "east": {"uv": [3, 11, 4, 13], "texture": "#0"}, + "south": {"uv": [4, 11, 4, 13], "texture": "#0"}, + "west": {"uv": [3, 11, 4, 13], "texture": "#0"}, + "up": {"uv": [3, 13, 4, 13], "texture": "#0"}, + "down": {"uv": [3, 13, 4, 13], "texture": "#0"} + } + }, + { + "name": "wick", + "from": [7.5, 10, 7], + "to": [7.5, 12, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [7.5, 0, 7.5]}, + "faces": { + "north": {"uv": [4, 11, 4, 13], "texture": "#0"}, + "east": {"uv": [3, 11, 4, 13], "texture": "#0"}, + "south": {"uv": [4, 11, 4, 13], "texture": "#0"}, + "west": {"uv": [3, 11, 4, 13], "texture": "#0"}, + "up": {"uv": [3, 13, 4, 13], "texture": "#0"}, + "down": {"uv": [3, 13, 4, 13], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "candle_body", + "origin": [0, 0, 0], + "color": 0, + "children": [ + 0, + 1, + 2, + 3, + 4, + { + "name": "dripped_wax", + "origin": [0, 0, 0], + "color": 0, + "children": [5, 6, 7, 8, 9, 10, 11] + } + ] + }, + 12, + 13 + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/advanced_candle_base_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/advanced_candle_base_lit.json new file mode 100644 index 0000000..c62fe09 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/advanced_candle_base_lit.json @@ -0,0 +1,203 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "advanced_candle_lit", + "particle": "advanced_candle_lit" + }, + "elements": [ + { + "from": [6, 0, 5], + "to": [9, 10, 6], + "faces": { + "north": {"uv": [7, 0, 10, 10], "texture": "#0"}, + "east": {"uv": [6, 0, 7, 10], "texture": "#0"}, + "south": {"uv": [7, 0, 10, 10], "texture": "#0"}, + "west": {"uv": [5, 0, 6, 10], "texture": "#0"}, + "up": {"uv": [11, 0, 14, 1], "texture": "#0"}, + "down": {"uv": [0, 11, 3, 12], "texture": "#0"} + } + }, + { + "from": [6, 0, 9], + "to": [9, 10, 10], + "faces": { + "north": {"uv": [7, 0, 10, 10], "texture": "#0"}, + "east": {"uv": [5, 0, 6, 10], "texture": "#0"}, + "south": {"uv": [7, 0, 10, 10], "texture": "#0"}, + "west": {"uv": [6, 0, 7, 10], "texture": "#0"}, + "up": {"uv": [11, 4, 14, 5], "texture": "#0"}, + "down": {"uv": [0, 11, 3, 12], "texture": "#0"} + } + }, + { + "from": [6, 0, 6], + "to": [9, 10, 9], + "faces": { + "north": {"uv": [7, 0, 10, 10], "texture": "#0"}, + "east": {"uv": [2, 0, 5, 10], "texture": "#0"}, + "south": {"uv": [7, 0, 10, 10], "texture": "#0"}, + "west": {"uv": [2, 0, 5, 10], "texture": "#0"}, + "up": {"uv": [11, 1, 14, 4], "texture": "#0"}, + "down": {"uv": [0, 11, 3, 14], "texture": "#0"} + } + }, + { + "from": [5, 0, 6], + "to": [6, 10, 9], + "faces": { + "north": {"uv": [1, 0, 2, 10], "texture": "#0"}, + "east": {"uv": [2, 0, 5, 10], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "west": {"uv": [2, 0, 5, 10], "texture": "#0"}, + "up": {"uv": [10, 4, 11, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 11, 1, 14], "texture": "#0"} + } + }, + { + "from": [9, 0, 6], + "to": [10, 10, 9], + "faces": { + "north": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "east": {"uv": [2, 0, 5, 10], "texture": "#0"}, + "south": {"uv": [1, 0, 2, 10], "texture": "#0"}, + "west": {"uv": [2, 0, 5, 10], "texture": "#0"}, + "up": {"uv": [14, 1, 15, 4], "texture": "#0"}, + "down": {"uv": [0, 11, 1, 14], "texture": "#0"} + } + }, + { + "from": [10, 0, 6], + "to": [11, 1, 10], + "faces": { + "north": {"uv": [0, 10, 1, 11], "texture": "#0"}, + "east": {"uv": [0, 10, 4, 11], "texture": "#0"}, + "south": {"uv": [0, 10, 1, 11], "texture": "#0"}, + "west": {"uv": [0, 10, 4, 11], "texture": "#0"}, + "up": {"uv": [0, 10, 1, 14], "texture": "#0"}, + "down": {"uv": [0, 10, 1, 14], "texture": "#0"} + } + }, + { + "from": [4, 0, 5], + "to": [5, 1, 7], + "faces": { + "north": {"uv": [1, 11, 2, 12], "texture": "#0"}, + "east": {"uv": [1, 11, 3, 12], "texture": "#0"}, + "south": {"uv": [1, 11, 2, 12], "texture": "#0"}, + "west": {"uv": [1, 11, 3, 12], "texture": "#0"}, + "up": {"uv": [1, 11, 2, 13], "texture": "#0"}, + "down": {"uv": [1, 11, 2, 13], "texture": "#0"} + } + }, + { + "from": [7, 0, 10], + "to": [10, 1, 11], + "faces": { + "north": {"uv": [4, 10, 7, 11], "texture": "#0"}, + "east": {"uv": [4, 10, 5, 11], "texture": "#0"}, + "south": {"uv": [4, 10, 7, 11], "texture": "#0"}, + "west": {"uv": [4, 10, 5, 11], "texture": "#0"}, + "up": {"uv": [4, 10, 7, 11], "texture": "#0"}, + "down": {"uv": [4, 10, 7, 11], "texture": "#0"} + } + }, + { + "from": [5, 0, 4], + "to": [7, 1, 5], + "faces": { + "north": {"uv": [7, 10, 9, 11], "texture": "#0"}, + "east": {"uv": [7, 10, 8, 11], "texture": "#0"}, + "south": {"uv": [7, 10, 9, 11], "texture": "#0"}, + "west": {"uv": [7, 10, 8, 11], "texture": "#0"}, + "up": {"uv": [7, 10, 9, 11], "texture": "#0"}, + "down": {"uv": [7, 10, 9, 11], "texture": "#0"} + } + }, + { + "from": [9, 0, 5], + "to": [10, 1, 6], + "faces": { + "north": {"uv": [9, 10, 10, 11], "texture": "#0"}, + "east": {"uv": [9, 10, 10, 11], "texture": "#0"}, + "south": {"uv": [9, 10, 10, 11], "texture": "#0"}, + "west": {"uv": [9, 10, 10, 11], "texture": "#0"}, + "up": {"uv": [9, 10, 10, 11], "texture": "#0"}, + "down": {"uv": [9, 10, 10, 11], "texture": "#0"} + } + }, + { + "from": [5, 0, 5], + "to": [6, 1, 6], + "faces": { + "north": {"uv": [0, 11, 1, 12], "texture": "#0"}, + "east": {"uv": [0, 11, 1, 12], "texture": "#0"}, + "south": {"uv": [0, 11, 1, 12], "texture": "#0"}, + "west": {"uv": [0, 11, 1, 12], "texture": "#0"}, + "up": {"uv": [0, 11, 1, 12], "texture": "#0"}, + "down": {"uv": [0, 11, 1, 12], "texture": "#0"} + } + }, + { + "from": [9, 0, 9], + "to": [10, 1, 10], + "faces": { + "north": {"uv": [0, 13, 1, 14], "texture": "#0"}, + "east": {"uv": [0, 13, 1, 14], "texture": "#0"}, + "south": {"uv": [0, 13, 1, 14], "texture": "#0"}, + "west": {"uv": [0, 13, 1, 14], "texture": "#0"}, + "up": {"uv": [0, 13, 1, 14], "texture": "#0"}, + "down": {"uv": [0, 13, 1, 14], "texture": "#0"} + } + }, + { + "name": "wick", + "from": [7.5, 10, 7], + "to": [7.5, 12, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [7.5, 0, 7.5]}, + "faces": { + "north": {"uv": [4, 11, 4, 13], "texture": "#0"}, + "east": {"uv": [3, 11, 4, 13], "texture": "#0"}, + "south": {"uv": [4, 11, 4, 13], "texture": "#0"}, + "west": {"uv": [3, 11, 4, 13], "texture": "#0"}, + "up": {"uv": [3, 13, 4, 13], "texture": "#0"}, + "down": {"uv": [3, 13, 4, 13], "texture": "#0"} + } + }, + { + "name": "wick", + "from": [7.5, 10, 7], + "to": [7.5, 12, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [7.5, 0, 7.5]}, + "faces": { + "north": {"uv": [4, 11, 4, 13], "texture": "#0"}, + "east": {"uv": [3, 11, 4, 13], "texture": "#0"}, + "south": {"uv": [4, 11, 4, 13], "texture": "#0"}, + "west": {"uv": [3, 11, 4, 13], "texture": "#0"}, + "up": {"uv": [3, 13, 4, 13], "texture": "#0"}, + "down": {"uv": [3, 13, 4, 13], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "candle_body", + "origin": [0, 0, 0], + "color": 0, + "children": [ + 0, + 1, + 2, + 3, + 4, + { + "name": "dripped_wax", + "origin": [0, 0, 0], + "color": 0, + "children": [5, 6, 7, 8, 9, 10, 11] + } + ] + }, + 12, + 13 + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/black_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/black_campfire.json similarity index 82% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/black_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/black_campfire.json index 305808f..1826c26 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/black_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/black_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/black_campfire_log_lit", "1": "hyperlighting:block/campfire/black_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/black_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/black_campfire_off.json similarity index 70% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/black_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/black_campfire_off.json index 3937d0e..eca541c 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/black_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/black_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/black_campfire_log", "particle": "hyperlighting:block/campfire/black_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/blue_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/blue_campfire.json similarity index 82% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/blue_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/blue_campfire.json index 646a93c..eb28f0b 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/blue_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/blue_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/blue_campfire_log_lit", "1": "hyperlighting:block/campfire/blue_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/blue_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/blue_campfire_off.json similarity index 70% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/blue_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/blue_campfire_off.json index 5192c4d..dfd48ec 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/blue_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/blue_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/blue_campfire_log", "particle": "hyperlighting:block/campfire/blue_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/brown_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/brown_campfire.json similarity index 82% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/brown_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/brown_campfire.json index e71bfbf..cb558eb 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/brown_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/brown_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/brown_campfire_log_lit", "1": "hyperlighting:block/campfire/brown_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/brown_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/brown_campfire_off.json similarity index 70% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/brown_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/brown_campfire_off.json index 7d0161e..e729113 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/brown_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/brown_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/brown_campfire_log", "particle": "hyperlighting:block/campfire/brown_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/cyan_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/cyan_campfire.json similarity index 82% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/cyan_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/cyan_campfire.json index 75bed24..0db052a 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/cyan_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/cyan_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/cyan_campfire_log_lit", "1": "hyperlighting:block/campfire/cyan_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/cyan_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/cyan_campfire_off.json similarity index 70% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/cyan_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/cyan_campfire_off.json index a3e6c4d..2566066 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/cyan_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/cyan_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/cyan_campfire_log", "particle": "hyperlighting:block/campfire/cyan_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/gray_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/gray_campfire.json similarity index 82% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/gray_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/gray_campfire.json index 28cf035..c6cdcc3 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/gray_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/gray_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/gray_campfire_log_lit", "1": "hyperlighting:block/campfire/gray_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/gray_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/gray_campfire_off.json similarity index 70% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/gray_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/gray_campfire_off.json index 4712826..a18cbdc 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/gray_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/gray_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/gray_campfire_log", "particle": "hyperlighting:block/campfire/gray_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/green_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/green_campfire.json similarity index 82% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/green_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/green_campfire.json index 7275970..8f1d8a3 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/green_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/green_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/green_campfire_log_lit", "1": "hyperlighting:block/campfire/green_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/green_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/green_campfire_off.json similarity index 70% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/green_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/green_campfire_off.json index 6cb0b04..2b8e386 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/green_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/green_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/green_campfire_log", "particle": "hyperlighting:block/campfire/green_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_blue_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_blue_campfire.json similarity index 83% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_blue_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_blue_campfire.json index 30a9d53..106af79 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_blue_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_blue_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/light_blue_campfire_log_lit", "1": "hyperlighting:block/campfire/light_blue_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_blue_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_blue_campfire_off.json similarity index 72% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_blue_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_blue_campfire_off.json index 02213b5..4a625db 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_blue_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_blue_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/light_blue_campfire_log", "particle": "hyperlighting:block/campfire/light_blue_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_gray_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_gray_campfire.json similarity index 83% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_gray_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_gray_campfire.json index d11af70..b166d04 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_gray_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_gray_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/light_gray_campfire_log_lit", "1": "hyperlighting:block/campfire/light_gray_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_gray_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_gray_campfire_off.json similarity index 72% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_gray_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_gray_campfire_off.json index 552396b..17f742f 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_gray_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/light_gray_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/light_gray_campfire_log", "particle": "hyperlighting:block/campfire/light_gray_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/lime_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/lime_campfire.json similarity index 82% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/lime_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/lime_campfire.json index b3bfae7..4203460 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/lime_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/lime_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/lime_campfire_log_lit", "1": "hyperlighting:block/campfire/lime_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/lime_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/lime_campfire_off.json similarity index 70% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/lime_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/lime_campfire_off.json index 83ca13a..5932417 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/lime_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/lime_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/lime_campfire_log", "particle": "hyperlighting:block/campfire/lime_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/magenta_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/magenta_campfire.json similarity index 83% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/magenta_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/magenta_campfire.json index e427306..1821d51 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/magenta_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/magenta_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/magenta_campfire_log_lit", "1": "hyperlighting:block/campfire/magenta_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/magenta_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/magenta_campfire_off.json similarity index 71% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/magenta_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/magenta_campfire_off.json index 63171ff..2fddd6e 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/magenta_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/magenta_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/magenta_campfire_log", "particle": "hyperlighting:block/campfire/magenta_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/orange_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/orange_campfire.json similarity index 82% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/orange_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/orange_campfire.json index 1f2f18c..3752d34 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/orange_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/orange_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/orange_campfire_log_lit", "1": "hyperlighting:block/campfire/orange_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/orange_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/orange_campfire_off.json similarity index 71% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/orange_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/orange_campfire_off.json index 30dfd8d..75adb6d 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/orange_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/orange_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/orange_campfire_log", "particle": "hyperlighting:block/campfire/orange_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/pink_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/pink_campfire.json similarity index 82% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/pink_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/pink_campfire.json index d15e6b1..19ea40d 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/pink_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/pink_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/pink_campfire_log_lit", "1": "hyperlighting:block/campfire/pink_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/pink_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/pink_campfire_off.json similarity index 70% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/pink_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/pink_campfire_off.json index 9369876..5e55f66 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/pink_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/pink_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/pink_campfire_log", "particle": "hyperlighting:block/campfire/pink_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/purple_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/purple_campfire.json similarity index 82% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/purple_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/purple_campfire.json index 905287d..02de433 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/purple_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/purple_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/purple_campfire_log_lit", "1": "hyperlighting:block/campfire/purple_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/purple_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/purple_campfire_off.json similarity index 71% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/purple_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/purple_campfire_off.json index 2252909..84b235c 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/purple_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/purple_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/purple_campfire_log", "particle": "hyperlighting:block/campfire/purple_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/red_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/red_campfire.json similarity index 82% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/red_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/red_campfire.json index b864eaa..406740c 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/red_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/red_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/red_campfire_log_lit", "1": "hyperlighting:block/campfire/red_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/red_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/red_campfire_off.json similarity index 70% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/red_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/red_campfire_off.json index 8a04f95..ced6e5f 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/red_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/red_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/red_campfire_log", "particle": "hyperlighting:block/campfire/red_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/white_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/white_campfire.json similarity index 82% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/white_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/white_campfire.json index ad75aac..183d0c5 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/white_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/white_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/white_campfire_log_lit", "1": "hyperlighting:block/campfire/white_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/white_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/white_campfire_off.json similarity index 70% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/white_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/white_campfire_off.json index 2e2782a..aba6731 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/white_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/white_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/white_campfire_log", "particle": "hyperlighting:block/campfire/white_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/yellow_campfire_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/yellow_campfire.json similarity index 82% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/yellow_campfire_lit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/yellow_campfire.json index 0b5078f..2b76006 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/yellow_campfire_lit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/yellow_campfire.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base", + "parent": "hyperlighting:block/advanced_campfire_base", "textures": { "0": "hyperlighting:block/campfire/yellow_campfire_log_lit", "1": "hyperlighting:block/campfire/yellow_campfire_log", diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/yellow_campfire_unlit.json b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/yellow_campfire_off.json similarity index 71% rename from Common/src/main/resources/assets/hyperlighting/models/block/campfire/yellow_campfire_unlit.json rename to Common/src/main/resources/assets/hyperlighting/models/block/campfire/yellow_campfire_off.json index c30a51f..4ca6627 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/campfire/yellow_campfire_unlit.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/campfire/yellow_campfire_off.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/campfire_base_unlit", + "parent": "hyperlighting:block/advanced_campfire_base_off", "textures": { "0": "hyperlighting:block/campfire/yellow_campfire_log", "particle": "hyperlighting:block/campfire/yellow_campfire_log" diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/black_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/black_candle.json index b6b0037..b6a20b8 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/black_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/black_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/black" + "0": "hyperlighting:block/candle/base/black_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/black_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/black_candle_lit.json new file mode 100644 index 0000000..2b07614 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/black_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/black_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/blue_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/blue_candle.json index 1a0474a..996a650 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/blue_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/blue_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/blue" + "0": "hyperlighting:block/candle/base/blue_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/blue_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/blue_candle_lit.json new file mode 100644 index 0000000..055b8a7 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/blue_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/blue_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/brown_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/brown_candle.json index 5748bda..442343a 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/brown_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/brown_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/brown" + "0": "hyperlighting:block/candle/base/brown_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/brown_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/brown_candle_lit.json new file mode 100644 index 0000000..35992e1 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/brown_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/brown_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/cyan_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/cyan_candle.json index d9244c5..a6f87ee 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/cyan_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/cyan_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/cyan" + "0": "hyperlighting:block/candle/base/cyan_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/cyan_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/cyan_candle_lit.json new file mode 100644 index 0000000..99d0e86 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/cyan_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/cyan_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/gray_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/gray_candle.json index de147a3..0ccdb72 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/gray_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/gray_candle.json @@ -1,6 +1,5 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/gray" - } + "0": "hyperlighting:block/candle/base/gray_advanced_candle" } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/gray_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/gray_candle_lit.json new file mode 100644 index 0000000..9b6fc83 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/gray_candle_lit.json @@ -0,0 +1,5 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/gray_advanced_candle_lit" +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/green_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/green_candle.json index f57d017..784426f 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/green_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/green_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/green" + "0": "hyperlighting:block/candle/base/green_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/green_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/green_candle_lit.json new file mode 100644 index 0000000..4935376 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/green_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/green_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/light_blue_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/light_blue_candle.json index 11e92ef..aa8f373 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/light_blue_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/light_blue_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/light_blue" + "0": "hyperlighting:block/candle/base/light_blue_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/light_blue_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/light_blue_candle_lit.json new file mode 100644 index 0000000..b236a9d --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/light_blue_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/light_blue_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/light_gray_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/light_gray_candle.json index c52a378..7cf7c91 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/light_gray_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/light_gray_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/light_gray" + "0": "hyperlighting:block/candle/base/light_gray_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/light_gray_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/light_gray_candle_lit.json new file mode 100644 index 0000000..7177c0f --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/light_gray_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/light_gray_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/lime_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/lime_candle.json index 2e19410..31c2977 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/lime_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/lime_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/lime" + "0": "hyperlighting:block/candle/base/lime_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/lime_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/lime_candle_lit.json new file mode 100644 index 0000000..f0d7259 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/lime_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/lime_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/magenta_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/magenta_candle.json index d2ca77b..593dbff 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/magenta_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/magenta_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/magenta" + "0": "hyperlighting:block/candle/base/magenta_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/magenta_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/magenta_candle_lit.json new file mode 100644 index 0000000..2d431ef --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/magenta_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/magenta_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/orange_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/orange_candle.json index 89d22d6..c1ace94 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/orange_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/orange_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/orange" + "0": "hyperlighting:block/candle/base/orange_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/orange_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/orange_candle_lit.json new file mode 100644 index 0000000..c3959fa --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/orange_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/orange_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/pink_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/pink_candle.json index df5e21b..a5f1d7b 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/pink_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/pink_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/pink" + "0": "hyperlighting:block/candle/base/pink_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/pink_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/pink_candle_lit.json new file mode 100644 index 0000000..aa27c5c --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/pink_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/pink_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/purple_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/purple_candle.json index 6861044..7c233e4 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/purple_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/purple_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/purple" + "0": "hyperlighting:block/candle/base/purple_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/purple_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/purple_candle_lit.json new file mode 100644 index 0000000..961458f --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/purple_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/purple_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/red_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/red_candle.json index a2b2063..24090d7 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/red_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/red_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/red" + "0": "hyperlighting:block/candle/base/red_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/red_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/red_candle_lit.json new file mode 100644 index 0000000..eb9528c --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/red_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/red_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/white_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/white_candle.json index 06a10b5..18aaa9a 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/white_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/white_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/white" + "0": "hyperlighting:block/candle/base/white_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/white_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/white_candle_lit.json new file mode 100644 index 0000000..f8a74df --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/white_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/white_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/yellow_candle.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/yellow_candle.json index 60374a0..b15aa85 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle/yellow_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/yellow_candle.json @@ -1,6 +1,6 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "textures": { - "0": "hyperlighting:block/candle/color/yellow" + "0": "hyperlighting:block/candle/base/yellow_advanced_candle" } } diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle/yellow_candle_lit.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle/yellow_candle_lit.json new file mode 100644 index 0000000..f61bc6a --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/yellow_candle_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/advanced_candle_base", + "textures": { + "0": "hyperlighting:block/candle/lit/yellow_advanced_candle_lit" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/candle_base.json b/Common/src/main/resources/assets/hyperlighting/models/block/candle_base.json deleted file mode 100644 index adec86e..0000000 --- a/Common/src/main/resources/assets/hyperlighting/models/block/candle_base.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "0": "hyperlighting:block/candle_wax", - "1": "minecraft:block/coal_block", - "particle": "hyperlighting:block/candle_wax" - }, - "elements": [ - { - "name": "candle_body", - "from": [7, 0, 7], - "to": [9, 10, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -1, 0]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#0"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#0"} - } - }, - { - "from": [7.71194, 9.94134, 7.75], - "to": [8.21194, 10.69134, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [7.96194, 7.19134, 8]}, - "faces": { - "north": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"}, - "east": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"}, - "south": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"}, - "west": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"}, - "up": {"uv": [0, 0, 15.5, 15.5], "texture": "#1"}, - "down": {"uv": [0, 0, 15.5, 15.5], "texture": "#1"} - } - }, - { - "from": [7.53963, 10.59567, 7.75], - "to": [8.03963, 11.34567, 8.25], - "rotation": {"angle": 22.5, "axis": "z", "origin": [7.8853, 11.07664, 8]}, - "faces": { - "north": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"}, - "east": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"}, - "south": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"}, - "west": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"}, - "up": {"uv": [0, 0, 15.5, 15.5], "texture": "#1"}, - "down": {"uv": [0, 0, 15.5, 15.5], "texture": "#1"} - } - } - ] -} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/hanging_fire.json b/Common/src/main/resources/assets/hyperlighting/models/block/hanging_fire.json new file mode 100644 index 0000000..952a6cb --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/hanging_fire.json @@ -0,0 +1,427 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "2": "block/cauldron_top", + "3": "block/cauldron_side", + "4": "block/cauldron_inner", + "5": "block/campfire_log", + "6": "hyperlighting:block/campfire/ashes", + "7": "block/chain", + "8": "hyperlighting:block/campfire/black_campfire_fire", + "particle": "block/cauldron_side" + }, + "elements": [ + { + "from": [2, -5, 2], + "to": [14, -4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 1], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#missing"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#6"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#4"} + } + }, + { + "from": [0, -5, 0], + "to": [16, 2, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 16, 7], "texture": "#3"}, + "east": {"uv": [14, 0, 16, 7], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 7], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 7], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 2], "texture": "#2"}, + "down": {"uv": [0, 14, 16, 16], "texture": "#4"} + } + }, + { + "from": [0, -5, 14], + "to": [16, 2, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 16, 7], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 7], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 7], "texture": "#3"}, + "west": {"uv": [14, 0, 16, 7], "texture": "#3"}, + "up": {"uv": [0, 14, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 2], "texture": "#4"} + } + }, + { + "from": [0, -5, 2], + "to": [2, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 1, 6], "texture": "#missing"}, + "east": {"uv": [2, 0, 14, 7], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 6], "texture": "#missing"}, + "west": {"uv": [2, 0, 14, 7], "texture": "#3"}, + "up": {"uv": [0, 2, 2, 14], "texture": "#2"}, + "down": {"uv": [0, 2, 2, 16], "texture": "#4"} + } + }, + { + "from": [14, -5, 2], + "to": [16, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 1, 5], "texture": "#missing"}, + "east": {"uv": [2, 0, 14, 7], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 5], "texture": "#missing"}, + "west": {"uv": [2, 0, 14, 7], "texture": "#3"}, + "up": {"uv": [14, 2, 16, 14], "texture": "#2"}, + "down": {"uv": [14, 2, 16, 14], "texture": "#4"} + } + }, + { + "from": [3, -4, 2], + "to": [6, -1, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "east": {"uv": [0, 0, 12, 3], "texture": "#5"}, + "south": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "west": {"uv": [0, 0, 12, 3], "texture": "#5"}, + "up": {"uv": [4, 0, 16, 3], "rotation": 90, "texture": "#5"}, + "down": {"uv": [0, 0, 3, 12], "texture": "#missing"} + } + }, + { + "from": [10, -4, 2], + "to": [13, -1, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "east": {"uv": [0, 0, 12, 3], "texture": "#5"}, + "south": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "west": {"uv": [0, 0, 12, 3], "texture": "#5"}, + "up": {"uv": [4, 0, 16, 3], "rotation": 90, "texture": "#5"}, + "down": {"uv": [0, 0, 3, 12], "texture": "#missing"} + } + }, + { + "from": [2, -2, 3], + "to": [14, 1, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [4, 1, 16, 4], "texture": "#5"}, + "east": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "south": {"uv": [0, 0, 12, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "up": {"uv": [0, 1, 11, 4], "texture": "#5"}, + "down": {"uv": [0, 0, 12, 3], "texture": "#missing"} + } + }, + { + "from": [2, -2, 10], + "to": [14, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [1, 0, 13, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "south": {"uv": [4, 1, 16, 4], "texture": "#5"}, + "west": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "up": {"uv": [0, 1, 11, 4], "texture": "#5"}, + "down": {"uv": [0, 0, 12, 3], "texture": "#missing"} + } + }, + { + "from": [1, 2, -0.41421], + "to": [1, 14, 2.58579], + "rotation": {"angle": -45, "axis": "y", "origin": [1, -5, 1]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [1, 2, -0.41421], + "to": [1, 14, 2.58579], + "rotation": {"angle": 45, "axis": "y", "origin": [1, -5, 1]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [15, 2, -0.41421], + "to": [15, 14, 2.58579], + "rotation": {"angle": 45, "axis": "y", "origin": [15, -6, 1]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [15, 2, -0.41421], + "to": [15, 14, 2.58579], + "rotation": {"angle": -45, "axis": "y", "origin": [15, -6, 1]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [15, 2, 13.58579], + "to": [15, 14, 16.58579], + "rotation": {"angle": -45, "axis": "y", "origin": [15, -5, 15]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [15, 2, 13.58579], + "to": [15, 14, 16.58579], + "rotation": {"angle": 45, "axis": "y", "origin": [15, -5, 15]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [1, 2, 13.58579], + "to": [1, 14, 16.58579], + "rotation": {"angle": 45, "axis": "y", "origin": [1, -6, 15]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [1, 2, 13.58579], + "to": [1, 14, 16.58579], + "rotation": {"angle": -45, "axis": "y", "origin": [1, -6, 15]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "name": "fire", + "from": [0, -4, 8], + "to": [16, 12, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, -5, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#8"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#8"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "up": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 16, 0], "texture": "#missing"} + } + }, + { + "name": "fire", + "from": [8, -4, 0], + "to": [8, 12, 16], + "rotation": {"angle": -45, "axis": "y", "origin": [8, -5, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#8"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#8"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#8"}, + "up": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#missing"}, + "down": {"uv": [0, 0, 16, 0], "rotation": 270, "texture": "#missing"} + } + }, + { + "from": [0, 14, 0], + "to": [16, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 16, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#3"}, + "west": {"uv": [14, 0, 16, 2], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 2], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#4"} + } + }, + { + "from": [0, 14, 14], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 16, 2], "texture": "#3"}, + "east": {"uv": [14, 0, 16, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#3"}, + "up": {"uv": [0, 14, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 2], "texture": "#4"} + } + }, + { + "from": [0, 14, 2], + "to": [2, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "east": {"uv": [2, 0, 14, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "west": {"uv": [2, 0, 14, 2], "texture": "#3"}, + "up": {"uv": [0, 2, 2, 14], "texture": "#2"}, + "down": {"uv": [0, 2, 2, 14], "texture": "#4"} + } + }, + { + "from": [14, 14, 2], + "to": [16, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "east": {"uv": [2, 0, 14, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "west": {"uv": [2, 0, 14, 2], "texture": "#3"}, + "up": {"uv": [14, 2, 16, 14], "texture": "#2"}, + "down": {"uv": [14, 2, 16, 14], "texture": "#4"} + } + }, + { + "from": [-1, 14.001, 7], + "to": [17, 15.999, 9], + "rotation": {"angle": -45, "axis": "y", "origin": [8, -5, 8]}, + "faces": { + "north": {"uv": [0, 4, 16, 6], "texture": "#3"}, + "east": {"uv": [14, 4, 16, 6], "texture": "#3"}, + "south": {"uv": [0, 4, 16, 6], "texture": "#3"}, + "west": {"uv": [0, 4, 2, 6], "texture": "#3"}, + "up": {"uv": [0, 4, 16, 6], "texture": "#3"}, + "down": {"uv": [0, 4, 16, 6], "texture": "#3"} + } + }, + { + "from": [-1, 14.002, 7], + "to": [17, 15.998, 9], + "rotation": {"angle": 45, "axis": "y", "origin": [8, -5, 8]}, + "faces": { + "north": {"uv": [0, 4, 16, 6], "texture": "#3"}, + "east": {"uv": [14, 4, 16, 6], "texture": "#3"}, + "south": {"uv": [0, 4, 16, 6], "texture": "#3"}, + "west": {"uv": [0, 4, 2, 6], "texture": "#3"}, + "up": {"uv": [0, 4, 16, 6], "texture": "#3"}, + "down": {"uv": [0, 4, 16, 6], "texture": "#3"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 1.5, -1], + "scale": [0.3, 0.3, 0.3] + }, + "thirdperson_lefthand": { + "translation": [0, 1.5, -1], + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_righthand": { + "scale": [0.6, 0.6, 0.6] + }, + "firstperson_lefthand": { + "scale": [0.6, 0.6, 0.6] + }, + "ground": { + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, 1, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "translation": [0, 1.75, 0], + "scale": [0.6, 0.6, 0.6] + } + }, + "groups": [ + { + "name": "cup", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3, 4] + }, + { + "name": "wood", + "origin": [0, 0, 0], + "color": 0, + "children": [5, 6, 7, 8] + }, + { + "name": "chains", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "NW", + "origin": [1, 0, 1], + "color": 0, + "children": [9, 10] + }, + { + "name": "NE", + "origin": [15, -1, 1], + "color": 0, + "children": [11, 12] + }, + { + "name": "SE", + "origin": [1, 0, 1], + "color": 0, + "children": [13, 14] + }, + { + "name": "SW", + "origin": [15, -1, 1], + "color": 0, + "children": [15, 16] + } + ] + }, + { + "name": "fire", + "origin": [0, 0, 0], + "color": 0, + "children": [17, 18] + }, + { + "name": "frame", + "origin": [8, 8, 8], + "color": 0, + "children": [19, 20, 21, 22, 23, 24] + } + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/hanging_fire_off.json b/Common/src/main/resources/assets/hyperlighting/models/block/hanging_fire_off.json new file mode 100644 index 0000000..4a97789 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/hanging_fire_off.json @@ -0,0 +1,392 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "2": "block/cauldron_top", + "3": "block/cauldron_side", + "4": "block/cauldron_inner", + "5": "block/campfire_log", + "6": "hyperlighting:block/campfire_ashes", + "7": "block/chain", + "particle": "block/cauldron_side" + }, + "elements": [ + { + "from": [2, -5, 2], + "to": [14, -4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 1], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#missing"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#6"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#4"} + } + }, + { + "from": [0, -5, 0], + "to": [16, 2, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 16, 7], "texture": "#3"}, + "east": {"uv": [14, 0, 16, 7], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 7], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 7], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 2], "texture": "#2"}, + "down": {"uv": [0, 14, 16, 16], "texture": "#4"} + } + }, + { + "from": [0, -5, 14], + "to": [16, 2, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 16, 7], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 7], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 7], "texture": "#3"}, + "west": {"uv": [14, 0, 16, 7], "texture": "#3"}, + "up": {"uv": [0, 14, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 2], "texture": "#4"} + } + }, + { + "from": [0, -5, 2], + "to": [2, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 1, 6], "texture": "#missing"}, + "east": {"uv": [2, 0, 14, 7], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 6], "texture": "#missing"}, + "west": {"uv": [2, 0, 14, 7], "texture": "#3"}, + "up": {"uv": [0, 2, 2, 14], "texture": "#2"}, + "down": {"uv": [0, 2, 2, 16], "texture": "#4"} + } + }, + { + "from": [14, -5, 2], + "to": [16, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 1, 5], "texture": "#missing"}, + "east": {"uv": [2, 0, 14, 7], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 5], "texture": "#missing"}, + "west": {"uv": [2, 0, 14, 7], "texture": "#3"}, + "up": {"uv": [14, 2, 16, 14], "texture": "#2"}, + "down": {"uv": [14, 2, 16, 14], "texture": "#4"} + } + }, + { + "from": [3, -4, 2], + "to": [6, -1, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "east": {"uv": [0, 0, 12, 3], "texture": "#5"}, + "south": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "west": {"uv": [0, 0, 12, 3], "texture": "#5"}, + "up": {"uv": [4, 0, 16, 3], "rotation": 90, "texture": "#5"}, + "down": {"uv": [0, 0, 3, 12], "texture": "#missing"} + } + }, + { + "from": [10, -4, 2], + "to": [13, -1, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "east": {"uv": [0, 0, 12, 3], "texture": "#5"}, + "south": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "west": {"uv": [0, 0, 12, 3], "texture": "#5"}, + "up": {"uv": [4, 0, 16, 3], "rotation": 90, "texture": "#5"}, + "down": {"uv": [0, 0, 3, 12], "texture": "#missing"} + } + }, + { + "from": [2, -2, 3], + "to": [14, 1, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [4, 1, 16, 4], "texture": "#5"}, + "east": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "south": {"uv": [0, 0, 12, 3], "texture": "#5"}, + "west": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "up": {"uv": [0, 1, 11, 4], "texture": "#5"}, + "down": {"uv": [0, 0, 12, 3], "texture": "#missing"} + } + }, + { + "from": [2, -2, 10], + "to": [14, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [1, 0, 13, 3], "texture": "#5"}, + "east": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "south": {"uv": [4, 1, 16, 4], "texture": "#5"}, + "west": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "up": {"uv": [0, 1, 11, 4], "texture": "#5"}, + "down": {"uv": [0, 0, 12, 3], "texture": "#missing"} + } + }, + { + "from": [1, 2, -0.41421], + "to": [1, 14, 2.58579], + "rotation": {"angle": -45, "axis": "y", "origin": [1, -5, 1]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [1, 2, -0.41421], + "to": [1, 14, 2.58579], + "rotation": {"angle": 45, "axis": "y", "origin": [1, -5, 1]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [15, 2, -0.41421], + "to": [15, 14, 2.58579], + "rotation": {"angle": 45, "axis": "y", "origin": [15, -6, 1]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [15, 2, -0.41421], + "to": [15, 14, 2.58579], + "rotation": {"angle": -45, "axis": "y", "origin": [15, -6, 1]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [15, 2, 13.58579], + "to": [15, 14, 16.58579], + "rotation": {"angle": -45, "axis": "y", "origin": [15, -5, 15]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [15, 2, 13.58579], + "to": [15, 14, 16.58579], + "rotation": {"angle": 45, "axis": "y", "origin": [15, -5, 15]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [1, 2, 13.58579], + "to": [1, 14, 16.58579], + "rotation": {"angle": 45, "axis": "y", "origin": [1, -6, 15]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [0, 4, 3, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [1, 2, 13.58579], + "to": [1, 14, 16.58579], + "rotation": {"angle": -45, "axis": "y", "origin": [1, -6, 15]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "east": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "west": {"uv": [3, 4, 6, 16], "texture": "#7"}, + "up": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#missing"} + } + }, + { + "from": [0, 14, 0], + "to": [16, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 16, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#3"}, + "west": {"uv": [14, 0, 16, 2], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 2], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#4"} + } + }, + { + "from": [0, 14, 14], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 16, 2], "texture": "#3"}, + "east": {"uv": [14, 0, 16, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#3"}, + "up": {"uv": [0, 14, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 2], "texture": "#4"} + } + }, + { + "from": [0, 14, 2], + "to": [2, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "east": {"uv": [2, 0, 14, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "west": {"uv": [2, 0, 14, 2], "texture": "#3"}, + "up": {"uv": [0, 2, 2, 14], "texture": "#2"}, + "down": {"uv": [0, 2, 2, 14], "texture": "#4"} + } + }, + { + "from": [14, 14, 2], + "to": [16, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "east": {"uv": [2, 0, 14, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "west": {"uv": [2, 0, 14, 2], "texture": "#3"}, + "up": {"uv": [14, 2, 16, 14], "texture": "#2"}, + "down": {"uv": [14, 2, 16, 14], "texture": "#4"} + } + }, + { + "from": [-1, 14.001, 7], + "to": [17, 15.999, 9], + "rotation": {"angle": -45, "axis": "y", "origin": [8, -5, 8]}, + "faces": { + "north": {"uv": [0, 4, 16, 6], "texture": "#3"}, + "east": {"uv": [14, 4, 16, 6], "texture": "#3"}, + "south": {"uv": [0, 4, 16, 6], "texture": "#3"}, + "west": {"uv": [0, 4, 2, 6], "texture": "#3"}, + "up": {"uv": [0, 4, 16, 6], "texture": "#3"}, + "down": {"uv": [0, 4, 16, 6], "texture": "#3"} + } + }, + { + "from": [-1, 14.002, 7], + "to": [17, 15.998, 9], + "rotation": {"angle": 45, "axis": "y", "origin": [8, -5, 8]}, + "faces": { + "north": {"uv": [0, 4, 16, 6], "texture": "#3"}, + "east": {"uv": [14, 4, 16, 6], "texture": "#3"}, + "south": {"uv": [0, 4, 16, 6], "texture": "#3"}, + "west": {"uv": [0, 4, 2, 6], "texture": "#3"}, + "up": {"uv": [0, 4, 16, 6], "texture": "#3"}, + "down": {"uv": [0, 4, 16, 6], "texture": "#3"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 1.5, -1], + "scale": [0.3, 0.3, 0.3] + }, + "thirdperson_lefthand": { + "translation": [0, 1.5, -1], + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_righthand": { + "scale": [0.6, 0.6, 0.6] + }, + "firstperson_lefthand": { + "scale": [0.6, 0.6, 0.6] + }, + "ground": { + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0, 1, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "translation": [0, 1.75, 0], + "scale": [0.6, 0.6, 0.6] + } + }, + "groups": [ + { + "name": "cup", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3, 4] + }, + { + "name": "wood", + "origin": [0, 0, 0], + "color": 0, + "children": [5, 6, 7, 8] + }, + { + "name": "chains", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "NW", + "origin": [1, 0, 1], + "color": 0, + "children": [9, 10] + }, + { + "name": "NE", + "origin": [15, -1, 1], + "color": 0, + "children": [11, 12] + }, + { + "name": "SE", + "origin": [1, 0, 1], + "color": 0, + "children": [13, 14] + }, + { + "name": "SW", + "origin": [15, -1, 1], + "color": 0, + "children": [15, 16] + } + ] + }, + { + "name": "frame", + "origin": [8, 8, 8], + "color": 0, + "children": [17, 18, 19, 20, 21, 22] + } + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/jacklantern_trio.json b/Common/src/main/resources/assets/hyperlighting/models/block/jacklantern_trio.json new file mode 100644 index 0000000..d5bf035 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/jacklantern_trio.json @@ -0,0 +1,80 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "1": "block/oak_planks", + "2": "hyperlighting:block/small_carved_pumpkin", + "3": "block/hay_block_top", + "particle": "block/hay_block_top" + }, + "elements": [ + { + "name": "Left Pumpkin", + "from": [8, 1, 2], + "to": [14, 7, 8], + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + }, + { + "name": "Right Pumpkin", + "from": [2, 1, 6], + "to": [8, 7, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [5, 0, 9]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + }, + { + "name": "Top Pumpkin", + "from": [7, 7, 7], + "to": [13, 13, 13], + "rotation": {"angle": 22.5, "axis": "y", "origin": [10, 6, 10]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "east": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "west": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [0, 6, 6, 12], "texture": "#2"} + } + }, + { + "name": "Stand", + "from": [9, 1, 10], + "to": [12, 7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 0, 10]}, + "faces": { + "north": {"uv": [13, 3, 16, 9], "texture": "#1"}, + "east": {"uv": [4, 3, 7, 9], "texture": "#1"}, + "south": {"uv": [10, 3, 13, 9], "texture": "#1"}, + "west": {"uv": [0, 3, 3, 9], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 3], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#1"} + } + }, + { + "name": "Straw", + "from": [0, 0, 0], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 15, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + } + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/solar_panel.json b/Common/src/main/resources/assets/hyperlighting/models/block/solar_panel.json index 6d8c0b4..e1b2fe9 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/block/solar_panel.json +++ b/Common/src/main/resources/assets/hyperlighting/models/block/solar_panel.json @@ -18,31 +18,5 @@ "down": {"uv": [0, 8, 16, 16], "texture": "#0"} } } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 3.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 3.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [56, 0, 0] - }, - "firstperson_lefthand": { - "rotation": [56, 0, 0] - }, - "ground": { - "translation": [0, 5.5, 0] - }, - "gui": { - "rotation": [90, 0, 0] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -7.5] - } - } + ] } \ No newline at end of file diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/advanced_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..4ac50492062fa1cd8a72c22b60a271a7e3782d83 GIT binary patch literal 650 zcmV;50(Jd~P)5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzw_;qVBn9uU&{!0cC5JOA= z!*-YkWEX+NKzd++1=&=5Y?#y0)iA+KM0PgF24p_6pJ4__xtD;$fM^$BGX$>zu&@Cu zf`$(^FT!1b9+=311qx(b0L2T)wjygl4t1=7NUUOPt^mgZB>=?>T;?eZ0s;cy=phzR k>;e=6NVT05Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzw7nclyD16K^wh)oQn8Lkk>P*<}B^I1NBdIc626coX* z9i{=^O5}wGvL{ao8T}Y+6CAQ!D|4rKVjj6 z&5Ljspa&*;VBrcM6fYp#imU;bI5-`kn~YB}HdkO6Ky0+a)S-Cc+KrP80s;cy=phzR k>;e=6NVT05Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwnj5`4aka- zT?7&b=>cI7fVi0m0CPIJQYM&*$gV(l6|$dU2AtlR1`Y$FU4YFHa2VinJ;e=6 gNVT05Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzw*4OVpU_uNq zv9vjd8B=T(|MPLNgXQ{m-e3gLOpo7uhAW0?#3lyP3|9zb6uE1F`Ana_{bazV0a-D! zi$LNaJs=DMEXWG+v0+X}SHlD|5!n^!u0r-R%z!zE?}NjDXcu5J1g`-QS3vBO72(C{ zJFpk9c>_7HkiCa)5{eg)ZADfH3vq1DfV%+MCB()INF9a&q-e$n#GcLP83Y6bz|li2 lpx6Z{29Rnyv96@8IskmJT^n)8l5_w7002ovPDHLkV1o20BEA3s literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/cyan_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/cyan_advanced_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..ecd19659bbdc390056ec028e31200b1f256d5437 GIT binary patch literal 652 zcmV;70(1R|P)5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzw5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwK~y+TV@xV6{?7mf94s7Q){j3wU_uNq zv1#3{j9!sZ|2a4yYSzu4#|WaCK74o&R}9mLO$?+Nt`NuwN=yRtnST8E!GKKzvSMTx zfn5mH1HvG{f~*i98|HL$HB2xQQCxxMDr7&y4A{1O88{4xb^$g+z+r&P*|4xdb{RIc za0Ac-6FIQ(8G_;hY=*!L!sSv7FTkRQ*x11t2E-bG5(~?wPh$`e5CBIHv4CP1pcp`^ e?Zmp0w(0=eKw<%sRo7ww0000n_X literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/green_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/green_advanced_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..403cbf4316e90d86d9dcb4b67460de2792b5de43 GIT binary patch literal 651 zcmV;60(AX}P)5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzw5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwU4B9OfVCXU4iZ@WIw|Ucu;K(4g=y{fD~}ZuE1>oIBXzFIYl5L zj}1V)01X%vZy*I0hB%T*s4hUV6~#7ah~swwl1qq=8K6Rh7f8{C%L^B>wHX8i1i;Zl mETGs0C5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzw5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwmc8Kag8{O1tl0L#tudcg>ynVx@utA%UCCI-@sP|3iMv<+f0(~tK*7_ezTR*dW- zkT^&W2!j9%vO;`pnA6eKFu_bjb_Ketko^oZU|IABa2OEn0&IrhH2~}i21tlY3gGq} z+yyWV$ckYB1v3bnF(_U@wiQ`1%phzAfCG_O#Y7oEY_!7Ep?G1M_X7q20ReFI5DPH8 nK&(cXIurv)wVhPUXrmqgeY;O@&IZxS00000NkvXXu0mjf^3xtI literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/magenta_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/magenta_advanced_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..5909a759df5eb734b5424c2565ad8d9686d7b577 GIT binary patch literal 644 zcmV-~0(5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwK~y+TW87=A5@QfG`NKAS=YjhB+Nw4HL{n6jz|R3fa#v15$3}fWv@j7hp3490s_Y4GSA&mtj*2 zHvl~_kpl~#At)}uW(dq6TrS1%0xWunjUAj}K&$~Mu@G`1hCx6;031EU0*YOLVgRYO e6YEOassjMQ&Rgq7*YIor00005Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzw7w_Rh3{Ww~ z^y`dQBN_e+@<61dW-~B?Xr|{+ULX`hHDVJ3X+|hyV0e}a;WNGe!oYw{1F~Wi7Xc+e zdO#QiSWpz=;lP}Zu7n9BfbI$mS0VWsW`Oo`NEi_90_1>0b_GrYzcd5IutKRPyfImARqva9%2E- kE~d;kCd07*qoM6N<$f*&0i(EtDd literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/pink_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/pink_advanced_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..763174e6da9e35c6bef01c4fdf9c78e157c5eb41 GIT binary patch literal 650 zcmV;50(Jd~P)5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzw1j zOxs~PkX-~61M7hT7GzWLv0+X}SHlDn0GWvFY;-=dpJ4`AFRulM0nskNW(ZybU||DN z1P>o9euTRKBQTKz3mC|_0E!ooZAI3A9O_sDkyyppTmg;+N&t!%w5R7X2nYy(qlZ{P ku?tWPAk}taT}fMY0CXBimwOi$EC2ui07*qoM6N<$f?f;~&j0`b literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/purple_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/purple_advanced_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..7959d8f08bdac3a6f01b49172d66b5f37d9c55fa GIT binary patch literal 653 zcmV;80&@L{P)5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzw$WmDX<}>~H@q+=I24uy^ zE&{s{s0V~WfCX70J~qth=xUf?CZf0k%~i;Lh8ZyLNeVa&h;{)sL+}~^4jTqY084TR z;Pf5X3)sAY99YQSLpKS<3&^&j!~!(Lu{i_o0%VsE8#5qv7zU7{86yz;u7ofM2nc|q nhgd+d3s4Lo)plZCNn3RQ47^=AdWs8a00000NkvXXu0mjf1!^6O literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/red_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/red_advanced_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..f28ff3f4bed652267268a665dbfc2e8927d77e62 GIT binary patch literal 651 zcmV;60(AX}P)5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwmQK%$so+d zj$u1Y1G0-iVh}wLz=CWlJ~qth=xV?o0-1>HY;-=dpJ4_R+z`_Qk z2o^rrya;yzdSIdk79yt54MFh&vaQGpkwYD8AQGz>n-?I-iUNS*g@p4L7z6|az|li2 lpx6Z{29Rnyv96@8Ish8rQ1~8iYqbCX002ovPDHLkV1lq=Af5mK literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/white_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/white_advanced_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..49d75cfe88965e5b0b9b7b02b2c80874bd5f53d9 GIT binary patch literal 648 zcmV;30(bq1P)5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzws$A1PWU}t9svwr^k2@_&~ zi7^7f@ynP0O9}~r{j;@9YW+Jk)K{g=sk^Kxaz*1Ki90o+Y0GlCr4M6rMEPSwe z5$*!?z(fx$T;YS_1!P;1HQ*8lrvr48@hQgU3Je2?jaHaC6fbDX$}$KD2!Nx9SU|B0 iPz)f|c4A#gTXg_|S4WTAjs^Gt00005Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzw5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwrFufbq?9d!Wc%Iwp+VR=?>;#mgLWuq%zF52+G8g99e$Q-pMf@GkjhUMiVMA z#+mX1lxf{$8oiuhQnO=-CB^)@+e5PY5aYQn7boo_?#GbS?eboIld6;t;KfU?He9q~ zDwx&XE$9UGlO1nRra9HHIJaVzvo~7+i)Qo&X3r+KJ8nXL0@PMx!{Jl$bwag)ZE(dZ zr_6%7DBcO~R99?4T>yH-P;n3->^W5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwom!8BMCOe3-w%utYKxD7zYE-xW4pXKG-7eGpa zK}b*(EdTr)MA;AUmU;Df|rP6x4(4PgQa zeE#%`;r;tJU<1Aa4MOLG#9)4gSuZo`64>ux7Z3w1%maajtcL^`!#lVZoCbhg0Rw`9 zA`B-^uE%N*+yIyckYX4>HUyU|QCxsa13rVmfrt!BEl0iT~ q02$toC0000o-dP literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/blue_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/blue_advanced_candle_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..688b2b5f97fbd91e59897a71e517a8f9fb7c195e GIT binary patch literal 694 zcmV;n0!jUeP)5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwxOwq$1CUYD^$E;p`Sar`0~ZGa z!+&NWu>8N@uNXi^bFxEh0`Vb02Co0@Cw4fS1;k?f_kn?jn-eVf`3ENkA0!TQI%Wa9INO0=hSl z#gM&+%@DW&xD0`b6LbNxt;B{2-Y_865R_Qhy)ukJKtKQ-J;VZ(Fd$YFvN{w4NVT0D c3#qRM02Y~O!C}IuuK)l507*qoM6N<$f5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwUvNz@jmTm!L&2Jn!2gwDU_Q&)CqKZ#d>qUW z>DLe&?!W$v!q>Bc>XsBjHiv-)#Jm0OKZC3YCs;y^?K=h^ECF>on2lrz6Nvxm+fRna zZ$5+NUj5?4;Df|qeui1kXg32K24EKu3(yV0YXHPm5Tj*9cyZbR_5!*$kj0R_hs_ie zFCg2BtQaJY3&34~Y%8&00#b)z04bU=0 WK4|}%HNO|; literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/cyan_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/cyan_advanced_candle_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..e4aac48b464004c80f1fb309396947da1848b043 GIT binary patch literal 702 zcmV;v0zv(WP)5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwz71TQNFA0!NOI=UfD zAc6l6A2R%V^$Kd^Zwx-e=ihKY!>lisa0iD0*agG_Sim8x$7ulARZx{oVq!S$fExhQ zfUFoK1_CgHu$hA50%Ti}6~hd|W&k)4iB(LL0mKFBjBe*gdg literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/gray_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/gray_advanced_candle_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..3cd4e4d53da46a5c09ca8628738d3b7209b3610b GIT binary patch literal 690 zcmV;j0!{siP)5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzw z7E1`LVf=Jq*8lIX-+|@CT`L$tG}HCFKjE5S8j;0dhJrN1Z2&S}?(P8dS?=F_1EfS4 z#Q8fXKKL*X;1L9}y<3L%@rzyjhufB1#ry8tU#LP1UdgAWpiIUU^)CXm37 zA3qpAe0UEw;K8F07<`Zz%+E0E`3%y)VE}dku>jo=kUp>rumPB>U@pU@4sHOlH(-iE zV%Wry4MTAOF2x{mf-XR|mDn)B8wSK0f)WeMrcYxK5D)-I53vAeERbaYskReq32oH@ Y02#({K-G}vSpWb407*qoM6N<$f^FY4(EtDd literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/green_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/green_advanced_candle_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..d1ab64a251598a1f522cebd843bde534523f9b11 GIT binary patch literal 701 zcmV;u0z&5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwE{ zXL$AKFW7+ZK!ecvATgMqVb*JSKLYz5>;hr|x*>QC0K0+#;wmvYNO)iaa2LQdAS(um zfdI@PyavF-0%|L=VwgeL41mNP62PaJC5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwk;Pz!f;7Wz05Wzzx&g8H5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwVF0x5abmCQDE@?^E)t& zET(T6$@u^C=Kl;&UxDQqHIf-YG}G0)AK;o`8j;0dhJrOCf&Vw=g83|0uiXVw$_&DS z5@6{U@4i844ivtg4i7}Tv>38E3@l(xFFrB+`^OHJ5ET~0;DaTgPDeL{2_*3L-D`$d zuU>=YUcY^h!3T-K{0y_6k=GX-24EKu3(yV0YXHbqFd!x-iqj6b3t$?M6(bvh%LEiJ z;L?E4AaEce17d7NR*zu-u>lHGhvJ2{<~{}i0ReFI5DO@F0g3^n+D@!1X{!zZoHt5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzw2W{=hZCG$M<^3}gDXQZ gfK=N_wTw3E0Y1@X5^8QTWB>pF07*qoM6N<$f^v5=n*aa+ literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/magenta_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/magenta_advanced_candle_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..bc446fbe5abc25f776ebd28b0c87a0f4189c3e9b GIT binary patch literal 685 zcmV;e0#f~nP)5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwTgu*+_;kf%rfE{9t(g z;RRUk%XdsZNDSs@nDvYi7T_>|xRXeLZU{&l*ag@C%vCU#;Zg@T0NEQb#UL?k;>d=f zxB!=8kT^jXAlpi0kbsrp35Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwI=o%5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwk;UMKf;1z6|L3-Y`7GCOePGZ8GPq=U zA=39gf~kLhz!t#yEc%iVzPuo^ISecy-iK$53>;iMUjo=yas?=#c&5=w1kQTPCMW(fN4Nh3>E_c zs6p6FLGc2zt;mYu24OJ)9Eij!#^wSH1BeY!m^u_MXiv{&5D*Z6rXYxttC0*0+RJep pOV9=QG=q#qF#z3mQoS=U>H$Z%Uca+OZhim&002ovPDHLkV1nPQJlg;O literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/purple_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/purple_advanced_candle_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..755bc878ededa1a73d64deda455d628079652d67 GIT binary patch literal 708 zcmV;#0z3VQP)5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzw^Q04M4_z;RGK&Qh1P6NQMV1UGiBvK5aTL$(5 zx;K!;kiCP=r6?{ywiQ`1NE{b{y8zi%V#5Ta4#NOaG-Jd<-<1#s0RaJU^uWN?NCpP& q<+zO{=mLD2F}#3oJE`6o81(>7S7>Mv5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwy^Pd3(#6`dq7`%J~p^?NS zW*%VtzcArH!?U+wDaOjpj3Aon@slqIO;C*}Vo)=|nvuZ&c3&``5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwq$1Ca6K)@m@H<^J0*3=G12 z3<3iDVEMmb@*~54URfkQ0|WD)*I+)gggCM}3@jktkN-gDGjT!P{|$o=HW=!3bVHax z0?*&QV|elQEyMtzLFjyt7|hQw>sk5iz+nJ(0kHtx5WEI}Tmb_T!ooQ1fV%*u0a-D! zA-GIH@d7Rl_zVIEA~GPxR%G=U1`r#dFm)(i(3F)0CMW@L^uWN?NCpP&<+zO{=mLD2 l!N~^MY;@a6_0GVk2LR@WSAU97j(7k7002ovPDHLkV1oT*K*az6 literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/yellow_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/yellow_advanced_candle_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..bfe15cd8baea7a9767fc5e9b834c7ebfe61d15b0 GIT binary patch literal 697 zcmV;q0!ICbP)5Qp?tw(rD(~XL-OhaV7qAT7O_GtNJ zTKG`dZ^(ecS4vN{_*rqT#qWxZcyt!*s;4*C!Kn_`@?L3zWs9$y=v}A&wk*@%lxrO4p3ktmqke3e;5Y zzwou50 z7Go2g#Q5)j^Z$PgdSE#gMt?>S&Gh5lBe*7*Mr1LVp&-q08-R>I|2Km9ERUbQVvq$g zWEFKG@-KgZDN%lY6#jn^gmxx|OK=Vgi1p*gPayFaBFG_&!3PP$oQ~`YuopnY>$e{n zZr^_ikpmip&IgIX{0uXIiLn+O24EKu3(yV0YXHalHGhvEh8h|>%L0s`RZfq|=$3=G=KaT`m}1^6_Bj72d3 f-F8yFGcf7_BkWwEq)sBV00000NkvXXu0mjfVwN!a literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/small_carved_pumpkin.png b/Common/src/main/resources/assets/hyperlighting/textures/block/small_carved_pumpkin.png new file mode 100644 index 0000000000000000000000000000000000000000..7d8b9a44546ab117c839e655bd0431ebe7fe8fcc GIT binary patch literal 877 zcmV-z1CsoSP)cGASK)HBGxpxoejf8UXP&+9X4|)7-mvT|XVl2M=J z)DO=mVDxu0Jm35XP^E}&!`)j8eDg&~8$P<1=k>4e_4@U1?^(Y+&tOk#N0IY>n86Pv z{V+3I2K+#B_tpY~q2$rMJpEnuVWeMQo5v5Nj!HSq9E&hspYK=`Sie25qywo&>;$Yu zb(phSz*>~}I})d%MJPD2OLtMCP(F_vWk8hvdQK)iE#IIi9TD0Mec8Gz#3@+`ZHiWQA=b0#A3au*T4u z@S+XPm8>2p!nPT7yO-%30K;u}bb9?z^1BZoTkz~__0s9CpW$KoFUVRI6Sv*LX%raj zNnW%MprxF5b`EqY+}`MF2mq?f0}nrxG*_~`Y^%-YiW-!nY9ee~W#PxOe=sggKvY!* zApVhfvUWp1C{YQV+QpvPnF+YP5l*83wfd<|=Cqoc5|YCwk_X)`PNRU^8(m5IuW^lQTm#@=+s$