From a3b175074d3f9e48128e7c4ed88a7d8d2dbe0df3 Mon Sep 17 00:00:00 2001 From: firenoo <49818773+firenoo@users.noreply.github.com> Date: Thu, 27 Jul 2023 10:42:10 -0700 Subject: [PATCH] Add new textures for wireless coloring (#15) --- .../textures/blocks/wireless/side_off.png | Bin 840 -> 432 bytes .../textures/blocks/wireless/side_on.png | Bin 844 -> 0 bytes .../textures/blocks/wireless/side_on1.png | Bin 0 -> 440 bytes .../textures/blocks/wireless/side_on10.png | Bin 0 -> 445 bytes .../textures/blocks/wireless/side_on11.png | Bin 0 -> 448 bytes .../textures/blocks/wireless/side_on12.png | Bin 0 -> 442 bytes .../textures/blocks/wireless/side_on13.png | Bin 0 -> 453 bytes .../textures/blocks/wireless/side_on14.png | Bin 0 -> 453 bytes .../textures/blocks/wireless/side_on15.png | Bin 0 -> 453 bytes .../textures/blocks/wireless/side_on16.png | Bin 0 -> 443 bytes .../textures/blocks/wireless/side_on17.png | Bin 0 -> 453 bytes .../textures/blocks/wireless/side_on2.png | Bin 0 -> 446 bytes .../textures/blocks/wireless/side_on3.png | Bin 0 -> 444 bytes .../textures/blocks/wireless/side_on4.png | Bin 0 -> 450 bytes .../textures/blocks/wireless/side_on5.png | Bin 0 -> 458 bytes .../textures/blocks/wireless/side_on6.png | Bin 0 -> 442 bytes .../textures/blocks/wireless/side_on7.png | Bin 0 -> 444 bytes .../textures/blocks/wireless/side_on8.png | Bin 0 -> 441 bytes .../textures/blocks/wireless/side_on9.png | Bin 0 -> 433 bytes .../textures/blocks/wireless/top_off.png | Bin 607 -> 0 bytes .../textures/blocks/wireless/top_on.png | Bin 627 -> 0 bytes .../machines/wireless/BlockWireless.scala | 53 +++++++++++------- .../machines/wireless/TileWireless.scala | 21 ++++++- 23 files changed, 52 insertions(+), 22 deletions(-) delete mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on1.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on10.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on11.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on12.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on13.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on14.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on15.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on16.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on17.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on2.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on3.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on4.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on5.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on6.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on7.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on8.png create mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on9.png delete mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/top_off.png delete mode 100644 src/main/resources/assets/ae2stuff/textures/blocks/wireless/top_on.png diff --git a/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_off.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_off.png index e3e6a1117f7f6fbf3af4255c3ecb109e46534559..39f40ab66a255aa8284b066686661a347a323d26 100644 GIT binary patch literal 432 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 kmE$-&FVlgP82hgC7sn= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on13.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on13.png new file mode 100644 index 0000000000000000000000000000000000000000..c7f79344cbfc33a102e3049596255e66b67ee494 GIT binary patch literal 453 zcmV;$0XqJPP)Px$e@R3^R5*>LlfO>FP!z_0y)9lsXjBMcz+Ev$d=WRd@&Ym-E*%^k92{8uGw2J* z#^#$Cqj8tPm?}*Pp(bq|Ztv9&4#bn3<=pQ(-?`_H)!FN00AF#;GPWWm01iO!um`~N z(*sp^ol2#`-Dt#7zYoCG^)+43V?LiVi#};@?*edhdxO<(Z)JnQF~i|-sS14G=koGG zRWO-M0Qi{B5Vph;5>k`{2<2HClO{2>wW{Gbzq1Nka(=J_z{~4-lu@H9v z%H=YEQU*@%-$>#J(k#zxVat@W{br6y4aWhv8;uk&Rmw>mvFauTr7((kc@^ecnj-+y zZS&_`IS2xRASlE%Mso!JGzZk23+aRfK)qi7LFO@y(HsHL^*r;qxzWIuE@5O7hC+E{ zV@p>}B2S<>4!~lu0MwiT&i0$CVZTg|QDI7kQ`mzvi8&cR{;^0?vq(@X_Mp{j0Z?13 v>QsNUtYpZVPx$e@R3^R5*>Lld(?1P!xv0-j-fMXh7KD1;hk(aAI}vA>ajMKwSC|ETV(H06c_) zD-)9%c>>(3HYJ3b^w#0Fl_ok6ZgQ4;|NlSdp8p)<bjsCW0Ko0t9ldUs^?J=J_@s4o48Z-vJw~f_7!QZnj7FoKDsWww@%Tnp zuv{(y`1o2OOo<^RD0Bb_9kB{gQAn*?&N$Y#sxT!NFE$YKKJ#-K8=VSZ^VrT;VgVG3 zMF5?dn5VM}Q7AygiL${$I-Jk_1fw#J1u&UTHBiC(%qI#36(`DN@`FHErK)Um1dw$* z`*V`n^E^Dy%iX1zlq1;lSfG8*$q561dcFROOzu)l$`Js)ZZ~^ubSjwA!4FJ)U+4%- zOzCJR5`mOs0cG|f=X3uL8`T!3ka2QzprVk+c4DWh<_76?YmlIj??JQK1fW(e vr&9m4tdNmYj+Jhe>$*EHlPx92zU%x0*_ffQkOCx#00000NkvXXu0mjfR+YwX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on15.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on15.png new file mode 100644 index 0000000000000000000000000000000000000000..f573508108e84b5cfc90423279cfd794b59065df GIT binary patch literal 453 zcmV;$0XqJPP)Px$e@R3^R5*>Tlf6#EPz;5?+?)1>su5732&pPVC&B=1eVFzIU?{NUA-Yf);054e zSQ%hrpsG}=28e=6QYi^Tejo^j3M_fCeC%WUSlip*O8^#O$TC({3IHA8@Zb=D`@37} z<~p@njjQWxj{1E7&d$&2b-T>xbKd+H?44ZzE-o+7YQmmR$sgvhRZl)m}tIDbw zqYQ&2ju1ex?PBJvv+KIJu3L)bIXOoBxZ)-3e@5tayX1V@w2;cg^Cg}qQuifNndv1m z&N)U02!a4e?+h>*t?pOn{!1%Ag`~6^W00000NkvXXu0mjfOR>qP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on16.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on16.png new file mode 100644 index 0000000000000000000000000000000000000000..52bbd9ee72ae3bef815e81cdb50b387f50bc1bd2 GIT binary patch literal 443 zcmV;s0Yv_ZP)Px$bxA})R5*>Tlf6!ZU=)TQzK{A5D5*NOsgowf!FoS<13GA3xQH(P40;24Lk`+R zCrRB<2|~aGaG;!TzU(1J|Y2V_Ftc*@TfK3`OOUL@K-5#6ok8(E-vl z1*$y*Y;PGPaa)0D89#D54W@MmMV>Kx^p_k`+#C{g8jKDw7z_Z|T<_MUmW-^^fNP9i lf0gHXD?ihkQfPmD=Pv{{v4#aIA%p+`002ovPDHLkV1kwKxvT&H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on17.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on17.png new file mode 100644 index 0000000000000000000000000000000000000000..9e876de6059987b1e7512351fd520e15cdd71c88 GIT binary patch literal 453 zcmV;$0XqJPP)Px$e@R3^R5*>LlRr)ZK@`S+JG(H1umPdO1Biu~nAlQy3IZ3901y02n+BFe;UkU8i$Px7$6a0>^Ra_3l&! zi^T$f_vIR4N(><(L^*&^z6*WAz^7Qq#T@IWsxT#2m#XZG!f_(wY&i#DJnbjq7CCznGT?*E0=4IaoG<_=l}g{pD5f!*BLJF>M*KKi&M~FU$}?H5 zgmTZsl(yPLB%nDKz;?R@)Sdxq)%xBwDoiToB>q7d_>8B03?Z5P@sS{voI$x<2B28T vX{kLUOT}c(vGi3rj&txarKQC9?>T<~tJb5Xb$Jeu00000NkvXXu0mjfc+SGk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on2.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on2.png new file mode 100644 index 0000000000000000000000000000000000000000..8322559fcc8ede2624d1e567cc88fe1598e4310d GIT binary patch literal 446 zcmV;v0YUzWP)Px$cu7P-R5*>LlfO>FP!z_0y=}dOKvYN=SDWZSyvbS4{l4>^zt-W=VFvIS$87Spqy)eL=$>~0m`$Il zRCg(t%Z$cjE-x+sxV^jMq|;%!T(XGX@mdD}4DJV5p0}S}U0u`b^)|}D_kH^P8jt*s`i7 zkq6Km2Vk{Y0cy?wFGKH_F?v5RuHh8+AWdQ#r;|Sx>Cr3_xWyhcn@s>}I~5)3kCwTH otT~RpD&O}vKBg@xvHp9`Uw_}BU^QcEfdBvi07*qoM6N<$f(-A=lmGw# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on3.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on3.png new file mode 100644 index 0000000000000000000000000000000000000000..34dcfc4dd6e960f14a695be6602e2152ad57d69a GIT binary patch literal 444 zcmV;t0YmPx$c1c7*R5*>LlfO>FP!z_0y)9fqXhay9+{8f~cnM#Cr5I-!P?tUgi^_mAfiAuP zZ{VVngN{y&RY?hyb z#onh}E;IE!F8h4|?uJ9Uj>BrTVi|nWJURwobU(sqHV>1lt7`^>!A=>tuFLK1jmls? zp9ApmwM3W_Lr92G1|XCraY!76)T)(?WBraQOo?~)3_$QMbBgwX>X9>P=lm8xsZ;_` z%E0-zJx>8+r5uF;dv=slS_Fa0DlJQM1dw$*t2tHn zeIMWVb3TpH9Kk=I1!~T@aKZqfUaxPEsZV1xM*wskC;PMyLQHA12uv0Wp)4>lrL88B z2GAS}V7*=gYR&-T&TQ)#6{e7Ja(fU*APx$d`Uz>R5*>Llf6#DP!z|1y)9lsXhcX@n3xa;F){H4*n9;DgPRP9OCN&8k3lyE zLtlZ-7cg;g&^S4;iCgeTC6%ZpXvnDWlP7tqL5+ z;r#qeRWO^)0C@XYAWVrNBt)nH5Gvv*APNJ@rDDpleyR#na&!9v!2R=U#&N$<1)$fi zXYv+6KA#6r&cM;(0b$@n6er3CrnDJP?-ERuax8#}>ndQRoWsCp(+)FEbKh50CC}0v z0i@kd-<&vmo`>gonViOGj^Lli0yXE1oG<{WR4U)dB&RW&BLKRcPI|fDsA5W+xoPx$gh@m}R5*>TlgmoOP!NW{oRfM&N$>)ti-1CLVMM$veU|zHcHw1{hv>%3LSI0i z#ibyk3qeq*P$X(dDLFzC7rAIe7exnVGt58p&&)r@+WJ}s@UAtJ*pyNLm;k-)9ssvD zSJ=)h&1RFc^K*80b^tg!K4z=iWjr1;ieB-SR{=OVJ;Ct2rEG6+pMJkT5d+`%IXpbb z84Lyk0AAik2&piHf|T3=MDAItNfXW7j9p>OuT_Oq42CNJsQb%WN8Q-~z-?dG;wFG) zSpa!wU}1hpq8&)HqOyThLmnR6MNayO@w}zX5E327gpuI+Vnl1xVcJP*ox(`+d=b&w zw3&8Nlx2~n2?D6LUCmr{4uXIn2x_r1r^JXKS3H6J&j?%HE+rq`*+43XFp`9!$UTxs z<>Z$rIF}d`AdX`ozcawYV;gnq1EOHzD0sLV`wxF#%lH z1z>K*E=&EgvPK0iF=qKyzVA=`OjAl>{Pmqb0G@fX(h91BGXMYp07*qoM6N<$f-jZB AH~;_u literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on6.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on6.png new file mode 100644 index 0000000000000000000000000000000000000000..dfb149b68e1a7a826e53b8a784a537f5c2607037 GIT binary patch literal 442 zcmV;r0Y(0aP)Px$bV)=(R5*>LlfO>FP!z_0y)9fqXhawoNSMVzOnd-dg9Khc2E?Tg!6GuCiEEqq z8a@DvgYF~@4pm7Bp(ZU3x3|(n2Et9wa_;wi=fBaqY;6I4!jMB=UP=Hgfc|wKfcLjo zO7j!ndxbD1hL8}W3_vK`#vySOQYn{GjvUYydT90C(QlJ4S`crJT$j#8F76Hv4yx9(NWAa@ii#>vaGs<&u`#)3RJj)*MS; kmE$-EA5&gRjAPIF7x~4U^#cLPe*gdg07*qoM6N<$f*mHg_5c6? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on7.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on7.png new file mode 100644 index 0000000000000000000000000000000000000000..368a4db73308c4b91405620c00dce551060bdf0b GIT binary patch literal 444 zcmV;t0YmPx$c1c7*R5*>Lld)35KoEw%Tmr{1WW-QHVL>4lVna!1)yc@3IHL z>&r7G`;cO>$aFU2s^16Tc08ur>9Ag}S^1wdPEG-s+)XeVjpKMQxMnyU?$m+nx{O9Q zs)PA_4#47Tg)k+CkPx8)K&XhLfG7-b%B7TJ{Z$pFEuTJS_ai|r>p`_z1;8nnwA2>Maw%DJ mEWK5(>+ZZvc_}gWUFRPJb)Uu32{l{*0000Px$b4f%&R5*>LlRZuXK@`V-JG(e!!bXLX3y6i7cnPU6v0N@71!A*@pb;tX0#K4* zrI)a=&=XLuN|tO`lU*!kXLSo=h?BhL&Hv-gd-JU3X>$Yc702vy_M`;B0q9$g?{tbh{V5bUv-)A_y)fFrj z3jp3fR|s2T2?;4W0ECWB8j~h5)q_gTaek``TXK1E4nPz|1xKY60JHg1A@2Z`%VhxV z3_LtOlf)sUn@rilmM-nqS%yh-jsq~6PBk#q&Pg1y?9 zARq{WLe5|eNAS<%fSz+fPFMicYPBC^mNOW`5da;}%P*Bu*wSSg+ANnsM`&Y9S5G1n zFdPS9y?OeyCS{z00=%;ryjek3Rrdr+^}0jM5SjMSEvm2$G-IA*JS j-`{ze_N2u6?>c`2^tqqK?H(iO00000NkvXXu0mjfF{QVb literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on9.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on9.png new file mode 100644 index 0000000000000000000000000000000000000000..182bba8329f412cba6720b0ed16424798311e7ee GIT binary patch literal 433 zcmV;i0Z#sjP)Px$Ye_^wR5*>Llg&=TKoG}&-4>P*nj#!|0r4Qd58R10LEzAYCoth4NCL(?ypRWd z0*+Oi5<*Sddf0BY2Vw}D%w_ifF*~zkbZ$B+z;_gJ$|*|;fCb>*x&XYty;8F;s8*}2 zHyiE;0|1^D3wqry`~99>_(}Wf8i3XF3Zvb=Oozh})9Li23OvtaKA))yw%aWLA749! zDKUhE1Qh^6MVdq;aYUnD%Q@CxRbfhAR*wJ#K~QjX90!2DJ1*ocfJ&tTpqzob(F1W5 zLXu|62Bx%G&L$Zq$vGCldb3f$L^;P%h-1eEryvYfRoSyNM*w-Z^EYSCzVGAvej%qZ znj<*#SfJ)ykP`*~&1Ul#ndLM_a|A%I+s!W>$H9~~L1+>LLPcm|N?T1L6VMzB;BYtq zYR&-5+2rUL6{eJP3jZL9Bl_<6-;V^PVh>ua766TUO-mhVSt%!Lj-|KC^SqOnsVpVN bx$FD`4GN#d{@d`+00000NkvXXu0mjfv5&H^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ae2stuff/textures/blocks/wireless/top_off.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/top_off.png deleted file mode 100644 index ba716e3bda6f953c701c747bd7cafcd4fa07dc2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 607 zcmV-l0-*hgP)4XGF%Zp^6)RRs?NLF* ziwL!z{Rxjf`xk;|{RMAcr61wlgI+x7Q9*hUTP)Ugag!M*NlmlccG<4B;80$NZ1zpw zOfp%h*Xv@QRuFTx!2UHF4aQzSWbA*m8B1#w#?Oy;#@)S|d*SWvRgd>25&7dY)Sy@_GAdN=0s9FBNSHBzWt*TtD(U-{|1rEv;i|w^CIw*_CIUn%atd~W z8ZTT4RD>D@7XW#rgU@DT#14UDo1_4x@4K3_&vYnsju6n#5@f7_HAM7%7l8d?0H%gq z2Q9XrJ)cHCO`0=f0EjIQ#3;EY(}F-)36xiXBP4TpY&_%BWR)|gD5+ph6rBPtUrWCu;{>pr| zj79$SjW(X(7Tu@ZEx7{>Z3Allxl6ABr1qq_U;2yssu&CgjK`-(jNPvOUXxO{?jX<; t%H?w6p0XW(+Dyx~AO-O6zplRp7yvs=CB9g@lJo!o002ovPDHLkV1j}!5L^HN diff --git a/src/main/resources/assets/ae2stuff/textures/blocks/wireless/top_on.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/top_on.png deleted file mode 100644 index 315e50a5ea42a2ef5e922de036878c27ff4e22d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 627 zcmV-(0*w8MP)4lfKoH%fMQhZcV!U!S zCWcS($k`w8;0fbdF&@2m^J@4A|GJr- z)-9LIY>^|!7Cc;is#Ge3-QIw(*J%-MY;F^NcHRm14-U-@udhuN?+LFAC>YRMpaVI!d!ujqr-RGej3h zg`y0naSQ^8XvgR1f#-RI5~QgK@i7O0kTQW*o8Ul5p~*_XwZ3->lrOJ~q0V{xmZ#cV zDhGqXz)nDMU-}~l&d0T&2bT;afax zT_v8f2YLX2&CQ}B9ws1Zp6Nx4)=QjY#BtJ`ITP^M<8c-hH>fm2&a?&0>cHw2*P0`a zlU>eTqHza_IA+}JMtAc#=Z0h02cFSEtJMmGa#n(zNw9miIzxi1l(Ds?)zUh6sY$&T zAuU(hHMmsBAmyeM`=b5Tu+>sF`PW~x 0) - icon_on_top - else - icon_off_top - } else { - if (meta > 0) - icon_on_side - else - icon_off_side + override def getIcon( + worldIn: IBlockAccess, + x: Int, + y: Int, + z: Int, + side: Int + ): IIcon = { + val te = worldIn.getTileEntity(x, y, z) + val meta = worldIn.getBlockMetadata(x, y, z) + + if (te.isInstanceOf[TileWireless]) { + if (meta > 0) { + val color = te.asInstanceOf[TileWireless].color.ordinal() + return icon_on.apply(color) + } } + icon_off + } + + override def getIcon(side: Int, meta: Int): IIcon = { + icon_on.apply(AEColor.Transparent.ordinal()) + } @SideOnly(Side.CLIENT) override def registerBlockIcons(reg: IIconRegister): Unit = { - icon_on_side = reg.registerIcon(Misc.iconName(modId, name, "side_on")) - icon_off_side = reg.registerIcon(Misc.iconName(modId, name, "side_off")) - icon_on_top = reg.registerIcon(Misc.iconName(modId, name, "top_on")) - icon_off_top = reg.registerIcon(Misc.iconName(modId, name, "top_off")) + val index = 1.to(17) + icon_on = index + .map(index => + reg.registerIcon(Misc.iconName(modId, name, "side_on" + index)) + ) + .toList + icon_off = reg.registerIcon(Misc.iconName(modId, name, "side_off")) } } diff --git a/src/main/scala/net/bdew/ae2stuff/machines/wireless/TileWireless.scala b/src/main/scala/net/bdew/ae2stuff/machines/wireless/TileWireless.scala index 8193ff6..61dd7f3 100644 --- a/src/main/scala/net/bdew/ae2stuff/machines/wireless/TileWireless.scala +++ b/src/main/scala/net/bdew/ae2stuff/machines/wireless/TileWireless.scala @@ -14,12 +14,12 @@ import appeng.api.AEApi import appeng.api.implementations.tiles.IColorableTile import appeng.api.networking.{GridFlags, IGridConnection} import appeng.api.util.AEColor -import appeng.me.helpers.AENetworkProxy import net.bdew.ae2stuff.AE2Stuff import net.bdew.ae2stuff.grid.{GridTile, VariableIdlePower} import net.bdew.lib.block.BlockRef import net.bdew.lib.data.base.{TileDataSlots, UpdateKind} import net.bdew.lib.multiblock.data.DataSlotPos +import net.bdew.lib.nbt.NBT import net.minecraft.block.Block import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack @@ -173,6 +173,16 @@ class TileWireless } val colorIdx = t.getShort("Color").toInt this.color = AEColor.values().apply(colorIdx) + if (hasWorldObj) { + worldObj.markBlockRangeForRenderUpdate( + xCoord, + yCoord, + zCoord, + xCoord, + yCoord, + zCoord + ) + } } override def recolourBlock( @@ -180,8 +190,15 @@ class TileWireless colour: AEColor, who: EntityPlayer ): Boolean = { + if (this.color == colour) { + return false + } this.color = colour - this.getGridNode(side).updateState() + if (getGridNode(side) != null) { + getGridNode(side).updateState() + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord) +// markDirty() + } true }