From 5c6fbff52ee6a6cd985f99a92417cdf12e44784a Mon Sep 17 00:00:00 2001 From: Adrien1106 Date: Wed, 14 May 2025 03:51:14 +0200 Subject: [PATCH 1/4] fix: visual issue always showing the suffocation texture --- src/main/java/fr/adrien1106/reframed/ReFramed.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/adrien1106/reframed/ReFramed.java b/src/main/java/fr/adrien1106/reframed/ReFramed.java index e106997..d107e13 100644 --- a/src/main/java/fr/adrien1106/reframed/ReFramed.java +++ b/src/main/java/fr/adrien1106/reframed/ReFramed.java @@ -138,8 +138,8 @@ public class ReFramed implements ModInitializer { .sounds(BlockSoundGroup.WOOD) .hardness(0.2f) .suffocates(Blocks::never) - .solidBlock(Blocks::always) - .blockVision(Blocks::always); + .solidBlock(Blocks::always); +// .blockVision(Blocks::always); } private static I registerItem(String path, I item) { From 8d8a0e36546f203143e4d051036977af1177b5ed Mon Sep 17 00:00:00 2001 From: Adrien1106 Date: Wed, 14 May 2025 03:51:43 +0200 Subject: [PATCH 2/4] fix: broken inner collision due to bad model --- .../reframed/models/block/stair/outer.json | 20 ++++++++++++----- .../models/block/stair/outer_side.json | 22 ++++++++++++++----- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/main/resources/assets/reframed/models/block/stair/outer.json b/src/main/resources/assets/reframed/models/block/stair/outer.json index d5f4c99..00e8f5e 100644 --- a/src/main/resources/assets/reframed/models/block/stair/outer.json +++ b/src/main/resources/assets/reframed/models/block/stair/outer.json @@ -1,17 +1,27 @@ { + "credit": "Made with Blockbench", "textures": { "particle": "#side" }, "elements": [ { - "from": [0, 0, 0], + "from": [0, 0, 8], "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"} + "west": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "west"}, + "up": {"uv": [0, 8, 8, 16], "texture": "#top"}, + "down": {"uv": [0, 0, 8, 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"} } }, { diff --git a/src/main/resources/assets/reframed/models/block/stair/outer_side.json b/src/main/resources/assets/reframed/models/block/stair/outer_side.json index 1f23bb8..f3d5700 100644 --- a/src/main/resources/assets/reframed/models/block/stair/outer_side.json +++ b/src/main/resources/assets/reframed/models/block/stair/outer_side.json @@ -1,16 +1,26 @@ { + "credit": "Made with Blockbench", "textures": { "particle": "#side" }, "elements": [ { - "from": [8, 0, 0], + "from": [8, 8, 0], "to": [16, 16, 8], "faces": { - "north": {"uv": [0, 0, 8, 16], "texture": "#side", "cullface": "north"}, - "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"}, + "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": [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"}, + "west": {"uv": [0, 8, 8, 16], "texture": "#side"}, "down": {"uv": [8, 8, 16, 16], "texture": "#bottom", "cullface": "down"} } }, @@ -50,7 +60,7 @@ "name": "outer_stairs", "origin": [8, 8, 8], "color": 0, - "children": [0, 1, 2, 3] + "children": [0, 1, 2, 3, 4] } ] } \ No newline at end of file From dbcb79f992e2e8788ffa2cac3ea9100695928e27 Mon Sep 17 00:00:00 2001 From: Adrien1106 Date: Wed, 14 May 2025 03:56:03 +0200 Subject: [PATCH 3/4] improved: removed unnecessary check + inner cull improvement --- .../java/fr/adrien1106/reframed/client/util/RenderHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/adrien1106/reframed/client/util/RenderHelper.java b/src/main/java/fr/adrien1106/reframed/client/util/RenderHelper.java index 93123a0..b651c85 100644 --- a/src/main/java/fr/adrien1106/reframed/client/util/RenderHelper.java +++ b/src/main/java/fr/adrien1106/reframed/client/util/RenderHelper.java @@ -94,7 +94,7 @@ public class RenderHelper { } catch (NullPointerException e) { // this can happen if mod haven't thought about inner faces return true; } - return !self_theme.isOpaque() || !other_theme.isOpaque(); + return self_theme.isOpaque() != other_theme.isOpaque() && self_theme.isOpaque(); } // Doing this method from scratch as it is simpler to do than injecting everywhere @@ -141,7 +141,7 @@ public class RenderHelper { if (self_theme.isSideInvisible(other_state, side)) return false; // Opaque is also simple as each model are rendered one by one - if (other_state.isOpaque() && self.isSolid()) { + if (other_state.isOpaque()) { // no cache section :( because it differs between each instance of the frame VoxelShape self_shape = self_block.getShape(self_state, theme_index).getFace(side); if (self_shape.isEmpty()) return true; From fd26f5da4a6886646e8384bfe7b3081cb1ce1853 Mon Sep 17 00:00:00 2001 From: Adrien1106 Date: Wed, 14 May 2025 17:58:06 +0200 Subject: [PATCH 4/4] feat: new version for publish --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 49d6e59..ded7b70 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.15.11 # Mod Properties modrinth_id = jCpoCBpn -mod_version = 1.6.7 +mod_version = 1.6.8 maven_group = fr.adrien1106 archives_base_name = ReFramed mod_id = reframed