diff --git a/src/main/java/refinedstorage/block/BlockNetworkReceiver.java b/src/main/java/refinedstorage/block/BlockNetworkReceiver.java index 3f37bab2c..eb09a8e23 100755 --- a/src/main/java/refinedstorage/block/BlockNetworkReceiver.java +++ b/src/main/java/refinedstorage/block/BlockNetworkReceiver.java @@ -30,4 +30,14 @@ public class BlockNetworkReceiver extends BlockNode { public TileEntity createTileEntity(World world, IBlockState state) { return new TileNetworkReceiver(); } + + @Override + public EnumPlacementType getPlacementType() { + return null; + } + + @Override + public boolean hasConnectivityState() { + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockNetworkTransmitter.java b/src/main/java/refinedstorage/block/BlockNetworkTransmitter.java index 6dca66146..75b6512b3 100755 --- a/src/main/java/refinedstorage/block/BlockNetworkTransmitter.java +++ b/src/main/java/refinedstorage/block/BlockNetworkTransmitter.java @@ -30,4 +30,14 @@ public class BlockNetworkTransmitter extends BlockNode { public TileEntity createTileEntity(World world, IBlockState state) { return new TileNetworkTransmitter(); } + + @Override + public EnumPlacementType getPlacementType() { + return null; + } + + @Override + public boolean hasConnectivityState() { + return true; + } } diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java index 8307640aa..07a2aa23c 100755 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -95,6 +95,7 @@ public class ClientProxy extends CommonProxy { ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PATTERN, 0, new ModelResourceLocation("refinedstorage:pattern", "inventory")); ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_HOUSING, 0, new ModelResourceLocation("refinedstorage:storage_housing", "inventory")); ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.GRID_FILTER, 0, new ModelResourceLocation("refinedstorage:grid_filter", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.NETWORK_CARD, 0, new ModelResourceLocation("refinedstorage:network_card", "inventory")); ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, 0, new ModelResourceLocation("refinedstorage:upgrade", "inventory")); ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_RANGE, new ModelResourceLocation("refinedstorage:range_upgrade", "inventory")); @@ -129,6 +130,8 @@ public class ClientProxy extends CommonProxy { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_MONITOR), 0, new ModelResourceLocation("refinedstorage:crafting_monitor", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.PROCESSING_PATTERN_ENCODER), 0, new ModelResourceLocation("refinedstorage:processing_pattern_encoder", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.NETWORK_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:network_transmitter", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.NETWORK_RECEIVER), 0, new ModelResourceLocation("refinedstorage:network_receiver", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=1k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=4k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k")); diff --git a/src/main/resources/assets/refinedstorage/blockstates/network_receiver.json b/src/main/resources/assets/refinedstorage/blockstates/network_receiver.json new file mode 100755 index 000000000..774d8c95a --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/network_receiver.json @@ -0,0 +1,25 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "refinedstorage:blocks/network_receiver_disconnected" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + "textures": { + "all": "refinedstorage:blocks/network_receiver_connected" + } + }, + "false": { + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json b/src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json new file mode 100755 index 000000000..86e56d08f --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json @@ -0,0 +1,25 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "refinedstorage:blocks/network_transmitter_disconnected" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + "textures": { + "all": "refinedstorage:blocks/network_transmitter_connected" + } + }, + "false": { + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/item/network_card.json b/src/main/resources/assets/refinedstorage/models/item/network_card.json new file mode 100755 index 000000000..cd2b01777 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/network_card.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/network_card" + } +} diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected.png new file mode 100755 index 000000000..46c528615 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_disconnected.png new file mode 100755 index 000000000..f56457e64 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected.png new file mode 100755 index 000000000..1e590c582 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_disconnected.png new file mode 100755 index 000000000..77c4f8da5 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/grid_filter.png b/src/main/resources/assets/refinedstorage/textures/items/grid_filter.png index f4cab8420..9d2a62091 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/grid_filter.png and b/src/main/resources/assets/refinedstorage/textures/items/grid_filter.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/network_card.png b/src/main/resources/assets/refinedstorage/textures/items/network_card.png new file mode 100755 index 000000000..40d0716be Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/network_card.png differ