it is done

CONTRIBUTING.md

@@ -31,7 +31,7 @@ Import [this style file](.github/Mindustry-CodeStyle-IJ.xml) into IntelliJ to ge
 
 #### Do not use incompatible Java features (java.util.function, java.awt).
 Android [does not support](https://developer.android.com/studio/write/java8-support#supported_features) many of Java 8's features, such as the packages `java.util.function`, `java.util.stream` or `forEach` in collections. Do not use these in your code.  
-If you need to use functional interfaces, use the ones in `io.anuke.arc.func`, which are more or less the same with different naming schemes.
+If you need to use functional interfaces, use the ones in `arc.func`, which are more or less the same with different naming schemes.
   
 The same applies to any class *outside* of the standard `java.[n]io` / `java.net` / `java.util` packages: Most of them are not supported.  
 `java.awt` is one of these packages: do not use it, ever. It is not supported on any platform, even desktop - the entire package is removed during JRE minimization.
@@ -39,7 +39,7 @@ In general, if you are using IntelliJ, you should be warned about platform incom
 
 
 #### Use `arc` collections and classes when possible.
-Instead of using `java.util.List`, `java.util.HashMap`, and other standard Java collections, use `Array`, `ObjectMap` and other equivalents from `io.anuke.arc.collection`. 
+Instead of using `java.util.List`, `java.util.HashMap`, and other standard Java collections, use `Array`, `ObjectMap` and other equivalents from `arc.struct`.
 Why? Because that's what the rest of the codebase uses, and the standard collections have a lot of cruft and usability issues associated with them.  
 In the rare case that concurrency is required, you may use the standard Java classes for that purpose (e.g. `CopyOnWriteArrayList`).  
 
@@ -47,7 +47,7 @@ What you'll usually need to change:
 - `HashSet` -> `ObjectSet`
 - `HashMap` -> `ObjectMap`
 - `List` / `ArrayList` / `Stack` -> `Array`
-- `java.util.Queue` -> `io.anuke.arc.collection.Queue`
+- `java.util.Queue` -> `arc.struct.Queue`
 - *Many others*
 
 

android/proguard-project.txt

@@ -22,8 +22,8 @@
 -verbose
 -verbose
 -ignorewarnings
--keep class io.anuke.mindustry.game.Rules
+-keep class mindustry.game.Rules
--keep class io.anuke.mindustry.desktop.DesktopLauncher
+-keep class mindustry.desktop.DesktopLauncher
 -keepclasseswithmembers public class * {
     public static void main(java.lang.String[]);
 }

android/src/io/anuke/mindustry/AndroidLauncher.java

@@ -11,14 +11,14 @@ import android.provider.Settings.*;
 import android.telephony.*;
 import io.anuke.arc.*;
 import io.anuke.arc.backends.android.surfaceview.*;
-import io.anuke.arc.files.*;
+import arc.files.*;
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.scene.ui.layout.*;
+import arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.arc.util.serialization.*;
+import arc.util.serialization.*;
-import io.anuke.mindustry.game.Saves.*;
+import mindustry.game.Saves.*;
-import io.anuke.mindustry.io.*;
+import mindustry.io.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import mindustry.ui.dialogs.*;
 
 import java.io.*;
 import java.lang.System;

annotations/src/main/java/mindustry/annotations/Annotations.java

@@ -1,4 +1,4 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import java.lang.annotation.*;
 

annotations/src/main/java/mindustry/annotations/AssetsAnnotationProcessor.java

@@ -1,7 +1,7 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import com.squareup.javapoet.*;
-import io.anuke.annotations.Annotations.*;
+import mindustry.annotations.Annotations.*;
 
 import javax.annotation.processing.*;
 import javax.lang.model.*;
@@ -12,10 +12,10 @@ import java.nio.file.*;
 import java.util.*;
 
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
-@SupportedAnnotationTypes("io.anuke.annotations.Annotations.StyleDefaults")
+@SupportedAnnotationTypes("mindustry.annotations.Annotations.StyleDefaults")
 public class AssetsAnnotationProcessor extends AbstractProcessor{
     /** Name of the base package to put all the generated classes. */
-    private static final String packageName = "io.anuke.mindustry.gen";
+    private static final String packageName = "mindustry.gen";
     private String path;
     private int round;
 
@@ -39,8 +39,8 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
             .getParent().getParent().getParent().getParent().getParent().getParent().toString();
             path = path.replace("%20", " ");
 
-            processSounds("Sounds", path + "/assets/sounds", "io.anuke.arc.audio.Sound");
+            processSounds("Sounds", path + "/assets/sounds", "arc.audio.Sound");
-            processSounds("Musics", path + "/assets/music", "io.anuke.arc.audio.Music");
+            processSounds("Musics", path + "/assets/music", "arc.audio.Music");
             processUI(roundEnv.getElementsAnnotatedWith(StyleDefaults.class));
 
             return true;
@@ -75,7 +75,7 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
                 suffix = suffix.isEmpty() ? "" : "-" + suffix;
 
                 String sfilen = filename + suffix;
-                String dtype = p.getFileName().toString().endsWith(".9.png") ? "io.anuke.arc.scene.style.NinePatchDrawable" : "io.anuke.arc.scene.style.TextureRegionDrawable";
+                String dtype = p.getFileName().toString().endsWith(".9.png") ? "arc.scene.style.NinePatchDrawable" : "arc.scene.style.TextureRegionDrawable";
 
                 String varname = capitalize(sfilen);
                 TypeSpec.Builder ttype = type;
@@ -100,7 +100,7 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
             t.getEnclosedElements().stream().filter(e -> e.getKind() == ElementKind.FIELD).forEach(field -> {
                 String fname = field.getSimpleName().toString();
                 if(fname.startsWith("default")){
-                    loadStyles.addStatement("io.anuke.arc.Core.scene.addStyle(" + field.asType().toString() + ".class, io.anuke.mindustry.ui.Styles." + fname + ")");
+                    loadStyles.addStatement("io.anuke.arc.Core.scene.addStyle(" + field.asType().toString() + ".class, mindustry.ui.Styles." + fname + ")");
                 }
             });
         }
@@ -142,11 +142,11 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
 
             dispose.addStatement("io.anuke.arc.Core.assets.unload(" + filename + ")");
             dispose.addStatement(name + " = null");
-            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new io.anuke.arc.audio.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
         });
 
         if(classname.equals("Sounds")){
-            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new io.anuke.arc.audio.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
         }
 
         type.addMethod(loadBegin.build());

annotations/src/main/java/mindustry/annotations/CallSuperAnnotationProcessor.java

@@ -1,9 +1,9 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import com.sun.source.util.*;
 import com.sun.tools.javac.tree.*;
 import com.sun.tools.javac.tree.JCTree.*;
-import io.anuke.annotations.Annotations.*;
+import mindustry.annotations.Annotations.*;
 
 import javax.annotation.processing.*;
 import javax.lang.model.*;

annotations/src/main/java/mindustry/annotations/ClassEntry.java

@@ -1,4 +1,4 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import java.util.ArrayList;
 

annotations/src/main/java/mindustry/annotations/CodeAnalyzerTreeScanner.java

@@ -1,4 +1,4 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import com.sun.source.tree.*;
 import com.sun.source.util.TreePathScanner;
@@ -9,7 +9,7 @@ import com.sun.tools.javac.code.Symbol.MethodSymbol;
 import com.sun.tools.javac.code.Type.ClassType;
 import com.sun.tools.javac.tree.JCTree.JCIdent;
 import com.sun.tools.javac.tree.JCTree.JCTypeApply;
-import io.anuke.annotations.Annotations.CallSuper;
+import mindustry.annotations.Annotations.CallSuper;
 
 import java.lang.annotation.Annotation;
 

annotations/src/main/java/mindustry/annotations/IOFinder.java

@@ -1,7 +1,7 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
-import io.anuke.annotations.Annotations.ReadClass;
+import mindustry.annotations.Annotations.ReadClass;
-import io.anuke.annotations.Annotations.WriteClass;
+import mindustry.annotations.Annotations.WriteClass;
 
 import javax.annotation.processing.RoundEnvironment;
 import javax.lang.model.element.Element;
@@ -11,8 +11,8 @@ import java.util.HashMap;
 import java.util.Set;
 
 /**
- * This class finds reader and writer methods annotated by the {@link io.anuke.annotations.Annotations.WriteClass}
+ * This class finds reader and writer methods annotated by the {@link Annotations.WriteClass}
- * and {@link io.anuke.annotations.Annotations.ReadClass} annotations.
+ * and {@link Annotations.ReadClass} annotations.
  */
 public class IOFinder{
 

annotations/src/main/java/mindustry/annotations/MethodEntry.java

@@ -1,6 +1,6 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
-import io.anuke.annotations.Annotations.*;
+import mindustry.annotations.Annotations.*;
 
 import javax.lang.model.element.ExecutableElement;
 

annotations/src/main/java/mindustry/annotations/RemoteMethodAnnotationProcessor.java

@@ -1,9 +1,9 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import com.squareup.javapoet.*;
-import io.anuke.annotations.Annotations.Loc;
+import mindustry.annotations.Annotations.Loc;
-import io.anuke.annotations.Annotations.Remote;
+import mindustry.annotations.Annotations.Remote;
-import io.anuke.annotations.IOFinder.ClassSerializer;
+import mindustry.annotations.IOFinder.ClassSerializer;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
@@ -16,9 +16,9 @@ import java.util.stream.Collectors;
 /** The annotation processor for generating remote method call code. */
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 @SupportedAnnotationTypes({
-"io.anuke.annotations.Annotations.Remote",
+"mindustry.annotations.Annotations.Remote",
-"io.anuke.annotations.Annotations.WriteClass",
+"mindustry.annotations.Annotations.WriteClass",
-"io.anuke.annotations.Annotations.ReadClass",
+"mindustry.annotations.Annotations.ReadClass",
 })
 public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
     /** Maximum size of each event packet. */
@@ -26,7 +26,7 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
     /** Warning on top of each autogenerated file. */
     public static final String autogenWarning = "Autogenerated file. Do not modify!\n";
     /** Name of the base package to put all the generated classes. */
-    private static final String packageName = "io.anuke.mindustry.gen";
+    private static final String packageName = "mindustry.gen";
 
     /** Name of class that handles reading and invoking packets on the server. */
     private static final String readServerName = "RemoteReadServer";

annotations/src/main/java/mindustry/annotations/RemoteReadGenerator.java

@@ -1,7 +1,7 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import com.squareup.javapoet.*;
-import io.anuke.annotations.IOFinder.ClassSerializer;
+import mindustry.annotations.IOFinder.ClassSerializer;
 
 import javax.lang.model.element.*;
 import javax.tools.Diagnostic.Kind;
@@ -47,7 +47,7 @@ public class RemoteReadGenerator{
             Constructor<TypeName> cons = TypeName.class.getDeclaredConstructor(String.class);
             cons.setAccessible(true);
 
-            TypeName playerType = cons.newInstance("io.anuke.mindustry.entities.type.Player");
+            TypeName playerType = cons.newInstance("mindustry.entities.type.Player");
             //add player parameter
             readMethod.addParameter(playerType, "player");
         }

annotations/src/main/java/mindustry/annotations/RemoteWriteGenerator.java

@@ -1,8 +1,8 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import com.squareup.javapoet.*;
-import io.anuke.annotations.Annotations.Loc;
+import mindustry.annotations.Annotations.Loc;
-import io.anuke.annotations.IOFinder.ClassSerializer;
+import mindustry.annotations.IOFinder.ClassSerializer;
 
 import javax.lang.model.element.*;
 import javax.tools.Diagnostic.Kind;
@@ -77,7 +77,7 @@ public class RemoteWriteGenerator{
                 return;
             }
 
-            if(!elem.getParameters().get(0).asType().toString().equals("io.anuke.mindustry.entities.type.Player")){
+            if(!elem.getParameters().get(0).asType().toString().equals("mindustry.entities.type.Player")){
                 Utils.messager.printMessage(Kind.ERROR, "Client invoke methods should have a first parameter of type Player.", elem);
                 return;
             }
@@ -85,12 +85,12 @@ public class RemoteWriteGenerator{
 
         //if toAll is false, it's a 'send to one player' variant, so add the player as a parameter
         if(!toAll){
-            method.addParameter(ClassName.bestGuess("io.anuke.mindustry.net.NetConnection"), "playerConnection");
+            method.addParameter(ClassName.bestGuess("mindustry.net.NetConnection"), "playerConnection");
         }
 
         //add sender to ignore
         if(forwarded){
-            method.addParameter(ClassName.bestGuess("io.anuke.mindustry.net.NetConnection"), "exceptConnection");
+            method.addParameter(ClassName.bestGuess("mindustry.net.NetConnection"), "exceptConnection");
         }
 
         //call local method if applicable, shouldn't happen when forwarding method as that already happens by default
@@ -127,7 +127,7 @@ public class RemoteWriteGenerator{
         method.beginControlFlow("if(" + getCheckString(methodEntry.where) + ")");
 
         //add statement to create packet from pool
-        method.addStatement("$1N packet = $2N.obtain($1N.class, $1N::new)", "io.anuke.mindustry.net.Packets.InvokePacket", "io.anuke.arc.util.pooling.Pools");
+        method.addStatement("$1N packet = $2N.obtain($1N.class, $1N::new)", "mindustry.net.Packets.InvokePacket", "arc.util.pooling.Pools");
         //assign buffer
         method.addStatement("packet.writeBuffer = TEMP_BUFFER");
         //assign priority
@@ -206,7 +206,7 @@ public class RemoteWriteGenerator{
 
         //send the actual packet
         method.addStatement(sendString + "packet, " +
-        (methodEntry.unreliable ? "io.anuke.mindustry.net.Net.SendMode.udp" : "io.anuke.mindustry.net.Net.SendMode.tcp") + ")");
+        (methodEntry.unreliable ? "mindustry.net.Net.SendMode.udp" : "mindustry.net.Net.SendMode.tcp") + ")");
 
 
         //end check for server/client

annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java

@@ -1,7 +1,7 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import com.squareup.javapoet.*;
-import io.anuke.annotations.Annotations.*;
+import mindustry.annotations.Annotations.*;
 
 import javax.annotation.processing.*;
 import javax.lang.model.*;
@@ -14,12 +14,12 @@ import java.util.*;
 import java.util.zip.*;
 
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
-@SupportedAnnotationTypes("io.anuke.annotations.Annotations.Serialize")
+@SupportedAnnotationTypes("mindustry.annotations.Annotations.Serialize")
 public class SerializeAnnotationProcessor extends AbstractProcessor{
     /** Target class name. */
     private static final String className = "Serialization";
     /** Name of the base package to put all the generated classes. */
-    private static final String packageName = "io.anuke.mindustry.gen";
+    private static final String packageName = "mindustry.gen";
 
     private int round;
 

annotations/src/main/java/mindustry/annotations/StructAnnotationProcessor.java

@@ -1,8 +1,8 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import com.squareup.javapoet.*;
-import io.anuke.annotations.Annotations.Struct;
+import mindustry.annotations.Annotations.Struct;
-import io.anuke.annotations.Annotations.StructField;
+import mindustry.annotations.Annotations.StructField;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
@@ -19,11 +19,11 @@ import java.util.Set;
  */
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 @SupportedAnnotationTypes({
-"io.anuke.annotations.Annotations.Struct"
+"mindustry.annotations.Annotations.Struct"
 })
 public class StructAnnotationProcessor extends AbstractProcessor{
     /** Name of the base package to put all the generated classes. */
-    private static final String packageName = "io.anuke.mindustry.gen";
+    private static final String packageName = "mindustry.gen";
     private int round;
 
     @Override

annotations/src/main/java/mindustry/annotations/Utils.java

@@ -1,4 +1,4 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.Messager;

annotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,5 +1,5 @@
-io.anuke.annotations.RemoteMethodAnnotationProcessor
+mindustry.annotations.RemoteMethodAnnotationProcessor
-io.anuke.annotations.SerializeAnnotationProcessor
+mindustry.annotations.SerializeAnnotationProcessor
-io.anuke.annotations.StructAnnotationProcessor
+mindustry.annotations.StructAnnotationProcessor
-io.anuke.annotations.CallSuperAnnotationProcessor
+mindustry.annotations.CallSuperAnnotationProcessor
-io.anuke.annotations.AssetsAnnotationProcessor
+mindustry.annotations.AssetsAnnotationProcessor

core/src/io/anuke/mindustry/ctype/ContentList.java

@@ -1,7 +0,0 @@
-package io.anuke.mindustry.ctype;
-
-/** Interface for a list of content to be loaded in {@link io.anuke.mindustry.core.ContentLoader}. */
-public interface ContentList{
-    /** This method should create all the content. */
-    void load();
-}

core/src/io/anuke/mindustry/entities/traits/TeamTrait.java

@@ -1,7 +0,0 @@
-package io.anuke.mindustry.entities.traits;
-
-import io.anuke.mindustry.game.Team;
-
-public interface TeamTrait extends Entity{
-    Team getTeam();
-}

core/src/io/anuke/mindustry/world/producers/Produce.java

@@ -1,4 +0,0 @@
-package io.anuke.mindustry.world.producers;
-
-public class Produce{
-}

core/src/io/anuke/mindustry/world/producers/ProduceItem.java

@@ -1,4 +0,0 @@
-package io.anuke.mindustry.world.producers;
-
-public class ProduceItem{
-}

core/src/mindustry/ClientLauncher.java

@@ -1,26 +1,26 @@
-package io.anuke.mindustry;
+package mindustry;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.assets.*;
+import arc.assets.*;
-import io.anuke.arc.assets.loaders.*;
+import arc.assets.loaders.*;
-import io.anuke.arc.audio.*;
+import arc.audio.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.scene.ui.layout.*;
+import arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.arc.util.async.*;
+import arc.util.async.*;
-import io.anuke.mindustry.core.*;
+import mindustry.core.*;
-import io.anuke.mindustry.ctype.Content;
+import mindustry.ctype.Content;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.maps.*;
+import mindustry.maps.*;
-import io.anuke.mindustry.mod.*;
+import mindustry.mod.*;
-import io.anuke.mindustry.net.Net;
+import mindustry.net.Net;
 
-import static io.anuke.arc.Core.*;
+import static arc.Core.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public abstract class ClientLauncher extends ApplicationCore implements Platform{
     private static final int loadingFPS = 20;

core/src/mindustry/Vars.java

@@ -1,33 +1,33 @@
-package io.anuke.mindustry;
+package mindustry;
 
-import io.anuke.arc.Application.*;
+import arc.*;
-import io.anuke.arc.*;
+import arc.Application.*;
-import io.anuke.arc.assets.*;
+import arc.assets.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.files.*;
+import arc.files.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.scene.ui.layout.*;
+import arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.arc.util.io.*;
+import arc.util.io.*;
-import io.anuke.mindustry.ai.*;
+import mindustry.ai.*;
-import io.anuke.mindustry.core.*;
+import mindustry.core.*;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.effect.*;
+import mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.traits.*;
+import mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.input.*;
+import mindustry.input.*;
-import io.anuke.mindustry.maps.*;
+import mindustry.maps.*;
-import io.anuke.mindustry.mod.*;
+import mindustry.mod.*;
-import io.anuke.mindustry.net.Net;
+import mindustry.net.Net;
-import io.anuke.mindustry.world.blocks.defense.ForceProjector.*;
+import mindustry.world.blocks.defense.ForceProjector.*;
 
 import java.nio.charset.*;
 import java.util.*;
 
-import static io.anuke.arc.Core.settings;
+import static arc.Core.settings;
 
 @SuppressWarnings("unchecked")
 public class Vars implements Loadable{
@@ -124,7 +124,7 @@ public class Vars implements Loadable{
     public static boolean steam;
     /** whether typing into the console is enabled - developers only */
     public static boolean enableConsole = false;
-    /** application data directory, equivalent to {@link io.anuke.arc.Settings#getDataDirectory()} */
+    /** application data directory, equivalent to {@link Settings#getDataDirectory()} */
     public static Fi dataDirectory;
     /** data subdirectory used for screenshots */
     public static Fi screenshotDirectory;
@@ -196,7 +196,7 @@ public class Vars implements Loadable{
 
     public static void init(){
         Serialization.init();
-        DefaultSerializers.typeMappings.put("io.anuke.mindustry.type.ContentType", "io.anuke.mindustry.ctype.ContentType");
+        DefaultSerializers.typeMappings.put("mindustry.type.ContentType", "mindustry.ctype.ContentType");
 
         if(loadLocales){
             //load locales

core/src/mindustry/ai/BlockIndexer.java

@@ -1,21 +1,21 @@
-package io.anuke.mindustry.ai;
+package mindustry.ai;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.game.Teams.*;
+import mindustry.game.Teams.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import mindustry.world.blocks.*;
-import io.anuke.mindustry.world.meta.*;
+import mindustry.world.meta.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 /** Class used for indexing special target blocks for AI. */
 @SuppressWarnings("unchecked")

core/src/mindustry/ai/Pathfinder.java

@@ -1,20 +1,20 @@
-package io.anuke.mindustry.ai;
+package mindustry.ai;
 
-import io.anuke.annotations.Annotations.*;
+import arc.*;
-import io.anuke.arc.*;
+import mindustry.annotations.Annotations.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.arc.util.ArcAnnotate.*;
+import arc.util.ArcAnnotate.*;
-import io.anuke.arc.util.async.*;
+import arc.util.async.*;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
-import io.anuke.mindustry.world.meta.*;
+import mindustry.world.meta.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class Pathfinder implements Runnable{
     private static final long maxUpdate = Time.millisToNanos(4);

core/src/mindustry/ai/WaveSpawner.java

@@ -1,22 +1,22 @@
-package io.anuke.mindustry.ai;
+package mindustry.ai;
 
-import io.anuke.arc.Events;
+import arc.Events;
-import io.anuke.arc.collection.Array;
+import arc.struct.Array;
-import io.anuke.arc.func.Floatc2;
+import arc.func.Floatc2;
-import io.anuke.arc.math.Angles;
+import arc.math.Angles;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.arc.util.Time;
+import arc.util.Time;
-import io.anuke.arc.util.Tmp;
+import arc.util.Tmp;
-import io.anuke.mindustry.content.Blocks;
+import mindustry.content.Blocks;
-import io.anuke.mindustry.content.Fx;
+import mindustry.content.Fx;
-import io.anuke.mindustry.entities.Damage;
+import mindustry.entities.Damage;
-import io.anuke.mindustry.entities.Effects;
+import mindustry.entities.Effects;
-import io.anuke.mindustry.entities.type.BaseUnit;
+import mindustry.entities.type.BaseUnit;
-import io.anuke.mindustry.game.EventType.WorldLoadEvent;
+import mindustry.game.EventType.WorldLoadEvent;
-import io.anuke.mindustry.game.SpawnGroup;
+import mindustry.game.SpawnGroup;
-import io.anuke.mindustry.world.Tile;
+import mindustry.world.Tile;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class WaveSpawner{
     private static final float margin = 40f, coreMargin = tilesize * 3; //how far away from the edge flying units spawn

core/src/mindustry/content/Blocks.java

@@ -1,34 +1,34 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.*;
+import mindustry.*;
-import io.anuke.mindustry.ctype.*;
+import mindustry.ctype.*;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.bullet.*;
+import mindustry.entities.bullet.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import mindustry.world.blocks.*;
-import io.anuke.mindustry.world.blocks.defense.*;
+import mindustry.world.blocks.defense.*;
-import io.anuke.mindustry.world.blocks.defense.turrets.*;
+import mindustry.world.blocks.defense.turrets.*;
-import io.anuke.mindustry.world.blocks.distribution.*;
+import mindustry.world.blocks.distribution.*;
-import io.anuke.mindustry.world.blocks.liquid.*;
+import mindustry.world.blocks.liquid.*;
-import io.anuke.mindustry.world.blocks.logic.*;
+import mindustry.world.blocks.logic.*;
-import io.anuke.mindustry.world.blocks.power.*;
+import mindustry.world.blocks.power.*;
-import io.anuke.mindustry.world.blocks.production.*;
+import mindustry.world.blocks.production.*;
-import io.anuke.mindustry.world.blocks.sandbox.*;
+import mindustry.world.blocks.sandbox.*;
-import io.anuke.mindustry.world.blocks.storage.*;
+import mindustry.world.blocks.storage.*;
-import io.anuke.mindustry.world.blocks.units.*;
+import mindustry.world.blocks.units.*;
-import io.anuke.mindustry.world.consumers.*;
+import mindustry.world.consumers.*;
-import io.anuke.mindustry.world.meta.*;
+import mindustry.world.meta.*;
-import io.anuke.mindustry.world.modules.*;
+import mindustry.world.modules.*;
 
 public class Blocks implements ContentList{
     public static Block
@@ -1511,7 +1511,7 @@ public class Blocks implements ContentList{
                 }
 
                 @Override
-                public void init(io.anuke.mindustry.entities.type.Bullet b){
+                public void init(mindustry.entities.type.Bullet b){
                     for(int i = 0; i < rays; i++){
                         Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), rayLength - Math.abs(i - (rays / 2)) * 20f);
                     }

core/src/mindustry/content/Bullets.java

@@ -1,18 +1,18 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
 
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.ctype.ContentList;
+import mindustry.ctype.ContentList;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.bullet.*;
+import mindustry.entities.bullet.*;
-import io.anuke.mindustry.entities.effect.*;
+import mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class Bullets implements ContentList{
     public static BulletType

core/src/mindustry/content/Fx.java

@@ -1,19 +1,19 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.ctype.ContentList;
+import mindustry.ctype.ContentList;
-import io.anuke.mindustry.entities.Effects.*;
+import mindustry.entities.Effects.*;
-import io.anuke.mindustry.entities.effect.GroundEffectEntity.*;
+import mindustry.entities.effect.GroundEffectEntity.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
-import io.anuke.mindustry.ui.Cicon;
+import mindustry.ui.Cicon;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class Fx implements ContentList{
     public static Effect

core/src/mindustry/content/Items.java

@@ -1,9 +1,9 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
 
-import io.anuke.arc.graphics.Color;
+import arc.graphics.Color;
-import io.anuke.mindustry.ctype.ContentList;
+import mindustry.ctype.ContentList;
-import io.anuke.mindustry.type.Item;
+import mindustry.type.Item;
-import io.anuke.mindustry.type.ItemType;
+import mindustry.type.ItemType;
 
 public class Items implements ContentList{
     public static Item scrap, copper, lead, graphite, coal, titanium, thorium, silicon, plastanium, phasefabric, surgealloy,

core/src/mindustry/content/Liquids.java

@@ -1,8 +1,8 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
 
-import io.anuke.arc.graphics.Color;
+import arc.graphics.Color;
-import io.anuke.mindustry.ctype.ContentList;
+import mindustry.ctype.ContentList;
-import io.anuke.mindustry.type.Liquid;
+import mindustry.type.Liquid;
 
 public class Liquids implements ContentList{
     public static Liquid water, slag, oil, cryofluid;

core/src/mindustry/content/Loadouts.java

@@ -1,7 +1,7 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
 
-import io.anuke.mindustry.ctype.*;
+import mindustry.ctype.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
 
 import java.io.*;
 

core/src/mindustry/content/Mechs.java

@@ -1,19 +1,19 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.*;
+import mindustry.*;
-import io.anuke.mindustry.ctype.ContentList;
+import mindustry.ctype.ContentList;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.bullet.*;
+import mindustry.entities.bullet.*;
-import io.anuke.mindustry.entities.effect.*;
+import mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
 
 public class Mechs implements ContentList{
     public static Mech alpha, delta, tau, omega, dart, javelin, trident, glaive;

core/src/mindustry/content/StatusEffects.java

@@ -1,13 +1,13 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.mindustry.entities.Effects;
+import mindustry.entities.Effects;
-import io.anuke.mindustry.ctype.ContentList;
+import mindustry.ctype.ContentList;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.type.StatusEffect;
+import mindustry.type.StatusEffect;
 
-import static io.anuke.mindustry.Vars.waveTeam;
+import static mindustry.Vars.waveTeam;
 
 public class StatusEffects implements ContentList{
     public static StatusEffect none, burning, freezing, wet, melting, tarred, overdrive, shielded, shocked, corroded, boss;

core/src/mindustry/content/TechTree.java

@@ -1,11 +1,11 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
 
-import io.anuke.arc.collection.Array;
+import arc.struct.Array;
-import io.anuke.mindustry.ctype.ContentList;
+import mindustry.ctype.ContentList;
-import io.anuke.mindustry.type.ItemStack;
+import mindustry.type.ItemStack;
-import io.anuke.mindustry.world.Block;
+import mindustry.world.Block;
 
-import static io.anuke.mindustry.content.Blocks.*;
+import static mindustry.content.Blocks.*;
 
 public class TechTree implements ContentList{
     public static Array<TechNode> all;

core/src/mindustry/content/TypeIDs.java

@@ -1,10 +1,10 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
 
-import io.anuke.mindustry.entities.effect.Fire;
+import mindustry.entities.effect.Fire;
-import io.anuke.mindustry.entities.effect.Puddle;
+import mindustry.entities.effect.Puddle;
-import io.anuke.mindustry.entities.type.Player;
+import mindustry.entities.type.Player;
-import io.anuke.mindustry.ctype.ContentList;
+import mindustry.ctype.ContentList;
-import io.anuke.mindustry.type.TypeID;
+import mindustry.type.TypeID;
 
 public class TypeIDs implements ContentList{
     public static TypeID fire, puddle, player;

core/src/mindustry/content/UnitTypes.java

@@ -1,13 +1,13 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
 
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.mindustry.ctype.ContentList;
+import mindustry.ctype.ContentList;
-import io.anuke.mindustry.entities.bullet.*;
+import mindustry.entities.bullet.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.entities.type.Bullet;
+import mindustry.entities.type.Bullet;
-import io.anuke.mindustry.entities.type.base.*;
+import mindustry.entities.type.base.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
 
 public class UnitTypes implements ContentList{
     public static UnitType

core/src/mindustry/content/Zones.java

@@ -1,16 +1,16 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
 
-import io.anuke.mindustry.ctype.ContentList;
+import mindustry.ctype.ContentList;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.game.Objectives.*;
+import mindustry.game.Objectives.*;
-import io.anuke.mindustry.maps.generators.*;
+import mindustry.maps.generators.*;
-import io.anuke.mindustry.maps.generators.MapGenerator.*;
+import mindustry.maps.generators.MapGenerator.*;
-import io.anuke.mindustry.maps.zonegen.*;
+import mindustry.maps.zonegen.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
 
-import static io.anuke.arc.collection.Array.with;
+import static arc.struct.Array.with;
-import static io.anuke.mindustry.content.Items.*;
+import static mindustry.content.Items.*;
-import static io.anuke.mindustry.type.ItemStack.list;
+import static mindustry.type.ItemStack.list;
 
 public class Zones implements ContentList{
     public static Zone

core/src/mindustry/core/ContentLoader.java

@@ -1,20 +1,20 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
 
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.util.ArcAnnotate.*;
+import arc.util.ArcAnnotate.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.ctype.*;
+import mindustry.ctype.*;
-import io.anuke.mindustry.ctype.ContentType;
+import mindustry.ctype.ContentType;
-import io.anuke.mindustry.entities.bullet.*;
+import mindustry.entities.bullet.*;
-import io.anuke.mindustry.mod.Mods.*;
+import mindustry.mod.Mods.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
 
-import static io.anuke.arc.Core.files;
+import static arc.Core.files;
-import static io.anuke.mindustry.Vars.mods;
+import static mindustry.Vars.mods;
 
 /**
  * Loads all game content.

core/src/mindustry/core/Control.java

@@ -1,36 +1,36 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.assets.*;
+import arc.assets.*;
-import io.anuke.arc.audio.*;
+import arc.audio.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.input.*;
+import arc.input.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.scene.ui.*;
+import arc.scene.ui.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.core.GameState.*;
+import mindustry.core.GameState.*;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.input.*;
+import mindustry.input.*;
-import io.anuke.mindustry.maps.Map;
+import mindustry.maps.Map;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import mindustry.ui.dialogs.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
-import io.anuke.mindustry.world.blocks.storage.*;
+import mindustry.world.blocks.storage.*;
 
 import java.io.*;
 import java.text.*;
 import java.util.*;
 
-import static io.anuke.arc.Core.*;
+import static arc.Core.*;
-import static io.anuke.mindustry.Vars.net;
+import static mindustry.Vars.net;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 /**
  * Control module.

core/src/mindustry/core/FileTree.java

@@ -1,9 +1,9 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.assets.loaders.*;
+import arc.assets.loaders.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.files.*;
+import arc.files.*;
 
 /** Handles files in a modded context. */
 public class FileTree implements FileHandleResolver{

core/src/mindustry/core/GameState.java

@@ -1,12 +1,12 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.entities.type.base.*;
+import mindustry.entities.type.base.*;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class GameState{
     /** Current wave number, can be anything in non-wave modes. */

core/src/mindustry/core/Logic.java

@@ -1,26 +1,26 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
 
-import io.anuke.annotations.Annotations.*;
+import arc.*;
-import io.anuke.arc.*;
+import mindustry.annotations.Annotations.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.core.GameState.*;
+import mindustry.core.GameState.*;
-import io.anuke.mindustry.ctype.*;
+import mindustry.ctype.*;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.game.Teams.*;
+import mindustry.game.Teams.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import mindustry.world.blocks.*;
-import io.anuke.mindustry.world.blocks.BuildBlock.*;
+import mindustry.world.blocks.BuildBlock.*;
-import io.anuke.mindustry.world.blocks.power.*;
+import mindustry.world.blocks.power.*;
 
 import java.util.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 /**
  * Logic module.

core/src/mindustry/core/NetClient.java

@@ -1,36 +1,36 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
 
-import io.anuke.annotations.Annotations.*;
+import arc.*;
-import io.anuke.arc.*;
+import mindustry.annotations.Annotations.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.util.CommandHandler.*;
+import arc.util.CommandHandler.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.arc.util.io.*;
+import arc.util.io.*;
-import io.anuke.arc.util.serialization.*;
+import arc.util.serialization.*;
-import io.anuke.mindustry.*;
+import mindustry.*;
-import io.anuke.mindustry.core.GameState.*;
+import mindustry.core.GameState.*;
-import io.anuke.mindustry.ctype.ContentType;
+import mindustry.ctype.ContentType;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.BuilderTrait.*;
+import mindustry.entities.traits.BuilderTrait.*;
-import io.anuke.mindustry.entities.traits.*;
+import mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.net.Administration.*;
+import mindustry.net.Administration.*;
-import io.anuke.mindustry.net.Net.*;
+import mindustry.net.Net.*;
-import io.anuke.mindustry.net.*;
+import mindustry.net.*;
-import io.anuke.mindustry.net.Packets.*;
+import mindustry.net.Packets.*;
-import io.anuke.mindustry.type.TypeID;
+import mindustry.type.TypeID;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
-import io.anuke.mindustry.world.modules.*;
+import mindustry.world.modules.*;
 
 import java.io.*;
 import java.util.zip.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class NetClient implements ApplicationListener{
     private final static float dataTimeout = 60 * 18;

core/src/mindustry/core/NetServer.java

@@ -1,33 +1,33 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
 
-import io.anuke.annotations.Annotations.*;
+import arc.*;
-import io.anuke.arc.*;
+import mindustry.annotations.Annotations.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.arc.util.CommandHandler.*;
+import arc.util.CommandHandler.*;
-import io.anuke.arc.util.io.*;
+import arc.util.io.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.core.GameState.*;
+import mindustry.core.GameState.*;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.BuilderTrait.*;
+import mindustry.entities.traits.BuilderTrait.*;
-import io.anuke.mindustry.entities.traits.*;
+import mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.net.*;
+import mindustry.net.*;
-import io.anuke.mindustry.net.Administration.*;
+import mindustry.net.Administration.*;
-import io.anuke.mindustry.net.Packets.*;
+import mindustry.net.Packets.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
 
 import java.io.*;
 import java.nio.*;
 import java.util.zip.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class NetServer implements ApplicationListener{
     private final static int maxSnapshotSize = 430, timerBlockSync = 0;

core/src/mindustry/core/Platform.java

@@ -1,21 +1,21 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.Input.*;
+import arc.Input.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.files.*;
+import arc.files.*;
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.scene.ui.*;
+import arc.scene.ui.*;
-import io.anuke.arc.util.serialization.*;
+import arc.util.serialization.*;
-import io.anuke.mindustry.mod.*;
+import mindustry.mod.*;
-import io.anuke.mindustry.net.*;
+import mindustry.net.*;
-import io.anuke.mindustry.net.Net.*;
+import mindustry.net.Net.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import mindustry.ui.dialogs.*;
 import org.mozilla.javascript.*;
 
-import static io.anuke.mindustry.Vars.mobile;
+import static mindustry.Vars.mobile;
 
 public interface Platform{
 

core/src/mindustry/core/Renderer.java

@@ -1,32 +1,32 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.files.*;
+import arc.files.*;
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.graphics.glutils.*;
+import arc.graphics.gl.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.scene.ui.layout.*;
+import arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.arc.util.pooling.*;
+import arc.util.pooling.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.core.GameState.*;
+import mindustry.core.GameState.*;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.effect.*;
+import mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.effect.GroundEffectEntity.*;
+import mindustry.entities.effect.GroundEffectEntity.*;
-import io.anuke.mindustry.entities.traits.*;
+import mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.input.*;
+import mindustry.input.*;
-import io.anuke.mindustry.ui.Cicon;
+import mindustry.ui.Cicon;
-import io.anuke.mindustry.world.blocks.defense.ForceProjector.*;
+import mindustry.world.blocks.defense.ForceProjector.*;
 
-import static io.anuke.arc.Core.*;
+import static arc.Core.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class Renderer implements ApplicationListener{
     public final BlockRenderer blocks = new BlockRenderer();

core/src/mindustry/core/UI.java

@@ -1,42 +1,42 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.Graphics.*;
+import arc.Graphics.*;
-import io.anuke.arc.Graphics.Cursor.*;
+import arc.Graphics.Cursor.*;
-import io.anuke.arc.Input.*;
+import arc.Input.*;
-import io.anuke.arc.assets.*;
+import arc.assets.*;
-import io.anuke.arc.assets.loaders.*;
+import arc.assets.loaders.*;
-import io.anuke.arc.assets.loaders.resolvers.*;
+import arc.assets.loaders.resolvers.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.files.*;
+import arc.files.*;
-import io.anuke.arc.freetype.*;
+import arc.freetype.*;
-import io.anuke.arc.freetype.FreeTypeFontGenerator.*;
+import arc.freetype.FreeTypeFontGenerator.*;
-import io.anuke.arc.freetype.FreetypeFontLoader.*;
+import arc.freetype.FreetypeFontLoader.*;
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.graphics.Texture.*;
+import arc.graphics.Texture.*;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.input.*;
+import arc.input.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.scene.*;
+import arc.scene.*;
-import io.anuke.arc.scene.actions.*;
+import arc.scene.actions.*;
-import io.anuke.arc.scene.event.*;
+import arc.scene.event.*;
-import io.anuke.arc.scene.ui.*;
+import arc.scene.ui.*;
-import io.anuke.arc.scene.ui.TextField.*;
+import arc.scene.ui.TextField.*;
-import io.anuke.arc.scene.ui.Tooltip.*;
+import arc.scene.ui.Tooltip.*;
-import io.anuke.arc.scene.ui.layout.*;
+import arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.core.GameState.*;
+import mindustry.core.GameState.*;
-import io.anuke.mindustry.editor.*;
+import mindustry.editor.*;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.ui.*;
+import mindustry.ui.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import mindustry.ui.dialogs.*;
-import io.anuke.mindustry.ui.fragments.*;
+import mindustry.ui.fragments.*;
 
-import static io.anuke.arc.scene.actions.Actions.*;
+import static arc.scene.actions.Actions.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class UI implements ApplicationListener, Loadable{
     public MenuFragment menufrag;

core/src/mindustry/core/Version.java

@@ -1,11 +1,11 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.Files.*;
+import arc.Files.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.files.*;
+import arc.files.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.arc.util.io.*;
+import arc.util.io.*;
 
 public class Version{
     /** Build type. 'official' for official releases; 'custom' or 'bleeding edge' are also used. */

core/src/mindustry/core/World.java

@@ -1,25 +1,25 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.arc.util.ArcAnnotate.*;
+import arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.core.GameState.*;
+import mindustry.core.GameState.*;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.io.*;
+import mindustry.io.*;
-import io.anuke.mindustry.maps.*;
+import mindustry.maps.*;
-import io.anuke.mindustry.maps.filters.*;
+import mindustry.maps.filters.*;
-import io.anuke.mindustry.maps.filters.GenerateFilter.*;
+import mindustry.maps.filters.GenerateFilter.*;
-import io.anuke.mindustry.maps.generators.*;
+import mindustry.maps.generators.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import mindustry.world.blocks.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class World{
     public final Context context = new Context();

core/src/mindustry/ctype/Content.java

@@ -1,12 +1,12 @@
-package io.anuke.mindustry.ctype;
+package mindustry.ctype;
 
-import io.anuke.arc.files.*;
+import arc.files.*;
-import io.anuke.arc.util.ArcAnnotate.*;
+import arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.*;
+import mindustry.*;
-import io.anuke.mindustry.mod.Mods.*;
+import mindustry.mod.Mods.*;
 
 
-/** Base class for a content type that is loaded in {@link io.anuke.mindustry.core.ContentLoader}. */
+/** Base class for a content type that is loaded in {@link mindustry.core.ContentLoader}. */
 public abstract class Content implements Comparable<Content>{
     public final short id;
     /** Info on which mod this content was loaded from. */
@@ -14,7 +14,7 @@ public abstract class Content implements Comparable<Content>{
 
 
     public Content(){
-        this.id = (short)Vars.content.getBy(getContentType()).size;
+        this.id = (short) Vars.content.getBy(getContentType()).size;
         Vars.content.handleContent(this);
     }
 

core/src/mindustry/ctype/ContentList.java

@@ -0,0 +1,7 @@
+package mindustry.ctype;
+
+/** Interface for a list of content to be loaded in {@link mindustry.core.ContentLoader}. */
+public interface ContentList{
+    /** This method should create all the content. */
+    void load();
+}

core/src/mindustry/ctype/ContentType.java

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.ctype;
+package mindustry.ctype;
 
 /** Do not rearrange, ever! */
 public enum ContentType{

core/src/mindustry/ctype/MappableContent.java

@@ -1,6 +1,6 @@
-package io.anuke.mindustry.ctype;
+package mindustry.ctype;
 
-import io.anuke.mindustry.*;
+import mindustry.*;
 
 public abstract class MappableContent extends Content{
     public final String name;

core/src/mindustry/ctype/UnlockableContent.java

@@ -1,12 +1,12 @@
-package io.anuke.mindustry.ctype;
+package mindustry.ctype;
 
-import io.anuke.annotations.Annotations.*;
+import arc.*;
-import io.anuke.arc.*;
+import mindustry.annotations.Annotations.*;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.scene.ui.layout.*;
+import arc.scene.ui.layout.*;
-import io.anuke.mindustry.*;
+import mindustry.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.ui.Cicon;
+import mindustry.ui.Cicon;
 
 /** Base interface for an unlockable content type. */
 public abstract class UnlockableContent extends MappableContent{
@@ -15,7 +15,7 @@ public abstract class UnlockableContent extends MappableContent{
     /** Localized description. May be null. */
     public String description;
     /** Icons by Cicon ID.*/
-    protected TextureRegion[] cicons = new TextureRegion[io.anuke.mindustry.ui.Cicon.all.length];
+    protected TextureRegion[] cicons = new TextureRegion[mindustry.ui.Cicon.all.length];
 
     public UnlockableContent(String name){
         super(name);

core/src/mindustry/editor/DrawOperation.java

@@ -1,14 +1,14 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
 
-import io.anuke.annotations.Annotations.Struct;
+import mindustry.annotations.Annotations.Struct;
-import io.anuke.arc.collection.LongArray;
+import arc.struct.LongArray;
-import io.anuke.mindustry.game.Team;
+import mindustry.game.Team;
-import io.anuke.mindustry.gen.TileOp;
+import mindustry.gen.TileOp;
-import io.anuke.mindustry.world.Block;
+import mindustry.world.Block;
-import io.anuke.mindustry.world.Tile;
+import mindustry.world.Tile;
-import io.anuke.mindustry.world.blocks.Floor;
+import mindustry.world.blocks.Floor;
 
-import static io.anuke.mindustry.Vars.content;
+import static mindustry.Vars.content;
 
 public class DrawOperation{
     private MapEditor editor;

core/src/mindustry/editor/EditorTile.java

@@ -1,17 +1,17 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
 
-import io.anuke.mindustry.content.Blocks;
+import mindustry.content.Blocks;
-import io.anuke.mindustry.core.GameState.State;
+import mindustry.core.GameState.State;
-import io.anuke.mindustry.editor.DrawOperation.OpType;
+import mindustry.editor.DrawOperation.OpType;
-import io.anuke.mindustry.game.Team;
+import mindustry.game.Team;
-import io.anuke.mindustry.gen.TileOp;
+import mindustry.gen.TileOp;
-import io.anuke.mindustry.world.Block;
+import mindustry.world.Block;
-import io.anuke.mindustry.world.Tile;
+import mindustry.world.Tile;
-import io.anuke.mindustry.world.blocks.*;
+import mindustry.world.blocks.*;
-import io.anuke.mindustry.world.modules.*;
+import mindustry.world.modules.*;
 
-import static io.anuke.mindustry.Vars.state;
+import static mindustry.Vars.state;
-import static io.anuke.mindustry.Vars.ui;
+import static mindustry.Vars.ui;
 
 //TODO somehow remove or replace this class with a more flexible solution
 public class EditorTile extends Tile{

core/src/mindustry/editor/EditorTool.java

@@ -1,15 +1,15 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
 
-import io.anuke.arc.collection.IntArray;
+import arc.struct.IntArray;
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.arc.math.geom.Bresenham2;
+import arc.math.geom.Bresenham2;
-import io.anuke.arc.util.Structs;
+import arc.util.Structs;
-import io.anuke.mindustry.Vars;
+import mindustry.Vars;
-import io.anuke.mindustry.content.Blocks;
+import mindustry.content.Blocks;
-import io.anuke.mindustry.game.Team;
+import mindustry.game.Team;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
-import io.anuke.mindustry.world.blocks.BlockPart;
+import mindustry.world.blocks.BlockPart;
 
 public enum EditorTool{
     zoom,

core/src/mindustry/editor/MapEditor.java

@@ -1,22 +1,22 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
 
-import io.anuke.arc.collection.StringMap;
+import arc.struct.StringMap;
-import io.anuke.arc.files.Fi;
+import arc.files.Fi;
-import io.anuke.arc.func.Cons;
+import arc.func.Cons;
-import io.anuke.arc.func.Boolf;
+import arc.func.Boolf;
-import io.anuke.arc.graphics.Pixmap;
+import arc.graphics.Pixmap;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.arc.util.Structs;
+import arc.util.Structs;
-import io.anuke.mindustry.content.Blocks;
+import mindustry.content.Blocks;
-import io.anuke.mindustry.game.Team;
+import mindustry.game.Team;
-import io.anuke.mindustry.gen.TileOp;
+import mindustry.gen.TileOp;
-import io.anuke.mindustry.io.LegacyMapIO;
+import mindustry.io.LegacyMapIO;
-import io.anuke.mindustry.io.MapIO;
+import mindustry.io.MapIO;
-import io.anuke.mindustry.maps.Map;
+import mindustry.maps.Map;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
-import io.anuke.mindustry.world.blocks.BlockPart;
+import mindustry.world.blocks.BlockPart;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class MapEditor{
     public static final int[] brushSizes = {1, 2, 3, 4, 5, 9, 15, 20};

core/src/mindustry/editor/MapEditorDialog.java

@@ -1,37 +1,37 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.files.*;
+import arc.files.*;
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.input.*;
+import arc.input.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.scene.actions.*;
+import arc.scene.actions.*;
-import io.anuke.arc.scene.event.*;
+import arc.scene.event.*;
-import io.anuke.arc.scene.style.*;
+import arc.scene.style.*;
-import io.anuke.arc.scene.ui.*;
+import arc.scene.ui.*;
-import io.anuke.arc.scene.ui.layout.*;
+import arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.arc.util.ArcAnnotate.*;
+import arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.*;
+import mindustry.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.core.GameState.*;
+import mindustry.core.GameState.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.io.*;
+import mindustry.io.*;
-import io.anuke.mindustry.maps.*;
+import mindustry.maps.*;
-import io.anuke.mindustry.ui.*;
+import mindustry.ui.*;
-import io.anuke.mindustry.ui.Cicon;
+import mindustry.ui.Cicon;
-import io.anuke.mindustry.ui.dialogs.*;
+import mindustry.ui.dialogs.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import mindustry.world.blocks.*;
-import io.anuke.mindustry.world.blocks.storage.*;
+import mindustry.world.blocks.storage.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class MapEditorDialog extends Dialog implements Disposable{
     public final MapEditor editor;

core/src/mindustry/editor/MapGenerateDialog.java

@@ -1,29 +1,29 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.graphics.Pixmap.*;
+import arc.graphics.Pixmap.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.scene.ui.*;
+import arc.scene.ui.*;
-import io.anuke.arc.scene.ui.ImageButton.*;
+import arc.scene.ui.ImageButton.*;
-import io.anuke.arc.scene.ui.layout.*;
+import arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.arc.util.async.*;
+import arc.util.async.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.io.*;
+import mindustry.io.*;
-import io.anuke.mindustry.maps.filters.*;
+import mindustry.maps.filters.*;
-import io.anuke.mindustry.maps.filters.GenerateFilter.*;
+import mindustry.maps.filters.GenerateFilter.*;
-import io.anuke.mindustry.ui.*;
+import mindustry.ui.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import mindustry.ui.dialogs.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import mindustry.world.blocks.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 @SuppressWarnings("unchecked")
 public class MapGenerateDialog extends FloatingDialog{

core/src/mindustry/editor/MapInfoDialog.java

@@ -1,13 +1,13 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.scene.ui.*;
+import arc.scene.ui.*;
-import io.anuke.mindustry.*;
+import mindustry.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.io.*;
+import mindustry.io.*;
-import io.anuke.mindustry.ui.*;
+import mindustry.ui.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import mindustry.ui.dialogs.*;
 
 public class MapInfoDialog extends FloatingDialog{
     private final MapEditor editor;

core/src/mindustry/editor/MapLoadDialog.java

@@ -1,14 +1,14 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
 
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.scene.ui.*;
+import arc.scene.ui.*;
-import io.anuke.arc.scene.ui.layout.*;
+import arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.maps.*;
+import mindustry.maps.*;
-import io.anuke.mindustry.ui.*;
+import mindustry.ui.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import mindustry.ui.dialogs.*;
 
-import static io.anuke.mindustry.Vars.maps;
+import static mindustry.Vars.maps;
 
 public class MapLoadDialog extends FloatingDialog{
     private Map selected = null;

core/src/mindustry/editor/MapRenderer.java

@@ -1,23 +1,23 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.collection.IntSet;
+import arc.struct.IntSet;
-import io.anuke.arc.collection.IntSet.IntSetIterator;
+import arc.struct.IntSet.IntSetIterator;
-import io.anuke.arc.graphics.Color;
+import arc.graphics.Color;
-import io.anuke.arc.graphics.Texture;
+import arc.graphics.Texture;
-import io.anuke.arc.graphics.g2d.Draw;
+import arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.TextureRegion;
+import arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.content.Blocks;
+import mindustry.content.Blocks;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.game.Team;
+import mindustry.game.Team;
-import io.anuke.mindustry.graphics.IndexedRenderer;
+import mindustry.graphics.IndexedRenderer;
-import io.anuke.mindustry.world.Block;
+import mindustry.world.Block;
-import io.anuke.mindustry.world.Tile;
+import mindustry.world.Tile;
-import io.anuke.mindustry.world.blocks.BlockPart;
+import mindustry.world.blocks.BlockPart;
 
-import static io.anuke.mindustry.Vars.tilesize;
+import static mindustry.Vars.tilesize;
 
 public class MapRenderer implements Disposable{
     private static final int chunkSize = 64;

core/src/mindustry/editor/MapResizeDialog.java

@@ -1,10 +1,10 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
 
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.scene.ui.layout.*;
+import arc.scene.ui.layout.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import mindustry.ui.dialogs.*;
 
 public class MapResizeDialog extends FloatingDialog{
     private static final int minSize = 50, maxSize = 500, increment = 50;

core/src/mindustry/editor/MapSaveDialog.java

@@ -1,12 +1,12 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
 
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.scene.ui.*;
+import arc.scene.ui.*;
-import io.anuke.mindustry.*;
+import mindustry.*;
-import io.anuke.mindustry.maps.*;
+import mindustry.maps.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import mindustry.ui.dialogs.*;
 
-import static io.anuke.mindustry.Vars.ui;
+import static mindustry.Vars.ui;
 
 public class MapSaveDialog extends FloatingDialog{
     private TextField field;

core/src/mindustry/editor/MapView.java

@@ -1,24 +1,24 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
 
-import io.anuke.arc.Core;
+import arc.Core;
-import io.anuke.arc.graphics.Color;
+import arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.input.GestureDetector;
+import arc.input.GestureDetector;
-import io.anuke.arc.input.GestureDetector.GestureListener;
+import arc.input.GestureDetector.GestureListener;
-import io.anuke.arc.input.KeyCode;
+import arc.input.KeyCode;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.scene.Element;
+import arc.scene.Element;
-import io.anuke.arc.scene.event.*;
+import arc.scene.event.*;
-import io.anuke.arc.scene.ui.TextField;
+import arc.scene.ui.TextField;
-import io.anuke.arc.scene.ui.layout.Scl;
+import arc.scene.ui.layout.Scl;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.graphics.Pal;
+import mindustry.graphics.Pal;
-import io.anuke.mindustry.input.Binding;
+import mindustry.input.Binding;
-import io.anuke.mindustry.ui.GridImage;
+import mindustry.ui.GridImage;
 
-import static io.anuke.mindustry.Vars.mobile;
+import static mindustry.Vars.mobile;
-import static io.anuke.mindustry.Vars.ui;
+import static mindustry.Vars.ui;
 
 public class MapView extends Element implements GestureListener{
     private MapEditor editor;

core/src/mindustry/editor/OperationStack.java

@@ -1,6 +1,6 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
 
-import io.anuke.arc.collection.Array;
+import arc.struct.Array;
 
 public class OperationStack{
     private final static int maxSize = 10;

core/src/mindustry/editor/WaveInfoDialog.java

@@ -1,28 +1,28 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.input.*;
+import arc.input.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.scene.event.*;
+import arc.scene.event.*;
-import io.anuke.arc.scene.ui.*;
+import arc.scene.ui.*;
-import io.anuke.arc.scene.ui.TextField.*;
+import arc.scene.ui.TextField.*;
-import io.anuke.arc.scene.ui.layout.*;
+import arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.*;
+import mindustry.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.ctype.ContentType;
+import mindustry.ctype.ContentType;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.io.*;
+import mindustry.io.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
-import io.anuke.mindustry.ui.Cicon;
+import mindustry.ui.Cicon;
-import io.anuke.mindustry.ui.dialogs.*;
+import mindustry.ui.dialogs.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
-import static io.anuke.mindustry.game.SpawnGroup.never;
+import static mindustry.game.SpawnGroup.never;
 
 public class WaveInfoDialog extends FloatingDialog{
     private final static int displayed = 20;
@@ -142,7 +142,7 @@ public class WaveInfoDialog extends FloatingDialog{
                     t.margin(0).defaults().pad(3).padLeft(5f).growX().left();
                     t.addButton(b -> {
                         b.left();
-                        b.addImage(group.type.icon(io.anuke.mindustry.ui.Cicon.medium)).size(32f).padRight(3);
+                        b.addImage(group.type.icon(mindustry.ui.Cicon.medium)).size(32f).padRight(3);
                         b.add(group.type.localizedName).color(Pal.accent);
                     }, () -> showUpdate(group)).pad(-6f).padBottom(0f);
 
@@ -224,7 +224,7 @@ public class WaveInfoDialog extends FloatingDialog{
             for(UnitType type : content.units()){
                 p.addButton(t -> {
                     t.left();
-                    t.addImage(type.icon(io.anuke.mindustry.ui.Cicon.medium)).size(40f).padRight(2f);
+                    t.addImage(type.icon(mindustry.ui.Cicon.medium)).size(40f).padRight(2f);
                     t.add(type.localizedName);
                 }, () -> {
                     lastType = type;

core/src/mindustry/entities/Damage.java

@@ -1,24 +1,24 @@
-package io.anuke.mindustry.entities;
+package mindustry.entities;
 
-import io.anuke.annotations.Annotations.*;
+import arc.*;
-import io.anuke.arc.*;
+import mindustry.annotations.Annotations.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.entities.Effects.*;
+import mindustry.entities.Effects.*;
-import io.anuke.mindustry.entities.effect.*;
+import mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 /** Utility class for damaging in an area. */
 public class Damage{

core/src/mindustry/entities/Effects.java

@@ -1,15 +1,15 @@
-package io.anuke.mindustry.entities;
+package mindustry.entities;
 
-import io.anuke.arc.Core;
+import arc.Core;
-import io.anuke.arc.collection.Array;
+import arc.struct.Array;
-import io.anuke.arc.func.Cons;
+import arc.func.Cons;
-import io.anuke.arc.graphics.Color;
+import arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.arc.math.geom.Position;
+import arc.math.geom.Position;
-import io.anuke.arc.util.pooling.Pools;
+import arc.util.pooling.Pools;
-import io.anuke.mindustry.entities.type.EffectEntity;
+import mindustry.entities.type.EffectEntity;
-import io.anuke.mindustry.entities.traits.ScaleTrait;
+import mindustry.entities.traits.ScaleTrait;
 
 public class Effects{
     private static final EffectContainer container = new EffectContainer();

core/src/mindustry/entities/Entities.java

@@ -1,7 +1,7 @@
-package io.anuke.mindustry.entities;
+package mindustry.entities;
 
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.mindustry.entities.traits.*;
+import mindustry.entities.traits.*;
 
 /** Simple container for managing entity groups.*/
 public class Entities{

core/src/mindustry/entities/EntityCollisions.java

@@ -1,14 +1,14 @@
-package io.anuke.mindustry.entities;
+package mindustry.entities;
 
-import io.anuke.arc.collection.Array;
+import arc.struct.Array;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.mindustry.entities.traits.Entity;
+import mindustry.entities.traits.Entity;
-import io.anuke.mindustry.entities.traits.SolidTrait;
+import mindustry.entities.traits.SolidTrait;
-import io.anuke.mindustry.world.Tile;
+import mindustry.world.Tile;
 
-import static io.anuke.mindustry.Vars.tilesize;
+import static mindustry.Vars.tilesize;
-import static io.anuke.mindustry.Vars.world;
+import static mindustry.Vars.world;
 
 public class EntityCollisions{
     //range for tile collision scanning

core/src/mindustry/entities/EntityGroup.java

@@ -1,13 +1,13 @@
-package io.anuke.mindustry.entities;
+package mindustry.entities;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.func.*;
+import arc.func.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.mindustry.entities.traits.*;
+import mindustry.entities.traits.*;
 
-import static io.anuke.mindustry.Vars.collisions;
+import static mindustry.Vars.collisions;
 
 /** Represents a group of a certain type of entity.*/
 @SuppressWarnings("unchecked")

core/src/mindustry/entities/Predict.java

@@ -1,9 +1,9 @@
-package io.anuke.mindustry.entities;
+package mindustry.entities;
 
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.entities.traits.*;
+import mindustry.entities.traits.*;
 
 /**
  * Class for predicting shoot angles based on velocities of targets.

core/src/mindustry/entities/TargetPriority.java

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities;
+package mindustry.entities;
 
 public enum TargetPriority{
     base,

core/src/mindustry/entities/Units.java

@@ -1,17 +1,17 @@
-package io.anuke.mindustry.entities;
+package mindustry.entities;
 
-import io.anuke.arc.collection.EnumSet;
+import arc.struct.EnumSet;
-import io.anuke.arc.func.Cons;
+import arc.func.Cons;
-import io.anuke.arc.func.Boolf;
+import arc.func.Boolf;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.arc.math.geom.Geometry;
+import arc.math.geom.Geometry;
-import io.anuke.arc.math.geom.Rectangle;
+import arc.math.geom.Rectangle;
-import io.anuke.mindustry.entities.traits.TargetTrait;
+import mindustry.entities.traits.TargetTrait;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.game.Team;
+import mindustry.game.Team;
-import io.anuke.mindustry.world.Tile;
+import mindustry.world.Tile;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 /** Utility class for unit and team interactions.*/
 public class Units{

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

@@ -1,11 +1,11 @@
-package io.anuke.mindustry.entities.bullet;
+package mindustry.entities.bullet;
 
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.Effects.*;
+import mindustry.entities.Effects.*;
-import io.anuke.mindustry.entities.type.Bullet;
+import mindustry.entities.type.Bullet;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
 
 //TODO scale velocity depending on fslope()
 public class ArtilleryBulletType extends BasicBulletType{
@@ -25,7 +25,7 @@ public class ArtilleryBulletType extends BasicBulletType{
     }
 
     @Override
-    public void update(io.anuke.mindustry.entities.type.Bullet b){
+    public void update(mindustry.entities.type.Bullet b){
         super.update(b);
 
         if(b.timer.get(0, 3 + b.fslope() * 2f)){

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

@@ -1,11 +1,11 @@
-package io.anuke.mindustry.entities.bullet;
+package mindustry.entities.bullet;
 
-import io.anuke.arc.Core;
+import arc.Core;
-import io.anuke.arc.graphics.Color;
+import arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.Draw;
+import arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.TextureRegion;
+import arc.graphics.g2d.TextureRegion;
-import io.anuke.mindustry.entities.type.Bullet;
+import mindustry.entities.type.Bullet;
-import io.anuke.mindustry.graphics.Pal;
+import mindustry.graphics.Pal;
 
 /** An extended BulletType for most ammo-based bullets shot from turrets and units. */
 public class BasicBulletType extends BulletType{

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

@@ -1,6 +1,6 @@
-package io.anuke.mindustry.entities.bullet;
+package mindustry.entities.bullet;
 
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
 
 public class BombBulletType extends BasicBulletType{
 

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

@@ -1,19 +1,19 @@
-package io.anuke.mindustry.entities.bullet;
+package mindustry.entities.bullet;
 
-import io.anuke.arc.audio.*;
+import arc.audio.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.ctype.Content;
+import mindustry.ctype.Content;
-import io.anuke.mindustry.ctype.ContentType;
+import mindustry.ctype.ContentType;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.Effects.*;
+import mindustry.entities.Effects.*;
-import io.anuke.mindustry.entities.effect.*;
+import mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.traits.*;
+import mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
 
 public abstract class BulletType extends Content{
     public float lifetime;

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

@@ -1,10 +1,10 @@
-package io.anuke.mindustry.entities.bullet;
+package mindustry.entities.bullet;
 
-import io.anuke.arc.math.geom.Rectangle;
+import arc.math.geom.Rectangle;
-import io.anuke.arc.util.Time;
+import arc.util.Time;
-import io.anuke.mindustry.content.Fx;
+import mindustry.content.Fx;
-import io.anuke.mindustry.entities.Units;
+import mindustry.entities.Units;
-import io.anuke.mindustry.entities.type.Bullet;
+import mindustry.entities.type.Bullet;
 
 public class FlakBulletType extends BasicBulletType{
     protected static Rectangle rect = new Rectangle();

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

@@ -1,13 +1,13 @@
-package io.anuke.mindustry.entities.bullet;
+package mindustry.entities.bullet;
 
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import mindustry.world.blocks.*;
 
 public class HealBulletType extends BulletType{
     protected float healPercent = 3f;

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

@@ -1,17 +1,17 @@
-package io.anuke.mindustry.entities.bullet;
+package mindustry.entities.bullet;
 
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.util.ArcAnnotate.*;
+import arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.effect.*;
+import mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.type.Bullet;
+import mindustry.entities.type.Bullet;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class LiquidBulletType extends BulletType{
     public @NonNull Liquid liquid;

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

@@ -1,16 +1,16 @@
-package io.anuke.mindustry.entities.bullet;
+package mindustry.entities.bullet;
 
-import io.anuke.arc.graphics.Color;
+import arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.Draw;
+import arc.graphics.g2d.Draw;
-import io.anuke.arc.math.Angles;
+import arc.math.Angles;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.mindustry.content.Fx;
+import mindustry.content.Fx;
-import io.anuke.mindustry.entities.Effects;
+import mindustry.entities.Effects;
-import io.anuke.mindustry.entities.type.Bullet;
+import mindustry.entities.type.Bullet;
-import io.anuke.mindustry.graphics.Pal;
+import mindustry.graphics.Pal;
-import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData;
+import mindustry.world.blocks.distribution.MassDriver.DriverBulletData;
 
-import static io.anuke.mindustry.Vars.content;
+import static mindustry.Vars.content;
 
 public class MassDriverBolt extends BulletType{
 
@@ -24,7 +24,7 @@ public class MassDriverBolt extends BulletType{
     }
 
     @Override
-    public void draw(io.anuke.mindustry.entities.type.Bullet b){
+    public void draw(mindustry.entities.type.Bullet b){
         float w = 11f, h = 13f;
 
         Draw.color(Pal.bulletYellowBack);
@@ -37,7 +37,7 @@ public class MassDriverBolt extends BulletType{
     }
 
     @Override
-    public void update(io.anuke.mindustry.entities.type.Bullet b){
+    public void update(mindustry.entities.type.Bullet b){
         //data MUST be an instance of DriverBulletData
         if(!(b.getData() instanceof DriverBulletData)){
             hit(b);
@@ -83,7 +83,7 @@ public class MassDriverBolt extends BulletType{
     }
 
     @Override
-    public void despawned(io.anuke.mindustry.entities.type.Bullet b){
+    public void despawned(mindustry.entities.type.Bullet b){
         super.despawned(b);
 
         if(!(b.getData() instanceof DriverBulletData)) return;

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

@@ -1,13 +1,13 @@
-package io.anuke.mindustry.entities.bullet;
+package mindustry.entities.bullet;
 
-import io.anuke.arc.graphics.Color;
+import arc.graphics.Color;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.arc.util.Time;
+import arc.util.Time;
-import io.anuke.mindustry.content.Fx;
+import mindustry.content.Fx;
-import io.anuke.mindustry.entities.Effects;
+import mindustry.entities.Effects;
-import io.anuke.mindustry.entities.type.Bullet;
+import mindustry.entities.type.Bullet;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.graphics.Pal;
+import mindustry.graphics.Pal;
 
 public class MissileBulletType extends BasicBulletType{
     protected Color trailColor = Pal.missileYellowBack;

core/src/mindustry/entities/effect/Decal.java

@@ -1,14 +1,14 @@
-package io.anuke.mindustry.entities.effect;
+package mindustry.entities.effect;
 
-import io.anuke.arc.graphics.g2d.Draw;
+import arc.graphics.g2d.Draw;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.mindustry.entities.EntityGroup;
+import mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.type.TimedEntity;
+import mindustry.entities.type.TimedEntity;
-import io.anuke.mindustry.entities.traits.BelowLiquidTrait;
+import mindustry.entities.traits.BelowLiquidTrait;
-import io.anuke.mindustry.entities.traits.DrawTrait;
+import mindustry.entities.traits.DrawTrait;
-import io.anuke.mindustry.graphics.Pal;
+import mindustry.graphics.Pal;
 
-import static io.anuke.mindustry.Vars.groundEffectGroup;
+import static mindustry.Vars.groundEffectGroup;
 
 /**
  * Class for creating block rubble on the ground.

core/src/mindustry/entities/effect/Fire.java

@@ -1,24 +1,24 @@
-package io.anuke.mindustry.entities.effect;
+package mindustry.entities.effect;
 
-import io.anuke.annotations.Annotations.*;
+import arc.*;
-import io.anuke.arc.*;
+import mindustry.annotations.Annotations.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.*;
+import mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
 
 import java.io.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class Fire extends TimedEntity implements SaveTrait, SyncTrait{
     private static final IntMap<Fire> map = new IntMap<>();

core/src/mindustry/entities/effect/GroundEffectEntity.java

@@ -1,13 +1,13 @@
-package io.anuke.mindustry.entities.effect;
+package mindustry.entities.effect;
 
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.arc.util.Time;
+import arc.util.Time;
-import io.anuke.mindustry.Vars;
+import mindustry.Vars;
-import io.anuke.mindustry.entities.Effects;
+import mindustry.entities.Effects;
-import io.anuke.mindustry.entities.Effects.Effect;
+import mindustry.entities.Effects.Effect;
-import io.anuke.mindustry.entities.Effects.EffectRenderer;
+import mindustry.entities.Effects.EffectRenderer;
-import io.anuke.mindustry.entities.type.EffectEntity;
+import mindustry.entities.type.EffectEntity;
-import io.anuke.mindustry.world.Tile;
+import mindustry.world.Tile;
 
 /**
  * A ground effect contains an effect that is rendered on the ground layer as opposed to the top layer.

core/src/mindustry/entities/effect/ItemTransfer.java

@@ -1,23 +1,23 @@
-package io.anuke.mindustry.entities.effect;
+package mindustry.entities.effect;
 
-import io.anuke.annotations.Annotations.Loc;
+import mindustry.annotations.Annotations.Loc;
-import io.anuke.annotations.Annotations.Remote;
+import mindustry.annotations.Annotations.Remote;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.math.Interpolation;
+import arc.math.Interpolation;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.arc.math.geom.Position;
+import arc.math.geom.Position;
-import io.anuke.arc.math.geom.Vector2;
+import arc.math.geom.Vector2;
-import io.anuke.arc.util.Time;
+import arc.util.Time;
-import io.anuke.arc.util.pooling.Pools;
+import arc.util.pooling.Pools;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.type.TimedEntity;
+import mindustry.entities.type.TimedEntity;
-import io.anuke.mindustry.entities.traits.DrawTrait;
+import mindustry.entities.traits.DrawTrait;
-import io.anuke.mindustry.entities.type.Unit;
+import mindustry.entities.type.Unit;
-import io.anuke.mindustry.graphics.Pal;
+import mindustry.graphics.Pal;
-import io.anuke.mindustry.type.Item;
+import mindustry.type.Item;
-import io.anuke.mindustry.world.Tile;
+import mindustry.world.Tile;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class ItemTransfer extends TimedEntity implements DrawTrait{
     private Vector2 from = new Vector2();

core/src/mindustry/entities/effect/Lightning.java

@@ -1,28 +1,28 @@
-package io.anuke.mindustry.entities.effect;
+package mindustry.entities.effect;
 
-import io.anuke.annotations.Annotations.Loc;
+import mindustry.annotations.Annotations.Loc;
-import io.anuke.annotations.Annotations.Remote;
+import mindustry.annotations.Annotations.Remote;
-import io.anuke.arc.collection.Array;
+import arc.struct.Array;
-import io.anuke.arc.collection.IntSet;
+import arc.struct.IntSet;
-import io.anuke.arc.graphics.Color;
+import arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.util.pooling.Pools;
+import arc.util.pooling.Pools;
-import io.anuke.mindustry.content.Bullets;
+import mindustry.content.Bullets;
-import io.anuke.mindustry.entities.EntityGroup;
+import mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.Units;
+import mindustry.entities.Units;
-import io.anuke.mindustry.entities.type.Bullet;
+import mindustry.entities.type.Bullet;
-import io.anuke.mindustry.entities.type.TimedEntity;
+import mindustry.entities.type.TimedEntity;
-import io.anuke.mindustry.entities.traits.DrawTrait;
+import mindustry.entities.traits.DrawTrait;
-import io.anuke.mindustry.entities.traits.TimeTrait;
+import mindustry.entities.traits.TimeTrait;
-import io.anuke.mindustry.entities.type.Unit;
+import mindustry.entities.type.Unit;
-import io.anuke.mindustry.game.Team;
+import mindustry.game.Team;
-import io.anuke.mindustry.gen.Call;
+import mindustry.gen.Call;
-import io.anuke.mindustry.graphics.Pal;
+import mindustry.graphics.Pal;
-import io.anuke.mindustry.world.Tile;
+import mindustry.world.Tile;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class Lightning extends TimedEntity implements DrawTrait, TimeTrait{
     public static final float lifetime = 10f;

core/src/mindustry/entities/effect/Puddle.java

@@ -1,26 +1,26 @@
-package io.anuke.mindustry.entities.effect;
+package mindustry.entities.effect;
 
-import io.anuke.annotations.Annotations.*;
+import mindustry.annotations.Annotations.*;
-import io.anuke.arc.collection.*;
+import arc.struct.*;
-import io.anuke.arc.graphics.*;
+import arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.arc.util.pooling.Pool.*;
+import arc.util.pooling.Pool.*;
-import io.anuke.arc.util.pooling.*;
+import arc.util.pooling.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.entities.*;
+import mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.*;
+import mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
+import mindustry.game.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
 
 import java.io.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrait, SyncTrait{
     private static final IntMap<Puddle> map = new IntMap<>();

core/src/mindustry/entities/effect/RubbleDecal.java

@@ -1,11 +1,11 @@
-package io.anuke.mindustry.entities.effect;
+package mindustry.entities.effect;
 
-import io.anuke.arc.Core;
+import arc.Core;
-import io.anuke.arc.graphics.g2d.Draw;
+import arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.TextureRegion;
+import arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
 
-import static io.anuke.mindustry.Vars.headless;
+import static mindustry.Vars.headless;
 
 public class RubbleDecal extends Decal{
     private TextureRegion region;

core/src/mindustry/entities/effect/ScorchDecal.java

@@ -1,14 +1,14 @@
-package io.anuke.mindustry.entities.effect;
+package mindustry.entities.effect;
 
-import io.anuke.arc.Core;
+import arc.Core;
-import io.anuke.arc.graphics.g2d.Draw;
+import arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.TextureRegion;
+import arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.math.Angles;
+import arc.math.Angles;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
-import io.anuke.mindustry.world.Tile;
+import mindustry.world.Tile;
 
-import static io.anuke.mindustry.Vars.headless;
+import static mindustry.Vars.headless;
-import static io.anuke.mindustry.Vars.world;
+import static mindustry.Vars.world;
 
 public class ScorchDecal extends Decal{
     private static final int scorches = 5;

core/src/mindustry/entities/traits/AbsorbTrait.java

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
 
 public interface AbsorbTrait extends Entity, TeamTrait, DamageTrait{
     void absorb();

core/src/mindustry/entities/traits/BelowLiquidTrait.java

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
 
 /**
  * A flag interface for marking an effect as appearing below liquids.

core/src/mindustry/entities/traits/BuilderMinerTrait.java

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
 
 /** A class for gracefully merging mining and building traits.*/
 public interface BuilderMinerTrait extends MinerTrait, BuilderTrait{

core/src/mindustry/entities/traits/BuilderTrait.java

@@ -1,27 +1,27 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
 
-import io.anuke.arc.*;
+import arc.*;
-import io.anuke.arc.collection.Queue;
+import arc.struct.Queue;
-import io.anuke.arc.graphics.g2d.*;
+import arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
+import arc.math.*;
-import io.anuke.arc.math.geom.*;
+import arc.math.geom.*;
-import io.anuke.arc.util.ArcAnnotate.*;
+import arc.util.ArcAnnotate.*;
-import io.anuke.arc.util.*;
+import arc.util.*;
-import io.anuke.mindustry.*;
+import mindustry.*;
-import io.anuke.mindustry.content.*;
+import mindustry.content.*;
-import io.anuke.mindustry.entities.type.*;
+import mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
+import mindustry.game.EventType.*;
-import io.anuke.mindustry.gen.*;
+import mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
+import mindustry.graphics.*;
-import io.anuke.mindustry.world.*;
+import mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import mindustry.world.blocks.*;
-import io.anuke.mindustry.world.blocks.BuildBlock.*;
+import mindustry.world.blocks.BuildBlock.*;
 
 import java.io.*;
 import java.util.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
-import static io.anuke.mindustry.entities.traits.BuilderTrait.BuildDataStatic.*;
+import static mindustry.entities.traits.BuilderTrait.BuildDataStatic.*;
 
 /** Interface for units that build things.*/
 public interface BuilderTrait extends Entity, TeamTrait{

core/src/mindustry/entities/traits/DamageTrait.java

@@ -1,6 +1,4 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
-
-import io.anuke.mindustry.entities.type.*;
 
 public interface DamageTrait{
     float damage();