From c4803d29da76af6bb175e3309ad1cdf51a877c99 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 10 Jun 2021 16:14:53 -0400
Subject: [PATCH] Pulverizer texture cleanup

---
 .../blocks/production/pulverizer-rotator.png  | Bin 281 -> 216 bytes
 .../blocks/production/pulverizer-top.png      | Bin 296 -> 306 bytes
 .../sprites/blocks/production/pulverizer.png  | Bin 163 -> 114 bytes
 core/src/mindustry/world/draw/DrawLiquid.java |  18 +++++++++++-------
 .../src/mindustry/world/draw/DrawRotator.java |   8 ++++----
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png b/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png
index f5522cfd11e5bfa291d4ff43d923bb260af59169..e89e5ed5e74669456c7191abe22445e916da2271 100644
GIT binary patch
delta 133
zcmbQqbc1n%;Y3HB>NHOm#}JF&r<bhx4k++2U)b^EU%KAZ2?bq&RvWJfH<>?i-rym_
z@}lth1nU@O0l`o67)1^+`Y`Z+VB1{6zr~Wh=(psCuPGm<9NOPl6mZ`yR-ZdV`Sh-r
qjU|rkD;l&D*q&~`|BPV=<HlvYjQ98r_!t-%7(8A5T-G@yGywp?k~ZQ1

delta 197
zcmcb?IFo6DAumh1qpu?a!^VE@KZ&dp_4MmG3p^r=85sBugD~Uq{1qt-3=B=4E{-7<
z{!cGh^EDXoFb8n${XbK2+vn9SGZGF?F1#18@oaky=P}W%*JN*)m9ffOaU{HQXlgjk
zq`_dahG7xYY9C3i4bM)hHcs{Nsd-Y!s+#2Q_*1xJ|D;Y$N8z0!0WOkS65m9+?Syw+
z(7ns($0D?g`-76hLhD98K828I{(|Y(56)5FxQv(aq3~k`1_lNOPgg&ebxsLQ0J``{
AdjJ3c

diff --git a/core/assets-raw/sprites/blocks/production/pulverizer-top.png b/core/assets-raw/sprites/blocks/production/pulverizer-top.png
index 621e52e4cb60c9cafc9497f5b8cdbb05198b9063..6c2aa6d6539cd8475e0c1aa60cf3a216f17cc8a3 100644
GIT binary patch
delta 290
zcmZ3%w25hgWIY=L14D6D)fWZ^2FBtbcPEB*=VV?oFfhFFba4!cXnlL#n(vSS4@1E5
z=Wlvu2)Mrx6cA2&<}-H(_gp1Wb-$eF$%+qGF0iPZa?JDa<Db7849+cA^*EOK>_~34
z_i;W>7KRTl341;`J^1L%srdK**5rwG6P+{Et~^s==-ME1{YhFqqu|A$n63oI@3(Ko
z#5A2?suEkTD0HCXk!efz4A<$ee_egQw*1@_m+tKfS2$w|wVPtwHb3J3vA2DKb5Bl!
zv+|jLs$UMwvT4~`dT(=um;u*8*{e5GZwLog`D=V@l<T-9bJguiQ^(Gwm$$7DjuJ3w
yckYPZ$ab*ztm3lwtRfFLNlMEK=Iu^&dBfdY&S7$b`z8Ye1B0ilpUXO@geCyvae|fr

delta 280
zcmdnQw1R1ZWIZzj1B1(wu44=g42;D=?oJHr&dI!FU|?WLcl32+VA$Bt{U?!?fq{W1
zz$e6Y#;hd_3=DY%4Gatnk6eCS1gR?t@(cd||38C+*2*so3=EtF9+AZi419+`m{C;2
z3#4|cr;B5Vh5z2kmV6BcJS-D`{-6KR&{C%7j$u9Tw|63eO6%rIM=(EJ9iYw9=hJ*i
z(I`bCL}2E^CTS62eO}=!3ilT9J8}r`b|~4v(j@Mjpv%#?^a#r_{#CydTlPfNOJsK2
zN!N3~RXm)~@^8_v)$in2*T2(0{9C|FxvJ%m#DDHXr!Q!5w?7ONo8&m9^{hfc^T~yA
edry322$|0z_%fhuf-(aG1B0ilpUXO@geCyk0%ke@

diff --git a/core/assets-raw/sprites/blocks/production/pulverizer.png b/core/assets-raw/sprites/blocks/production/pulverizer.png
index 1132418067a54b6e99c0e72282bd9bc37f741fab..bd07997cdf6217dcca590a11bf14e6bbb9b88682 100644
GIT binary patch
delta 96
zcmZ3?STsQ*ii3%Pf#HwD+r<nF42;D=?oJHr&dI!FU|`Vkba4#v=zM$DkdeWF<G=>P
t%7RDtxz!$cvzko2`hHV=6*~hAbn|xqX4IIu#@YuY;_2$=vd$@?2>_>b9mW6v

delta 146
zcmXR~%s4@!o`so#fuS)Z{Wt>y17mTJyA#8@b22X(7#LX69eo`c7&i8E|4C$JU|`@3
z@Ck99F>6U)L4%ifu&eBcS0KRxkH}&M2EIce%qXhi)xf~OpzP`57@~1L`2Yjc3#KLs
vCMPcshs2PC7aR*17)ux(OBfv)8E*YG&dKT&D&b*ZU|{fc^>bP0l+XkKh@mLO

diff --git a/core/src/mindustry/world/draw/DrawLiquid.java b/core/src/mindustry/world/draw/DrawLiquid.java
index 2ea18ae1b1..16cfd14934 100644
--- a/core/src/mindustry/world/draw/DrawLiquid.java
+++ b/core/src/mindustry/world/draw/DrawLiquid.java
@@ -10,16 +10,19 @@ import mindustry.world.blocks.production.GenericCrafter.*;
 public class DrawLiquid extends DrawBlock{
     public TextureRegion liquid, top;
 
-    public void draw(GenericCrafterBuild entity){
-        Draw.rect(entity.block.region, entity.x, entity.y);
+    @Override
+    public void draw(GenericCrafterBuild build){
+        Draw.rect(build.block.region, build.x, build.y);
+        GenericCrafter type = (GenericCrafter)build.block;
 
-        if(entity.liquids.total() > 0.001f){
-            Drawf.liquid(liquid, entity.x, entity.y,
-                entity.liquids.get(((GenericCrafter)entity.block).outputLiquid.liquid) / entity.block.liquidCapacity,
-                ((GenericCrafter)entity.block).outputLiquid.liquid.color);
+        if(type.outputLiquid != null && build.liquids.get(type.outputLiquid.liquid) > 0){
+            Drawf.liquid(liquid, build.x, build.y,
+                build.liquids.get(type.outputLiquid.liquid) / type.liquidCapacity,
+                type.outputLiquid.liquid.color
+            );
         }
 
-        if(top.found()) Draw.rect(top, entity.x, entity.y);
+        if(top.found()) Draw.rect(top, build.x, build.y);
     }
 
     @Override
@@ -28,6 +31,7 @@ public class DrawLiquid extends DrawBlock{
         liquid = Core.atlas.find(block.name + "-liquid");
     }
 
+    @Override
     public TextureRegion[] icons(Block block){
         return top.found() ? new TextureRegion[]{block.region, top} : new TextureRegion[]{block.region};
     }
diff --git a/core/src/mindustry/world/draw/DrawRotator.java b/core/src/mindustry/world/draw/DrawRotator.java
index 0b2fbe7151..5d75b77825 100644
--- a/core/src/mindustry/world/draw/DrawRotator.java
+++ b/core/src/mindustry/world/draw/DrawRotator.java
@@ -9,10 +9,10 @@ public class DrawRotator extends DrawBlock{
     public TextureRegion rotator, top;
 
     @Override
-    public void draw(GenericCrafterBuild entity){
-        Draw.rect(entity.block.region, entity.x, entity.y);
-        Draw.rect(rotator, entity.x, entity.y, entity.totalProgress * 2f);
-        if(top.found()) Draw.rect(top, entity.x, entity.y);
+    public void draw(GenericCrafterBuild build){
+        Draw.rect(build.block.region, build.x, build.y);
+        Draw.rect(rotator, build.x, build.y, build.totalProgress * 2f);
+        if(top.found()) Draw.rect(top, build.x, build.y);
     }
 
     @Override