From 75bd05e75e4e7f9e4f4e842769e2caef9aabd606 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 30 Jul 2017 16:33:44 +0200 Subject: [PATCH] Added CTM integration for Crafting Monitor --- .../refinedstorage/proxy/ProxyClient.java | 19 ++++--- .../blockstates/crafting_monitor.json | 2 +- .../blockstates/crafting_monitor_glow.json | 48 ++++++++++++++++++ .../blocks/crafting_monitor_connected.png | Bin 16448 -> 0 bytes .../blocks/crafting_monitor_disconnected.png | Bin 15899 -> 0 bytes ...g => crafting_monitor_front_connected.png} | Bin .../crafting_monitor_front_connected_glow.png | Bin 0 -> 553 bytes ...ng_monitor_front_connected_glow.png.mcmeta | 9 ++++ 8 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/refinedstorage/blockstates/crafting_monitor_glow.json delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png rename src/main/resources/assets/refinedstorage/textures/blocks/{crafting_monitor_connected_front.png => crafting_monitor_front_connected.png} (100%) mode change 100755 => 100644 create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front_connected_glow.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front_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 03b21d1dc..5d0d01382 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java @@ -210,7 +210,6 @@ public class ProxyClient extends ProxyCommon { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.RELAY), 0, new ModelResourceLocation("refinedstorage:relay", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory")); 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.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")); @@ -237,15 +236,23 @@ public class ProxyClient extends ProxyCommon { ModelLoader.setCustomStateMapper(RSBlocks.GRID, new StateMapperBase() { @Override protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation("refinedstorage:grid" + (Loader.isModLoaded("ctm") ? "_glow" : ""), "connected=" + state.getValue(BlockGrid.CONNECTED) + ",direction=" + state.getValue(RSBlocks.GRID.getDirection().getProperty()) + ",type=" + state.getValue(BlockGrid.TYPE)); + return new ModelResourceLocation("refinedstorage:grid" + (Loader.isModLoaded("ctm") ? "_glow" : ""), getPropertyString(state.getProperties())); } }); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter" + (Loader.isModLoaded("ctm") ? "_glow" : ""), "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CRAFTING_MONITOR), 0, new ModelResourceLocation("refinedstorage:crafting_monitor", "inventory")); + ModelLoader.setCustomStateMapper(RSBlocks.CRAFTING_MONITOR, new StateMapperBase() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation("refinedstorage:crafting_monitor" + (Loader.isModLoaded("ctm") ? "_glow" : ""), getPropertyString(state.getProperties())); + } + }); + + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter", "inventory")); ModelLoader.setCustomStateMapper(RSBlocks.WIRELESS_TRANSMITTER, new StateMapperBase() { @Override protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation("refinedstorage:wireless_transmitter" + (Loader.isModLoaded("ctm") ? "_glow" : ""), "connected=" + state.getValue(BlockWirelessTransmitter.CONNECTED)); + return new ModelResourceLocation("refinedstorage:wireless_transmitter" + (Loader.isModLoaded("ctm") ? "_glow" : ""), getPropertyString(state.getProperties())); } }); @@ -253,7 +260,7 @@ public class ProxyClient extends ProxyCommon { 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)); + return new ModelResourceLocation("refinedstorage:network_transmitter" + (Loader.isModLoaded("ctm") ? "_glow" : ""), getPropertyString(state.getProperties())); } }); @@ -261,7 +268,7 @@ public class ProxyClient extends ProxyCommon { 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)); + return new ModelResourceLocation("refinedstorage:network_receiver" + (Loader.isModLoaded("ctm") ? "_glow" : ""), getPropertyString(state.getProperties())); } }); diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json index 7b6ad923c..cba9745e4 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json @@ -22,7 +22,7 @@ "connected": { "true": { "textures": { - "north": "refinedstorage:blocks/crafting_monitor_connected_front" + "north": "refinedstorage:blocks/crafting_monitor_front_connected" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor_glow.json b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor_glow.json new file mode 100644 index 000000000..3dafe5834 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor_glow.json @@ -0,0 +1,48 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "refinedstorage:cube_glow", + "textures": { + "particle": "refinedstorage:blocks/crafting_monitor_front", + "north": "refinedstorage:blocks/crafting_monitor_front", + "east": "refinedstorage:blocks/crafting_monitor_left", + "south": "refinedstorage:blocks/crafting_monitor_back", + "west": "refinedstorage:blocks/crafting_monitor_right", + "up": "refinedstorage:blocks/crafting_monitor_top", + "down": "refinedstorage:blocks/bottom", + "glow": "refinedstorage:blocks/none" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block", + "y": 0 + } + ], + "connected": { + "true": { + "textures": { + "north": "refinedstorage:blocks/crafting_monitor_front_connected", + "glow": "refinedstorage:blocks/crafting_monitor_front_connected_glow" + } + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png deleted file mode 100755 index ec94f31e74ff0fcdd769c816dae9062ba4b6d0b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16448 zcmeI3ZEzFE8ON_FNn96#n>v^R39=w00iSetx|8lySyZpQ6d7X+unQra?oPIfq?0B2 zHHA>(rVZ1k1tvhDkOB!QIJkrsJB8FVae)S79EJf86mU9jNPq#7LYfehrhAfX$!qyW zZJFtpyBWPa`|R`I-QPaDd-vgU+mI+anN2u@x z3)MFc9#X4(e4%S&=_Ej2W7CB_v94Kx&tB-jCp+B!C* z#Wk2VT@cR=#DuED{#e&|PAm9@fDnvEKpdVnE>tN-#Ym+%Op^odVH*Z>;&KhNowmP$ zK-#7wQAZ6xkU*L?GUBce3EC1NB36ev!BGQ-GAZ5YqdsqPat0|$o?-hg)cJ-9lRWXT zSSrM4$OOh}w1ovWDu&&n=r_l+thgVc%4UmYmFn?@z928wMxHQf;gIBfC)ETy8x_nT zAN43kqZsAJX(Mhh>If7w7%?nGBwiEJaEZLnTc4uApoHFy6Gn_M5{6Wbl$x*xSU)@) zWiwJqt(&65b4ITi4zN+PFThp^+EB2 zQ4Y!qx+E=C5RmLeA`=qj{X#m5XK{fRP!G)-P!B;;D1(t0Y9Lt#=W#s+uFS>sq?55Y z2pef3V!g6DD2su%S)8=qX~Xc0h4c=Fayn?8!NxE^NKa!{(rz{AoHXGeC_S0EkjLXC z2m_DO9u7zKdN4c>7#d0#XpA&aG>_|ujKyd@L(-H5>xXW^oi>Zk#?U$kX>;2384EE^ z1BL0WPRdGS((tT01Lm~raEHZ$TWFm7Xz?7JcltP&e0rL&FOL~UOG5uQx}9>#!DNC%VnGuj6_+m zAZFQP`RxPw%@{CVz&Slic}egkfc`L?jz>wH!5NI|p`v$j8h`wKFgx%hkzURnJc z!qAmylJ3)tU=@RmVq>cZ9CJg;k}b#Umr1M9UmdH@=rM4CyLoUWLQ~yvXt{i7sv8bX zM$QlVqGoXN#X1TVr$k9Nlkq#9Qt;d(n8EFU4%`mF#c)KiuTJon*?r(nCnD`9IM}OW zF|Z?TVEJ%?DUL*7e5z8OP-2^5yc9hDfJZOwz_ZtoeR5zIyPJQKBf6Wake1R21Vr9c zaLMz5yb3M|h`g!blIH_?6-)D!3pZ@}`1Io)6?za6v%iO$C=cAIPiVf`G`I3NCp*kXOM40g*Qq zT=IM%uYwB#B5x|V zAo8XxuI%L7%t8>n!dwg9Rrajy_JjAFRou)H7lJfAiXbbWMUdNHg5S#sQjH}h?4dT{lx&-}b~|AK&R+n#sV zA6A_{UiByRk(M`v4<4>L+v9nA-{_O?U3z!p@m)X2y)@<4-e(Wq(R5v|Uy*xcV=tYR z-;U*2v+}!cX60|%>DyE^`N5pGj|yX-6Uwu>H(Oh~E6FRLH0(G@n@s0>dV0>D-PL{d z^!N9>r@nu)zPtM7?KgYr2}kFR?Zrk?u1SqKR`>iz8~?KJwcWc5I{vU&v$=Ej+R3Z8 zvttW7N=i#h*|8_Ox(p{8?yo(0u;at_(;qE=tfBi`ZP!OW^{Y`e&G-MU^Afb-g|7dQZMgtsbq}amlv$i!%>7*5s_p*>0bA{=$X% z^Y>Tb^c$;}EOCmO?X7t`7H)a#t@&>8(?7oS)f+EwE_!vt`t_>DT4s1pEqGxg)|S4`L*EQXx6FPe*YU%glIQK)-BUY{AOCQoxT*J@?&%-D+V>ex z`hGU0bKYxPFX|^Anf8)cw{>Cez1*DF3$FI9n6eK4UTf2aFZQgvex~ZTpD$n9di~g* z<`vO{D=scFfBr<)s-3TrIE<*N_LH~yw|s4&w`t#u9m=GThNYwm~MRRJw@h?83P90j&1$mUQ2Po zn2z`NT|Llz^<2x7yWA6wzFyElx{g+jY*#ggCd|lhd}P|~wuvJwIU`yEPj9U#U*AiQ zA3wgSsp&^n%i77-tRow(S>IEcJ;va$2aY~e4wqZtthK}(V|n; zPv$zZtv|uNTPg9<7qz=5PGy8~Kg&3w;K}|Bw&A_(}6#sdSd3$lh#S Gy6WGTMMm`i diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png deleted file mode 100755 index 6db474b97d08f3d2fe2987bcd896b2b99cdf15d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15899 zcmeI3e{2)i9l$TBMJA%in$Vh}ZgLDr$rk(W{M(1);$K;k)=3)7nn*+Ad_E@!w$Jf7 z*omgWAQ~N_w9qPQ>3}YiV9VB2O0{I7B8Y{Aq6pF{st}17V>Co1ozMhRG6Koo`L|!3 zr))#oKX;OUeBbwdzu$MC@ArN0{d2!)sQbYS#hZ#T411xb+Sv$x<>E)S27JGByww1H z)`hE^1q|D8N&FQ3@%Y}qW7sw`=V^*IxnH9gKB%UByq8tSgJCcm!z{1F!!)y(jVios z3m2+XKKSgSQo;Eum2c?XggfkDTe<4a2)m=R&ck%>Wz0V1E7oF5oB|GlY?M~SgMpAh z#VeHwzZCc{4&zEiVoG#xrP3w_R5ZC86b?SZD)efDiXll-VKl2ry-BOlS12?DsmBR3 zP7*4Dq)39&5Q@~Lv=)PZmWah_46pqJYF?CF<<|8dQX*Qd2LW65G zDlkJObcCXGTon>FC!M7II9Y*-aN#J&hZLe;+RL{`E0szyQ07YAS1_Cj6cSSG07X1b zhjCI(;DwBQOvWbM9tk9t=3{U+zy{e+Q~-8lLA!7(ALWHseua=3^@@Q(PTcNH?1JkJ z1`CE3qON@aK?-R>OTp6-X7NT=;M*e%>)HoyWpkmsk8=KOa`HThnibd1#<>;DL`~8x zQ3}ZnS-`zgjtEOf`G|+-1J-1fHKY+L9F9a)Dazj9LOwnwlv{AvB%AN7H`YlC9#Tu`2ui2V^^r3Z_5t>fkB-u- z@{&6@$B&Pp{Cp%xN3C3tZej6osKtV32Xkg-s)};(0X_nj#agu%ywGq#D<{vii)C#K zF{}WRA>U_AiIiGC8WmFj?7g?Jz=m{>Fp*0I5OC^Mxx58C0#ZfX)|e^t9In~8+@dm z@T-ho9i!6eb$*rCPv})%ua6F6ofBK+0eYI0>c z=F42yM>y~hp#wQ{(rNimLKJYbEL1foR$E7YIV7rW2iulEnyt1(yARV5ffbusr83>k zGS7!(Nu>%a(G)3~5g!y*M(j1L&w}TTW|x(*v?M2R%M-Xd1k21Y9vaxLB5 z;Nonc$;p9dr6Beb(vY%&6$K5OS2D~|qzsd($~ogEnqhJjoS?zs9nYNJm-Wd^7kid} zvUl_>y+XdEAP^9=DB(i$fwU4X2nbq~aH07?S_u~f1T9Lq(0m}RgbMGm2g2o(4vG3%?Hv-xF8^CQNo4h18F5(5D>H|;X?C) zv=S}|2wIeIq4_{s2^RzeElRl1d?2la3j%@`C0uAekXFJ40YQrrE;JuVE8&8GphXE6 znh&Iva6v%OqJ#_02hvKoARuT_!iDAoX(e0`5VR=aLi2&N5-tb`T9k01`9N9;7X$4#^x-qPCD~267gkk?$0>58l zSUZ7X_jh9$^*)BZ$e;M}NEL>y`B9D2=7~>wj^D03R4X5y+xoqVjbB_o_t7`~pKUzq z{_V#{_J7;yspgu0zn$On=gW_J{<83=8E<`EW|)AeDdVwx33J}30uCqw7B@w{rfKt4Q)6)92%So7{;di z`(~#j*kr76XEN>E~`DUeU+gbH5bqGTFhuE-Y-T`PQx*?YoTY9liDS^{TNG2YP!azJ7G)P7$+S zR=V(X@$utL_W3iD{S_0sY1_K_p{4oxH|1+&zZxGOFFT^>>Sj-!I@R30wTN@9dH3p; zW6V*qZ697+d+299Wk-6p%cg&L zldTCd}m>_)GRN?>h=1;6=>dw(6kB92Zzw`E$yZ?x5K8T;5d-Uk5^Xl!g z3l}f)gHwI8lLNON%(*8#JHgf5?VkAD_@b*V7CTI?J$6^;o@l?-d0}yW{x`Gd`(}H4 z2c|xj_f(Aaly%8FP7BvxVh+faJN8TsB(;D`#jB;4r>3SJK76?655>dp2zBMpcgahg zuW$U_m%SBZ|Li<9)6vbgy?l;4$=;lu{r=38>FKRw{R$a2`hMg6^J@E>^1qoj*gqc# nj+WSErCntAX1k2}=1dXx;KG+>u6LI>P?K1VtIpYH-+l1k!%MgD diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front_connected.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected_front.png rename to src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front_connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front_connected_glow.png new file mode 100644 index 0000000000000000000000000000000000000000..1c926c014e99c319fb79565af7971efbe211e0f0 GIT binary patch literal 553 zcmV+^0@nSBP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^MlX|MGF00EgvL_t(IPotGo7VKJO_N@{-dXcY^h*735X0w(l(W=Cy>Jk`?$1$ICJ1Xqc8n6+^4v@bUWE)6%@WUiCsK6_ z1XX%MN#2BY2BJFs;SAluB%PrYt$`fAOrH8VRjMw5PQ_#;n