From 849824189f3e5f145e9c02fc6bf63d0fac45629e Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Sun, 1 Sep 2024 14:54:09 -0700 Subject: [PATCH] Fix trapdoor, panel, bar, and pane item models - Fix #5349 --- .../models/block/copycat_base/panel.json | 2 +- .../framed_glass_trapdoor/block_bottom.json | 2 +- .../framed_glass_trapdoor/block_open.json | 1 - .../framed_glass_trapdoor/block_top.json | 1 - .../block/train_trapdoor/block_bottom.json | 2 +- .../block/train_trapdoor/block_open.json | 1 - .../block/train_trapdoor/block_top.json | 1 - .../assets/create/models/item/bars.json | 53 ++++++++----------- .../assets/create/models/item/pane.json | 25 ++++----- 9 files changed, 35 insertions(+), 53 deletions(-) diff --git a/src/main/resources/assets/create/models/block/copycat_base/panel.json b/src/main/resources/assets/create/models/block/copycat_base/panel.json index 50dc651f4..ee1323a73 100644 --- a/src/main/resources/assets/create/models/block/copycat_base/panel.json +++ b/src/main/resources/assets/create/models/block/copycat_base/panel.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "block/block", + "parent": "block/thin_block", "textures": { "1": "create:block/copycat_base", "2": "create:block/copycat_base", diff --git a/src/main/resources/assets/create/models/block/framed_glass_trapdoor/block_bottom.json b/src/main/resources/assets/create/models/block/framed_glass_trapdoor/block_bottom.json index 283045f4e..f761fc9d6 100644 --- a/src/main/resources/assets/create/models/block/framed_glass_trapdoor/block_bottom.json +++ b/src/main/resources/assets/create/models/block/framed_glass_trapdoor/block_bottom.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "block/block", + "parent": "block/thin_block", "textures": { "0": "create:block/glass_door_side", "1": "create:block/palettes/framed_glass", diff --git a/src/main/resources/assets/create/models/block/framed_glass_trapdoor/block_open.json b/src/main/resources/assets/create/models/block/framed_glass_trapdoor/block_open.json index 1e1b7a6d5..0b0a60f56 100644 --- a/src/main/resources/assets/create/models/block/framed_glass_trapdoor/block_open.json +++ b/src/main/resources/assets/create/models/block/framed_glass_trapdoor/block_open.json @@ -1,6 +1,5 @@ { "credit": "Made with Blockbench", - "parent": "block/block", "textures": { "0": "create:block/glass_door_side", "1": "create:block/palettes/framed_glass", diff --git a/src/main/resources/assets/create/models/block/framed_glass_trapdoor/block_top.json b/src/main/resources/assets/create/models/block/framed_glass_trapdoor/block_top.json index ba0581e99..ba563761f 100644 --- a/src/main/resources/assets/create/models/block/framed_glass_trapdoor/block_top.json +++ b/src/main/resources/assets/create/models/block/framed_glass_trapdoor/block_top.json @@ -1,6 +1,5 @@ { "credit": "Made with Blockbench", - "parent": "block/block", "textures": { "0": "create:block/glass_door_side", "1": "create:block/palettes/framed_glass", diff --git a/src/main/resources/assets/create/models/block/train_trapdoor/block_bottom.json b/src/main/resources/assets/create/models/block/train_trapdoor/block_bottom.json index e45403dd4..fa0f314ca 100644 --- a/src/main/resources/assets/create/models/block/train_trapdoor/block_bottom.json +++ b/src/main/resources/assets/create/models/block/train_trapdoor/block_bottom.json @@ -1,5 +1,5 @@ { - "parent": "block/block", + "parent": "block/thin_block", "credit": "Made with Blockbench", "textures": { "0": "create:block/train_door_side", diff --git a/src/main/resources/assets/create/models/block/train_trapdoor/block_open.json b/src/main/resources/assets/create/models/block/train_trapdoor/block_open.json index ea25af4fd..56e1e7e1e 100644 --- a/src/main/resources/assets/create/models/block/train_trapdoor/block_open.json +++ b/src/main/resources/assets/create/models/block/train_trapdoor/block_open.json @@ -1,6 +1,5 @@ { "credit": "Made with Blockbench", - "parent": "block/block", "textures": { "0": "create:block/train_door_side", "1": "create:block/train_trapdoor", diff --git a/src/main/resources/assets/create/models/block/train_trapdoor/block_top.json b/src/main/resources/assets/create/models/block/train_trapdoor/block_top.json index d29e767ea..e24be29a6 100644 --- a/src/main/resources/assets/create/models/block/train_trapdoor/block_top.json +++ b/src/main/resources/assets/create/models/block/train_trapdoor/block_top.json @@ -1,5 +1,4 @@ { - "parent": "block/block", "credit": "Made with Blockbench", "textures": { "0": "create:block/train_door_side", diff --git a/src/main/resources/assets/create/models/item/bars.json b/src/main/resources/assets/create/models/item/bars.json index 97d5a8744..3577d43a6 100644 --- a/src/main/resources/assets/create/models/item/bars.json +++ b/src/main/resources/assets/create/models/item/bars.json @@ -1,54 +1,44 @@ { "credit": "Made with Blockbench", - "ambientocclusion": false, - "textures": { - "bars": "block/iron_bars", - "edge": "block/iron_bars_edge" - }, "elements": [ { - "from": [0, 0, 8], - "to": [16, 16, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "from": [8, 0, 0], + "to": [8, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#bars"}, - "south": {"uv": [16, 0, 0, 16], "texture": "#bars"} + "east": {"uv": [16, 0, 0, 16], "texture": "#bars"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#bars"} } }, { - "from": [15.95, 0, 7], - "to": [16, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "from": [7, 0, 15.95], + "to": [9, 16, 16], "faces": { - "east": {"uv": [7, 16, 9, 0], "rotation": 180, "texture": "#bars", "cullface": "east"}, - "west": {"uv": [9, 16, 7, 0], "rotation": 180, "texture": "#bars", "cullface": "east"} + "north": {"uv": [9, 16, 7, 0], "texture": "#bars"}, + "south": {"uv": [7, 16, 9, 0], "texture": "#bars"} } }, { - "from": [0, 0, 7], - "to": [0.05, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "from": [7, 0, 0], + "to": [9, 16, 0.05], "faces": { - "east": {"uv": [7, 16, 9, 0], "rotation": 180, "texture": "#bars", "cullface": "west"}, - "west": {"uv": [9, 16, 7, 0], "rotation": 180, "texture": "#bars", "cullface": "west"} + "north": {"uv": [7, 16, 9, 0], "texture": "#bars"}, + "south": {"uv": [9, 16, 7, 0], "texture": "#bars"} } }, { - "from": [0, 15.95, 7], - "to": [16, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "from": [7, 15.95, 0], + "to": [9, 16, 16], "faces": { - "up": {"uv": [9, 0, 7, 16], "rotation": 270, "texture": "#edge", "cullface": "up"}, - "down": {"uv": [9, 0, 7, 16], "rotation": 90, "texture": "#edge", "cullface": "up"} + "up": {"uv": [7, 0, 9, 16], "rotation": 180, "texture": "#edge"}, + "down": {"uv": [7, 16, 9, 0], "rotation": 180, "texture": "#edge"} } }, { - "from": [0, 0, 7], - "to": [16, 0.05, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "from": [7, 0, 0], + "to": [9, 0.05, 16], "faces": { - "up": {"uv": [9, 0, 7, 16], "rotation": 270, "texture": "#edge", "cullface": "down"}, - "down": {"uv": [9, 0, 7, 16], "rotation": 90, "texture": "#edge", "cullface": "down"} + "up": {"uv": [7, 16, 9, 0], "rotation": 180, "texture": "#edge"}, + "down": {"uv": [7, 0, 9, 16], "rotation": 180, "texture": "#edge"} } } ], @@ -76,10 +66,11 @@ "scale": [0.25, 0.25, 0.25] }, "gui": { - "rotation": [30, 135, 0], + "rotation": [30, 45, 0], "scale": [0.625, 0.625, 0.625] }, "fixed": { + "rotation": [ 0, 270, 0 ], "scale": [0.5, 0.5, 0.5] } } diff --git a/src/main/resources/assets/create/models/item/pane.json b/src/main/resources/assets/create/models/item/pane.json index a0ade738b..a9f2b67e8 100644 --- a/src/main/resources/assets/create/models/item/pane.json +++ b/src/main/resources/assets/create/models/item/pane.json @@ -1,22 +1,16 @@ { "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "#edge", - "1": "#pane", - "particle": "#pane" - }, "elements": [ { - "from": [0, 0, 7], - "to": [16, 16, 9], + "from": [7, 0, 0], + "to": [9, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "east": {"uv": [7, 0, 9, 16], "rotation": 180, "texture": "#0"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [7, 0, 9, 16], "rotation": 180, "texture": "#0"}, - "up": {"uv": [7, 0, 9, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [7, 0, 9, 16], "rotation": 90, "texture": "#0"} + "north": {"uv": [7, 0, 9, 16], "texture": "#edge"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#pane"}, + "south": {"uv": [7, 0, 9, 16], "texture": "#edge"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#pane"}, + "up": {"uv": [7, 0, 9, 16], "rotation": 180, "texture": "#edge"}, + "down": {"uv": [7, 0, 9, 16], "rotation": 180, "texture": "#edge"} } } ], @@ -44,10 +38,11 @@ "scale": [0.25, 0.25, 0.25] }, "gui": { - "rotation": [30, 135, 0], + "rotation": [30, 45, 0], "scale": [0.625, 0.625, 0.625] }, "fixed": { + "rotation": [ 0, 270, 0 ], "scale": [0.5, 0.5, 0.5] } }