Refactoring

core/src/mindustry/io/SaveVersion.java

@@ -8,7 +8,6 @@ import mindustry.core.*;
 import mindustry.ctype.*;
 import mindustry.ctype.ContentType;
 import mindustry.entities.*;
-import mindustry.entities.traits.*;
 import mindustry.game.*;
 import mindustry.game.Teams.*;
 import mindustry.maps.*;

core/src/mindustry/io/TypeIO.java

@@ -42,8 +42,8 @@ public class TypeIO{
         return id == -1 ? null : playerGroup.getByID(id);
     }
 
-    @WriteClass(Unit.class)
-    public static void writeUnit(ByteBuffer buffer, Unit unit){
+    @WriteClass(Unitc.class)
+    public static void writeUnit(ByteBuffer buffer, Unitc unit){
         if(unit.getGroup() == null){
             buffer.put((byte)-1);
             return;
@@ -52,12 +52,12 @@ public class TypeIO{
         buffer.putInt(unit.getID());
     }
 
-    @ReadClass(Unit.class)
-    public static Unit readUnit(ByteBuffer buffer){
+    @ReadClass(Unitc.class)
+    public static Unitc readUnit(ByteBuffer buffer){
         byte gid = buffer.get();
         if(gid == -1) return null;
         int id = buffer.getInt();
-        return (Unit)entities.get(gid).getByID(id);
+        return (Unitc)entities.get(gid).getByID(id);
     }
 
     @WriteClass(ShooterTrait.class)

core/src/mindustry/io/versions/Save1.java

@@ -1,7 +1,7 @@
 package mindustry.io.versions;
 
 import arc.func.*;
-import mindustry.entities.traits.*;
+import mindustry.entities.*;
 
 import java.io.*;
 

core/src/mindustry/io/versions/Save2.java

@@ -1,7 +1,7 @@
 package mindustry.io.versions;
 
 import mindustry.ctype.ContentType;
-import mindustry.entities.traits.*;
+import mindustry.entities.*;
 import mindustry.io.*;
 import mindustry.type.TypeID;