From a06182e75db684744caeaf2576c38c6412b1a5bc Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 30 Jul 2017 16:21:33 +0200 Subject: [PATCH] Added CTM integration for Network Transmitter/Receiver --- .../refinedstorage/proxy/ProxyClient.java | 18 ++++++++++-- .../blockstates/network_receiver_glow.json | 27 ++++++++++++++++++ .../blockstates/network_transmitter_glow.json | 27 ++++++++++++++++++ .../network_receiver_connected_glow.png | Bin 0 -> 338 bytes ...network_receiver_connected_glow.png.mcmeta | 9 ++++++ .../network_transmitter_connected_glow.png | Bin 0 -> 342 bytes ...work_transmitter_connected_glow.png.mcmeta | 9 ++++++ 7 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/refinedstorage/blockstates/network_receiver_glow.json create mode 100644 src/main/resources/assets/refinedstorage/blockstates/network_transmitter_glow.json create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png.mcmeta create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png.mcmeta diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java index a07896869..03b21d1dc 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java @@ -212,8 +212,6 @@ public class ProxyClient extends ProxyCommon { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_INTERFACE), 0, new ModelResourceLocation("refinedstorage:fluid_interface", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CRAFTING_MONITOR), 0, new ModelResourceLocation("refinedstorage:crafting_monitor", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "connected=false,direction=north")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.NETWORK_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:network_transmitter", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.NETWORK_RECEIVER), 0, new ModelResourceLocation("refinedstorage:network_receiver", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), ItemStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=1k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), ItemStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=4k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), ItemStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k")); @@ -251,6 +249,22 @@ public class ProxyClient extends ProxyCommon { } }); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.NETWORK_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:network_transmitter", "inventory")); + ModelLoader.setCustomStateMapper(RSBlocks.NETWORK_TRANSMITTER, new StateMapperBase() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation("refinedstorage:network_transmitter" + (Loader.isModLoaded("ctm") ? "_glow" : ""), "connected=" + state.getValue(BlockNetworkTransmitter.CONNECTED)); + } + }); + + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.NETWORK_RECEIVER), 0, new ModelResourceLocation("refinedstorage:network_receiver", "inventory")); + ModelLoader.setCustomStateMapper(RSBlocks.NETWORK_RECEIVER, new StateMapperBase() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation("refinedstorage:network_receiver" + (Loader.isModLoaded("ctm") ? "_glow" : ""), "connected=" + state.getValue(BlockNetworkReceiver.CONNECTED)); + } + }); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RSBlocks.CONTROLLER), stack -> { ControllerEnergyType energyType = stack.getItemDamage() == ControllerType.CREATIVE.getId() ? ControllerEnergyType.ON : TileController.getEnergyType(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack)); diff --git a/src/main/resources/assets/refinedstorage/blockstates/network_receiver_glow.json b/src/main/resources/assets/refinedstorage/blockstates/network_receiver_glow.json new file mode 100644 index 000000000..b249f3e2d --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/network_receiver_glow.json @@ -0,0 +1,27 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "refinedstorage:cube_all_glow", + "textures": { + "all": "refinedstorage:blocks/network_receiver_disconnected", + "glow": "refinedstorage:blocks/none" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + "textures": { + "all": "refinedstorage:blocks/network_receiver_connected", + "glow": "refinedstorage:blocks/network_receiver_connected_glow" + } + }, + "false": { + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/network_transmitter_glow.json b/src/main/resources/assets/refinedstorage/blockstates/network_transmitter_glow.json new file mode 100644 index 000000000..8f03f267a --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/network_transmitter_glow.json @@ -0,0 +1,27 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "refinedstorage:cube_all_glow", + "textures": { + "all": "refinedstorage:blocks/network_transmitter_disconnected", + "glow": "refinedstorage:blocks/none" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + "textures": { + "all": "refinedstorage:blocks/network_transmitter_connected", + "glow": "refinedstorage:blocks/network_transmitter_connected_glow" + } + }, + "false": { + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png new file mode 100644 index 0000000000000000000000000000000000000000..a6b017a448d929aeef6bdaa460b18898cd60d3cc GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwr2>%=KS^iVk_YIEGmGC;#~W-`-VXwE~Cx{J)>-&;5P>|FwSo|M`WFlmj?+Tdip_ z$l3PnRsHs@<_$h?J}LBsP7r}%9<`$Lb<9CGL?0Y_nXXWEV9p!k`2V}t>|+yCU}MkU z_qG1r-}??~R~lA+um8LKZUwiF15a60{p0$Br7Fyi^lI3PJq{*{*D+~ku_~zo9iR!s zJl6TU{@$;?TdE+u+lC`ql;vTE_x}IKV}E_!|N7bb|1+Q0F|=-2eOSxG=HGb+2Ag&N VvzjXwDFc1O;OXk;vd$@?2>>j9g(3g| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png.mcmeta new file mode 100644 index 000000000..eea6c1fe1 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "layer": "CUTOUT", + "extra": { + "light": 15 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png new file mode 100644 index 0000000000000000000000000000000000000000..d069dbfbc6134b332c1b638369e0ba39d377079b GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwr2>%=KS^ijH}@IEGmGFYUMGI^-bGTC8O)Eh_Ep$fCHmi{svbd-weOAIQH_)e+(p z^zCsyr?BFp@5ed4YFv^A-AA{7{_)IkgH*%*gjAoxQm52+0Z+aQg?YUy zwzcNI<6fc>E19%IJ)AD@xac8nvFq7#Y1^w?+c(OqeG->_+;!=R!^heM8wxHKZ<3ez z#q@Kj`^VSZrmqD%bzX!yJf0ft9SYW-uyjdcoWUpNFXfC;vyFkqo|Pq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png.mcmeta new file mode 100644 index 000000000..eea6c1fe1 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "layer": "CUTOUT", + "extra": { + "light": 15 + } + } +} \ No newline at end of file