diff --git a/build.gradle b/build.gradle index 91859fdd54..5ee2870b24 100644 --- a/build.gradle +++ b/build.gradle @@ -299,7 +299,7 @@ project(":core"){ compileOnly project(":annotations") annotationProcessor project(":annotations") - annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:0.3.0' + annotationProcessor 'com.github.Anuken:jabel:40eec868af' } } diff --git a/core/assets/sprites/fallback/sprites5.png b/core/assets/sprites/fallback/sprites5.png index 63874c502a..3808dcce75 100644 Binary files a/core/assets/sprites/fallback/sprites5.png and b/core/assets/sprites/fallback/sprites5.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index a6b9f62a6f..4d2be7a3cc 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java index 384331f56b..f1d45bebc3 100644 --- a/core/src/mindustry/graphics/Drawf.java +++ b/core/src/mindustry/graphics/Drawf.java @@ -97,17 +97,15 @@ public class Drawf{ } public static void liquid(TextureRegion region, float x, float y, float alpha, Color color, float rotation){ - Draw.color(color); - Draw.alpha(alpha); + Draw.color(color, alpha); Draw.rect(region, x, y, rotation); - Draw.reset(); + Draw.color(); } public static void liquid(TextureRegion region, float x, float y, float alpha, Color color){ - Draw.color(color); - Draw.alpha(alpha); + Draw.color(color, alpha); Draw.rect(region, x, y); - Draw.reset(); + Draw.color(); } public static void dashCircle(float x, float y, float rad, Color color){ diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index 964979c031..8824d44d34 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -103,10 +103,7 @@ public class Conduit extends LiquidBlock implements Autotiler{ Draw.color(botColor); Draw.rect(sliced(botRegions[bits], slice), x, y, rotation); - Draw.color(liquids.current().color); - Draw.alpha(smoothLiquid); - Draw.rect(sliced(botRegions[bits], slice), x, y, rotation); - Draw.color(); + Drawf.liquid(sliced(botRegions[bits], slice), x, y, smoothLiquid, liquids.current().color, rotation); Draw.rect(sliced(topRegions[bits], slice), x, y, rotation); }