Moved Nullable to utils package

core/src/mindustry/ai/BaseRegistry.java

@@ -3,7 +3,6 @@ package mindustry.ai;
 import arc.*;
 import arc.math.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.ctype.*;
 import mindustry.game.*;

core/src/mindustry/ai/BlockIndexer.java

@@ -6,7 +6,7 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.EnumSet;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.content.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;

core/src/mindustry/ai/Pathfinder.java

@@ -4,7 +4,6 @@ import arc.*;
 import arc.func.*;
 import arc.math.geom.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.async.*;
 import mindustry.annotations.Annotations.*;
@@ -187,6 +186,8 @@ public class Pathfinder implements Runnable{
                     for(Flowfield data : threadList){
                         updateFrontier(data, maxUpdate / threadList.size);
 
+                        //TODO implement timeouts... or don't
+                        /*
                         //remove flowfields that have 'timed out' so they can be garbage collected and no longer waste space
                         if(data.refreshRate > 0 && Time.timeSinceMillis(data.lastUpdateTime) > fieldTimeout){
                             //make sure it doesn't get removed twice
@@ -195,12 +196,11 @@ public class Pathfinder implements Runnable{
                             Team team = data.team;
 
                             Core.app.post(() -> {
-                                //TODO ?????
                                 //remove its used state
-                                //if(fieldMap[team.id] != null){
+                                if(fieldMap[team.id] != null){
-                                //    fieldMap[team.id].remove(data.target);
+                                    fieldMap[team.id].remove(data.target);
-                                //    fieldMapUsed[team.id].remove(data.target);
+                                    fieldMapUsed[team.id].remove(data.target);
-                                //}
+                                }
                                 //remove from main thread list
                                 mainList.remove(data);
                             });
@@ -209,7 +209,7 @@ public class Pathfinder implements Runnable{
                                 //remove from this thread list with a delay
                                 threadList.remove(data);
                             });
-                        }
+                        }*/
                     }
                 }
 

core/src/mindustry/ai/types/BuilderAI.java

@@ -1,7 +1,7 @@
 package mindustry.ai.types;
 
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.game.Teams.*;

core/src/mindustry/ai/types/FormationAI.java

@@ -2,7 +2,7 @@ package mindustry.ai.types;
 
 import arc.math.*;
 import arc.math.geom.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.ai.formations.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;

core/src/mindustry/audio/MusicControl.java

@@ -4,7 +4,6 @@ import arc.*;
 import arc.audio.*;
 import arc.math.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;

core/src/mindustry/content/TechTree.java

@@ -2,7 +2,7 @@ package mindustry.content;
 
 import arc.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.ctype.*;
 import mindustry.game.Objectives.*;
 import mindustry.type.*;
@@ -571,7 +571,8 @@ public class TechTree implements ContentList{
         return node(block, () -> {});
     }
 
-    public static @Nullable TechNode get(UnlockableContent content){
+    public static @Nullable
+    TechNode get(UnlockableContent content){
         return map.get(content);
     }
 

core/src/mindustry/core/ContentLoader.java

@@ -4,7 +4,6 @@ import arc.files.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.ctype.*;

core/src/mindustry/core/Control.java

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

core/src/mindustry/core/GameState.java

@@ -1,7 +1,7 @@
 package mindustry.core;
 
 import arc.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.gen.*;

core/src/mindustry/core/NetServer.java

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

core/src/mindustry/core/World.java

@@ -6,7 +6,6 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.struct.ObjectIntMap.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.noise.*;
 import mindustry.content.*;

core/src/mindustry/ctype/Content.java

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

core/src/mindustry/ctype/UnlockableContent.java

@@ -4,7 +4,7 @@ import arc.*;
 import arc.func.*;
 import arc.graphics.g2d.*;
 import arc.scene.ui.layout.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.game.EventType.*;
 import mindustry.graphics.*;

core/src/mindustry/editor/MapEditorDialog.java

@@ -15,7 +15,6 @@ import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.ArcAnnotate.*;
 import mindustry.*;
 import mindustry.content.*;
 import mindustry.core.GameState.*;

core/src/mindustry/entities/Effect.java

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

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

@@ -3,7 +3,6 @@ package mindustry.entities.bullet;
 import arc.audio.*;
 import arc.graphics.*;
 import arc.math.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;

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

@@ -3,7 +3,7 @@ package mindustry.entities.bullet;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.geom.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.gen.*;

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

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

core/src/mindustry/entities/comp/BuildingComp.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 arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.audio.*;

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

@@ -1,6 +1,6 @@
 package mindustry.entities.comp;
 
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 

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

@@ -3,7 +3,7 @@ package mindustry.entities.comp;
 import arc.func.*;
 import arc.math.geom.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.ai.formations.*;
 import mindustry.ai.types.*;
 import mindustry.annotations.Annotations.*;

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

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

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

@@ -6,7 +6,6 @@ import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.pooling.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;

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

@@ -1,7 +1,7 @@
 package mindustry.entities.comp;
 
 import arc.math.geom.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
@@ -55,7 +55,8 @@ abstract class PosComp implements Position{
         return tile != null && tile.solid();
     }
 
-    @Nullable Tile tileOn(){
+    @Nullable
+    Tile tileOn(){
         return world.tileWorld(x, y);
     }
 

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

@@ -1,6 +1,6 @@
 package mindustry.entities.comp;
 
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.game.*;
 import mindustry.gen.*;
@@ -17,7 +17,8 @@ abstract class TeamComp implements Posc{
         return team.rules().cheat;
     }
 
-    public @Nullable Building core(){
+    public @Nullable
+    Building core(){
         return team.core();
     }
 

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

@@ -6,7 +6,6 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.ai.*;
 import mindustry.annotations.Annotations.*;

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

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

core/src/mindustry/entities/units/AIController.java

@@ -2,7 +2,6 @@ package mindustry.entities.units;
 
 import arc.math.*;
 import arc.math.geom.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.entities.*;

core/src/mindustry/entities/units/BuildPlan.java

@@ -2,7 +2,7 @@ package mindustry.entities.units;
 
 import arc.func.*;
 import arc.math.geom.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.gen.*;
 import mindustry.world.*;
 

core/src/mindustry/entities/units/WeaponMount.java

@@ -1,6 +1,6 @@
 package mindustry.entities.units;
 
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 

core/src/mindustry/game/EventType.java

@@ -1,6 +1,6 @@
 package mindustry.game;
 
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.core.GameState.*;
 import mindustry.ctype.*;
 import mindustry.entities.units.*;

core/src/mindustry/game/Rules.java

@@ -2,7 +2,7 @@ package mindustry.game;
 
 import arc.graphics.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import arc.util.serialization.*;
 import arc.util.serialization.Json.*;
 import mindustry.content.*;

core/src/mindustry/game/Saves.java

@@ -5,7 +5,6 @@ import arc.assets.*;
 import arc.files.*;
 import arc.graphics.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.async.*;
 import mindustry.*;

core/src/mindustry/game/Schematic.java

@@ -2,7 +2,7 @@ package mindustry.game;
 
 import arc.files.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.content.*;
 import mindustry.mod.Mods.*;
 import mindustry.type.*;

core/src/mindustry/game/Schematics.java

@@ -9,7 +9,6 @@ import arc.graphics.gl.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.io.*;
 import arc.util.io.Streams.*;

core/src/mindustry/game/SectorInfo.java

@@ -2,7 +2,6 @@ package mindustry.game;
 
 import arc.math.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.ctype.*;

core/src/mindustry/game/Team.java

@@ -4,7 +4,7 @@ import arc.*;
 import arc.graphics.*;
 import arc.math.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.game.Rules.*;
 import mindustry.game.Teams.*;
 import mindustry.graphics.*;
@@ -91,7 +91,8 @@ public class Team implements Comparable<Team>{
         return state.teams.get(this);
     }
 
-    public @Nullable CoreBuild core(){
+    public @Nullable
+    CoreBuild core(){
         return data().core();
     }
 

core/src/mindustry/game/Teams.java

@@ -3,7 +3,7 @@ package mindustry.game;
 import arc.func.*;
 import arc.math.geom.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.ai.*;
 import mindustry.content.*;
 import mindustry.entities.units.*;
@@ -24,7 +24,8 @@ public class Teams{
         active.add(get(Team.crux));
     }
 
-    public @Nullable CoreBuild closestEnemyCore(float x, float y, Team team){
+    public @Nullable
+    CoreBuild closestEnemyCore(float x, float y, Team team){
         for(Team enemy : team.enemies()){
             CoreBuild tile = Geometry.findClosest(x, y, enemy.cores());
             if(tile != null) return tile;

core/src/mindustry/graphics/MinimapRenderer.java

@@ -9,7 +9,6 @@ import arc.math.geom.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.pooling.*;
 import mindustry.entities.*;
 import mindustry.game.EventType.*;

core/src/mindustry/graphics/Shaders.java

@@ -8,7 +8,6 @@ import arc.graphics.g3d.*;
 import arc.graphics.gl.*;
 import arc.math.geom.*;
 import arc.scene.ui.layout.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.type.*;
 

core/src/mindustry/input/DesktopInput.java

@@ -10,7 +10,6 @@ import arc.scene.*;
 import arc.scene.event.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.entities.units.*;

core/src/mindustry/input/InputHandler.java

@@ -12,7 +12,6 @@ import arc.scene.*;
 import arc.scene.event.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.ai.formations.patterns.*;
 import mindustry.annotations.Annotations.*;

core/src/mindustry/io/TypeIO.java

@@ -3,7 +3,7 @@ package mindustry.io;
 import arc.graphics.*;
 import arc.math.geom.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import arc.util.io.*;
 import arc.util.pooling.*;
 import mindustry.ai.types.*;

core/src/mindustry/logic/LAssembler.java

@@ -2,7 +2,7 @@ package mindustry.logic;
 
 import arc.func.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.*;
 import mindustry.gen.*;
 import mindustry.logic.LExecutor.*;
@@ -202,7 +202,8 @@ public class LAssembler{
         }
     }
 
-    public @Nullable BVar getVar(String name){
+    public @Nullable
+    BVar getVar(String name){
         return vars.get(name);
     }
 

core/src/mindustry/logic/LExecutor.java

@@ -1,7 +1,6 @@
 package mindustry.logic;
 
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.noise.*;
 import mindustry.*;

core/src/mindustry/logic/LStatement.java

@@ -9,7 +9,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.logic.LCanvas.*;
 import mindustry.logic.LExecutor.*;

core/src/mindustry/maps/Map.java

@@ -4,7 +4,6 @@ import arc.*;
 import arc.files.*;
 import arc.graphics.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.game.EventType.*;

core/src/mindustry/maps/Maps.java

@@ -8,7 +8,6 @@ import arc.func.*;
 import arc.graphics.*;
 import arc.struct.IntSet.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.async.*;
 import arc.util.io.*;

core/src/mindustry/mod/ContentParser.java

@@ -8,7 +8,6 @@ import arc.func.*;
 import arc.graphics.*;
 import arc.mock.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.serialization.*;
 import arc.util.serialization.Json.*;

core/src/mindustry/mod/Mods.java

@@ -11,7 +11,6 @@ import arc.graphics.g2d.TextureAtlas.*;
 import arc.scene.ui.*;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.io.*;
 import arc.util.serialization.*;
 import arc.util.serialization.Jval.*;

core/src/mindustry/net/Administration.java

@@ -3,7 +3,6 @@ package mindustry.net;
 import arc.*;
 import arc.func.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.Log.*;
 import arc.util.pooling.Pool.*;

core/src/mindustry/net/Host.java

@@ -1,6 +1,6 @@
 package mindustry.net;
 
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.*;
 import mindustry.game.*;
 

core/src/mindustry/net/Net.java

@@ -4,7 +4,6 @@ import arc.*;
 import arc.func.*;
 import arc.net.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.pooling.*;
 import mindustry.gen.*;

core/src/mindustry/net/NetConnection.java

@@ -1,7 +1,6 @@
 package mindustry.net;
 
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;

core/src/mindustry/type/Liquid.java

@@ -2,7 +2,7 @@ package mindustry.type;
 
 import arc.graphics.*;
 import arc.scene.ui.layout.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.content.*;
 import mindustry.ctype.*;
 import mindustry.ui.*;

core/src/mindustry/type/Planet.java

@@ -7,7 +7,6 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.noise.*;
 import mindustry.ctype.*;

core/src/mindustry/type/Publishable.java

@@ -2,13 +2,14 @@ package mindustry.type;
 
 import arc.files.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.*;
 
 /** Defines a piece of content that can be published on the Workshop. */
 public interface Publishable{
     /** @return workshop item ID, or null if this isn't on the workshop. */
-    @Nullable String getSteamID();
+    @Nullable
+    String getSteamID();
     /** adds a steam ID to this item once it's published. should save the item to make sure this change is persisted. */
     void addSteamID(String id);
     /** removes the item ID; called when the item isn't found. */

core/src/mindustry/type/Sector.java

@@ -4,7 +4,6 @@ import arc.*;
 import arc.func.*;
 import arc.math.geom.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.game.Saves.*;

core/src/mindustry/ui/ItemsDisplay.java

@@ -5,7 +5,7 @@ import arc.math.*;
 import arc.scene.actions.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.core.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;

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

@@ -13,7 +13,6 @@ import arc.scene.event.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
-import arc.util.ArcAnnotate.*;
 import mindustry.core.*;
 import mindustry.ctype.*;
 import mindustry.game.*;

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

@@ -14,7 +14,6 @@ import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.ArcAnnotate.*;
 import mindustry.content.*;
 import mindustry.content.TechTree.*;
 import mindustry.core.*;

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

@@ -10,7 +10,6 @@ import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.core.*;
 import mindustry.entities.*;

core/src/mindustry/world/Block.java

@@ -12,7 +12,6 @@ import arc.scene.ui.layout.*;
 import arc.struct.EnumSet;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.pooling.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.core.*;

core/src/mindustry/world/Tile.java

@@ -7,7 +7,7 @@ import arc.math.geom.QuadTree.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.game.*;

core/src/mindustry/world/Tiles.java

@@ -3,7 +3,7 @@ package mindustry.world;
 import arc.func.*;
 import arc.math.*;
 import arc.math.geom.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 
 import java.util.*;
 
@@ -45,7 +45,8 @@ public class Tiles implements Iterable<Tile>{
     }
 
     /** @return a tile at coordinates, or null if out of bounds */
-    public @Nullable Tile get(int x, int y){
+    public @Nullable
+    Tile get(int x, int y){
         return (x < 0 || x >= width || y < 0 || y >= height) ? null : array[y*width + x];
     }
 

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

@@ -3,7 +3,6 @@ package mindustry.world.blocks;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
@@ -149,20 +148,19 @@ public interface Autotiler{
      * @param bits The blending value array
      */
     default void transformCase(int num, int[] bits){
-        if(num == 0){
+        switch(num){
-            bits[0] = 3;
+            case 0 -> bits[0] = 3;
-        }else if(num == 1){
+            case 1 -> bits[0] = 4;
-            bits[0] = 4;
+            case 2 -> bits[0] = 2;
-        }else if(num == 2){
+            case 3 -> {
-            bits[0] = 2;
+                bits[0] = 2;
-        }else if(num == 3){
+                bits[2] = -1;
-            bits[0] = 2;
+            }
-            bits[2] = -1;
+            case 4 -> {
-        }else if(num == 4){
+                bits[0] = 1;
-            bits[0] = 1;
+                bits[2] = -1;
-            bits[2] = -1;
+            }
-        }else if(num == 5){
+            case 5 -> bits[0] = 1;
-            bits[0] = 1;
         }
     }
 

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

@@ -6,7 +6,6 @@ import arc.Graphics.Cursor.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.annotations.Annotations.*;

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

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

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

@@ -3,7 +3,6 @@ package mindustry.world.blocks.defense;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.annotations.Annotations.*;

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

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

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

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

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

@@ -1,7 +1,6 @@
 package mindustry.world.blocks.distribution;
 
 import arc.math.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.gen.*;

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

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

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

@@ -3,7 +3,6 @@ package mindustry.world.blocks.distribution;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.scene.ui.layout.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.entities.units.*;

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

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

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

@@ -4,7 +4,6 @@ import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.*;

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

@@ -1,6 +1,6 @@
 package mindustry.world.blocks.payloads;
 
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import arc.util.io.*;
 import mindustry.game.*;
 import mindustry.gen.*;

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

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

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

@@ -3,7 +3,7 @@ package mindustry.world.blocks.production;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;

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

@@ -3,7 +3,6 @@ package mindustry.world.blocks.production;
 import arc.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;

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

@@ -2,7 +2,6 @@ package mindustry.world.blocks.sandbox;
 
 import arc.graphics.g2d.*;
 import arc.scene.ui.layout.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.entities.units.*;

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

@@ -1,7 +1,7 @@
 package mindustry.world.blocks.storage;
 
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;

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

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

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

@@ -2,7 +2,6 @@ package mindustry.world.modules;
 
 import arc.math.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.type.*;

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

@@ -1,7 +1,6 @@
 package mindustry.world.modules;
 
 import arc.math.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.type.*;

server/src/mindustry/server/ServerControl.java

@@ -4,7 +4,6 @@ import arc.*;
 import arc.files.*;
 import arc.struct.*;
 import arc.struct.Seq.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.Timer;
 import arc.util.CommandHandler.*;