From 32b130619f644ffa5f095595314337c963767767 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Tue, 21 Jun 2016 21:36:23 +0200
Subject: [PATCH] Updated some textures + made controller update more frequent

---
 .../api/network/NetworkMaster.java            |  13 ++++++++++++-
 .../java/refinedstorage/tile/TileSlave.java   |  18 ++++++++----------
 .../refinedstorage/textures/blocks/cable.png  | Bin 428 -> 448 bytes
 .../textures/blocks/detector_powered.png      | Bin 661 -> 646 bytes
 .../textures/blocks/external_storage.png      | Bin 583 -> 640 bytes
 .../textures/blocks/interface.png             | Bin 618 -> 618 bytes
 .../blocks/processing_pattern_encoder.png     | Bin 689 -> 535 bytes
 7 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/main/java/refinedstorage/api/network/NetworkMaster.java b/src/main/java/refinedstorage/api/network/NetworkMaster.java
index 18370c290..3fe672439 100755
--- a/src/main/java/refinedstorage/api/network/NetworkMaster.java
+++ b/src/main/java/refinedstorage/api/network/NetworkMaster.java
@@ -54,6 +54,7 @@ public class NetworkMaster {
     private List<IStorage> storages = new ArrayList<IStorage>();
 
     private List<BlockPos> slaves = new ArrayList<BlockPos>();
+    private Map<BlockPos, Boolean> slaveConnectivity = new HashMap<BlockPos, Boolean>();
     private List<BlockPos> slavesToAdd = new ArrayList<BlockPos>();
     private List<BlockPos> slavesToLoad = new ArrayList<BlockPos>();
     private List<BlockPos> slavesToRemove = new ArrayList<BlockPos>();
@@ -146,6 +147,16 @@ public class NetworkMaster {
                 if (slave.canUpdate()) {
                     slave.updateSlave();
                 }
+
+                boolean active = slave.canUpdate();
+
+                if (!slaveConnectivity.containsKey(slave.getPosition()) || slaveConnectivity.get(slave.getPosition()) != active) {
+                    slaveConnectivity.put(slave.getPosition(), active);
+
+                    if (slave.canSendConnectivityUpdate()) {
+                        RefinedStorageUtils.updateBlock(world, slave.getPosition());
+                    }
+                }
             }
 
             for (ICraftingTask taskToCancel : craftingTasksToCancel) {
@@ -200,7 +211,7 @@ public class NetworkMaster {
         if (energy.getEnergyStored() != lastEnergy) {
             world.updateComparatorOutputLevel(pos, RefinedStorageBlocks.CONTROLLER);
 
-            if (System.currentTimeMillis() - lastEnergyUpdate > 5000) {
+            if (System.currentTimeMillis() - lastEnergyUpdate > 2500) {
                 lastEnergyUpdate = System.currentTimeMillis();
 
                 RefinedStorageUtils.updateBlock(world, pos);
diff --git a/src/main/java/refinedstorage/tile/TileSlave.java b/src/main/java/refinedstorage/tile/TileSlave.java
index 67c391653..f1fcc0f8a 100755
--- a/src/main/java/refinedstorage/tile/TileSlave.java
+++ b/src/main/java/refinedstorage/tile/TileSlave.java
@@ -26,7 +26,6 @@ public abstract class TileSlave extends TileBase implements ISynchronizedContain
     protected RedstoneMode redstoneMode = RedstoneMode.IGNORE;
     protected NetworkMaster network;
 
-    private boolean wasActive;
     private Set<String> visited = new HashSet<String>();
 
     @Override
@@ -43,15 +42,6 @@ public abstract class TileSlave extends TileBase implements ISynchronizedContain
         return true;
     }
 
-    @Override
-    public void update() {
-        if (canSendConnectivityUpdate() && wasActive != isActive()) {
-            wasActive = isActive();
-
-            RefinedStorageUtils.updateBlock(worldObj, pos);
-        }
-    }
-
     @Override
     public void connect(World world, NetworkMaster network) {
         if (network.canRun()) {
@@ -61,6 +51,10 @@ public abstract class TileSlave extends TileBase implements ISynchronizedContain
             this.network.addSlave(pos);
 
             world.notifyNeighborsOfStateChange(pos, getBlockType());
+
+            if (canSendConnectivityUpdate()) {
+                RefinedStorageUtils.updateBlock(world, pos);
+            }
         }
     }
 
@@ -80,6 +74,10 @@ public abstract class TileSlave extends TileBase implements ISynchronizedContain
         }
 
         world.notifyNeighborsOfStateChange(pos, getBlockType());
+
+        if (canSendConnectivityUpdate()) {
+            RefinedStorageUtils.updateBlock(world, pos);
+        }
     }
 
     @Override
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable.png
index 75a9ec1852054579e32bd73be40939daeb2bb6dc..123ad41e24d467f36ab68124820b3811e6b0866a 100644
GIT binary patch
delta 362
zcmV-w0hRu&1Hc22JPN-601m$aI0aKAkwzzfK1oDDR5(vf%?DCKQ51vWyCEOFBPhN1
zA`I+*8-8;1jhP|*$;pNEcsy>m8~=Lge!ug}<pOwIDf;X6nj+^?J)h6h>11u80ZOhs
zpU(;9A$Gywcszpreh+rLogSpf0@!ReAUH;v0NQT1hr{9LK}@-7y<YQ>GI}N9<#L&S
zqFt?47BXHe79tMK=ksU+lFDmgHk*ydW1yK#CT_8wPNyO#gXCj691a1wVLlp-;wK0U
z1_O;#@<m#e%s*cOA1}Fzyx;GO$yZQ}@@c2j(f4{i@%>L?lH)<Q+m(TXHP(bQ?RGmn
z$#HA7TB>HVsTH}V(P-pMKM&%s?WkT=uZ!d$T34%8Zd$2SfHKu;H9Lp6g_IGax8~(?
z86@OfEEWYXxr0c0u~aHyB`6dMNk9%+mc3@b5~F$hr!3390fg(!(_<8KA^-pY07*qo
IM6N<$f)shDbN~PV

delta 342
zcmV-c0jd7L1FQp(JPN=701m(bYSxJfkwzzfDoI2^R5(wSk6W&TFbqVq|CJOJh{!`k
zDB;b%?y;d&KW_)8Ogu9-HS4k-;5^Rjq^|4Q_x<2(JN!IPQIBJu=XG6|c`?&8EecxF
z-Q)qxz#&YrFnHZ+E#~%VK&s9aZQFMA&lFG;OgFVwoV65);?a~Bw&{A3RbsXN9>_U=
zv*_)paJf#?&E=O%nQ|U6rj+DQleuFzFRatg1<&gZR6}U|57LNJHbA)g5OhtBUwK{q
z>>snX2)My{5PS@Q3PeLl3F;H+l%%7DD~4#Cb2x@!@Pnst#2C5KrzO|Br0JdOP2cyT
zspBC^Wi1oFz&PaJ1J>G3(RV%7b<*HL5W{p!0z}meFC8p0fUDoOEyp%ZBNuCRmP|Em
o(>@SS+hWo4_}*YT?bqw|2Rc_Hm#J1q(EtDd07*qoM6N<$f`#6ts{jB1

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png
index 760e4d9dea22b49497d61218ce261381d3014f45..885120f4e37aa90b3a0b52adfee7dd6d7cc69cbc 100755
GIT binary patch
delta 562
zcmV-20?qxE1%?HXJPN=701m(bYSxJfkwzzf1W80eR5(vPlHrP?P!z}S!xUwG8MYK7
zj5eAXv!xU<VsVjR5k)SF2!r$-`#t(L5lA+YM6qM-gDm?b`}aD#KfQA9IsbF+(Ifc^
zmRM%FOw+Qg;c$35ozi0p;~Rk2EG5h3a<NzttS|^)K>QM~<Mnzyolft!+pW0G=kqv!
zjuG*FKMcdb4>VmPhGDp_8!*a16e<&?D2n_2*JLt@7y(L#5v87{X#@*8z!C!LQ+Xm6
z#qH<&yDZC9$YVH;qpB*wqLli9PdyI?%<*`9xm>Q->(kRX3L{pCmT8pYOrj`?ZQJMy
zH6V9f=Z`F3&SxaRfXDS*+x~9b&T6%PQobnU;nTxtH2Tbd0nu;MY%^eB3ugrc?RJZ7
zx7#es@E!ld{iE4zez>v|G~n_1k!&^_Y~f6g$2`y9vW#n%7w#6v<@p)TQ(mQI&q&}}
zoY)il45{C*T52>J^?JQ(sR{w9FX31+7z{8%43tgV#G65MI2@8Bfq|`s+p-XU#GoN2
zq9|h6$SHpj_QZiur)i3+*jAtxVxrh1@anpbd4mNmL+5#6zuzZ^q}S_Jeq#Z@0U5-k
z^0L|=hwuWAgxzk>cX^BzI##HxhZiYZ(p3B(3|-SywbSjqzV492^E|o*s1E;ZHWLMr
zbUIxi2m<=UQ<5Znq92S}t%ma*5hxMLOAxw$0h;PA*6miK*Z=?k07*qoM6N<$f^g&y
ALjV8(

delta 577
zcmV-H0>1r*1(gMmJPN@801m+cxRGn^kwzzf6G=otR5(vPl3$CWP#DI~hbhXs8MYK<
zP#SY)%9c{Zh^0k>MU)Ulf<d|+W?^TTyS<O@CW6RTk|=hp{b2ieoZa6!ublI|f6mcY
z@&$}w<J`t$%d%Rn)_%W_cQF=U0n~9GG8&DB!y$o%LHGcohiD$n=ks2#cR8QW*?BO3
z7(`J7kMH|o7zTcz8#*yf({<f|k~?Oh+EueGyIlTsyWJTjK*@0Cc~f222@G+7CIp`E
zb-JA_JO6%v?{qqaYf5n(N7FO{^E}TFd~Z6%0!u|vj>qHabh^7!X5ow$^71s#!<j@?
zRok|4E7U-^<2v$-d^{YGAV14c+^K7S+uv;4nM@|?XO&!ix{_u2hLSIS+$gU~ozi}8
zD=%$`1qi6uYh<}xCP{+t_#fsU)oS%aO7@5WxA(VXu~=XWG2ZRcH2sw%Of?^vHHJyk
z1H^q=q$T%AU}_96@YfU(_L$E~rBW`Jr6)=HE)^~yUW+)ENRosWqM@|gW4xJv_#|$(
z+s$SpJPO!an3e@68jWDW^E{f3octG|PaKHoIF3;j+XB>rkLLvf)i4b78w@c_gJrq(
zdcE0h1VJcta|qo;7=lTm(%K(~upEno)oRT)S+o^#v`}6TFOpwL*YJN(3|-f>Mzitu
zwn7fevbZfkb?E(mpXYeeXfy#V$8oqHo}wt?6aA!=N+p~RM-G<{j%)q}CK)L@Y}t~g
P00000NkvXXu0mjfA8io3

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/external_storage.png b/src/main/resources/assets/refinedstorage/textures/blocks/external_storage.png
index 9a49736d2d9ca4beac4460bc02ba38b65541b508..887a3e44b6e0d9f95feb2f098f8b169b3c177372 100644
GIT binary patch
delta 556
zcmV+{0@MA+1b_vQJPN-601m$aI0aKAkwzzf{z*hZR5(v1k`HU*KoG_E3zTvk*6K;Q
z(q6H8idY+Ct(u56e@?^@B0*9_EMh4kLBtaL^7q@#TV|N-ytg}<S+N2k7D<bu^?LoG
z5WPqEcff8WDPb5cmrH>i(!)2%zO!?7KA%sg(>HcJ5ocLOCP|XR;gBY&=X)Xug3r%?
z&ooVK+m?x=Tz~^0$>?~r9h)$YzdX+q7(C0e5a6cPl(g&qvmHn6NK6#=`~70E5Lg_?
zNt#S2lb4qlUDxrwUXS4Q_4WDrnZUB99QqZ<j^hZ|b$7cRRdI%<Y29wO)9Jtid=fXC
zP17`XyZvUfac8cW&1c+&#xzZG?RL9=)oL{w4T4&&_E%v%9_O6NWGpBV>Goqg8jY&e
zYQ0|1{lmip0{r9S<7ha71KzARK_#256!iQ3ySuyl`};o%1mIS|FbxRX&Bj7tjE!&=
zG8+UpH#ff(ApKIPR4RB<a;EQV!!X2fIAnwjl+IjTT@{PPQmIrfmkWi$PlfA$>+8W_
zz%yXbkOf_1*k};^P`J3bK$*t~E-x=hMF>_aUGE95^L?KV%AT?`*-uRG>G1M>nvH`7
zS+L9NP&erE9fqMFkn%kb^BF5K2f+!JLBBtcC3y?phXOPx%B0BmsTKr*&)$4K*EL-{
uJu%G=H&P#-{{x(oLspeXnp~O}*7*-r%G96BAqvm{0000<MNUMnLSTYZxeCt!

delta 498
zcmV<O0S*3u1;+%CJPN@801m+cxRGn^kwzzf#Ysd#R5(vPl8uV$Fc5|FPP>$ftk|Ee
zKX}Dbl(M9hP+2S`v=mW_Zzjs!y-#+(N%!6pCr)P0%tTMr2gorkrgd4CM+aSK_5u*q
zLdo;|a5yNe@A@kkuETA(-ENo5<%*pz_`@)eY1_8%`>yTMELHpczOL)eK@w+K>-Bnn
zv-t(-?9kD&KU>?RX{s=Iz!h}1waeA=`}@!Dudn5DIi?zi)9JL^?G$FMZM)Vs4GwM`
z$B)P3`Ftix%rw`?N}08*)k-lv2!bez;3Y{CMj@Za{Z2s`hD4$`3W9kMgtOUfy;-Zx
zcEhYshtY`>nQ*_~qcCdfn&1dY#i3e%EEdL?>R9~;|K{95d^uH>so;S3#k=Ar9LeaS
zphsy8B&k1EZmw*{PZu#}LBTwn=O4L<Q|MA;60MBE)rM+gBti~Ni;}U5pMr#toZ1=&
zVvG8D&RLE>5slE0mGAqAE$NXY4~1_xlPB>H^djf`6E&Sqvn)ezaA57_gi!`vZ;bB`
z#3cw>O(qi#uJ_Ln$IsFf%a9e{HIjbQ>6=_B-SIvgph0maMNl2+PHel~`kt>|US5Ic
odEAfv&4Df>m`_6B$@09{zi}fIS7}C>pa1{>07*qoM6N<$f`2*ubN~PV

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/interface.png b/src/main/resources/assets/refinedstorage/textures/blocks/interface.png
index bbfb4846d78c69392d44bd6cd71e0ac43de9dd23..c8c4c4a914d1bc3101d6482b5adb893308817fdb 100755
GIT binary patch
delta 21
dcmaFG@``1G4c9>i2EK!gJ0@no-RP#m1OQr?2m$~A

delta 21
ccmaFG@``1G4c8$C2EId#q8eTe8{Jfx08i2eY5)KL

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png b/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png
index 1814c6dc3f6330c82e506205dcca29a4288efff8..f02eb6e2bc7d3217b8d8e4e0451b13837c9e8a5f 100755
GIT binary patch
delta 451
zcmV;!0X+V(1(yVnJPN%401mwYNBfYikwzwe0hLKaK~y+TO_GnQf=~>`&pUN7O9}}?
zl88hS2}8sXLqriNq{r#cea-tj?jn9}V{YGeraS5kA~e<-$4Qc02gH{cdjUjaO^Ko?
z3`2#sP5S`-qks0#=ktEQKhW-u-}gP4x~|){ZR*Ake04gVZns<0G~{%m(+{8lB<*#7
zT|>*ZtE$rXeTBjUi^bA37b5eyDIz|$EX$%Oj>n@ytE#G-n&|ueK}H8E_VfADi;iVg
z?RGomd0w99Of@ZlBo6lVdgJ7Ik*2A)_tgHd=PYVu2AVCG77QGT;3L9uoQ-l_m(uK-
zP5a4F<48o{fUUb#j^m`+e*tV5QXss4F#;h=Q<nmJV@KzR-4JDr@n4O@i0GYO65F=b
zdc9_aER-l+WhCr$Ho9;PSTtlsAC^rG(eL+{G#@?k<acpeOu_j~3uReW5CrTS-gFGu
zykbQlK!dEv@WKgl2XO+O3Va_8SSx;b3gKWZYo$l>kKB&|(4Y*ei=YmmJF&wq;b0o3
tn$3QIVHk{oT@9d%fb&Uc82T}cpFigq5g#|2zC!>2002ovPDHLkV1hiq)fNB%

delta 606
zcmV-k0-^nv1hEB>JPN)501mzZ>O!%=kwzwe0xwBKK~y+TRg!&c+E5h6?{`wugix!|
z5)~(g5D`&CIz%Z!aWyuEwcldfSJ=R@`o{j)*oLd^2iV-EuJhelCYvT~=wEw`1J@_N
zb2+(r&N&G;Bm#vI(M?37@p$~csc0;UH3nffy0L`A;ZP_<5V>rw0I3C4Q#DOf6s3TF
zI8l(Rs){F>OeUAhWiwep6o@2A>2%s-isyN+Z*xI@|2?nQ%zQqN*Mn4+j|D*>2sD5-
z|8%508>^*B@%eO%TH4`uyHlxDFc>5VS(bSZuarg?AC{HYvi)PVrP9(t@nQ<l@mQ8I
zlVD;pnRK~ar{!_^)3WkeZw`L9=POWu{h|ZxXtnQ7CznVhe10GC2mF}jbUKSK$CdW7
z*3qxVe>y+cp#IgUca2)tID0+gI1YW?ZjN9UN)H?d+N(*mt9O2_yLYMI80T+q?RGnC
zhx{SI*CdY2f;ZFZjajhR(OInPJ>$G_3&T+&!K1*zIl_@J%d*9Hlgc-}vsl4@^gp$}
zadtU_As&l691en6I6~Z?Hb&*%vW<e}`XAeZf${Kq#xN`n8fHS%G!7eUzA=2!TRi$W
zf83fsF+l<<LtVR`vM7i|XqqADEs7#VQ4iktPcHlU=0Ld`Zpk-yzyKS}gkc!`9hkr{
zfI(uTY>?H8uvsh?<a^W}3Z#%p#IpOFR}zBwKTL^&fRi@^{UE$8BuOIn0)YTc(Zpi0
sLTG>)Sock#%T}0)2OCkFi=wQ50kVXF=O<>r_5c6?07*qoM6N<$f=eMHVgLXD