Liquid total bugfixes

core/src/mindustry/world/draw/DrawAnimation.java

@@ -1,9 +1,9 @@
 package mindustry.world.draw;
 
 import arc.*;
-import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import mindustry.graphics.*;
 import mindustry.world.*;
 import mindustry.world.blocks.production.GenericCrafter.*;
 
@@ -22,10 +22,9 @@ public class DrawAnimation extends DrawBlock{
                 frames[(int)Mathf.absin(build.totalProgress, frameSpeed, frameCount - 0.001f)] :
                 frames[(int)((build.totalProgress / frameSpeed) % frameCount)],
             build.x, build.y);
+
         if(build.liquids != null){
-            Draw.color(Color.clear, build.liquids.current().color, build.liquids.total() / build.block.liquidCapacity);
-            Draw.rect(liquid, build.x, build.y);
-            Draw.color();
+            Drawf.liquid(liquid, build.x, build.y, build.liquids.currentAmount() / build.block.liquidCapacity, build.liquids.current().color);
         }
         if(top.found()){
             Draw.rect(top, build.x, build.y);

core/src/mindustry/world/draw/DrawMixer.java

@@ -22,6 +22,7 @@ public class DrawMixer extends DrawBlock{
 
     @Override
     public void draw(GenericCrafterBuild build){
+        GenericCrafter crafter = (GenericCrafter)build.block;
         float rotation = build.block.rotate ? build.rotdeg() : 0;
         Draw.rect(bottom, build.x, build.y, rotation);
 
@@ -33,11 +34,10 @@ public class DrawMixer extends DrawBlock{
             );
         }
 
-        if(build.liquids.total() > 0.001f){
-            Draw.color(((GenericCrafter)build.block).outputLiquid.liquid.color);
-            Draw.alpha(build.liquids.get(((GenericCrafter)build.block).outputLiquid.liquid) / build.block.liquidCapacity);
-            Draw.rect(liquid, build.x, build.y, rotation);
-            Draw.color();
+        if(crafter.outputLiquid != null && build.liquids.get(crafter.outputLiquid.liquid) > 0.001f){
+            var liq = crafter.outputLiquid.liquid;
+
+            Drawf.liquid(liquid, build.x, build.y, build.liquids.get(liq) / crafter.liquidCapacity, liq.color);
         }
 
         Draw.rect(top, build.x, build.y, rotation);