Moved Nullable to utils package

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;