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
zcmcc5J)3)i3S;U-RfYO88Eu|F>7tQLOf5%>D&`fJ7fhcobocY7<H^<^)1~~Kxdnoz
zvfMcP|9|v5@p%qUVv{b$6n(1*@>C5mxgvi)aI*jJz4Hso9{zTGw@#LEQHPb>{K|Qc
zwV%|?R(LsOyZg?`b+0Z4U%XiuD3O~Q{Z?lA@<kGSmUHi~oAWtqSMl>dYwP98%(pLo
z{kB}F!BFB?QbD3ymt6kV&_^Fv|4`kNe5ZMv%CSxNKgn2^=k8;Cf2*o_?)v36c1{m#
z?AV`}OUx~L^!!F{%RAjgw@>lQGQ|J+TikzFYS%TJJ*zdDSHAIEuD9-u7#q_$k?&i2
zlzwb9zZ%BXb?7MHF}52y8g~O1GHel7t(OYPym+T{IiGOw499@>3(j|pdWF1RG|YEk
z=US_<AaTcvgr&_}ISO~&a;m<&>H6y>5tRaNN|ILBc;9zdtNoc=6uM<vtKKI6^$`cx
zB^c&faz1<08>rB7ty43<ro6Dc@bUYO-h>I}XSmo`=eKtqE9qXlqq0xpxSeJF61I~T
zq73y)Yt9<9DM@^osT8cHugD=-5b_~7v9d$c#K7T9;)Li2YR7nrOm5top}gfd8(+Ib
zG<U~?8H*dFRJcxfbqd-~5-|+1EGjxPCo*DZ!CAxQXDriCZgUUqoYbP)-QhKHRp8`J
zX`-RJQQjJY(Gt^Rj)>|mz0&2X9TI+KokU<Zx9+z3D?6U5`9^1MRj#Reb*Fgxy1iel
z4s|fUwErYvUNR+6-M8hE&*b!ZMy1mt#glT6P8D0fC*`Hq>bOYj$l8?Ndj{WUnOa2}
zAG;){ZhlQcZ08Dv+kQ7Jn3EL+CB%~%7-f5m*G~yDc-CVa&orrtIYQa2h)ps%!N8Ym
z&x=!cdv{LXQ*Y^a|B-IZkvYb%>Y6OmugpEO_xW4S?8WbdRr8v3xOs!+#m&rkW<)iI
z-4^@5qpW`QgZYc}ujDEP6cyg_FFZW+<I$h1r>rSed~oYbjOq1reAS7E=Kt$8P3!r+
z&Qw0~`Ma~fx0OD-o5#0X{;KY`-Ey06#l8`!%}G1H?!pqY`5X0J>f_VbuY0*+*Vl`?
z&+MyOzv{M;imd9($bz#nOB1p+ooC6)a#z}T=UKct%e?LN0_!~=|25ANGpb&_c6#QH
zk82ixS6lc*ulITBH)o^d>k>z5SA5&CVR^*Dn6^Vx-@ZAN%hI6pcC+t~Ez-@qrU#0z
z6A%{{UH&kA!*1z!;Wrk`DE;?1Qr~U$tLBJcU#F~J(T({_0uP_Nxn)b6^UJ27lk$!q
z_>?6rYS+%pO}G1)_xQzLuX%=#<uoo;_&7cc%VylXL+pW_x%<{j&g+7!@{cD?&0lqw
zf8&19y(#w}on?B!xI3v+O7Bemqr3bD`#a0~&s3i_JFODaEqd0!NH1dB)mnkwa|`F!
ztH`{yF;>^T8d6Z;Co}V@-c>v1+nZTg)_3f7l-hWA;e7eU2lrn2<oEiZ&2PhBf``A=
zUw>D2|I+6}R^NrM)o?Cef9=1>-x*4OqPMse?q`(zdHsJL9|s=;0|Q%<x4R32DT5`0
zJ#Sq7Y6b=d&H|6fVg?31We{epSZZI!z`!v1Eei*aoRGR|mr6<s0|UeM$&9SAc|Kdt
zJXYuT6bd=)^ty@d8AlA~#Lh;(hR|;h4!9g_Sk5T%<L`~S2QmqH-{%~>^Um_=%?UB5
zSBkNoP?a&gI!T1-h(wP!@47`5AHv+47g@=P@CrqlpL9E@A;HS<=eXM~mAwv33=9km
Mp00i_>zopr053LQ7XSbN

delta 1341
zcmbQueV==R3gfhistWbf9&7OYO&8tF!oqQ+=*a6iHxKI6uiNn0>(W%8(DL)~vu`9w
zwk%oAUif+b{^`HD!xy}WeWbMW*_*<pv$6tsj>uoXINAUA&h-U#hki5Pjg@Ee5UjO{
z`)u=E`^BG)3zkg2C--vQm&yHedQRBq$mXU?&;R@+MdYyK^3Qj#7SCN~U3#wG`pe|E
zzH66%4@u}b_&~gw+xSpOMb}%Q{^&w=8_l%YEooDBXud4Iy)*kq%AV{mDc0-NZS7_q
z`dQ<5!r#p5<q`ic6}iH4DvSE(%G(`z*S&xLyPWOUCTxASaPBf5@6>Xw(%{s7gN+BL
z6zZSOU^P#UDO;VvBx)@n?XY=asr%G3hV|mAQcJdEyxSMt-l2IW;6nQa=Q}2ys#h)~
zR?WC8wKgEB_pmFYn(PYK35Qj=-`2jqw|;WMbH^Ey9A`2f|G07|{mA@G@x@!uly>fk
z+13<uutq9LqUhTZ9R{b@TQu{3zkBxX&$0WA(v1rF#@r$y_xZ$nUmo86=$K`a-0vrU
z1f@cb)t_WgJ9LjHQG<zbzNS&?C)E}w7Hh5#fgW;6T)Z3t#S%}%HgtBh2&vq-7ZIFs
zo>zv?D2Th^!Hi@^6H~1NUY!r^RXJ-sEQ^ZH%-Ol2AoZ-_@-vptC+WIpcB+c%?VO^t
zRBWn-XT&BE!Ig_luXKnUGrj(3)s?8wjVqhBCT&e>%c|$r-F9Wi)38}vZf!YSTlMNr
zv3_jTTdPAI%n$89Y2=+);jHev<C4$h^m(bL)&z^!<Q|<Wwtmm4Nukr@R?J;tx5&-^
z#9sGazbiZ&w>+Q9f5k!X>9HoAxf>GMjyNeP#PKj%lo*`Z6X11lg7KLeUJfokhu#|p
zBvU#V51MFxSj4@Xzy8U+N6##3xwn7dvP{45m+#3O$8x3b%6an_n3aT2*}=F;!({fa
z9TRRCBzCa{uJ*LQyE{JhL;FSXUuF+Ac3Qnt-?=cYrtt47({4SBnAtN!H<gv0Xyvs3
zDVpgc@jW&(&hz=ZqrbP6EW0bmXD$Cy?f2dOm1Sbq9_x?3Il;9y<FjOCy<*ke*x1R5
zwXYX{H~Rf5)^%G7hn3gT=S|7aR*0@#+IMM9iO!LaYj!TYF`F&txMO+7<G<bW#FVNx
zU%hQKr{dbjugy*?lq5rKf8Knn?aeZC!hXK1fsgXC|7y&fXvbD4uVkyIBAz|v^@N*u
zHzxh$JFW9_v#-W>_T~Z?sa*xrcD&T8*XY(i^URL%!KVMJ5*i!yCmguUQxoucsl@h&
z3wU>x+%~N=^f1e)ZtM#T=$N=~!QX&+#!ouG+^8r%dFr^+_gm-Uw|-ab@=RghQ5?8G
z#QqM8|G~<40uxVcFtE$G6QVuAJoE3Y!!I3PE56p*yWPETzw+AZ*K*IK(j32S3>8lI
z|5#Hm{O6qY9fR{G{D#jxmIgZ4W?gl%syS|aNBVljbIE@tY&@G2Dwa$%_dN0_sQl!;
zg+Hx~?(+HG63q093h;95oU5_!tDeUH)4%v8%FYZwqN&t-<6Xgtm#c3?zL(=%&b>i?
z@$1C?U#fO*<bM9yQ}V9d!#Um~r(WVOf6oW@tdQ^ejFJjZ4~q2bZed_xU`z6LcVX~i
z@MZ{3T|4u~<RvT$JOU!je8x)U%nS?+rzT%uiLKXpa!k7@;PIv}PZT|;WGt}YDv0d!
z=6TjJxm{)DWVREmYc{d3lxDiZQc`%}{qb*CN*T7Xv}-?|ecLwOV0(3+vGk<5+#M&g
zT8bDv6&tjt2CtgddFhS&8mX9@1s}rPnipBgiSP<VnV)n!s3F11kY*Qj{r{H*)eH;_
O44$rjF6*3_5}E*yjf3p~

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