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 0000000..4ac5049 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/advanced_candle.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/black_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/black_advanced_candle.png new file mode 100644 index 0000000..bcfd451 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/black_advanced_candle.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/blue_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/blue_advanced_candle.png new file mode 100644 index 0000000..72f1160 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/blue_advanced_candle.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/brown_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/brown_advanced_candle.png new file mode 100644 index 0000000..a20b0f9 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/brown_advanced_candle.png differ 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 0000000..ecd1965 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/cyan_advanced_candle.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/gray_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/gray_advanced_candle.png new file mode 100644 index 0000000..87146e0 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/gray_advanced_candle.png differ 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 0000000..403cbf4 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/green_advanced_candle.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/light_blue_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/light_blue_advanced_candle.png new file mode 100644 index 0000000..64d23d7 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/light_blue_advanced_candle.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/light_gray_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/light_gray_advanced_candle.png new file mode 100644 index 0000000..bbd662b Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/light_gray_advanced_candle.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/lime_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/lime_advanced_candle.png new file mode 100644 index 0000000..2df1ee4 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/lime_advanced_candle.png differ 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 0000000..5909a75 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/magenta_advanced_candle.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/orange_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/orange_advanced_candle.png new file mode 100644 index 0000000..cc32214 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/orange_advanced_candle.png differ 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 0000000..763174e Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/pink_advanced_candle.png differ 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 0000000..7959d8f Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/purple_advanced_candle.png differ 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 0000000..f28ff3f Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/red_advanced_candle.png differ 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 0000000..49d75cf Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/white_advanced_candle.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/yellow_advanced_candle.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/yellow_advanced_candle.png new file mode 100644 index 0000000..820b07e Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/base/yellow_advanced_candle.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/advanced_candle_lit.png new file mode 100644 index 0000000..4c5c896 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/advanced_candle_lit.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/black_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/black_advanced_candle_lit.png new file mode 100644 index 0000000..f4052ad Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/black_advanced_candle_lit.png differ 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 0000000..688b2b5 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/blue_advanced_candle_lit.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/brown_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/brown_advanced_candle_lit.png new file mode 100644 index 0000000..ec79782 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/brown_advanced_candle_lit.png differ 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 0000000..e4aac48 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/cyan_advanced_candle_lit.png differ 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 0000000..3cd4e4d Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/gray_advanced_candle_lit.png differ 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 0000000..d1ab64a Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/green_advanced_candle_lit.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/light_blue_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/light_blue_advanced_candle_lit.png new file mode 100644 index 0000000..95f856d Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/light_blue_advanced_candle_lit.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/light_gray_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/light_gray_advanced_candle_lit.png new file mode 100644 index 0000000..f578d6a Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/light_gray_advanced_candle_lit.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/lime_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/lime_advanced_candle_lit.png new file mode 100644 index 0000000..ed22b60 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/lime_advanced_candle_lit.png differ 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 0000000..bc446fb Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/magenta_advanced_candle_lit.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/orange_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/orange_advanced_candle_lit.png new file mode 100644 index 0000000..4c214b3 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/orange_advanced_candle_lit.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/pink_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/pink_advanced_candle_lit.png new file mode 100644 index 0000000..3fac3e9 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/pink_advanced_candle_lit.png differ 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 0000000..755bc87 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/purple_advanced_candle_lit.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/red_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/red_advanced_candle_lit.png new file mode 100644 index 0000000..a28e691 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/red_advanced_candle_lit.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/white_advanced_candle_lit.png b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/white_advanced_candle_lit.png new file mode 100644 index 0000000..ff106bc Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/white_advanced_candle_lit.png differ 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 0000000..bfe15cd Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/candle/lit/yellow_advanced_candle_lit.png differ 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 0000000..7d8b9a4 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/small_carved_pumpkin.png differ