From a226cd390cc6f16f227fb0c3f8d220d014c10033 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <patrick@queztech.net>
Date: Thu, 30 Apr 2020 21:16:19 +0200
Subject: [PATCH] Cleanup stack conveyor code (#1946)

- removes now obsolete adhoc boosteffect listing
- clarrify comments a bit more
- monospace align some code
- retexture to avoid shadow conflict
---
 .../conveyors/plastanium-conveyor-stack.png   | Bin 1503 -> 1435 bytes
 .../world/blocks/distribution/Conveyor.java   |   1 -
 .../blocks/distribution/StackConveyor.java    |  11 +++++------
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-stack.png b/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-stack.png
index 81e859b8fdfbed7c73921aac50b97c545a6a3280..8cd2516e5cf12916fc6232e81b9c51cfae2bc452 100644
GIT binary patch
delta 1295
zcmV+q1@QXc3!4j&BmrfSB_Mxx94id`XBAlj0))hJc%E~2aF?GF-Se`?V>|I@8c#zD
z5K@%{*v<d{TkaR0K;&Iw(Oh!&cv49vR5a8d&ry?4`@NrVcH#R$?yemHqKG;kpLw3+
zE988eAnBC1N4b-J>d{lt*>O=AZDm{S9H*zE7!Em|->#hVYPxgh{H=c;b~m@9>+N?E
zfH4^QVsK$biXLyZRpRlh_$9n!+=I3x#<Jh?96NVyz5(yrdV`&>r#wDF;e0*^<Tn_d
za^mOMZG`SEqT9+39ROea{d14q8oJgzysIe#sq9XtF0Skr1_I6$_q2>6_^~(DRtk#3
z#SX>>*lZ}>QK0~|7bSlhRB6%Nb*By!Q<y<ehtNaZGK~^S=zyO<2MVnqpkcVEV5Nh#
z2ywXDLVMk^*XyKMc@Rb-89LSt?~8jT{F8E3w3dY~vQMvA!LDF2Z8-_%?2S<%gw}~E
zZ+v%gcX8wIh>c*7H_QqLt8a&j#&nCVxOt8k$38iKqz1`26##!Ctj#cnA{g+QB2y+W
zAqWw0RPa+_d59@AFhI;<kXzs;#td>a*xHyQw8sVxhZtK6h~Su`fEpwU$V!P3KavzN
zR5@~T%$!+Rxp2)fr_4EL$+kyTiIRjRi-<~*s!@}&W))Q}T1zMqTNsyI#1$>2)QUwb
zR9DQd7*T5rEw+EuxaB5ITWPf;e0u8KbC<5Y^g6<b1L;5V5I1y`Q727=(oB<Qo-%co
zSr=k$#g!JXykzMrt6o_<S$$-U-Z1x?H9A={#?l@qH`X8)xu_u9PS`jDV<8b37h?bc
z9gH)tlu|I}j5A*Xl7a(RBQ|md8Dn5DO$xl|%H55*m%M*DPT%4!e8ikH>VASbXVjg{
zz31%-YoqQHC2oQ&3k_2r7dAEwm|BBY+ZO-0c7LnjpQ10+Z6Z)|aokUF!<q5L`Ky$y
zbs^x|%v?3s&JKHF!k_+)HD-+at~DQ7=kCq>wsq#+ZVtO2)h+hB9<$nA>=1oyX2-73
zq&A<iFGPP|XRog5u)6ipyUf0Nud3TJBpoH`S#Zr9rC@6*Lz*2O3wb<CZaD1C1Gej+
zJG}A!gPImHd#kONX}IyMqxUAE<Svcpb@oFtW7inOeW>=hu%}p|T!zAx?d-yB1b{5<
zvrYK48-u!+Q5UWd7Z(+$;b*YB8}3)wqZ}gtNW_1OI{JLX5srx+PIB0vq*24p*|fBV
zL+OH2$sa-R4kH;jeXW^oXFl<6<LJFgo-yMdDAIULLE%<w0kgOk;667;wbDbbQ+jX5
zVwG>I-4C(96}@EN;>`l!0lQ*}8ZOLl;@uB0zlnE`%zMi=%OqTj70pj_E?BnJeGt2y
zai4!A9PK<aCoR=faBxl>ndL6kJ_Fmc1q82%yFnVU-Jzc!qrtt@@=oi)Jo_>F5ySR>
z*Y0-T((}SP_Y>B938Syp{}lb0BK%vlMsdFZ8Tr@$ZVm_z00006VoOIv05t$P06z_0
zf2#lh010qNS#tmYE+YT{E+YYWr9XB6005Ki1PBZs5+@~!BxGa&006g>0R>%dOtj47
zCl5&yRKr5+f(GUYTnUkhfewIG_Ta!o!GNa$82J6ze&8HnZugwQ-0nH$*^pezsTKvu
zB^))?k`w~O7>r8|uA+GGRz`!OIvx}a5?VLOM!_f;1pxfVM%pC3Kmq^&002ovPDHLk
FV1h3;Ul#xX

delta 1341
zcmV-D1;YB93*QTnBmtI@B_My6<0uUMXBD#q1PH`(#Os{d!7P8Su;WV7l}uH4&tIF^
zU>Ss@s|RuOpTC#;3s<1%UE(6S=In8$nrcuC#2?qulTZ7(uW)|C`vcuw9|A}beLP<C
zJm)Lu{IQ^<linWbuJn_SoQ%jnY#nW98=v#!WE8_er}N#_bDgF;b<Te~^povPt*7@?
zV2r`w7lR8k!c=&Q?Gle$aVI<}W}Ad&l(;GBbKALV_+-3m^kh4)Cp|uz!ufno$WJyp
z>BLX;cx@9NB%+U<A3ntHi@(3_Y`4~swdSFnrVLAEcPe#LWsfki!IW_?%V-5RV_bHt
zXaW^G5F0?Vp>;=<%rSo#B^so(XzspKhlnZ6P|%0aL)<ipCDhPidYIiBtx#f(!$kom
z9jHZ+!zBytee2$@lVImTm>CGnXyf?Q+-Jm}X&0ll%yo&pT(*K-!F(EG7;^T+EC535
zv?*`<?&j|N#@_)Ofgo=)3lvn}4i=5+!?)tbIbt6B<oppDRK|bF04BoT3}Gk&0iP){
zW%4D2LIgVs@KHz}VhRli5OWyh7O;tkgc2m!-dIy;&kY<7GExhG;Fx0pG&L%~N{Qh=
zB?){;IdXE$oVl=YWz8|C%sJ<hEk|jIB^55Ylp>`Tl_*JAvJ?@iqBYcr6vj2z;;PhI
zRk5jpwPLkmhH8HcEw<FS<yM-s+O)%cdg|PBFI{@=I>Lwp;Xm>yZpf%ZCr!B0Op|Ax
zWy-8m7kq8Sl@_nO%92%=UZ|a@KB7iX$h}96PSgyswC9x%)Icuf#)2%Juwe$oLLwku
z3;{TFFwDGAO2Lpb%zO<93JySx*uWWNhylSgDe$5TyAOZl-s0vseG9kn3OQ%c{SM@u
zL3bkeBW|CdHgs2%xB;>#G@JUkkk~L`iUv`uNk84YUuE!z(HHtQ;V8K}?kBmSW_)q|
zsx^x)I9!{VRkC(=$b|_%`4wqQ824RiUP<Tf#rw8&rrjP6J0IyL``wSJb{0EGuf^=h
z3ax1K8F_ypdYxTelVN@9qxUlV>Rm;)WC%J+rRRcU=BO2^rH<09bS%X2thu4sn+9yh
zL3e25{fnL!B73vd+cKPZ*75a&LZ~7cRXzFH?JG+JnUKE@)luSZYyBvhkv;}-A0j<2
zBo}Lx>yX*qv10iS%Pi@$O(?eqgK$I|x^R}b=_-FHi!aRPJ^|pe|0NhGurH9n(+qr2
z^Q9QK;h+t=blWv~F-SIOdx4HoP>7Mfp#4yuGvtZ%*m!fv%Ev<Y+Rk6K_aTZ&WCyr&
zQNL6_+yqa-dF~LA$gnUzXxvmQkT+@ln#1Wp>mlnby|+hkzay=C>mKGBW<mC`RTF1V
z@qB+1{LVYvFwZm(G3Q97QA2%d)j~Ra$1~g;*Ldd{{&WTmvtW3nkvB=i;!=0X-l6$A
zGTjbM+7W3=T2M+siJd5}^)4v?%lZzH9hq0eDI$&7?r_NItJqoZ9to!lupguAVUPMH
zKI|U({JeDTcSu8DNNj%?{SS=r2WnLJF98`K<-rt>Ewlgt00v@9M??Th080Q<Wv!X`
zlcWS73=k9p4l^Qm0{{R3%9GFpU4Ja(#w&7A<FfSRAxV^Ipg0O}S&mB#=7^JrB&m}I
z$OWvj2dNtZ)C6>K!0*TQ)O7&11cxi-o7+8SFt>Y-GaHhf3y8^TgmM5$A%H8DQ>vDU
z((Fg98eG|M@K#2HqB<TF4H8;6$wt8_7zF@kK2q2J^q_kH0000<MNUMnLIPldkBx)v

diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java
index e530a1cf9e..b8d045baa5 100644
--- a/core/src/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java
@@ -52,7 +52,6 @@ public class Conveyor extends Block implements Autotiler{
         
         //have to add a custom calculated speed, since the actual movement speed is apparently not linear
         stats.add(BlockStat.itemsMoved, displayedSpeed, StatUnit.itemsSecond);
-        stats.add(BlockStat.boostEffect, "$blocks.itemsmoved");
     }
 
     @Override
diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
index 6906c14620..d290a18db1 100644
--- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
@@ -58,7 +58,6 @@ public class StackConveyor extends Block implements Autotiler{
         super.setStats();
 
         stats.add(BlockStat.itemsMoved, speed * 60, StatUnit.perSecond);
-        stats.add(BlockStat.boostEffect, "$blocks.itemcapacity");
     }
 
     @Override
@@ -129,11 +128,11 @@ public class StackConveyor extends Block implements Autotiler{
             Tmp.v2.set(tile);
             Tmp.v1.interpolate(Tmp.v2, 1f - cooldown, Interpolation.linear);
 
-            //fixme
+            //rotation
             float a = (from.rotation()%4) * 90;
             float b = (tile.rotation()%4) * 90;
             if((from.rotation()%4) == 3 && (tile.rotation()%4) == 0) a = -1 * 90;
-            if((from.rotation()%4) == 0 && (tile.rotation()%4) == 3) a = 4 * 90;
+            if((from.rotation()%4) == 0 && (tile.rotation()%4) == 3) a =  4 * 90;
 
             //stack
             Draw.rect(stackRegion, Tmp.v1.x, Tmp.v1.y, Mathf.lerp(a, b, Interpolation.smooth.apply(1f - Mathf.clamp(cooldown * 2, 0f, 1f))));
@@ -151,7 +150,7 @@ public class StackConveyor extends Block implements Autotiler{
             state = stateMove;
 
             int[] bits = buildBlending(tile, tile.rotation(), null, true);
-            if(bits[0] == 0 && blends(tile, tile.rotation(), 0) && !blends(tile, tile.rotation(), 2)) state = stateLoad; // a 0 that faces into a conveyor with none behind it
+            if(bits[0] == 0 &&  blends(tile, tile.rotation(), 0) && !blends(tile, tile.rotation(), 2)) state = stateLoad;  // a 0 that faces into a conveyor with none behind it
             if(bits[0] == 0 && !blends(tile, tile.rotation(), 0) && blends(tile, tile.rotation(), 2)) state = stateUnload; // a 0 that faces into none with a conveyor behind it
             
             blendprox = 0;
@@ -195,7 +194,7 @@ public class StackConveyor extends Block implements Autotiler{
                         if(e.link == -1){
                             e.items.addAll(items);
                             e.link = tile.pos();
-                            // ▲ new | old ▼
+                            // ▲ to | from ▼
                             link = -1;
                             items.clear();
 
@@ -252,7 +251,7 @@ public class StackConveyor extends Block implements Autotiler{
             return !((state != stateLoad)                   // not a loading dock
             ||  (items.total() > 0 && !items.has(item))     // incompatible items
             ||  (items.total() >= getMaximumAccepted(item)) // filled to capacity
-            ||  (tile.front() == source));
+            ||  (tile.front()  == source));
         }
 
         @Override