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 0000000000..5360903433 Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/mass-conveyor-edge.png differ 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 0000000000..8ecc636e9e Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/mass-conveyor-top.png differ 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 0000000000..8615a84382 Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/mass-conveyor.png differ 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