From 12c55641eead86dcf0c6d7bc6365a8aff62077f6 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Thu, 19 Oct 2017 22:48:40 +0200
Subject: [PATCH] Fixed cable blocks, Wireless Transmitter, Detector and
 Portable Grid acting as full blocks (being able to place torches on them
 etc), fixes #1493

---
 CHANGELOG.md                                               | 1 +
 .../com/raoulvdberge/refinedstorage/block/BlockCable.java  | 7 +++++++
 .../raoulvdberge/refinedstorage/block/BlockDetector.java   | 7 +++++++
 .../refinedstorage/block/BlockPortableGrid.java            | 7 +++++++
 .../refinedstorage/block/BlockWirelessTransmitter.java     | 7 +++++++
 5 files changed, 29 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ad6ca5fc..e9e210a54 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Updated Portuguese (Brazilian) translation (Pinz714)
 - Fixed crash with External Storage (raoulvdberge)
 - Fixed stack-crafting in the crafting grid (crafting table) causing lag on a dedicated server (Lordmau5)
+- Fixed cable blocks, Wireless Transmitter, Detector and Portable Grid acting as full blocks (being able to place torches on them etc) (raoulvdberge)
 
 ### 1.5.20
 - Restore MC 1.12.0 compatibility (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
index 5499d5392..25bb7be7f 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
@@ -7,6 +7,7 @@ import com.raoulvdberge.refinedstorage.tile.TileCable;
 import com.raoulvdberge.refinedstorage.tile.TileNode;
 import com.raoulvdberge.refinedstorage.util.RenderUtils;
 import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
@@ -226,6 +227,12 @@ public class BlockCable extends BlockNode {
         return BlockRenderLayer.CUTOUT;
     }
 
+    @Override
+    @SuppressWarnings("deprecation")
+    public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) {
+        return BlockFaceShape.UNDEFINED;
+    }
+
     @Override
     @Nullable
     public Direction getDirection() {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
index 07c4aacb7..f4a7c016f 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
@@ -3,6 +3,7 @@ package com.raoulvdberge.refinedstorage.block;
 import com.raoulvdberge.refinedstorage.RSGui;
 import com.raoulvdberge.refinedstorage.tile.TileDetector;
 import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -95,4 +96,10 @@ public class BlockDetector extends BlockNode {
     public Direction getDirection() {
         return null;
     }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) {
+        return BlockFaceShape.UNDEFINED;
+    }
 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java
index 86aeb1b03..2e9ae95d5 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java
@@ -6,6 +6,7 @@ import com.raoulvdberge.refinedstorage.item.ItemBlockPortableGrid;
 import com.raoulvdberge.refinedstorage.tile.grid.portable.TilePortableGrid;
 import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
@@ -126,4 +127,10 @@ public class BlockPortableGrid extends BlockBase {
 
         return true;
     }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) {
+        return BlockFaceShape.UNDEFINED;
+    }
 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java
index cf055c756..4c8ba65dd 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java
@@ -3,6 +3,7 @@ package com.raoulvdberge.refinedstorage.block;
 import com.raoulvdberge.refinedstorage.RSGui;
 import com.raoulvdberge.refinedstorage.tile.TileWirelessTransmitter;
 import net.minecraft.block.Block;
+import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.util.ITooltipFlag;
@@ -98,4 +99,10 @@ public class BlockWirelessTransmitter extends BlockNode {
 
         tooltip.add(I18n.format("block.refinedstorage:wireless_transmitter.tooltip", TextFormatting.WHITE + I18n.format("block.refinedstorage:cable.name") + TextFormatting.GRAY));
     }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) {
+        return BlockFaceShape.UNDEFINED;
+    }
 }