From 4ec8f4903a194f68e2d9a369b51ae92cde61d4ee Mon Sep 17 00:00:00 2001 From: Adrien1106 Date: Mon, 26 Feb 2024 16:09:19 +0100 Subject: [PATCH] complexified stairs models for better transparent renders hopping to not deteriorate the performances too much --- .../reframed/client/ReFramedClient.java | 6 +- .../models/block/double_outer_stairs.json | 27 +++++--- .../reframed/models/block/inner_stairs.json | 65 +++++++++++++++++++ .../models/block/outer_side_stairs.json | 33 +++++++--- .../reframed/models/block/outer_stairs.json | 48 ++++++++++++++ .../assets/reframed/models/block/stairs.json | 54 +++++++++++++++ 6 files changed, 212 insertions(+), 21 deletions(-) create mode 100644 src/main/resources/assets/reframed/models/block/inner_stairs.json create mode 100644 src/main/resources/assets/reframed/models/block/outer_stairs.json create mode 100644 src/main/resources/assets/reframed/models/block/stairs.json diff --git a/src/main/java/fr/adrien1106/reframed/client/ReFramedClient.java b/src/main/java/fr/adrien1106/reframed/client/ReFramedClient.java index b37ced6..da80ca2 100644 --- a/src/main/java/fr/adrien1106/reframed/client/ReFramedClient.java +++ b/src/main/java/fr/adrien1106/reframed/client/ReFramedClient.java @@ -53,10 +53,10 @@ public class ReFramedClient implements ClientModInitializer { HELPER.addReFramedModel(ReFramed.id("pressure_plate_up_special") , HELPER.auto(new Identifier("block/pressure_plate_up"))); HELPER.addReFramedModel(ReFramed.id("pressure_plate_down_special") , HELPER.auto(new Identifier("block/pressure_plate_down"))); HELPER.addReFramedModel(ReFramed.id("slab_special") , HELPER.auto(new Identifier("block/slab"))); - HELPER.addReFramedModel(ReFramed.id("stairs_special") , HELPER.auto(new Identifier("block/stairs"))); + HELPER.addReFramedModel(ReFramed.id("stairs_special") , HELPER.auto(ReFramed.id("block/stairs"))); HELPER.addReFramedModel(ReFramed.id("double_outer_stairs_special") , HELPER.auto(ReFramed.id("block/double_outer_stairs"))); - HELPER.addReFramedModel(ReFramed.id("inner_stairs_special") , HELPER.auto(new Identifier("block/inner_stairs"))); - HELPER.addReFramedModel(ReFramed.id("outer_stairs_special") , HELPER.auto(new Identifier("block/outer_stairs"))); + HELPER.addReFramedModel(ReFramed.id("inner_stairs_special") , HELPER.auto(ReFramed.id("block/inner_stairs"))); + HELPER.addReFramedModel(ReFramed.id("outer_stairs_special") , HELPER.auto(ReFramed.id("block/outer_stairs"))); HELPER.addReFramedModel(ReFramed.id("outer_side_stairs_special") , HELPER.auto(ReFramed.id("block/outer_side_stairs"))); HELPER.addReFramedModel(ReFramed.id("trapdoor_bottom_special") , HELPER.auto(new Identifier("block/template_trapdoor_bottom"))); HELPER.addReFramedModel(ReFramed.id("trapdoor_top_special") , HELPER.auto(new Identifier("block/template_trapdoor_top"))); diff --git a/src/main/resources/assets/reframed/models/block/double_outer_stairs.json b/src/main/resources/assets/reframed/models/block/double_outer_stairs.json index bc62650..6042232 100644 --- a/src/main/resources/assets/reframed/models/block/double_outer_stairs.json +++ b/src/main/resources/assets/reframed/models/block/double_outer_stairs.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { "particle": "#side" @@ -7,14 +6,22 @@ "elements": [ { "from": [8, 0, 0], - "to": [16, 8, 16], + "to": [16, 8, 8], "faces": { "north": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "north"}, - "east": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "east"}, + "east": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "east"}, + "west": {"uv": [0, 8, 8, 16], "texture": "#side"}, + "up": {"uv": [8, 0, 16, 8], "texture": "#top"}, + "down": {"uv": [8, 8, 16, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 0, 8], + "to": [16, 8, 16], + "faces": { + "east": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "east"}, "south": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "south"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#side"}, - "up": {"uv": [8, 0, 16, 16], "texture": "#top", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 16], "texture": "#bottom"} + "down": {"uv": [8, 0, 16, 8], "texture": "#bottom", "cullface": "down"} } }, { @@ -22,9 +29,9 @@ "to": [16, 16, 16], "faces": { "north": {"uv": [0, 0, 8, 8], "texture": "#side"}, - "east": {"uv": [0, 0, 8, 8], "texture": "#side"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "east"}, "south": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "south"}, - "west": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "west"}, + "west": {"uv": [8, 0, 16, 8], "texture": "#side"}, "up": {"uv": [8, 8, 16, 16], "texture": "#top", "cullface": "up"} } }, @@ -35,8 +42,8 @@ "north": {"uv": [8, 8, 16, 16], "texture": "#side"}, "south": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "south"}, "west": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "west"}, - "up": {"uv": [0, 8, 8, 16], "texture": "#top", "cullface": "up"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#bottom"} + "up": {"uv": [0, 8, 8, 16], "texture": "#top"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#bottom", "cullface": "down"} } } ] diff --git a/src/main/resources/assets/reframed/models/block/inner_stairs.json b/src/main/resources/assets/reframed/models/block/inner_stairs.json new file mode 100644 index 0000000..378ad8f --- /dev/null +++ b/src/main/resources/assets/reframed/models/block/inner_stairs.json @@ -0,0 +1,65 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [0, 0, 8], + "to": [16, 8, 16], + "faces": { + "east": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "south"}, + "west": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "west"}, + "down": {"uv": [0, 0, 16, 8], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [0, 0, 0], + "to": [8, 8, 8], + "faces": { + "north": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "north"}, + "west": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "west"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#top"}, + "down": {"uv": [0, 8, 8, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 0, 0], + "to": [16, 8, 8], + "faces": { + "north": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "north"}, + "east": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "east"}, + "down": {"uv": [8, 8, 16, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 8, 8], + "to": [16, 16, 16], + "faces": { + "east": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "south"}, + "up": {"uv": [8, 8, 16, 16], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [8, 8, 0], + "to": [16, 16, 8], + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "north"}, + "east": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "east"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#side"}, + "up": {"uv": [8, 0, 16, 8], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [0, 8, 8], + "to": [8, 16, 16], + "faces": { + "north": {"uv": [8, 0, 16, 8], "texture": "#side"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "south"}, + "west": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "west"}, + "up": {"uv": [0, 8, 8, 16], "texture": "#top", "cullface": "up"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/outer_side_stairs.json b/src/main/resources/assets/reframed/models/block/outer_side_stairs.json index f7838f8..1f23bb8 100644 --- a/src/main/resources/assets/reframed/models/block/outer_side_stairs.json +++ b/src/main/resources/assets/reframed/models/block/outer_side_stairs.json @@ -1,19 +1,36 @@ { - "credit": "Made with Blockbench", "textures": { "particle": "#side" }, "elements": [ { "from": [8, 0, 0], - "to": [16, 16, 16], + "to": [16, 16, 8], "faces": { "north": {"uv": [0, 0, 8, 16], "texture": "#side", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "east"}, - "south": {"uv": [8, 0, 16, 16], "texture": "#side", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#side"}, - "up": {"uv": [8, 0, 16, 16], "texture": "#top", "cullface": "up"}, - "down": {"uv": [8, 0, 16, 16], "texture": "#bottom", "cullface": "down"} + "east": {"uv": [8, 0, 16, 16], "texture": "#side", "cullface": "east"}, + "west": {"uv": [0, 0, 8, 16], "texture": "#side"}, + "up": {"uv": [8, 0, 16, 8], "texture": "#top", "cullface": "up"}, + "down": {"uv": [8, 8, 16, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 8, 8], + "to": [16, 16, 16], + "faces": { + "east": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "south"}, + "west": {"uv": [8, 0, 16, 8], "texture": "#side"}, + "up": {"uv": [8, 8, 16, 16], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [8, 0, 8], + "to": [16, 8, 16], + "faces": { + "east": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "south"}, + "down": {"uv": [8, 0, 16, 8], "texture": "#bottom", "cullface": "down"} } }, { @@ -33,7 +50,7 @@ "name": "outer_stairs", "origin": [8, 8, 8], "color": 0, - "children": [0, 1] + "children": [0, 1, 2, 3] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/outer_stairs.json b/src/main/resources/assets/reframed/models/block/outer_stairs.json new file mode 100644 index 0000000..d5f4c99 --- /dev/null +++ b/src/main/resources/assets/reframed/models/block/outer_stairs.json @@ -0,0 +1,48 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [8, 8, 16], + "faces": { + "north": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "north"}, + "south": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "west"}, + "up": {"uv": [0, 0, 8, 16], "texture": "#top"}, + "down": {"uv": [0, 0, 8, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 0, 0], + "to": [16, 8, 8], + "faces": { + "north": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "north"}, + "east": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "east"}, + "up": {"uv": [8, 0, 16, 8], "texture": "#top"}, + "down": {"uv": [8, 8, 16, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 0, 8], + "to": [16, 8, 16], + "faces": { + "east": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "south"}, + "down": {"uv": [8, 0, 16, 8], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 8, 8], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#side"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "south"}, + "west": {"uv": [8, 0, 16, 8], "texture": "#side"}, + "up": {"uv": [8, 8, 16, 16], "texture": "#top", "cullface": "up"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/stairs.json b/src/main/resources/assets/reframed/models/block/stairs.json new file mode 100644 index 0000000..01f33e6 --- /dev/null +++ b/src/main/resources/assets/reframed/models/block/stairs.json @@ -0,0 +1,54 @@ +{ + "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [8, 8, 16], + "faces": { + "north": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "north"}, + "south": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "west"}, + "up": {"uv": [0, 0, 8, 16], "texture": "#top"}, + "down": {"uv": [0, 0, 8, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 0, 0], + "to": [16, 8, 16], + "faces": { + "north": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "south"}, + "down": {"uv": [8, 0, 16, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 8, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 8], "texture": "#side"}, + "up": {"uv": [8, 0, 16, 16], "texture": "#top", "cullface": "up"} + } + } + ], + "display": { + "thirdperson_lefthand": { + "rotation": [75, -135, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "gui": { + "rotation": [30, 135, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [0, -90, 0] + } + } +} \ No newline at end of file