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!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z_`)V
z#WAE}&f7bNd4~c-TrPTtIXWKPwD?M-!>f=;E>_mv9$MZV2}~3JrZ2j4`BFr_%ftW2
z>YKy9|M~RG^84+}C)h8Rvk9azB(e!?x%-|+A$9kC#(&I8%N{l}@|4@v7&I)@Yv*S(
zII|TbU}#>`aQ49SAJgyMvrp?+Jirk4_40><3}MCRL1f|k4+j~<zMlY*UtfU8&$A!S
z=X1Z$9OT!o{GdDHh)In>!^3kR^R7JoaFC&Gr&*0bgW|I`el~%02If0feP#`gF(*U{
zR3i^8tzpd8WL+j;!y7x{_(fI}QJpl=9imO|8JR0&Vh^<XFosWJjX5R0VOr3Eq%g+S
zovb_xXBZA46DNK*HSN*YIFS@K;p!2E(>oonU2X>Pqr4^@U8AtN({WmH^P1)CKO5a9
zd}sY@crB<&Cyh1ImuJ%)=@eVr6Z|G!k_Q;>iHD$C_PZ(UL177_xDjiNr&xhz{DCMh
z#_mYgJ^C7F9=~AHOX1ovN#{Y(zJ{$+n8Y@7MfmC@fI|5jtLlRFzH&aru?!3h44$rj
JF6*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!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z_{Df
z#WAE}&f7bVd4~;nTmrYU^HsITEIiRVduoG8X_mXxB&o;yL&G0;xV$>C<*pP15>WVV
zC|&S#*S|0O^Y34OX|vp?btV6&9V_z63iW1c9hOhZ4!rx~QH;^lC*7~^#m@0wb}K#P
z!^ETWO+U*f@@AY}o-oyy!;;;``j=_>$&g9^cU82i<xGCZ{Ov-^{wK5N*qS^vzv&pm
zwJl0`344L&4KLpb?Yl*CrmD5D>=wysRck4|wlv|YFUQ~i&w@6bQfrz2G?pvuYRi=S
zyYyIBXE@#JJHIsHrmx4|cMpR$oKag6|F>8(B23t8nWG--=?tfv7Uz~GT=dnL+rCRg
zXA|c_<&(C8*51?4tlPq<k=Jm#!L}&lyyp&u&w}>Ola1$Z6!boG=g`uQC1=8SNKBvb
zQ(n)VJ^fvxg7Az=7Uh!*&McNVHNQ~feb9<mkG3D{jl6V5@XjoaQ!+=-?rb_Ed1s#8
zOv`R|6E!2zWqeP9R)lunm*RiPo2tbtdtqt7YVrMBA52_wx?#_!%%2<Bc8IL{70Rmk
zykTnGn!;1lOH1_DPwPApGVvXANO#dm7No#u5G!Rr&7l$TWPgA#NZ8ZW&t;ucLK6VO
CFy2f6

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!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z!>J~
z;uumf=k2wFUWXkRTmxsH5BAXfH)ltg{;%d;6P!GaMHOGhR-7}M>{>DXlI5N~`)X}@
zYU=j%_x))8Ss^vgcQNzh{O8xEt!C`mzxU#@aK@hf^S9<MzaN(neY$t~MaJJd?^H$E
zJ+M1BTV8Jdy!Pt>-^};470ELlVd>x$5LQrg@M)OAV91y>Xaz3U*j&B;A^+_0%jfkS
zT7FyS+v&=0*nfI0$ZrvOHDA?r4%J=T7Q2_VbHm<?%MNF+;JCeW>r->f#d_fvxO2T3
Q7#J8lUHx3vIVCg!0HjBgxBvhE

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