Made team a separate class

core/src/mindustry/entities/Damage.java

@@ -88,7 +88,7 @@ public class Damage{
         tr.trns(angle, length);
         Intc2 collider = (cx, cy) -> {
             Tile tile = world.ltile(cx, cy);
-            if(tile != null && !collidedBlocks.contains(tile.pos()) && tile.entity != null && tile.getTeamID() != team.ordinal() && tile.entity.collide(hitter)){
+            if(tile != null && !collidedBlocks.contains(tile.pos()) && tile.entity != null && tile.getTeamID() != (int) team.id && tile.entity.collide(hitter)){
                 tile.entity.collision(hitter);
                 collidedBlocks.add(tile.pos());
                 hitter.getBulletType().hit(hitter, tile.worldx(), tile.worldy());

core/src/mindustry/entities/Units.java

@@ -157,7 +157,7 @@ public class Units{
 
     /** Iterates over all units in a rectangle. */
     public static void nearby(Team team, float x, float y, float width, float height, Cons<Unit> cons){
-        unitGroups[team.ordinal()].intersect(x, y, width, height, cons);
+        unitGroups[(int) team.id].intersect(x, y, width, height, cons);
         playerGroup.intersect(x, y, width, height, player -> {
             if(player.getTeam() == team){
                 cons.get(player);
@@ -167,7 +167,7 @@ public class Units{
 
     /** Iterates over all units in a circle around this position. */
     public static void nearby(Team team, float x, float y, float radius, Cons<Unit> cons){
-        unitGroups[team.ordinal()].intersect(x - radius, y - radius, radius*2f, radius*2f, unit -> {
+        unitGroups[(int) team.id].intersect(x - radius, y - radius, radius*2f, radius*2f, unit -> {
             if(unit.withinDst(x, y, radius)){
                 cons.get(unit);
             }
@@ -183,7 +183,7 @@ public class Units{
     /** Iterates over all units in a rectangle. */
     public static void nearby(float x, float y, float width, float height, Cons<Unit> cons){
         for(Team team : Team.all){
-            unitGroups[team.ordinal()].intersect(x, y, width, height, cons);
+            unitGroups[(int) team.id].intersect(x, y, width, height, cons);
         }
 
         playerGroup.intersect(x, y, width, height, cons);
@@ -199,7 +199,7 @@ public class Units{
         EnumSet<Team> targets = state.teams.enemiesOf(team);
 
         for(Team other : targets){
-            unitGroups[other.ordinal()].intersect(x, y, width, height, cons);
+            unitGroups[(int) other.id].intersect(x, y, width, height, cons);
         }
 
         playerGroup.intersect(x, y, width, height, player -> {
@@ -217,7 +217,7 @@ public class Units{
     /** Iterates over all units. */
     public static void all(Cons<Unit> cons){
         for(Team team : Team.all){
-            unitGroups[team.ordinal()].all().each(cons);
+            unitGroups[(int) team.id].all().each(cons);
         }
 
         playerGroup.all().each(cons);

core/src/mindustry/entities/type/BaseUnit.java

@@ -365,7 +365,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
 
     @Override
     public EntityGroup targetGroup(){
-        return unitGroups[team.ordinal()];
+        return unitGroups[(int) team.id];
     }
 
     @Override

core/src/mindustry/entities/type/Unit.java

@@ -169,7 +169,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
     public void writeSave(DataOutput stream, boolean net) throws IOException{
         if(item.item == null) item.item = Items.copper;
 
-        stream.writeByte(team.ordinal());
+        stream.writeByte((int) team.id);
         stream.writeBoolean(isDead());
         stream.writeFloat(net ? interpolator.target.x : x);
         stream.writeFloat(net ? interpolator.target.y : y);
@@ -220,7 +220,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
 
         for(Team team : Team.all){
             if(team != getTeam() || !(this instanceof Player)){
-                avoid(unitGroups[team.ordinal()].intersect(cx, cy, fsize, fsize));
+                avoid(unitGroups[(int) team.id].intersect(cx, cy, fsize, fsize));
             }
         }
 

core/src/mindustry/entities/type/base/BuilderDrone.java

@@ -114,7 +114,7 @@ public class BuilderDrone extends BaseDrone implements BuilderTrait{
     public BuilderDrone(){
         if(reset.check()){
             Events.on(BuildSelectEvent.class, event -> {
-                EntityGroup<BaseUnit> group = unitGroups[event.team.ordinal()];
+                EntityGroup<BaseUnit> group = unitGroups[(int) event.team.id];
 
                 if(!(event.tile.entity instanceof BuildEntity)) return;