Cleanup

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'
 
     }
 }

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){

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);
         }