Cleanup

core/src/mindustry/world/Block.java

@@ -467,8 +467,7 @@ public class Block extends UnlockableContent{
 
     /** Never use outside of the editor! */
     public TextureRegion editorIcon(){
-        if(editorIcon == null) editorIcon = Core.atlas.find(name + "-icon-editor");
-        return editorIcon;
+        return editorIcon == null ? (editorIcon = Core.atlas.find(name + "-icon-editor")) : editorIcon;
     }
 
     /** Never use outside of the editor! */
@@ -485,21 +484,16 @@ public class Block extends UnlockableContent{
     }
 
     protected TextureRegion[] icons(){
-        return new TextureRegion[]{region};
+        //use team region in vanilla team blocks
+        return teamRegion.found() && minfo.mod == null ? new TextureRegion[]{region, teamRegions[Team.sharded.id]} : new TextureRegion[]{region};
     }
 
     public TextureRegion[] getGeneratedIcons(){
-        if(generatedIcons == null){
-            generatedIcons = icons();
-        }
-        return generatedIcons;
+        return generatedIcons == null ? (generatedIcons = icons()) : generatedIcons;
     }
 
     public TextureRegion[] variantRegions(){
-        if(variantRegions == null){
-            variantRegions = new TextureRegion[]{icon(Cicon.full)};
-        }
-        return variantRegions;
+        return variantRegions == null ? (variantRegions = new TextureRegion[]{icon(Cicon.full)}) : variantRegions;
     }
 
     public boolean hasBuilding(){

core/src/mindustry/world/DirectionalItemBuffer.java

@@ -6,7 +6,7 @@ import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class DirectionalItemBuffer{
     public final long[][] buffers;

core/src/mindustry/world/Edges.java

@@ -6,7 +6,7 @@ import mindustry.gen.*;
 
 import java.util.*;
 
-import static mindustry.Vars.world;
+import static mindustry.Vars.*;
 
 public class Edges{
     private static final int maxSize = 14;

core/src/mindustry/world/ItemBuffer.java

@@ -4,7 +4,7 @@ import arc.util.*;
 import arc.util.io.*;
 import mindustry.type.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class ItemBuffer{
     private long[] buffer;

core/src/mindustry/world/blocks/Attributes.java

@@ -2,7 +2,7 @@ package mindustry.world.blocks;
 
 import arc.util.serialization.*;
 import arc.util.serialization.Json.*;
-import mindustry.world.meta.Attribute;
+import mindustry.world.meta.*;
 
 import java.util.*;
 

core/src/mindustry/world/blocks/defense/Door.java

@@ -1,8 +1,8 @@
 package mindustry.world.blocks.defense;
 
-import arc.audio.*;
 import arc.Graphics.*;
 import arc.Graphics.Cursor.*;
+import arc.audio.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;

core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java

@@ -6,7 +6,7 @@ import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.entities.bullet.*;
 
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 public class ChargeTurret extends PowerTurret{
     public float chargeTime = 30f;

core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java

@@ -9,7 +9,7 @@ import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
 import mindustry.world.meta.values.*;
 
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 public class LaserTurret extends PowerTurret{
     public float firingMoveFract = 0.25f;

core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java

@@ -6,8 +6,8 @@ import mindustry.annotations.Annotations.*;
 import mindustry.entities.*;
 import mindustry.entities.bullet.*;
 import mindustry.gen.*;
-import mindustry.type.*;
 import mindustry.graphics.*;
+import mindustry.type.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
 import mindustry.world.meta.values.*;

core/src/mindustry/world/blocks/defense/turrets/Turret.java

@@ -178,12 +178,13 @@ public abstract class Turret extends Block{
 
         @Override
         public double sense(LAccess sensor){
-            if(sensor == LAccess.rotation) return rotation;
-            if(sensor == LAccess.shootX) return targetPos.x;
-            if(sensor == LAccess.shootY) return targetPos.y;
-            if(sensor == LAccess.shooting) return (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : validateTarget()) ? 1 : 0;
-
-            return super.sense(sensor);
+            return switch(sensor){
+                case rotation -> rotation;
+                case shootX -> targetPos.x;
+                case shootY -> targetPos.y;
+                case shooting -> (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : validateTarget()) ? 1 : 0;
+                default -> super.sense(sensor);
+            };
         }
 
         @Override

core/src/mindustry/world/blocks/distribution/Conveyor.java

@@ -162,7 +162,7 @@ public class Conveyor extends Block implements Autotiler{
 
         @Override
         public boolean shouldIdleSound(){
-            return clogHeat <= 0.5f ;
+            return clogHeat <= 0.5f;
         }
 
         @Override

core/src/mindustry/world/blocks/distribution/Junction.java

@@ -7,7 +7,7 @@ import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class Junction extends Block{
     public float speed = 26; //frames taken to go through this junction

core/src/mindustry/world/blocks/distribution/OverflowGate.java

@@ -1,15 +1,15 @@
 package mindustry.world.blocks.distribution;
 
 import arc.math.*;
-import arc.util.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import arc.util.io.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.world;
+import static mindustry.Vars.*;
 
 public class OverflowGate extends Block{
     public float speed = 1f;

core/src/mindustry/world/blocks/environment/Boulder.java

@@ -1,11 +1,9 @@
 package mindustry.world.blocks.environment;
 
-import arc.Core;
-import arc.graphics.g2d.Draw;
-import arc.graphics.g2d.TextureRegion;
-import arc.math.Mathf;
-import mindustry.world.Block;
-import mindustry.world.Tile;
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.world.*;
 
 public class Boulder extends Block{
     protected int variants;

core/src/mindustry/world/blocks/environment/OreBlock.java

@@ -1,15 +1,15 @@
 package mindustry.world.blocks.environment;
 
 import arc.*;
-import mindustry.annotations.Annotations.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
+import mindustry.annotations.Annotations.*;
 import mindustry.graphics.*;
 import mindustry.graphics.MultiPacker.*;
 import mindustry.type.*;
 import mindustry.world.*;
 
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 /**An overlay ore for a specific item type.*/
 public class OreBlock extends OverlayFloor{

core/src/mindustry/world/blocks/environment/OverlayFloor.java

@@ -1,8 +1,8 @@
 package mindustry.world.blocks.environment;
 
-import arc.graphics.g2d.Draw;
-import arc.math.Mathf;
-import mindustry.world.Tile;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.world.*;
 
 /**A type of floor that is overlaid on top of over floors.*/
 public class OverlayFloor extends Floor{

core/src/mindustry/world/blocks/environment/StaticTree.java

@@ -4,7 +4,7 @@ import arc.graphics.g2d.*;
 import arc.util.*;
 import mindustry.world.*;
 
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 public class StaticTree extends StaticWall{
 

core/src/mindustry/world/blocks/environment/StaticWall.java

@@ -8,7 +8,7 @@ import mindustry.annotations.Annotations.*;
 import mindustry.graphics.*;
 import mindustry.world.*;
 
-import static mindustry.Vars.world;
+import static mindustry.Vars.*;
 
 public class StaticWall extends Boulder{
     public @Load("@-large") TextureRegion large;

core/src/mindustry/world/blocks/environment/TreeBlock.java

@@ -1,13 +1,12 @@
 package mindustry.world.blocks.environment;
 
 import arc.graphics.g2d.*;
-import arc.math.Mathf;
+import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
-import mindustry.graphics.Layer;
-import mindustry.world.Block;
-import mindustry.world.Tile;
+import mindustry.graphics.*;
+import mindustry.world.*;
 
 public class TreeBlock extends Block{
     public @Load("@-shadow") TextureRegion shadow;

core/src/mindustry/world/blocks/experimental/BlockLoader.java

@@ -10,7 +10,7 @@ import mindustry.ui.*;
 import mindustry.world.blocks.payloads.*;
 import mindustry.world.blocks.production.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class BlockLoader extends PayloadAcceptor{
     public final int timerLoad = timers++;

core/src/mindustry/world/blocks/experimental/BlockUnloader.java

@@ -3,7 +3,7 @@ package mindustry.world.blocks.experimental;
 import mindustry.gen.*;
 import mindustry.type.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class BlockUnloader extends BlockLoader{
 

core/src/mindustry/world/blocks/liquid/LiquidBridge.java

@@ -6,7 +6,7 @@ import mindustry.type.*;
 import mindustry.world.blocks.distribution.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.world;
+import static mindustry.Vars.*;
 
 public class LiquidBridge extends ItemBridge{
 

core/src/mindustry/world/blocks/logic/SwitchBlock.java

@@ -4,7 +4,6 @@ import arc.graphics.g2d.*;
 import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
-import mindustry.logic.*;
 import mindustry.world.*;
 
 public class SwitchBlock extends Block{
@@ -22,12 +21,6 @@ public class SwitchBlock extends Block{
 
     public class SwitchBuild extends Building{
 
-        @Override
-        public double sense(LAccess sensor){
-            if(sensor == LAccess.enabled) return enabled ? 1 : 0;
-            return super.sense(sensor);
-        }
-
         @Override
         public boolean configTapped(){
             configure(!enabled);

core/src/mindustry/world/blocks/payloads/BlockPayload.java

@@ -8,7 +8,7 @@ import mindustry.graphics.*;
 import mindustry.ui.*;
 import mindustry.world.*;
 
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 public class BlockPayload implements Payload{
     public Building entity;

core/src/mindustry/world/blocks/payloads/UnitPayload.java

@@ -7,8 +7,8 @@ import arc.math.geom.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.*;
-import mindustry.entities.*;
 import mindustry.entities.EntityCollisions.*;
+import mindustry.entities.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.ui.*;

core/src/mindustry/world/blocks/power/Battery.java

@@ -8,7 +8,7 @@ import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 public class Battery extends PowerDistributor{
     public @Load("@-top") TextureRegion topRegion;

core/src/mindustry/world/blocks/power/BurnerGenerator.java

@@ -1,8 +1,8 @@
 package mindustry.world.blocks.power;
 
 import arc.graphics.g2d.*;
-import mindustry.graphics.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.graphics.*;
 import mindustry.type.*;
 
 public class BurnerGenerator extends ItemLiquidGenerator{

core/src/mindustry/world/blocks/power/ConditionalConsumePower.java

@@ -1,8 +1,8 @@
 package mindustry.world.blocks.power;
 
-import arc.func.Boolf;
+import arc.func.*;
 import mindustry.gen.*;
-import mindustry.world.consumers.ConsumePower;
+import mindustry.world.consumers.*;
 
 /** A power consumer that only activates sometimes. */
 public class ConditionalConsumePower extends ConsumePower{

core/src/mindustry/world/blocks/power/DecayGenerator.java

@@ -1,6 +1,6 @@
 package mindustry.world.blocks.power;
 
-import mindustry.type.Item;
+import mindustry.type.*;
 
 public class DecayGenerator extends ItemLiquidGenerator{
 

core/src/mindustry/world/blocks/power/PowerBlock.java

@@ -1,7 +1,7 @@
 package mindustry.world.blocks.power;
 
-import mindustry.world.Block;
-import mindustry.world.meta.BlockGroup;
+import mindustry.world.*;
+import mindustry.world.meta.*;
 
 public abstract class PowerBlock extends Block{
 

core/src/mindustry/world/blocks/power/SingleTypeGenerator.java

@@ -1,7 +1,6 @@
 package mindustry.world.blocks.power;
 
-import mindustry.type.Item;
-import mindustry.type.Liquid;
+import mindustry.type.*;
 
 public class SingleTypeGenerator extends ItemLiquidGenerator{
 

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

@@ -1,8 +1,8 @@
 package mindustry.world.blocks.production;
 
 import arc.graphics.g2d.*;
-import mindustry.graphics.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.graphics.*;
 import mindustry.world.meta.*;
 
 public class Fracker extends SolidPump{

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

@@ -11,7 +11,7 @@ import mindustry.graphics.*;
 import mindustry.world.*;
 import mindustry.world.blocks.payloads.*;
 
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 public class PayloadAcceptor extends Block{
     public float payloadSpeed = 0.5f;

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

@@ -4,8 +4,8 @@ import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import mindustry.game.*;
-import mindustry.type.*;
 import mindustry.graphics.*;
+import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.liquid.*;

core/src/mindustry/world/blocks/sandbox/LiquidSource.java

@@ -11,7 +11,7 @@ import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class LiquidSource extends Block{
 

core/src/mindustry/world/blocks/sandbox/PowerVoid.java

@@ -1,7 +1,7 @@
 package mindustry.world.blocks.sandbox;
 
-import mindustry.world.blocks.power.PowerBlock;
-import mindustry.world.meta.BlockStat;
+import mindustry.world.blocks.power.*;
+import mindustry.world.meta.*;
 
 public class PowerVoid extends PowerBlock{
 

core/src/mindustry/world/blocks/storage/CoreBlock.java

@@ -6,7 +6,6 @@ import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.core.*;

core/src/mindustry/world/blocks/units/UnitFactory.java

@@ -7,8 +7,8 @@ import arc.math.*;
 import arc.scene.style.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
-import arc.util.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import arc.util.io.*;
 import mindustry.*;
 import mindustry.entities.*;

core/src/mindustry/world/consumers/Consume.java

@@ -1,9 +1,9 @@
 package mindustry.world.consumers;
 
+import arc.scene.ui.layout.*;
 import arc.struct.*;
-import arc.scene.ui.layout.Table;
 import mindustry.gen.*;
-import mindustry.world.meta.BlockStats;
+import mindustry.world.meta.*;
 
 /** An abstract class that defines a type of resource that a block can consume. */
 public abstract class Consume{

core/src/mindustry/world/consumers/ConsumeLiquidFilter.java

@@ -1,18 +1,15 @@
 package mindustry.world.consumers;
 
+import arc.func.*;
+import arc.scene.ui.layout.*;
 import arc.struct.*;
-import arc.func.Boolf;
-import arc.scene.ui.layout.Table;
 import mindustry.gen.*;
-import mindustry.type.Liquid;
-import mindustry.ui.Cicon;
-import mindustry.ui.MultiReqImage;
-import mindustry.ui.ReqImage;
-import mindustry.world.meta.BlockStat;
-import mindustry.world.meta.BlockStats;
-import mindustry.world.meta.values.LiquidFilterValue;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.meta.*;
+import mindustry.world.meta.values.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class ConsumeLiquidFilter extends ConsumeLiquidBase{
     public final Boolf<Liquid> filter;

core/src/mindustry/world/consumers/ConsumePower.java

@@ -1,7 +1,7 @@
 package mindustry.world.consumers;
 
-import arc.math.Mathf;
-import arc.scene.ui.layout.Table;
+import arc.math.*;
+import arc.scene.ui.layout.*;
 import mindustry.gen.*;
 import mindustry.world.meta.*;
 

core/src/mindustry/world/consumers/Consumers.java

@@ -1,13 +1,13 @@
 package mindustry.world.consumers;
 
+import arc.func.*;
 import arc.struct.*;
-import arc.func.Boolf;
-import arc.util.Structs;
-import mindustry.Vars;
+import arc.util.*;
+import mindustry.*;
 import mindustry.gen.*;
 import mindustry.type.*;
-import mindustry.world.blocks.power.ConditionalConsumePower;
-import mindustry.world.meta.BlockStats;
+import mindustry.world.blocks.power.*;
+import mindustry.world.meta.*;
 
 public class Consumers{
     private Consume[] map = new Consume[ConsumeType.values().length];

core/src/mindustry/world/meta/BlockBars.java

@@ -1,9 +1,9 @@
 package mindustry.world.meta;
 
-import arc.struct.OrderedMap;
-import arc.func.Func;
+import arc.func.*;
+import arc.struct.*;
 import mindustry.gen.*;
-import mindustry.ui.Bar;
+import mindustry.ui.*;
 
 public class BlockBars{
     private OrderedMap<String, Func<Building, Bar>> bars = new OrderedMap<>();

core/src/mindustry/world/meta/BlockStat.java

@@ -1,8 +1,8 @@
 package mindustry.world.meta;
 
-import arc.Core;
+import arc.*;
 
-import java.util.Locale;
+import java.util.*;
 
 /** Describes one type of stat for a block. */
 public enum BlockStat{

core/src/mindustry/world/meta/BlockStats.java

@@ -1,7 +1,7 @@
 package mindustry.world.meta;
 
-import arc.struct.*;
 import arc.struct.ObjectMap.*;
+import arc.struct.*;
 import mindustry.*;
 import mindustry.type.*;
 import mindustry.world.*;

core/src/mindustry/world/meta/StatCategory.java

@@ -1,6 +1,6 @@
 package mindustry.world.meta;
 
-import arc.Core;
+import arc.*;
 
 /** A specific category for a stat. */
 public enum StatCategory{

core/src/mindustry/world/meta/StatUnit.java

@@ -1,8 +1,8 @@
 package mindustry.world.meta;
 
-import arc.Core;
+import arc.*;
 
-import java.util.Locale;
+import java.util.*;
 
 /**
  * Defines a unit of measurement for block stats.

core/src/mindustry/world/meta/StatValue.java

@@ -1,6 +1,6 @@
 package mindustry.world.meta;
 
-import arc.scene.ui.layout.Table;
+import arc.scene.ui.layout.*;
 
 /**
  * A base interface for a value of a stat that is displayed.

core/src/mindustry/world/meta/values/AmmoListValue.java

@@ -1,19 +1,19 @@
 package mindustry.world.meta.values;
 
 import arc.*;
-import arc.struct.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.content.*;
-import mindustry.ctype.UnlockableContent;
+import mindustry.ctype.*;
 import mindustry.entities.bullet.*;
 import mindustry.gen.*;
-import mindustry.ui.Cicon;
+import mindustry.ui.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 public class AmmoListValue<T extends UnlockableContent> implements StatValue{
     private final ObjectMap<T, BulletType> map;

core/src/mindustry/world/meta/values/BooleanValue.java

@@ -1,7 +1,7 @@
 package mindustry.world.meta.values;
 
-import arc.scene.ui.layout.Table;
-import mindustry.world.meta.StatValue;
+import arc.scene.ui.layout.*;
+import mindustry.world.meta.*;
 
 public class BooleanValue implements StatValue{
     private final boolean value;

core/src/mindustry/world/meta/values/BoosterListValue.java

@@ -6,10 +6,10 @@ import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.gen.*;
 import mindustry.type.*;
-import mindustry.ui.Cicon;
+import mindustry.ui.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class BoosterListValue implements StatValue{
     protected float reload, maxUsed, multiplier;

core/src/mindustry/world/meta/values/ItemFilterValue.java

@@ -1,13 +1,13 @@
 package mindustry.world.meta.values;
 
-import arc.struct.Seq;
-import arc.func.Boolf;
-import arc.scene.ui.layout.Table;
-import mindustry.type.Item;
-import mindustry.ui.ItemDisplay;
-import mindustry.world.meta.StatValue;
+import arc.func.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.meta.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class ItemFilterValue implements StatValue{
     private final Boolf<Item> filter;

core/src/mindustry/world/meta/values/ItemListValue.java

@@ -1,9 +1,9 @@
 package mindustry.world.meta.values;
 
-import arc.scene.ui.layout.Table;
-import mindustry.type.ItemStack;
-import mindustry.ui.ItemDisplay;
-import mindustry.world.meta.StatValue;
+import arc.scene.ui.layout.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.meta.*;
 
 public class ItemListValue implements StatValue{
     private final ItemStack[] stacks;

core/src/mindustry/world/meta/values/LiquidFilterValue.java

@@ -1,13 +1,13 @@
 package mindustry.world.meta.values;
 
-import arc.struct.Seq;
-import arc.func.Boolf;
-import arc.scene.ui.layout.Table;
-import mindustry.type.Liquid;
-import mindustry.ui.LiquidDisplay;
-import mindustry.world.meta.StatValue;
+import arc.func.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.meta.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class LiquidFilterValue implements StatValue{
     private final Boolf<Liquid> filter;

core/src/mindustry/world/meta/values/LiquidValue.java

@@ -1,9 +1,9 @@
 package mindustry.world.meta.values;
 
-import arc.scene.ui.layout.Table;
-import mindustry.type.Liquid;
-import mindustry.ui.LiquidDisplay;
-import mindustry.world.meta.StatValue;
+import arc.scene.ui.layout.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.meta.*;
 
 public class LiquidValue implements StatValue{
     private final Liquid liquid;

core/src/mindustry/world/meta/values/NumberValue.java

@@ -1,9 +1,8 @@
 package mindustry.world.meta.values;
 
-import arc.scene.ui.layout.Table;
-import arc.util.Strings;
-import mindustry.world.meta.StatUnit;
-import mindustry.world.meta.StatValue;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.world.meta.*;
 
 /**
  * A stat that is a number with a unit attacked.

core/src/mindustry/world/meta/values/StringValue.java

@@ -1,8 +1,8 @@
 package mindustry.world.meta.values;
 
-import arc.scene.ui.layout.Table;
-import arc.util.Strings;
-import mindustry.world.meta.StatValue;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.world.meta.*;
 
 public class StringValue implements StatValue{
     private final String value;

core/src/mindustry/world/modules/ItemModule.java

@@ -9,7 +9,7 @@ import mindustry.type.*;
 
 import java.util.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class ItemModule extends BlockModule{
     public static final ItemModule empty = new ItemModule();

core/src/mindustry/world/modules/LiquidModule.java

@@ -1,14 +1,14 @@
 package mindustry.world.modules;
 
 import arc.math.*;
-import arc.util.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import arc.util.io.*;
 import mindustry.type.*;
 
 import java.util.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class LiquidModule extends BlockModule{
     private static final int windowSize = 3, updateInterval = 60;

core/src/mindustry/world/modules/PowerModule.java

@@ -1,8 +1,8 @@
 package mindustry.world.modules;
 
-import arc.struct.IntSeq;
+import arc.struct.*;
 import arc.util.io.*;
-import mindustry.world.blocks.power.PowerGraph;
+import mindustry.world.blocks.power.*;
 
 public class PowerModule extends BlockModule{
     /**