From a234949b8cfbc9623a412b5ea7c31fdddc9d75a6 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 15 Apr 2020 13:03:37 -0400
Subject: [PATCH] Visual tweaks

---
 .../blocks/distribution/mass-conveyor-edge.png    | Bin 0 -> 503 bytes
 .../blocks/distribution/mass-conveyor-top.png     | Bin 0 -> 513 bytes
 .../sprites/blocks/distribution/mass-conveyor.png | Bin 0 -> 412 bytes
 .../world/blocks/distribution/MassConveyor.java   |   9 +++++++++
 gradle.properties                                 |   2 +-
 5 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 core/assets-raw/sprites/blocks/distribution/mass-conveyor-edge.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/mass-conveyor-top.png
 create mode 100644 core/assets-raw/sprites/blocks/distribution/mass-conveyor.png

diff --git a/core/assets-raw/sprites/blocks/distribution/mass-conveyor-edge.png b/core/assets-raw/sprites/blocks/distribution/mass-conveyor-edge.png
new file mode 100644
index 0000000000000000000000000000000000000000..53609034331f98c7cffd50368544cd54192982bb
GIT binary patch
literal 503
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zH+s4_hE&XX
zd&e;EP=JWbMei_2$Ag;|Ux{>h6%xtC%DUS_%ey0iY2x4XMRzV=ipY0)`2SdabJ+Jk
zpMF_>zkT@x`^9oLfi#9hHi0d7-}5M>?!M3Xk6CHi!)8XFa=RLXhJ||V{A>niwt@r<
z&1)LY9(ev^`n`MhY5j@^7{b0@{&0{XtoS^LEPM|n#lD{akzZec$j`GM&gXN#&m82}
zuKb`o;)n^*yocvN=3RLTlyBQ<1{6?y*2d2!kj}t-$Ewe)!7=89NP%kPfu%K!*_y1&
z1Z;R?Cmg@XiXy6$Cb~nk={+NJg-q;$Rv*UjNvtua#5YU}I*=5`xVn>-N8t>^A!Opj
z@1~|b`Wh#a!X{ijqHubr<F(7pAbynBgrjQ|R(Cp1D{fx1oc(8`+l23|e+{n%HR+_W
zM*8w>nj@WJYkPv<q)YMu!#(j3RLg!hg*_-NVH7uFjqwyK(2PG2<;B<?$qF?1%;OhK
xdMR8xCh0r~+Sjmk3X|Aot_WY91W+h{V^v+S-dE12I2IU_44$rjF6*2UngBx!&Y}PS

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/mass-conveyor-top.png b/core/assets-raw/sprites/blocks/distribution/mass-conveyor-top.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ecc636e9e6690c1d7fb2e0a4c3313b23c548009
GIT binary patch
literal 513
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zcYC@xhE&XX
zd&e>FumO)t;8u3Nsur1rCt7DuZ7?a#a+jJU^>}}1_~Q<jS0}dIl>%yq1BLH~(gi<v
z{rj>%|NixtHp_ilSMq<_u_CXmP;aKzVfm!&z`HLV#TZR}(*5dQ>>Tf9x6(sCOguW@
z^s{UtZ^qf>2~&MJEZJ?Wf0>q_44L$QS4FE@&g6H@-!8Q5e=>WHt;s|4n~pJD+oFV*
zuor0F@baC|zFQ<`s#*&RkZM(HDZREd;i@mk-~Z2oHk?vxng2AFE9`2^l>58%SXXB_
z-Re8PG~uSN$KH1jgEpK|TN3}bSTiC_*lU@i9_#50r<)e%mL^>E)tKA9OGIZA=R)O^
zwu08))6cBi!l;qgaJs>^DC4~64u#Kx_Rf=y=Wi7BK6B^L(vBr(!gokapYT&&&z(K}
zU7~{Uj7k>elMBu)mN+%PP~&~jidT=eAM1_0bVl&bER9n#N6+qTIwN^!p508#Zgvwj
zBhh7iPl8s2cHfucf61Gw#VdPZX~1gn{aYVQTynZ$&!^0v8`yS;tojwos`$KNYTTN_
xQ`1XJ^wv-7JP|VS9dk%`(Mc9~&;uD_rR=9UG$Nkt4-f_kd%F6$taD0e0sz7=-b?@h

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/distribution/mass-conveyor.png b/core/assets-raw/sprites/blocks/distribution/mass-conveyor.png
new file mode 100644
index 0000000000000000000000000000000000000000..8615a8438297b2a99319f1868dc7876c4ffe0e7a
GIT binary patch
literal 412
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%z!#rIaLn`LH
zy>`&+umgi@;Oz6k9-9B=>?qU!)x2whlc%w$;>*~Ib4HV0E2dwv+_Pt2tu0SY-Jbrw
zAI(22q~`f9W`3Oi{MxkDj6M7JUR)Lqq~>qUU4B0<A^LRh@{5eWciyRrvU^~6ZnnJK
z{CVxy1HPH>X)BUvI>OSyDIlz%=HSyXgTat7Y0wH>uCcj#|3m)S<Co9tJGA_^&bQN*
z-?0DmT9Dr&@@l@S>l~`Pwk>uqYv%@_{|{%c;JCeW>r->f#d_fvxO2UM!Oh_5>gTe~
HDWM4fq(_su

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/world/blocks/distribution/MassConveyor.java b/core/src/mindustry/world/blocks/distribution/MassConveyor.java
index d48f954033..5e0c52e3a0 100644
--- a/core/src/mindustry/world/blocks/distribution/MassConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/MassConveyor.java
@@ -118,6 +118,15 @@ public class MassConveyor extends Block{
             Tmp.v1.set(- s/2f + clipped.getWidth()/2f*Draw.scl,  - s/2f + clipped.getHeight()/2f*Draw.scl).rotate(rot);
             Draw.rect(clipped, x + Tmp.v1.x, y + Tmp.v1.y, rot);
 
+            for(int i = 0; i < 4; i++){
+                if(blends(i) && i != rotation()){
+                    Draw.alpha(1f - Interpolation.pow5In.apply(fract()));
+                    //prev from back
+                    Tmp.v1.set(- s/2f + clipped.getWidth()/2f*Draw.scl,  - s/2f + clipped.getHeight()/2f*Draw.scl).rotate(i * 90 + 180);
+                    Draw.rect(clipped, x + Tmp.v1.x, y + Tmp.v1.y, i * 90 + 180);
+                }
+            }
+
             Draw.reset();
 
             for(int i = 0; i < 4; i++){
diff --git a/gradle.properties b/gradle.properties
index 016a79cbfb..bd308f53bc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=bc7c6ea8654fa1d476f228a62327b2fbb0085b2f
+archash=2b64b11475b00658cd99050063e88bec31064748