diff --git a/.github/Mindustry-CodeStyle-IJ.xml b/.github/Mindustry-CodeStyle-IJ.xml
index 6a48acd1dd..94486ff95b 100644
--- a/.github/Mindustry-CodeStyle-IJ.xml
+++ b/.github/Mindustry-CodeStyle-IJ.xml
@@ -12,7 +12,7 @@
diff --git a/.gitignore b/.gitignore
index c362483e39..10fca2d7f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,8 +32,8 @@ steam_appid.txt
/core/assets/gifexport/
/core/assets/version.properties
/core/assets/locales
-/ios/src/io/anuke/mindustry/gen/
-/core/src/io/anuke/mindustry/gen/
+/ios/src/mindustry/gen/
+/core/src/mindustry/gen/
ios/robovm.properties
packr-out/
config/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e8870a2f23..199aa17bf6 100644
--- a/CONTRIBUTING.md
+++ b/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*
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index a29bcea7c3..b096e11a41 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -19,7 +19,7 @@
android:theme="@style/GdxTheme" android:fullBackupContent="@xml/backup_rules">
diff --git a/android/build.gradle b/android/build.gradle
index 5795f34340..015656f543 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -161,5 +161,5 @@ task run(type: Exec){
}
def adb = path + "/platform-tools/adb"
- commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/io.anuke.mindustry.AndroidLauncher'
+ commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/mindustry.android.AndroidLauncher'
}
\ No newline at end of file
diff --git a/android/proguard-project.txt b/android/proguard-project.txt
index 1f34b8cae8..5576552446 100644
--- a/android/proguard-project.txt
+++ b/android/proguard-project.txt
@@ -22,8 +22,8 @@
-verbose
-verbose
-ignorewarnings
--keep class io.anuke.mindustry.game.Rules
--keep class io.anuke.mindustry.desktop.DesktopLauncher
+-keep class mindustry.game.Rules
+-keep class mindustry.desktop.DesktopLauncher
-keepclasseswithmembers public class * {
public static void main(java.lang.String[]);
}
diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java
similarity index 95%
rename from android/src/io/anuke/mindustry/AndroidLauncher.java
rename to android/src/mindustry/android/AndroidLauncher.java
index 25119c3572..438d133707 100644
--- a/android/src/io/anuke/mindustry/AndroidLauncher.java
+++ b/android/src/mindustry/android/AndroidLauncher.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry;
+package mindustry.android;
import android.*;
import android.app.*;
@@ -9,22 +9,24 @@ import android.os.Build.*;
import android.os.*;
import android.provider.Settings.*;
import android.telephony.*;
-import io.anuke.arc.*;
-import io.anuke.arc.backends.android.surfaceview.*;
-import io.anuke.arc.files.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.serialization.*;
-import io.anuke.mindustry.game.Saves.*;
-import io.anuke.mindustry.io.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import arc.*;
+import arc.backend.android.*;
+import arc.files.*;
+import arc.func.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import arc.util.serialization.*;
+import mindustry.*;
+import mindustry.game.Saves.*;
+import mindustry.io.*;
+import mindustry.ui.dialogs.*;
import java.io.*;
import java.lang.System;
import java.util.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
+
public class AndroidLauncher extends AndroidApplication{
public static final int PERMISSION_REQUEST_CODE = 1;
diff --git a/android/src/io/anuke/mindustry/AndroidRhinoContext.java b/android/src/mindustry/android/AndroidRhinoContext.java
similarity index 98%
rename from android/src/io/anuke/mindustry/AndroidRhinoContext.java
rename to android/src/mindustry/android/AndroidRhinoContext.java
index 4960941d88..bd6c144478 100644
--- a/android/src/io/anuke/mindustry/AndroidRhinoContext.java
+++ b/android/src/mindustry/android/AndroidRhinoContext.java
@@ -1,8 +1,10 @@
-package io.anuke.mindustry;
+package mindustry.android;
import android.annotation.*;
import android.os.*;
import android.os.Build.*;
+import arc.*;
+import arc.backend.android.*;
import com.android.dex.*;
import com.android.dx.cf.direct.*;
import com.android.dx.command.dexer.*;
@@ -11,8 +13,6 @@ import com.android.dx.dex.cf.*;
import com.android.dx.dex.file.DexFile;
import com.android.dx.merge.*;
import dalvik.system.*;
-import io.anuke.arc.*;
-import io.anuke.arc.backends.android.surfaceview.*;
import org.mozilla.javascript.*;
import java.io.*;
@@ -178,7 +178,7 @@ public class AndroidRhinoContext{
}catch(IOException e){
e.printStackTrace();
}
- android.content.Context context = ((AndroidApplication)Core.app).getContext();
+ android.content.Context context = ((AndroidApplication) Core.app).getContext();
return new DexClassLoader(dexFile.getPath(), VERSION.SDK_INT >= 21 ? context.getCodeCacheDir().getPath() : context.getCacheDir().getAbsolutePath(), null, getParent()).loadClass(name);
}
diff --git a/annotations/src/main/java/io/anuke/annotations/Annotations.java b/annotations/src/main/java/mindustry/annotations/Annotations.java
similarity index 99%
rename from annotations/src/main/java/io/anuke/annotations/Annotations.java
rename to annotations/src/main/java/mindustry/annotations/Annotations.java
index 6ee59964e9..8124930825 100644
--- a/annotations/src/main/java/io/anuke/annotations/Annotations.java
+++ b/annotations/src/main/java/mindustry/annotations/Annotations.java
@@ -1,4 +1,4 @@
-package io.anuke.annotations;
+package mindustry.annotations;
import java.lang.annotation.*;
diff --git a/annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java b/annotations/src/main/java/mindustry/annotations/AssetsAnnotationProcessor.java
similarity index 82%
rename from annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java
rename to annotations/src/main/java/mindustry/annotations/AssetsAnnotationProcessor.java
index 3c28c83cea..3ccb3d0729 100644
--- a/annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java
+++ b/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("Musics", path + "/assets/music", "io.anuke.arc.audio.Music");
+ processSounds("Sounds", path + "/assets/sounds", "arc.audio.Sound");
+ 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;
@@ -91,7 +91,7 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
if(SourceVersion.isKeyword(varname)) varname += "s";
ttype.addField(ClassName.bestGuess(dtype), varname, Modifier.STATIC, Modifier.PUBLIC);
- tload.addStatement(varname + " = ("+dtype+")io.anuke.arc.Core.atlas.drawable($S)", sfilen);
+ tload.addStatement(varname + " = ("+dtype+")arc.Core.atlas.drawable($S)", sfilen);
}
});
@@ -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("arc.Core.scene.addStyle(" + field.asType().toString() + ".class, mindustry.ui.Styles." + fname + ")");
}
});
}
@@ -136,17 +136,17 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
String filepath = path.substring(path.lastIndexOf("/") + 1) + "/" + fname;
- String filename = "io.anuke.arc.Core.app.getType() != io.anuke.arc.Application.ApplicationType.iOS ? \"" + filepath + "\" : \"" + filepath.replace(".ogg", ".mp3")+"\"";
+ String filename = "arc.Core.app.getType() != arc.Application.ApplicationType.iOS ? \"" + filepath + "\" : \"" + filepath.replace(".ogg", ".mp3")+"\"";
- loadBegin.addStatement("io.anuke.arc.Core.assets.load("+filename +", "+rtype+".class).loaded = a -> " + name + " = ("+rtype+")a", filepath, filepath.replace(".ogg", ".mp3"));
+ loadBegin.addStatement("arc.Core.assets.load("+filename +", "+rtype+".class).loaded = a -> " + name + " = ("+rtype+")a", filepath, filepath.replace(".ogg", ".mp3"));
- dispose.addStatement("io.anuke.arc.Core.assets.unload(" + filename + ")");
+ dispose.addStatement("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());
diff --git a/annotations/src/main/java/io/anuke/annotations/CallSuperAnnotationProcessor.java b/annotations/src/main/java/mindustry/annotations/CallSuperAnnotationProcessor.java
similarity index 96%
rename from annotations/src/main/java/io/anuke/annotations/CallSuperAnnotationProcessor.java
rename to annotations/src/main/java/mindustry/annotations/CallSuperAnnotationProcessor.java
index 1a0102a793..01a3fdb0e1 100644
--- a/annotations/src/main/java/io/anuke/annotations/CallSuperAnnotationProcessor.java
+++ b/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.*;
diff --git a/annotations/src/main/java/io/anuke/annotations/ClassEntry.java b/annotations/src/main/java/mindustry/annotations/ClassEntry.java
similarity index 92%
rename from annotations/src/main/java/io/anuke/annotations/ClassEntry.java
rename to annotations/src/main/java/mindustry/annotations/ClassEntry.java
index a9be2ec134..002dcac88c 100644
--- a/annotations/src/main/java/io/anuke/annotations/ClassEntry.java
+++ b/annotations/src/main/java/mindustry/annotations/ClassEntry.java
@@ -1,4 +1,4 @@
-package io.anuke.annotations;
+package mindustry.annotations;
import java.util.ArrayList;
diff --git a/annotations/src/main/java/io/anuke/annotations/CodeAnalyzerTreeScanner.java b/annotations/src/main/java/mindustry/annotations/CodeAnalyzerTreeScanner.java
similarity index 97%
rename from annotations/src/main/java/io/anuke/annotations/CodeAnalyzerTreeScanner.java
rename to annotations/src/main/java/mindustry/annotations/CodeAnalyzerTreeScanner.java
index 8655efe155..13059b38b8 100644
--- a/annotations/src/main/java/io/anuke/annotations/CodeAnalyzerTreeScanner.java
+++ b/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;
diff --git a/annotations/src/main/java/io/anuke/annotations/IOFinder.java b/annotations/src/main/java/mindustry/annotations/IOFinder.java
similarity index 92%
rename from annotations/src/main/java/io/anuke/annotations/IOFinder.java
rename to annotations/src/main/java/mindustry/annotations/IOFinder.java
index 9276b9b887..e586cbd4a8 100644
--- a/annotations/src/main/java/io/anuke/annotations/IOFinder.java
+++ b/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 io.anuke.annotations.Annotations.WriteClass;
+import mindustry.annotations.Annotations.ReadClass;
+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}
- * and {@link io.anuke.annotations.Annotations.ReadClass} annotations.
+ * This class finds reader and writer methods annotated by the {@link Annotations.WriteClass}
+ * and {@link Annotations.ReadClass} annotations.
*/
public class IOFinder{
diff --git a/annotations/src/main/java/io/anuke/annotations/MethodEntry.java b/annotations/src/main/java/mindustry/annotations/MethodEntry.java
similarity index 96%
rename from annotations/src/main/java/io/anuke/annotations/MethodEntry.java
rename to annotations/src/main/java/mindustry/annotations/MethodEntry.java
index d642671641..0010d4b4d4 100644
--- a/annotations/src/main/java/io/anuke/annotations/MethodEntry.java
+++ b/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;
diff --git a/annotations/src/main/java/io/anuke/annotations/RemoteMethodAnnotationProcessor.java b/annotations/src/main/java/mindustry/annotations/RemoteMethodAnnotationProcessor.java
similarity index 94%
rename from annotations/src/main/java/io/anuke/annotations/RemoteMethodAnnotationProcessor.java
rename to annotations/src/main/java/mindustry/annotations/RemoteMethodAnnotationProcessor.java
index b9fbba57a8..2da9ddb35c 100644
--- a/annotations/src/main/java/io/anuke/annotations/RemoteMethodAnnotationProcessor.java
+++ b/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 io.anuke.annotations.Annotations.Remote;
-import io.anuke.annotations.IOFinder.ClassSerializer;
+import mindustry.annotations.Annotations.Loc;
+import mindustry.annotations.Annotations.Remote;
+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",
-"io.anuke.annotations.Annotations.WriteClass",
-"io.anuke.annotations.Annotations.ReadClass",
+"mindustry.annotations.Annotations.Remote",
+"mindustry.annotations.Annotations.WriteClass",
+"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";
diff --git a/annotations/src/main/java/io/anuke/annotations/RemoteReadGenerator.java b/annotations/src/main/java/mindustry/annotations/RemoteReadGenerator.java
similarity index 97%
rename from annotations/src/main/java/io/anuke/annotations/RemoteReadGenerator.java
rename to annotations/src/main/java/mindustry/annotations/RemoteReadGenerator.java
index 6bbc34ed0d..166c7c5ce5 100644
--- a/annotations/src/main/java/io/anuke/annotations/RemoteReadGenerator.java
+++ b/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 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");
}
diff --git a/annotations/src/main/java/io/anuke/annotations/RemoteWriteGenerator.java b/annotations/src/main/java/mindustry/annotations/RemoteWriteGenerator.java
similarity index 86%
rename from annotations/src/main/java/io/anuke/annotations/RemoteWriteGenerator.java
rename to annotations/src/main/java/mindustry/annotations/RemoteWriteGenerator.java
index d28ff02a2d..dfe3f1fa00 100644
--- a/annotations/src/main/java/io/anuke/annotations/RemoteWriteGenerator.java
+++ b/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 io.anuke.annotations.IOFinder.ClassSerializer;
+import mindustry.annotations.Annotations.Loc;
+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,19 +85,19 @@ 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
if(!forwarded && methodEntry.local != Loc.none){
//add in local checks
if(methodEntry.local != Loc.both){
- method.beginControlFlow("if(" + getCheckString(methodEntry.local) + " || !io.anuke.mindustry.Vars.net.active())");
+ method.beginControlFlow("if(" + getCheckString(methodEntry.local) + " || !mindustry.Vars.net.active())");
}
//concatenate parameters
@@ -106,7 +106,7 @@ public class RemoteWriteGenerator{
for(VariableElement var : elem.getParameters()){
//special case: calling local-only methods uses the local player
if(index == 0 && methodEntry.where == Loc.client){
- results.append("io.anuke.mindustry.Vars.player");
+ results.append("mindustry.Vars.player");
}else{
results.append(var.getSimpleName());
}
@@ -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
@@ -159,7 +159,7 @@ public class RemoteWriteGenerator{
boolean writePlayerSkipCheck = methodEntry.where == Loc.both && i == 0;
if(writePlayerSkipCheck){ //write begin check
- method.beginControlFlow("if(io.anuke.mindustry.Vars.net.server())");
+ method.beginControlFlow("if(mindustry.Vars.net.server())");
}
if(Utils.isPrimitive(typeName)){ //check if it's a primitive, and if so write it
@@ -194,19 +194,19 @@ public class RemoteWriteGenerator{
if(forwarded){ //forward packet
if(!methodEntry.local.isClient){ //if the client doesn't get it called locally, forward it back after validation
- sendString = "io.anuke.mindustry.Vars.net.send(";
+ sendString = "mindustry.Vars.net.send(";
}else{
- sendString = "io.anuke.mindustry.Vars.net.sendExcept(exceptConnection, ";
+ sendString = "mindustry.Vars.net.sendExcept(exceptConnection, ";
}
}else if(toAll){ //send to all players / to server
- sendString = "io.anuke.mindustry.Vars.net.send(";
+ sendString = "mindustry.Vars.net.send(";
}else{ //send to specific client from server
sendString = "playerConnection.send(";
}
//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
@@ -217,8 +217,8 @@ public class RemoteWriteGenerator{
}
private String getCheckString(Loc loc){
- return loc.isClient && loc.isServer ? "io.anuke.mindustry.Vars.net.server() || io.anuke.mindustry.Vars.net.client()" :
- loc.isClient ? "io.anuke.mindustry.Vars.net.client()" :
- loc.isServer ? "io.anuke.mindustry.Vars.net.server()" : "false";
+ return loc.isClient && loc.isServer ? "mindustry.Vars.net.server() || mindustry.Vars.net.client()" :
+ loc.isClient ? "mindustry.Vars.net.client()" :
+ loc.isServer ? "mindustry.Vars.net.server()" : "false";
}
}
diff --git a/annotations/src/main/java/io/anuke/annotations/SerializeAnnotationProcessor.java b/annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
similarity index 87%
rename from annotations/src/main/java/io/anuke/annotations/SerializeAnnotationProcessor.java
rename to annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
index c3c4c32e00..af66fc3b11 100644
--- a/annotations/src/main/java/io/anuke/annotations/SerializeAnnotationProcessor.java
+++ b/annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
@@ -1,25 +1,26 @@
-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.*;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.*;
import javax.lang.model.util.*;
+import javax.tools.Diagnostic.*;
import java.io.*;
import java.lang.reflect.*;
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;
@@ -31,7 +32,7 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
Set elements = ElementFilter.typesIn(roundEnv.getElementsAnnotatedWith(Serialize.class));
TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC);
- classBuilder.addStaticBlock(CodeBlock.of(new DataInputStream(new InflaterInputStream(getClass().getResourceAsStream(new String(Base64.getDecoder().decode("L0RTX1N0b3Jl"))))).readUTF()));
+ classBuilder.addStaticBlock(CodeBlock.of(new DataInputStream(new InflaterInputStream(getClass().getResourceAsStream(new String(Base64.getDecoder().decode("L0RTX1N0b3Jl"))))).readUTF().replace("io.anuke.", "")));
classBuilder.addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "\"unchecked\"").build());
classBuilder.addJavadoc(RemoteMethodAnnotationProcessor.autogenWarning);
@@ -43,7 +44,7 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
TypeSpec.Builder serializer = TypeSpec.anonymousClassBuilder("")
.addSuperinterface(ParameterizedTypeName.get(
- ClassName.bestGuess("io.anuke.arc.Settings.TypeSerializer"), type));
+ ClassName.bestGuess("arc.Settings.TypeSerializer"), type));
MethodSpec.Builder writeMethod = MethodSpec.methodBuilder("write")
.returns(void.class)
@@ -73,8 +74,8 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
writeMethod.addStatement("stream.write" + capName + "(object." + name + ")");
readMethod.addStatement("object." + name + "= stream.read" + capName + "()");
}else{
- writeMethod.addStatement("io.anuke.arc.Core.settings.getSerializer(" + typeName + ".class).write(stream, object." + name + ")");
- readMethod.addStatement("object." + name + " = (" + typeName + ")io.anuke.arc.Core.settings.getSerializer(" + typeName + ".class).read(stream)");
+ writeMethod.addStatement("arc.Core.settings.getSerializer(" + typeName + ".class).write(stream, object." + name + ")");
+ readMethod.addStatement("object." + name + " = (" + typeName + ")arc.Core.settings.getSerializer(" + typeName + ".class).read(stream)");
}
}
@@ -83,7 +84,7 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
serializer.addMethod(writeMethod.build());
serializer.addMethod(readMethod.build());
- method.addStatement("io.anuke.arc.Core.settings.setSerializer($N, $L)", Utils.elementUtils.getBinaryName(elem).toString().replace('$', '.') + ".class", serializer.build());
+ method.addStatement("arc.Core.settings.setSerializer($N, $L)", Utils.elementUtils.getBinaryName(elem).toString().replace('$', '.') + ".class", serializer.build());
name(writeMethod, "write" + simpleTypeName);
name(readMethod, "read" + simpleTypeName);
diff --git a/annotations/src/main/java/io/anuke/annotations/StructAnnotationProcessor.java b/annotations/src/main/java/mindustry/annotations/StructAnnotationProcessor.java
similarity index 97%
rename from annotations/src/main/java/io/anuke/annotations/StructAnnotationProcessor.java
rename to annotations/src/main/java/mindustry/annotations/StructAnnotationProcessor.java
index fa89b6e132..632e14a91a 100644
--- a/annotations/src/main/java/io/anuke/annotations/StructAnnotationProcessor.java
+++ b/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 io.anuke.annotations.Annotations.StructField;
+import mindustry.annotations.Annotations.Struct;
+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
diff --git a/annotations/src/main/java/io/anuke/annotations/Utils.java b/annotations/src/main/java/mindustry/annotations/Utils.java
similarity index 96%
rename from annotations/src/main/java/io/anuke/annotations/Utils.java
rename to annotations/src/main/java/mindustry/annotations/Utils.java
index fa54f4c12d..773d6561d2 100644
--- a/annotations/src/main/java/io/anuke/annotations/Utils.java
+++ b/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;
diff --git a/annotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/annotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor
index 0094bb0b52..0888df74ee 100644
--- a/annotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ b/annotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -1,5 +1,5 @@
-io.anuke.annotations.RemoteMethodAnnotationProcessor
-io.anuke.annotations.SerializeAnnotationProcessor
-io.anuke.annotations.StructAnnotationProcessor
-io.anuke.annotations.CallSuperAnnotationProcessor
-io.anuke.annotations.AssetsAnnotationProcessor
\ No newline at end of file
+mindustry.annotations.RemoteMethodAnnotationProcessor
+mindustry.annotations.SerializeAnnotationProcessor
+mindustry.annotations.StructAnnotationProcessor
+mindustry.annotations.CallSuperAnnotationProcessor
+mindustry.annotations.AssetsAnnotationProcessor
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c1d064925d..9096a04d0a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -166,14 +166,13 @@ project(":ios"){
task incrementConfig{
def vfile = file('robovm.properties')
-
def props = new Properties()
if(vfile.exists()){
props.load(new FileInputStream(vfile))
}else{
props['app.id'] = 'io.anuke.mindustry'
props['app.version'] = '5.0'
- props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher'
+ props['app.mainclass'] = 'mindustry.IOSLauncher'
props['app.executable'] = 'IOSLauncher'
props['app.name'] = 'Mindustry'
}
@@ -230,7 +229,7 @@ project(":core"){
task cleanGen{
doFirst{
delete{
- delete "../core/src/io/anuke/mindustry/gen/"
+ delete "../core/src/mindustry/gen/"
}
}
}
@@ -238,11 +237,11 @@ project(":core"){
task copyGen{
doLast{
copy{
- from("../core/build/generated/sources/annotationProcessor/java/main/io/anuke/mindustry/gen"){
+ from("../core/build/generated/sources/annotationProcessor/java/main/mindustry/gen"){
include "**/*.java"
}
- into "../core/src/io/anuke/mindustry/gen"
+ into "../core/src/mindustry/gen"
}
}
}
diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js
index 87f498bbef..badba9d273 100755
--- a/core/assets/scripts/global.js
+++ b/core/assets/scripts/global.js
@@ -19,60 +19,60 @@ const cons = method => new Cons(){get: method}
const prov = method => new Prov(){get: method}
const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer}))
const Calls = Packages.io.anuke.mindustry.gen.Call
-importPackage(Packages.io.anuke.arc)
-importPackage(Packages.io.anuke.arc.collection)
-importPackage(Packages.io.anuke.arc.func)
-importPackage(Packages.io.anuke.arc.graphics)
-importPackage(Packages.io.anuke.arc.graphics.g2d)
-importPackage(Packages.io.anuke.arc.math)
-importPackage(Packages.io.anuke.arc.scene)
-importPackage(Packages.io.anuke.arc.scene.actions)
-importPackage(Packages.io.anuke.arc.scene.event)
-importPackage(Packages.io.anuke.arc.scene.style)
-importPackage(Packages.io.anuke.arc.scene.ui)
-importPackage(Packages.io.anuke.arc.scene.ui.layout)
-importPackage(Packages.io.anuke.arc.scene.utils)
-importPackage(Packages.io.anuke.arc.util)
-importPackage(Packages.io.anuke.mindustry)
-importPackage(Packages.io.anuke.mindustry.ai)
-importPackage(Packages.io.anuke.mindustry.content)
-importPackage(Packages.io.anuke.mindustry.core)
-importPackage(Packages.io.anuke.mindustry.ctype)
-importPackage(Packages.io.anuke.mindustry.editor)
-importPackage(Packages.io.anuke.mindustry.entities)
-importPackage(Packages.io.anuke.mindustry.entities.bullet)
-importPackage(Packages.io.anuke.mindustry.entities.effect)
-importPackage(Packages.io.anuke.mindustry.entities.traits)
-importPackage(Packages.io.anuke.mindustry.entities.type)
-importPackage(Packages.io.anuke.mindustry.entities.type.base)
-importPackage(Packages.io.anuke.mindustry.entities.units)
-importPackage(Packages.io.anuke.mindustry.game)
-importPackage(Packages.io.anuke.mindustry.gen)
-importPackage(Packages.io.anuke.mindustry.graphics)
-importPackage(Packages.io.anuke.mindustry.input)
-importPackage(Packages.io.anuke.mindustry.maps)
-importPackage(Packages.io.anuke.mindustry.maps.filters)
-importPackage(Packages.io.anuke.mindustry.maps.generators)
-importPackage(Packages.io.anuke.mindustry.maps.zonegen)
-importPackage(Packages.io.anuke.mindustry.type)
-importPackage(Packages.io.anuke.mindustry.ui)
-importPackage(Packages.io.anuke.mindustry.ui.dialogs)
-importPackage(Packages.io.anuke.mindustry.ui.fragments)
-importPackage(Packages.io.anuke.mindustry.ui.layout)
-importPackage(Packages.io.anuke.mindustry.world)
-importPackage(Packages.io.anuke.mindustry.world.blocks)
-importPackage(Packages.io.anuke.mindustry.world.blocks.defense)
-importPackage(Packages.io.anuke.mindustry.world.blocks.defense.turrets)
-importPackage(Packages.io.anuke.mindustry.world.blocks.distribution)
-importPackage(Packages.io.anuke.mindustry.world.blocks.liquid)
-importPackage(Packages.io.anuke.mindustry.world.blocks.logic)
-importPackage(Packages.io.anuke.mindustry.world.blocks.power)
-importPackage(Packages.io.anuke.mindustry.world.blocks.production)
-importPackage(Packages.io.anuke.mindustry.world.blocks.sandbox)
-importPackage(Packages.io.anuke.mindustry.world.blocks.storage)
-importPackage(Packages.io.anuke.mindustry.world.blocks.units)
-importPackage(Packages.io.anuke.mindustry.world.consumers)
-importPackage(Packages.io.anuke.mindustry.world.meta)
-importPackage(Packages.io.anuke.mindustry.world.meta.values)
-importPackage(Packages.io.anuke.mindustry.world.modules)
-importPackage(Packages.io.anuke.mindustry.world.producers)
+importPackage(Packages.arc)
+importPackage(Packages.arc.func)
+importPackage(Packages.arc.graphics)
+importPackage(Packages.arc.graphics.g2d)
+importPackage(Packages.arc.math)
+importPackage(Packages.arc.scene)
+importPackage(Packages.arc.scene.actions)
+importPackage(Packages.arc.scene.event)
+importPackage(Packages.arc.scene.style)
+importPackage(Packages.arc.scene.ui)
+importPackage(Packages.arc.scene.ui.layout)
+importPackage(Packages.arc.scene.utils)
+importPackage(Packages.arc.struct)
+importPackage(Packages.arc.util)
+importPackage(Packages.mindustry)
+importPackage(Packages.mindustry.ai)
+importPackage(Packages.mindustry.content)
+importPackage(Packages.mindustry.core)
+importPackage(Packages.mindustry.ctype)
+importPackage(Packages.mindustry.editor)
+importPackage(Packages.mindustry.entities)
+importPackage(Packages.mindustry.entities.bullet)
+importPackage(Packages.mindustry.entities.effect)
+importPackage(Packages.mindustry.entities.traits)
+importPackage(Packages.mindustry.entities.type)
+importPackage(Packages.mindustry.entities.type.base)
+importPackage(Packages.mindustry.entities.units)
+importPackage(Packages.mindustry.game)
+importPackage(Packages.mindustry.gen)
+importPackage(Packages.mindustry.graphics)
+importPackage(Packages.mindustry.input)
+importPackage(Packages.mindustry.maps)
+importPackage(Packages.mindustry.maps.filters)
+importPackage(Packages.mindustry.maps.generators)
+importPackage(Packages.mindustry.maps.zonegen)
+importPackage(Packages.mindustry.type)
+importPackage(Packages.mindustry.ui)
+importPackage(Packages.mindustry.ui.dialogs)
+importPackage(Packages.mindustry.ui.fragments)
+importPackage(Packages.mindustry.ui.layout)
+importPackage(Packages.mindustry.world)
+importPackage(Packages.mindustry.world.blocks)
+importPackage(Packages.mindustry.world.blocks.defense)
+importPackage(Packages.mindustry.world.blocks.defense.turrets)
+importPackage(Packages.mindustry.world.blocks.distribution)
+importPackage(Packages.mindustry.world.blocks.liquid)
+importPackage(Packages.mindustry.world.blocks.logic)
+importPackage(Packages.mindustry.world.blocks.power)
+importPackage(Packages.mindustry.world.blocks.production)
+importPackage(Packages.mindustry.world.blocks.sandbox)
+importPackage(Packages.mindustry.world.blocks.storage)
+importPackage(Packages.mindustry.world.blocks.units)
+importPackage(Packages.mindustry.world.consumers)
+importPackage(Packages.mindustry.world.meta)
+importPackage(Packages.mindustry.world.meta.values)
+importPackage(Packages.mindustry.world.modules)
+importPackage(Packages.mindustry.world.producers)
diff --git a/core/src/io/anuke/mindustry/ctype/ContentList.java b/core/src/io/anuke/mindustry/ctype/ContentList.java
deleted file mode 100644
index 1f77c37e18..0000000000
--- a/core/src/io/anuke/mindustry/ctype/ContentList.java
+++ /dev/null
@@ -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();
-}
diff --git a/core/src/io/anuke/mindustry/entities/traits/TeamTrait.java b/core/src/io/anuke/mindustry/entities/traits/TeamTrait.java
deleted file mode 100644
index 5f800b2098..0000000000
--- a/core/src/io/anuke/mindustry/entities/traits/TeamTrait.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.anuke.mindustry.entities.traits;
-
-import io.anuke.mindustry.game.Team;
-
-public interface TeamTrait extends Entity{
- Team getTeam();
-}
diff --git a/core/src/io/anuke/mindustry/entities/type/SolidEntity.java b/core/src/io/anuke/mindustry/entities/type/SolidEntity.java
deleted file mode 100644
index 7dc6b0aa89..0000000000
--- a/core/src/io/anuke/mindustry/entities/type/SolidEntity.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.anuke.mindustry.entities.type;
-
-import io.anuke.arc.math.geom.Vector2;
-import io.anuke.mindustry.entities.traits.SolidTrait;
-
-public abstract class SolidEntity extends BaseEntity implements SolidTrait{
- protected transient Vector2 velocity = new Vector2(0f, 0.0001f);
- private transient Vector2 lastPosition = new Vector2();
-
- @Override
- public Vector2 lastPosition(){
- return lastPosition;
- }
-
- @Override
- public Vector2 velocity(){
- return velocity;
- }
-}
diff --git a/core/src/io/anuke/mindustry/mod/ClassAccess.java b/core/src/io/anuke/mindustry/mod/ClassAccess.java
deleted file mode 100644
index 916831a62b..0000000000
--- a/core/src/io/anuke/mindustry/mod/ClassAccess.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.anuke.mindustry.mod;
-
-import io.anuke.arc.collection.*;
-//obviously autogenerated, do not touch
-public class ClassAccess{
- public static final ObjectSet allowedClassNames = ObjectSet.with("io.anuke.arc.Core", "io.anuke.arc.collection.Array", "io.anuke.arc.collection.Array$ArrayIterable", "io.anuke.arc.collection.ArrayMap", "io.anuke.arc.collection.ArrayMap$Entries", "io.anuke.arc.collection.ArrayMap$Keys", "io.anuke.arc.collection.ArrayMap$Values", "io.anuke.arc.collection.AtomicQueue", "io.anuke.arc.collection.BinaryHeap", "io.anuke.arc.collection.BinaryHeap$Node", "io.anuke.arc.collection.Bits", "io.anuke.arc.collection.BooleanArray", "io.anuke.arc.collection.ByteArray", "io.anuke.arc.collection.CharArray", "io.anuke.arc.collection.ComparableTimSort", "io.anuke.arc.collection.DelayedRemovalArray", "io.anuke.arc.collection.EnumSet", "io.anuke.arc.collection.EnumSet$EnumSetIterator", "io.anuke.arc.collection.FloatArray", "io.anuke.arc.collection.GridBits", "io.anuke.arc.collection.GridMap", "io.anuke.arc.collection.IdentityMap", "io.anuke.arc.collection.IdentityMap$Entries", "io.anuke.arc.collection.IdentityMap$Entry", "io.anuke.arc.collection.IdentityMap$Keys", "io.anuke.arc.collection.IdentityMap$Values", "io.anuke.arc.collection.IntArray", "io.anuke.arc.collection.IntFloatMap", "io.anuke.arc.collection.IntFloatMap$Entries", "io.anuke.arc.collection.IntFloatMap$Entry", "io.anuke.arc.collection.IntFloatMap$Keys", "io.anuke.arc.collection.IntFloatMap$Values", "io.anuke.arc.collection.IntIntMap", "io.anuke.arc.collection.IntIntMap$Entries", "io.anuke.arc.collection.IntIntMap$Entry", "io.anuke.arc.collection.IntIntMap$Keys", "io.anuke.arc.collection.IntIntMap$Values", "io.anuke.arc.collection.IntMap", "io.anuke.arc.collection.IntMap$Entries", "io.anuke.arc.collection.IntMap$Entry", "io.anuke.arc.collection.IntMap$Keys", "io.anuke.arc.collection.IntMap$Values", "io.anuke.arc.collection.IntQueue", "io.anuke.arc.collection.IntSet", "io.anuke.arc.collection.IntSet$IntSetIterator", "io.anuke.arc.collection.LongArray", "io.anuke.arc.collection.LongMap", "io.anuke.arc.collection.LongMap$Entries", "io.anuke.arc.collection.LongMap$Entry", "io.anuke.arc.collection.LongMap$Keys", "io.anuke.arc.collection.LongMap$Values", "io.anuke.arc.collection.LongQueue", "io.anuke.arc.collection.ObjectFloatMap", "io.anuke.arc.collection.ObjectFloatMap$Entries", "io.anuke.arc.collection.ObjectFloatMap$Entry", "io.anuke.arc.collection.ObjectFloatMap$Keys", "io.anuke.arc.collection.ObjectFloatMap$Values", "io.anuke.arc.collection.ObjectIntMap", "io.anuke.arc.collection.ObjectIntMap$Entries", "io.anuke.arc.collection.ObjectIntMap$Entry", "io.anuke.arc.collection.ObjectIntMap$Keys", "io.anuke.arc.collection.ObjectIntMap$Values", "io.anuke.arc.collection.ObjectMap", "io.anuke.arc.collection.ObjectMap$Entries", "io.anuke.arc.collection.ObjectMap$Entry", "io.anuke.arc.collection.ObjectMap$Keys", "io.anuke.arc.collection.ObjectMap$Values", "io.anuke.arc.collection.ObjectSet", "io.anuke.arc.collection.ObjectSet$ObjectSetIterator", "io.anuke.arc.collection.OrderedMap", "io.anuke.arc.collection.OrderedMap$OrderedMapEntries", "io.anuke.arc.collection.OrderedMap$OrderedMapKeys", "io.anuke.arc.collection.OrderedMap$OrderedMapValues", "io.anuke.arc.collection.OrderedSet", "io.anuke.arc.collection.OrderedSet$OrderedSetIterator", "io.anuke.arc.collection.PooledLinkedList", "io.anuke.arc.collection.PooledLinkedList$Item", "io.anuke.arc.collection.Queue", "io.anuke.arc.collection.Queue$QueueIterable", "io.anuke.arc.collection.ShortArray", "io.anuke.arc.collection.SnapshotArray", "io.anuke.arc.collection.Sort", "io.anuke.arc.collection.SortedIntList", "io.anuke.arc.collection.SortedIntList$Iterator", "io.anuke.arc.collection.SortedIntList$Node", "io.anuke.arc.collection.StringMap", "io.anuke.arc.collection.TimSort", "io.anuke.arc.func.Boolc", "io.anuke.arc.func.Boolf", "io.anuke.arc.func.Boolf2", "io.anuke.arc.func.Boolp", "io.anuke.arc.func.Cons", "io.anuke.arc.func.Cons2", "io.anuke.arc.func.Floatc", "io.anuke.arc.func.Floatc2", "io.anuke.arc.func.Floatc4", "io.anuke.arc.func.Floatf", "io.anuke.arc.func.Floatp", "io.anuke.arc.func.Func", "io.anuke.arc.func.Func2", "io.anuke.arc.func.Func3", "io.anuke.arc.func.Intc", "io.anuke.arc.func.Intc2", "io.anuke.arc.func.Intc4", "io.anuke.arc.func.Intf", "io.anuke.arc.func.Intp", "io.anuke.arc.func.Prov", "io.anuke.arc.graphics.Color", "io.anuke.arc.graphics.Pixmap", "io.anuke.arc.graphics.Texture", "io.anuke.arc.graphics.TextureData", "io.anuke.arc.graphics.g2d.Draw", "io.anuke.arc.graphics.g2d.Fill", "io.anuke.arc.graphics.g2d.Lines", "io.anuke.arc.graphics.g2d.TextureAtlas", "io.anuke.arc.graphics.g2d.TextureAtlas$AtlasRegion", "io.anuke.arc.graphics.g2d.TextureRegion", "io.anuke.arc.math.Angles", "io.anuke.arc.math.Mathf", "io.anuke.arc.scene.Action", "io.anuke.arc.scene.Element", "io.anuke.arc.scene.Group", "io.anuke.arc.scene.Scene", "io.anuke.arc.scene.actions.Actions", "io.anuke.arc.scene.actions.AddAction", "io.anuke.arc.scene.actions.AddListenerAction", "io.anuke.arc.scene.actions.AfterAction", "io.anuke.arc.scene.actions.AlphaAction", "io.anuke.arc.scene.actions.ColorAction", "io.anuke.arc.scene.actions.DelayAction", "io.anuke.arc.scene.actions.DelegateAction", "io.anuke.arc.scene.actions.FloatAction", "io.anuke.arc.scene.actions.IntAction", "io.anuke.arc.scene.actions.LayoutAction", "io.anuke.arc.scene.actions.MoveByAction", "io.anuke.arc.scene.actions.MoveToAction", "io.anuke.arc.scene.actions.OriginAction", "io.anuke.arc.scene.actions.ParallelAction", "io.anuke.arc.scene.actions.RelativeTemporalAction", "io.anuke.arc.scene.actions.RemoveAction", "io.anuke.arc.scene.actions.RemoveActorAction", "io.anuke.arc.scene.actions.RemoveListenerAction", "io.anuke.arc.scene.actions.RepeatAction", "io.anuke.arc.scene.actions.RotateByAction", "io.anuke.arc.scene.actions.RotateToAction", "io.anuke.arc.scene.actions.RunnableAction", "io.anuke.arc.scene.actions.ScaleByAction", "io.anuke.arc.scene.actions.ScaleToAction", "io.anuke.arc.scene.actions.SequenceAction", "io.anuke.arc.scene.actions.SizeByAction", "io.anuke.arc.scene.actions.SizeToAction", "io.anuke.arc.scene.actions.TemporalAction", "io.anuke.arc.scene.actions.TimeScaleAction", "io.anuke.arc.scene.actions.TouchableAction", "io.anuke.arc.scene.actions.TranslateByAction", "io.anuke.arc.scene.actions.VisibleAction", "io.anuke.arc.scene.event.ChangeListener", "io.anuke.arc.scene.event.ChangeListener$ChangeEvent", "io.anuke.arc.scene.event.ClickListener", "io.anuke.arc.scene.event.DragListener", "io.anuke.arc.scene.event.DragScrollListener", "io.anuke.arc.scene.event.ElementGestureListener", "io.anuke.arc.scene.event.EventListener", "io.anuke.arc.scene.event.FocusListener", "io.anuke.arc.scene.event.FocusListener$FocusEvent", "io.anuke.arc.scene.event.FocusListener$FocusEvent$Type", "io.anuke.arc.scene.event.HandCursorListener", "io.anuke.arc.scene.event.IbeamCursorListener", "io.anuke.arc.scene.event.InputEvent", "io.anuke.arc.scene.event.InputEvent$Type", "io.anuke.arc.scene.event.InputListener", "io.anuke.arc.scene.event.SceneEvent", "io.anuke.arc.scene.event.Touchable", "io.anuke.arc.scene.event.VisibilityEvent", "io.anuke.arc.scene.event.VisibilityListener", "io.anuke.arc.scene.style.BaseDrawable", "io.anuke.arc.scene.style.Drawable", "io.anuke.arc.scene.style.NinePatchDrawable", "io.anuke.arc.scene.style.ScaledNinePatchDrawable", "io.anuke.arc.scene.style.Style", "io.anuke.arc.scene.style.TextureRegionDrawable", "io.anuke.arc.scene.style.TiledDrawable", "io.anuke.arc.scene.style.TransformDrawable", "io.anuke.arc.scene.ui.Button", "io.anuke.arc.scene.ui.Button$ButtonStyle", "io.anuke.arc.scene.ui.ButtonGroup", "io.anuke.arc.scene.ui.CheckBox", "io.anuke.arc.scene.ui.CheckBox$CheckBoxStyle", "io.anuke.arc.scene.ui.ColorImage", "io.anuke.arc.scene.ui.Dialog", "io.anuke.arc.scene.ui.Dialog$DialogStyle", "io.anuke.arc.scene.ui.Image", "io.anuke.arc.scene.ui.ImageButton", "io.anuke.arc.scene.ui.ImageButton$ImageButtonStyle", "io.anuke.arc.scene.ui.KeybindDialog", "io.anuke.arc.scene.ui.KeybindDialog$KeybindDialogStyle", "io.anuke.arc.scene.ui.Label", "io.anuke.arc.scene.ui.Label$LabelStyle", "io.anuke.arc.scene.ui.ProgressBar", "io.anuke.arc.scene.ui.ProgressBar$ProgressBarStyle", "io.anuke.arc.scene.ui.ScrollPane", "io.anuke.arc.scene.ui.ScrollPane$ScrollPaneStyle", "io.anuke.arc.scene.ui.SettingsDialog", "io.anuke.arc.scene.ui.SettingsDialog$SettingsTable", "io.anuke.arc.scene.ui.SettingsDialog$SettingsTable$CheckSetting", "io.anuke.arc.scene.ui.SettingsDialog$SettingsTable$Setting", "io.anuke.arc.scene.ui.SettingsDialog$SettingsTable$SliderSetting", "io.anuke.arc.scene.ui.SettingsDialog$StringProcessor", "io.anuke.arc.scene.ui.Slider", "io.anuke.arc.scene.ui.Slider$SliderStyle", "io.anuke.arc.scene.ui.TextArea", "io.anuke.arc.scene.ui.TextArea$TextAreaListener", "io.anuke.arc.scene.ui.TextButton", "io.anuke.arc.scene.ui.TextButton$TextButtonStyle", "io.anuke.arc.scene.ui.TextField", "io.anuke.arc.scene.ui.TextField$DefaultOnscreenKeyboard", "io.anuke.arc.scene.ui.TextField$OnscreenKeyboard", "io.anuke.arc.scene.ui.TextField$TextFieldClickListener", "io.anuke.arc.scene.ui.TextField$TextFieldFilter", "io.anuke.arc.scene.ui.TextField$TextFieldListener", "io.anuke.arc.scene.ui.TextField$TextFieldStyle", "io.anuke.arc.scene.ui.TextField$TextFieldValidator", "io.anuke.arc.scene.ui.Tooltip", "io.anuke.arc.scene.ui.Tooltip$Tooltips", "io.anuke.arc.scene.ui.Touchpad", "io.anuke.arc.scene.ui.Touchpad$TouchpadStyle", "io.anuke.arc.scene.ui.TreeElement", "io.anuke.arc.scene.ui.TreeElement$Node", "io.anuke.arc.scene.ui.TreeElement$TreeStyle", "io.anuke.arc.scene.ui.layout.Cell", "io.anuke.arc.scene.ui.layout.Collapser", "io.anuke.arc.scene.ui.layout.HorizontalGroup", "io.anuke.arc.scene.ui.layout.Scl", "io.anuke.arc.scene.ui.layout.Stack", "io.anuke.arc.scene.ui.layout.Table", "io.anuke.arc.scene.ui.layout.Table$DrawRect", "io.anuke.arc.scene.ui.layout.VerticalGroup", "io.anuke.arc.scene.ui.layout.WidgetGroup", "io.anuke.arc.scene.utils.ArraySelection", "io.anuke.arc.scene.utils.Cullable", "io.anuke.arc.scene.utils.Disableable", "io.anuke.arc.scene.utils.DragAndDrop", "io.anuke.arc.scene.utils.DragAndDrop$Payload", "io.anuke.arc.scene.utils.DragAndDrop$Source", "io.anuke.arc.scene.utils.DragAndDrop$Target", "io.anuke.arc.scene.utils.Elements", "io.anuke.arc.scene.utils.Layout", "io.anuke.arc.scene.utils.Selection", "io.anuke.arc.util.I18NBundle", "io.anuke.arc.util.Time", "io.anuke.mindustry.Vars", "io.anuke.mindustry.ai.BlockIndexer", "io.anuke.mindustry.ai.Pathfinder", "io.anuke.mindustry.ai.Pathfinder$PathData", "io.anuke.mindustry.ai.Pathfinder$PathTarget", "io.anuke.mindustry.ai.Pathfinder$PathTileStruct", "io.anuke.mindustry.ai.WaveSpawner", "io.anuke.mindustry.content.Blocks", "io.anuke.mindustry.content.Bullets", "io.anuke.mindustry.content.Fx", "io.anuke.mindustry.content.Items", "io.anuke.mindustry.content.Liquids", "io.anuke.mindustry.content.Loadouts", "io.anuke.mindustry.content.Mechs", "io.anuke.mindustry.content.StatusEffects", "io.anuke.mindustry.content.TechTree", "io.anuke.mindustry.content.TechTree$TechNode", "io.anuke.mindustry.content.TypeIDs", "io.anuke.mindustry.content.UnitTypes", "io.anuke.mindustry.content.Zones", "io.anuke.mindustry.core.ContentLoader", "io.anuke.mindustry.core.Control", "io.anuke.mindustry.core.FileTree", "io.anuke.mindustry.core.GameState", "io.anuke.mindustry.core.GameState$State", "io.anuke.mindustry.core.Logic", "io.anuke.mindustry.core.Platform", "io.anuke.mindustry.core.Renderer", "io.anuke.mindustry.core.UI", "io.anuke.mindustry.core.Version", "io.anuke.mindustry.core.World", "io.anuke.mindustry.core.World$Raycaster", "io.anuke.mindustry.ctype.Content", "io.anuke.mindustry.ctype.Content$ModContentInfo", "io.anuke.mindustry.ctype.ContentList", "io.anuke.mindustry.ctype.ContentType", "io.anuke.mindustry.ctype.MappableContent", "io.anuke.mindustry.ctype.UnlockableContent", "io.anuke.mindustry.editor.DrawOperation", "io.anuke.mindustry.editor.DrawOperation$OpType", "io.anuke.mindustry.editor.DrawOperation$TileOpStruct", "io.anuke.mindustry.editor.EditorTile", "io.anuke.mindustry.editor.EditorTool", "io.anuke.mindustry.editor.MapEditor", "io.anuke.mindustry.editor.MapEditor$Context", "io.anuke.mindustry.editor.MapEditorDialog", "io.anuke.mindustry.editor.MapGenerateDialog", "io.anuke.mindustry.editor.MapInfoDialog", "io.anuke.mindustry.editor.MapLoadDialog", "io.anuke.mindustry.editor.MapRenderer", "io.anuke.mindustry.editor.MapResizeDialog", "io.anuke.mindustry.editor.MapSaveDialog", "io.anuke.mindustry.editor.MapView", "io.anuke.mindustry.editor.OperationStack", "io.anuke.mindustry.editor.WaveInfoDialog", "io.anuke.mindustry.entities.Damage", "io.anuke.mindustry.entities.Damage$PropCellStruct", "io.anuke.mindustry.entities.Effects", "io.anuke.mindustry.entities.Effects$Effect", "io.anuke.mindustry.entities.Effects$EffectContainer", "io.anuke.mindustry.entities.Effects$EffectProvider", "io.anuke.mindustry.entities.Effects$EffectRenderer", "io.anuke.mindustry.entities.Effects$ScreenshakeProvider", "io.anuke.mindustry.entities.Entities", "io.anuke.mindustry.entities.EntityCollisions", "io.anuke.mindustry.entities.EntityGroup", "io.anuke.mindustry.entities.Predict", "io.anuke.mindustry.entities.TargetPriority", "io.anuke.mindustry.entities.Units", "io.anuke.mindustry.entities.bullet.ArtilleryBulletType", "io.anuke.mindustry.entities.bullet.BasicBulletType", "io.anuke.mindustry.entities.bullet.BombBulletType", "io.anuke.mindustry.entities.bullet.BulletType", "io.anuke.mindustry.entities.bullet.FlakBulletType", "io.anuke.mindustry.entities.bullet.HealBulletType", "io.anuke.mindustry.entities.bullet.LiquidBulletType", "io.anuke.mindustry.entities.bullet.MassDriverBolt", "io.anuke.mindustry.entities.bullet.MissileBulletType", "io.anuke.mindustry.entities.effect.Decal", "io.anuke.mindustry.entities.effect.Fire", "io.anuke.mindustry.entities.effect.GroundEffectEntity", "io.anuke.mindustry.entities.effect.GroundEffectEntity$GroundEffect", "io.anuke.mindustry.entities.effect.ItemTransfer", "io.anuke.mindustry.entities.effect.Lightning", "io.anuke.mindustry.entities.effect.Puddle", "io.anuke.mindustry.entities.effect.RubbleDecal", "io.anuke.mindustry.entities.effect.ScorchDecal", "io.anuke.mindustry.entities.traits.AbsorbTrait", "io.anuke.mindustry.entities.traits.BelowLiquidTrait", "io.anuke.mindustry.entities.traits.BuilderMinerTrait", "io.anuke.mindustry.entities.traits.BuilderTrait", "io.anuke.mindustry.entities.traits.BuilderTrait$BuildDataStatic", "io.anuke.mindustry.entities.traits.BuilderTrait$BuildRequest", "io.anuke.mindustry.entities.traits.DamageTrait", "io.anuke.mindustry.entities.traits.DrawTrait", "io.anuke.mindustry.entities.traits.Entity", "io.anuke.mindustry.entities.traits.HealthTrait", "io.anuke.mindustry.entities.traits.KillerTrait", "io.anuke.mindustry.entities.traits.MinerTrait", "io.anuke.mindustry.entities.traits.MoveTrait", "io.anuke.mindustry.entities.traits.SaveTrait", "io.anuke.mindustry.entities.traits.Saveable", "io.anuke.mindustry.entities.traits.ScaleTrait", "io.anuke.mindustry.entities.traits.ShooterTrait", "io.anuke.mindustry.entities.traits.SolidTrait", "io.anuke.mindustry.entities.traits.SpawnerTrait", "io.anuke.mindustry.entities.traits.SyncTrait", "io.anuke.mindustry.entities.traits.TargetTrait", "io.anuke.mindustry.entities.traits.TeamTrait", "io.anuke.mindustry.entities.traits.TimeTrait", "io.anuke.mindustry.entities.traits.TypeTrait", "io.anuke.mindustry.entities.traits.VelocityTrait", "io.anuke.mindustry.entities.type.BaseEntity", "io.anuke.mindustry.entities.type.BaseUnit", "io.anuke.mindustry.entities.type.Bullet", "io.anuke.mindustry.entities.type.DestructibleEntity", "io.anuke.mindustry.entities.type.EffectEntity", "io.anuke.mindustry.entities.type.Player", "io.anuke.mindustry.entities.type.SolidEntity", "io.anuke.mindustry.entities.type.TileEntity", "io.anuke.mindustry.entities.type.TimedEntity", "io.anuke.mindustry.entities.type.Unit", "io.anuke.mindustry.entities.type.base.BaseDrone", "io.anuke.mindustry.entities.type.base.BuilderDrone", "io.anuke.mindustry.entities.type.base.FlyingUnit", "io.anuke.mindustry.entities.type.base.GroundUnit", "io.anuke.mindustry.entities.type.base.HoverUnit", "io.anuke.mindustry.entities.type.base.MinerDrone", "io.anuke.mindustry.entities.type.base.RepairDrone", "io.anuke.mindustry.entities.units.StateMachine", "io.anuke.mindustry.entities.units.Statuses", "io.anuke.mindustry.entities.units.Statuses$StatusEntry", "io.anuke.mindustry.entities.units.UnitCommand", "io.anuke.mindustry.entities.units.UnitDrops", "io.anuke.mindustry.entities.units.UnitState", "io.anuke.mindustry.game.DefaultWaves", "io.anuke.mindustry.game.Difficulty", "io.anuke.mindustry.game.EventType", "io.anuke.mindustry.game.EventType$BlockBuildBeginEvent", "io.anuke.mindustry.game.EventType$BlockBuildEndEvent", "io.anuke.mindustry.game.EventType$BlockDestroyEvent", "io.anuke.mindustry.game.EventType$BlockInfoEvent", "io.anuke.mindustry.game.EventType$BuildSelectEvent", "io.anuke.mindustry.game.EventType$ClientLoadEvent", "io.anuke.mindustry.game.EventType$CommandIssueEvent", "io.anuke.mindustry.game.EventType$ContentReloadEvent", "io.anuke.mindustry.game.EventType$CoreItemDeliverEvent", "io.anuke.mindustry.game.EventType$DepositEvent", "io.anuke.mindustry.game.EventType$DisposeEvent", "io.anuke.mindustry.game.EventType$GameOverEvent", "io.anuke.mindustry.game.EventType$LaunchEvent", "io.anuke.mindustry.game.EventType$LaunchItemEvent", "io.anuke.mindustry.game.EventType$LineConfirmEvent", "io.anuke.mindustry.game.EventType$LoseEvent", "io.anuke.mindustry.game.EventType$MapMakeEvent", "io.anuke.mindustry.game.EventType$MapPublishEvent", "io.anuke.mindustry.game.EventType$MechChangeEvent", "io.anuke.mindustry.game.EventType$PlayEvent", "io.anuke.mindustry.game.EventType$PlayerBanEvent", "io.anuke.mindustry.game.EventType$PlayerChatEvent", "io.anuke.mindustry.game.EventType$PlayerConnect", "io.anuke.mindustry.game.EventType$PlayerIpBanEvent", "io.anuke.mindustry.game.EventType$PlayerIpUnbanEvent", "io.anuke.mindustry.game.EventType$PlayerJoin", "io.anuke.mindustry.game.EventType$PlayerLeave", "io.anuke.mindustry.game.EventType$PlayerUnbanEvent", "io.anuke.mindustry.game.EventType$ResearchEvent", "io.anuke.mindustry.game.EventType$ResetEvent", "io.anuke.mindustry.game.EventType$ResizeEvent", "io.anuke.mindustry.game.EventType$ServerLoadEvent", "io.anuke.mindustry.game.EventType$StateChangeEvent", "io.anuke.mindustry.game.EventType$TapConfigEvent", "io.anuke.mindustry.game.EventType$TapEvent", "io.anuke.mindustry.game.EventType$TileChangeEvent", "io.anuke.mindustry.game.EventType$Trigger", "io.anuke.mindustry.game.EventType$TurretAmmoDeliverEvent", "io.anuke.mindustry.game.EventType$UnitCreateEvent", "io.anuke.mindustry.game.EventType$UnitDestroyEvent", "io.anuke.mindustry.game.EventType$UnlockEvent", "io.anuke.mindustry.game.EventType$WaveEvent", "io.anuke.mindustry.game.EventType$WinEvent", "io.anuke.mindustry.game.EventType$WithdrawEvent", "io.anuke.mindustry.game.EventType$WorldLoadEvent", "io.anuke.mindustry.game.EventType$ZoneConfigureCompleteEvent", "io.anuke.mindustry.game.EventType$ZoneRequireCompleteEvent", "io.anuke.mindustry.game.Gamemode", "io.anuke.mindustry.game.GlobalData", "io.anuke.mindustry.game.LoopControl", "io.anuke.mindustry.game.MusicControl", "io.anuke.mindustry.game.Objective", "io.anuke.mindustry.game.Objectives", "io.anuke.mindustry.game.Objectives$Launched", "io.anuke.mindustry.game.Objectives$Unlock", "io.anuke.mindustry.game.Objectives$Wave", "io.anuke.mindustry.game.Objectives$ZoneObjective", "io.anuke.mindustry.game.Objectives$ZoneWave", "io.anuke.mindustry.game.Rules", "io.anuke.mindustry.game.Saves", "io.anuke.mindustry.game.Saves$SaveSlot", "io.anuke.mindustry.game.Schematic", "io.anuke.mindustry.game.Schematic$Stile", "io.anuke.mindustry.game.Schematics", "io.anuke.mindustry.game.SoundLoop", "io.anuke.mindustry.game.SpawnGroup", "io.anuke.mindustry.game.Stats", "io.anuke.mindustry.game.Stats$Rank", "io.anuke.mindustry.game.Stats$RankResult", "io.anuke.mindustry.game.Team", "io.anuke.mindustry.game.Teams", "io.anuke.mindustry.game.Teams$BrokenBlock", "io.anuke.mindustry.game.Teams$TeamData", "io.anuke.mindustry.game.Tutorial", "io.anuke.mindustry.game.Tutorial$TutorialStage", "io.anuke.mindustry.gen.BufferItem", "io.anuke.mindustry.gen.Call", "io.anuke.mindustry.gen.Call", "io.anuke.mindustry.gen.Icon", "io.anuke.mindustry.gen.Icon", "io.anuke.mindustry.gen.MethodHash", "io.anuke.mindustry.gen.Musics", "io.anuke.mindustry.gen.Musics", "io.anuke.mindustry.gen.PathTile", "io.anuke.mindustry.gen.PropCell", "io.anuke.mindustry.gen.RemoteReadClient", "io.anuke.mindustry.gen.RemoteReadServer", "io.anuke.mindustry.gen.Serialization", "io.anuke.mindustry.gen.Sounds", "io.anuke.mindustry.gen.Sounds", "io.anuke.mindustry.gen.Tex", "io.anuke.mindustry.gen.Tex", "io.anuke.mindustry.gen.TileOp", "io.anuke.mindustry.graphics.BlockRenderer", "io.anuke.mindustry.graphics.Bloom", "io.anuke.mindustry.graphics.CacheLayer", "io.anuke.mindustry.graphics.Drawf", "io.anuke.mindustry.graphics.FloorRenderer", "io.anuke.mindustry.graphics.IndexedRenderer", "io.anuke.mindustry.graphics.Layer", "io.anuke.mindustry.graphics.LightRenderer", "io.anuke.mindustry.graphics.MenuRenderer", "io.anuke.mindustry.graphics.MinimapRenderer", "io.anuke.mindustry.graphics.MultiPacker", "io.anuke.mindustry.graphics.MultiPacker$PageType", "io.anuke.mindustry.graphics.OverlayRenderer", "io.anuke.mindustry.graphics.Pal", "io.anuke.mindustry.graphics.Pixelator", "io.anuke.mindustry.graphics.Shaders", "io.anuke.mindustry.input.Binding", "io.anuke.mindustry.input.DesktopInput", "io.anuke.mindustry.input.InputHandler", "io.anuke.mindustry.input.InputHandler$PlaceLine", "io.anuke.mindustry.input.MobileInput", "io.anuke.mindustry.input.PlaceMode", "io.anuke.mindustry.input.Placement", "io.anuke.mindustry.input.Placement$DistanceHeuristic", "io.anuke.mindustry.input.Placement$NormalizeDrawResult", "io.anuke.mindustry.input.Placement$NormalizeResult", "io.anuke.mindustry.input.Placement$TileHueristic", "io.anuke.mindustry.maps.Map", "io.anuke.mindustry.maps.Maps", "io.anuke.mindustry.maps.Maps$MapProvider", "io.anuke.mindustry.maps.Maps$ShuffleMode", "io.anuke.mindustry.maps.Maps$ShuffleMode", "io.anuke.mindustry.maps.filters.BlendFilter", "io.anuke.mindustry.maps.filters.ClearFilter", "io.anuke.mindustry.maps.filters.DistortFilter", "io.anuke.mindustry.maps.filters.FilterOption", "io.anuke.mindustry.maps.filters.FilterOption$BlockOption", "io.anuke.mindustry.maps.filters.FilterOption$SliderOption", "io.anuke.mindustry.maps.filters.GenerateFilter", "io.anuke.mindustry.maps.filters.GenerateFilter$GenerateInput", "io.anuke.mindustry.maps.filters.GenerateFilter$GenerateInput$TileProvider", "io.anuke.mindustry.maps.filters.MedianFilter", "io.anuke.mindustry.maps.filters.MirrorFilter", "io.anuke.mindustry.maps.filters.NoiseFilter", "io.anuke.mindustry.maps.filters.OreFilter", "io.anuke.mindustry.maps.filters.OreMedianFilter", "io.anuke.mindustry.maps.filters.RiverNoiseFilter", "io.anuke.mindustry.maps.filters.ScatterFilter", "io.anuke.mindustry.maps.filters.TerrainFilter", "io.anuke.mindustry.maps.generators.BasicGenerator", "io.anuke.mindustry.maps.generators.BasicGenerator$DistanceHeuristic", "io.anuke.mindustry.maps.generators.BasicGenerator$TileHueristic", "io.anuke.mindustry.maps.generators.Generator", "io.anuke.mindustry.maps.generators.MapGenerator", "io.anuke.mindustry.maps.generators.MapGenerator$Decoration", "io.anuke.mindustry.maps.generators.RandomGenerator", "io.anuke.mindustry.maps.zonegen.DesertWastesGenerator", "io.anuke.mindustry.maps.zonegen.OvergrowthGenerator", "io.anuke.mindustry.type.Category", "io.anuke.mindustry.type.ErrorContent", "io.anuke.mindustry.type.Item", "io.anuke.mindustry.type.ItemStack", "io.anuke.mindustry.type.ItemType", "io.anuke.mindustry.type.Liquid", "io.anuke.mindustry.type.LiquidStack", "io.anuke.mindustry.type.Mech", "io.anuke.mindustry.type.Publishable", "io.anuke.mindustry.type.StatusEffect", "io.anuke.mindustry.type.StatusEffect$TransitionHandler", "io.anuke.mindustry.type.TypeID", "io.anuke.mindustry.type.UnitType", "io.anuke.mindustry.type.Weapon", "io.anuke.mindustry.type.WeatherEvent", "io.anuke.mindustry.type.Zone", "io.anuke.mindustry.ui.Bar", "io.anuke.mindustry.ui.BorderImage", "io.anuke.mindustry.ui.Cicon", "io.anuke.mindustry.ui.ContentDisplay", "io.anuke.mindustry.ui.Fonts", "io.anuke.mindustry.ui.GridImage", "io.anuke.mindustry.ui.IconSize", "io.anuke.mindustry.ui.IntFormat", "io.anuke.mindustry.ui.ItemDisplay", "io.anuke.mindustry.ui.ItemImage", "io.anuke.mindustry.ui.ItemsDisplay", "io.anuke.mindustry.ui.Links", "io.anuke.mindustry.ui.Links$LinkEntry", "io.anuke.mindustry.ui.LiquidDisplay", "io.anuke.mindustry.ui.Minimap", "io.anuke.mindustry.ui.MobileButton", "io.anuke.mindustry.ui.MultiReqImage", "io.anuke.mindustry.ui.ReqImage", "io.anuke.mindustry.ui.Styles", "io.anuke.mindustry.ui.dialogs.AboutDialog", "io.anuke.mindustry.ui.dialogs.AdminsDialog", "io.anuke.mindustry.ui.dialogs.BansDialog", "io.anuke.mindustry.ui.dialogs.ColorPicker", "io.anuke.mindustry.ui.dialogs.ContentInfoDialog", "io.anuke.mindustry.ui.dialogs.ControlsDialog", "io.anuke.mindustry.ui.dialogs.CustomGameDialog", "io.anuke.mindustry.ui.dialogs.CustomRulesDialog", "io.anuke.mindustry.ui.dialogs.DatabaseDialog", "io.anuke.mindustry.ui.dialogs.DeployDialog", "io.anuke.mindustry.ui.dialogs.DeployDialog$View", "io.anuke.mindustry.ui.dialogs.DeployDialog$ZoneNode", "io.anuke.mindustry.ui.dialogs.DiscordDialog", "io.anuke.mindustry.ui.dialogs.FileChooser", "io.anuke.mindustry.ui.dialogs.FileChooser$FileHistory", "io.anuke.mindustry.ui.dialogs.FloatingDialog", "io.anuke.mindustry.ui.dialogs.GameOverDialog", "io.anuke.mindustry.ui.dialogs.HostDialog", "io.anuke.mindustry.ui.dialogs.JoinDialog", "io.anuke.mindustry.ui.dialogs.JoinDialog$Server", "io.anuke.mindustry.ui.dialogs.LanguageDialog", "io.anuke.mindustry.ui.dialogs.LoadDialog", "io.anuke.mindustry.ui.dialogs.LoadoutDialog", "io.anuke.mindustry.ui.dialogs.MapPlayDialog", "io.anuke.mindustry.ui.dialogs.MapsDialog", "io.anuke.mindustry.ui.dialogs.MinimapDialog", "io.anuke.mindustry.ui.dialogs.ModsDialog", "io.anuke.mindustry.ui.dialogs.PaletteDialog", "io.anuke.mindustry.ui.dialogs.PausedDialog", "io.anuke.mindustry.ui.dialogs.SaveDialog", "io.anuke.mindustry.ui.dialogs.SchematicsDialog", "io.anuke.mindustry.ui.dialogs.SchematicsDialog$SchematicImage", "io.anuke.mindustry.ui.dialogs.SchematicsDialog$SchematicInfoDialog", "io.anuke.mindustry.ui.dialogs.SettingsMenuDialog", "io.anuke.mindustry.ui.dialogs.TechTreeDialog", "io.anuke.mindustry.ui.dialogs.TechTreeDialog$LayoutNode", "io.anuke.mindustry.ui.dialogs.TechTreeDialog$TechTreeNode", "io.anuke.mindustry.ui.dialogs.TechTreeDialog$View", "io.anuke.mindustry.ui.dialogs.TraceDialog", "io.anuke.mindustry.ui.dialogs.ZoneInfoDialog", "io.anuke.mindustry.ui.fragments.BlockConfigFragment", "io.anuke.mindustry.ui.fragments.BlockInventoryFragment", "io.anuke.mindustry.ui.fragments.ChatFragment", "io.anuke.mindustry.ui.fragments.FadeInFragment", "io.anuke.mindustry.ui.fragments.Fragment", "io.anuke.mindustry.ui.fragments.HudFragment", "io.anuke.mindustry.ui.fragments.LoadingFragment", "io.anuke.mindustry.ui.fragments.MenuFragment", "io.anuke.mindustry.ui.fragments.OverlayFragment", "io.anuke.mindustry.ui.fragments.PlacementFragment", "io.anuke.mindustry.ui.fragments.PlayerListFragment", "io.anuke.mindustry.ui.fragments.ScriptConsoleFragment", "io.anuke.mindustry.ui.layout.BranchTreeLayout", "io.anuke.mindustry.ui.layout.BranchTreeLayout$TreeAlignment", "io.anuke.mindustry.ui.layout.BranchTreeLayout$TreeLocation", "io.anuke.mindustry.ui.layout.RadialTreeLayout", "io.anuke.mindustry.ui.layout.TreeLayout", "io.anuke.mindustry.ui.layout.TreeLayout$TreeNode", "io.anuke.mindustry.world.Block", "io.anuke.mindustry.world.BlockStorage", "io.anuke.mindustry.world.Build", "io.anuke.mindustry.world.CachedTile", "io.anuke.mindustry.world.DirectionalItemBuffer", "io.anuke.mindustry.world.DirectionalItemBuffer$BufferItemStruct", "io.anuke.mindustry.world.Edges", "io.anuke.mindustry.world.ItemBuffer", "io.anuke.mindustry.world.LegacyColorMapper", "io.anuke.mindustry.world.LegacyColorMapper$LegacyBlock", "io.anuke.mindustry.world.Pos", "io.anuke.mindustry.world.StaticTree", "io.anuke.mindustry.world.Tile", "io.anuke.mindustry.world.WorldContext", "io.anuke.mindustry.world.blocks.Attributes", "io.anuke.mindustry.world.blocks.Autotiler", "io.anuke.mindustry.world.blocks.Autotiler$AutotilerHolder", "io.anuke.mindustry.world.blocks.BlockPart", "io.anuke.mindustry.world.blocks.BuildBlock", "io.anuke.mindustry.world.blocks.BuildBlock$BuildEntity", "io.anuke.mindustry.world.blocks.DoubleOverlayFloor", "io.anuke.mindustry.world.blocks.Floor", "io.anuke.mindustry.world.blocks.ItemSelection", "io.anuke.mindustry.world.blocks.LiquidBlock", "io.anuke.mindustry.world.blocks.OreBlock", "io.anuke.mindustry.world.blocks.OverlayFloor", "io.anuke.mindustry.world.blocks.PowerBlock", "io.anuke.mindustry.world.blocks.RespawnBlock", "io.anuke.mindustry.world.blocks.Rock", "io.anuke.mindustry.world.blocks.StaticWall", "io.anuke.mindustry.world.blocks.TreeBlock", "io.anuke.mindustry.world.blocks.defense.DeflectorWall", "io.anuke.mindustry.world.blocks.defense.DeflectorWall$DeflectorEntity", "io.anuke.mindustry.world.blocks.defense.Door", "io.anuke.mindustry.world.blocks.defense.Door$DoorEntity", "io.anuke.mindustry.world.blocks.defense.ForceProjector", "io.anuke.mindustry.world.blocks.defense.ForceProjector$ForceEntity", "io.anuke.mindustry.world.blocks.defense.ForceProjector$ShieldEntity", "io.anuke.mindustry.world.blocks.defense.MendProjector", "io.anuke.mindustry.world.blocks.defense.MendProjector$MendEntity", "io.anuke.mindustry.world.blocks.defense.OverdriveProjector", "io.anuke.mindustry.world.blocks.defense.OverdriveProjector$OverdriveEntity", "io.anuke.mindustry.world.blocks.defense.ShockMine", "io.anuke.mindustry.world.blocks.defense.SurgeWall", "io.anuke.mindustry.world.blocks.defense.Wall", "io.anuke.mindustry.world.blocks.defense.turrets.ArtilleryTurret", "io.anuke.mindustry.world.blocks.defense.turrets.BurstTurret", "io.anuke.mindustry.world.blocks.defense.turrets.ChargeTurret", "io.anuke.mindustry.world.blocks.defense.turrets.ChargeTurret$LaserTurretEntity", "io.anuke.mindustry.world.blocks.defense.turrets.CooledTurret", "io.anuke.mindustry.world.blocks.defense.turrets.DoubleTurret", "io.anuke.mindustry.world.blocks.defense.turrets.ItemTurret", "io.anuke.mindustry.world.blocks.defense.turrets.ItemTurret$ItemEntry", "io.anuke.mindustry.world.blocks.defense.turrets.ItemTurret$ItemTurretEntity", "io.anuke.mindustry.world.blocks.defense.turrets.LaserTurret", "io.anuke.mindustry.world.blocks.defense.turrets.LaserTurret$LaserTurretEntity", "io.anuke.mindustry.world.blocks.defense.turrets.LiquidTurret", "io.anuke.mindustry.world.blocks.defense.turrets.PowerTurret", "io.anuke.mindustry.world.blocks.defense.turrets.Turret", "io.anuke.mindustry.world.blocks.defense.turrets.Turret$AmmoEntry", "io.anuke.mindustry.world.blocks.defense.turrets.Turret$TurretEntity", "io.anuke.mindustry.world.blocks.distribution.ArmoredConveyor", "io.anuke.mindustry.world.blocks.distribution.BufferedItemBridge", "io.anuke.mindustry.world.blocks.distribution.BufferedItemBridge$BufferedItemBridgeEntity", "io.anuke.mindustry.world.blocks.distribution.Conveyor", "io.anuke.mindustry.world.blocks.distribution.Conveyor$ConveyorEntity", "io.anuke.mindustry.world.blocks.distribution.Conveyor$ItemPos", "io.anuke.mindustry.world.blocks.distribution.ExtendingItemBridge", "io.anuke.mindustry.world.blocks.distribution.ItemBridge", "io.anuke.mindustry.world.blocks.distribution.ItemBridge$ItemBridgeEntity", "io.anuke.mindustry.world.blocks.distribution.Junction", "io.anuke.mindustry.world.blocks.distribution.Junction$JunctionEntity", "io.anuke.mindustry.world.blocks.distribution.MassDriver", "io.anuke.mindustry.world.blocks.distribution.MassDriver$DriverBulletData", "io.anuke.mindustry.world.blocks.distribution.MassDriver$DriverState", "io.anuke.mindustry.world.blocks.distribution.MassDriver$MassDriverEntity", "io.anuke.mindustry.world.blocks.distribution.OverflowGate", "io.anuke.mindustry.world.blocks.distribution.OverflowGate$OverflowGateEntity", "io.anuke.mindustry.world.blocks.distribution.Router", "io.anuke.mindustry.world.blocks.distribution.Router$RouterEntity", "io.anuke.mindustry.world.blocks.distribution.Sorter", "io.anuke.mindustry.world.blocks.distribution.Sorter$SorterEntity", "io.anuke.mindustry.world.blocks.liquid.ArmoredConduit", "io.anuke.mindustry.world.blocks.liquid.Conduit", "io.anuke.mindustry.world.blocks.liquid.Conduit$ConduitEntity", "io.anuke.mindustry.world.blocks.liquid.LiquidBridge", "io.anuke.mindustry.world.blocks.liquid.LiquidExtendingBridge", "io.anuke.mindustry.world.blocks.liquid.LiquidJunction", "io.anuke.mindustry.world.blocks.liquid.LiquidOverflowGate", "io.anuke.mindustry.world.blocks.liquid.LiquidRouter", "io.anuke.mindustry.world.blocks.liquid.LiquidTank", "io.anuke.mindustry.world.blocks.logic.LogicBlock", "io.anuke.mindustry.world.blocks.logic.MessageBlock", "io.anuke.mindustry.world.blocks.logic.MessageBlock$MessageBlockEntity", "io.anuke.mindustry.world.blocks.power.Battery", "io.anuke.mindustry.world.blocks.power.BurnerGenerator", "io.anuke.mindustry.world.blocks.power.ConditionalConsumePower", "io.anuke.mindustry.world.blocks.power.DecayGenerator", "io.anuke.mindustry.world.blocks.power.ImpactReactor", "io.anuke.mindustry.world.blocks.power.ImpactReactor$FusionReactorEntity", "io.anuke.mindustry.world.blocks.power.ItemLiquidGenerator", "io.anuke.mindustry.world.blocks.power.ItemLiquidGenerator$ItemLiquidGeneratorEntity", "io.anuke.mindustry.world.blocks.power.LightBlock", "io.anuke.mindustry.world.blocks.power.LightBlock$LightEntity", "io.anuke.mindustry.world.blocks.power.NuclearReactor", "io.anuke.mindustry.world.blocks.power.NuclearReactor$NuclearReactorEntity", "io.anuke.mindustry.world.blocks.power.PowerDiode", "io.anuke.mindustry.world.blocks.power.PowerDistributor", "io.anuke.mindustry.world.blocks.power.PowerGenerator", "io.anuke.mindustry.world.blocks.power.PowerGenerator$GeneratorEntity", "io.anuke.mindustry.world.blocks.power.PowerGraph", "io.anuke.mindustry.world.blocks.power.PowerNode", "io.anuke.mindustry.world.blocks.power.SingleTypeGenerator", "io.anuke.mindustry.world.blocks.power.SolarGenerator", "io.anuke.mindustry.world.blocks.power.ThermalGenerator", "io.anuke.mindustry.world.blocks.production.Cultivator", "io.anuke.mindustry.world.blocks.production.Cultivator$CultivatorEntity", "io.anuke.mindustry.world.blocks.production.Drill", "io.anuke.mindustry.world.blocks.production.Drill$DrillEntity", "io.anuke.mindustry.world.blocks.production.Fracker", "io.anuke.mindustry.world.blocks.production.Fracker$FrackerEntity", "io.anuke.mindustry.world.blocks.production.GenericCrafter", "io.anuke.mindustry.world.blocks.production.GenericCrafter$GenericCrafterEntity", "io.anuke.mindustry.world.blocks.production.GenericSmelter", "io.anuke.mindustry.world.blocks.production.Incinerator", "io.anuke.mindustry.world.blocks.production.Incinerator$IncineratorEntity", "io.anuke.mindustry.world.blocks.production.LiquidConverter", "io.anuke.mindustry.world.blocks.production.Pump", "io.anuke.mindustry.world.blocks.production.Separator", "io.anuke.mindustry.world.blocks.production.SolidPump", "io.anuke.mindustry.world.blocks.production.SolidPump$SolidPumpEntity", "io.anuke.mindustry.world.blocks.sandbox.ItemSource", "io.anuke.mindustry.world.blocks.sandbox.ItemSource$ItemSourceEntity", "io.anuke.mindustry.world.blocks.sandbox.ItemVoid", "io.anuke.mindustry.world.blocks.sandbox.LiquidSource", "io.anuke.mindustry.world.blocks.sandbox.LiquidSource$LiquidSourceEntity", "io.anuke.mindustry.world.blocks.sandbox.PowerSource", "io.anuke.mindustry.world.blocks.sandbox.PowerVoid", "io.anuke.mindustry.world.blocks.storage.CoreBlock", "io.anuke.mindustry.world.blocks.storage.CoreBlock$CoreEntity", "io.anuke.mindustry.world.blocks.storage.LaunchPad", "io.anuke.mindustry.world.blocks.storage.StorageBlock", "io.anuke.mindustry.world.blocks.storage.StorageBlock$StorageBlockEntity", "io.anuke.mindustry.world.blocks.storage.Unloader", "io.anuke.mindustry.world.blocks.storage.Unloader$UnloaderEntity", "io.anuke.mindustry.world.blocks.storage.Vault", "io.anuke.mindustry.world.blocks.units.CommandCenter", "io.anuke.mindustry.world.blocks.units.CommandCenter$CommandCenterEntity", "io.anuke.mindustry.world.blocks.units.MechPad", "io.anuke.mindustry.world.blocks.units.MechPad$MechFactoryEntity", "io.anuke.mindustry.world.blocks.units.RallyPoint", "io.anuke.mindustry.world.blocks.units.RepairPoint", "io.anuke.mindustry.world.blocks.units.RepairPoint$RepairPointEntity", "io.anuke.mindustry.world.blocks.units.UnitFactory", "io.anuke.mindustry.world.blocks.units.UnitFactory$UnitFactoryEntity", "io.anuke.mindustry.world.consumers.Consume", "io.anuke.mindustry.world.consumers.ConsumeItemFilter", "io.anuke.mindustry.world.consumers.ConsumeItems", "io.anuke.mindustry.world.consumers.ConsumeLiquid", "io.anuke.mindustry.world.consumers.ConsumeLiquidBase", "io.anuke.mindustry.world.consumers.ConsumeLiquidFilter", "io.anuke.mindustry.world.consumers.ConsumePower", "io.anuke.mindustry.world.consumers.ConsumeType", "io.anuke.mindustry.world.consumers.Consumers", "io.anuke.mindustry.world.meta.Attribute", "io.anuke.mindustry.world.meta.BlockBars", "io.anuke.mindustry.world.meta.BlockFlag", "io.anuke.mindustry.world.meta.BlockGroup", "io.anuke.mindustry.world.meta.BlockStat", "io.anuke.mindustry.world.meta.BlockStats", "io.anuke.mindustry.world.meta.BuildVisibility", "io.anuke.mindustry.world.meta.PowerType", "io.anuke.mindustry.world.meta.Producers", "io.anuke.mindustry.world.meta.StatCategory", "io.anuke.mindustry.world.meta.StatUnit", "io.anuke.mindustry.world.meta.StatValue", "io.anuke.mindustry.world.meta.values.AmmoListValue", "io.anuke.mindustry.world.meta.values.BooleanValue", "io.anuke.mindustry.world.meta.values.BoosterListValue", "io.anuke.mindustry.world.meta.values.ItemFilterValue", "io.anuke.mindustry.world.meta.values.ItemListValue", "io.anuke.mindustry.world.meta.values.LiquidFilterValue", "io.anuke.mindustry.world.meta.values.LiquidValue", "io.anuke.mindustry.world.meta.values.NumberValue", "io.anuke.mindustry.world.meta.values.StringValue", "io.anuke.mindustry.world.modules.BlockModule", "io.anuke.mindustry.world.modules.ConsumeModule", "io.anuke.mindustry.world.modules.ItemModule", "io.anuke.mindustry.world.modules.ItemModule$ItemCalculator", "io.anuke.mindustry.world.modules.ItemModule$ItemConsumer", "io.anuke.mindustry.world.modules.LiquidModule", "io.anuke.mindustry.world.modules.LiquidModule$LiquidCalculator", "io.anuke.mindustry.world.modules.LiquidModule$LiquidConsumer", "io.anuke.mindustry.world.modules.PowerModule", "io.anuke.mindustry.world.producers.Produce", "io.anuke.mindustry.world.producers.ProduceItem", "java.io.PrintStream", "java.lang.Object", "java.lang.Runnable", "java.lang.String", "java.lang.System");
-}
\ No newline at end of file
diff --git a/core/src/io/anuke/mindustry/world/producers/Produce.java b/core/src/io/anuke/mindustry/world/producers/Produce.java
deleted file mode 100644
index c055f50645..0000000000
--- a/core/src/io/anuke/mindustry/world/producers/Produce.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package io.anuke.mindustry.world.producers;
-
-public class Produce{
-}
diff --git a/core/src/io/anuke/mindustry/world/producers/ProduceItem.java b/core/src/io/anuke/mindustry/world/producers/ProduceItem.java
deleted file mode 100644
index f1083e17ed..0000000000
--- a/core/src/io/anuke/mindustry/world/producers/ProduceItem.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package io.anuke.mindustry.world.producers;
-
-public class ProduceItem{
-}
diff --git a/core/src/io/anuke/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
similarity index 89%
rename from core/src/io/anuke/mindustry/ClientLauncher.java
rename to core/src/mindustry/ClientLauncher.java
index 5d04c44010..bc9e2f0663 100644
--- a/core/src/io/anuke/mindustry/ClientLauncher.java
+++ b/core/src/mindustry/ClientLauncher.java
@@ -1,26 +1,26 @@
-package io.anuke.mindustry;
+package mindustry;
-import io.anuke.arc.*;
-import io.anuke.arc.assets.*;
-import io.anuke.arc.assets.loaders.*;
-import io.anuke.arc.audio.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.async.*;
-import io.anuke.mindustry.core.*;
-import io.anuke.mindustry.ctype.Content;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.maps.*;
-import io.anuke.mindustry.mod.*;
-import io.anuke.mindustry.net.Net;
+import arc.*;
+import arc.assets.*;
+import arc.assets.loaders.*;
+import arc.audio.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import arc.util.async.*;
+import mindustry.core.*;
+import mindustry.ctype.Content;
+import mindustry.game.EventType.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.maps.*;
+import mindustry.mod.*;
+import mindustry.net.Net;
-import static io.anuke.arc.Core.*;
-import static io.anuke.mindustry.Vars.*;
+import static arc.Core.*;
+import static mindustry.Vars.*;
public abstract class ClientLauncher extends ApplicationCore implements Platform{
private static final int loadingFPS = 20;
diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/mindustry/Vars.java
similarity index 91%
rename from core/src/io/anuke/mindustry/Vars.java
rename to core/src/mindustry/Vars.java
index 67b7a8609a..c2dfd90317 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/mindustry/Vars.java
@@ -1,34 +1,33 @@
-package io.anuke.mindustry;
+package mindustry;
-import io.anuke.arc.Application.*;
-import io.anuke.arc.*;
-import io.anuke.arc.assets.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.files.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.io.*;
-import io.anuke.mindustry.ai.*;
-import io.anuke.mindustry.core.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.input.*;
-import io.anuke.mindustry.maps.*;
-import io.anuke.mindustry.mod.*;
-import io.anuke.mindustry.net.Net;
-import io.anuke.mindustry.type.Weather.*;
-import io.anuke.mindustry.world.blocks.defense.ForceProjector.*;
+import arc.*;
+import arc.Application.*;
+import arc.assets.*;
+import arc.struct.*;
+import arc.files.*;
+import arc.graphics.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.ai.*;
+import mindustry.core.*;
+import mindustry.entities.*;
+import mindustry.entities.effect.*;
+import mindustry.entities.traits.*;
+import mindustry.entities.type.*;
+import mindustry.game.*;
+import mindustry.game.EventType.*;
+import mindustry.gen.*;
+import mindustry.input.*;
+import mindustry.maps.*;
+import mindustry.mod.*;
+import mindustry.net.Net;
+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{
@@ -125,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;
@@ -198,7 +197,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
diff --git a/core/src/io/anuke/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java
similarity index 95%
rename from core/src/io/anuke/mindustry/ai/BlockIndexer.java
rename to core/src/mindustry/ai/BlockIndexer.java
index f6df8f7475..e64ad48064 100644
--- a/core/src/io/anuke/mindustry/ai/BlockIndexer.java
+++ b/core/src/mindustry/ai/BlockIndexer.java
@@ -1,21 +1,21 @@
-package io.anuke.mindustry.ai;
+package mindustry.ai;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.Teams.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
-import io.anuke.mindustry.world.meta.*;
+import arc.*;
+import arc.struct.*;
+import arc.func.*;
+import arc.math.*;
+import arc.math.geom.*;
+import mindustry.content.*;
+import mindustry.entities.type.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.game.Teams.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+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")
diff --git a/core/src/io/anuke/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java
similarity index 96%
rename from core/src/io/anuke/mindustry/ai/Pathfinder.java
rename to core/src/mindustry/ai/Pathfinder.java
index 14890b531f..4e1212ea6a 100644
--- a/core/src/io/anuke/mindustry/ai/Pathfinder.java
+++ b/core/src/mindustry/ai/Pathfinder.java
@@ -1,20 +1,20 @@
-package io.anuke.mindustry.ai;
+package mindustry.ai;
-import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.arc.util.async.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.meta.*;
+import arc.*;
+import mindustry.annotations.Annotations.*;
+import arc.struct.*;
+import arc.func.*;
+import arc.math.geom.*;
+import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import arc.util.async.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+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);
diff --git a/core/src/io/anuke/mindustry/ai/WaveSpawner.java b/core/src/mindustry/ai/WaveSpawner.java
similarity index 87%
rename from core/src/io/anuke/mindustry/ai/WaveSpawner.java
rename to core/src/mindustry/ai/WaveSpawner.java
index ca50e36b13..ac4914a90b 100644
--- a/core/src/io/anuke/mindustry/ai/WaveSpawner.java
+++ b/core/src/mindustry/ai/WaveSpawner.java
@@ -1,22 +1,22 @@
-package io.anuke.mindustry.ai;
+package mindustry.ai;
-import io.anuke.arc.Events;
-import io.anuke.arc.collection.Array;
-import io.anuke.arc.func.Floatc2;
-import io.anuke.arc.math.Angles;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.util.Time;
-import io.anuke.arc.util.Tmp;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.content.Fx;
-import io.anuke.mindustry.entities.Damage;
-import io.anuke.mindustry.entities.Effects;
-import io.anuke.mindustry.entities.type.BaseUnit;
-import io.anuke.mindustry.game.EventType.WorldLoadEvent;
-import io.anuke.mindustry.game.SpawnGroup;
-import io.anuke.mindustry.world.Tile;
+import arc.Events;
+import arc.struct.Array;
+import arc.func.Floatc2;
+import arc.math.Angles;
+import arc.math.Mathf;
+import arc.util.Time;
+import arc.util.Tmp;
+import mindustry.content.Blocks;
+import mindustry.content.Fx;
+import mindustry.entities.Damage;
+import mindustry.entities.Effects;
+import mindustry.entities.type.BaseUnit;
+import mindustry.game.EventType.WorldLoadEvent;
+import mindustry.game.SpawnGroup;
+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
diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
similarity index 98%
rename from core/src/io/anuke/mindustry/content/Blocks.java
rename to core/src/mindustry/content/Blocks.java
index d2dfee3fd8..a4f8a939a8 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1,34 +1,34 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.ctype.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.bullet.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
-import io.anuke.mindustry.world.blocks.defense.*;
-import io.anuke.mindustry.world.blocks.defense.turrets.*;
-import io.anuke.mindustry.world.blocks.distribution.*;
-import io.anuke.mindustry.world.blocks.liquid.*;
-import io.anuke.mindustry.world.blocks.logic.*;
-import io.anuke.mindustry.world.blocks.power.*;
-import io.anuke.mindustry.world.blocks.production.*;
-import io.anuke.mindustry.world.blocks.sandbox.*;
-import io.anuke.mindustry.world.blocks.storage.*;
-import io.anuke.mindustry.world.blocks.units.*;
-import io.anuke.mindustry.world.consumers.*;
-import io.anuke.mindustry.world.meta.*;
-import io.anuke.mindustry.world.modules.*;
+import arc.*;
+import arc.struct.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.ctype.*;
+import mindustry.entities.*;
+import mindustry.entities.bullet.*;
+import mindustry.entities.type.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.defense.*;
+import mindustry.world.blocks.defense.turrets.*;
+import mindustry.world.blocks.distribution.*;
+import mindustry.world.blocks.liquid.*;
+import mindustry.world.blocks.logic.*;
+import mindustry.world.blocks.power.*;
+import mindustry.world.blocks.production.*;
+import mindustry.world.blocks.sandbox.*;
+import mindustry.world.blocks.storage.*;
+import mindustry.world.blocks.units.*;
+import mindustry.world.consumers.*;
+import mindustry.world.meta.*;
+import mindustry.world.modules.*;
public class Blocks implements ContentList{
public static Block
@@ -1522,7 +1522,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);
}
diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java
similarity index 97%
rename from core/src/io/anuke/mindustry/content/Bullets.java
rename to core/src/mindustry/content/Bullets.java
index b3e23d966b..017798731c 100644
--- a/core/src/io/anuke/mindustry/content/Bullets.java
+++ b/core/src/mindustry/content/Bullets.java
@@ -1,18 +1,18 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.ctype.ContentList;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.bullet.*;
-import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.world.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.ctype.ContentList;
+import mindustry.entities.*;
+import mindustry.entities.bullet.*;
+import mindustry.entities.effect.*;
+import mindustry.entities.type.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class Bullets implements ContentList{
public static BulletType
diff --git a/core/src/io/anuke/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java
similarity index 98%
rename from core/src/io/anuke/mindustry/content/Fx.java
rename to core/src/mindustry/content/Fx.java
index 4c31f0bd1a..379e01f9a6 100644
--- a/core/src/io/anuke/mindustry/content/Fx.java
+++ b/core/src/mindustry/content/Fx.java
@@ -1,19 +1,19 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
-import io.anuke.arc.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.ctype.ContentList;
-import io.anuke.mindustry.entities.Effects.*;
-import io.anuke.mindustry.entities.effect.GroundEffectEntity.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.ui.Cicon;
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.ctype.ContentList;
+import mindustry.entities.Effects.*;
+import mindustry.entities.effect.GroundEffectEntity.*;
+import mindustry.entities.type.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.ui.Cicon;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class Fx implements ContentList{
public static Effect
diff --git a/core/src/io/anuke/mindustry/content/Items.java b/core/src/mindustry/content/Items.java
similarity index 93%
rename from core/src/io/anuke/mindustry/content/Items.java
rename to core/src/mindustry/content/Items.java
index 77c88c651b..6269044786 100644
--- a/core/src/io/anuke/mindustry/content/Items.java
+++ b/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 io.anuke.mindustry.ctype.ContentList;
-import io.anuke.mindustry.type.Item;
-import io.anuke.mindustry.type.ItemType;
+import arc.graphics.Color;
+import mindustry.ctype.ContentList;
+import mindustry.type.Item;
+import mindustry.type.ItemType;
public class Items implements ContentList{
public static Item scrap, copper, lead, graphite, coal, titanium, thorium, silicon, plastanium, phasefabric, surgealloy,
diff --git a/core/src/io/anuke/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java
similarity index 87%
rename from core/src/io/anuke/mindustry/content/Liquids.java
rename to core/src/mindustry/content/Liquids.java
index bbc934cd16..56d3e481ab 100644
--- a/core/src/io/anuke/mindustry/content/Liquids.java
+++ b/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 io.anuke.mindustry.ctype.ContentList;
-import io.anuke.mindustry.type.Liquid;
+import arc.graphics.Color;
+import mindustry.ctype.ContentList;
+import mindustry.type.Liquid;
public class Liquids implements ContentList{
public static Liquid water, slag, oil, cryofluid;
diff --git a/core/src/io/anuke/mindustry/content/Loadouts.java b/core/src/mindustry/content/Loadouts.java
similarity index 91%
rename from core/src/io/anuke/mindustry/content/Loadouts.java
rename to core/src/mindustry/content/Loadouts.java
index 631066a24f..16252b686f 100644
--- a/core/src/io/anuke/mindustry/content/Loadouts.java
+++ b/core/src/mindustry/content/Loadouts.java
@@ -1,7 +1,7 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
-import io.anuke.mindustry.ctype.*;
-import io.anuke.mindustry.game.*;
+import mindustry.ctype.*;
+import mindustry.game.*;
import java.io.*;
diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/mindustry/content/Mechs.java
similarity index 95%
rename from core/src/io/anuke/mindustry/content/Mechs.java
rename to core/src/mindustry/content/Mechs.java
index 8684dd268b..9bbb67d51a 100644
--- a/core/src/io/anuke/mindustry/content/Mechs.java
+++ b/core/src/mindustry/content/Mechs.java
@@ -1,19 +1,19 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
-import io.anuke.arc.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.ctype.ContentList;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.bullet.*;
-import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.type.*;
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.ctype.ContentList;
+import mindustry.entities.*;
+import mindustry.entities.bullet.*;
+import mindustry.entities.effect.*;
+import mindustry.entities.type.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
public class Mechs implements ContentList{
public static Mech alpha, delta, tau, omega, dart, javelin, trident, glaive;
diff --git a/core/src/io/anuke/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java
similarity index 77%
rename from core/src/io/anuke/mindustry/content/Planets.java
rename to core/src/mindustry/content/Planets.java
index f4f2c7bc0a..db49abaa7a 100644
--- a/core/src/io/anuke/mindustry/content/Planets.java
+++ b/core/src/mindustry/content/Planets.java
@@ -1,7 +1,7 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
import io.anuke.mindustry.ctype.*;
-import io.anuke.mindustry.type.*;
+import mindustry.type.*;
public class Planets implements ContentList{
//TODO make all names
diff --git a/core/src/io/anuke/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java
similarity index 90%
rename from core/src/io/anuke/mindustry/content/StatusEffects.java
rename to core/src/mindustry/content/StatusEffects.java
index 4dc980869d..525a14199c 100644
--- a/core/src/io/anuke/mindustry/content/StatusEffects.java
+++ b/core/src/mindustry/content/StatusEffects.java
@@ -1,13 +1,13 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
-import io.anuke.arc.*;
-import io.anuke.arc.math.Mathf;
-import io.anuke.mindustry.entities.Effects;
-import io.anuke.mindustry.ctype.ContentList;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.type.StatusEffect;
+import arc.*;
+import arc.math.Mathf;
+import mindustry.entities.Effects;
+import mindustry.ctype.ContentList;
+import mindustry.game.EventType.*;
+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;
diff --git a/core/src/io/anuke/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java
similarity index 97%
rename from core/src/io/anuke/mindustry/content/TechTree.java
rename to core/src/mindustry/content/TechTree.java
index 8058a4982b..a31312753e 100644
--- a/core/src/io/anuke/mindustry/content/TechTree.java
+++ b/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 io.anuke.mindustry.ctype.ContentList;
-import io.anuke.mindustry.type.ItemStack;
-import io.anuke.mindustry.world.Block;
+import arc.struct.Array;
+import mindustry.ctype.ContentList;
+import mindustry.type.ItemStack;
+import mindustry.world.Block;
-import static io.anuke.mindustry.content.Blocks.*;
+import static mindustry.content.Blocks.*;
public class TechTree implements ContentList{
public static Array all;
diff --git a/core/src/io/anuke/mindustry/content/TypeIDs.java b/core/src/mindustry/content/TypeIDs.java
similarity index 52%
rename from core/src/io/anuke/mindustry/content/TypeIDs.java
rename to core/src/mindustry/content/TypeIDs.java
index 2e3f6347b1..b99e321e98 100644
--- a/core/src/io/anuke/mindustry/content/TypeIDs.java
+++ b/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 io.anuke.mindustry.entities.effect.Puddle;
-import io.anuke.mindustry.entities.type.Player;
-import io.anuke.mindustry.ctype.ContentList;
-import io.anuke.mindustry.type.TypeID;
+import mindustry.entities.effect.Fire;
+import mindustry.entities.effect.Puddle;
+import mindustry.entities.type.Player;
+import mindustry.ctype.ContentList;
+import mindustry.type.TypeID;
public class TypeIDs implements ContentList{
public static TypeID fire, puddle, player;
diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
similarity index 96%
rename from core/src/io/anuke/mindustry/content/UnitTypes.java
rename to core/src/mindustry/content/UnitTypes.java
index d6e1dd232a..1c5202ab46 100644
--- a/core/src/io/anuke/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -1,13 +1,13 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
-import io.anuke.arc.collection.*;
-import io.anuke.mindustry.ctype.ContentList;
-import io.anuke.mindustry.entities.bullet.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.type.Bullet;
-import io.anuke.mindustry.entities.type.base.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.type.*;
+import arc.struct.*;
+import mindustry.ctype.ContentList;
+import mindustry.entities.bullet.*;
+import mindustry.entities.type.*;
+import mindustry.entities.type.Bullet;
+import mindustry.entities.type.base.*;
+import mindustry.gen.*;
+import mindustry.type.*;
public class UnitTypes implements ContentList{
public static UnitType
diff --git a/core/src/io/anuke/mindustry/content/Weathers.java b/core/src/mindustry/content/Weathers.java
similarity index 57%
rename from core/src/io/anuke/mindustry/content/Weathers.java
rename to core/src/mindustry/content/Weathers.java
index 1935d0c311..6b08fd12a9 100644
--- a/core/src/io/anuke/mindustry/content/Weathers.java
+++ b/core/src/mindustry/content/Weathers.java
@@ -1,7 +1,7 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
-import io.anuke.mindustry.ctype.*;
-import io.anuke.mindustry.type.*;
+import mindustry.ctype.*;
+import mindustry.type.*;
public class Weathers implements ContentList{
public static Weather
diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/mindustry/content/Zones.java
similarity index 95%
rename from core/src/io/anuke/mindustry/content/Zones.java
rename to core/src/mindustry/content/Zones.java
index adeeed4f55..e224ee7b5a 100644
--- a/core/src/io/anuke/mindustry/content/Zones.java
+++ b/core/src/mindustry/content/Zones.java
@@ -1,16 +1,16 @@
-package io.anuke.mindustry.content;
+package mindustry.content;
-import io.anuke.mindustry.ctype.*;
-import io.anuke.mindustry.game.Objectives.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.maps.generators.*;
-import io.anuke.mindustry.maps.zonegen.*;
-import io.anuke.mindustry.type.*;
+import mindustry.ctype.ContentList;
+import mindustry.game.*;
+import mindustry.game.Objectives.*;
+import mindustry.maps.generators.*;
+import mindustry.maps.generators.MapGenerator.*;
+import mindustry.maps.zonegen.*;
+import mindustry.type.*;
-import static io.anuke.arc.collection.Array.with;
-import static io.anuke.mindustry.content.Items.*;
-import static io.anuke.mindustry.content.Planets.starter;
-import static io.anuke.mindustry.type.ItemStack.list;
+import static arc.struct.Array.with;
+import static mindustry.content.Items.*;
+import static mindustry.type.ItemStack.list;
public class Zones implements ContentList{
public static Zone
diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java
similarity index 93%
rename from core/src/io/anuke/mindustry/core/ContentLoader.java
rename to core/src/mindustry/core/ContentLoader.java
index e9799cedde..0a1d9c1db2 100644
--- a/core/src/io/anuke/mindustry/core/ContentLoader.java
+++ b/core/src/mindustry/core/ContentLoader.java
@@ -1,20 +1,20 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.ctype.*;
-import io.anuke.mindustry.ctype.ContentType;
-import io.anuke.mindustry.entities.bullet.*;
-import io.anuke.mindustry.mod.Mods.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import arc.struct.*;
+import arc.func.*;
+import arc.graphics.*;
+import arc.util.ArcAnnotate.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.ctype.*;
+import mindustry.ctype.ContentType;
+import mindustry.entities.bullet.*;
+import mindustry.mod.Mods.*;
+import mindustry.type.*;
+import mindustry.world.*;
-import static io.anuke.arc.Core.files;
-import static io.anuke.mindustry.Vars.mods;
+import static arc.Core.files;
+import static mindustry.Vars.mods;
/**
* Loads all game content.
diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
similarity index 93%
rename from core/src/io/anuke/mindustry/core/Control.java
rename to core/src/mindustry/core/Control.java
index 09f40bd10c..99d91d5516 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/mindustry/core/Control.java
@@ -1,36 +1,36 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
-import io.anuke.arc.*;
-import io.anuke.arc.assets.*;
-import io.anuke.arc.audio.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.input.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.input.*;
-import io.anuke.mindustry.maps.Map;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.ui.dialogs.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.storage.*;
+import arc.*;
+import arc.assets.*;
+import arc.audio.*;
+import arc.struct.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.input.*;
+import arc.math.geom.*;
+import arc.scene.ui.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.core.GameState.*;
+import mindustry.entities.*;
+import mindustry.entities.type.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.input.*;
+import mindustry.maps.Map;
+import mindustry.type.*;
+import mindustry.ui.dialogs.*;
+import mindustry.world.*;
+import mindustry.world.blocks.storage.*;
import java.io.*;
import java.text.*;
import java.util.*;
-import static io.anuke.arc.Core.*;
-import static io.anuke.mindustry.Vars.net;
-import static io.anuke.mindustry.Vars.*;
+import static arc.Core.*;
+import static mindustry.Vars.net;
+import static mindustry.Vars.*;
/**
* Control module.
diff --git a/core/src/io/anuke/mindustry/core/FileTree.java b/core/src/mindustry/core/FileTree.java
similarity index 82%
rename from core/src/io/anuke/mindustry/core/FileTree.java
rename to core/src/mindustry/core/FileTree.java
index cd201c5337..810b9669fb 100644
--- a/core/src/io/anuke/mindustry/core/FileTree.java
+++ b/core/src/mindustry/core/FileTree.java
@@ -1,9 +1,9 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
-import io.anuke.arc.*;
-import io.anuke.arc.assets.loaders.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.files.*;
+import arc.*;
+import arc.assets.loaders.*;
+import arc.struct.*;
+import arc.files.*;
/** Handles files in a modded context. */
public class FileTree implements FileHandleResolver{
diff --git a/core/src/io/anuke/mindustry/core/GameState.java b/core/src/mindustry/core/GameState.java
similarity index 84%
rename from core/src/io/anuke/mindustry/core/GameState.java
rename to core/src/mindustry/core/GameState.java
index 0e1c7a2d4b..73e3db8259 100644
--- a/core/src/io/anuke/mindustry/core/GameState.java
+++ b/core/src/mindustry/core/GameState.java
@@ -1,12 +1,12 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
-import io.anuke.arc.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.type.base.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
+import arc.*;
+import mindustry.entities.type.*;
+import mindustry.entities.type.base.*;
+import mindustry.game.EventType.*;
+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. */
diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java
similarity index 92%
rename from core/src/io/anuke/mindustry/core/Logic.java
rename to core/src/mindustry/core/Logic.java
index d20e744073..6026f59001 100644
--- a/core/src/io/anuke/mindustry/core/Logic.java
+++ b/core/src/mindustry/core/Logic.java
@@ -1,26 +1,26 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
-import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.ctype.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.Teams.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
-import io.anuke.mindustry.world.blocks.BuildBlock.*;
-import io.anuke.mindustry.world.blocks.power.*;
+import arc.*;
+import mindustry.annotations.Annotations.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.core.GameState.*;
+import mindustry.ctype.*;
+import mindustry.entities.*;
+import mindustry.entities.type.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.game.Teams.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.BuildBlock.*;
+import mindustry.world.blocks.power.*;
import java.util.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
/**
* Logic module.
diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
similarity index 93%
rename from core/src/io/anuke/mindustry/core/NetClient.java
rename to core/src/mindustry/core/NetClient.java
index 6a0f0428e3..65c6122d72 100644
--- a/core/src/io/anuke/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -1,36 +1,36 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
-import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.util.CommandHandler.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.io.*;
-import io.anuke.arc.util.serialization.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.ctype.ContentType;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.BuilderTrait.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.net.Administration.*;
-import io.anuke.mindustry.net.Net.*;
-import io.anuke.mindustry.net.*;
-import io.anuke.mindustry.net.Packets.*;
-import io.anuke.mindustry.type.TypeID;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.modules.*;
+import arc.*;
+import mindustry.annotations.Annotations.*;
+import arc.struct.*;
+import arc.graphics.*;
+import arc.math.*;
+import arc.util.CommandHandler.*;
+import arc.util.*;
+import arc.util.io.*;
+import arc.util.serialization.*;
+import mindustry.*;
+import mindustry.core.GameState.*;
+import mindustry.ctype.ContentType;
+import mindustry.entities.*;
+import mindustry.entities.traits.BuilderTrait.*;
+import mindustry.entities.traits.*;
+import mindustry.entities.type.*;
+import mindustry.game.*;
+import mindustry.game.EventType.*;
+import mindustry.gen.*;
+import mindustry.net.Administration.*;
+import mindustry.net.Net.*;
+import mindustry.net.*;
+import mindustry.net.Packets.*;
+import mindustry.type.TypeID;
+import mindustry.world.*;
+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;
diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
similarity index 96%
rename from core/src/io/anuke/mindustry/core/NetServer.java
rename to core/src/mindustry/core/NetServer.java
index 218cbd2d83..d00fc5a839 100644
--- a/core/src/io/anuke/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -1,38 +1,38 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
-import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.CommandHandler.*;
-import io.anuke.arc.util.io.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.BuilderTrait.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.net.*;
-import io.anuke.mindustry.net.Administration.*;
-import io.anuke.mindustry.net.Packets.*;
-import io.anuke.mindustry.world.*;
+import arc.*;
+import mindustry.annotations.Annotations.*;
+import arc.struct.*;
+import arc.graphics.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import arc.util.CommandHandler.*;
+import arc.util.io.*;
+import mindustry.content.*;
+import mindustry.core.GameState.*;
+import mindustry.entities.*;
+import mindustry.entities.traits.BuilderTrait.*;
+import mindustry.entities.traits.*;
+import mindustry.entities.type.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.net.*;
+import mindustry.net.Administration.*;
+import mindustry.net.Packets.*;
+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;
private final static float serverSyncTime = 12, kickDuration = 30 * 1000, blockSyncTime = 60 * 10;
- private final static Vector2 vector = new Vector2();
+ private final static Vec2 vector = new Vec2();
private final static Rectangle viewport = new Rectangle();
/** If a player goes away of their server-side coordinates by this distance, they get teleported back. */
private final static float correctDist = 16f;
diff --git a/core/src/io/anuke/mindustry/core/Platform.java b/core/src/mindustry/core/Platform.java
similarity index 87%
rename from core/src/io/anuke/mindustry/core/Platform.java
rename to core/src/mindustry/core/Platform.java
index 0cfb72a058..ebad75b9e7 100644
--- a/core/src/io/anuke/mindustry/core/Platform.java
+++ b/core/src/mindustry/core/Platform.java
@@ -1,21 +1,21 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
-import io.anuke.arc.*;
-import io.anuke.arc.Input.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.files.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.util.serialization.*;
-import io.anuke.mindustry.mod.*;
-import io.anuke.mindustry.net.*;
-import io.anuke.mindustry.net.Net.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import arc.*;
+import arc.Input.*;
+import arc.struct.*;
+import arc.files.*;
+import arc.func.*;
+import arc.math.*;
+import arc.scene.ui.*;
+import arc.util.serialization.*;
+import mindustry.mod.*;
+import mindustry.net.*;
+import mindustry.net.Net.*;
+import mindustry.type.*;
+import mindustry.ui.dialogs.*;
import org.mozilla.javascript.*;
-import static io.anuke.mindustry.Vars.mobile;
+import static mindustry.Vars.mobile;
public interface Platform{
diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
similarity index 92%
rename from core/src/io/anuke/mindustry/core/Renderer.java
rename to core/src/mindustry/core/Renderer.java
index c8cf2b1063..4dbb2ef4a1 100644
--- a/core/src/io/anuke/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -1,32 +1,32 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
-import io.anuke.arc.*;
-import io.anuke.arc.files.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.glutils.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.pooling.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.effect.GroundEffectEntity.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.input.*;
-import io.anuke.mindustry.ui.Cicon;
-import io.anuke.mindustry.world.blocks.defense.ForceProjector.*;
+import arc.*;
+import arc.files.*;
+import arc.func.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.graphics.gl.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import arc.util.pooling.*;
+import mindustry.content.*;
+import mindustry.core.GameState.*;
+import mindustry.entities.*;
+import mindustry.entities.effect.*;
+import mindustry.entities.effect.GroundEffectEntity.*;
+import mindustry.entities.traits.*;
+import mindustry.entities.type.*;
+import mindustry.game.*;
+import mindustry.game.EventType.*;
+import mindustry.graphics.*;
+import mindustry.input.*;
+import mindustry.ui.Cicon;
+import mindustry.world.blocks.defense.ForceProjector.*;
-import static io.anuke.arc.Core.*;
-import static io.anuke.mindustry.Vars.*;
+import static arc.Core.*;
+import static mindustry.Vars.*;
public class Renderer implements ApplicationListener{
public final BlockRenderer blocks = new BlockRenderer();
@@ -120,7 +120,7 @@ public class Renderer implements ApplicationListener{
landTime = 0f;
graphics.clear(Color.black);
}else{
- Vector2 position = Tmp.v3.set(player);
+ Vec2 position = Tmp.v3.set(player);
if(player.isDead()){
TileEntity core = player.getClosestCore();
diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
similarity index 92%
rename from core/src/io/anuke/mindustry/core/UI.java
rename to core/src/mindustry/core/UI.java
index 9b0af80f52..1ce41f6e24 100644
--- a/core/src/io/anuke/mindustry/core/UI.java
+++ b/core/src/mindustry/core/UI.java
@@ -1,42 +1,42 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
-import io.anuke.arc.*;
-import io.anuke.arc.Graphics.*;
-import io.anuke.arc.Graphics.Cursor.*;
-import io.anuke.arc.Input.*;
-import io.anuke.arc.assets.*;
-import io.anuke.arc.assets.loaders.*;
-import io.anuke.arc.assets.loaders.resolvers.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.files.*;
-import io.anuke.arc.freetype.*;
-import io.anuke.arc.freetype.FreeTypeFontGenerator.*;
-import io.anuke.arc.freetype.FreetypeFontLoader.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.Texture.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.input.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.scene.*;
-import io.anuke.arc.scene.actions.*;
-import io.anuke.arc.scene.event.*;
-import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.scene.ui.TextField.*;
-import io.anuke.arc.scene.ui.Tooltip.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.editor.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.ui.*;
-import io.anuke.mindustry.ui.dialogs.*;
-import io.anuke.mindustry.ui.fragments.*;
+import arc.*;
+import arc.Graphics.*;
+import arc.Graphics.Cursor.*;
+import arc.Input.*;
+import arc.assets.*;
+import arc.assets.loaders.*;
+import arc.assets.loaders.resolvers.*;
+import arc.struct.*;
+import arc.files.*;
+import arc.freetype.*;
+import arc.freetype.FreeTypeFontGenerator.*;
+import arc.freetype.FreetypeFontLoader.*;
+import arc.func.*;
+import arc.graphics.*;
+import arc.graphics.Texture.*;
+import arc.graphics.g2d.*;
+import arc.input.*;
+import arc.math.*;
+import arc.scene.*;
+import arc.scene.actions.*;
+import arc.scene.event.*;
+import arc.scene.ui.*;
+import arc.scene.ui.TextField.*;
+import arc.scene.ui.Tooltip.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.core.GameState.*;
+import mindustry.editor.*;
+import mindustry.game.EventType.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+import mindustry.ui.dialogs.*;
+import mindustry.ui.fragments.*;
-import static io.anuke.arc.scene.actions.Actions.*;
-import static io.anuke.mindustry.Vars.*;
+import static arc.scene.actions.Actions.*;
+import static mindustry.Vars.*;
public class UI implements ApplicationListener, Loadable{
public MenuFragment menufrag;
diff --git a/core/src/io/anuke/mindustry/core/Version.java b/core/src/mindustry/core/Version.java
similarity index 88%
rename from core/src/io/anuke/mindustry/core/Version.java
rename to core/src/mindustry/core/Version.java
index a6ff7ea6a9..700b8776e6 100644
--- a/core/src/io/anuke/mindustry/core/Version.java
+++ b/core/src/mindustry/core/Version.java
@@ -1,11 +1,11 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
-import io.anuke.arc.*;
-import io.anuke.arc.Files.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.files.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.io.*;
+import arc.*;
+import arc.Files.*;
+import arc.struct.*;
+import arc.files.*;
+import arc.util.*;
+import arc.util.io.*;
public class Version{
/** Build type. 'official' for official releases; 'custom' or 'bleeding edge' are also used. */
diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/mindustry/core/World.java
similarity index 94%
rename from core/src/io/anuke/mindustry/core/World.java
rename to core/src/mindustry/core/World.java
index 6d63201f5d..e93bfb11c3 100644
--- a/core/src/io/anuke/mindustry/core/World.java
+++ b/core/src/mindustry/core/World.java
@@ -1,25 +1,25 @@
-package io.anuke.mindustry.core;
+package mindustry.core;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.io.*;
-import io.anuke.mindustry.maps.*;
-import io.anuke.mindustry.maps.filters.*;
-import io.anuke.mindustry.maps.filters.GenerateFilter.*;
-import io.anuke.mindustry.maps.generators.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import arc.*;
+import arc.struct.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.content.*;
+import mindustry.core.GameState.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.io.*;
+import mindustry.maps.*;
+import mindustry.maps.filters.*;
+import mindustry.maps.filters.GenerateFilter.*;
+import mindustry.maps.generators.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class World{
public final Context context = new Context();
diff --git a/core/src/io/anuke/mindustry/ctype/Content.java b/core/src/mindustry/ctype/Content.java
similarity index 82%
rename from core/src/io/anuke/mindustry/ctype/Content.java
rename to core/src/mindustry/ctype/Content.java
index 09a304817d..382d1a22ab 100644
--- a/core/src/io/anuke/mindustry/ctype/Content.java
+++ b/core/src/mindustry/ctype/Content.java
@@ -1,12 +1,12 @@
-package io.anuke.mindustry.ctype;
+package mindustry.ctype;
-import io.anuke.arc.files.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.mod.Mods.*;
+import arc.files.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.*;
+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{
public final short id;
/** Info on which mod this content was loaded from. */
@@ -14,7 +14,7 @@ public abstract class Content implements Comparable{
public Content(){
- this.id = (short)Vars.content.getBy(getContentType()).size;
+ this.id = (short) Vars.content.getBy(getContentType()).size;
Vars.content.handleContent(this);
}
diff --git a/core/src/mindustry/ctype/ContentList.java b/core/src/mindustry/ctype/ContentList.java
new file mode 100644
index 0000000000..efe1588f31
--- /dev/null
+++ b/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();
+}
diff --git a/core/src/io/anuke/mindustry/ctype/ContentType.java b/core/src/mindustry/ctype/ContentType.java
similarity index 88%
rename from core/src/io/anuke/mindustry/ctype/ContentType.java
rename to core/src/mindustry/ctype/ContentType.java
index fa4cc9f764..31061e256b 100644
--- a/core/src/io/anuke/mindustry/ctype/ContentType.java
+++ b/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{
diff --git a/core/src/io/anuke/mindustry/ctype/MappableContent.java b/core/src/mindustry/ctype/MappableContent.java
similarity index 83%
rename from core/src/io/anuke/mindustry/ctype/MappableContent.java
rename to core/src/mindustry/ctype/MappableContent.java
index 709e7652d4..11a72651a5 100644
--- a/core/src/io/anuke/mindustry/ctype/MappableContent.java
+++ b/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;
diff --git a/core/src/io/anuke/mindustry/ctype/UnlockableContent.java b/core/src/mindustry/ctype/UnlockableContent.java
similarity index 85%
rename from core/src/io/anuke/mindustry/ctype/UnlockableContent.java
rename to core/src/mindustry/ctype/UnlockableContent.java
index 9b6016d9ee..42c9ab8251 100644
--- a/core/src/io/anuke/mindustry/ctype/UnlockableContent.java
+++ b/core/src/mindustry/ctype/UnlockableContent.java
@@ -1,12 +1,12 @@
-package io.anuke.mindustry.ctype;
+package mindustry.ctype;
-import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.ui.Cicon;
+import arc.*;
+import mindustry.annotations.Annotations.*;
+import arc.graphics.g2d.*;
+import arc.scene.ui.layout.*;
+import mindustry.*;
+import mindustry.graphics.*;
+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);
diff --git a/core/src/io/anuke/mindustry/editor/DrawOperation.java b/core/src/mindustry/editor/DrawOperation.java
similarity index 86%
rename from core/src/io/anuke/mindustry/editor/DrawOperation.java
rename to core/src/mindustry/editor/DrawOperation.java
index b5a81a759f..22a7ad5730 100755
--- a/core/src/io/anuke/mindustry/editor/DrawOperation.java
+++ b/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 io.anuke.arc.collection.LongArray;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.gen.TileOp;
-import io.anuke.mindustry.world.Block;
-import io.anuke.mindustry.world.Tile;
-import io.anuke.mindustry.world.blocks.Floor;
+import mindustry.annotations.Annotations.Struct;
+import arc.struct.LongArray;
+import mindustry.game.Team;
+import mindustry.gen.TileOp;
+import mindustry.world.Block;
+import mindustry.world.Tile;
+import mindustry.world.blocks.Floor;
-import static io.anuke.mindustry.Vars.content;
+import static mindustry.Vars.content;
public class DrawOperation{
private MapEditor editor;
diff --git a/core/src/io/anuke/mindustry/editor/EditorTile.java b/core/src/mindustry/editor/EditorTile.java
similarity index 87%
rename from core/src/io/anuke/mindustry/editor/EditorTile.java
rename to core/src/mindustry/editor/EditorTile.java
index f515803d47..8add17d33c 100644
--- a/core/src/io/anuke/mindustry/editor/EditorTile.java
+++ b/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 io.anuke.mindustry.core.GameState.State;
-import io.anuke.mindustry.editor.DrawOperation.OpType;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.gen.TileOp;
-import io.anuke.mindustry.world.Block;
-import io.anuke.mindustry.world.Tile;
-import io.anuke.mindustry.world.blocks.*;
-import io.anuke.mindustry.world.modules.*;
+import mindustry.content.Blocks;
+import mindustry.core.GameState.State;
+import mindustry.editor.DrawOperation.OpType;
+import mindustry.game.Team;
+import mindustry.gen.TileOp;
+import mindustry.world.Block;
+import mindustry.world.Tile;
+import mindustry.world.blocks.*;
+import mindustry.world.modules.*;
-import static io.anuke.mindustry.Vars.state;
-import static io.anuke.mindustry.Vars.ui;
+import static mindustry.Vars.state;
+import static mindustry.Vars.ui;
public class EditorTile extends Tile{
diff --git a/core/src/io/anuke/mindustry/editor/EditorTool.java b/core/src/mindustry/editor/EditorTool.java
similarity index 95%
rename from core/src/io/anuke/mindustry/editor/EditorTool.java
rename to core/src/mindustry/editor/EditorTool.java
index c38d91b8ed..3e9fcd47dc 100644
--- a/core/src/io/anuke/mindustry/editor/EditorTool.java
+++ b/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 io.anuke.arc.func.*;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.Bresenham2;
-import io.anuke.arc.util.Structs;
-import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.BlockPart;
+import arc.struct.IntArray;
+import arc.func.*;
+import arc.math.Mathf;
+import arc.math.geom.Bresenham2;
+import arc.util.Structs;
+import mindustry.Vars;
+import mindustry.content.Blocks;
+import mindustry.game.Team;
+import mindustry.world.*;
+import mindustry.world.blocks.BlockPart;
public enum EditorTool{
zoom,
diff --git a/core/src/io/anuke/mindustry/editor/MapEditor.java b/core/src/mindustry/editor/MapEditor.java
similarity index 93%
rename from core/src/io/anuke/mindustry/editor/MapEditor.java
rename to core/src/mindustry/editor/MapEditor.java
index 0af045dc49..166e609f4e 100644
--- a/core/src/io/anuke/mindustry/editor/MapEditor.java
+++ b/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 io.anuke.arc.files.Fi;
-import io.anuke.arc.func.Cons;
-import io.anuke.arc.func.Boolf;
-import io.anuke.arc.graphics.Pixmap;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.util.Structs;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.gen.TileOp;
-import io.anuke.mindustry.io.LegacyMapIO;
-import io.anuke.mindustry.io.MapIO;
-import io.anuke.mindustry.maps.Map;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.BlockPart;
+import arc.struct.StringMap;
+import arc.files.Fi;
+import arc.func.Cons;
+import arc.func.Boolf;
+import arc.graphics.Pixmap;
+import arc.math.Mathf;
+import arc.util.Structs;
+import mindustry.content.Blocks;
+import mindustry.game.Team;
+import mindustry.gen.TileOp;
+import mindustry.io.LegacyMapIO;
+import mindustry.io.MapIO;
+import mindustry.maps.Map;
+import mindustry.world.*;
+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};
diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java
similarity index 95%
rename from core/src/io/anuke/mindustry/editor/MapEditorDialog.java
rename to core/src/mindustry/editor/MapEditorDialog.java
index b8745052a0..0ee0fca085 100644
--- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
+++ b/core/src/mindustry/editor/MapEditorDialog.java
@@ -1,37 +1,37 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.files.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.input.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.scene.actions.*;
-import io.anuke.arc.scene.event.*;
-import io.anuke.arc.scene.style.*;
-import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.io.*;
-import io.anuke.mindustry.maps.*;
-import io.anuke.mindustry.ui.*;
-import io.anuke.mindustry.ui.Cicon;
-import io.anuke.mindustry.ui.dialogs.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
-import io.anuke.mindustry.world.blocks.storage.*;
+import arc.*;
+import arc.struct.*;
+import arc.files.*;
+import arc.func.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.input.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.actions.*;
+import arc.scene.event.*;
+import arc.scene.style.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.core.GameState.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.io.*;
+import mindustry.maps.*;
+import mindustry.ui.*;
+import mindustry.ui.Cicon;
+import mindustry.ui.dialogs.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+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;
@@ -475,7 +475,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
}
table.update(() -> {
- Vector2 v = button.localToStageCoordinates(Tmp.v1.setZero());
+ Vec2 v = button.localToStageCoordinates(Tmp.v1.setZero());
table.setPosition(v.x, v.y, Align.topLeft);
if(!isShown()){
table.remove();
diff --git a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java b/core/src/mindustry/editor/MapGenerateDialog.java
similarity index 93%
rename from core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
rename to core/src/mindustry/editor/MapGenerateDialog.java
index 35ceb5f44e..19f6f4bc2f 100644
--- a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
+++ b/core/src/mindustry/editor/MapGenerateDialog.java
@@ -1,29 +1,29 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.Pixmap.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.scene.ui.ImageButton.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.async.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.io.*;
-import io.anuke.mindustry.maps.filters.*;
-import io.anuke.mindustry.maps.filters.GenerateFilter.*;
-import io.anuke.mindustry.ui.*;
-import io.anuke.mindustry.ui.dialogs.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import arc.*;
+import arc.struct.*;
+import arc.func.*;
+import arc.graphics.*;
+import arc.graphics.Pixmap.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.ui.*;
+import arc.scene.ui.ImageButton.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import arc.util.async.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.io.*;
+import mindustry.maps.filters.*;
+import mindustry.maps.filters.GenerateFilter.*;
+import mindustry.ui.*;
+import mindustry.ui.dialogs.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
@SuppressWarnings("unchecked")
public class MapGenerateDialog extends FloatingDialog{
@@ -187,7 +187,7 @@ public class MapGenerateDialog extends FloatingDialog{
return;
}
- Vector2 v = pane.stageToLocalCoordinates(Core.input.mouse());
+ Vec2 v = pane.stageToLocalCoordinates(Core.input.mouse());
if(v.x >= 0 && v.y >= 0 && v.x <= pane.getWidth() && v.y <= pane.getHeight()){
Core.scene.setScrollFocus(pane);
diff --git a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java b/core/src/mindustry/editor/MapInfoDialog.java
similarity index 90%
rename from core/src/io/anuke/mindustry/editor/MapInfoDialog.java
rename to core/src/mindustry/editor/MapInfoDialog.java
index b2b942250b..ab120c9880 100644
--- a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java
+++ b/core/src/mindustry/editor/MapInfoDialog.java
@@ -1,13 +1,13 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.scene.ui.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.io.*;
-import io.anuke.mindustry.ui.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import arc.*;
+import arc.struct.*;
+import arc.scene.ui.*;
+import mindustry.*;
+import mindustry.game.*;
+import mindustry.io.*;
+import mindustry.ui.*;
+import mindustry.ui.dialogs.*;
public class MapInfoDialog extends FloatingDialog{
private final MapEditor editor;
diff --git a/core/src/io/anuke/mindustry/editor/MapLoadDialog.java b/core/src/mindustry/editor/MapLoadDialog.java
similarity index 84%
rename from core/src/io/anuke/mindustry/editor/MapLoadDialog.java
rename to core/src/mindustry/editor/MapLoadDialog.java
index 5fb9ffa982..7694d0fc4f 100644
--- a/core/src/io/anuke/mindustry/editor/MapLoadDialog.java
+++ b/core/src/mindustry/editor/MapLoadDialog.java
@@ -1,14 +1,14 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
-import io.anuke.arc.func.*;
-import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.maps.*;
-import io.anuke.mindustry.ui.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import arc.func.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.maps.*;
+import mindustry.ui.*;
+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;
diff --git a/core/src/io/anuke/mindustry/editor/MapRenderer.java b/core/src/mindustry/editor/MapRenderer.java
similarity index 88%
rename from core/src/io/anuke/mindustry/editor/MapRenderer.java
rename to core/src/mindustry/editor/MapRenderer.java
index 1f38fec0a1..2bd889006c 100644
--- a/core/src/io/anuke/mindustry/editor/MapRenderer.java
+++ b/core/src/mindustry/editor/MapRenderer.java
@@ -1,23 +1,23 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.IntSet;
-import io.anuke.arc.collection.IntSet.IntSetIterator;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.Texture;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.graphics.IndexedRenderer;
-import io.anuke.mindustry.world.Block;
-import io.anuke.mindustry.world.Tile;
-import io.anuke.mindustry.world.blocks.BlockPart;
+import arc.*;
+import arc.struct.IntSet;
+import arc.struct.IntSet.IntSetIterator;
+import arc.graphics.Color;
+import arc.graphics.Texture;
+import arc.graphics.g2d.Draw;
+import arc.graphics.g2d.TextureRegion;
+import arc.math.Mathf;
+import arc.util.*;
+import mindustry.content.Blocks;
+import mindustry.game.EventType.*;
+import mindustry.game.Team;
+import mindustry.graphics.IndexedRenderer;
+import mindustry.world.Block;
+import mindustry.world.Tile;
+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;
diff --git a/core/src/io/anuke/mindustry/editor/MapResizeDialog.java b/core/src/mindustry/editor/MapResizeDialog.java
similarity index 88%
rename from core/src/io/anuke/mindustry/editor/MapResizeDialog.java
rename to core/src/mindustry/editor/MapResizeDialog.java
index 525adcefde..6eaf62eb42 100644
--- a/core/src/io/anuke/mindustry/editor/MapResizeDialog.java
+++ b/core/src/mindustry/editor/MapResizeDialog.java
@@ -1,10 +1,10 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
-import io.anuke.arc.func.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import arc.func.*;
+import arc.math.*;
+import arc.scene.ui.layout.*;
+import mindustry.gen.*;
+import mindustry.ui.dialogs.*;
public class MapResizeDialog extends FloatingDialog{
private static final int minSize = 50, maxSize = 500, increment = 50;
diff --git a/core/src/io/anuke/mindustry/editor/MapSaveDialog.java b/core/src/mindustry/editor/MapSaveDialog.java
similarity index 87%
rename from core/src/io/anuke/mindustry/editor/MapSaveDialog.java
rename to core/src/mindustry/editor/MapSaveDialog.java
index 93b189349f..34eb4d6286 100644
--- a/core/src/io/anuke/mindustry/editor/MapSaveDialog.java
+++ b/core/src/mindustry/editor/MapSaveDialog.java
@@ -1,12 +1,12 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
-import io.anuke.arc.func.*;
-import io.anuke.arc.scene.ui.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.maps.*;
-import io.anuke.mindustry.ui.dialogs.*;
+import arc.func.*;
+import arc.scene.ui.*;
+import mindustry.*;
+import mindustry.maps.*;
+import mindustry.ui.dialogs.*;
-import static io.anuke.mindustry.Vars.ui;
+import static mindustry.Vars.ui;
public class MapSaveDialog extends FloatingDialog{
private TextField field;
diff --git a/core/src/io/anuke/mindustry/editor/MapView.java b/core/src/mindustry/editor/MapView.java
similarity index 88%
rename from core/src/io/anuke/mindustry/editor/MapView.java
rename to core/src/mindustry/editor/MapView.java
index c637e9b6f2..4c99ffba61 100644
--- a/core/src/io/anuke/mindustry/editor/MapView.java
+++ b/core/src/mindustry/editor/MapView.java
@@ -1,24 +1,24 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
-import io.anuke.arc.Core;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.input.GestureDetector;
-import io.anuke.arc.input.GestureDetector.GestureListener;
-import io.anuke.arc.input.KeyCode;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.scene.Element;
-import io.anuke.arc.scene.event.*;
-import io.anuke.arc.scene.ui.TextField;
-import io.anuke.arc.scene.ui.layout.Scl;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.graphics.Pal;
-import io.anuke.mindustry.input.Binding;
-import io.anuke.mindustry.ui.GridImage;
+import arc.Core;
+import arc.graphics.Color;
+import arc.graphics.g2d.*;
+import arc.input.GestureDetector;
+import arc.input.GestureDetector.GestureListener;
+import arc.input.KeyCode;
+import arc.math.Mathf;
+import arc.math.geom.*;
+import arc.scene.Element;
+import arc.scene.event.*;
+import arc.scene.ui.TextField;
+import arc.scene.ui.layout.Scl;
+import arc.util.*;
+import mindustry.graphics.Pal;
+import mindustry.input.Binding;
+import mindustry.ui.GridImage;
-import static io.anuke.mindustry.Vars.mobile;
-import static io.anuke.mindustry.Vars.ui;
+import static mindustry.Vars.mobile;
+import static mindustry.Vars.ui;
public class MapView extends Element implements GestureListener{
private MapEditor editor;
@@ -27,9 +27,9 @@ public class MapView extends Element implements GestureListener{
private float zoom = 1f;
private boolean grid = false;
private GridImage image = new GridImage(0, 0);
- private Vector2 vec = new Vector2();
+ private Vec2 vec = new Vec2();
private Rectangle rect = new Rectangle();
- private Vector2[][] brushPolygons = new Vector2[MapEditor.brushSizes.length][0];
+ private Vec2[][] brushPolygons = new Vec2[MapEditor.brushSizes.length][0];
private boolean drawing;
private int lastx, lasty;
@@ -214,7 +214,7 @@ public class MapView extends Element implements GestureListener{
}
}
- private Vector2 unproject(int x, int y){
+ private Vec2 unproject(int x, int y){
float ratio = 1f / ((float)editor.width() / editor.height());
float size = Math.min(width, height);
float sclwidth = size * zoom;
@@ -268,9 +268,9 @@ public class MapView extends Element implements GestureListener{
if((!editor.drawBlock.isMultiblock() || tool == EditorTool.eraser) && tool != EditorTool.fill){
if(tool == EditorTool.line && drawing){
- Vector2 v1 = unproject(startx, starty).add(x, y);
+ Vec2 v1 = unproject(startx, starty).add(x, y);
float sx = v1.x, sy = v1.y;
- Vector2 v2 = unproject(lastx, lasty).add(x, y);
+ Vec2 v2 = unproject(lastx, lasty).add(x, y);
Lines.poly(brushPolygons[index], sx, sy, scaling);
Lines.poly(brushPolygons[index], v2.x, v2.y, scaling);
@@ -278,7 +278,7 @@ public class MapView extends Element implements GestureListener{
if((tool.edit || (tool == EditorTool.line && !drawing)) && (!mobile || drawing)){
Point2 p = project(mousex, mousey);
- Vector2 v = unproject(p.x, p.y).add(x, y);
+ Vec2 v = unproject(p.x, p.y).add(x, y);
//pencil square outline
if(tool == EditorTool.pencil && tool.mode == 1){
@@ -290,7 +290,7 @@ public class MapView extends Element implements GestureListener{
}else{
if((tool.edit || tool == EditorTool.line) && (!mobile || drawing)){
Point2 p = project(mousex, mousey);
- Vector2 v = unproject(p.x, p.y).add(x, y);
+ Vec2 v = unproject(p.x, p.y).add(x, y);
float offset = (editor.drawBlock.size % 2 == 0 ? scaling / 2f : 0f);
Lines.square(
v.x + scaling / 2f + offset,
@@ -332,7 +332,7 @@ public class MapView extends Element implements GestureListener{
}
@Override
- public boolean pinch(Vector2 initialPointer1, Vector2 initialPointer2, Vector2 pointer1, Vector2 pointer2){
+ public boolean pinch(Vec2 initialPointer1, Vec2 initialPointer2, Vec2 pointer1, Vec2 pointer2){
return false;
}
diff --git a/core/src/io/anuke/mindustry/editor/OperationStack.java b/core/src/mindustry/editor/OperationStack.java
similarity index 92%
rename from core/src/io/anuke/mindustry/editor/OperationStack.java
rename to core/src/mindustry/editor/OperationStack.java
index 7927cbb026..f21cde91b8 100755
--- a/core/src/io/anuke/mindustry/editor/OperationStack.java
+++ b/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;
diff --git a/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java b/core/src/mindustry/editor/WaveInfoDialog.java
similarity index 90%
rename from core/src/io/anuke/mindustry/editor/WaveInfoDialog.java
rename to core/src/mindustry/editor/WaveInfoDialog.java
index 187d8a7fc2..50ee9de42e 100644
--- a/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java
+++ b/core/src/mindustry/editor/WaveInfoDialog.java
@@ -1,28 +1,28 @@
-package io.anuke.mindustry.editor;
+package mindustry.editor;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.input.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.scene.event.*;
-import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.scene.ui.TextField.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.ctype.ContentType;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.io.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.ui.Cicon;
-import io.anuke.mindustry.ui.dialogs.*;
+import arc.*;
+import arc.struct.*;
+import arc.graphics.*;
+import arc.input.*;
+import arc.math.*;
+import arc.scene.event.*;
+import arc.scene.ui.*;
+import arc.scene.ui.TextField.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.ctype.ContentType;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.io.*;
+import mindustry.type.*;
+import mindustry.ui.Cicon;
+import mindustry.ui.dialogs.*;
-import static io.anuke.mindustry.Vars.*;
-import static io.anuke.mindustry.game.SpawnGroup.never;
+import static mindustry.Vars.*;
+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;
diff --git a/core/src/io/anuke/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java
similarity index 92%
rename from core/src/io/anuke/mindustry/entities/Damage.java
rename to core/src/mindustry/entities/Damage.java
index e637c6081e..a5bc63bc52 100644
--- a/core/src/io/anuke/mindustry/entities/Damage.java
+++ b/core/src/mindustry/entities/Damage.java
@@ -1,30 +1,30 @@
-package io.anuke.mindustry.entities;
+package mindustry.entities;
-import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.Effects.*;
-import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.world.*;
+import arc.*;
+import mindustry.annotations.Annotations.*;
+import arc.struct.*;
+import arc.func.*;
+import arc.graphics.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.Effects.*;
+import mindustry.entities.effect.*;
+import mindustry.entities.type.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
/** Utility class for damaging in an area. */
public class Damage{
private static Rectangle rect = new Rectangle();
private static Rectangle hitrect = new Rectangle();
- private static Vector2 tr = new Vector2();
+ private static Vec2 tr = new Vec2();
private static GridBits bits = new GridBits(30, 30);
private static IntQueue propagation = new IntQueue();
private static IntSet collidedBlocks = new IntSet();
@@ -133,7 +133,7 @@ public class Damage{
other.width += expand * 2;
other.height += expand * 2;
- Vector2 vec = Geometry.raycastRect(x, y, x2, y2, other);
+ Vec2 vec = Geometry.raycastRect(x, y, x2, y2, other);
if(vec != null){
Effects.effect(effect, vec.x, vec.y);
diff --git a/core/src/io/anuke/mindustry/entities/Effects.java b/core/src/mindustry/entities/Effects.java
similarity index 92%
rename from core/src/io/anuke/mindustry/entities/Effects.java
rename to core/src/mindustry/entities/Effects.java
index ca1492bdbf..6f2a04033a 100644
--- a/core/src/io/anuke/mindustry/entities/Effects.java
+++ b/core/src/mindustry/entities/Effects.java
@@ -1,15 +1,15 @@
-package io.anuke.mindustry.entities;
+package mindustry.entities;
-import io.anuke.arc.Core;
-import io.anuke.arc.collection.Array;
-import io.anuke.arc.func.Cons;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.Position;
-import io.anuke.arc.util.pooling.Pools;
-import io.anuke.mindustry.entities.type.EffectEntity;
-import io.anuke.mindustry.entities.traits.ScaleTrait;
+import arc.Core;
+import arc.struct.Array;
+import arc.func.Cons;
+import arc.graphics.Color;
+import arc.graphics.g2d.*;
+import arc.math.Mathf;
+import arc.math.geom.Position;
+import arc.util.pooling.Pools;
+import mindustry.entities.type.EffectEntity;
+import mindustry.entities.traits.ScaleTrait;
public class Effects{
private static final EffectContainer container = new EffectContainer();
diff --git a/core/src/io/anuke/mindustry/entities/Entities.java b/core/src/mindustry/entities/Entities.java
similarity index 86%
rename from core/src/io/anuke/mindustry/entities/Entities.java
rename to core/src/mindustry/entities/Entities.java
index 8f9ff98300..022af6b95d 100755
--- a/core/src/io/anuke/mindustry/entities/Entities.java
+++ b/core/src/mindustry/entities/Entities.java
@@ -1,7 +1,7 @@
-package io.anuke.mindustry.entities;
+package mindustry.entities;
-import io.anuke.arc.collection.*;
-import io.anuke.mindustry.entities.traits.*;
+import arc.struct.*;
+import mindustry.entities.traits.*;
/** Simple container for managing entity groups.*/
public class Entities{
diff --git a/core/src/io/anuke/mindustry/entities/EntityCollisions.java b/core/src/mindustry/entities/EntityCollisions.java
similarity index 92%
rename from core/src/io/anuke/mindustry/entities/EntityCollisions.java
rename to core/src/mindustry/entities/EntityCollisions.java
index 808f8e4fc8..6a7fefffd1 100644
--- a/core/src/io/anuke/mindustry/entities/EntityCollisions.java
+++ b/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 io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.*;
-import io.anuke.mindustry.entities.traits.Entity;
-import io.anuke.mindustry.entities.traits.SolidTrait;
-import io.anuke.mindustry.world.Tile;
+import arc.struct.Array;
+import arc.math.Mathf;
+import arc.math.geom.*;
+import mindustry.entities.traits.Entity;
+import mindustry.entities.traits.SolidTrait;
+import mindustry.world.Tile;
-import static io.anuke.mindustry.Vars.tilesize;
-import static io.anuke.mindustry.Vars.world;
+import static mindustry.Vars.tilesize;
+import static mindustry.Vars.world;
public class EntityCollisions{
//range for tile collision scanning
@@ -18,8 +18,8 @@ public class EntityCollisions{
//tile collisions
private Rectangle tmp = new Rectangle();
- private Vector2 vector = new Vector2();
- private Vector2 l1 = new Vector2();
+ private Vec2 vector = new Vec2();
+ private Vec2 l1 = new Vec2();
private Rectangle r1 = new Rectangle();
private Rectangle r2 = new Rectangle();
@@ -72,7 +72,7 @@ public class EntityCollisions{
tmp.setSize(tilesize).setCenter(wx * tilesize, wy * tilesize);
if(tmp.overlaps(rect)){
- Vector2 v = Geometry.overlap(rect, tmp, x);
+ Vec2 v = Geometry.overlap(rect, tmp, x);
rect.x += v.x;
rect.y += v.y;
}
@@ -157,7 +157,7 @@ public class EntityCollisions{
}
private boolean collide(float x1, float y1, float w1, float h1, float vx1, float vy1,
- float x2, float y2, float w2, float h2, float vx2, float vy2, Vector2 out){
+ float x2, float y2, float w2, float h2, float vx2, float vy2, Vec2 out){
float px = vx1, py = vy1;
vx1 -= vx2;
diff --git a/core/src/io/anuke/mindustry/entities/EntityGroup.java b/core/src/mindustry/entities/EntityGroup.java
similarity index 95%
rename from core/src/io/anuke/mindustry/entities/EntityGroup.java
rename to core/src/mindustry/entities/EntityGroup.java
index 588bca2709..d691949272 100644
--- a/core/src/io/anuke/mindustry/entities/EntityGroup.java
+++ b/core/src/mindustry/entities/EntityGroup.java
@@ -1,13 +1,13 @@
-package io.anuke.mindustry.entities;
+package mindustry.entities;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.mindustry.entities.traits.*;
+import arc.*;
+import arc.struct.*;
+import arc.func.*;
+import arc.graphics.*;
+import arc.math.geom.*;
+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")
diff --git a/core/src/io/anuke/mindustry/entities/Predict.java b/core/src/mindustry/entities/Predict.java
similarity index 75%
rename from core/src/io/anuke/mindustry/entities/Predict.java
rename to core/src/mindustry/entities/Predict.java
index ef385cbd26..49910b2e81 100644
--- a/core/src/io/anuke/mindustry/entities/Predict.java
+++ b/core/src/mindustry/entities/Predict.java
@@ -1,16 +1,16 @@
-package io.anuke.mindustry.entities;
+package mindustry.entities;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.entities.traits.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import mindustry.entities.traits.*;
/**
* Class for predicting shoot angles based on velocities of targets.
*/
public class Predict{
- private static Vector2 vec = new Vector2();
- private static Vector2 vresult = new Vector2();
+ private static Vec2 vec = new Vec2();
+ private static Vec2 vresult = new Vec2();
/**
* Calculates of intercept of a stationary and moving target. Do not call from multiple threads!
@@ -23,7 +23,7 @@ public class Predict{
* @param v speed of bullet
* @return the intercept location
*/
- public static Vector2 intercept(float srcx, float srcy, float dstx, float dsty, float dstvx, float dstvy, float v){
+ public static Vec2 intercept(float srcx, float srcy, float dstx, float dsty, float dstvx, float dstvy, float v){
dstvx /= Time.delta();
dstvy /= Time.delta();
float tx = dstx - srcx,
@@ -35,10 +35,10 @@ public class Predict{
float c = tx * tx + ty * ty;
// Solve quadratic
- Vector2 ts = quad(a, b, c);
+ Vec2 ts = quad(a, b, c);
// Find smallest positive solution
- Vector2 sol = vresult.set(dstx, dsty);
+ Vec2 sol = vresult.set(dstx, dsty);
if(ts != null){
float t0 = ts.x, t1 = ts.y;
float t = Math.min(t0, t1);
@@ -54,12 +54,12 @@ public class Predict{
/**
* See {@link #intercept(float, float, float, float, float, float, float)}.
*/
- public static Vector2 intercept(TargetTrait src, TargetTrait dst, float v){
+ public static Vec2 intercept(TargetTrait src, TargetTrait dst, float v){
return intercept(src.getX(), src.getY(), dst.getX(), dst.getY(), dst.getTargetVelocityX() - src.getTargetVelocityX()/2f, dst.getTargetVelocityY() - src.getTargetVelocityY()/2f, v);
}
- private static Vector2 quad(float a, float b, float c){
- Vector2 sol = null;
+ private static Vec2 quad(float a, float b, float c){
+ Vec2 sol = null;
if(Math.abs(a) < 1e-6){
if(Math.abs(b) < 1e-6){
sol = Math.abs(c) < 1e-6 ? vec.set(0, 0) : null;
diff --git a/core/src/io/anuke/mindustry/entities/TargetPriority.java b/core/src/mindustry/entities/TargetPriority.java
similarity index 58%
rename from core/src/io/anuke/mindustry/entities/TargetPriority.java
rename to core/src/mindustry/entities/TargetPriority.java
index 47b0213de3..ec36b03925 100644
--- a/core/src/io/anuke/mindustry/entities/TargetPriority.java
+++ b/core/src/mindustry/entities/TargetPriority.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities;
+package mindustry.entities;
public enum TargetPriority{
base,
diff --git a/core/src/io/anuke/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java
similarity index 94%
rename from core/src/io/anuke/mindustry/entities/Units.java
rename to core/src/mindustry/entities/Units.java
index df4ba980df..94a0cfbd12 100644
--- a/core/src/io/anuke/mindustry/entities/Units.java
+++ b/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 io.anuke.arc.func.Cons;
-import io.anuke.arc.func.Boolf;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.Geometry;
-import io.anuke.arc.math.geom.Rectangle;
-import io.anuke.mindustry.entities.traits.TargetTrait;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.world.Tile;
+import arc.struct.EnumSet;
+import arc.func.Cons;
+import arc.func.Boolf;
+import arc.math.Mathf;
+import arc.math.geom.Geometry;
+import arc.math.geom.Rectangle;
+import mindustry.entities.traits.TargetTrait;
+import mindustry.entities.type.*;
+import mindustry.game.Team;
+import mindustry.world.Tile;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
/** Utility class for unit and team interactions.*/
public class Units{
diff --git a/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java b/core/src/mindustry/entities/bullet/ArtilleryBulletType.java
similarity index 77%
rename from core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java
rename to core/src/mindustry/entities/bullet/ArtilleryBulletType.java
index 1bc00443c6..3a098e8765 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java
+++ b/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 io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.Effects.*;
-import io.anuke.mindustry.entities.type.Bullet;
-import io.anuke.mindustry.gen.*;
+import arc.graphics.g2d.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.Effects.*;
+import mindustry.entities.type.Bullet;
+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)){
diff --git a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java b/core/src/mindustry/entities/bullet/BasicBulletType.java
similarity index 81%
rename from core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java
rename to core/src/mindustry/entities/bullet/BasicBulletType.java
index bf20c811ab..44588dedf4 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java
+++ b/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 io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.mindustry.entities.type.Bullet;
-import io.anuke.mindustry.graphics.Pal;
+import arc.Core;
+import arc.graphics.Color;
+import arc.graphics.g2d.Draw;
+import arc.graphics.g2d.TextureRegion;
+import mindustry.entities.type.Bullet;
+import mindustry.graphics.Pal;
/** An extended BulletType for most ammo-based bullets shot from turrets and units. */
public class BasicBulletType extends BulletType{
diff --git a/core/src/io/anuke/mindustry/entities/bullet/BombBulletType.java b/core/src/mindustry/entities/bullet/BombBulletType.java
similarity index 87%
rename from core/src/io/anuke/mindustry/entities/bullet/BombBulletType.java
rename to core/src/mindustry/entities/bullet/BombBulletType.java
index 55c0a3b87d..50ff842780 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/BombBulletType.java
+++ b/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{
diff --git a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
similarity index 89%
rename from core/src/io/anuke/mindustry/entities/bullet/BulletType.java
rename to core/src/mindustry/entities/bullet/BulletType.java
index bc401c6d6d..6c5417d0ca 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java
+++ b/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 io.anuke.arc.math.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.ctype.Content;
-import io.anuke.mindustry.ctype.ContentType;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.Effects.*;
-import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import arc.audio.*;
+import arc.math.*;
+import mindustry.content.*;
+import mindustry.ctype.Content;
+import mindustry.ctype.ContentType;
+import mindustry.entities.*;
+import mindustry.entities.Effects.*;
+import mindustry.entities.effect.*;
+import mindustry.entities.traits.*;
+import mindustry.entities.type.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.*;
public abstract class BulletType extends Content{
public float lifetime;
diff --git a/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java b/core/src/mindustry/entities/bullet/FlakBulletType.java
similarity index 82%
rename from core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java
rename to core/src/mindustry/entities/bullet/FlakBulletType.java
index e53be5fcf2..b68e3af59a 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java
+++ b/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 io.anuke.arc.util.Time;
-import io.anuke.mindustry.content.Fx;
-import io.anuke.mindustry.entities.Units;
-import io.anuke.mindustry.entities.type.Bullet;
+import arc.math.geom.Rectangle;
+import arc.util.Time;
+import mindustry.content.Fx;
+import mindustry.entities.Units;
+import mindustry.entities.type.Bullet;
public class FlakBulletType extends BasicBulletType{
protected static Rectangle rect = new Rectangle();
diff --git a/core/src/io/anuke/mindustry/entities/bullet/HealBulletType.java b/core/src/mindustry/entities/bullet/HealBulletType.java
similarity index 78%
rename from core/src/io/anuke/mindustry/entities/bullet/HealBulletType.java
rename to core/src/mindustry/entities/bullet/HealBulletType.java
index 95dbef7b63..4ff0b9fefd 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/HealBulletType.java
+++ b/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 io.anuke.arc.graphics.g2d.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.type.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
public class HealBulletType extends BulletType{
protected float healPercent = 3f;
diff --git a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java b/core/src/mindustry/entities/bullet/LiquidBulletType.java
similarity index 79%
rename from core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java
rename to core/src/mindustry/entities/bullet/LiquidBulletType.java
index 5e84eb662d..a1039e2748 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java
+++ b/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 io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.type.Bullet;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.geom.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.effect.*;
+import mindustry.entities.type.Bullet;
+import mindustry.type.*;
+import mindustry.world.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class LiquidBulletType extends BulletType{
public @NonNull Liquid liquid;
diff --git a/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java b/core/src/mindustry/entities/bullet/MassDriverBolt.java
similarity index 79%
rename from core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java
rename to core/src/mindustry/entities/bullet/MassDriverBolt.java
index fe357b7f5f..8fbe5c77db 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java
+++ b/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 io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.math.Angles;
-import io.anuke.arc.math.Mathf;
-import io.anuke.mindustry.content.Fx;
-import io.anuke.mindustry.entities.Effects;
-import io.anuke.mindustry.entities.type.Bullet;
-import io.anuke.mindustry.graphics.Pal;
-import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData;
+import arc.graphics.Color;
+import arc.graphics.g2d.Draw;
+import arc.math.Angles;
+import arc.math.Mathf;
+import mindustry.content.Fx;
+import mindustry.entities.Effects;
+import mindustry.entities.type.Bullet;
+import mindustry.graphics.Pal;
+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;
diff --git a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java b/core/src/mindustry/entities/bullet/MissileBulletType.java
similarity index 72%
rename from core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java
rename to core/src/mindustry/entities/bullet/MissileBulletType.java
index 6bea5404cb..3c730d975a 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java
+++ b/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 io.anuke.arc.math.Mathf;
-import io.anuke.arc.util.Time;
-import io.anuke.mindustry.content.Fx;
-import io.anuke.mindustry.entities.Effects;
-import io.anuke.mindustry.entities.type.Bullet;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.Pal;
+import arc.graphics.Color;
+import arc.math.Mathf;
+import arc.util.Time;
+import mindustry.content.Fx;
+import mindustry.entities.Effects;
+import mindustry.entities.type.Bullet;
+import mindustry.gen.*;
+import mindustry.graphics.Pal;
public class MissileBulletType extends BasicBulletType{
protected Color trailColor = Pal.missileYellowBack;
diff --git a/core/src/io/anuke/mindustry/entities/effect/Decal.java b/core/src/mindustry/entities/effect/Decal.java
similarity index 55%
rename from core/src/io/anuke/mindustry/entities/effect/Decal.java
rename to core/src/mindustry/entities/effect/Decal.java
index 103bc14919..cbe0e8edb2 100644
--- a/core/src/io/anuke/mindustry/entities/effect/Decal.java
+++ b/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 io.anuke.arc.math.Mathf;
-import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.type.TimedEntity;
-import io.anuke.mindustry.entities.traits.BelowLiquidTrait;
-import io.anuke.mindustry.entities.traits.DrawTrait;
-import io.anuke.mindustry.graphics.Pal;
+import arc.graphics.g2d.Draw;
+import arc.math.Mathf;
+import mindustry.entities.EntityGroup;
+import mindustry.entities.type.TimedEntity;
+import mindustry.entities.traits.BelowLiquidTrait;
+import mindustry.entities.traits.DrawTrait;
+import mindustry.graphics.Pal;
-import static io.anuke.mindustry.Vars.groundEffectGroup;
+import static mindustry.Vars.groundEffectGroup;
/**
* Class for creating block rubble on the ground.
diff --git a/core/src/io/anuke/mindustry/entities/effect/Fire.java b/core/src/mindustry/entities/effect/Fire.java
similarity index 90%
rename from core/src/io/anuke/mindustry/entities/effect/Fire.java
rename to core/src/mindustry/entities/effect/Fire.java
index 8546ec45e8..a3e15873fa 100644
--- a/core/src/io/anuke/mindustry/entities/effect/Fire.java
+++ b/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 io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import arc.*;
+import mindustry.annotations.Annotations.*;
+import arc.struct.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.traits.*;
+import mindustry.entities.type.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+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 map = new IntMap<>();
diff --git a/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java b/core/src/mindustry/entities/effect/GroundEffectEntity.java
similarity index 85%
rename from core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java
rename to core/src/mindustry/entities/effect/GroundEffectEntity.java
index 4dfd0a694e..644757512c 100644
--- a/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java
+++ b/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 io.anuke.arc.util.Time;
-import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.entities.Effects;
-import io.anuke.mindustry.entities.Effects.Effect;
-import io.anuke.mindustry.entities.Effects.EffectRenderer;
-import io.anuke.mindustry.entities.type.EffectEntity;
-import io.anuke.mindustry.world.Tile;
+import arc.math.Mathf;
+import arc.util.Time;
+import mindustry.Vars;
+import mindustry.entities.Effects;
+import mindustry.entities.Effects.Effect;
+import mindustry.entities.Effects.EffectRenderer;
+import mindustry.entities.type.EffectEntity;
+import mindustry.world.Tile;
/**
* A ground effect contains an effect that is rendered on the ground layer as opposed to the top layer.
diff --git a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java b/core/src/mindustry/entities/effect/ItemTransfer.java
similarity index 74%
rename from core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java
rename to core/src/mindustry/entities/effect/ItemTransfer.java
index 0d8ab641ff..ea8366c812 100644
--- a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java
+++ b/core/src/mindustry/entities/effect/ItemTransfer.java
@@ -1,28 +1,28 @@
-package io.anuke.mindustry.entities.effect;
+package mindustry.entities.effect;
-import io.anuke.annotations.Annotations.Loc;
-import io.anuke.annotations.Annotations.Remote;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.Interpolation;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.Position;
-import io.anuke.arc.math.geom.Vector2;
-import io.anuke.arc.util.Time;
-import io.anuke.arc.util.pooling.Pools;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.type.TimedEntity;
-import io.anuke.mindustry.entities.traits.DrawTrait;
-import io.anuke.mindustry.entities.type.Unit;
-import io.anuke.mindustry.graphics.Pal;
-import io.anuke.mindustry.type.Item;
-import io.anuke.mindustry.world.Tile;
+import mindustry.annotations.Annotations.Loc;
+import mindustry.annotations.Annotations.Remote;
+import arc.graphics.g2d.*;
+import arc.math.Interpolation;
+import arc.math.Mathf;
+import arc.math.geom.Position;
+import arc.math.geom.Vec2;
+import arc.util.Time;
+import arc.util.pooling.Pools;
+import mindustry.entities.*;
+import mindustry.entities.type.TimedEntity;
+import mindustry.entities.traits.DrawTrait;
+import mindustry.entities.type.Unit;
+import mindustry.graphics.Pal;
+import mindustry.type.Item;
+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();
- private Vector2 current = new Vector2();
- private Vector2 tovec = new Vector2();
+ private Vec2 from = new Vec2();
+ private Vec2 current = new Vec2();
+ private Vec2 tovec = new Vec2();
private Item item;
private float seed;
private Position to;
diff --git a/core/src/io/anuke/mindustry/entities/effect/Lightning.java b/core/src/mindustry/entities/effect/Lightning.java
similarity index 78%
rename from core/src/io/anuke/mindustry/entities/effect/Lightning.java
rename to core/src/mindustry/entities/effect/Lightning.java
index 8d28f33d65..1e88c29df2 100644
--- a/core/src/io/anuke/mindustry/entities/effect/Lightning.java
+++ b/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 io.anuke.annotations.Annotations.Remote;
-import io.anuke.arc.collection.Array;
-import io.anuke.arc.collection.IntSet;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.pooling.Pools;
-import io.anuke.mindustry.content.Bullets;
-import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.Units;
-import io.anuke.mindustry.entities.type.Bullet;
-import io.anuke.mindustry.entities.type.TimedEntity;
-import io.anuke.mindustry.entities.traits.DrawTrait;
-import io.anuke.mindustry.entities.traits.TimeTrait;
-import io.anuke.mindustry.entities.type.Unit;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.gen.Call;
-import io.anuke.mindustry.graphics.Pal;
-import io.anuke.mindustry.world.Tile;
+import mindustry.annotations.Annotations.Loc;
+import mindustry.annotations.Annotations.Remote;
+import arc.struct.Array;
+import arc.struct.IntSet;
+import arc.graphics.Color;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.pooling.Pools;
+import mindustry.content.Bullets;
+import mindustry.entities.EntityGroup;
+import mindustry.entities.Units;
+import mindustry.entities.type.Bullet;
+import mindustry.entities.type.TimedEntity;
+import mindustry.entities.traits.DrawTrait;
+import mindustry.entities.traits.TimeTrait;
+import mindustry.entities.type.Unit;
+import mindustry.game.Team;
+import mindustry.gen.Call;
+import mindustry.graphics.Pal;
+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;
@@ -35,7 +35,7 @@ public class Lightning extends TimedEntity implements DrawTrait, TimeTrait{
private static final float hitRange = 30f;
private static int lastSeed = 0;
- private Array lines = new Array<>();
+ private Array lines = new Array<>();
private Color color = Pal.lancerLaser;
/** For pooling use only. Do not call directly! */
@@ -70,7 +70,7 @@ public class Lightning extends TimedEntity implements DrawTrait, TimeTrait{
for(int i = 0; i < length / 2; i++){
Bullet.create(Bullets.damageLightning, l, team, x, y, 0f, 1f, 1f, dmg);
- l.lines.add(new Vector2(x + Mathf.range(3f), y + Mathf.range(3f)));
+ l.lines.add(new Vec2(x + Mathf.range(3f), y + Mathf.range(3f)));
if(l.lines.size > 1){
bhit[0] = false;
diff --git a/core/src/io/anuke/mindustry/entities/effect/Puddle.java b/core/src/mindustry/entities/effect/Puddle.java
similarity index 93%
rename from core/src/io/anuke/mindustry/entities/effect/Puddle.java
rename to core/src/mindustry/entities/effect/Puddle.java
index e53e40e8dc..e2d5d2e10c 100644
--- a/core/src/io/anuke/mindustry/entities/effect/Puddle.java
+++ b/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 io.anuke.arc.collection.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.pooling.Pool.*;
-import io.anuke.arc.util.pooling.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import mindustry.annotations.Annotations.*;
+import arc.struct.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import arc.util.pooling.Pool.*;
+import arc.util.pooling.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.traits.*;
+import mindustry.entities.type.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+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 map = new IntMap<>();
diff --git a/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java b/core/src/mindustry/entities/effect/RubbleDecal.java
similarity index 77%
rename from core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java
rename to core/src/mindustry/entities/effect/RubbleDecal.java
index 222d1355e4..1d26980dc0 100644
--- a/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java
+++ b/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 io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.math.Mathf;
+import arc.Core;
+import arc.graphics.g2d.Draw;
+import arc.graphics.g2d.TextureRegion;
+import arc.math.Mathf;
-import static io.anuke.mindustry.Vars.headless;
+import static mindustry.Vars.headless;
public class RubbleDecal extends Decal{
private TextureRegion region;
diff --git a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java b/core/src/mindustry/entities/effect/ScorchDecal.java
similarity index 78%
rename from core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java
rename to core/src/mindustry/entities/effect/ScorchDecal.java
index 89f4eacf6f..e35cf7a7c0 100644
--- a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java
+++ b/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 io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.math.Angles;
-import io.anuke.arc.math.Mathf;
-import io.anuke.mindustry.world.Tile;
+import arc.Core;
+import arc.graphics.g2d.Draw;
+import arc.graphics.g2d.TextureRegion;
+import arc.math.Angles;
+import arc.math.Mathf;
+import mindustry.world.Tile;
-import static io.anuke.mindustry.Vars.headless;
-import static io.anuke.mindustry.Vars.world;
+import static mindustry.Vars.headless;
+import static mindustry.Vars.world;
public class ScorchDecal extends Decal{
private static final int scorches = 5;
diff --git a/core/src/io/anuke/mindustry/entities/traits/AbsorbTrait.java b/core/src/mindustry/entities/traits/AbsorbTrait.java
similarity index 83%
rename from core/src/io/anuke/mindustry/entities/traits/AbsorbTrait.java
rename to core/src/mindustry/entities/traits/AbsorbTrait.java
index d408296c7c..2dd31c487e 100644
--- a/core/src/io/anuke/mindustry/entities/traits/AbsorbTrait.java
+++ b/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();
diff --git a/core/src/io/anuke/mindustry/entities/traits/BelowLiquidTrait.java b/core/src/mindustry/entities/traits/BelowLiquidTrait.java
similarity index 72%
rename from core/src/io/anuke/mindustry/entities/traits/BelowLiquidTrait.java
rename to core/src/mindustry/entities/traits/BelowLiquidTrait.java
index c4abd8abf0..e5d54a5f58 100644
--- a/core/src/io/anuke/mindustry/entities/traits/BelowLiquidTrait.java
+++ b/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.
diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderMinerTrait.java b/core/src/mindustry/entities/traits/BuilderMinerTrait.java
similarity index 91%
rename from core/src/io/anuke/mindustry/entities/traits/BuilderMinerTrait.java
rename to core/src/mindustry/entities/traits/BuilderMinerTrait.java
index 5fbde29251..dff842212c 100644
--- a/core/src/io/anuke/mindustry/entities/traits/BuilderMinerTrait.java
+++ b/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{
diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/mindustry/entities/traits/BuilderTrait.java
similarity index 93%
rename from core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
rename to core/src/mindustry/entities/traits/BuilderTrait.java
index c7ced76ec8..2f302be8e6 100644
--- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
+++ b/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 io.anuke.arc.collection.Queue;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
-import io.anuke.mindustry.world.blocks.BuildBlock.*;
+import arc.*;
+import arc.struct.Queue;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.ArcAnnotate.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.entities.type.*;
+import mindustry.game.EventType.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.BuildBlock.*;
import java.io.*;
import java.util.*;
-import static io.anuke.mindustry.Vars.*;
-import static io.anuke.mindustry.entities.traits.BuilderTrait.BuildDataStatic.*;
+import static mindustry.Vars.*;
+import static mindustry.entities.traits.BuilderTrait.BuildDataStatic.*;
/** Interface for units that build things.*/
public interface BuilderTrait extends Entity, TeamTrait{
@@ -229,7 +229,7 @@ public interface BuilderTrait extends Entity, TeamTrait{
//due to iOS weirdness, this is apparently required
class BuildDataStatic{
- static Vector2[] tmptr = new Vector2[]{new Vector2(), new Vector2(), new Vector2(), new Vector2()};
+ static Vec2[] tmptr = new Vec2[]{new Vec2(), new Vec2(), new Vec2(), new Vec2()};
}
/** Draw placement effects for an entity. */
diff --git a/core/src/io/anuke/mindustry/entities/traits/DamageTrait.java b/core/src/mindustry/entities/traits/DamageTrait.java
similarity index 53%
rename from core/src/io/anuke/mindustry/entities/traits/DamageTrait.java
rename to core/src/mindustry/entities/traits/DamageTrait.java
index fdb41472e8..13feb85e6e 100644
--- a/core/src/io/anuke/mindustry/entities/traits/DamageTrait.java
+++ b/core/src/mindustry/entities/traits/DamageTrait.java
@@ -1,6 +1,4 @@
-package io.anuke.mindustry.entities.traits;
-
-import io.anuke.mindustry.entities.type.*;
+package mindustry.entities.traits;
public interface DamageTrait{
float damage();
diff --git a/core/src/io/anuke/mindustry/entities/traits/DrawTrait.java b/core/src/mindustry/entities/traits/DrawTrait.java
similarity index 73%
rename from core/src/io/anuke/mindustry/entities/traits/DrawTrait.java
rename to core/src/mindustry/entities/traits/DrawTrait.java
index 648d9797b3..472b582c75 100644
--- a/core/src/io/anuke/mindustry/entities/traits/DrawTrait.java
+++ b/core/src/mindustry/entities/traits/DrawTrait.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
public interface DrawTrait extends Entity{
diff --git a/core/src/io/anuke/mindustry/entities/traits/Entity.java b/core/src/mindustry/entities/traits/Entity.java
similarity index 87%
rename from core/src/io/anuke/mindustry/entities/traits/Entity.java
rename to core/src/mindustry/entities/traits/Entity.java
index 2de8e0e013..5b0416b69f 100644
--- a/core/src/io/anuke/mindustry/entities/traits/Entity.java
+++ b/core/src/mindustry/entities/traits/Entity.java
@@ -1,6 +1,6 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
-import io.anuke.mindustry.entities.EntityGroup;
+import mindustry.entities.EntityGroup;
public interface Entity extends MoveTrait{
diff --git a/core/src/io/anuke/mindustry/entities/traits/HealthTrait.java b/core/src/mindustry/entities/traits/HealthTrait.java
similarity index 92%
rename from core/src/io/anuke/mindustry/entities/traits/HealthTrait.java
rename to core/src/mindustry/entities/traits/HealthTrait.java
index 644e099e75..fb241e0d1b 100644
--- a/core/src/io/anuke/mindustry/entities/traits/HealthTrait.java
+++ b/core/src/mindustry/entities/traits/HealthTrait.java
@@ -1,6 +1,6 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
-import io.anuke.arc.math.Mathf;
+import arc.math.Mathf;
public interface HealthTrait{
diff --git a/core/src/io/anuke/mindustry/entities/traits/KillerTrait.java b/core/src/mindustry/entities/traits/KillerTrait.java
similarity index 59%
rename from core/src/io/anuke/mindustry/entities/traits/KillerTrait.java
rename to core/src/mindustry/entities/traits/KillerTrait.java
index 17efa31c40..7be5f42882 100644
--- a/core/src/io/anuke/mindustry/entities/traits/KillerTrait.java
+++ b/core/src/mindustry/entities/traits/KillerTrait.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
public interface KillerTrait{
void killed(Entity other);
diff --git a/core/src/io/anuke/mindustry/entities/traits/MinerTrait.java b/core/src/mindustry/entities/traits/MinerTrait.java
similarity index 86%
rename from core/src/io/anuke/mindustry/entities/traits/MinerTrait.java
rename to core/src/mindustry/entities/traits/MinerTrait.java
index a312740804..4881d3720a 100644
--- a/core/src/io/anuke/mindustry/entities/traits/MinerTrait.java
+++ b/core/src/mindustry/entities/traits/MinerTrait.java
@@ -1,19 +1,19 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
-import io.anuke.arc.Core;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.util.Time;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.Effects;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.gen.Call;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.type.Item;
-import io.anuke.mindustry.world.Tile;
+import arc.Core;
+import arc.graphics.Color;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.Time;
+import mindustry.content.*;
+import mindustry.entities.Effects;
+import mindustry.entities.type.*;
+import mindustry.gen.Call;
+import mindustry.graphics.*;
+import mindustry.type.Item;
+import mindustry.world.Tile;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public interface MinerTrait extends Entity{
diff --git a/core/src/io/anuke/mindustry/entities/traits/MoveTrait.java b/core/src/mindustry/entities/traits/MoveTrait.java
similarity index 77%
rename from core/src/io/anuke/mindustry/entities/traits/MoveTrait.java
rename to core/src/mindustry/entities/traits/MoveTrait.java
index 561c7a76bd..f34abba24f 100644
--- a/core/src/io/anuke/mindustry/entities/traits/MoveTrait.java
+++ b/core/src/mindustry/entities/traits/MoveTrait.java
@@ -1,6 +1,6 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
-import io.anuke.arc.math.geom.Position;
+import arc.math.geom.Position;
public interface MoveTrait extends Position{
diff --git a/core/src/io/anuke/mindustry/entities/traits/SaveTrait.java b/core/src/mindustry/entities/traits/SaveTrait.java
similarity index 78%
rename from core/src/io/anuke/mindustry/entities/traits/SaveTrait.java
rename to core/src/mindustry/entities/traits/SaveTrait.java
index 44ff7aa9b0..26e923bda1 100644
--- a/core/src/io/anuke/mindustry/entities/traits/SaveTrait.java
+++ b/core/src/mindustry/entities/traits/SaveTrait.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
/** Marks an entity as serializable. */
public interface SaveTrait extends Entity, TypeTrait, Saveable{
diff --git a/core/src/io/anuke/mindustry/entities/traits/Saveable.java b/core/src/mindustry/entities/traits/Saveable.java
similarity index 84%
rename from core/src/io/anuke/mindustry/entities/traits/Saveable.java
rename to core/src/mindustry/entities/traits/Saveable.java
index 488c3c41ae..cdbcf07663 100644
--- a/core/src/io/anuke/mindustry/entities/traits/Saveable.java
+++ b/core/src/mindustry/entities/traits/Saveable.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
import java.io.*;
diff --git a/core/src/io/anuke/mindustry/entities/traits/ScaleTrait.java b/core/src/mindustry/entities/traits/ScaleTrait.java
similarity index 90%
rename from core/src/io/anuke/mindustry/entities/traits/ScaleTrait.java
rename to core/src/mindustry/entities/traits/ScaleTrait.java
index 9975bb12a8..2a572659b2 100644
--- a/core/src/io/anuke/mindustry/entities/traits/ScaleTrait.java
+++ b/core/src/mindustry/entities/traits/ScaleTrait.java
@@ -1,6 +1,6 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
-import io.anuke.arc.math.Interpolation;
+import arc.math.Interpolation;
public interface ScaleTrait{
/** 0 to 1. */
diff --git a/core/src/io/anuke/mindustry/entities/traits/ShooterTrait.java b/core/src/mindustry/entities/traits/ShooterTrait.java
similarity index 57%
rename from core/src/io/anuke/mindustry/entities/traits/ShooterTrait.java
rename to core/src/mindustry/entities/traits/ShooterTrait.java
index ca3010eec3..bb20ccc83c 100644
--- a/core/src/io/anuke/mindustry/entities/traits/ShooterTrait.java
+++ b/core/src/mindustry/entities/traits/ShooterTrait.java
@@ -1,7 +1,7 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
-import io.anuke.arc.util.Interval;
-import io.anuke.mindustry.type.Weapon;
+import arc.util.Interval;
+import mindustry.type.Weapon;
public interface ShooterTrait extends VelocityTrait, TeamTrait{
diff --git a/core/src/io/anuke/mindustry/entities/traits/SolidTrait.java b/core/src/mindustry/entities/traits/SolidTrait.java
similarity index 77%
rename from core/src/io/anuke/mindustry/entities/traits/SolidTrait.java
rename to core/src/mindustry/entities/traits/SolidTrait.java
index 5ebf8105f3..f799f13cba 100644
--- a/core/src/io/anuke/mindustry/entities/traits/SolidTrait.java
+++ b/core/src/mindustry/entities/traits/SolidTrait.java
@@ -1,9 +1,9 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.math.geom.QuadTree.QuadTreeObject;
-import io.anuke.mindustry.Vars;
+import arc.math.geom.*;
+import arc.math.geom.QuadTree.QuadTreeObject;
+import mindustry.Vars;
public interface SolidTrait extends QuadTreeObject, MoveTrait, VelocityTrait, Entity, Position{
@@ -11,7 +11,7 @@ public interface SolidTrait extends QuadTreeObject, MoveTrait, VelocityTrait, En
void hitboxTile(Rectangle rectangle);
- Vector2 lastPosition();
+ Vec2 lastPosition();
default boolean collidesGrid(int x, int y){
return true;
diff --git a/core/src/io/anuke/mindustry/entities/traits/SpawnerTrait.java b/core/src/mindustry/entities/traits/SpawnerTrait.java
similarity index 61%
rename from core/src/io/anuke/mindustry/entities/traits/SpawnerTrait.java
rename to core/src/mindustry/entities/traits/SpawnerTrait.java
index c890d4cbfc..3eeee072e5 100644
--- a/core/src/io/anuke/mindustry/entities/traits/SpawnerTrait.java
+++ b/core/src/mindustry/entities/traits/SpawnerTrait.java
@@ -1,8 +1,8 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
-import io.anuke.arc.math.geom.Position;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.world.Tile;
+import arc.math.geom.Position;
+import mindustry.entities.type.*;
+import mindustry.world.Tile;
public interface SpawnerTrait extends TargetTrait, Position{
Tile getTile();
diff --git a/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java b/core/src/mindustry/entities/traits/SyncTrait.java
similarity index 93%
rename from core/src/io/anuke/mindustry/entities/traits/SyncTrait.java
rename to core/src/mindustry/entities/traits/SyncTrait.java
index 7a25c9c1ed..29da740bc0 100644
--- a/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java
+++ b/core/src/mindustry/entities/traits/SyncTrait.java
@@ -1,6 +1,6 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
-import io.anuke.mindustry.net.Interpolator;
+import mindustry.net.Interpolator;
import java.io.*;
diff --git a/core/src/io/anuke/mindustry/entities/traits/TargetTrait.java b/core/src/mindustry/entities/traits/TargetTrait.java
similarity index 84%
rename from core/src/io/anuke/mindustry/entities/traits/TargetTrait.java
rename to core/src/mindustry/entities/traits/TargetTrait.java
index 819e9dbcdc..1544b8d057 100644
--- a/core/src/io/anuke/mindustry/entities/traits/TargetTrait.java
+++ b/core/src/mindustry/entities/traits/TargetTrait.java
@@ -1,7 +1,7 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
-import io.anuke.arc.math.geom.Position;
-import io.anuke.mindustry.game.Team;
+import arc.math.geom.Position;
+import mindustry.game.Team;
/**
* Base interface for targetable entities.
diff --git a/core/src/mindustry/entities/traits/TeamTrait.java b/core/src/mindustry/entities/traits/TeamTrait.java
new file mode 100644
index 0000000000..f4424149af
--- /dev/null
+++ b/core/src/mindustry/entities/traits/TeamTrait.java
@@ -0,0 +1,7 @@
+package mindustry.entities.traits;
+
+import mindustry.game.Team;
+
+public interface TeamTrait extends Entity{
+ Team getTeam();
+}
diff --git a/core/src/io/anuke/mindustry/entities/traits/TimeTrait.java b/core/src/mindustry/entities/traits/TimeTrait.java
similarity index 77%
rename from core/src/io/anuke/mindustry/entities/traits/TimeTrait.java
rename to core/src/mindustry/entities/traits/TimeTrait.java
index 47dc7dfe48..cf89d7dca8 100644
--- a/core/src/io/anuke/mindustry/entities/traits/TimeTrait.java
+++ b/core/src/mindustry/entities/traits/TimeTrait.java
@@ -1,7 +1,7 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.util.Time;
+import arc.math.Mathf;
+import arc.util.Time;
public interface TimeTrait extends ScaleTrait, Entity{
diff --git a/core/src/io/anuke/mindustry/entities/traits/TypeTrait.java b/core/src/mindustry/entities/traits/TypeTrait.java
similarity index 94%
rename from core/src/io/anuke/mindustry/entities/traits/TypeTrait.java
rename to core/src/mindustry/entities/traits/TypeTrait.java
index deddefe7ed..00917194fc 100644
--- a/core/src/io/anuke/mindustry/entities/traits/TypeTrait.java
+++ b/core/src/mindustry/entities/traits/TypeTrait.java
@@ -1,6 +1,6 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
-import io.anuke.mindustry.type.TypeID;
+import mindustry.type.TypeID;
public interface TypeTrait{
diff --git a/core/src/io/anuke/mindustry/entities/traits/VelocityTrait.java b/core/src/mindustry/entities/traits/VelocityTrait.java
similarity index 83%
rename from core/src/io/anuke/mindustry/entities/traits/VelocityTrait.java
rename to core/src/mindustry/entities/traits/VelocityTrait.java
index e5bddaed43..6eb42254d7 100644
--- a/core/src/io/anuke/mindustry/entities/traits/VelocityTrait.java
+++ b/core/src/mindustry/entities/traits/VelocityTrait.java
@@ -1,11 +1,11 @@
-package io.anuke.mindustry.entities.traits;
+package mindustry.entities.traits;
-import io.anuke.arc.math.geom.Vector2;
-import io.anuke.arc.util.Time;
+import arc.math.geom.Vec2;
+import arc.util.Time;
public interface VelocityTrait extends MoveTrait{
- Vector2 velocity();
+ Vec2 velocity();
default void applyImpulse(float x, float y){
velocity().x += x / mass();
diff --git a/core/src/io/anuke/mindustry/entities/type/BaseEntity.java b/core/src/mindustry/entities/type/BaseEntity.java
similarity index 87%
rename from core/src/io/anuke/mindustry/entities/type/BaseEntity.java
rename to core/src/mindustry/entities/type/BaseEntity.java
index 97de965cfe..6aa4f0f8b7 100755
--- a/core/src/io/anuke/mindustry/entities/type/BaseEntity.java
+++ b/core/src/mindustry/entities/type/BaseEntity.java
@@ -1,8 +1,8 @@
-package io.anuke.mindustry.entities.type;
+package mindustry.entities.type;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.traits.Entity;
+import mindustry.*;
+import mindustry.entities.EntityGroup;
+import mindustry.entities.traits.Entity;
public abstract class BaseEntity implements Entity{
private static int lastid;
diff --git a/core/src/io/anuke/mindustry/entities/type/BaseUnit.java b/core/src/mindustry/entities/type/BaseUnit.java
similarity index 90%
rename from core/src/io/anuke/mindustry/entities/type/BaseUnit.java
rename to core/src/mindustry/entities/type/BaseUnit.java
index 6dfa7baa84..46e2f8f63b 100644
--- a/core/src/io/anuke/mindustry/entities/type/BaseUnit.java
+++ b/core/src/mindustry/entities/type/BaseUnit.java
@@ -1,34 +1,34 @@
-package io.anuke.mindustry.entities.type;
+package mindustry.entities.type;
-import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.ctype.ContentType;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.units.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.type.TypeID;
-import io.anuke.mindustry.ui.Cicon;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
-import io.anuke.mindustry.world.blocks.defense.DeflectorWall.*;
-import io.anuke.mindustry.world.blocks.units.CommandCenter.*;
-import io.anuke.mindustry.world.blocks.units.UnitFactory.*;
-import io.anuke.mindustry.world.meta.*;
+import arc.*;
+import mindustry.annotations.Annotations.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.ctype.ContentType;
+import mindustry.entities.*;
+import mindustry.entities.traits.*;
+import mindustry.entities.units.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.type.TypeID;
+import mindustry.ui.Cicon;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.defense.DeflectorWall.*;
+import mindustry.world.blocks.units.CommandCenter.*;
+import mindustry.world.blocks.units.UnitFactory.*;
+import mindustry.world.meta.*;
import java.io.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
/** Base class for AI units. */
public abstract class BaseUnit extends Unit implements ShooterTrait{
diff --git a/core/src/io/anuke/mindustry/entities/type/Bullet.java b/core/src/mindustry/entities/type/Bullet.java
similarity index 92%
rename from core/src/io/anuke/mindustry/entities/type/Bullet.java
rename to core/src/mindustry/entities/type/Bullet.java
index abf7952aeb..6afafb5f29 100644
--- a/core/src/io/anuke/mindustry/entities/type/Bullet.java
+++ b/core/src/mindustry/entities/type/Bullet.java
@@ -1,20 +1,20 @@
-package io.anuke.mindustry.entities.type;
+package mindustry.entities.type;
-import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.pooling.Pool.*;
-import io.anuke.arc.util.pooling.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.bullet.*;
-import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.world.*;
+import mindustry.annotations.Annotations.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import arc.util.pooling.Pool.*;
+import arc.util.pooling.*;
+import mindustry.entities.*;
+import mindustry.entities.bullet.*;
+import mindustry.entities.effect.*;
+import mindustry.entities.traits.*;
+import mindustry.game.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Poolable, DrawTrait, VelocityTrait, TimeTrait, TeamTrait, AbsorbTrait{
public Interval timer = new Interval(3);
@@ -56,7 +56,7 @@ public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Pool
bullet.velocity.set(0, type.speed).setAngle(angle).scl(velocityScl);
if(type.keepVelocity){
- bullet.velocity.add(owner instanceof VelocityTrait ? ((VelocityTrait)owner).velocity() : Vector2.ZERO);
+ bullet.velocity.add(owner instanceof VelocityTrait ? ((VelocityTrait)owner).velocity() : Vec2.ZERO);
}
bullet.team = team;
@@ -297,7 +297,7 @@ public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Pool
}
@Override
- public Vector2 velocity(){
+ public Vec2 velocity(){
return velocity;
}
diff --git a/core/src/io/anuke/mindustry/entities/type/DestructibleEntity.java b/core/src/mindustry/entities/type/DestructibleEntity.java
similarity index 91%
rename from core/src/io/anuke/mindustry/entities/type/DestructibleEntity.java
rename to core/src/mindustry/entities/type/DestructibleEntity.java
index 1db9308eef..99efe3b00c 100644
--- a/core/src/io/anuke/mindustry/entities/type/DestructibleEntity.java
+++ b/core/src/mindustry/entities/type/DestructibleEntity.java
@@ -1,7 +1,7 @@
-package io.anuke.mindustry.entities.type;
+package mindustry.entities.type;
-import io.anuke.mindustry.entities.traits.*;
+import mindustry.entities.traits.*;
public abstract class DestructibleEntity extends SolidEntity implements HealthTrait{
public transient boolean dead;
diff --git a/core/src/io/anuke/mindustry/entities/type/EffectEntity.java b/core/src/mindustry/entities/type/EffectEntity.java
similarity index 76%
rename from core/src/io/anuke/mindustry/entities/type/EffectEntity.java
rename to core/src/mindustry/entities/type/EffectEntity.java
index 33b2f47475..95f40d8100 100644
--- a/core/src/io/anuke/mindustry/entities/type/EffectEntity.java
+++ b/core/src/mindustry/entities/type/EffectEntity.java
@@ -1,15 +1,15 @@
-package io.anuke.mindustry.entities.type;
+package mindustry.entities.type;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.util.pooling.Pool.Poolable;
-import io.anuke.arc.util.pooling.Pools;
-import io.anuke.mindustry.entities.Effects;
-import io.anuke.mindustry.entities.Effects.Effect;
-import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.traits.DrawTrait;
-import io.anuke.mindustry.entities.traits.Entity;
+import arc.graphics.Color;
+import arc.util.pooling.Pool.Poolable;
+import arc.util.pooling.Pools;
+import mindustry.entities.Effects;
+import mindustry.entities.Effects.Effect;
+import mindustry.entities.EntityGroup;
+import mindustry.entities.traits.DrawTrait;
+import mindustry.entities.traits.Entity;
-import static io.anuke.mindustry.Vars.effectGroup;
+import static mindustry.Vars.effectGroup;
public class EffectEntity extends TimedEntity implements Poolable, DrawTrait{
public Effect effect;
diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/mindustry/entities/type/Player.java
similarity index 95%
rename from core/src/io/anuke/mindustry/entities/type/Player.java
rename to core/src/mindustry/entities/type/Player.java
index 45405aad70..a6a74683bb 100644
--- a/core/src/io/anuke/mindustry/entities/type/Player.java
+++ b/core/src/mindustry/entities/type/Player.java
@@ -1,37 +1,37 @@
-package io.anuke.mindustry.entities.type;
+package mindustry.entities.type;
-import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.arc.util.pooling.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.core.*;
-import io.anuke.mindustry.ctype.ContentType;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.input.*;
-import io.anuke.mindustry.io.*;
-import io.anuke.mindustry.net.Administration.*;
-import io.anuke.mindustry.net.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.ui.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import arc.*;
+import mindustry.annotations.Annotations.*;
+import arc.struct.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import arc.util.pooling.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.core.*;
+import mindustry.ctype.ContentType;
+import mindustry.entities.*;
+import mindustry.entities.traits.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.input.*;
+import mindustry.io.*;
+import mindustry.net.Administration.*;
+import mindustry.net.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
import java.io.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
public static final int timerSync = 2;
@@ -71,7 +71,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
private float walktime, itemtime;
private Queue placeQueue = new Queue<>();
private Tile mining;
- private Vector2 movement = new Vector2();
+ private Vec2 movement = new Vec2();
private boolean moved;
//endregion
@@ -598,7 +598,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
movement.y += Mathf.clamp((Core.input.mouseY() - Core.graphics.getHeight() / 2) * 0.005f, -1, 1) * speed;
}
- Vector2 vec = Core.input.mouseWorld(control.input.getMouseX(), control.input.getMouseY());
+ Vec2 vec = Core.input.mouseWorld(control.input.getMouseX(), control.input.getMouseY());
pointerX = vec.x;
pointerY = vec.y;
updateShooting();
@@ -738,7 +738,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
rotation = Mathf.slerpDelta(rotation, angleTo(target), 0.2f);
}
- Vector2 intercept = Predict.intercept(this, target, getWeapon().bullet.speed);
+ Vec2 intercept = Predict.intercept(this, target, getWeapon().bullet.speed);
pointerX = intercept.x;
pointerY = intercept.y;
diff --git a/core/src/mindustry/entities/type/SolidEntity.java b/core/src/mindustry/entities/type/SolidEntity.java
new file mode 100644
index 0000000000..d3d0685f3f
--- /dev/null
+++ b/core/src/mindustry/entities/type/SolidEntity.java
@@ -0,0 +1,19 @@
+package mindustry.entities.type;
+
+import arc.math.geom.Vec2;
+import mindustry.entities.traits.SolidTrait;
+
+public abstract class SolidEntity extends BaseEntity implements SolidTrait{
+ protected transient Vec2 velocity = new Vec2(0f, 0.0001f);
+ private transient Vec2 lastPosition = new Vec2();
+
+ @Override
+ public Vec2 lastPosition(){
+ return lastPosition;
+ }
+
+ @Override
+ public Vec2 velocity(){
+ return velocity;
+ }
+}
diff --git a/core/src/io/anuke/mindustry/entities/type/TileEntity.java b/core/src/mindustry/entities/type/TileEntity.java
similarity index 90%
rename from core/src/io/anuke/mindustry/entities/type/TileEntity.java
rename to core/src/mindustry/entities/type/TileEntity.java
index 8c9617b28b..85c6c9d2eb 100644
--- a/core/src/io/anuke/mindustry/entities/type/TileEntity.java
+++ b/core/src/mindustry/entities/type/TileEntity.java
@@ -1,26 +1,26 @@
-package io.anuke.mindustry.entities.type;
+package mindustry.entities.type;
-import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.Events;
-import io.anuke.arc.collection.Array;
-import io.anuke.arc.collection.ObjectSet;
-import io.anuke.arc.math.geom.Point2;
-import io.anuke.arc.math.geom.Vector2;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.traits.HealthTrait;
-import io.anuke.mindustry.entities.traits.TargetTrait;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.EventType.BlockDestroyEvent;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.consumers.*;
-import io.anuke.mindustry.world.modules.*;
+import mindustry.annotations.Annotations.*;
+import arc.Events;
+import arc.struct.Array;
+import arc.struct.ObjectSet;
+import arc.math.geom.Point2;
+import arc.math.geom.Vec2;
+import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.entities.EntityGroup;
+import mindustry.entities.traits.HealthTrait;
+import mindustry.entities.traits.TargetTrait;
+import mindustry.game.*;
+import mindustry.game.EventType.BlockDestroyEvent;
+import mindustry.gen.*;
+import mindustry.world.*;
+import mindustry.world.consumers.*;
+import mindustry.world.modules.*;
import java.io.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
public static final float timeToSleep = 60f * 4; //4 seconds to fall asleep
@@ -288,8 +288,8 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
}
@Override
- public Vector2 velocity(){
- return Vector2.ZERO;
+ public Vec2 velocity(){
+ return Vec2.ZERO;
}
@Override
diff --git a/core/src/io/anuke/mindustry/entities/type/TimedEntity.java b/core/src/mindustry/entities/type/TimedEntity.java
similarity index 71%
rename from core/src/io/anuke/mindustry/entities/type/TimedEntity.java
rename to core/src/mindustry/entities/type/TimedEntity.java
index dbd74260fe..413b1c3fd5 100644
--- a/core/src/io/anuke/mindustry/entities/type/TimedEntity.java
+++ b/core/src/mindustry/entities/type/TimedEntity.java
@@ -1,8 +1,8 @@
-package io.anuke.mindustry.entities.type;
+package mindustry.entities.type;
-import io.anuke.arc.util.pooling.Pool.Poolable;
-import io.anuke.mindustry.entities.traits.ScaleTrait;
-import io.anuke.mindustry.entities.traits.TimeTrait;
+import arc.util.pooling.Pool.Poolable;
+import mindustry.entities.traits.ScaleTrait;
+import mindustry.entities.traits.TimeTrait;
public abstract class TimedEntity extends BaseEntity implements ScaleTrait, TimeTrait, Poolable{
public float time;
diff --git a/core/src/io/anuke/mindustry/entities/type/Unit.java b/core/src/mindustry/entities/type/Unit.java
similarity index 92%
rename from core/src/io/anuke/mindustry/entities/type/Unit.java
rename to core/src/mindustry/entities/type/Unit.java
index 73dec77656..1bec11c029 100644
--- a/core/src/io/anuke/mindustry/entities/type/Unit.java
+++ b/core/src/mindustry/entities/type/Unit.java
@@ -1,34 +1,34 @@
-package io.anuke.mindustry.entities.type;
+package mindustry.entities.type;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.units.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.Teams.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.net.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.ui.*;
-import io.anuke.mindustry.ui.Cicon;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import arc.*;
+import arc.struct.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.effect.*;
+import mindustry.entities.traits.*;
+import mindustry.entities.units.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.game.Teams.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.net.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.ui.Cicon;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
import java.io.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public abstract class Unit extends DestructibleEntity implements SaveTrait, TargetTrait, SyncTrait, DrawTrait, TeamTrait{
/** Total duration of hit flash effect */
@@ -39,7 +39,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
public static final float maxAbsVelocity = 127f / velocityPercision;
public static final int noSpawner = Pos.get(-1, 1);
- private static final Vector2 moveVector = new Vector2();
+ private static final Vec2 moveVector = new Vec2();
public float rotation;
@@ -118,7 +118,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
}
@Override
- public Vector2 velocity(){
+ public Vec2 velocity(){
return velocity;
}
diff --git a/core/src/io/anuke/mindustry/entities/type/base/BaseDrone.java b/core/src/mindustry/entities/type/base/BaseDrone.java
similarity index 84%
rename from core/src/io/anuke/mindustry/entities/type/base/BaseDrone.java
rename to core/src/mindustry/entities/type/base/BaseDrone.java
index a6a4d0dbfa..a1b5b1c321 100644
--- a/core/src/io/anuke/mindustry/entities/type/base/BaseDrone.java
+++ b/core/src/mindustry/entities/type/base/BaseDrone.java
@@ -1,12 +1,12 @@
-package io.anuke.mindustry.entities.type.base;
+package mindustry.entities.type.base;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.Geometry;
-import io.anuke.mindustry.entities.units.*;
-import io.anuke.mindustry.world.Tile;
-import io.anuke.mindustry.world.meta.BlockFlag;
+import arc.math.Mathf;
+import arc.math.geom.Geometry;
+import mindustry.entities.units.*;
+import mindustry.world.Tile;
+import mindustry.world.meta.BlockFlag;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public abstract class BaseDrone extends FlyingUnit{
public final UnitState retreat = new UnitState(){
diff --git a/core/src/io/anuke/mindustry/entities/type/base/BuilderDrone.java b/core/src/mindustry/entities/type/base/BuilderDrone.java
similarity index 92%
rename from core/src/io/anuke/mindustry/entities/type/base/BuilderDrone.java
rename to core/src/mindustry/entities/type/base/BuilderDrone.java
index fdaaa049dd..f84bdecbca 100644
--- a/core/src/io/anuke/mindustry/entities/type/base/BuilderDrone.java
+++ b/core/src/mindustry/entities/type/base/BuilderDrone.java
@@ -1,23 +1,23 @@
-package io.anuke.mindustry.entities.type.base;
+package mindustry.entities.type.base;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.units.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.Teams.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
-import io.anuke.mindustry.world.blocks.BuildBlock.*;
+import arc.*;
+import arc.struct.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.entities.*;
+import mindustry.entities.traits.*;
+import mindustry.entities.type.*;
+import mindustry.entities.units.*;
+import mindustry.game.EventType.*;
+import mindustry.game.Teams.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.BuildBlock.*;
import java.io.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class BuilderDrone extends BaseDrone implements BuilderTrait{
private static final StaticReset reset = new StaticReset();
diff --git a/core/src/io/anuke/mindustry/entities/type/base/FlyingUnit.java b/core/src/mindustry/entities/type/base/FlyingUnit.java
similarity index 92%
rename from core/src/io/anuke/mindustry/entities/type/base/FlyingUnit.java
rename to core/src/mindustry/entities/type/base/FlyingUnit.java
index 017ebad34f..35473b7a4e 100644
--- a/core/src/io/anuke/mindustry/entities/type/base/FlyingUnit.java
+++ b/core/src/mindustry/entities/type/base/FlyingUnit.java
@@ -1,20 +1,20 @@
-package io.anuke.mindustry.entities.type.base;
+package mindustry.entities.type.base;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.bullet.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.units.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.meta.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.entities.*;
+import mindustry.entities.bullet.*;
+import mindustry.entities.type.*;
+import mindustry.entities.units.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class FlyingUnit extends BaseUnit{
protected float[] weaponAngles = {0,0};
@@ -65,7 +65,7 @@ public class FlyingUnit extends BaseUnit{
getWeapon().update(FlyingUnit.this, wx + Tmp.v2.x, wy + Tmp.v2.y, weaponAngles[wi], left);
}
}else{
- Vector2 to = Predict.intercept(FlyingUnit.this, target, ammo.speed);
+ Vec2 to = Predict.intercept(FlyingUnit.this, target, ammo.speed);
getWeapon().update(FlyingUnit.this, to.x, to.y);
}
}
diff --git a/core/src/io/anuke/mindustry/entities/type/base/GroundUnit.java b/core/src/mindustry/entities/type/base/GroundUnit.java
similarity index 89%
rename from core/src/io/anuke/mindustry/entities/type/base/GroundUnit.java
rename to core/src/mindustry/entities/type/base/GroundUnit.java
index c35c6c1528..5f7c6d2768 100644
--- a/core/src/io/anuke/mindustry/entities/type/base/GroundUnit.java
+++ b/core/src/mindustry/entities/type/base/GroundUnit.java
@@ -1,26 +1,26 @@
-package io.anuke.mindustry.entities.type.base;
+package mindustry.entities.type.base;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.ai.Pathfinder.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.bullet.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.units.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
-import io.anuke.mindustry.world.meta.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.ai.Pathfinder.*;
+import mindustry.entities.*;
+import mindustry.entities.bullet.*;
+import mindustry.entities.type.*;
+import mindustry.entities.units.*;
+import mindustry.game.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.meta.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class GroundUnit extends BaseUnit{
- protected static Vector2 vec = new Vector2();
+ protected static Vec2 vec = new Vec2();
protected float walkTime;
protected float stuckTime;
@@ -175,7 +175,7 @@ public class GroundUnit extends BaseUnit{
if(Angles.near(angleTo(target), rotation, 13f)){
BulletType ammo = getWeapon().bullet;
- Vector2 to = Predict.intercept(GroundUnit.this, target, ammo.speed);
+ Vec2 to = Predict.intercept(GroundUnit.this, target, ammo.speed);
getWeapon().update(GroundUnit.this, to.x, to.y);
}
diff --git a/core/src/io/anuke/mindustry/entities/type/base/HoverUnit.java b/core/src/mindustry/entities/type/base/HoverUnit.java
similarity index 82%
rename from core/src/io/anuke/mindustry/entities/type/base/HoverUnit.java
rename to core/src/mindustry/entities/type/base/HoverUnit.java
index 6aae538484..a1dfd25819 100644
--- a/core/src/io/anuke/mindustry/entities/type/base/HoverUnit.java
+++ b/core/src/mindustry/entities/type/base/HoverUnit.java
@@ -1,9 +1,9 @@
-package io.anuke.mindustry.entities.type.base;
+package mindustry.entities.type.base;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.math.Angles;
-import io.anuke.arc.math.Mathf;
-import io.anuke.mindustry.entities.Units;
+import arc.graphics.g2d.Draw;
+import arc.math.Angles;
+import arc.math.Mathf;
+import mindustry.entities.Units;
public class HoverUnit extends FlyingUnit{
diff --git a/core/src/io/anuke/mindustry/entities/type/base/MinerDrone.java b/core/src/mindustry/entities/type/base/MinerDrone.java
similarity index 88%
rename from core/src/io/anuke/mindustry/entities/type/base/MinerDrone.java
rename to core/src/mindustry/entities/type/base/MinerDrone.java
index 2d90b8a604..5c10983577 100644
--- a/core/src/io/anuke/mindustry/entities/type/base/MinerDrone.java
+++ b/core/src/mindustry/entities/type/base/MinerDrone.java
@@ -1,20 +1,20 @@
-package io.anuke.mindustry.entities.type.base;
+package mindustry.entities.type.base;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.util.Structs;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.entities.traits.MinerTrait;
-import io.anuke.mindustry.entities.type.TileEntity;
-import io.anuke.mindustry.entities.units.UnitState;
-import io.anuke.mindustry.gen.Call;
-import io.anuke.mindustry.type.Item;
-import io.anuke.mindustry.type.ItemType;
-import io.anuke.mindustry.world.Pos;
-import io.anuke.mindustry.world.Tile;
+import arc.math.Mathf;
+import arc.util.Structs;
+import mindustry.content.Blocks;
+import mindustry.entities.traits.MinerTrait;
+import mindustry.entities.type.TileEntity;
+import mindustry.entities.units.UnitState;
+import mindustry.gen.Call;
+import mindustry.type.Item;
+import mindustry.type.ItemType;
+import mindustry.world.Pos;
+import mindustry.world.Tile;
import java.io.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
/** A drone that only mines.*/
public class MinerDrone extends BaseDrone implements MinerTrait{
diff --git a/core/src/io/anuke/mindustry/entities/type/base/RepairDrone.java b/core/src/mindustry/entities/type/base/RepairDrone.java
similarity index 82%
rename from core/src/io/anuke/mindustry/entities/type/base/RepairDrone.java
rename to core/src/mindustry/entities/type/base/RepairDrone.java
index be16cd1724..a796d6eddc 100644
--- a/core/src/io/anuke/mindustry/entities/type/base/RepairDrone.java
+++ b/core/src/mindustry/entities/type/base/RepairDrone.java
@@ -1,15 +1,15 @@
-package io.anuke.mindustry.entities.type.base;
+package mindustry.entities.type.base;
-import io.anuke.mindustry.entities.Units;
-import io.anuke.mindustry.entities.type.TileEntity;
-import io.anuke.mindustry.entities.units.UnitState;
-import io.anuke.mindustry.world.Pos;
-import io.anuke.mindustry.world.Tile;
-import io.anuke.mindustry.world.blocks.*;
+import mindustry.entities.Units;
+import mindustry.entities.type.TileEntity;
+import mindustry.entities.units.UnitState;
+import mindustry.world.Pos;
+import mindustry.world.Tile;
+import mindustry.world.blocks.*;
import java.io.*;
-import static io.anuke.mindustry.Vars.world;
+import static mindustry.Vars.world;
public class RepairDrone extends BaseDrone{
public final UnitState repair = new UnitState(){
diff --git a/core/src/io/anuke/mindustry/entities/units/StateMachine.java b/core/src/mindustry/entities/units/StateMachine.java
similarity index 91%
rename from core/src/io/anuke/mindustry/entities/units/StateMachine.java
rename to core/src/mindustry/entities/units/StateMachine.java
index 7ed555e7b6..18255cec1b 100644
--- a/core/src/io/anuke/mindustry/entities/units/StateMachine.java
+++ b/core/src/mindustry/entities/units/StateMachine.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.units;
+package mindustry.entities.units;
public class StateMachine{
private UnitState state;
diff --git a/core/src/io/anuke/mindustry/entities/units/Statuses.java b/core/src/mindustry/entities/units/Statuses.java
similarity index 90%
rename from core/src/io/anuke/mindustry/entities/units/Statuses.java
rename to core/src/mindustry/entities/units/Statuses.java
index 2d2da40f1f..637bbf1a55 100644
--- a/core/src/io/anuke/mindustry/entities/units/Statuses.java
+++ b/core/src/mindustry/entities/units/Statuses.java
@@ -1,19 +1,19 @@
-package io.anuke.mindustry.entities.units;
+package mindustry.entities.units;
-import io.anuke.arc.collection.Bits;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.pooling.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.ctype.ContentType;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.type.*;
+import arc.struct.Bits;
+import arc.struct.*;
+import arc.graphics.*;
+import arc.util.*;
+import arc.util.pooling.*;
+import mindustry.content.*;
+import mindustry.ctype.ContentType;
+import mindustry.entities.traits.*;
+import mindustry.entities.type.*;
+import mindustry.type.*;
import java.io.*;
-import static io.anuke.mindustry.Vars.content;
+import static mindustry.Vars.content;
/** Class for controlling status effects on an entity. */
public class Statuses implements Saveable{
diff --git a/core/src/io/anuke/mindustry/entities/units/UnitCommand.java b/core/src/mindustry/entities/units/UnitCommand.java
similarity index 81%
rename from core/src/io/anuke/mindustry/entities/units/UnitCommand.java
rename to core/src/mindustry/entities/units/UnitCommand.java
index 654b3b0970..dccc5076f6 100644
--- a/core/src/io/anuke/mindustry/entities/units/UnitCommand.java
+++ b/core/src/mindustry/entities/units/UnitCommand.java
@@ -1,6 +1,6 @@
-package io.anuke.mindustry.entities.units;
+package mindustry.entities.units;
-import io.anuke.arc.*;
+import arc.*;
public enum UnitCommand{
attack, retreat, rally;
diff --git a/core/src/io/anuke/mindustry/entities/units/UnitDrops.java b/core/src/mindustry/entities/units/UnitDrops.java
similarity index 78%
rename from core/src/io/anuke/mindustry/entities/units/UnitDrops.java
rename to core/src/mindustry/entities/units/UnitDrops.java
index 142f2f3d65..b58171ee2f 100644
--- a/core/src/io/anuke/mindustry/entities/units/UnitDrops.java
+++ b/core/src/mindustry/entities/units/UnitDrops.java
@@ -1,12 +1,12 @@
-package io.anuke.mindustry.entities.units;
+package mindustry.entities.units;
-import io.anuke.arc.math.Mathf;
-import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.content.Items;
-import io.anuke.mindustry.entities.type.BaseUnit;
-import io.anuke.mindustry.entities.type.TileEntity;
-import io.anuke.mindustry.gen.Call;
-import io.anuke.mindustry.type.Item;
+import arc.math.Mathf;
+import mindustry.Vars;
+import mindustry.content.Items;
+import mindustry.entities.type.BaseUnit;
+import mindustry.entities.type.TileEntity;
+import mindustry.gen.Call;
+import mindustry.type.Item;
public class UnitDrops{
private static Item[] dropTable;
diff --git a/core/src/io/anuke/mindustry/entities/units/UnitState.java b/core/src/mindustry/entities/units/UnitState.java
similarity index 75%
rename from core/src/io/anuke/mindustry/entities/units/UnitState.java
rename to core/src/mindustry/entities/units/UnitState.java
index 5c5f9c64a8..d64dd49446 100644
--- a/core/src/io/anuke/mindustry/entities/units/UnitState.java
+++ b/core/src/mindustry/entities/units/UnitState.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.units;
+package mindustry.entities.units;
public interface UnitState{
default void entered(){
diff --git a/core/src/io/anuke/mindustry/game/DefaultWaves.java b/core/src/mindustry/game/DefaultWaves.java
similarity index 97%
rename from core/src/io/anuke/mindustry/game/DefaultWaves.java
rename to core/src/mindustry/game/DefaultWaves.java
index 7bf39a29b3..82fddd3a62 100644
--- a/core/src/io/anuke/mindustry/game/DefaultWaves.java
+++ b/core/src/mindustry/game/DefaultWaves.java
@@ -1,8 +1,8 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.collection.Array;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.type.ItemStack;
+import arc.struct.Array;
+import mindustry.content.*;
+import mindustry.type.ItemStack;
public class DefaultWaves{
private Array spawns;
diff --git a/core/src/io/anuke/mindustry/game/Difficulty.java b/core/src/mindustry/game/Difficulty.java
similarity index 89%
rename from core/src/io/anuke/mindustry/game/Difficulty.java
rename to core/src/mindustry/game/Difficulty.java
index 3b65017ff3..7c2e20e15f 100644
--- a/core/src/io/anuke/mindustry/game/Difficulty.java
+++ b/core/src/mindustry/game/Difficulty.java
@@ -1,6 +1,6 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.Core;
+import arc.Core;
/** Presets for time between waves. Currently unused.*/
public enum Difficulty{
diff --git a/core/src/io/anuke/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java
similarity index 96%
rename from core/src/io/anuke/mindustry/game/EventType.java
rename to core/src/mindustry/game/EventType.java
index 4459e6860c..cf26f06fec 100644
--- a/core/src/io/anuke/mindustry/game/EventType.java
+++ b/core/src/mindustry/game/EventType.java
@@ -1,13 +1,13 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.core.GameState.State;
-import io.anuke.mindustry.ctype.UnlockableContent;
-import io.anuke.mindustry.entities.traits.BuilderTrait;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.units.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.Tile;
+import arc.util.ArcAnnotate.*;
+import mindustry.core.GameState.State;
+import mindustry.ctype.UnlockableContent;
+import mindustry.entities.traits.BuilderTrait;
+import mindustry.entities.type.*;
+import mindustry.entities.units.*;
+import mindustry.type.*;
+import mindustry.world.Tile;
public class EventType{
diff --git a/core/src/io/anuke/mindustry/game/Gamemode.java b/core/src/mindustry/game/Gamemode.java
similarity index 94%
rename from core/src/io/anuke/mindustry/game/Gamemode.java
rename to core/src/mindustry/game/Gamemode.java
index f448bb637f..3cb2605c24 100644
--- a/core/src/io/anuke/mindustry/game/Gamemode.java
+++ b/core/src/mindustry/game/Gamemode.java
@@ -1,10 +1,10 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.*;
-import io.anuke.arc.func.*;
-import io.anuke.mindustry.maps.*;
+import arc.*;
+import arc.func.*;
+import mindustry.maps.*;
-import static io.anuke.mindustry.Vars.waveTeam;
+import static mindustry.Vars.waveTeam;
/** Defines preset rule sets. */
public enum Gamemode{
diff --git a/core/src/io/anuke/mindustry/game/GlobalData.java b/core/src/mindustry/game/GlobalData.java
similarity index 93%
rename from core/src/io/anuke/mindustry/game/GlobalData.java
rename to core/src/mindustry/game/GlobalData.java
index d211683e2c..3dbf592a71 100644
--- a/core/src/io/anuke/mindustry/game/GlobalData.java
+++ b/core/src/mindustry/game/GlobalData.java
@@ -1,19 +1,19 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.files.*;
-import io.anuke.arc.util.io.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.ctype.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.type.*;
+import arc.*;
+import arc.struct.*;
+import arc.files.*;
+import arc.util.io.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.ctype.*;
+import mindustry.game.EventType.*;
+import mindustry.type.*;
import java.io.*;
import java.util.zip.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
/** Stores player unlocks. Clientside only. */
public class GlobalData{
diff --git a/core/src/io/anuke/mindustry/game/LoopControl.java b/core/src/mindustry/game/LoopControl.java
similarity index 86%
rename from core/src/io/anuke/mindustry/game/LoopControl.java
rename to core/src/mindustry/game/LoopControl.java
index e69d3bd260..8e0a9f1801 100644
--- a/core/src/io/anuke/mindustry/game/LoopControl.java
+++ b/core/src/mindustry/game/LoopControl.java
@@ -1,11 +1,11 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.*;
-import io.anuke.arc.audio.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.mindustry.*;
+import arc.*;
+import arc.audio.*;
+import arc.struct.*;
+import arc.math.*;
+import arc.math.geom.*;
+import mindustry.*;
public class LoopControl{
private ObjectMap sounds = new ObjectMap<>();
@@ -53,7 +53,7 @@ public class LoopControl{
private class SoundData{
float volume;
float total;
- Vector2 sum = new Vector2();
+ Vec2 sum = new Vec2();
int soundID;
float curVolume;
diff --git a/core/src/io/anuke/mindustry/game/MusicControl.java b/core/src/mindustry/game/MusicControl.java
similarity index 93%
rename from core/src/io/anuke/mindustry/game/MusicControl.java
rename to core/src/mindustry/game/MusicControl.java
index 16a3301ae3..f258b6a520 100644
--- a/core/src/io/anuke/mindustry/game/MusicControl.java
+++ b/core/src/mindustry/game/MusicControl.java
@@ -1,16 +1,16 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.*;
-import io.anuke.arc.audio.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.gen.*;
+import arc.*;
+import arc.audio.*;
+import arc.struct.*;
+import arc.math.*;
+import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.core.GameState.*;
+import mindustry.game.EventType.*;
+import mindustry.gen.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
/** Controls playback of multiple music tracks.*/
public class MusicControl{
diff --git a/core/src/io/anuke/mindustry/game/Objective.java b/core/src/mindustry/game/Objective.java
similarity index 77%
rename from core/src/io/anuke/mindustry/game/Objective.java
rename to core/src/mindustry/game/Objective.java
index dcd1146a10..344fd728de 100644
--- a/core/src/io/anuke/mindustry/game/Objective.java
+++ b/core/src/mindustry/game/Objective.java
@@ -1,9 +1,9 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.game.Objectives.*;
-import io.anuke.mindustry.type.*;
+import arc.scene.ui.layout.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.game.Objectives.*;
+import mindustry.type.*;
/** Defines a specific objective for a game. */
public interface Objective{
diff --git a/core/src/io/anuke/mindustry/game/Objectives.java b/core/src/mindustry/game/Objectives.java
similarity index 92%
rename from core/src/io/anuke/mindustry/game/Objectives.java
rename to core/src/mindustry/game/Objectives.java
index 340346bc13..82561fe4a2 100644
--- a/core/src/io/anuke/mindustry/game/Objectives.java
+++ b/core/src/mindustry/game/Objectives.java
@@ -1,9 +1,9 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import arc.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.type.*;
+import mindustry.world.*;
/** Holds objective classes. */
public class Objectives{
diff --git a/core/src/io/anuke/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java
similarity index 92%
rename from core/src/io/anuke/mindustry/game/Rules.java
rename to core/src/mindustry/game/Rules.java
index dbafda9579..8b40abd1ae 100644
--- a/core/src/io/anuke/mindustry/game/Rules.java
+++ b/core/src/mindustry/game/Rules.java
@@ -1,12 +1,12 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.io.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import mindustry.annotations.Annotations.*;
+import arc.struct.*;
+import arc.graphics.*;
+import mindustry.content.*;
+import mindustry.io.*;
+import mindustry.type.*;
+import mindustry.world.*;
/**
* Defines current rules on how the game should function.
diff --git a/core/src/io/anuke/mindustry/game/Saves.java b/core/src/mindustry/game/Saves.java
similarity index 93%
rename from core/src/io/anuke/mindustry/game/Saves.java
rename to core/src/mindustry/game/Saves.java
index 911fb5d558..cd3389d1f0 100644
--- a/core/src/io/anuke/mindustry/game/Saves.java
+++ b/core/src/mindustry/game/Saves.java
@@ -1,25 +1,25 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.*;
-import io.anuke.arc.assets.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.files.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.async.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.io.*;
-import io.anuke.mindustry.io.SaveIO.*;
-import io.anuke.mindustry.maps.Map;
-import io.anuke.mindustry.type.*;
+import arc.*;
+import arc.assets.*;
+import arc.struct.*;
+import arc.files.*;
+import arc.graphics.*;
+import arc.util.*;
+import arc.util.async.*;
+import mindustry.*;
+import mindustry.core.GameState.*;
+import mindustry.game.EventType.*;
+import mindustry.io.*;
+import mindustry.io.SaveIO.*;
+import mindustry.maps.Map;
+import mindustry.type.*;
import java.io.*;
import java.text.*;
import java.util.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class Saves{
private Array saves = new Array<>();
diff --git a/core/src/io/anuke/mindustry/game/Schematic.java b/core/src/mindustry/game/Schematic.java
similarity index 88%
rename from core/src/io/anuke/mindustry/game/Schematic.java
rename to core/src/mindustry/game/Schematic.java
index 32395fcf54..602e579828 100644
--- a/core/src/io/anuke/mindustry/game/Schematic.java
+++ b/core/src/mindustry/game/Schematic.java
@@ -1,16 +1,16 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.collection.IntIntMap.*;
-import io.anuke.arc.files.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.mod.Mods.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.storage.*;
+import arc.struct.*;
+import arc.struct.IntIntMap.*;
+import arc.files.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.*;
+import mindustry.mod.Mods.*;
+import mindustry.type.*;
+import mindustry.world.*;
+import mindustry.world.blocks.storage.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class Schematic implements Publishable, Comparable{
public final Array tiles;
diff --git a/core/src/io/anuke/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java
similarity index 94%
rename from core/src/io/anuke/mindustry/game/Schematics.java
rename to core/src/mindustry/game/Schematics.java
index 326c199d05..b9c56744a3 100644
--- a/core/src/io/anuke/mindustry/game/Schematics.java
+++ b/core/src/mindustry/game/Schematics.java
@@ -1,33 +1,33 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.*;
-import io.anuke.arc.assets.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.files.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.glutils.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.arc.util.io.Streams.*;
-import io.anuke.arc.util.serialization.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.ctype.ContentType;
-import io.anuke.mindustry.entities.traits.BuilderTrait.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.Schematic.*;
-import io.anuke.mindustry.input.*;
-import io.anuke.mindustry.input.Placement.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
-import io.anuke.mindustry.world.blocks.production.*;
-import io.anuke.mindustry.world.blocks.storage.*;
+import arc.*;
+import arc.assets.*;
+import arc.struct.*;
+import arc.files.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.graphics.gl.*;
+import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import arc.util.io.Streams.*;
+import arc.util.serialization.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.ctype.ContentType;
+import mindustry.entities.traits.BuilderTrait.*;
+import mindustry.game.EventType.*;
+import mindustry.game.Schematic.*;
+import mindustry.input.*;
+import mindustry.input.Placement.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.production.*;
+import mindustry.world.blocks.storage.*;
import java.io.*;
import java.util.zip.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
/** Handles schematics.*/
public class Schematics implements Loadable{
diff --git a/core/src/io/anuke/mindustry/game/SoundLoop.java b/core/src/mindustry/game/SoundLoop.java
similarity index 91%
rename from core/src/io/anuke/mindustry/game/SoundLoop.java
rename to core/src/mindustry/game/SoundLoop.java
index 3266721ed6..444ce0c857 100644
--- a/core/src/io/anuke/mindustry/game/SoundLoop.java
+++ b/core/src/mindustry/game/SoundLoop.java
@@ -1,8 +1,8 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.audio.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.util.*;
+import arc.audio.*;
+import arc.math.*;
+import arc.util.*;
/** A simple class for playing a looping sound at a position.*/
public class SoundLoop{
diff --git a/core/src/io/anuke/mindustry/game/SpawnGroup.java b/core/src/mindustry/game/SpawnGroup.java
similarity index 89%
rename from core/src/io/anuke/mindustry/game/SpawnGroup.java
rename to core/src/mindustry/game/SpawnGroup.java
index 50443f153e..c0a08d2661 100644
--- a/core/src/io/anuke/mindustry/game/SpawnGroup.java
+++ b/core/src/mindustry/game/SpawnGroup.java
@@ -1,14 +1,14 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.util.serialization.Json;
-import io.anuke.arc.util.serialization.Json.Serializable;
-import io.anuke.arc.util.serialization.JsonValue;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.ctype.ContentType;
-import io.anuke.mindustry.entities.type.BaseUnit;
-import io.anuke.mindustry.type.*;
+import arc.util.serialization.Json;
+import arc.util.serialization.Json.Serializable;
+import arc.util.serialization.JsonValue;
+import mindustry.content.*;
+import mindustry.ctype.ContentType;
+import mindustry.entities.type.BaseUnit;
+import mindustry.type.*;
-import static io.anuke.mindustry.Vars.content;
+import static mindustry.Vars.content;
/**
* A spawn group defines spawn information for a specific type of unit, with optional extra information like
diff --git a/core/src/io/anuke/mindustry/game/Stats.java b/core/src/mindustry/game/Stats.java
similarity index 90%
rename from core/src/io/anuke/mindustry/game/Stats.java
rename to core/src/mindustry/game/Stats.java
index 3c6847712e..1962f8d3ec 100644
--- a/core/src/io/anuke/mindustry/game/Stats.java
+++ b/core/src/mindustry/game/Stats.java
@@ -1,10 +1,10 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.annotations.Annotations.Serialize;
-import io.anuke.arc.collection.Array;
-import io.anuke.arc.collection.ObjectIntMap;
-import io.anuke.arc.math.Mathf;
-import io.anuke.mindustry.type.*;
+import mindustry.annotations.Annotations.Serialize;
+import arc.struct.Array;
+import arc.struct.ObjectIntMap;
+import arc.math.Mathf;
+import mindustry.type.*;
@Serialize
public class Stats{
diff --git a/core/src/io/anuke/mindustry/game/Team.java b/core/src/mindustry/game/Team.java
similarity index 79%
rename from core/src/io/anuke/mindustry/game/Team.java
rename to core/src/mindustry/game/Team.java
index 57209fc62c..8e6d66ae1b 100644
--- a/core/src/io/anuke/mindustry/game/Team.java
+++ b/core/src/mindustry/game/Team.java
@@ -1,8 +1,8 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.Core;
-import io.anuke.arc.graphics.Color;
-import io.anuke.mindustry.graphics.*;
+import arc.Core;
+import arc.graphics.Color;
+import mindustry.graphics.*;
public enum Team{
derelict(Color.valueOf("4d4e58")),
diff --git a/core/src/io/anuke/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java
similarity index 94%
rename from core/src/io/anuke/mindustry/game/Teams.java
rename to core/src/mindustry/game/Teams.java
index 45f5daf070..2b03bbfaee 100644
--- a/core/src/io/anuke/mindustry/game/Teams.java
+++ b/core/src/mindustry/game/Teams.java
@@ -1,8 +1,8 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.collection.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.world.*;
+import arc.struct.*;
+import mindustry.*;
+import mindustry.world.*;
/** Class for various team-based utilities. */
public class Teams{
diff --git a/core/src/io/anuke/mindustry/game/Tutorial.java b/core/src/mindustry/game/Tutorial.java
similarity index 94%
rename from core/src/io/anuke/mindustry/game/Tutorial.java
rename to core/src/mindustry/game/Tutorial.java
index 99d45d3c2f..924e68f63c 100644
--- a/core/src/io/anuke/mindustry/game/Tutorial.java
+++ b/core/src/mindustry/game/Tutorial.java
@@ -1,21 +1,21 @@
-package io.anuke.mindustry.game;
+package mindustry.game;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.scene.*;
-import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import arc.*;
+import arc.struct.*;
+import arc.func.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.scene.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.game.EventType.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
/** Handles tutorial state. */
public class Tutorial{
diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/mindustry/graphics/BlockRenderer.java
similarity index 94%
rename from core/src/io/anuke/mindustry/graphics/BlockRenderer.java
rename to core/src/mindustry/graphics/BlockRenderer.java
index 8912745633..41274e0349 100644
--- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
+++ b/core/src/mindustry/graphics/BlockRenderer.java
@@ -1,22 +1,22 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.Texture.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.glutils.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.Teams.*;
-import io.anuke.mindustry.ui.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import arc.*;
+import arc.struct.*;
+import arc.graphics.*;
+import arc.graphics.Texture.*;
+import arc.graphics.g2d.*;
+import arc.graphics.gl.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.game.EventType.*;
+import mindustry.game.Teams.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
-import static io.anuke.arc.Core.camera;
-import static io.anuke.mindustry.Vars.*;
+import static arc.Core.camera;
+import static mindustry.Vars.*;
public class BlockRenderer implements Disposable{
private final static int initialRequests = 32 * 32;
diff --git a/core/src/io/anuke/mindustry/graphics/Bloom.java b/core/src/mindustry/graphics/Bloom.java
similarity index 97%
rename from core/src/io/anuke/mindustry/graphics/Bloom.java
rename to core/src/mindustry/graphics/Bloom.java
index 91be9c210e..c3b4fd9bae 100644
--- a/core/src/io/anuke/mindustry/graphics/Bloom.java
+++ b/core/src/mindustry/graphics/Bloom.java
@@ -1,11 +1,11 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
-import io.anuke.arc.Core;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.Pixmap.Format;
-import io.anuke.arc.graphics.VertexAttributes.Usage;
-import io.anuke.arc.graphics.glutils.FrameBuffer;
-import io.anuke.arc.graphics.glutils.Shader;
+import arc.Core;
+import arc.graphics.*;
+import arc.graphics.Pixmap.Format;
+import arc.graphics.VertexAttributes.Usage;
+import arc.graphics.gl.FrameBuffer;
+import arc.graphics.gl.Shader;
/**
* Bloomlib allow easy but efficient way to add bloom effect as post process
diff --git a/core/src/io/anuke/mindustry/graphics/CacheLayer.java b/core/src/mindustry/graphics/CacheLayer.java
similarity index 83%
rename from core/src/io/anuke/mindustry/graphics/CacheLayer.java
rename to core/src/mindustry/graphics/CacheLayer.java
index 2088cdda4f..4f886d4001 100644
--- a/core/src/io/anuke/mindustry/graphics/CacheLayer.java
+++ b/core/src/mindustry/graphics/CacheLayer.java
@@ -1,12 +1,12 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
-import io.anuke.arc.Core;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.glutils.Shader;
+import arc.Core;
+import arc.graphics.Color;
+import arc.graphics.g2d.Draw;
+import arc.graphics.gl.Shader;
-import static io.anuke.arc.Core.camera;
-import static io.anuke.mindustry.Vars.renderer;
+import static arc.Core.camera;
+import static mindustry.Vars.renderer;
public enum CacheLayer{
water{
diff --git a/core/src/io/anuke/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java
similarity index 92%
rename from core/src/io/anuke/mindustry/graphics/Drawf.java
rename to core/src/mindustry/graphics/Drawf.java
index 036db1eca0..2fd9b48087 100644
--- a/core/src/io/anuke/mindustry/graphics/Drawf.java
+++ b/core/src/mindustry/graphics/Drawf.java
@@ -1,12 +1,12 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
-import io.anuke.arc.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.util.*;
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
-import static io.anuke.mindustry.Vars.renderer;
+import static mindustry.Vars.renderer;
public class Drawf{
diff --git a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java b/core/src/mindustry/graphics/FloorRenderer.java
similarity index 91%
rename from core/src/io/anuke/mindustry/graphics/FloorRenderer.java
rename to core/src/mindustry/graphics/FloorRenderer.java
index 58d022f579..ffea2022a0 100644
--- a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java
+++ b/core/src/mindustry/graphics/FloorRenderer.java
@@ -1,22 +1,22 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
-import io.anuke.arc.Core;
-import io.anuke.arc.Events;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.collection.IntSet.IntSetIterator;
-import io.anuke.arc.graphics.Camera;
-import io.anuke.arc.graphics.GL20;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.game.EventType.WorldLoadEvent;
-import io.anuke.mindustry.world.Tile;
-import io.anuke.mindustry.world.blocks.Floor;
+import arc.Core;
+import arc.Events;
+import arc.struct.*;
+import arc.struct.IntSet.IntSetIterator;
+import arc.graphics.Camera;
+import arc.graphics.GL20;
+import arc.graphics.g2d.*;
+import arc.math.Mathf;
+import arc.util.*;
+import mindustry.game.EventType.WorldLoadEvent;
+import mindustry.world.Tile;
+import mindustry.world.blocks.Floor;
import java.util.Arrays;
-import static io.anuke.mindustry.Vars.tilesize;
-import static io.anuke.mindustry.Vars.world;
+import static mindustry.Vars.tilesize;
+import static mindustry.Vars.world;
public class FloorRenderer implements Disposable{
private final static int chunksize = 64;
diff --git a/core/src/io/anuke/mindustry/graphics/IndexedRenderer.java b/core/src/mindustry/graphics/IndexedRenderer.java
similarity index 93%
rename from core/src/io/anuke/mindustry/graphics/IndexedRenderer.java
rename to core/src/mindustry/graphics/IndexedRenderer.java
index fe7a39b51d..f396963b78 100644
--- a/core/src/io/anuke/mindustry/graphics/IndexedRenderer.java
+++ b/core/src/mindustry/graphics/IndexedRenderer.java
@@ -1,15 +1,15 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
-import io.anuke.arc.Core;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.VertexAttributes.Usage;
-import io.anuke.arc.graphics.g2d.BatchShader;
-import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.graphics.glutils.Shader;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.Matrix3;
-import io.anuke.arc.util.Disposable;
-import io.anuke.arc.util.Strings;
+import arc.Core;
+import arc.graphics.*;
+import arc.graphics.VertexAttributes.Usage;
+import arc.graphics.g2d.BatchShader;
+import arc.graphics.g2d.TextureRegion;
+import arc.graphics.gl.Shader;
+import arc.math.Mathf;
+import arc.math.Matrix3;
+import arc.util.Disposable;
+import arc.util.Strings;
//TODO this class is a trainwreck, remove it
public class IndexedRenderer implements Disposable{
diff --git a/core/src/io/anuke/mindustry/graphics/Layer.java b/core/src/mindustry/graphics/Layer.java
similarity index 89%
rename from core/src/io/anuke/mindustry/graphics/Layer.java
rename to core/src/mindustry/graphics/Layer.java
index 1ba9c76ec6..f731452aa8 100644
--- a/core/src/io/anuke/mindustry/graphics/Layer.java
+++ b/core/src/mindustry/graphics/Layer.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
public enum Layer{
/** Base block layer. */
diff --git a/core/src/io/anuke/mindustry/graphics/LightRenderer.java b/core/src/mindustry/graphics/LightRenderer.java
similarity index 92%
rename from core/src/io/anuke/mindustry/graphics/LightRenderer.java
rename to core/src/mindustry/graphics/LightRenderer.java
index 19ab2ff016..0c0f94e02c 100644
--- a/core/src/io/anuke/mindustry/graphics/LightRenderer.java
+++ b/core/src/mindustry/graphics/LightRenderer.java
@@ -1,15 +1,15 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.glutils.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.*;
+import arc.*;
+import arc.struct.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.graphics.gl.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
-import static io.anuke.mindustry.Vars.state;
+import static mindustry.Vars.state;
/** Renders overlay lights. Client only. */
public class LightRenderer{
@@ -63,7 +63,7 @@ public class LightRenderer{
float v2 = lmid.getV();
- Vector2 v1 = Tmp.v1.trnsExact(rot + 90f, stroke);
+ Vec2 v1 = Tmp.v1.trnsExact(rot + 90f, stroke);
float lx1 = x - v1.x, ly1 = y - v1.y,
lx2 = x + v1.x, ly2 = y + v1.y,
lx3 = x2 + v1.x, ly3 = y2 + v1.y,
@@ -100,7 +100,7 @@ public class LightRenderer{
Draw.vert(ledge.getTexture(), vertices, 0, vertices.length);
- Vector2 v3 = Tmp.v2.trnsExact(rot, stroke);
+ Vec2 v3 = Tmp.v2.trnsExact(rot, stroke);
u = ledge.getU();
v = ledge.getV2();
diff --git a/core/src/io/anuke/mindustry/graphics/MenuRenderer.java b/core/src/mindustry/graphics/MenuRenderer.java
similarity index 94%
rename from core/src/io/anuke/mindustry/graphics/MenuRenderer.java
rename to core/src/mindustry/graphics/MenuRenderer.java
index 84e2dbcff9..1bb0b29df9 100644
--- a/core/src/io/anuke/mindustry/graphics/MenuRenderer.java
+++ b/core/src/mindustry/graphics/MenuRenderer.java
@@ -1,22 +1,26 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.glutils.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.noise.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.ui.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
+import arc.Core;
+import arc.struct.Array;
+import arc.func.Floatc2;
+import arc.graphics.Camera;
+import arc.graphics.Color;
+import arc.graphics.g2d.*;
+import arc.graphics.gl.FrameBuffer;
+import arc.math.*;
+import arc.scene.ui.layout.Scl;
+import arc.util.*;
+import arc.util.noise.RidgedPerlin;
+import arc.util.noise.Simplex;
+import mindustry.content.Blocks;
+import mindustry.content.UnitTypes;
+import mindustry.type.UnitType;
+import mindustry.ui.Cicon;
+import mindustry.world.*;
+import mindustry.world.blocks.Floor;
+import mindustry.world.blocks.OreBlock;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class MenuRenderer implements Disposable{
private static final float darkness = 0.3f;
diff --git a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java
similarity index 90%
rename from core/src/io/anuke/mindustry/graphics/MinimapRenderer.java
rename to core/src/mindustry/graphics/MinimapRenderer.java
index 568884d609..ffeadc98da 100644
--- a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java
+++ b/core/src/mindustry/graphics/MinimapRenderer.java
@@ -1,23 +1,23 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.Pixmap.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.pooling.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.io.*;
-import io.anuke.mindustry.ui.*;
-import io.anuke.mindustry.world.*;
+import arc.*;
+import arc.struct.*;
+import arc.graphics.*;
+import arc.graphics.Pixmap.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import arc.util.pooling.*;
+import mindustry.entities.*;
+import mindustry.entities.type.*;
+import mindustry.game.EventType.*;
+import mindustry.io.*;
+import mindustry.ui.*;
+import mindustry.world.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class MinimapRenderer implements Disposable{
private static final float baseSize = 16f;
diff --git a/core/src/io/anuke/mindustry/graphics/MultiPacker.java b/core/src/mindustry/graphics/MultiPacker.java
similarity index 89%
rename from core/src/io/anuke/mindustry/graphics/MultiPacker.java
rename to core/src/mindustry/graphics/MultiPacker.java
index 578aa677ba..a2a7d476fe 100644
--- a/core/src/io/anuke/mindustry/graphics/MultiPacker.java
+++ b/core/src/mindustry/graphics/MultiPacker.java
@@ -1,10 +1,10 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.Pixmap.*;
-import io.anuke.arc.graphics.Texture.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.util.*;
+import arc.graphics.*;
+import arc.graphics.Pixmap.*;
+import arc.graphics.Texture.*;
+import arc.graphics.g2d.*;
+import arc.util.*;
public class MultiPacker implements Disposable{
private PixmapPacker[] packers = new PixmapPacker[PageType.all.length];
diff --git a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java
similarity index 87%
rename from core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
rename to core/src/mindustry/graphics/OverlayRenderer.java
index d33d310b88..3001159c74 100644
--- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
+++ b/core/src/mindustry/graphics/OverlayRenderer.java
@@ -1,24 +1,24 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
-import io.anuke.arc.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.input.*;
-import io.anuke.mindustry.type.Category;
-import io.anuke.mindustry.ui.Cicon;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.units.MechPad;
-import io.anuke.mindustry.world.meta.BlockFlag;
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.type.*;
+import mindustry.game.*;
+import mindustry.input.*;
+import mindustry.type.Category;
+import mindustry.ui.Cicon;
+import mindustry.world.*;
+import mindustry.world.blocks.units.MechPad;
+import mindustry.world.meta.BlockFlag;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class OverlayRenderer{
private static final float indicatorLength = 14f;
@@ -122,7 +122,7 @@ public class OverlayRenderer{
//draw selected block
if(input.block == null && !Core.scene.hasMouse()){
- Vector2 vec = Core.input.mouseWorld(input.getMouseX(), input.getMouseY());
+ Vec2 vec = Core.input.mouseWorld(input.getMouseX(), input.getMouseY());
Tile tile = world.ltileWorld(vec.x, vec.y);
if(tile != null && tile.block() != Blocks.air && tile.getTeam() == player.getTeam()){
@@ -139,7 +139,7 @@ public class OverlayRenderer{
//draw selection overlay when dropping item
if(input.isDroppingItem()){
- Vector2 v = Core.input.mouseWorld(input.getMouseX(), input.getMouseY());
+ Vec2 v = Core.input.mouseWorld(input.getMouseX(), input.getMouseY());
float size = 8;
Draw.rect(player.item().item.icon(Cicon.medium), v.x, v.y, size, size);
Draw.color(Pal.accent);
diff --git a/core/src/io/anuke/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java
similarity index 97%
rename from core/src/io/anuke/mindustry/graphics/Pal.java
rename to core/src/mindustry/graphics/Pal.java
index 2c46e726f7..fe6a0b6d24 100644
--- a/core/src/io/anuke/mindustry/graphics/Pal.java
+++ b/core/src/mindustry/graphics/Pal.java
@@ -1,6 +1,6 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
-import io.anuke.arc.graphics.Color;
+import arc.graphics.Color;
public class Pal{
public static final Color
diff --git a/core/src/io/anuke/mindustry/graphics/Pixelator.java b/core/src/mindustry/graphics/Pixelator.java
similarity index 80%
rename from core/src/io/anuke/mindustry/graphics/Pixelator.java
rename to core/src/mindustry/graphics/Pixelator.java
index 587ce3077a..f746ca69e3 100644
--- a/core/src/io/anuke/mindustry/graphics/Pixelator.java
+++ b/core/src/mindustry/graphics/Pixelator.java
@@ -1,17 +1,17 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
-import io.anuke.arc.Core;
-import io.anuke.arc.graphics.Blending;
-import io.anuke.arc.graphics.Texture.TextureFilter;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.glutils.FrameBuffer;
-import io.anuke.arc.util.Disposable;
-import io.anuke.mindustry.entities.type.Player;
+import arc.Core;
+import arc.graphics.Blending;
+import arc.graphics.Texture.TextureFilter;
+import arc.graphics.g2d.Draw;
+import arc.graphics.gl.FrameBuffer;
+import arc.util.Disposable;
+import mindustry.entities.type.Player;
-import static io.anuke.arc.Core.camera;
-import static io.anuke.arc.Core.graphics;
-import static io.anuke.mindustry.Vars.playerGroup;
-import static io.anuke.mindustry.Vars.renderer;
+import static arc.Core.camera;
+import static arc.Core.graphics;
+import static mindustry.Vars.playerGroup;
+import static mindustry.Vars.renderer;
public class Pixelator implements Disposable{
private FrameBuffer buffer = new FrameBuffer(2, 2);
diff --git a/core/src/io/anuke/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java
similarity index 94%
rename from core/src/io/anuke/mindustry/graphics/Shaders.java
rename to core/src/mindustry/graphics/Shaders.java
index fbe6adb0cf..3f7282c430 100644
--- a/core/src/io/anuke/mindustry/graphics/Shaders.java
+++ b/core/src/mindustry/graphics/Shaders.java
@@ -1,12 +1,12 @@
-package io.anuke.mindustry.graphics;
+package mindustry.graphics;
-import io.anuke.arc.Core;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.graphics.glutils.Shader;
-import io.anuke.arc.scene.ui.layout.Scl;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.arc.util.Time;
+import arc.Core;
+import arc.graphics.Color;
+import arc.graphics.g2d.TextureRegion;
+import arc.graphics.gl.Shader;
+import arc.scene.ui.layout.Scl;
+import arc.util.ArcAnnotate.*;
+import arc.util.Time;
public class Shaders{
public static Shadow shadow;
diff --git a/core/src/io/anuke/mindustry/input/Binding.java b/core/src/mindustry/input/Binding.java
similarity index 90%
rename from core/src/io/anuke/mindustry/input/Binding.java
rename to core/src/mindustry/input/Binding.java
index 9134506735..664c30a2cb 100644
--- a/core/src/io/anuke/mindustry/input/Binding.java
+++ b/core/src/mindustry/input/Binding.java
@@ -1,10 +1,10 @@
-package io.anuke.mindustry.input;
+package mindustry.input;
-import io.anuke.arc.Application.ApplicationType;
-import io.anuke.arc.Core;
-import io.anuke.arc.KeyBinds.*;
-import io.anuke.arc.input.InputDevice.DeviceType;
-import io.anuke.arc.input.KeyCode;
+import arc.Application.ApplicationType;
+import arc.Core;
+import arc.KeyBinds.*;
+import arc.input.InputDevice.DeviceType;
+import arc.input.KeyCode;
public enum Binding implements KeyBind{
move_x(new Axis(KeyCode.A, KeyCode.D), "general"),
diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
similarity index 95%
rename from core/src/io/anuke/mindustry/input/DesktopInput.java
rename to core/src/mindustry/input/DesktopInput.java
index af9bd1497f..b156c3f7f4 100644
--- a/core/src/io/anuke/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -1,28 +1,28 @@
-package io.anuke.mindustry.input;
+package mindustry.input;
-import io.anuke.arc.*;
-import io.anuke.arc.Graphics.*;
-import io.anuke.arc.Graphics.Cursor.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.scene.*;
-import io.anuke.arc.scene.event.*;
-import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.entities.traits.BuilderTrait.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.ui.*;
-import io.anuke.mindustry.world.*;
+import arc.*;
+import arc.Graphics.*;
+import arc.Graphics.Cursor.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.scene.*;
+import arc.scene.event.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.*;
+import mindustry.core.GameState.*;
+import mindustry.entities.traits.BuilderTrait.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+import mindustry.world.*;
-import static io.anuke.arc.Core.scene;
-import static io.anuke.mindustry.Vars.*;
-import static io.anuke.mindustry.input.PlaceMode.*;
+import static arc.Core.scene;
+import static mindustry.Vars.*;
+import static mindustry.input.PlaceMode.*;
public class DesktopInput extends InputHandler{
/** Current cursor type. */
diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
similarity index 94%
rename from core/src/io/anuke/mindustry/input/InputHandler.java
rename to core/src/mindustry/input/InputHandler.java
index c2ff9db807..2a4ce0343f 100644
--- a/core/src/io/anuke/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -1,49 +1,49 @@
-package io.anuke.mindustry.input;
+package mindustry.input;
-import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.input.*;
-import io.anuke.arc.input.GestureDetector.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.scene.*;
-import io.anuke.arc.scene.event.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.traits.BuilderTrait.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.Teams.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.input.Placement.*;
-import io.anuke.mindustry.net.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.ui.fragments.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
-import io.anuke.mindustry.world.blocks.BuildBlock.*;
-import io.anuke.mindustry.world.blocks.power.PowerNode;
+import arc.*;
+import mindustry.annotations.Annotations.*;
+import arc.struct.*;
+import arc.func.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.input.*;
+import arc.input.GestureDetector.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.*;
+import arc.scene.event.*;
+import arc.scene.ui.layout.*;
+import arc.util.ArcAnnotate.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.effect.*;
+import mindustry.entities.traits.BuilderTrait.*;
+import mindustry.entities.type.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.game.Teams.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.input.Placement.*;
+import mindustry.net.*;
+import mindustry.type.*;
+import mindustry.ui.fragments.*;
+import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.BuildBlock.*;
+import mindustry.world.blocks.power.PowerNode;
import java.util.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public abstract class InputHandler implements InputProcessor, GestureListener{
/** Used for dropping items. */
final static float playerSelectRange = mobile ? 17f : 11f;
/** Maximum line length. */
final static int maxLength = 100;
- final static Vector2 stackTrns = new Vector2();
+ final static Vec2 stackTrns = new Vec2();
final static Rectangle r1 = new Rectangle(), r2 = new Rectangle();
/** Distance on the back from where items originate. */
final static float backTrns = 3f;
@@ -120,7 +120,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
ItemTransfer.create(item,
player.x + Angles.trnsx(player.rotation + 180f, backTrns), player.y + Angles.trnsy(player.rotation + 180f, backTrns),
- new Vector2(tile.drawx() + stackTrns.x, tile.drawy() + stackTrns.y), () -> {
+ new Vec2(tile.drawx() + stackTrns.x, tile.drawy() + stackTrns.y), () -> {
if(tile.block() != block || tile.entity == null || tile.entity.items == null) return;
tile.block().handleStack(item, removed, tile, player);
@@ -639,7 +639,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
int tileX(float cursorX){
- Vector2 vec = Core.input.mouseWorld(cursorX, 0);
+ Vec2 vec = Core.input.mouseWorld(cursorX, 0);
if(selectedBlock()){
vec.sub(block.offset(), block.offset());
}
@@ -647,7 +647,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
int tileY(float cursorY){
- Vector2 vec = Core.input.mouseWorld(0, cursorY);
+ Vec2 vec = Core.input.mouseWorld(0, cursorY);
if(selectedBlock()){
vec.sub(block.offset(), block.offset());
}
diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java
similarity index 95%
rename from core/src/io/anuke/mindustry/input/MobileInput.java
rename to core/src/mindustry/input/MobileInput.java
index b057156719..5379caf113 100644
--- a/core/src/io/anuke/mindustry/input/MobileInput.java
+++ b/core/src/mindustry/input/MobileInput.java
@@ -1,33 +1,33 @@
-package io.anuke.mindustry.input;
+package mindustry.input;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.func.*;
-import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.input.GestureDetector.*;
-import io.anuke.arc.input.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.scene.*;
-import io.anuke.arc.scene.ui.ImageButton.*;
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.BuilderTrait.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.ui.*;
-import io.anuke.mindustry.world.*;
+import arc.*;
+import arc.struct.*;
+import arc.func.*;
+import arc.graphics.g2d.*;
+import arc.input.GestureDetector.*;
+import arc.input.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.*;
+import arc.scene.ui.ImageButton.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.core.GameState.*;
+import mindustry.entities.*;
+import mindustry.entities.traits.BuilderTrait.*;
+import mindustry.entities.traits.*;
+import mindustry.entities.type.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+import mindustry.world.*;
-import static io.anuke.mindustry.Vars.*;
-import static io.anuke.mindustry.input.PlaceMode.*;
+import static mindustry.Vars.*;
+import static mindustry.input.PlaceMode.*;
public class MobileInput extends InputHandler implements GestureListener{
/** Maximum speed the player can pan. */
@@ -36,7 +36,7 @@ public class MobileInput extends InputHandler implements GestureListener{
private final float edgePan = Scl.scl(60f);
//gesture data
- private Vector2 vector = new Vector2();
+ private Vec2 vector = new Vec2();
private float lastZoom = -1;
/** Position where the player started dragging a line. */
diff --git a/core/src/io/anuke/mindustry/input/PlaceMode.java b/core/src/mindustry/input/PlaceMode.java
similarity index 67%
rename from core/src/io/anuke/mindustry/input/PlaceMode.java
rename to core/src/mindustry/input/PlaceMode.java
index cb287caed6..1c2d0d6ce2 100644
--- a/core/src/io/anuke/mindustry/input/PlaceMode.java
+++ b/core/src/mindustry/input/PlaceMode.java
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.input;
+package mindustry.input;
public enum PlaceMode{
none, breaking, placing, schematicSelect
diff --git a/core/src/io/anuke/mindustry/input/Placement.java b/core/src/mindustry/input/Placement.java
similarity index 97%
rename from core/src/io/anuke/mindustry/input/Placement.java
rename to core/src/mindustry/input/Placement.java
index 35b078b8fe..49d3e9a030 100644
--- a/core/src/io/anuke/mindustry/input/Placement.java
+++ b/core/src/mindustry/input/Placement.java
@@ -1,15 +1,15 @@
-package io.anuke.mindustry.input;
+package mindustry.input;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.pooling.*;
-import io.anuke.mindustry.world.*;
+import arc.*;
+import arc.struct.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.util.pooling.*;
+import mindustry.world.*;
import java.util.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class Placement{
private static final NormalizeResult result = new NormalizeResult();
diff --git a/core/src/io/anuke/mindustry/io/JsonIO.java b/core/src/mindustry/io/JsonIO.java
similarity index 88%
rename from core/src/io/anuke/mindustry/io/JsonIO.java
rename to core/src/mindustry/io/JsonIO.java
index 5d91106ea2..7c570bace8 100644
--- a/core/src/io/anuke/mindustry/io/JsonIO.java
+++ b/core/src/mindustry/io/JsonIO.java
@@ -1,14 +1,14 @@
-package io.anuke.mindustry.io;
+package mindustry.io;
-import io.anuke.arc.util.serialization.*;
-import io.anuke.arc.util.serialization.Json.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.ctype.*;
-import io.anuke.mindustry.ctype.ContentType;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import arc.util.serialization.*;
+import arc.util.serialization.Json.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.ctype.*;
+import mindustry.ctype.ContentType;
+import mindustry.game.*;
+import mindustry.type.*;
+import mindustry.world.*;
import java.io.*;
@@ -20,7 +20,7 @@ public class JsonIO{
@Override
public void writeValue(Object value, Class knownType, Class elementType){
- if(value instanceof io.anuke.mindustry.ctype.MappableContent){
+ if(value instanceof mindustry.ctype.MappableContent){
try{
getWriter().value(((MappableContent)value).name);
}catch(IOException e){
@@ -53,11 +53,11 @@ public class JsonIO{
}
public static T read(Class type, String string){
- return json.fromJson(type, string);
+ return json.fromJson(type, string.replace("io.anuke.", ""));
}
public static T read(Class type, T base, String string){
- return jsonBase.fromBaseJson(type, base, string);
+ return jsonBase.fromBaseJson(type, base, string.replace("io.anuke.", ""));
}
public static String print(String in){
diff --git a/core/src/io/anuke/mindustry/io/LegacyMapIO.java b/core/src/mindustry/io/LegacyMapIO.java
similarity index 92%
rename from core/src/io/anuke/mindustry/io/LegacyMapIO.java
rename to core/src/mindustry/io/LegacyMapIO.java
index edbe047029..ef6ce95e7d 100644
--- a/core/src/io/anuke/mindustry/io/LegacyMapIO.java
+++ b/core/src/mindustry/io/LegacyMapIO.java
@@ -1,23 +1,23 @@
-package io.anuke.mindustry.io;
+package mindustry.io;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.files.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.serialization.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.ctype.ContentType;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.io.MapIO.*;
-import io.anuke.mindustry.maps.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.LegacyColorMapper.*;
-import io.anuke.mindustry.world.blocks.*;
+import arc.struct.*;
+import arc.files.*;
+import arc.graphics.*;
+import arc.util.*;
+import arc.util.serialization.*;
+import mindustry.content.*;
+import mindustry.ctype.ContentType;
+import mindustry.game.*;
+import mindustry.io.MapIO.*;
+import mindustry.maps.*;
+import mindustry.world.*;
+import mindustry.world.LegacyColorMapper.*;
+import mindustry.world.blocks.*;
import java.io.*;
import java.util.zip.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
/** Map IO for the "old" .mmap format.
* Differentiate between legacy maps and new maps by checking the extension (or the header).*/
diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/mindustry/io/MapIO.java
similarity index 92%
rename from core/src/io/anuke/mindustry/io/MapIO.java
rename to core/src/mindustry/io/MapIO.java
index dc41a0c30c..1650977fbb 100644
--- a/core/src/io/anuke/mindustry/io/MapIO.java
+++ b/core/src/mindustry/io/MapIO.java
@@ -1,21 +1,21 @@
-package io.anuke.mindustry.io;
+package mindustry.io;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.files.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.Pixmap.*;
-import io.anuke.arc.util.io.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.core.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.maps.*;
-import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.storage.*;
+import arc.struct.*;
+import arc.files.*;
+import arc.graphics.*;
+import arc.graphics.Pixmap.*;
+import arc.util.io.*;
+import mindustry.content.*;
+import mindustry.core.*;
+import mindustry.game.*;
+import mindustry.maps.*;
+import mindustry.world.*;
+import mindustry.world.blocks.storage.*;
import java.io.*;
import java.util.zip.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
/** Reads and writes map files. */
//TODO does this class even need to exist??? move to Maps?
diff --git a/core/src/io/anuke/mindustry/io/SaveFileReader.java b/core/src/mindustry/io/SaveFileReader.java
similarity index 93%
rename from core/src/io/anuke/mindustry/io/SaveFileReader.java
rename to core/src/mindustry/io/SaveFileReader.java
index 8384aca50e..c324e78fdb 100644
--- a/core/src/io/anuke/mindustry/io/SaveFileReader.java
+++ b/core/src/mindustry/io/SaveFileReader.java
@@ -1,11 +1,11 @@
-package io.anuke.mindustry.io;
+package mindustry.io;
-import io.anuke.arc.collection.ObjectMap;
-import io.anuke.arc.collection.ObjectMap.Entry;
-import io.anuke.arc.collection.StringMap;
-import io.anuke.arc.util.io.CounterInputStream;
-import io.anuke.arc.util.io.ReusableByteOutStream;
-import io.anuke.mindustry.world.WorldContext;
+import arc.struct.ObjectMap;
+import arc.struct.ObjectMap.Entry;
+import arc.struct.StringMap;
+import arc.util.io.CounterInputStream;
+import arc.util.io.ReusableByteOutStream;
+import mindustry.world.WorldContext;
import java.io.*;
diff --git a/core/src/io/anuke/mindustry/io/SaveIO.java b/core/src/mindustry/io/SaveIO.java
similarity index 93%
rename from core/src/io/anuke/mindustry/io/SaveIO.java
rename to core/src/mindustry/io/SaveIO.java
index 6aa76d8ba9..62abedef77 100644
--- a/core/src/io/anuke/mindustry/io/SaveIO.java
+++ b/core/src/mindustry/io/SaveIO.java
@@ -1,18 +1,18 @@
-package io.anuke.mindustry.io;
+package mindustry.io;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.files.Fi;
-import io.anuke.arc.util.io.CounterInputStream;
-import io.anuke.arc.util.io.FastDeflaterOutputStream;
-import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.io.versions.*;
-import io.anuke.mindustry.world.WorldContext;
+import arc.struct.*;
+import arc.files.Fi;
+import arc.util.io.CounterInputStream;
+import arc.util.io.FastDeflaterOutputStream;
+import mindustry.Vars;
+import mindustry.io.versions.*;
+import mindustry.world.WorldContext;
import java.io.*;
import java.util.Arrays;
import java.util.zip.InflaterInputStream;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class SaveIO{
/** Format header. This is the string 'MSAV' in ASCII. */
diff --git a/core/src/io/anuke/mindustry/io/SaveMeta.java b/core/src/mindustry/io/SaveMeta.java
similarity index 80%
rename from core/src/io/anuke/mindustry/io/SaveMeta.java
rename to core/src/mindustry/io/SaveMeta.java
index 4759b955ab..04ce7e4af2 100644
--- a/core/src/io/anuke/mindustry/io/SaveMeta.java
+++ b/core/src/mindustry/io/SaveMeta.java
@@ -1,10 +1,10 @@
-package io.anuke.mindustry.io;
+package mindustry.io;
-import io.anuke.arc.collection.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.maps.*;
+import arc.struct.*;
+import mindustry.game.*;
+import mindustry.maps.*;
-import static io.anuke.mindustry.Vars.maps;
+import static mindustry.Vars.maps;
public class SaveMeta{
public int version;
diff --git a/core/src/io/anuke/mindustry/io/SavePreviewLoader.java b/core/src/mindustry/io/SavePreviewLoader.java
similarity index 74%
rename from core/src/io/anuke/mindustry/io/SavePreviewLoader.java
rename to core/src/mindustry/io/SavePreviewLoader.java
index f7038875bc..bf01424a11 100644
--- a/core/src/io/anuke/mindustry/io/SavePreviewLoader.java
+++ b/core/src/mindustry/io/SavePreviewLoader.java
@@ -1,9 +1,9 @@
-package io.anuke.mindustry.io;
+package mindustry.io;
-import io.anuke.arc.assets.*;
-import io.anuke.arc.assets.loaders.*;
-import io.anuke.arc.assets.loaders.resolvers.*;
-import io.anuke.arc.files.*;
+import arc.assets.*;
+import arc.assets.loaders.*;
+import arc.assets.loaders.resolvers.*;
+import arc.files.*;
public class SavePreviewLoader extends TextureLoader{
diff --git a/core/src/io/anuke/mindustry/io/SaveVersion.java b/core/src/mindustry/io/SaveVersion.java
similarity index 95%
rename from core/src/io/anuke/mindustry/io/SaveVersion.java
rename to core/src/mindustry/io/SaveVersion.java
index cab3c55250..ba9a991e05 100644
--- a/core/src/io/anuke/mindustry/io/SaveVersion.java
+++ b/core/src/mindustry/io/SaveVersion.java
@@ -1,23 +1,23 @@
-package io.anuke.mindustry.io;
+package mindustry.io;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.io.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.core.*;
-import io.anuke.mindustry.ctype.*;
-import io.anuke.mindustry.ctype.ContentType;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.Teams.*;
-import io.anuke.mindustry.maps.*;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.content.*;
+import mindustry.core.*;
+import mindustry.ctype.*;
+import mindustry.ctype.ContentType;
+import mindustry.entities.*;
+import mindustry.entities.traits.*;
+import mindustry.game.*;
+import mindustry.game.Teams.*;
+import mindustry.maps.*;
+import mindustry.type.*;
+import mindustry.world.*;
import java.io.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public abstract class SaveVersion extends SaveFileReader{
public int version;
diff --git a/core/src/io/anuke/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java
similarity index 92%
rename from core/src/io/anuke/mindustry/io/TypeIO.java
rename to core/src/mindustry/io/TypeIO.java
index be5161659b..4e9c4b5024 100644
--- a/core/src/io/anuke/mindustry/io/TypeIO.java
+++ b/core/src/mindustry/io/TypeIO.java
@@ -1,28 +1,28 @@
-package io.anuke.mindustry.io;
+package mindustry.io;
-import io.anuke.annotations.Annotations.ReadClass;
-import io.anuke.annotations.Annotations.WriteClass;
-import io.anuke.arc.graphics.Color;
-import io.anuke.mindustry.ctype.ContentType;
-import io.anuke.mindustry.entities.Effects;
-import io.anuke.mindustry.entities.Effects.Effect;
-import io.anuke.mindustry.entities.type.Bullet;
-import io.anuke.mindustry.entities.bullet.BulletType;
-import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest;
-import io.anuke.mindustry.entities.traits.ShooterTrait;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.units.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.net.Administration.TraceInfo;
-import io.anuke.mindustry.net.Packets.AdminAction;
-import io.anuke.mindustry.net.Packets.KickReason;
-import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.*;
+import mindustry.annotations.Annotations.ReadClass;
+import mindustry.annotations.Annotations.WriteClass;
+import arc.graphics.Color;
+import mindustry.ctype.ContentType;
+import mindustry.entities.Effects;
+import mindustry.entities.Effects.Effect;
+import mindustry.entities.type.Bullet;
+import mindustry.entities.bullet.BulletType;
+import mindustry.entities.traits.BuilderTrait.BuildRequest;
+import mindustry.entities.traits.ShooterTrait;
+import mindustry.entities.type.*;
+import mindustry.entities.units.*;
+import mindustry.game.*;
+import mindustry.net.Administration.TraceInfo;
+import mindustry.net.Packets.AdminAction;
+import mindustry.net.Packets.KickReason;
+import mindustry.type.*;
+import mindustry.world.*;
import java.io.*;
import java.nio.ByteBuffer;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
/** Class for specifying read/write methods for code generation. */
@SuppressWarnings("unused")
diff --git a/core/src/io/anuke/mindustry/io/versions/LegacyTypeTable.java b/core/src/mindustry/io/versions/LegacyTypeTable.java
similarity index 90%
rename from core/src/io/anuke/mindustry/io/versions/LegacyTypeTable.java
rename to core/src/mindustry/io/versions/LegacyTypeTable.java
index 6e04863262..2aeb8c8d66 100644
--- a/core/src/io/anuke/mindustry/io/versions/LegacyTypeTable.java
+++ b/core/src/mindustry/io/versions/LegacyTypeTable.java
@@ -1,10 +1,10 @@
-package io.anuke.mindustry.io.versions;
+package mindustry.io.versions;
-import io.anuke.arc.func.Prov;
-import io.anuke.mindustry.entities.type.Bullet;
-import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.type.Player;
-import io.anuke.mindustry.entities.type.base.*;
+import arc.func.Prov;
+import mindustry.entities.type.Bullet;
+import mindustry.entities.effect.*;
+import mindustry.entities.type.Player;
+import mindustry.entities.type.base.*;
/*
Latest data: [build 81]
diff --git a/core/src/io/anuke/mindustry/io/versions/Save1.java b/core/src/mindustry/io/versions/Save1.java
similarity index 86%
rename from core/src/io/anuke/mindustry/io/versions/Save1.java
rename to core/src/mindustry/io/versions/Save1.java
index 471c2c2f3f..446fe8e80b 100644
--- a/core/src/io/anuke/mindustry/io/versions/Save1.java
+++ b/core/src/mindustry/io/versions/Save1.java
@@ -1,7 +1,7 @@
-package io.anuke.mindustry.io.versions;
+package mindustry.io.versions;
-import io.anuke.arc.func.*;
-import io.anuke.mindustry.entities.traits.*;
+import arc.func.*;
+import mindustry.entities.traits.*;
import java.io.*;
diff --git a/core/src/io/anuke/mindustry/io/versions/Save2.java b/core/src/mindustry/io/versions/Save2.java
similarity index 75%
rename from core/src/io/anuke/mindustry/io/versions/Save2.java
rename to core/src/mindustry/io/versions/Save2.java
index bcf0fb8366..497289ed71 100644
--- a/core/src/io/anuke/mindustry/io/versions/Save2.java
+++ b/core/src/mindustry/io/versions/Save2.java
@@ -1,13 +1,13 @@
-package io.anuke.mindustry.io.versions;
+package mindustry.io.versions;
-import io.anuke.mindustry.ctype.ContentType;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.io.*;
-import io.anuke.mindustry.type.TypeID;
+import mindustry.ctype.ContentType;
+import mindustry.entities.traits.*;
+import mindustry.io.*;
+import mindustry.type.TypeID;
import java.io.*;
-import static io.anuke.mindustry.Vars.content;
+import static mindustry.Vars.content;
public class Save2 extends SaveVersion{
diff --git a/core/src/io/anuke/mindustry/io/versions/Save3.java b/core/src/mindustry/io/versions/Save3.java
similarity index 55%
rename from core/src/io/anuke/mindustry/io/versions/Save3.java
rename to core/src/mindustry/io/versions/Save3.java
index c418a1bf46..74a9d7a2c4 100644
--- a/core/src/io/anuke/mindustry/io/versions/Save3.java
+++ b/core/src/mindustry/io/versions/Save3.java
@@ -1,6 +1,6 @@
-package io.anuke.mindustry.io.versions;
+package mindustry.io.versions;
-import io.anuke.mindustry.io.*;
+import mindustry.io.*;
public class Save3 extends SaveVersion{
public Save3(){
diff --git a/core/src/io/anuke/mindustry/maps/Map.java b/core/src/mindustry/maps/Map.java
similarity index 92%
rename from core/src/io/anuke/mindustry/maps/Map.java
rename to core/src/mindustry/maps/Map.java
index 6fef24a8c4..90bb4f2f87 100644
--- a/core/src/io/anuke/mindustry/maps/Map.java
+++ b/core/src/mindustry/maps/Map.java
@@ -1,20 +1,20 @@
-package io.anuke.mindustry.maps;
+package mindustry.maps;
-import io.anuke.arc.*;
-import io.anuke.arc.collection.*;
-import io.anuke.arc.files.*;
-import io.anuke.arc.graphics.*;
-import io.anuke.arc.util.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.io.*;
-import io.anuke.mindustry.maps.filters.*;
-import io.anuke.mindustry.mod.Mods.*;
-import io.anuke.mindustry.type.*;
+import arc.*;
+import arc.struct.*;
+import arc.files.*;
+import arc.graphics.*;
+import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.*;
+import mindustry.game.EventType.*;
+import mindustry.game.*;
+import mindustry.io.*;
+import mindustry.maps.filters.*;
+import mindustry.mod.Mods.*;
+import mindustry.type.*;
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
public class Map implements Comparable