Cleanup continues

core/src/mindustry/graphics/MinimapRenderer.java

@@ -12,7 +12,7 @@ import arc.util.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.pooling.*;
 import mindustry.entities.*;
-import mindustry.entities.type.*;
+import mindustry.gen.*;
 import mindustry.game.EventType.*;
 import mindustry.io.*;
 import mindustry.ui.*;
@@ -97,8 +97,8 @@ public class MinimapRenderer implements Disposable{
             Draw.rect(unit.getIconRegion(), x + rx, y + ry, scale, scale, unit.rotation - 90);
             Draw.reset();
 
-            if(withLabels && unit instanceof Player){
-                Player pl = (Player) unit;
+            if(withLabels && unit instanceof Playerc){
+                Playerc pl = (Playerc) unit;
                 if(!pl.isLocal){
                     // Only display names for other players.
                     drawLabel(x + rx, y + ry, pl.name, unit.getTeam().color);

core/src/mindustry/graphics/OverlayRenderer.java

@@ -9,7 +9,7 @@ import arc.util.*;
 import mindustry.*;
 import mindustry.content.*;
 import mindustry.entities.*;
-import mindustry.entities.type.*;
+import mindustry.gen.*;
 import mindustry.input.*;
 import mindustry.type.*;
 import mindustry.ui.*;
@@ -36,7 +36,7 @@ public class OverlayRenderer{
     public void drawTop(){
 
         if(Core.settings.getBool("indicators")){
-            for(Player player : playerGroup.all()){
+            for(Playerc player : Groups.player.all()){
                 if(Vars.player != player && Vars.player.team() == player.team()){
                     if(!rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f)
                     .setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x, player.y)){

core/src/mindustry/graphics/Pixelator.java

@@ -6,11 +6,11 @@ import arc.graphics.Texture.TextureFilter;
 import arc.graphics.g2d.Draw;
 import arc.graphics.gl.FrameBuffer;
 import arc.util.Disposable;
-import mindustry.entities.type.Player;
+import mindustry.gen.*;
 
 import static arc.Core.camera;
 import static arc.Core.graphics;
-import static mindustry.Vars.playerGroup;
+import static mindustry.Groups.player;
 import static mindustry.Vars.renderer;
 
 public class Pixelator implements Disposable{
@@ -55,7 +55,7 @@ public class Pixelator implements Disposable{
         Draw.rect(Draw.wrap(buffer.getTexture()), Core.camera.position.x, Core.camera.position.y, Core.camera.width, -Core.camera.height);
         Draw.blend();
 
-        playerGroup.draw(p -> !p.isDead(), Player::drawName);
+        Groups.player.draw(p -> !p.isDead(), Playerc::drawName);
 
         Core.camera.position.set(px, py);
         Core.settings.put("animatedwater", hadWater);