Prevent server sound ear destruction / Particle effect rand param

core/src/mindustry/world/blocks/production/Fracker.java

@@ -1,19 +1,12 @@
 package mindustry.world.blocks.production;
 
-import arc.graphics.g2d.*;
 import arc.math.*;
-import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
-import mindustry.graphics.*;
 import mindustry.world.meta.*;
 
 public class Fracker extends SolidPump{
     public float itemUseTime = 100f;
 
-    public @Load("@-liquid") TextureRegion liquidRegion;
-    public @Load("@-rotator") TextureRegion rotatorRegion;
-    public @Load("@-top") TextureRegion topRegion;
-
     public Fracker(String name){
         super(name);
         hasItems = true;
@@ -30,33 +23,9 @@ public class Fracker extends SolidPump{
         stats.add(Stat.productionTime, itemUseTime / 60f, StatUnit.seconds);
     }
 
-    @Override
-    public boolean outputsItems(){
-        return false;
-    }
-
-    @Override
-    public TextureRegion[] icons(){
-        return new TextureRegion[]{region, rotatorRegion, topRegion};
-    }
-
     public class FrackerBuild extends SolidPumpBuild{
         public float accumulator;
 
-        @Override
-        public void drawCracks(){}
-
-        @Override
-        public void draw(){
-            Draw.rect(region, x, y);
-            super.drawCracks();
-
-            Drawf.liquid(liquidRegion, x, y, liquids.get(result) / liquidCapacity, result.color);
-
-            Drawf.spinSprite(rotatorRegion, x, y, pumpTime);
-            Draw.rect(topRegion, x, y);
-        }
-
         @Override
         public void updateTile(){
             if(consValid()){
@@ -73,10 +42,5 @@ public class Fracker extends SolidPump{
                 dumpLiquid(result);
             }
         }
-
-        @Override
-        public float typeLiquid(){
-            return liquids.get(result);
-        }
     }
 }

core/src/mindustry/world/blocks/production/SolidPump.java

@@ -68,6 +68,11 @@ public class SolidPump extends Pump{
         return sum > 0.00001f;
     }
 
+    @Override
+    public boolean outputsItems(){
+        return false;
+    }
+
     @Override
     protected boolean canPump(Tile tile){
         return tile != null && !tile.floor().isLiquid;
@@ -85,10 +90,16 @@ public class SolidPump extends Pump{
         public float validTiles;
         public float lastPump;
 
+
+        @Override
+        public void drawCracks(){}
+
         @Override
         public void draw(){
             Draw.rect(region, x, y);
-            Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color);
+            super.drawCracks();
+
+            Drawf.liquid(liquidRegion, x, y, liquids.get(result) / liquidCapacity, result.color);
             Drawf.spinSprite(rotatorRegion, x, y, pumpTime * rotateSpeed);
             Draw.rect(topRegion, x, y);
         }
@@ -133,7 +144,7 @@ public class SolidPump extends Pump{
         }
 
         public float typeLiquid(){
-            return liquids.total();
+            return liquids.get(result);
         }
     }
 }