From 0d1659f5fc4e60de3d81726e70c652fb9630a5a3 Mon Sep 17 00:00:00 2001 From: CallMeEchoCodes Date: Fri, 13 Dec 2024 18:50:54 +1100 Subject: [PATCH] feat(assets): begin updating stone chest model --- .github/workflows/build.yml | 2 +- .../hollow/models/block/stone_chest.json | 45 ------------------ .../hollow/models/block/stone_chest_left.json | 37 +++++++------- .../hollow/models/block/stone_chest_lid.json | 24 ---------- .../models/block/stone_chest_lid_left.json | 19 ++++---- .../models/block/stone_chest_lid_right.json | 19 ++++---- .../models/block/stone_chest_right.json | 27 +++++------ .../hollow/textures/block/stone_chest.png | Bin 2164 -> 2783 bytes .../hollow/textures/block/stone_chest_lid.png | Bin 578 -> 1288 bytes .../textures/block/stone_chest_lid_double.png | Bin 817 -> 1342 bytes 10 files changed, 47 insertions(+), 126 deletions(-) delete mode 100644 src/main/resources/assets/hollow/models/block/stone_chest.json delete mode 100644 src/main/resources/assets/hollow/models/block/stone_chest_lid.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c26c01a..0a56402 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v1 + - uses: gradle/actions/wrapper-validation@v3 - uses: actions/setup-java@v4 with: java-version: '21' diff --git a/src/main/resources/assets/hollow/models/block/stone_chest.json b/src/main/resources/assets/hollow/models/block/stone_chest.json deleted file mode 100644 index 08e68f3..0000000 --- a/src/main/resources/assets/hollow/models/block/stone_chest.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [64, 64], - "parent": "block/block", - "textures": { - "3": "hollow:block/stone_chest", - "particle": "minecraft:block/chiseled_deepslate" - }, - "elements": [ - { - "name": "chest", - "from": [1, 1, 1], - "to": [15, 16, 15], - "faces": { - "north": {"uv": [4, 0, 7.5, 3.75], "texture": "#3"}, - "east": {"uv": [4, 3.75, 7.5, 7.5], "texture": "#3"}, - "south": {"uv": [7.5, 0, 11, 3.75], "texture": "#3"}, - "west": {"uv": [7.5, 3.75, 11, 7.5], "texture": "#3"}, - "up": {"uv": [7.5, 11, 4, 7.5], "texture": "#3"}, - "down": {"uv": [11, 7.5, 7.5, 11], "texture": "#3"} - } - }, - { - "name": "base", - "from": [0, 0, 0], - "to": [16, 1, 16], - "faces": { - "north": {"uv": [0, 8, 4, 8.25], "texture": "#3"}, - "east": {"uv": [0, 8.25, 4, 8.5], "texture": "#3"}, - "south": {"uv": [0, 8.5, 4, 8.75], "texture": "#3"}, - "west": {"uv": [0, 8.75, 4, 9], "texture": "#3"}, - "up": {"uv": [4, 4, 0, 0], "texture": "#3"}, - "down": {"uv": [4, 4, 0, 8], "texture": "#3"} - } - } - ], - "groups": [ - { - "name": "stone_chest", - "origin": [0, 0, 0], - "color": 0, - "children": [0, 1] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/hollow/models/block/stone_chest_left.json b/src/main/resources/assets/hollow/models/block/stone_chest_left.json index 995ca7d..2baa8ec 100644 --- a/src/main/resources/assets/hollow/models/block/stone_chest_left.json +++ b/src/main/resources/assets/hollow/models/block/stone_chest_left.json @@ -1,35 +1,32 @@ { "credit": "Made with Blockbench", "texture_size": [64, 64], - "parent": "block/block", "textures": { - "0": "hollow:block/stone_chest_double", - "particle": "minecraft:block/chiseled_deepslate" + "all": "hollow:block/stone_chest", + "particle": "block/chiseled_deepslate" }, "elements": [ { - "name": "chest_right", - "from": [1, 1, 1], - "to": [16, 16, 15], + "from": [0, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, "faces": { - "north": {"uv": [1.875, 4, 3.75, 5.875], "texture": "#0"}, - "south": {"uv": [4, 1.875, 5.875, 3.75], "texture": "#0"}, - "west": {"uv": [1.875, 5.875, 3.625, 7.75], "texture": "#0"}, - "up": {"uv": [7.75, 3.625, 5.875, 1.875], "texture": "#0"}, - "down": {"uv": [5.5, 5.875, 3.625, 7.625], "texture": "#0"} + "north": {"uv": [4, 11, 8, 11.25], "texture": "#all", "cullface": "north"}, + "south": {"uv": [4, 11, 8, 11.25], "texture": "#all", "cullface": "south"}, + "west": {"uv": [4, 11, 8, 11.25], "texture": "#all", "cullface": "west"}, + "up": {"uv": [8, 15, 4, 11], "texture": "#all"}, + "down": {"uv": [8, 11, 4, 15], "texture": "#all", "cullface": "down"} } }, { - "name": "base_right", - "from": [0, 0, 0], - "to": [16, 1, 16], + "from": [1, 1, 1], + "to": [16, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, "faces": { - "north": {"uv": [7.25, 4.125, 9.25, 4.25], "texture": "#0"}, - "east": {"uv": [7.25, 4.25, 9.25, 4.375], "texture": "#0"}, - "south": {"uv": [7.25, 4.375, 9.25, 4.5], "texture": "#0"}, - "west": {"uv": [7.25, 4.5, 9.25, 4.625], "texture": "#0"}, - "up": {"uv": [4, 2, 2, 0], "texture": "#0"}, - "down": {"uv": [4, 2, 2, 4], "texture": "#0"} + "north": {"uv": [7.25, 7.25, 11, 11], "texture": "#all"}, + "south": {"uv": [11, 0, 7.25, 3.75], "texture": "#all"}, + "west": {"uv": [11, 7.25, 14.5, 11], "texture": "#all"}, + "up": {"uv": [11, 7.25, 7.25, 3.75], "texture": "#all", "cullface": "up"} } } ] diff --git a/src/main/resources/assets/hollow/models/block/stone_chest_lid.json b/src/main/resources/assets/hollow/models/block/stone_chest_lid.json deleted file mode 100644 index 3c9ea9e..0000000 --- a/src/main/resources/assets/hollow/models/block/stone_chest_lid.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "parent": "block/block", - "textures": { - "1": "hollow:block/stone_chest_lid", - "particle": "minecraft:block/polished_deepslate" - }, - "elements": [ - { - "name": "lid", - "from": [1, 0, 1], - "to": [15, 4, 15], - "faces": { - "north": {"uv": [7, 0, 14, 2], "texture": "#1"}, - "east": {"uv": [7, 2, 14, 4], "texture": "#1"}, - "south": {"uv": [7, 4, 14, 6], "texture": "#1"}, - "west": {"uv": [7, 6, 14, 8], "texture": "#1"}, - "up": {"uv": [7, 7, 0, 0], "texture": "#1"}, - "down": {"uv": [7, 7, 0, 14], "texture": "#1"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/hollow/models/block/stone_chest_lid_left.json b/src/main/resources/assets/hollow/models/block/stone_chest_lid_left.json index 73d79fb..dbea76a 100644 --- a/src/main/resources/assets/hollow/models/block/stone_chest_lid_left.json +++ b/src/main/resources/assets/hollow/models/block/stone_chest_lid_left.json @@ -1,22 +1,21 @@ { "credit": "Made with Blockbench", - "texture_size": [64, 64], - "parent": "block/block", + "texture_size": [32, 32], "textures": { - "0": "hollow:block/stone_chest_lid_double", - "particle": "minecraft:block/polished_deepslate" + "all": "hollow:block/stone_chest_lid", + "particle": "block/chiseled_deepslate" }, "elements": [ { - "name": "lid_right", "from": [1, 0, 1], "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [16, -22, 0]}, "faces": { - "north": {"uv": [7.5, 0, 11.25, 1], "texture": "#0"}, - "south": {"uv": [7.5, 1, 11.25, 2], "texture": "#0"}, - "west": {"uv": [7.5, 3, 11, 4], "texture": "#0"}, - "up": {"uv": [7.5, 3.5, 3.75, 0], "texture": "#0"}, - "down": {"uv": [7.5, 3.5, 3.75, 7], "texture": "#0"} + "north": {"uv": [7.5, 2, 15, 4], "texture": "#all"}, + "south": {"uv": [15, 0, 7.5, 2], "texture": "#all"}, + "west": {"uv": [8, 11, 15, 13], "texture": "#all"}, + "up": {"uv": [15, 11, 7.5, 4], "texture": "#all"}, + "down": {"uv": [15, 4, 7.5, 11], "texture": "#all", "cullface": "down"} } } ] diff --git a/src/main/resources/assets/hollow/models/block/stone_chest_lid_right.json b/src/main/resources/assets/hollow/models/block/stone_chest_lid_right.json index 66cfc70..1aeced2 100644 --- a/src/main/resources/assets/hollow/models/block/stone_chest_lid_right.json +++ b/src/main/resources/assets/hollow/models/block/stone_chest_lid_right.json @@ -1,22 +1,21 @@ { "credit": "Made with Blockbench", - "texture_size": [64, 64], - "parent": "block/block", + "texture_size": [32, 32], "textures": { - "0": "hollow:block/stone_chest_lid_double", - "particle": "minecraft:block/polished_deepslate" + "all": "hollow:block/stone_chest_lid", + "particle": "block/chiseled_deepslate" }, "elements": [ { - "name": "lid_left", "from": [0, 0, 1], "to": [15, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [0, -22, 0]}, "faces": { - "north": {"uv": [0, 7, 3.75, 8], "texture": "#0"}, - "east": {"uv": [7.5, 2, 11, 3], "texture": "#0"}, - "south": {"uv": [3.75, 7, 7.5, 8], "texture": "#0"}, - "up": {"uv": [3.75, 3.5, 0, 0], "texture": "#0"}, - "down": {"uv": [3.75, 3.5, 0, 7], "texture": "#0"} + "north": {"uv": [0, 2, 7.5, 4], "texture": "#all"}, + "east": {"uv": [0, 11, 7, 13], "texture": "#all"}, + "south": {"uv": [7.5, 0, 0, 2], "texture": "#all"}, + "up": {"uv": [7.5, 11, 0, 4], "texture": "#all"}, + "down": {"uv": [7.5, 4, 0, 11], "texture": "#all", "cullface": "down"} } } ] diff --git a/src/main/resources/assets/hollow/models/block/stone_chest_right.json b/src/main/resources/assets/hollow/models/block/stone_chest_right.json index 7b46eaf..68c8daa 100644 --- a/src/main/resources/assets/hollow/models/block/stone_chest_right.json +++ b/src/main/resources/assets/hollow/models/block/stone_chest_right.json @@ -1,35 +1,30 @@ { "credit": "Made with Blockbench", "texture_size": [64, 64], - "parent": "block/block", "textures": { - "0": "hollow:block/stone_chest_double", - "particle": "minecraft:block/chiseled_deepslate" + "all": "hollow:block/stone_chest", + "particle": "block/chiseled_deepslate" }, "elements": [ { - "name": "chest_left", "from": [0, 1, 1], "to": [15, 16, 15], "faces": { - "north": {"uv": [0, 4, 1.875, 5.875], "texture": "#0"}, - "east": {"uv": [3.75, 4, 5.5, 5.875], "texture": "#0"}, - "south": {"uv": [4, 0, 5.875, 1.875], "texture": "#0"}, - "up": {"uv": [7.375, 7.375, 5.5, 5.625], "texture": "#0"}, - "down": {"uv": [1.875, 5.875, 0, 7.625], "texture": "#0"} + "north": {"uv": [3.5, 7.25, 7.25, 11], "texture": "#all"}, + "east": {"uv": [0, 7.25, 3.5, 11], "texture": "#all"}, + "south": {"uv": [7.25, 0, 3.5, 3.75], "texture": "#all"}, + "up": {"uv": [7.25, 7.25, 3.5, 3.75], "texture": "#all", "cullface": "up"} } }, { - "name": "base_left", "from": [0, 0, 0], "to": [16, 1, 16], "faces": { - "north": {"uv": [5.875, 3.625, 7.875, 3.75], "texture": "#0"}, - "east": {"uv": [7.25, 3.75, 9.25, 3.875], "texture": "#0"}, - "south": {"uv": [7.25, 3.875, 9.25, 4], "texture": "#0"}, - "west": {"uv": [7.25, 4, 9.25, 4.125], "texture": "#0"}, - "up": {"uv": [2, 2, 0, 0], "texture": "#0"}, - "down": {"uv": [2, 2, 0, 4], "texture": "#0"} + "north": {"uv": [0, 11, 4, 11.25], "texture": "#all", "cullface": "north"}, + "east": {"uv": [0, 11, 4, 11.25], "texture": "#all", "cullface": "east"}, + "south": {"uv": [0, 11, 4, 11.25], "texture": "#all", "cullface": "south"}, + "up": {"uv": [4, 15, 0, 11], "texture": "#all"}, + "down": {"uv": [4, 11, 0, 15], "texture": "#all", "cullface": "down"} } } ] diff --git a/src/main/resources/assets/hollow/textures/block/stone_chest.png b/src/main/resources/assets/hollow/textures/block/stone_chest.png index eb003bd96e4c5bc43db43c63df3dfe85c7078cb4..1b165c1b1e86cabf74c2a06ea5e6f32b12d7a5a1 100644 GIT binary patch delta 2776 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 e90~uD-TNQBFbVLBhtjD40000E+? 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 delta 564 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 S*&dk07(8A5T-G@yGywpg+h$w<