diff --git a/src/main/java/refinedstorage/block/BlockInterface.java b/src/main/java/refinedstorage/block/BlockInterface.java index 77be4f4d5..9200f7802 100755 --- a/src/main/java/refinedstorage/block/BlockInterface.java +++ b/src/main/java/refinedstorage/block/BlockInterface.java @@ -31,6 +31,11 @@ public class BlockInterface extends BlockNode { return true; } + @Override + public boolean hasConnectivityState() { + return true; + } + @Override public EnumPlacementType getPlacementType() { return null; diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java index 3a8b377bb..b3f81f07a 100755 --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -69,6 +69,6 @@ public class BlockSolderer extends BlockNode { @Override public EnumPlacementType getPlacementType() { - return EnumPlacementType.ANY; + return EnumPlacementType.HORIZONTAL; } } diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java index 098900c02..b92221410 100755 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java @@ -68,6 +68,11 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm return upgrades; } + @Override + public boolean canConduct() { + return false; + } + @Override public T getCapability(Capability capability, EnumFacing facing) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { diff --git a/src/main/resources/assets/refinedstorage/blockstates/interface.json b/src/main/resources/assets/refinedstorage/blockstates/interface.json index bbe118c50..028bd4033 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/interface.json +++ b/src/main/resources/assets/refinedstorage/blockstates/interface.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "refinedstorage:blocks/interface" + "all": "refinedstorage:blocks/interface_disconnected" } }, "variants": { @@ -12,8 +12,14 @@ "transform": "forge:default-block" } ], - "normal": { - "model": "cube_all" + "connected": { + "true": { + "textures": { + "all": "refinedstorage:blocks/interface_connected" + } + }, + "false": { + } } } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png index 91b0eb20e..9b007f0b4 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png index dc7662154..e69c21afa 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png index 4f42da994..5bd206ac9 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png index d120a0729..770e2656c 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png index 7390afd4b..550df8c68 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png index 31d89c761..909631862 100644 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/interface_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/interface_connected.png new file mode 100755 index 000000000..24d133c7e Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/interface_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/interface.png b/src/main/resources/assets/refinedstorage/textures/blocks/interface_disconnected.png similarity index 91% rename from src/main/resources/assets/refinedstorage/textures/blocks/interface.png rename to src/main/resources/assets/refinedstorage/textures/blocks/interface_disconnected.png index ac9291c8c..e3fa3c48d 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/interface.png and b/src/main/resources/assets/refinedstorage/textures/blocks/interface_disconnected.png differ