Cleanup

core/src/mindustry/ai/Astar.java

@@ -6,7 +6,7 @@ import arc.struct.*;
 import arc.util.*;
 import mindustry.world.*;
 
-import static mindustry.Vars.world;
+import static mindustry.Vars.*;
 
 public class Astar{
     public static final DistanceHeuristic manhattan = (x1, y1, x2, y2) -> Math.abs(x1 - x2) + Math.abs(y1 - y2);

core/src/mindustry/ai/BaseRegistry.java

@@ -17,7 +17,7 @@ import mindustry.world.meta.*;
 
 import java.io.*;
 
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 public class BaseRegistry{
     public Seq<BasePart> cores = new Seq<>();

core/src/mindustry/async/AsyncCore.java

@@ -7,7 +7,7 @@ import mindustry.game.EventType.*;
 
 import java.util.concurrent.*;
 
-import static mindustry.Vars.state;
+import static mindustry.Vars.*;
 
 public class AsyncCore{
     //all processes to be executed each frame

core/src/mindustry/async/PhysicsProcess.java

@@ -5,8 +5,8 @@ import arc.math.geom.*;
 import arc.math.geom.QuadTree.*;
 import arc.struct.*;
 import mindustry.*;
-import mindustry.entities.*;
 import mindustry.async.PhysicsProcess.PhysicsWorld.*;
+import mindustry.entities.*;
 import mindustry.gen.*;
 
 public class PhysicsProcess implements AsyncProcess{

core/src/mindustry/audio/LoopControl.java

@@ -2,9 +2,9 @@ package mindustry.audio;
 
 import arc.*;
 import arc.audio.*;
-import arc.struct.*;
 import arc.math.*;
 import arc.math.geom.*;
+import arc.struct.*;
 import mindustry.*;
 
 public class LoopControl{

core/src/mindustry/content/Fx.java

@@ -18,7 +18,7 @@ import static arc.graphics.g2d.Draw.rect;
 import static arc.graphics.g2d.Draw.*;
 import static arc.graphics.g2d.Lines.*;
 import static arc.math.Angles.*;
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 public class Fx{
     public static final Effect

core/src/mindustry/content/Liquids.java

@@ -1,8 +1,8 @@
 package mindustry.content;
 
-import arc.graphics.Color;
-import mindustry.ctype.ContentList;
-import mindustry.type.Liquid;
+import arc.graphics.*;
+import mindustry.ctype.*;
+import mindustry.type.*;
 
 public class Liquids implements ContentList{
     public static Liquid water, slag, oil, cryofluid;

core/src/mindustry/content/StatusEffects.java

@@ -2,10 +2,11 @@ package mindustry.content;
 
 import arc.*;
 import arc.graphics.*;
-import arc.math.Mathf;
-import mindustry.ctype.ContentList;
+import arc.math.*;
+import mindustry.ctype.*;
 import mindustry.game.EventType.*;
-import mindustry.type.StatusEffect;
+import mindustry.type.*;
+
 import static mindustry.Vars.*;
 
 public class StatusEffects implements ContentList{

core/src/mindustry/core/ContentLoader.java

@@ -1,9 +1,9 @@
 package mindustry.core;
 
 import arc.files.*;
-import arc.struct.*;
 import arc.func.*;
 import arc.graphics.*;
+import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.content.*;
@@ -13,8 +13,8 @@ import mindustry.mod.Mods.*;
 import mindustry.type.*;
 import mindustry.world.*;
 
-import static arc.Core.files;
-import static mindustry.Vars.mods;
+import static arc.Core.*;
+import static mindustry.Vars.*;
 
 /**
  * Loads all game content.

core/src/mindustry/core/Control.java

@@ -8,8 +8,8 @@ import arc.input.*;
 import arc.math.*;
 import arc.scene.ui.*;
 import arc.struct.*;
-import arc.util.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.*;
 import mindustry.audio.*;
 import mindustry.content.*;

core/src/mindustry/core/FileTree.java

@@ -2,8 +2,8 @@ package mindustry.core;
 
 import arc.*;
 import arc.assets.loaders.*;
-import arc.struct.*;
 import arc.files.*;
+import arc.struct.*;
 
 /** Handles files in a modded context. */
 public class FileTree implements FileHandleResolver{

core/src/mindustry/core/NetServer.java

@@ -6,8 +6,8 @@ import arc.graphics.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
-import arc.util.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import arc.util.CommandHandler.*;
 import arc.util.io.*;
 import arc.util.serialization.*;

core/src/mindustry/core/UI.java

@@ -24,7 +24,7 @@ import mindustry.editor.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.logic.LogicDialog;
+import mindustry.logic.*;
 import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
 import mindustry.ui.fragments.*;

core/src/mindustry/core/Version.java

@@ -2,8 +2,8 @@ package mindustry.core;
 
 import arc.*;
 import arc.Files.*;
-import arc.struct.*;
 import arc.files.*;
+import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
 

core/src/mindustry/ctype/Content.java

@@ -1,8 +1,8 @@
 package mindustry.ctype;
 
 import arc.files.*;
-import arc.util.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.*;
 import mindustry.mod.Mods.*;
 

core/src/mindustry/editor/DrawOperation.java

@@ -1,14 +1,13 @@
 package mindustry.editor;
 
+import arc.struct.*;
 import mindustry.annotations.Annotations.*;
-import arc.struct.LongSeq;
-import mindustry.game.Team;
-import mindustry.gen.TileOp;
-import mindustry.world.Block;
-import mindustry.world.Tile;
-import mindustry.world.blocks.environment.Floor;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class DrawOperation{
     private MapEditor editor;

core/src/mindustry/editor/EditorTile.java

@@ -1,7 +1,6 @@
 package mindustry.editor;
 
 import arc.func.*;
-import arc.util.ArcAnnotate.*;
 import mindustry.content.*;
 import mindustry.editor.DrawOperation.*;
 import mindustry.game.*;

core/src/mindustry/editor/MapEditorDialog.java

@@ -1,7 +1,6 @@
 package mindustry.editor;
 
 import arc.*;
-import arc.struct.*;
 import arc.files.*;
 import arc.func.*;
 import arc.graphics.*;
@@ -14,6 +13,7 @@ import arc.scene.event.*;
 import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
 import arc.util.ArcAnnotate.*;
 import mindustry.*;

core/src/mindustry/editor/MapInfoDialog.java

@@ -1,8 +1,8 @@
 package mindustry.editor;
 
 import arc.*;
-import arc.struct.*;
 import arc.scene.ui.*;
+import arc.struct.*;
 import mindustry.*;
 import mindustry.game.*;
 import mindustry.io.*;

core/src/mindustry/editor/MapLoadDialog.java

@@ -8,7 +8,7 @@ import mindustry.maps.*;
 import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
 
-import static mindustry.Vars.maps;
+import static mindustry.Vars.*;
 
 public class MapLoadDialog extends BaseDialog{
     private Map selected = null;

core/src/mindustry/editor/MapView.java

@@ -1,24 +1,22 @@
 package mindustry.editor;
 
-import arc.Core;
-import arc.graphics.Color;
+import arc.*;
+import arc.graphics.*;
 import arc.graphics.g2d.*;
-import arc.input.GestureDetector;
-import arc.input.GestureDetector.GestureListener;
-import arc.input.KeyCode;
-import arc.math.Mathf;
+import arc.input.*;
+import arc.input.GestureDetector.*;
+import arc.math.*;
 import arc.math.geom.*;
-import arc.scene.Element;
+import arc.scene.*;
 import arc.scene.event.*;
-import arc.scene.ui.TextField;
-import arc.scene.ui.layout.Scl;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
 import arc.util.*;
-import mindustry.graphics.Pal;
-import mindustry.input.Binding;
-import mindustry.ui.GridImage;
+import mindustry.graphics.*;
+import mindustry.input.*;
+import mindustry.ui.*;
 
-import static mindustry.Vars.mobile;
-import static mindustry.Vars.ui;
+import static mindustry.Vars.*;
 
 public class MapView extends Element implements GestureListener{
     private MapEditor editor;

core/src/mindustry/editor/OperationStack.java

@@ -1,6 +1,6 @@
 package mindustry.editor;
 
-import arc.struct.Seq;
+import arc.struct.*;
 
 public class OperationStack{
     private static final int maxSize = 10;

core/src/mindustry/entities/Effect.java

@@ -7,8 +7,8 @@ import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
-import arc.util.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.*;
 import mindustry.content.*;
 import mindustry.gen.*;

core/src/mindustry/entities/EntityGroup.java

@@ -8,7 +8,7 @@ import mindustry.gen.*;
 
 import java.util.*;
 
-import static mindustry.Vars.collisions;
+import static mindustry.Vars.*;
 
 /** Represents a group of a certain type of entity.*/
 @SuppressWarnings("unchecked")

core/src/mindustry/entities/abilities/StatusFieldAbility.java

@@ -1,6 +1,5 @@
 package mindustry.entities.abilities;
 
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.*;

core/src/mindustry/entities/bullet/MassDriverBolt.java

@@ -1,15 +1,14 @@
 package mindustry.entities.bullet;
 
-import arc.graphics.Color;
-import arc.graphics.g2d.Draw;
-import arc.math.Angles;
-import arc.math.Mathf;
-import mindustry.content.Fx;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import mindustry.content.*;
 import mindustry.gen.*;
-import mindustry.graphics.Pal;
-import mindustry.world.blocks.distribution.MassDriver.DriverBulletData;
+import mindustry.graphics.*;
+import mindustry.world.blocks.distribution.MassDriver.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class MassDriverBolt extends BulletType{
 

core/src/mindustry/entities/comp/BuildingComp.java

@@ -1238,6 +1238,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             case powerNetOut -> power == null ? 0 : power.graph.getLastScaledPowerOut() * 60;
             case powerNetStored -> power == null ? 0 : power.graph.getLastPowerStored();
             case powerNetCapacity -> power == null ? 0 : power.graph.getLastCapacity();
+            case enabled -> enabled ? 1 : 0;
             default -> 0;
         };
     }

core/src/mindustry/entities/comp/EntityComp.java

@@ -6,7 +6,7 @@ import mindustry.annotations.Annotations.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
 
-import static mindustry.Vars.player;
+import static mindustry.Vars.*;
 
 @Component
 @BaseComponent

core/src/mindustry/entities/comp/FlyingComp.java

@@ -10,7 +10,7 @@ import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.world.blocks.environment.*;
 
-import static mindustry.Vars.net;
+import static mindustry.Vars.*;
 
 @Component
 abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{

core/src/mindustry/entities/comp/HitboxComp.java

@@ -2,8 +2,8 @@ package mindustry.entities.comp;
 
 import arc.func.*;
 import arc.math.*;
-import arc.math.geom.QuadTree.*;
 import arc.math.geom.*;
+import arc.math.geom.QuadTree.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 

core/src/mindustry/entities/comp/MinerComp.java

@@ -4,8 +4,8 @@ import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
-import arc.util.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.gen.*;

core/src/mindustry/entities/comp/PosComp.java

@@ -8,7 +8,7 @@ import mindustry.content.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
 
-import static mindustry.Vars.world;
+import static mindustry.Vars.*;
 
 @Component
 abstract class PosComp implements Position{

core/src/mindustry/entities/comp/ShieldComp.java

@@ -5,7 +5,7 @@ import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.gen.*;
 
-import static mindustry.Vars.minArmorDamage;
+import static mindustry.Vars.*;
 
 @Component
 abstract class ShieldComp implements Healthc, Posc{

core/src/mindustry/entities/comp/TeamComp.java

@@ -5,7 +5,7 @@ import mindustry.annotations.Annotations.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 
-import static mindustry.Vars.state;
+import static mindustry.Vars.*;
 
 @Component
 abstract class TeamComp implements Posc{

core/src/mindustry/entities/comp/VelComp.java

@@ -2,8 +2,8 @@ package mindustry.entities.comp;
 
 import arc.math.*;
 import arc.math.geom.*;
-import arc.util.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.entities.EntityCollisions.*;
 import mindustry.gen.*;

core/src/mindustry/game/Saves.java

@@ -2,11 +2,11 @@ package mindustry.game;
 
 import arc.*;
 import arc.assets.*;
-import arc.struct.*;
 import arc.files.*;
 import arc.graphics.*;
-import arc.util.*;
+import arc.struct.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import arc.util.async.*;
 import mindustry.*;
 import mindustry.core.GameState.*;

core/src/mindustry/game/SpawnGroup.java

@@ -8,7 +8,7 @@ import mindustry.gen.*;
 import mindustry.io.legacy.*;
 import mindustry.type.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 /**
  * A spawn group defines spawn information for a specific type of unit, with optional extra information like

core/src/mindustry/game/Tutorial.java

@@ -1,17 +1,17 @@
 package mindustry.game;
 
 import arc.*;
-import arc.struct.*;
 import arc.func.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.scene.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.content.*;
-import mindustry.gen.*;
 import mindustry.game.EventType.*;
+import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
 import mindustry.world.*;

core/src/mindustry/graphics/BlockRenderer.java

@@ -16,7 +16,7 @@ import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.power.*;
 
-import static arc.Core.camera;
+import static arc.Core.*;
 import static mindustry.Vars.*;
 
 public class BlockRenderer implements Disposable{

core/src/mindustry/graphics/CacheLayer.java

@@ -4,7 +4,7 @@ import arc.*;
 import arc.graphics.*;
 import arc.graphics.gl.*;
 
-import static mindustry.Vars.renderer;
+import static mindustry.Vars.*;
 
 public enum CacheLayer{
     water{

core/src/mindustry/graphics/LightRenderer.java

@@ -10,7 +10,7 @@ import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
 
-import static mindustry.Vars.state;
+import static mindustry.Vars.*;
 
 /** Renders overlay lights. Client only. */
 public class LightRenderer{

core/src/mindustry/graphics/Pal.java

@@ -1,6 +1,6 @@
 package mindustry.graphics;
 
-import arc.graphics.Color;
+import arc.graphics.*;
 
 public class Pal{
     public static Color

core/src/mindustry/graphics/Pixelator.java

@@ -8,7 +8,7 @@ import arc.graphics.gl.*;
 import arc.util.*;
 
 import static arc.Core.*;
-import static mindustry.Vars.renderer;
+import static mindustry.Vars.*;
 
 public class Pixelator implements Disposable{
     private FrameBuffer buffer = new FrameBuffer();

core/src/mindustry/io/SaveMeta.java

@@ -4,7 +4,7 @@ import arc.struct.*;
 import mindustry.game.*;
 import mindustry.maps.*;
 
-import static mindustry.Vars.maps;
+import static mindustry.Vars.*;
 
 public class SaveMeta{
     public int version;

core/src/mindustry/io/legacy/LegacySaveVersion.java

@@ -9,7 +9,7 @@ import mindustry.world.*;
 
 import java.io.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public abstract class LegacySaveVersion extends SaveVersion{
 

core/src/mindustry/io/legacy/Save3.java

@@ -5,7 +5,7 @@ import mindustry.game.Teams.*;
 
 import java.io.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class Save3 extends LegacySaveVersion{
 

core/src/mindustry/logic/LAccess.java

@@ -29,13 +29,16 @@ public enum LAccess{
 
     //values with parameters are considered controllable
     enabled("to"), //"to" is standard for single parameter access
-    shoot("x", "y", "shoot"),;
+    shoot("x", "y", "shoot"),
+
+    ;
 
     public final String[] parameters;
 
-    public static final LAccess[] all = values();
-    public static final LAccess[] senseable = Seq.select(all, t -> t.parameters.length <= 1).toArray(LAccess.class);
-    public static final LAccess[] controls = Seq.select(all, t -> t.parameters.length > 0).toArray(LAccess.class);
+    public static final LAccess[]
+        all = values(),
+        senseable = Seq.select(all, t -> t.parameters.length <= 1).toArray(LAccess.class),
+        controls = Seq.select(all, t -> t.parameters.length > 0).toArray(LAccess.class);
 
     LAccess(String... parameters){
         this.parameters = parameters;

core/src/mindustry/logic/LCanvas.java

@@ -13,7 +13,6 @@ import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.ArcAnnotate.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.ui.*;

core/src/mindustry/maps/Map.java

@@ -1,11 +1,11 @@
 package mindustry.maps;
 
 import arc.*;
-import arc.struct.*;
 import arc.files.*;
 import arc.graphics.*;
-import arc.util.*;
+import arc.struct.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;

core/src/mindustry/maps/MapPreviewLoader.java

@@ -3,12 +3,12 @@ package mindustry.maps;
 import arc.assets.*;
 import arc.assets.loaders.*;
 import arc.assets.loaders.resolvers.*;
-import arc.struct.*;
 import arc.files.*;
 import arc.graphics.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
-import mindustry.ctype.Content;
+import mindustry.ctype.*;
 
 public class MapPreviewLoader extends TextureLoader{
 

core/src/mindustry/maps/filters/CoreSpawnFilter.java

@@ -5,7 +5,7 @@ import arc.util.*;
 import mindustry.world.*;
 import mindustry.world.blocks.storage.*;
 
-import static mindustry.Vars.state;
+import static mindustry.Vars.*;
 
 /** Selects X spawns from the core spawn pool.*/
 public class CoreSpawnFilter extends GenerateFilter{

core/src/mindustry/maps/filters/MedianFilter.java

@@ -1,12 +1,12 @@
 package mindustry.maps.filters;
 
-import arc.struct.*;
 import arc.math.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.maps.filters.FilterOption.*;
 import mindustry.world.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class MedianFilter extends GenerateFilter{
     float radius = 2;

core/src/mindustry/maps/filters/NoiseFilter.java

@@ -1,13 +1,11 @@
 package mindustry.maps.filters;
 
 import arc.util.*;
-import mindustry.content.Blocks;
-import mindustry.maps.filters.FilterOption.BlockOption;
-import mindustry.maps.filters.FilterOption.SliderOption;
-import mindustry.world.Block;
+import mindustry.content.*;
+import mindustry.maps.filters.FilterOption.*;
+import mindustry.world.*;
 
-import static mindustry.maps.filters.FilterOption.floorsOnly;
-import static mindustry.maps.filters.FilterOption.wallsOnly;
+import static mindustry.maps.filters.FilterOption.*;
 
 public class NoiseFilter extends GenerateFilter{
     float scl = 40, threshold = 0.5f, octaves = 3f, falloff = 0.5f;

core/src/mindustry/maps/filters/OreFilter.java

@@ -1,12 +1,11 @@
 package mindustry.maps.filters;
 
 import arc.util.*;
-import mindustry.content.Blocks;
-import mindustry.maps.filters.FilterOption.SliderOption;
-import mindustry.world.Block;
+import mindustry.content.*;
+import mindustry.maps.filters.FilterOption.*;
+import mindustry.world.*;
 
-import static mindustry.maps.filters.FilterOption.BlockOption;
-import static mindustry.maps.filters.FilterOption.oresOnly;
+import static mindustry.maps.filters.FilterOption.*;
 
 public class OreFilter extends GenerateFilter{
     public float scl = 23, threshold = 0.81f, octaves = 2f, falloff = 0.3f;

core/src/mindustry/maps/filters/OreMedianFilter.java

@@ -1,7 +1,7 @@
 package mindustry.maps.filters;
 
-import arc.struct.*;
 import arc.math.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.content.*;

core/src/mindustry/maps/filters/RiverNoiseFilter.java

@@ -1,13 +1,11 @@
 package mindustry.maps.filters;
 
 import arc.util.*;
-import mindustry.content.Blocks;
-import mindustry.maps.filters.FilterOption.BlockOption;
-import mindustry.maps.filters.FilterOption.SliderOption;
-import mindustry.world.Block;
+import mindustry.content.*;
+import mindustry.maps.filters.FilterOption.*;
+import mindustry.world.*;
 
-import static mindustry.maps.filters.FilterOption.floorsOnly;
-import static mindustry.maps.filters.FilterOption.wallsOnly;
+import static mindustry.maps.filters.FilterOption.*;
 
 public class RiverNoiseFilter extends GenerateFilter{
     float scl = 40, threshold = 0f, threshold2 = 0.1f;

core/src/mindustry/maps/filters/ScatterFilter.java

@@ -1,8 +1,8 @@
 package mindustry.maps.filters;
 
 import arc.util.*;
-import mindustry.content.Blocks;
-import mindustry.world.Block;
+import mindustry.content.*;
+import mindustry.world.*;
 
 import static mindustry.maps.filters.FilterOption.*;
 

core/src/mindustry/maps/filters/TerrainFilter.java

@@ -1,14 +1,12 @@
 package mindustry.maps.filters;
 
-import arc.math.Mathf;
+import arc.math.*;
 import arc.util.*;
-import mindustry.content.Blocks;
-import mindustry.maps.filters.FilterOption.BlockOption;
-import mindustry.maps.filters.FilterOption.SliderOption;
-import mindustry.world.Block;
+import mindustry.content.*;
+import mindustry.maps.filters.FilterOption.*;
+import mindustry.world.*;
 
-import static mindustry.maps.filters.FilterOption.floorsOnly;
-import static mindustry.maps.filters.FilterOption.wallsOnly;
+import static mindustry.maps.filters.FilterOption.*;
 
 public class TerrainFilter extends GenerateFilter{
     float scl = 40, threshold = 0.9f, octaves = 3f, falloff = 0.5f, magnitude = 1f, circleScl = 2.1f;

core/src/mindustry/mod/ModLoadingMusic.java

@@ -2,7 +2,6 @@ package mindustry.mod;
 
 import arc.audio.*;
 import arc.mock.*;
-import arc.util.ArcAnnotate.*;
 
 public class ModLoadingMusic implements Music{
     public Music music = new MockMusic();

core/src/mindustry/mod/ModLoadingSound.java

@@ -3,7 +3,6 @@ package mindustry.mod;
 import arc.audio.*;
 import arc.math.geom.*;
 import arc.mock.*;
-import arc.util.ArcAnnotate.*;
 
 public class ModLoadingSound implements Sound{
     public Sound sound = new MockSound();

core/src/mindustry/net/CrashSender.java

@@ -2,9 +2,9 @@ package mindustry.net;
 
 import arc.*;
 import arc.Net.*;
-import arc.struct.*;
 import arc.files.*;
 import arc.func.*;
+import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
 import arc.util.serialization.*;
@@ -19,8 +19,8 @@ import java.text.*;
 import java.util.*;
 
 import static arc.Core.*;
-import static mindustry.Vars.mods;
 import static mindustry.Vars.net;
+import static mindustry.Vars.*;
 
 public class CrashSender{
 

core/src/mindustry/net/NetworkIO.java

@@ -1,6 +1,6 @@
 package mindustry.net;
 
-import arc.Core;
+import arc.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.core.*;

core/src/mindustry/net/Packet.java

@@ -1,8 +1,8 @@
 package mindustry.net;
 
-import arc.util.pooling.Pool.Poolable;
+import arc.util.pooling.Pool.*;
 
-import java.nio.ByteBuffer;
+import java.nio.*;
 
 public interface Packet extends Poolable{
     default void read(ByteBuffer buffer){}

core/src/mindustry/net/Registrator.java

@@ -1,7 +1,7 @@
 package mindustry.net;
 
-import arc.struct.ObjectIntMap;
-import arc.func.Prov;
+import arc.func.*;
+import arc.struct.*;
 import mindustry.net.Packets.*;
 
 public class Registrator{

core/src/mindustry/net/Streamable.java

@@ -1,6 +1,6 @@
 package mindustry.net;
 
-import mindustry.net.Packets.StreamBegin;
+import mindustry.net.Packets.*;
 
 import java.io.*;
 

core/src/mindustry/type/AmmoTypes.java

@@ -1,6 +1,5 @@
 package mindustry.type;
 
-import arc.util.ArcAnnotate.*;
 import mindustry.*;
 import mindustry.content.*;
 import mindustry.ctype.*;

core/src/mindustry/type/Item.java

@@ -1,13 +1,13 @@
 package mindustry.type;
 
-import arc.struct.*;
 import arc.graphics.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import mindustry.ctype.*;
 import mindustry.ui.*;
 import mindustry.world.blocks.environment.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public class Item extends UnlockableContent{
     public final Color color;

core/src/mindustry/type/ItemStack.java

@@ -1,7 +1,7 @@
 package mindustry.type;
 
-import arc.struct.Seq;
-import mindustry.content.Items;
+import arc.struct.*;
+import mindustry.content.*;
 
 public class ItemStack implements Comparable<ItemStack>{
     public static final ItemStack[] empty = {};

core/src/mindustry/type/Publishable.java

@@ -1,7 +1,7 @@
 package mindustry.type;
 
-import arc.struct.*;
 import arc.files.*;
+import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import mindustry.*;
 

core/src/mindustry/ui/BorderImage.java

@@ -2,9 +2,9 @@ package mindustry.ui;
 
 import arc.graphics.*;
 import arc.graphics.g2d.*;
-import arc.scene.ui.Image;
-import arc.scene.ui.layout.Scl;
-import mindustry.graphics.Pal;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import mindustry.graphics.*;
 
 public class BorderImage extends Image{
     public float thickness = 4f;

core/src/mindustry/ui/ContentDisplay.java

@@ -1,9 +1,9 @@
 package mindustry.ui;
 
 import arc.*;
-import arc.struct.*;
 import arc.graphics.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;

core/src/mindustry/ui/GridImage.java

@@ -1,7 +1,7 @@
 package mindustry.ui;
 
-import arc.graphics.g2d.Fill;
-import arc.scene.Element;
+import arc.graphics.g2d.*;
+import arc.scene.*;
 
 public class GridImage extends Element{
     private int imageWidth, imageHeight;

core/src/mindustry/ui/IntFormat.java

@@ -1,8 +1,8 @@
 package mindustry.ui;
 
 
-import arc.Core;
-import arc.func.Func;
+import arc.*;
+import arc.func.*;
 
 /**
  * A low-garbage way to format bundle strings.

core/src/mindustry/ui/ItemDisplay.java

@@ -1,8 +1,7 @@
 package mindustry.ui;
 
-import arc.scene.ui.layout.Table;
-import mindustry.type.Item;
-import mindustry.type.ItemStack;
+import arc.scene.ui.layout.*;
+import mindustry.type.*;
 
 /** An item image with text. */
 public class ItemDisplay extends Table{

core/src/mindustry/ui/Links.java

@@ -1,11 +1,11 @@
 package mindustry.ui;
 
-import arc.Core;
+import arc.*;
+import arc.graphics.*;
 import arc.scene.style.*;
-import arc.util.Strings;
-import arc.graphics.Color;
+import arc.util.*;
 import mindustry.gen.*;
-import mindustry.graphics.Pal;
+import mindustry.graphics.*;
 
 public class Links{
     private static LinkEntry[] links;

core/src/mindustry/ui/LiquidDisplay.java

@@ -1,12 +1,11 @@
 package mindustry.ui;
 
-import arc.graphics.Color;
-import arc.scene.ui.Image;
-import arc.scene.ui.layout.Stack;
-import arc.scene.ui.layout.Table;
-import arc.util.Strings;
-import mindustry.type.Liquid;
-import mindustry.world.meta.StatUnit;
+import arc.graphics.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.type.*;
+import mindustry.world.meta.*;
 
 /** An ItemDisplay, but for liquids. */
 public class LiquidDisplay extends Table{

core/src/mindustry/ui/Minimap.java

@@ -1,9 +1,9 @@
 package mindustry.ui;
 
-import arc.Core;
-import arc.graphics.g2d.Draw;
-import arc.input.KeyCode;
-import arc.scene.Element;
+import arc.*;
+import arc.graphics.g2d.*;
+import arc.input.*;
+import arc.scene.*;
 import arc.scene.event.*;
 import arc.scene.ui.layout.*;
 import mindustry.gen.*;

core/src/mindustry/ui/MobileButton.java

@@ -1,8 +1,8 @@
 package mindustry.ui;
 
 import arc.scene.style.*;
-import arc.scene.ui.ImageButton;
-import arc.util.Align;
+import arc.scene.ui.*;
+import arc.util.*;
 
 public class MobileButton extends ImageButton{
 

core/src/mindustry/ui/MultiReqImage.java

@@ -1,8 +1,8 @@
 package mindustry.ui;
 
-import arc.struct.Seq;
-import arc.scene.ui.layout.Stack;
-import arc.util.Time;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
 
 public class MultiReqImage extends Stack{
     private Seq<ReqImage> displays = new Seq<>();

core/src/mindustry/ui/ReqImage.java

@@ -1,12 +1,11 @@
 package mindustry.ui;
 
-import arc.func.Boolp;
+import arc.func.*;
 import arc.graphics.g2d.*;
-import arc.scene.Element;
-import arc.scene.ui.Image;
-import arc.scene.ui.layout.Stack;
-import arc.scene.ui.layout.Scl;
-import mindustry.graphics.Pal;
+import arc.scene.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import mindustry.graphics.*;
 
 public class ReqImage extends Stack{
     private final Boolp valid;

core/src/mindustry/ui/Styles.java

@@ -1,7 +1,6 @@
 package mindustry.ui;
 
 import arc.*;
-import mindustry.annotations.Annotations.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.graphics.g2d.TextureAtlas.*;
@@ -16,6 +15,7 @@ import arc.scene.ui.ScrollPane.*;
 import arc.scene.ui.Slider.*;
 import arc.scene.ui.TextButton.*;
 import arc.scene.ui.TextField.*;
+import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 

core/src/mindustry/ui/dialogs/AboutDialog.java

@@ -1,10 +1,10 @@
 package mindustry.ui.dialogs;
 
 import arc.*;
-import arc.struct.*;
 import arc.graphics.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;

core/src/mindustry/ui/dialogs/ContentInfoDialog.java

@@ -1,8 +1,8 @@
 package mindustry.ui.dialogs;
 
-import arc.scene.ui.ScrollPane;
-import arc.scene.ui.layout.Table;
-import mindustry.ctype.UnlockableContent;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import mindustry.ctype.*;
 
 public class ContentInfoDialog extends BaseDialog{
 

core/src/mindustry/ui/dialogs/DiscordDialog.java

@@ -1,10 +1,10 @@
 package mindustry.ui.dialogs;
 
-import arc.Core;
-import arc.graphics.Color;
-import arc.scene.ui.Dialog;
+import arc.*;
+import arc.graphics.*;
+import arc.scene.ui.*;
 import mindustry.gen.*;
-import mindustry.graphics.Pal;
+import mindustry.graphics.*;
 
 import static mindustry.Vars.*;
 

core/src/mindustry/ui/dialogs/LanguageDialog.java

@@ -1,17 +1,15 @@
 package mindustry.ui.dialogs;
 
-import arc.Core;
-import arc.struct.*;
+import arc.*;
 import arc.scene.ui.*;
-import arc.scene.ui.layout.Table;
-import arc.util.Log;
-import arc.util.Strings;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
 import mindustry.ui.*;
 
-import java.util.Locale;
+import java.util.*;
 
-import static mindustry.Vars.locales;
-import static mindustry.Vars.ui;
+import static mindustry.Vars.*;
 
 public class LanguageDialog extends BaseDialog{
     private Locale lastLocale;

core/src/mindustry/ui/dialogs/MapPlayDialog.java

@@ -4,7 +4,6 @@ import arc.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
-import arc.util.ArcAnnotate.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.maps.*;

core/src/mindustry/ui/dialogs/MinimapDialog.java

@@ -8,7 +8,7 @@ import arc.scene.event.*;
 import arc.scene.ui.layout.*;
 import mindustry.gen.*;
 
-import static mindustry.Vars.renderer;
+import static mindustry.Vars.*;
 
 public class MinimapDialog extends BaseDialog{
 

core/src/mindustry/ui/dialogs/SaveDialog.java

@@ -1,9 +1,9 @@
 package mindustry.ui.dialogs;
 
-import arc.Core;
-import arc.scene.ui.TextButton;
-import arc.util.Time;
-import mindustry.game.Saves.SaveSlot;
+import arc.*;
+import arc.scene.ui.*;
+import arc.util.*;
+import mindustry.game.Saves.*;
 import mindustry.gen.*;
 
 import static mindustry.Vars.*;

core/src/mindustry/ui/dialogs/SchematicsDialog.java

@@ -11,7 +11,7 @@ import arc.scene.ui.ImageButton.*;
 import arc.scene.ui.TextButton.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
-import mindustry.Vars;
+import mindustry.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;

core/src/mindustry/ui/dialogs/TraceDialog.java

@@ -1,9 +1,9 @@
 package mindustry.ui.dialogs;
 
-import arc.Core;
-import arc.scene.ui.layout.Table;
+import arc.*;
+import arc.scene.ui.layout.*;
 import mindustry.gen.*;
-import mindustry.net.Administration.TraceInfo;
+import mindustry.net.Administration.*;
 
 public class TraceDialog extends BaseDialog{
 

core/src/mindustry/ui/fragments/BlockInventoryFragment.java

@@ -10,8 +10,8 @@ import arc.scene.*;
 import arc.scene.actions.*;
 import arc.scene.event.*;
 import arc.scene.ui.*;
-import arc.scene.ui.layout.*;
 import arc.scene.ui.layout.Stack;
+import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;

core/src/mindustry/ui/fragments/ChatFragment.java

@@ -2,7 +2,6 @@ package mindustry.ui.fragments;
 
 import arc.*;
 import arc.Input.*;
-import arc.struct.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
@@ -10,6 +9,7 @@ import arc.scene.*;
 import arc.scene.ui.*;
 import arc.scene.ui.Label.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.gen.*;

core/src/mindustry/ui/fragments/Fragment.java

@@ -1,6 +1,6 @@
 package mindustry.ui.fragments;
 
-import arc.scene.Group;
+import arc.scene.*;
 
 public abstract class Fragment{
     public abstract void build(Group parent);

core/src/mindustry/ui/layout/BranchTreeLayout.java

@@ -1,7 +1,7 @@
 package mindustry.ui.layout;
 
-import arc.struct.*;
 import arc.math.geom.*;
+import arc.struct.*;
 
 /**
  * Algorithm taken from <a href="https://github.com/abego/treelayout">TreeLayout</a>.

core/src/mindustry/ui/layout/RadialTreeLayout.java

@@ -1,7 +1,7 @@
 package mindustry.ui.layout;
 
-import arc.struct.*;
 import arc.math.*;
+import arc.struct.*;
 
 public class RadialTreeLayout implements TreeLayout{
     private static ObjectSet<TreeNode> visited = new ObjectSet<>();

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;