From 7744d2663b268b07e456b9420198964524d916e0 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Thu, 27 Jun 2024 20:41:42 +0100 Subject: [PATCH] Fix heights of turtle flags They were 0.5 squares too high, so the textures were a little stretched. --- .../models/block/turtle_rainbow_overlay.json | 71 +++++++++---------- .../models/block/turtle_trans_overlay.json | 71 +++++++++---------- 2 files changed, 70 insertions(+), 72 deletions(-) diff --git a/projects/common/src/main/resources/assets/computercraft/models/block/turtle_rainbow_overlay.json b/projects/common/src/main/resources/assets/computercraft/models/block/turtle_rainbow_overlay.json index f397920a8..9a6d0b3d9 100644 --- a/projects/common/src/main/resources/assets/computercraft/models/block/turtle_rainbow_overlay.json +++ b/projects/common/src/main/resources/assets/computercraft/models/block/turtle_rainbow_overlay.json @@ -1,38 +1,37 @@ { - "parent": "block/block", - "textures": { - "particle": "computercraft:block/turtle_rainbow_overlay", - "texture": "computercraft:block/turtle_rainbow_overlay" - }, - "elements": [ - { - "name": "Flag", - "from": [1.5, 13, 10.5], - "to": [2, 16.5, 15.5], - "rotation": {"angle": 22.5, "axis": "x", "origin": [2, 11, 10.75]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#texture"}, - "east": {"uv": [0, 0, 7, 6], "texture": "#texture"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#texture"}, - "west": {"uv": [0, 0, 7, 6], "texture": "#texture"}, - "up": {"uv": [15, 0, 16, 6], "texture": "#texture"}, - "down": {"uv": [8, 0, 9, 6], "texture": "#texture"} - } - }, - { - "name": "Stick", - "from": [1.5, 10.5, 10.5], - "to": [2, 13, 11], - "rotation": {"angle": 22.5, "axis": "x", "origin": [2, 11, 10.75]}, - "faces": { - "north": {"uv": [12, 0, 13, 6], "texture": "#texture"}, - "east": {"uv": [13, 0, 14, 6], "texture": "#texture"}, - "south": {"uv": [12, 0, 13, 6], "texture": "#texture"}, - "west": {"uv": [13, 0, 14, 6], "texture": "#texture"}, - "up": {"uv": [12, 6, 13, 7], "texture": "#texture"}, - "down": {"uv": [13, 6, 14, 7], "texture": "#texture"} - } - } - ], - "display": {} + "parent": "block/block", + "textures": { + "particle": "computercraft:block/turtle_rainbow_overlay", + "texture": "computercraft:block/turtle_rainbow_overlay" + }, + "elements": [ + { + "name": "Flag", + "from": [1.5, 13.5, 10.5], + "to": [2, 16.5, 15.5], + "rotation": {"angle": 22.5, "axis": "x", "origin": [2, 11, 10.75]}, + "faces": { + "north": {"uv": [0, 0, 1, 6], "texture": "#texture"}, + "east": {"uv": [0, 0, 7, 6], "texture": "#texture"}, + "south": {"uv": [0, 0, 1, 6], "texture": "#texture"}, + "west": {"uv": [0, 0, 7, 6], "texture": "#texture"}, + "up": {"uv": [15, 0, 16, 6], "texture": "#texture"}, + "down": {"uv": [8, 0, 9, 6], "texture": "#texture"} + } + }, + { + "name": "Stick", + "from": [1.5, 10.5, 10.5], + "to": [2, 13.5, 11], + "rotation": {"angle": 22.5, "axis": "x", "origin": [2, 11, 10.75]}, + "faces": { + "north": {"uv": [12, 0, 13, 6], "texture": "#texture"}, + "east": {"uv": [13, 0, 14, 6], "texture": "#texture"}, + "south": {"uv": [12, 0, 13, 6], "texture": "#texture"}, + "west": {"uv": [13, 0, 14, 6], "texture": "#texture"}, + "up": {"uv": [12, 6, 13, 7], "texture": "#texture"}, + "down": {"uv": [13, 6, 14, 7], "texture": "#texture"} + } + } + ] } diff --git a/projects/common/src/main/resources/assets/computercraft/models/block/turtle_trans_overlay.json b/projects/common/src/main/resources/assets/computercraft/models/block/turtle_trans_overlay.json index 4260d72e6..9871e656d 100644 --- a/projects/common/src/main/resources/assets/computercraft/models/block/turtle_trans_overlay.json +++ b/projects/common/src/main/resources/assets/computercraft/models/block/turtle_trans_overlay.json @@ -1,38 +1,37 @@ { - "parent": "block/block", - "textures": { - "particle": "computercraft:block/turtle_trans_overlay", - "texture": "computercraft:block/turtle_trans_overlay" - }, - "elements": [ - { - "name": "Flag", - "from": [1.5, 13.5, 10.5], - "to": [2, 16.5, 15.5], - "rotation": {"angle": 22.5, "axis": "x", "origin": [2, 11, 10.75]}, - "faces": { - "north": {"uv": [0, 0, 1, 5], "texture": "#texture"}, - "east": {"uv": [0, 0, 7, 5], "texture": "#texture"}, - "south": {"uv": [0, 0, 1, 5], "texture": "#texture"}, - "west": {"uv": [0, 0, 7, 5], "texture": "#texture"}, - "up": {"uv": [15, 0, 16, 5], "texture": "#texture"}, - "down": {"uv": [15, 0, 16, 5], "texture": "#texture"} - } - }, - { - "name": "Stick", - "from": [1.5, 10.5, 10.5], - "to": [2, 13.5, 11], - "rotation": {"angle": 22.5, "axis": "x", "origin": [2, 11, 10.75]}, - "faces": { - "north": {"uv": [12, 0, 13, 6], "texture": "#texture"}, - "east": {"uv": [13, 0, 14, 6], "texture": "#texture"}, - "south": {"uv": [12, 0, 13, 6], "texture": "#texture"}, - "west": {"uv": [13, 0, 14, 6], "texture": "#texture"}, - "up": {"uv": [12, 6, 13, 7], "texture": "#texture"}, - "down": {"uv": [13, 6, 14, 7], "texture": "#texture"} - } - } - ], - "display": {} + "parent": "block/block", + "textures": { + "particle": "computercraft:block/turtle_trans_overlay", + "texture": "computercraft:block/turtle_trans_overlay" + }, + "elements": [ + { + "name": "Flag", + "from": [1.5, 13.5, 10.5], + "to": [2, 16, 15.5], + "rotation": {"angle": 22.5, "axis": "x", "origin": [2, 11, 10.75]}, + "faces": { + "north": {"uv": [0, 0, 1, 5], "texture": "#texture"}, + "east": {"uv": [0, 0, 7, 5], "texture": "#texture"}, + "south": {"uv": [0, 0, 1, 5], "texture": "#texture"}, + "west": {"uv": [0, 0, 7, 5], "texture": "#texture"}, + "up": {"uv": [15, 0, 16, 5], "texture": "#texture"}, + "down": {"uv": [15, 0, 16, 5], "texture": "#texture"} + } + }, + { + "name": "Stick", + "from": [1.5, 10.5, 10.5], + "to": [2, 13.5, 11], + "rotation": {"angle": 22.5, "axis": "x", "origin": [2, 11, 10.75]}, + "faces": { + "north": {"uv": [12, 0, 13, 6], "texture": "#texture"}, + "east": {"uv": [13, 0, 14, 6], "texture": "#texture"}, + "south": {"uv": [12, 0, 13, 6], "texture": "#texture"}, + "west": {"uv": [13, 0, 14, 6], "texture": "#texture"}, + "up": {"uv": [12, 6, 13, 7], "texture": "#texture"}, + "down": {"uv": [13, 6, 14, 7], "texture": "#texture"} + } + } + ] }