From e23a062a09bb3d6d8bfe57a839b1756bd0334861 Mon Sep 17 00:00:00 2001 From: Bill Date: Sun, 21 Apr 2024 09:17:51 -0400 Subject: [PATCH 1/2] Disable NetworkDirectional from showing Bedrock Due to Slimefun's Blockstorage issues: If a NetworkDirectional machine is able to see bedrock, and that machine has a Blockstorage issue, users can end up with actual Bedrock item. This fixes it by adding a check in the `getDirectionalSlotPane` method. --- .../sefiraat/networks/slimefun/network/NetworkDirectional.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkDirectional.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkDirectional.java index c2b64e519..98c44808e 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkDirectional.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkDirectional.java @@ -333,7 +333,7 @@ public static ItemStack getDirectionalSlotPane(@Nonnull BlockFace blockFace, @No @Nonnull public static ItemStack getDirectionalSlotPane(@Nonnull BlockFace blockFace, @Nonnull Material blockMaterial, boolean active) { - if (blockMaterial.isItem() && !blockMaterial.isAir()) { + if (blockMaterial.isItem() && !blockMaterial.isAir() && blockMaterial != Material.BEDROCK)) { final ItemStack displayStack = new CustomItemStack( blockMaterial, Theme.PASSIVE + "Direction " + blockFace.name() + " (" + blockMaterial.name() + ")" From 7e3783b60e15a977088223e20a3d7f395c2f15d2 Mon Sep 17 00:00:00 2001 From: Bill Date: Tue, 18 Jun 2024 15:18:33 -0400 Subject: [PATCH 2/2] Update src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkDirectional.java Co-authored-by: Sefiraat --- .../sefiraat/networks/slimefun/network/NetworkDirectional.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkDirectional.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkDirectional.java index 98c44808e..6751a0420 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkDirectional.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkDirectional.java @@ -333,7 +333,7 @@ public static ItemStack getDirectionalSlotPane(@Nonnull BlockFace blockFace, @No @Nonnull public static ItemStack getDirectionalSlotPane(@Nonnull BlockFace blockFace, @Nonnull Material blockMaterial, boolean active) { - if (blockMaterial.isItem() && !blockMaterial.isAir() && blockMaterial != Material.BEDROCK)) { + if (blockMaterial.isItem() && !blockMaterial.isAir() && blockMaterial.getHardness() >= 0)) { final ItemStack displayStack = new CustomItemStack( blockMaterial, Theme.PASSIVE + "Direction " + blockFace.name() + " (" + blockMaterial.name() + ")"