Fix X-ray with certain mods using double shelves blocks.

LambdAurora · Aug 9, 2023 · 51e5c9a · 51e5c9a
1 parent aaca7eb
commit 51e5c9a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -87,4 +87,8 @@
 
 - Fixed missing mushroom-derived blocks like mushroom stem pile, mushroom stump, etc.
 
+### 1.0.0-beta.17
+
+- Fixed X-ray with certain mods using double shelves blocks.
+
 [EMI]: https://modrinth.com/mod/emi "EMI Modrinth page"
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Mod properties
-mod_version=1.0.0-beta.16
+mod_version=1.0.0-beta.17
 maven_group=dev.lambdaurora
 archives_base_name=aurorasdecorations
 modrinth_id=GOqAnOfW

diff --git a/src/main/java/dev/lambdaurora/aurorasdeco/block/ShelfBlock.java b/src/main/java/dev/lambdaurora/aurorasdeco/block/ShelfBlock.java
@@ -370,7 +370,7 @@ private static QuiltBlockSettings settings(WoodType woodType) {
 				.nonOpaque();
 	}
 
-	private static Map<PartType, VoxelShape> createTypeShapes(int xMin, int zMin, int xMax, int zMax) {
+	private static Map<PartType, VoxelShape> createTypeShapes(double xMin, double zMin, double xMax, double zMax) {
 		var builder = ImmutableMap.<PartType, VoxelShape>builder();
 		builder.put(PartType.BOTTOM, createCuboidShape(xMin, 0, zMin, xMax, 8, zMax));
 		builder.put(PartType.TOP, createCuboidShape(xMin, 8, zMin, xMax, 16, zMax));
@@ -381,10 +381,10 @@ private static Map<PartType, VoxelShape> createTypeShapes(int xMin, int zMin, in
 	static {
 		var facingBuilder = ImmutableMap.<Direction, Map<PartType, VoxelShape>>builder();
 
-		facingBuilder.put(Direction.NORTH, createTypeShapes(0, 12, 16, 16));
-		facingBuilder.put(Direction.EAST, createTypeShapes(0, 0, 4, 16));
-		facingBuilder.put(Direction.SOUTH, createTypeShapes(0, 0, 16, 4));
-		facingBuilder.put(Direction.WEST, createTypeShapes(12, 0, 16, 16));
+		facingBuilder.put(Direction.NORTH, createTypeShapes(0, 12, 16, 15.99f));
+		facingBuilder.put(Direction.EAST, createTypeShapes(0.01f, 0, 4, 16));
+		facingBuilder.put(Direction.SOUTH, createTypeShapes(0, 0.01f, 16, 4));
+		facingBuilder.put(Direction.WEST, createTypeShapes(12, 0, 15.99f, 16));
 
 		SHAPES = new EnumMap<>(facingBuilder.build());