From b093c828b93ce812d96edab6e1197d214ae453d8 Mon Sep 17 00:00:00 2001 From: Mark Rapson Date: Tue, 11 Aug 2026 02:02:14 +0100 Subject: [PATCH] Preserve parent model settings in renderer --- build/scripts/render_models.py | 20 +- .../assets/lz/models/items/candle_stand.json | 669 ------------------ .../assets/minecraft/items/candle.json | 14 - 3 files changed, 13 insertions(+), 690 deletions(-) delete mode 100644 resourcepack/assets/lz/models/items/candle_stand.json delete mode 100644 resourcepack/assets/minecraft/items/candle.json diff --git a/build/scripts/render_models.py b/build/scripts/render_models.py index 9ba28dd..8d9b3ed 100644 --- a/build/scripts/render_models.py +++ b/build/scripts/render_models.py @@ -185,6 +185,12 @@ def merge_model(pack_root: Path, model_ref: str, cache: dict[str, dict[str, Any] else: merged["texture_size"] = [16, 16] + for key in ("display", "gui_light", "render_type", "groups", "credit", "ambientocclusion"): + if key in data: + merged[key] = data[key] + elif parent_model and key in parent_model: + merged[key] = parent_model[key] + cache[model_ref] = merged return merged @@ -458,8 +464,8 @@ def render_model(pack_root: Path, model_ref: str, output_path: Path, cache: dict shadow = shadow.filter(ImageFilter.GaussianBlur(8)) canvas.alpha_composite(shadow) + faces: list[tuple[float, list[tuple[float, float, float]], Image.Image]] = [] for corners, element, model_data in transformed_elements: - faces: list[tuple[float, list[tuple[float, float, float]], Image.Image]] = [] for face_name, face in element.get("faces", {}).items(): vertices = face_vertices(corners, face_name) if not vertices: @@ -468,12 +474,12 @@ def render_model(pack_root: Path, model_ref: str, output_path: Path, cache: dict texture = resolve_face_texture(pack_root, model_data, face) faces.append((sort_face_key(projected), projected, texture)) - faces.sort(key=lambda item: item[0]) - for _, projected, texture in faces: - warped = transform_face(texture, projected, canvas) - if warped is None: - continue - canvas.alpha_composite(warped) + faces.sort(key=lambda item: item[0]) + for _, projected, texture in faces: + warped = transform_face(texture, projected, canvas) + if warped is None: + continue + canvas.alpha_composite(warped) canvas.save(output_path) diff --git a/resourcepack/assets/lz/models/items/candle_stand.json b/resourcepack/assets/lz/models/items/candle_stand.json deleted file mode 100644 index 15729ec..0000000 --- a/resourcepack/assets/lz/models/items/candle_stand.json +++ /dev/null @@ -1,669 +0,0 @@ -{ - "textures": { - "0": "block/candle", - "1": "block/gold_block", - "2": "lz:block/items/flame", - "particle": "block/gold_block" - }, - "elements": [ - { - "from": [7.2, 8.8, 2.4], - "to": [8.8, 12.4, 4], - "shade": false, - "light_emission": 12, - "rotation": {"angle": 0, "axis": "y", "origin": [-4.8, 0, -4.8]}, - "faces": { - "north": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "east": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "south": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "west": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "up": {"uv": [0, 6, 2, 8], "texture": "#0"}, - "down": {"uv": [0, 14, 2, 16], "texture": "#0"} - } - }, - { - "from": [7.2, 8.8, 12], - "to": [8.8, 12.4, 13.6], - "shade": false, - "light_emission": 12, - "rotation": {"angle": 0, "axis": "y", "origin": [-4.8, 0, -4.8]}, - "faces": { - "north": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "east": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "south": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "west": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "up": {"uv": [0, 6, 2, 8], "texture": "#0"}, - "down": {"uv": [0, 14, 2, 16], "texture": "#0"} - } - }, - { - "from": [12, 8.8, 7.2], - "to": [13.6, 12.4, 8.8], - "shade": false, - "light_emission": 12, - "rotation": {"angle": 0, "axis": "y", "origin": [-4.8, 0, -4.8]}, - "faces": { - "north": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "east": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "south": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "west": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "up": {"uv": [0, 6, 2, 8], "texture": "#0"}, - "down": {"uv": [0, 14, 2, 16], "texture": "#0"} - } - }, - { - "from": [2.4, 8.8, 7.2], - "to": [4, 12.4, 8.8], - "shade": false, - "light_emission": 12, - "rotation": {"angle": 0, "axis": "y", "origin": [-4.8, 0, -4.8]}, - "faces": { - "north": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "east": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "south": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "west": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "up": {"uv": [0, 6, 2, 8], "texture": "#0"}, - "down": {"uv": [0, 14, 2, 16], "texture": "#0"} - } - }, - { - "from": [7.2, 10.8, 7.2], - "to": [8.8, 14.4, 8.8], - "shade": false, - "light_emission": 12, - "rotation": {"angle": 0, "axis": "y", "origin": [-4.8, 0, -4.8]}, - "faces": { - "north": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "east": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "south": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "west": {"uv": [0, 8, 2, 12], "texture": "#0"}, - "up": {"uv": [0, 6, 2, 8], "texture": "#0"}, - "down": {"uv": [0, 14, 2, 16], "texture": "#0"} - } - }, - { - "from": [7.2, 1.6, 7.2], - "to": [8.8, 10, 8.8], - "rotation": {"angle": 0, "axis": "y", "origin": [-4.8, 0, -4.8]}, - "faces": { - "north": {"uv": [8, 3, 10, 13], "texture": "#1"}, - "east": {"uv": [8, 3, 10, 13], "texture": "#1"}, - "south": {"uv": [8, 3, 10, 13], "texture": "#1"}, - "west": {"uv": [8, 3, 10, 13], "texture": "#1"}, - "up": {"uv": [8, 11, 10, 13], "texture": "#1"}, - "down": {"uv": [8, 11, 10, 13], "texture": "#1"} - } - }, - { - "from": [6.4, 0, 6.4], - "to": [9.6, 1.6, 9.6], - "rotation": {"angle": 0, "axis": "y", "origin": [6.4, 0, 6.4]}, - "faces": { - "north": {"uv": [3, 10, 7, 12], "texture": "#1"}, - "east": {"uv": [3, 10, 7, 12], "texture": "#1"}, - "south": {"uv": [3, 10, 7, 12], "texture": "#1"}, - "west": {"uv": [3, 10, 7, 12], "texture": "#1"}, - "up": {"uv": [3, 8, 7, 12], "texture": "#1"}, - "down": {"uv": [11, 11, 15, 15], "texture": "#1"} - } - }, - { - "from": [6.8, 8.4, 2], - "to": [9.2, 9.2, 4.4], - "rotation": {"angle": 0, "axis": "y", "origin": [6.4, 0, 6.4]}, - "faces": { - "north": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "east": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "south": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "west": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "up": {"uv": [2, 10, 6, 14], "texture": "#1"}, - "down": {"uv": [2, 10, 6, 14], "texture": "#1"} - } - }, - { - "from": [6.8, 8.4, 11.6], - "to": [9.2, 9.2, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [6.4, 0, 6.4]}, - "faces": { - "north": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "east": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "south": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "west": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "up": {"uv": [2, 10, 6, 14], "texture": "#1"}, - "down": {"uv": [2, 10, 6, 14], "texture": "#1"} - } - }, - { - "from": [11.6, 8.4, 6.8], - "to": [14, 9.2, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [6.4, 0, 6.4]}, - "faces": { - "north": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "east": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "south": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "west": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "up": {"uv": [2, 10, 6, 14], "texture": "#1"}, - "down": {"uv": [2, 10, 6, 14], "texture": "#1"} - } - }, - { - "from": [2, 8.4, 6.8], - "to": [4.4, 9.2, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [6.4, 0, 6.4]}, - "faces": { - "north": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "east": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "south": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "west": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "up": {"uv": [2, 10, 6, 14], "texture": "#1"}, - "down": {"uv": [2, 10, 6, 14], "texture": "#1"} - } - }, - { - "from": [6.8, 10, 6.8], - "to": [9.2, 10.8, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [6.4, 0, 6.4]}, - "faces": { - "north": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "east": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "south": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "west": {"uv": [2, 12, 6, 14], "texture": "#1"}, - "up": {"uv": [2, 10, 6, 14], "texture": "#1"}, - "down": {"uv": [2, 10, 6, 14], "texture": "#1"} - } - }, - { - "from": [1.8, 6.4, 7.6016], - "to": [4.4, 7.2, 8.3984], - "rotation": {"angle": -22.5, "axis": "z", "origin": [4.8, 4.4, 6.4]}, - "faces": { - "north": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "east": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "south": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "west": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "up": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "down": {"uv": [3, 5, 8, 7], "texture": "#1"} - } - }, - { - "from": [7.6, 7.4, 2.8], - "to": [8.4, 8.4, 3.6], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.4, 8]}, - "faces": { - "north": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "east": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "south": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "west": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "up": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "down": {"uv": [3, 5, 8, 7], "texture": "#1"} - } - }, - { - "from": [7.6, 6.4, 5.2], - "to": [8.4, 7.2, 7.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.4, 8]}, - "faces": { - "north": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "east": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "south": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "west": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "up": {"uv": [3, 5, 8, 7], "texture": "#1"}, - "down": {"uv": [3, 5, 8, 7], "texture": "#1"} - } - }, - { - "from": [12.4, 7.4, 7.6], - "to": [13.2, 8.4, 8.4], - "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 7.35, 8]}, - "faces": { - "north": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "east": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "south": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "west": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "up": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "down": {"uv": [3, 4, 7, 6], "texture": "#1"} - } - }, - { - "from": [8.8, 6.4, 7.6], - "to": [10.8, 7.2, 8.4], - "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 7.35, 8]}, - "faces": { - "north": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "east": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "south": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "west": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "up": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "down": {"uv": [3, 4, 7, 6], "texture": "#1"} - } - }, - { - "from": [10.5424, 6.8736, 7.6016], - "to": [13.1424, 7.6736, 8.3984], - "rotation": {"angle": 22.5, "axis": "z", "origin": [11.86, 7.28, 8]}, - "faces": { - "north": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "east": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "south": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "west": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "up": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "down": {"uv": [3, 4, 7, 6], "texture": "#1"} - } - }, - { - "from": [7.6016, 5.38787, 2.56784], - "to": [8.3984, 6.18787, 5.16784], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 5.78787, 7.72]}, - "faces": { - "north": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "east": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "south": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "west": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "up": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "down": {"uv": [3, 4, 7, 6], "texture": "#1"} - } - }, - { - "from": [2.8, 7.4, 7.6], - "to": [3.6, 8.4, 8.4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.4, 8]}, - "faces": { - "north": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "east": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "south": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "west": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "up": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "down": {"uv": [3, 4, 7, 6], "texture": "#1"} - } - }, - { - "from": [5.2, 6.4, 7.6], - "to": [7.2, 7.2, 8.4], - "rotation": {"angle": 0, "axis": "y", "origin": [6.4, 4.4, 6.4]}, - "faces": { - "north": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "east": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "south": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "west": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "up": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "down": {"uv": [3, 4, 7, 6], "texture": "#1"} - } - }, - { - "from": [7.6016, 5.176, 11.84], - "to": [8.3984, 5.976, 14.44], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 3.16, 8.24]}, - "faces": { - "north": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "east": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "south": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "west": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "up": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "down": {"uv": [3, 4, 7, 6], "texture": "#1"} - } - }, - { - "from": [7.6, 7.4, 12.4], - "to": [8.4, 8.4, 13.2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.4, 8]}, - "faces": { - "north": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "east": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "south": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "west": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "up": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "down": {"uv": [3, 4, 7, 6], "texture": "#1"} - } - }, - { - "from": [7.6, 6.4, 8.8], - "to": [8.4, 7.2, 10.8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.4, 8]}, - "faces": { - "north": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "east": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "south": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "west": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "up": {"uv": [3, 4, 7, 6], "texture": "#1"}, - "down": {"uv": [3, 4, 7, 6], "texture": "#1"} - } - }, - { - "from": [0.24, 12.4, -5.04], - "to": [1.04, 13.2, -5.04], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [25.84, 12.4, -5.04]}, - "faces": { - "north": {"uv": [1, 5, 0, 6], "texture": "#0"}, - "south": {"uv": [0, 5, 1, 6], "texture": "#0"} - } - }, - { - "from": [8.02091, 12.4, 12.37909], - "to": [8.02091, 13.2, 13.17909], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [8.02091, 12.8, 12.77909]}, - "faces": { - "east": {"uv": [0, 5, 1, 6], "texture": "#0"}, - "west": {"uv": [0, 5, 1, 6], "texture": "#0"} - } - }, - { - "from": [0.24, 12.4, -11.84], - "to": [1.04, 13.2, -11.84], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [25.84, 12.4, -5.04]}, - "faces": { - "north": {"uv": [1, 5, 0, 6], "texture": "#0"}, - "south": {"uv": [0, 5, 1, 6], "texture": "#0"} - } - }, - { - "from": [8.02091, 12.4, 5.57909], - "to": [8.02091, 13.2, 6.37909], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [8.02091, 12.8, 12.77909]}, - "faces": { - "east": {"uv": [0, 5, 1, 6], "texture": "#0"}, - "west": {"uv": [0, 5, 1, 6], "texture": "#0"} - } - }, - { - "from": [7.04, 12.4, -11.84], - "to": [7.84, 13.2, -11.84], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [25.84, 12.4, -5.04]}, - "faces": { - "north": {"uv": [1, 5, 0, 6], "texture": "#0"}, - "south": {"uv": [0, 5, 1, 6], "texture": "#0"} - } - }, - { - "from": [14.82091, 12.4, 5.57909], - "to": [14.82091, 13.2, 6.37909], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [8.02091, 12.8, 12.77909]}, - "faces": { - "east": {"uv": [0, 5, 1, 6], "texture": "#0"}, - "west": {"uv": [0, 5, 1, 6], "texture": "#0"} - } - }, - { - "from": [7.04, 14.4, -7.04], - "to": [7.84, 15.2, -7.04], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [25.84, 14.4, -0.24]}, - "faces": { - "north": {"uv": [1, 5, 0, 6], "texture": "#0"}, - "south": {"uv": [0, 5, 1, 6], "texture": "#0"} - } - }, - { - "from": [14.82091, 14.4, 10.37909], - "to": [14.82091, 15.2, 11.17909], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [8.02091, 14.8, 17.57909]}, - "faces": { - "east": {"uv": [0, 5, 1, 6], "texture": "#0"}, - "west": {"uv": [0, 5, 1, 6], "texture": "#0"} - } - }, - { - "from": [7.04, 12.4, -5.04], - "to": [7.84, 13.2, -5.04], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [25.84, 12.4, -5.04]}, - "faces": { - "north": {"uv": [1, 5, 0, 6], "texture": "#0"}, - "south": {"uv": [0, 5, 1, 6], "texture": "#0"} - } - }, - { - "from": [14.82091, 12.4, 12.37909], - "to": [14.82091, 13.2, 13.17909], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [8.02091, 12.8, 12.77909]}, - "faces": { - "east": {"uv": [0, 5, 1, 6], "texture": "#0"}, - "west": {"uv": [0, 5, 1, 6], "texture": "#0"} - } - }, - { - "from": [7.04, 12.8, 3.2], - "to": [8.96, 14.72, 3.2], - "light_emission": 15, - "rotation": {"angle": -45, "axis": "y", "origin": [8, 13.76, 3.2]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "south": {"uv": [16, 0, 0, 16], "texture": "#2"} - } - }, - { - "from": [7.04, 12.8, 3.2], - "to": [8.96, 14.72, 3.2], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [8, 13.76, 3.2]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "south": {"uv": [16, 0, 0, 16], "texture": "#2"} - } - }, - { - "from": [7.04, 12.8, 12.8], - "to": [8.96, 14.72, 12.8], - "light_emission": 15, - "rotation": {"angle": -45, "axis": "y", "origin": [8, 13.76, 12.8]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "south": {"uv": [16, 0, 0, 16], "texture": "#2"} - } - }, - { - "from": [7.04, 12.8, 12.8], - "to": [8.96, 14.72, 12.8], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [8, 13.76, 12.8]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "south": {"uv": [16, 0, 0, 16], "texture": "#2"} - } - }, - { - "from": [11.84, 12.8, 8], - "to": [13.76, 14.72, 8], - "light_emission": 15, - "rotation": {"angle": -45, "axis": "y", "origin": [12.8, 13.76, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "south": {"uv": [16, 0, 0, 16], "texture": "#2"} - } - }, - { - "from": [11.84, 12.8, 8], - "to": [13.76, 14.72, 8], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [12.8, 13.76, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "south": {"uv": [16, 0, 0, 16], "texture": "#2"} - } - }, - { - "from": [2.24, 12.8, 8], - "to": [4.16, 14.72, 8], - "light_emission": 15, - "rotation": {"angle": -45, "axis": "y", "origin": [3.2, 13.76, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "south": {"uv": [16, 0, 0, 16], "texture": "#2"} - } - }, - { - "from": [2.24, 12.8, 8], - "to": [4.16, 14.72, 8], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [3.2, 13.76, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "south": {"uv": [16, 0, 0, 16], "texture": "#2"} - } - }, - { - "from": [7.04, 14.8, 8], - "to": [8.96, 16.72, 8], - "light_emission": 15, - "rotation": {"angle": -45, "axis": "y", "origin": [8, 15.76, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "south": {"uv": [16, 0, 0, 16], "texture": "#2"} - } - }, - { - "from": [7.04, 14.8, 8], - "to": [8.96, 16.72, 8], - "light_emission": 15, - "rotation": {"angle": 45, "axis": "y", "origin": [8, 15.76, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "south": {"uv": [16, 0, 0, 16], "texture": "#2"} - } - } - ], - "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] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.9, 0.9, 0.9] - }, - "head": { - "translation": [0, -30.4, 0], - "scale": [1.6, 1.6, 1.6] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -12.8], - "scale": [1.6, 1.6, 1.6] - } - }, - "groups": [ - { - "name": "Candles", - "origin": [0, 0, 0], - "color": 0, - "shade": false, - "children": [0, 1, 2, 3, 4] - }, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - { - "name": "Arm", - "origin": [7, 2.75, 7], - "color": 0, - "children": [12, 13, 14] - }, - { - "name": "Arm", - "origin": [7, 2.75, 7], - "color": 0, - "children": [15, 16, 17] - }, - { - "name": "Arm", - "origin": [7, 2.75, 7], - "color": 0, - "children": [18, 19, 20] - }, - { - "name": "Arm", - "origin": [7, 2.75, 7], - "color": 0, - "children": [21, 22, 23] - }, - { - "name": "group", - "origin": [8.01307, 8, 10.98693], - "color": 0, - "children": [24, 25] - }, - { - "name": "group", - "origin": [8.01307, 8, 10.98693], - "color": 0, - "children": [26, 27] - }, - { - "name": "group", - "origin": [8.01307, 8, 10.98693], - "color": 0, - "children": [28, 29] - }, - { - "name": "group", - "origin": [8.01307, 8, 10.98693], - "color": 0, - "children": [30, 31] - }, - { - "name": "group", - "origin": [8.01307, 8, 10.98693], - "color": 0, - "children": [32, 33] - }, - { - "name": "group", - "origin": [8, 8.6, 5], - "color": 0, - "children": [34, 35] - }, - { - "name": "group", - "origin": [8, 8.6, 5], - "color": 0, - "children": [36, 37] - }, - { - "name": "group", - "origin": [8, 8.6, 5], - "color": 0, - "children": [38, 39] - }, - { - "name": "group", - "origin": [8, 8.6, 5], - "color": 0, - "children": [40, 41] - }, - { - "name": "group", - "origin": [8, 8.6, 5], - "color": 0, - "children": [42, 43] - } - ] -} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/candle.json b/resourcepack/assets/minecraft/items/candle.json deleted file mode 100644 index 925c01d..0000000 --- a/resourcepack/assets/minecraft/items/candle.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "select", - "property": "component", - "component": "minecraft:custom_name", - "fallback": { - "type": "minecraft:model", - "model": "minecraft:item/candle" - }, - "cases": [ - { "when": "candelabra", "model": { "type": "model", "model": "lz:items/candle_stand" } } - ] - } -}