Merge pull request 'Further visual fixes' (#26) from dev into master

Reviewed-on: #26

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

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 extends Item> I registerItem(String path, I item) {

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;

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"}
 			}
 		},
 		{

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]
 		}
 	]
 }