diff --git a/Common/src/main/resources/assets/hyperlighting/blockstates/advanced_candle.json b/Common/src/main/resources/assets/hyperlighting/blockstates/advanced_candle.json index 1780c28..aa0ddf1 100644 --- a/Common/src/main/resources/assets/hyperlighting/blockstates/advanced_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/blockstates/advanced_candle.json @@ -1,131 +1,35 @@ { "variants": { - "facing=east,lit=true,color=white": {"model": "hyperlighting:block/candle/white_candle"}, - "facing=east,lit=false,color=white": {"model": "hyperlighting:block/candle/white_candle"}, - "facing=south,lit=true,color=white": {"model": "hyperlighting:block/candle/white_candle", "y": 90}, - "facing=south,lit=false,color=white": {"model": "hyperlighting:block/candle/white_candle", "y": 90}, - "facing=west,lit=true,color=white": {"model": "hyperlighting:block/candle/white_candle", "y": 180}, - "facing=west,lit=false,color=white": {"model": "hyperlighting:block/candle/white_candle", "y": 180}, - "facing=north,lit=true,color=white": {"model": "hyperlighting:block/candle/white_candle", "y": 270}, - "facing=north,lit=false,color=white": {"model": "hyperlighting:block/candle/white_candle", "y": 270}, - "facing=east,lit=true,color=orange": {"model": "hyperlighting:block/candle/orange_candle"}, - "facing=east,lit=false,color=orange": {"model": "hyperlighting:block/candle/orange_candle"}, - "facing=south,lit=true,color=orange": {"model": "hyperlighting:block/candle/orange_candle", "y": 90}, - "facing=south,lit=false,color=orange": {"model": "hyperlighting:block/candle/orange_candle", "y": 90}, - "facing=west,lit=true,color=orange": {"model": "hyperlighting:block/candle/orange_candle", "y": 180}, - "facing=west,lit=false,color=orange": {"model": "hyperlighting:block/candle/orange_candle", "y": 180}, - "facing=north,lit=true,color=orange": {"model": "hyperlighting:block/candle/orange_candle", "y": 270}, - "facing=north,lit=false,color=orange": {"model": "hyperlighting:block/candle/orange_candle", "y": 270}, - "facing=east,lit=true,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle"}, - "facing=east,lit=false,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle"}, - "facing=south,lit=true,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle", "y": 90}, - "facing=south,lit=false,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle", "y": 90}, - "facing=west,lit=true,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle", "y": 180}, - "facing=west,lit=false,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle", "y": 180}, - "facing=north,lit=true,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle", "y": 270}, - "facing=north,lit=false,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle", "y": 270}, - "facing=east,lit=true,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle"}, - "facing=east,lit=false,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle"}, - "facing=south,lit=true,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle", "y": 90}, - "facing=south,lit=false,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle", "y": 90}, - "facing=west,lit=true,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle", "y": 180}, - "facing=west,lit=false,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle", "y": 180}, - "facing=north,lit=true,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle", "y": 270}, - "facing=north,lit=false,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle", "y": 270}, - "facing=east,lit=true,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle"}, - "facing=east,lit=false,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle"}, - "facing=south,lit=true,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle", "y": 90}, - "facing=south,lit=false,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle", "y": 90}, - "facing=west,lit=true,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle", "y": 180}, - "facing=west,lit=false,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle", "y": 180}, - "facing=north,lit=true,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle", "y": 270}, - "facing=north,lit=false,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle", "y": 270}, - "facing=east,lit=true,color=lime": {"model": "hyperlighting:block/candle/lime_candle"}, - "facing=east,lit=false,color=lime": {"model": "hyperlighting:block/candle/lime_candle"}, - "facing=south,lit=true,color=lime": {"model": "hyperlighting:block/candle/lime_candle", "y": 90}, - "facing=south,lit=false,color=lime": {"model": "hyperlighting:block/candle/lime_candle", "y": 90}, - "facing=west,lit=true,color=lime": {"model": "hyperlighting:block/candle/lime_candle", "y": 180}, - "facing=west,lit=false,color=lime": {"model": "hyperlighting:block/candle/lime_candle", "y": 180}, - "facing=north,lit=true,color=lime": {"model": "hyperlighting:block/candle/lime_candle", "y": 270}, - "facing=north,lit=false,color=lime": {"model": "hyperlighting:block/candle/lime_candle", "y": 270}, - "facing=east,lit=true,color=pink": {"model": "hyperlighting:block/candle/pink_candle"}, - "facing=east,lit=false,color=pink": {"model": "hyperlighting:block/candle/pink_candle"}, - "facing=south,lit=true,color=pink": {"model": "hyperlighting:block/candle/pink_candle", "y": 90}, - "facing=south,lit=false,color=pink": {"model": "hyperlighting:block/candle/pink_candle", "y": 90}, - "facing=west,lit=true,color=pink": {"model": "hyperlighting:block/candle/pink_candle", "y": 180}, - "facing=west,lit=false,color=pink": {"model": "hyperlighting:block/candle/pink_candle", "y": 180}, - "facing=north,lit=true,color=pink": {"model": "hyperlighting:block/candle/pink_candle", "y": 270}, - "facing=north,lit=false,color=pink": {"model": "hyperlighting:block/candle/pink_candle", "y": 270}, - "facing=east,lit=true,color=gray": {"model": "hyperlighting:block/candle/gray_candle"}, - "facing=east,lit=false,color=gray": {"model": "hyperlighting:block/candle/gray_candle"}, - "facing=south,lit=true,color=gray": {"model": "hyperlighting:block/candle/gray_candle", "y": 90}, - "facing=south,lit=false,color=gray": {"model": "hyperlighting:block/candle/gray_candle", "y": 90}, - "facing=west,lit=true,color=gray": {"model": "hyperlighting:block/candle/gray_candle", "y": 180}, - "facing=west,lit=false,color=gray": {"model": "hyperlighting:block/candle/gray_candle", "y": 180}, - "facing=north,lit=true,color=gray": {"model": "hyperlighting:block/candle/gray_candle", "y": 270}, - "facing=north,lit=false,color=gray": {"model": "hyperlighting:block/candle/gray_candle", "y": 270}, - "facing=east,lit=true,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle"}, - "facing=east,lit=false,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle"}, - "facing=south,lit=true,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle", "y": 90}, - "facing=south,lit=false,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle", "y": 90}, - "facing=west,lit=true,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle", "y": 180}, - "facing=west,lit=false,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle", "y": 180}, - "facing=north,lit=true,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle", "y": 270}, - "facing=north,lit=false,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle", "y": 270}, - "facing=east,lit=true,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle"}, - "facing=east,lit=false,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle"}, - "facing=south,lit=true,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle", "y": 90}, - "facing=south,lit=false,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle", "y": 90}, - "facing=west,lit=true,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle", "y": 180}, - "facing=west,lit=false,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle", "y": 180}, - "facing=north,lit=true,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle", "y": 270}, - "facing=north,lit=false,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle", "y": 270}, - "facing=east,lit=true,color=purple": {"model": "hyperlighting:block/candle/purple_candle"}, - "facing=east,lit=false,color=purple": {"model": "hyperlighting:block/candle/purple_candle"}, - "facing=south,lit=true,color=purple": {"model": "hyperlighting:block/candle/purple_candle", "y": 90}, - "facing=south,lit=false,color=purple": {"model": "hyperlighting:block/candle/purple_candle", "y": 90}, - "facing=west,lit=true,color=purple": {"model": "hyperlighting:block/candle/purple_candle", "y": 180}, - "facing=west,lit=false,color=purple": {"model": "hyperlighting:block/candle/purple_candle", "y": 180}, - "facing=north,lit=true,color=purple": {"model": "hyperlighting:block/candle/purple_candle", "y": 270}, - "facing=north,lit=false,color=purple": {"model": "hyperlighting:block/candle/purple_candle", "y": 270}, - "facing=east,lit=true,color=blue": {"model": "hyperlighting:block/candle/blue_candle"}, - "facing=east,lit=false,color=blue": {"model": "hyperlighting:block/candle/blue_candle"}, - "facing=south,lit=true,color=blue": {"model": "hyperlighting:block/candle/blue_candle", "y": 90}, - "facing=south,lit=false,color=blue": {"model": "hyperlighting:block/candle/blue_candle", "y": 90}, - "facing=west,lit=true,color=blue": {"model": "hyperlighting:block/candle/blue_candle", "y": 180}, - "facing=west,lit=false,color=blue": {"model": "hyperlighting:block/candle/blue_candle", "y": 180}, - "facing=north,lit=true,color=blue": {"model": "hyperlighting:block/candle/blue_candle", "y": 270}, - "facing=north,lit=false,color=blue": {"model": "hyperlighting:block/candle/blue_candle", "y": 270}, - "facing=east,lit=true,color=brown": {"model": "hyperlighting:block/candle/brown_candle"}, - "facing=east,lit=false,color=brown": {"model": "hyperlighting:block/candle/brown_candle"}, - "facing=south,lit=true,color=brown": {"model": "hyperlighting:block/candle/brown_candle", "y": 90}, - "facing=south,lit=false,color=brown": {"model": "hyperlighting:block/candle/brown_candle", "y": 90}, - "facing=west,lit=true,color=brown": {"model": "hyperlighting:block/candle/brown_candle", "y": 180}, - "facing=west,lit=false,color=brown": {"model": "hyperlighting:block/candle/brown_candle", "y": 180}, - "facing=north,lit=true,color=brown": {"model": "hyperlighting:block/candle/brown_candle", "y": 270}, - "facing=north,lit=false,color=brown": {"model": "hyperlighting:block/candle/brown_candle", "y": 270}, - "facing=east,lit=true,color=green": {"model": "hyperlighting:block/candle/green_candle"}, - "facing=east,lit=false,color=green": {"model": "hyperlighting:block/candle/green_candle"}, - "facing=south,lit=true,color=green": {"model": "hyperlighting:block/candle/green_candle", "y": 90}, - "facing=south,lit=false,color=green": {"model": "hyperlighting:block/candle/green_candle", "y": 90}, - "facing=west,lit=true,color=green": {"model": "hyperlighting:block/candle/green_candle", "y": 180}, - "facing=west,lit=false,color=green": {"model": "hyperlighting:block/candle/green_candle", "y": 180}, - "facing=north,lit=true,color=green": {"model": "hyperlighting:block/candle/green_candle", "y": 270}, - "facing=north,lit=false,color=green": {"model": "hyperlighting:block/candle/green_candle", "y": 270}, - "facing=east,lit=true,color=red": {"model": "hyperlighting:block/candle/red_candle"}, - "facing=east,lit=false,color=red": {"model": "hyperlighting:block/candle/red_candle"}, - "facing=south,lit=true,color=red": {"model": "hyperlighting:block/candle/red_candle", "y": 90}, - "facing=south,lit=false,color=red": {"model": "hyperlighting:block/candle/red_candle", "y": 90}, - "facing=west,lit=true,color=red": {"model": "hyperlighting:block/candle/red_candle", "y": 180}, - "facing=west,lit=false,color=red": {"model": "hyperlighting:block/candle/red_candle", "y": 180}, - "facing=north,lit=true,color=red": {"model": "hyperlighting:block/candle/red_candle", "y": 270}, - "facing=north,lit=false,color=red": {"model": "hyperlighting:block/candle/red_candle", "y": 270}, - "facing=east,lit=true,color=black": {"model": "hyperlighting:block/candle/black_candle"}, - "facing=east,lit=false,color=black": {"model": "hyperlighting:block/candle/black_candle"}, - "facing=south,lit=true,color=black": {"model": "hyperlighting:block/candle/black_candle", "y": 90}, - "facing=south,lit=false,color=black": {"model": "hyperlighting:block/candle/black_candle", "y": 90}, - "facing=west,lit=true,color=black": {"model": "hyperlighting:block/candle/black_candle", "y": 180}, - "facing=west,lit=false,color=black": {"model": "hyperlighting:block/candle/black_candle", "y": 180}, - "facing=north,lit=true,color=black": {"model": "hyperlighting:block/candle/black_candle", "y": 270}, - "facing=north,lit=false,color=black": {"model": "hyperlighting:block/candle/black_candle", "y": 270} } + "lit=true,color=white": {"model": "hyperlighting:block/candle/white_candle"}, + "lit=false,color=white": {"model": "hyperlighting:block/candle/white_candle"}, + "lit=true,color=orange": {"model": "hyperlighting:block/candle/orange_candle"}, + "lit=false,color=orange": {"model": "hyperlighting:block/candle/orange_candle"}, + "lit=true,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle"}, + "lit=false,color=magenta": {"model": "hyperlighting:block/candle/magenta_candle"}, + "lit=true,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle"}, + "lit=false,color=light_blue": {"model": "hyperlighting:block/candle/light_blue_candle"}, + "lit=true,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle"}, + "lit=false,color=yellow": {"model": "hyperlighting:block/candle/yellow_candle"}, + "lit=true,color=lime": {"model": "hyperlighting:block/candle/lime_candle"}, + "lit=false,color=lime": {"model": "hyperlighting:block/candle/lime_candle"}, + "lit=true,color=pink": {"model": "hyperlighting:block/candle/pink_candle"}, + "lit=false,color=pink": {"model": "hyperlighting:block/candle/pink_candle"}, + "lit=true,color=gray": {"model": "hyperlighting:block/candle/gray_candle"}, + "lit=false,color=gray": {"model": "hyperlighting:block/candle/gray_candle"}, + "lit=true,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle"}, + "lit=false,color=light_gray": {"model": "hyperlighting:block/candle/light_gray_candle"}, + "lit=true,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle"}, + "lit=false,color=cyan": {"model": "hyperlighting:block/candle/cyan_candle"}, + "lit=true,color=purple": {"model": "hyperlighting:block/candle/purple_candle"}, + "lit=false,color=purple": {"model": "hyperlighting:block/candle/purple_candle"}, + "lit=true,color=blue": {"model": "hyperlighting:block/candle/blue_candle"}, + "lit=false,color=blue": {"model": "hyperlighting:block/candle/blue_candle"}, + "lit=true,color=brown": {"model": "hyperlighting:block/candle/brown_candle"}, + "lit=false,color=brown": {"model": "hyperlighting:block/candle/brown_candle"}, + "lit=true,color=green": {"model": "hyperlighting:block/candle/green_candle"}, + "lit=false,color=green": {"model": "hyperlighting:block/candle/green_candle"}, + "lit=true,color=red": {"model": "hyperlighting:block/candle/red_candle"}, + "lit=false,color=red": {"model": "hyperlighting:block/candle/red_candle"}, + "lit=true,color=black": {"model": "hyperlighting:block/candle/black_candle"}, + "lit=false,color=black": {"model": "hyperlighting:block/candle/black_candle"} } } 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..3c37186 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/advanced_candle_base.json @@ -0,0 +1,230 @@ +{ + "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"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 3, 1], + "scale": [0.55, 0.55, 0.55] + }, + "thirdperson_lefthand": { + "translation": [0, 3, 1], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson_righthand": { + "rotation": [0, -90, 25], + "translation": [1.13, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "firstperson_lefthand": { + "rotation": [0, -90, 25], + "translation": [1.13, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, 180, 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/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..7d8ce92 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,6 @@ { - "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..a8342a4 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/candle/gray_candle_lit.json @@ -0,0 +1,6 @@ +{ + "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/item/advanced_candle.json b/Common/src/main/resources/assets/hyperlighting/models/item/advanced_candle.json index 460b377..b60ddd8 100644 --- a/Common/src/main/resources/assets/hyperlighting/models/item/advanced_candle.json +++ b/Common/src/main/resources/assets/hyperlighting/models/item/advanced_candle.json @@ -1,5 +1,5 @@ { - "parent": "hyperlighting:block/candle_base", + "parent": "hyperlighting:block/advanced_candle_base", "overrides": [ { "predicate": { "color": 0 }, "model": "hyperlighting:block/candle/white_candle" }, { "predicate": { "color": 1 }, "model": "hyperlighting:block/candle/orange_candle" }, 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