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, Publishable{ /** Whether this is a custom map. */ diff --git a/core/src/io/anuke/mindustry/maps/MapException.java b/core/src/mindustry/maps/MapException.java similarity index 84% rename from core/src/io/anuke/mindustry/maps/MapException.java rename to core/src/mindustry/maps/MapException.java index 7bc1c76805..c97b274432 100644 --- a/core/src/io/anuke/mindustry/maps/MapException.java +++ b/core/src/mindustry/maps/MapException.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.maps; +package mindustry.maps; public class MapException extends RuntimeException{ public final Map map; diff --git a/core/src/io/anuke/mindustry/maps/MapPreviewLoader.java b/core/src/mindustry/maps/MapPreviewLoader.java similarity index 80% rename from core/src/io/anuke/mindustry/maps/MapPreviewLoader.java rename to core/src/mindustry/maps/MapPreviewLoader.java index a6f218cb7a..3572846ea7 100644 --- a/core/src/io/anuke/mindustry/maps/MapPreviewLoader.java +++ b/core/src/mindustry/maps/MapPreviewLoader.java @@ -1,14 +1,14 @@ -package io.anuke.mindustry.maps; +package mindustry.maps; -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.graphics.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.ctype.Content; +import arc.assets.*; +import arc.assets.loaders.*; +import arc.assets.loaders.resolvers.*; +import arc.struct.*; +import arc.files.*; +import arc.graphics.*; +import arc.util.*; +import mindustry.*; +import mindustry.ctype.Content; public class MapPreviewLoader extends TextureLoader{ diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/mindustry/maps/Maps.java similarity index 93% rename from core/src/io/anuke/mindustry/maps/Maps.java rename to core/src/mindustry/maps/Maps.java index 970c55da44..d7522e5166 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/mindustry/maps/Maps.java @@ -1,32 +1,32 @@ -package io.anuke.mindustry.maps; +package mindustry.maps; -import io.anuke.arc.*; -import io.anuke.arc.assets.*; -import io.anuke.arc.assets.loaders.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.collection.IntSet.*; -import io.anuke.arc.files.*; -import io.anuke.arc.func.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.async.*; -import io.anuke.arc.util.io.*; -import io.anuke.arc.util.serialization.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.ctype.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.io.*; -import io.anuke.mindustry.maps.MapPreviewLoader.*; -import io.anuke.mindustry.maps.filters.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.storage.*; +import arc.*; +import arc.assets.*; +import arc.assets.loaders.*; +import arc.struct.*; +import arc.struct.IntSet.*; +import arc.files.*; +import arc.func.*; +import arc.graphics.*; +import arc.util.ArcAnnotate.*; +import arc.util.*; +import arc.util.async.*; +import arc.util.io.*; +import arc.util.serialization.*; +import mindustry.*; +import mindustry.content.*; +import mindustry.ctype.*; +import mindustry.game.EventType.*; +import mindustry.game.*; +import mindustry.io.*; +import mindustry.maps.MapPreviewLoader.*; +import mindustry.maps.filters.*; +import mindustry.world.*; +import mindustry.world.blocks.storage.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class Maps{ /** List of all built-in maps. Filenames only. */ @@ -97,7 +97,7 @@ public class Maps{ }); if(Core.assets != null){ - ((CustomLoader)Core.assets.getLoader(Content.class)).loaded = this::createAllPreviews; + ((CustomLoader) Core.assets.getLoader(Content.class)).loaded = this::createAllPreviews; } } @@ -329,7 +329,7 @@ public class Maps{ return filters; }else{ try{ - return JsonIO.read(Array.class, str.replace("mindustrz", "mindustry")); + return JsonIO.read(Array.class, str); }catch(Exception e){ e.printStackTrace(); return readFilters(""); diff --git a/core/src/io/anuke/mindustry/maps/filters/BlendFilter.java b/core/src/mindustry/maps/filters/BlendFilter.java similarity index 81% rename from core/src/io/anuke/mindustry/maps/filters/BlendFilter.java rename to core/src/mindustry/maps/filters/BlendFilter.java index 829bfe47f6..405ed2b46b 100644 --- a/core/src/io/anuke/mindustry/maps/filters/BlendFilter.java +++ b/core/src/mindustry/maps/filters/BlendFilter.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.maps.filters.FilterOption.*; -import io.anuke.mindustry.world.*; +import arc.math.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.maps.filters.FilterOption.*; +import mindustry.world.*; -import static io.anuke.mindustry.maps.filters.FilterOption.*; +import static mindustry.maps.filters.FilterOption.*; public class BlendFilter extends GenerateFilter{ float radius = 2f; diff --git a/core/src/io/anuke/mindustry/maps/filters/ClearFilter.java b/core/src/mindustry/maps/filters/ClearFilter.java similarity index 64% rename from core/src/io/anuke/mindustry/maps/filters/ClearFilter.java rename to core/src/mindustry/maps/filters/ClearFilter.java index df4e384926..3769d7f77d 100644 --- a/core/src/io/anuke/mindustry/maps/filters/ClearFilter.java +++ b/core/src/mindustry/maps/filters/ClearFilter.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; -import io.anuke.arc.util.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.world.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.world.*; -import static io.anuke.mindustry.maps.filters.FilterOption.*; +import static mindustry.maps.filters.FilterOption.*; public class ClearFilter extends GenerateFilter{ protected Block block = Blocks.air; diff --git a/core/src/io/anuke/mindustry/maps/filters/CoreSpawnFilter.java b/core/src/mindustry/maps/filters/CoreSpawnFilter.java similarity index 93% rename from core/src/io/anuke/mindustry/maps/filters/CoreSpawnFilter.java rename to core/src/mindustry/maps/filters/CoreSpawnFilter.java index fbf5fa0e6c..ad73d7686f 100644 --- a/core/src/io/anuke/mindustry/maps/filters/CoreSpawnFilter.java +++ b/core/src/mindustry/maps/filters/CoreSpawnFilter.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; import io.anuke.arc.collection.*; import io.anuke.arc.util.*; import io.anuke.mindustry.maps.filters.FilterOption.*; -import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.storage.*; +import mindustry.world.*; import static io.anuke.mindustry.Vars.*; diff --git a/core/src/io/anuke/mindustry/maps/filters/DistortFilter.java b/core/src/mindustry/maps/filters/DistortFilter.java similarity index 78% rename from core/src/io/anuke/mindustry/maps/filters/DistortFilter.java rename to core/src/mindustry/maps/filters/DistortFilter.java index 66abd8008d..e1fecffc3c 100644 --- a/core/src/io/anuke/mindustry/maps/filters/DistortFilter.java +++ b/core/src/mindustry/maps/filters/DistortFilter.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; -import io.anuke.arc.util.*; -import io.anuke.mindustry.maps.filters.FilterOption.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.*; +import arc.util.*; +import mindustry.maps.filters.FilterOption.*; +import mindustry.world.*; +import mindustry.world.blocks.*; public class DistortFilter extends GenerateFilter{ float scl = 40, mag = 5; diff --git a/core/src/io/anuke/mindustry/maps/filters/EnemySpawnFilter.java b/core/src/mindustry/maps/filters/EnemySpawnFilter.java similarity index 89% rename from core/src/io/anuke/mindustry/maps/filters/EnemySpawnFilter.java rename to core/src/mindustry/maps/filters/EnemySpawnFilter.java index 2c58b092b1..bb2993dc1c 100644 --- a/core/src/io/anuke/mindustry/maps/filters/EnemySpawnFilter.java +++ b/core/src/mindustry/maps/filters/EnemySpawnFilter.java @@ -1,10 +1,9 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; import io.anuke.arc.collection.*; import io.anuke.arc.util.*; -import io.anuke.mindustry.content.*; import io.anuke.mindustry.maps.filters.FilterOption.*; -import io.anuke.mindustry.world.*; +import mindustry.world.*; /** Selects X spawns from the spawn pool.*/ public class EnemySpawnFilter extends GenerateFilter{ diff --git a/core/src/io/anuke/mindustry/maps/filters/FilterOption.java b/core/src/mindustry/maps/filters/FilterOption.java similarity index 78% rename from core/src/io/anuke/mindustry/maps/filters/FilterOption.java rename to core/src/mindustry/maps/filters/FilterOption.java index d9b64702b7..6dba80f496 100644 --- a/core/src/io/anuke/mindustry/maps/filters/FilterOption.java +++ b/core/src/mindustry/maps/filters/FilterOption.java @@ -1,27 +1,27 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; -import io.anuke.arc.*; -import io.anuke.arc.func.*; -import io.anuke.arc.scene.style.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.ui.Cicon; -import io.anuke.mindustry.ui.dialogs.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.*; +import arc.*; +import arc.func.*; +import arc.scene.style.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import mindustry.*; +import mindustry.content.*; +import mindustry.ui.Cicon; +import mindustry.ui.dialogs.*; +import mindustry.world.*; +import mindustry.world.blocks.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public abstract class FilterOption{ - public static final Boolf floorsOnly = b -> (b instanceof Floor && !(b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(io.anuke.mindustry.ui.Cicon.full)); - public static final Boolf wallsOnly = b -> (!b.synthetic() && !(b instanceof Floor)) && !headless && Core.atlas.isFound(b.icon(io.anuke.mindustry.ui.Cicon.full)); - public static final Boolf floorsOptional = b -> b == Blocks.air || ((b instanceof Floor && !(b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(io.anuke.mindustry.ui.Cicon.full))); - public static final Boolf wallsOptional = b -> b == Blocks.air || ((!b.synthetic() && !(b instanceof Floor)) && !headless && Core.atlas.isFound(b.icon(io.anuke.mindustry.ui.Cicon.full))); - public static final Boolf wallsOresOptional = b -> b == Blocks.air || (((!b.synthetic() && !(b instanceof Floor)) || (b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(io.anuke.mindustry.ui.Cicon.full))); - public static final Boolf oresOnly = b -> b instanceof OverlayFloor && !headless && Core.atlas.isFound(b.icon(io.anuke.mindustry.ui.Cicon.full)); + public static final Boolf floorsOnly = b -> (b instanceof Floor && !(b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full)); + public static final Boolf wallsOnly = b -> (!b.synthetic() && !(b instanceof Floor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full)); + public static final Boolf floorsOptional = b -> b == Blocks.air || ((b instanceof Floor && !(b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full))); + public static final Boolf wallsOptional = b -> b == Blocks.air || ((!b.synthetic() && !(b instanceof Floor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full))); + public static final Boolf wallsOresOptional = b -> b == Blocks.air || (((!b.synthetic() && !(b instanceof Floor)) || (b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full))); + public static final Boolf oresOnly = b -> b instanceof OverlayFloor && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full)); public static final Boolf anyOptional = b -> floorsOnly.get(b) || wallsOnly.get(b) || oresOnly.get(b) || b == Blocks.air; public abstract void build(Table table); @@ -87,8 +87,8 @@ public abstract class FilterOption{ @Override public void build(Table table){ - table.addButton(b -> b.addImage(supplier.get().icon(io.anuke.mindustry.ui.Cicon.small)).update(i -> ((TextureRegionDrawable)i.getDrawable()) - .setRegion(supplier.get() == Blocks.air ? Core.atlas.find("icon-none") : supplier.get().icon(io.anuke.mindustry.ui.Cicon.small))).size(8 * 3), () -> { + table.addButton(b -> b.addImage(supplier.get().icon(mindustry.ui.Cicon.small)).update(i -> ((TextureRegionDrawable)i.getDrawable()) + .setRegion(supplier.get() == Blocks.air ? Core.atlas.find("icon-none") : supplier.get().icon(mindustry.ui.Cicon.small))).size(8 * 3), () -> { FloatingDialog dialog = new FloatingDialog(""); dialog.setFillParent(false); int i = 0; diff --git a/core/src/io/anuke/mindustry/maps/filters/GenerateFilter.java b/core/src/mindustry/maps/filters/GenerateFilter.java similarity index 93% rename from core/src/io/anuke/mindustry/maps/filters/GenerateFilter.java rename to core/src/mindustry/maps/filters/GenerateFilter.java index fe725a5e9b..6193dfa704 100644 --- a/core/src/io/anuke/mindustry/maps/filters/GenerateFilter.java +++ b/core/src/mindustry/maps/filters/GenerateFilter.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; -import io.anuke.arc.*; -import io.anuke.arc.math.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.noise.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.world.*; +import arc.*; +import arc.math.*; +import arc.scene.ui.*; +import arc.util.*; +import arc.util.noise.*; +import mindustry.content.*; +import mindustry.world.*; public abstract class GenerateFilter{ protected transient float o = (float)(Math.random() * 10000000.0); diff --git a/core/src/io/anuke/mindustry/maps/filters/MedianFilter.java b/core/src/mindustry/maps/filters/MedianFilter.java similarity index 82% rename from core/src/io/anuke/mindustry/maps/filters/MedianFilter.java rename to core/src/mindustry/maps/filters/MedianFilter.java index c0bef49804..cf3fbc2b29 100644 --- a/core/src/io/anuke/mindustry/maps/filters/MedianFilter.java +++ b/core/src/mindustry/maps/filters/MedianFilter.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; -import io.anuke.arc.collection.*; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.maps.filters.FilterOption.*; -import io.anuke.mindustry.world.*; +import arc.struct.*; +import arc.math.*; +import arc.util.*; +import mindustry.maps.filters.FilterOption.*; +import mindustry.world.*; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; public class MedianFilter extends GenerateFilter{ float radius = 2; diff --git a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java b/core/src/mindustry/maps/filters/MirrorFilter.java similarity index 76% rename from core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java rename to core/src/mindustry/maps/filters/MirrorFilter.java index 6bfb7afb5e..d4c96a7e07 100644 --- a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java +++ b/core/src/mindustry/maps/filters/MirrorFilter.java @@ -1,17 +1,17 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; -import io.anuke.arc.func.*; -import io.anuke.arc.graphics.g2d.*; -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.mindustry.graphics.*; -import io.anuke.mindustry.maps.filters.FilterOption.*; -import io.anuke.mindustry.world.*; +import arc.func.*; +import arc.graphics.g2d.*; +import arc.math.geom.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.graphics.*; +import mindustry.maps.filters.FilterOption.*; +import mindustry.world.*; public class MirrorFilter extends GenerateFilter{ - private final Vector2 v1 = new Vector2(), v2 = new Vector2(), v3 = new Vector2(); + private final Vec2 v1 = new Vec2(), v2 = new Vec2(), v3 = new Vec2(); int angle = 45; @@ -47,12 +47,12 @@ public class MirrorFilter extends GenerateFilter{ public void draw(Image image){ super.draw(image); - Vector2 vsize = Scaling.fit.apply(image.getDrawable().getMinWidth(), image.getDrawable().getMinHeight(), image.getWidth(), image.getHeight()); + Vec2 vsize = Scaling.fit.apply(image.getDrawable().getMinWidth(), image.getDrawable().getMinHeight(), image.getWidth(), image.getHeight()); float imageWidth = Math.max(vsize.x, vsize.y); float imageHeight = Math.max(vsize.y, vsize.x); float size = Math.max(image.getWidth() *2, image.getHeight()*2); - Cons clamper = v -> + Cons clamper = v -> v.clamp( image.getX() + image.getWidth()/2f - imageWidth/2f, image.getX() + image.getWidth()/2f + imageWidth/2f, @@ -67,7 +67,7 @@ public class MirrorFilter extends GenerateFilter{ Draw.reset(); } - void mirror(Vector2 p, float x0, float y0, float x1, float y1){ + void mirror(Vec2 p, float x0, float y0, float x1, float y1){ //special case: uneven map mirrored at 45 degree angle if(in.width != in.height && angle % 90 != 0){ p.x = (p.x - in.width/2f) * -1 + in.width/2f; @@ -83,7 +83,7 @@ public class MirrorFilter extends GenerateFilter{ } } - boolean left(Vector2 a, Vector2 b, Vector2 c){ + boolean left(Vec2 a, Vec2 b, Vec2 c){ return ((b.x - a.x)*(c.y - a.y) - (b.y - a.y)*(c.x - a.x)) > 0; } } diff --git a/core/src/io/anuke/mindustry/maps/filters/NoiseFilter.java b/core/src/mindustry/maps/filters/NoiseFilter.java similarity index 74% rename from core/src/io/anuke/mindustry/maps/filters/NoiseFilter.java rename to core/src/mindustry/maps/filters/NoiseFilter.java index c32b45bd76..bfde903e7a 100644 --- a/core/src/io/anuke/mindustry/maps/filters/NoiseFilter.java +++ b/core/src/mindustry/maps/filters/NoiseFilter.java @@ -1,11 +1,12 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; -import io.anuke.arc.util.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.maps.filters.FilterOption.*; -import io.anuke.mindustry.world.*; +import mindustry.content.Blocks; +import mindustry.maps.filters.FilterOption.BlockOption; +import mindustry.maps.filters.FilterOption.SliderOption; +import mindustry.world.Block; -import static io.anuke.mindustry.maps.filters.FilterOption.*; +import static mindustry.maps.filters.FilterOption.floorsOnly; +import static mindustry.maps.filters.FilterOption.wallsOnly; public class NoiseFilter extends GenerateFilter{ float scl = 40, threshold = 0.5f, octaves = 3f, falloff = 0.5f; diff --git a/core/src/io/anuke/mindustry/maps/filters/OreFilter.java b/core/src/mindustry/maps/filters/OreFilter.java similarity index 75% rename from core/src/io/anuke/mindustry/maps/filters/OreFilter.java rename to core/src/mindustry/maps/filters/OreFilter.java index d07891c692..76aaaf5ae1 100644 --- a/core/src/io/anuke/mindustry/maps/filters/OreFilter.java +++ b/core/src/mindustry/maps/filters/OreFilter.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; -import io.anuke.arc.util.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.maps.filters.FilterOption.*; -import io.anuke.mindustry.world.*; +import mindustry.content.Blocks; +import mindustry.maps.filters.FilterOption.SliderOption; +import mindustry.world.Block; -import static io.anuke.mindustry.maps.filters.FilterOption.*; +import static mindustry.maps.filters.FilterOption.BlockOption; +import static mindustry.maps.filters.FilterOption.oresOnly; public class OreFilter extends GenerateFilter{ public float scl = 23, threshold = 0.81f, octaves = 2f, falloff = 0.3f; diff --git a/core/src/io/anuke/mindustry/maps/filters/OreMedianFilter.java b/core/src/mindustry/maps/filters/OreMedianFilter.java similarity index 85% rename from core/src/io/anuke/mindustry/maps/filters/OreMedianFilter.java rename to core/src/mindustry/maps/filters/OreMedianFilter.java index 56bc2d5975..92dfaf0898 100644 --- a/core/src/io/anuke/mindustry/maps/filters/OreMedianFilter.java +++ b/core/src/mindustry/maps/filters/OreMedianFilter.java @@ -1,12 +1,11 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; -import io.anuke.arc.collection.*; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.maps.filters.FilterOption.*; -import io.anuke.mindustry.world.*; +import arc.struct.*; +import arc.math.*; +import mindustry.*; +import mindustry.content.*; +import mindustry.maps.filters.FilterOption.*; +import mindustry.world.*; public class OreMedianFilter extends GenerateFilter{ public float radius = 2; diff --git a/core/src/io/anuke/mindustry/maps/filters/RandomItemFilter.java b/core/src/mindustry/maps/filters/RandomItemFilter.java similarity index 77% rename from core/src/io/anuke/mindustry/maps/filters/RandomItemFilter.java rename to core/src/mindustry/maps/filters/RandomItemFilter.java index 1c08d562bd..d4f163d6db 100644 --- a/core/src/io/anuke/mindustry/maps/filters/RandomItemFilter.java +++ b/core/src/mindustry/maps/filters/RandomItemFilter.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; -import io.anuke.arc.collection.*; -import io.anuke.arc.math.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.storage.*; +import arc.math.*; +import arc.struct.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.blocks.storage.*; public class RandomItemFilter extends GenerateFilter{ public Array drops = new Array<>(); diff --git a/core/src/io/anuke/mindustry/maps/filters/RiverNoiseFilter.java b/core/src/mindustry/maps/filters/RiverNoiseFilter.java similarity index 76% rename from core/src/io/anuke/mindustry/maps/filters/RiverNoiseFilter.java rename to core/src/mindustry/maps/filters/RiverNoiseFilter.java index 82cc0bba7b..87d433c9c8 100644 --- a/core/src/io/anuke/mindustry/maps/filters/RiverNoiseFilter.java +++ b/core/src/mindustry/maps/filters/RiverNoiseFilter.java @@ -1,11 +1,12 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; -import io.anuke.arc.util.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.maps.filters.FilterOption.*; -import io.anuke.mindustry.world.*; +import mindustry.content.Blocks; +import mindustry.maps.filters.FilterOption.BlockOption; +import mindustry.maps.filters.FilterOption.SliderOption; +import mindustry.world.Block; -import static io.anuke.mindustry.maps.filters.FilterOption.*; +import static mindustry.maps.filters.FilterOption.floorsOnly; +import static mindustry.maps.filters.FilterOption.wallsOnly; public class RiverNoiseFilter extends GenerateFilter{ float scl = 40, threshold = 0f, threshold2 = 0.1f; diff --git a/core/src/io/anuke/mindustry/maps/filters/ScatterFilter.java b/core/src/mindustry/maps/filters/ScatterFilter.java similarity index 80% rename from core/src/io/anuke/mindustry/maps/filters/ScatterFilter.java rename to core/src/mindustry/maps/filters/ScatterFilter.java index db9ffcdb15..0deabd6b2e 100644 --- a/core/src/io/anuke/mindustry/maps/filters/ScatterFilter.java +++ b/core/src/mindustry/maps/filters/ScatterFilter.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; -import io.anuke.arc.util.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.maps.filters.FilterOption.*; -import io.anuke.mindustry.world.*; +import mindustry.content.Blocks; +import mindustry.maps.filters.FilterOption.BlockOption; +import mindustry.maps.filters.FilterOption.SliderOption; +import mindustry.world.Block; -import static io.anuke.mindustry.maps.filters.FilterOption.*; +import static mindustry.maps.filters.FilterOption.*; public class ScatterFilter extends GenerateFilter{ protected float chance = 0.014f; diff --git a/core/src/io/anuke/mindustry/maps/filters/TerrainFilter.java b/core/src/mindustry/maps/filters/TerrainFilter.java similarity index 78% rename from core/src/io/anuke/mindustry/maps/filters/TerrainFilter.java rename to core/src/mindustry/maps/filters/TerrainFilter.java index ef8e109e05..ec0d87ce8c 100644 --- a/core/src/io/anuke/mindustry/maps/filters/TerrainFilter.java +++ b/core/src/mindustry/maps/filters/TerrainFilter.java @@ -1,12 +1,13 @@ -package io.anuke.mindustry.maps.filters; +package mindustry.maps.filters; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.maps.filters.FilterOption.*; -import io.anuke.mindustry.world.*; +import arc.math.Mathf; +import mindustry.content.Blocks; +import mindustry.maps.filters.FilterOption.BlockOption; +import mindustry.maps.filters.FilterOption.SliderOption; +import mindustry.world.Block; -import static io.anuke.mindustry.maps.filters.FilterOption.*; +import static mindustry.maps.filters.FilterOption.floorsOnly; +import static mindustry.maps.filters.FilterOption.wallsOnly; public class TerrainFilter extends GenerateFilter{ float scl = 40, threshold = 0.9f, octaves = 3f, falloff = 0.5f, magnitude = 1f, circleScl = 2.1f; diff --git a/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java b/core/src/mindustry/maps/generators/BasicGenerator.java similarity index 95% rename from core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java rename to core/src/mindustry/maps/generators/BasicGenerator.java index dcff53d5f3..10844908bf 100644 --- a/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java +++ b/core/src/mindustry/maps/generators/BasicGenerator.java @@ -1,15 +1,15 @@ -package io.anuke.mindustry.maps.generators; +package mindustry.maps.generators; -import io.anuke.arc.collection.*; -import io.anuke.arc.func.Intc2; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.math.geom.Geometry; -import io.anuke.arc.math.geom.Point2; -import io.anuke.arc.util.Structs; -import io.anuke.arc.util.noise.Simplex; -import io.anuke.mindustry.content.Blocks; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.Floor; +import arc.struct.*; +import arc.func.Intc2; +import arc.math.Mathf; +import arc.math.geom.Geometry; +import arc.math.geom.Point2; +import arc.util.Structs; +import arc.util.noise.Simplex; +import mindustry.content.Blocks; +import mindustry.world.*; +import mindustry.world.blocks.Floor; import java.util.PriorityQueue; diff --git a/core/src/io/anuke/mindustry/maps/generators/Generator.java b/core/src/mindustry/maps/generators/Generator.java similarity index 76% rename from core/src/io/anuke/mindustry/maps/generators/Generator.java rename to core/src/mindustry/maps/generators/Generator.java index 85aecaec75..4a535de45c 100644 --- a/core/src/io/anuke/mindustry/maps/generators/Generator.java +++ b/core/src/mindustry/maps/generators/Generator.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.maps.generators; +package mindustry.maps.generators; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.world.*; +import mindustry.game.*; +import mindustry.world.*; public abstract class Generator{ public int width, height; diff --git a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java b/core/src/mindustry/maps/generators/MapGenerator.java similarity index 83% rename from core/src/io/anuke/mindustry/maps/generators/MapGenerator.java rename to core/src/mindustry/maps/generators/MapGenerator.java index 9dc0e314d6..36730b8b3c 100644 --- a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java +++ b/core/src/mindustry/maps/generators/MapGenerator.java @@ -1,16 +1,16 @@ -package io.anuke.mindustry.maps.generators; +package mindustry.maps.generators; -import io.anuke.arc.math.*; -import io.anuke.arc.math.geom.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.io.*; -import io.anuke.mindustry.maps.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.storage.*; +import arc.math.*; +import arc.math.geom.*; +import mindustry.content.*; +import mindustry.game.*; +import mindustry.io.*; +import mindustry.maps.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.blocks.storage.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; //TODO: //- limited # of enemy spawns as filter diff --git a/core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java b/core/src/mindustry/maps/generators/RandomGenerator.java similarity index 80% rename from core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java rename to core/src/mindustry/maps/generators/RandomGenerator.java index f600b9b306..924c373be2 100644 --- a/core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java +++ b/core/src/mindustry/maps/generators/RandomGenerator.java @@ -1,11 +1,12 @@ -package io.anuke.mindustry.maps.generators; +package mindustry.maps.generators; -import io.anuke.arc.collection.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.maps.*; -import io.anuke.mindustry.world.*; +import arc.struct.StringMap; +import mindustry.content.Blocks; +import mindustry.maps.Map; +import mindustry.world.Block; +import mindustry.world.Tile; -import static io.anuke.mindustry.Vars.world; +import static mindustry.Vars.world; public abstract class RandomGenerator extends Generator{ protected Block floor; diff --git a/core/src/io/anuke/mindustry/maps/zonegen/DesertWastesGenerator.java b/core/src/mindustry/maps/zonegen/DesertWastesGenerator.java similarity index 88% rename from core/src/io/anuke/mindustry/maps/zonegen/DesertWastesGenerator.java rename to core/src/mindustry/maps/zonegen/DesertWastesGenerator.java index e1bba700fc..a3ee4b6004 100644 --- a/core/src/io/anuke/mindustry/maps/zonegen/DesertWastesGenerator.java +++ b/core/src/mindustry/maps/zonegen/DesertWastesGenerator.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.maps.zonegen; +package mindustry.maps.zonegen; -import io.anuke.arc.math.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.maps.generators.*; -import io.anuke.mindustry.world.*; +import arc.math.Mathf; +import mindustry.content.Blocks; +import mindustry.maps.generators.BasicGenerator; +import mindustry.world.*; -import static io.anuke.mindustry.Vars.schematics; +import static mindustry.Vars.schematics; public class DesertWastesGenerator extends BasicGenerator{ diff --git a/core/src/io/anuke/mindustry/maps/zonegen/OvergrowthGenerator.java b/core/src/mindustry/maps/zonegen/OvergrowthGenerator.java similarity index 87% rename from core/src/io/anuke/mindustry/maps/zonegen/OvergrowthGenerator.java rename to core/src/mindustry/maps/zonegen/OvergrowthGenerator.java index 569c2697ee..e618a7faf1 100644 --- a/core/src/io/anuke/mindustry/maps/zonegen/OvergrowthGenerator.java +++ b/core/src/mindustry/maps/zonegen/OvergrowthGenerator.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.maps.zonegen; +package mindustry.maps.zonegen; -import io.anuke.arc.math.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.maps.generators.*; -import io.anuke.mindustry.world.*; +import arc.math.Mathf; +import mindustry.content.Blocks; +import mindustry.maps.generators.BasicGenerator; +import mindustry.world.Tile; -import static io.anuke.mindustry.Vars.schematics; +import static mindustry.Vars.schematics; public class OvergrowthGenerator extends BasicGenerator{ diff --git a/core/src/mindustry/mod/ClassAccess.java b/core/src/mindustry/mod/ClassAccess.java new file mode 100644 index 0000000000..62f089a107 --- /dev/null +++ b/core/src/mindustry/mod/ClassAccess.java @@ -0,0 +1,7 @@ +package mindustry.mod; + +import arc.struct.*; +//obviously autogenerated, do not touch +public class ClassAccess{ + public static final ObjectSet allowedClassNames = ObjectSet.with("arc.Core", "arc.func.Boolc", "arc.func.Boolf", "arc.func.Boolf2", "arc.func.Boolp", "arc.func.Cons", "arc.func.Cons2", "arc.func.Floatc", "arc.func.Floatc2", "arc.func.Floatc4", "arc.func.Floatf", "arc.func.Floatp", "arc.func.Func", "arc.func.Func2", "arc.func.Func3", "arc.func.Intc", "arc.func.Intc2", "arc.func.Intc4", "arc.func.Intf", "arc.func.Intp", "arc.func.Prov", "arc.graphics.Color", "arc.graphics.Pixmap", "arc.graphics.Texture", "arc.graphics.TextureData", "arc.graphics.g2d.Draw", "arc.graphics.g2d.Fill", "arc.graphics.g2d.Lines", "arc.graphics.g2d.TextureAtlas", "arc.graphics.g2d.TextureAtlas$AtlasRegion", "arc.graphics.g2d.TextureRegion", "arc.math.Angles", "arc.math.Mathf", "arc.scene.Action", "arc.scene.Element", "arc.scene.Group", "arc.scene.Scene", "arc.scene.actions.Actions", "arc.scene.actions.AddAction", "arc.scene.actions.AddListenerAction", "arc.scene.actions.AfterAction", "arc.scene.actions.AlphaAction", "arc.scene.actions.ColorAction", "arc.scene.actions.DelayAction", "arc.scene.actions.DelegateAction", "arc.scene.actions.FloatAction", "arc.scene.actions.IntAction", "arc.scene.actions.LayoutAction", "arc.scene.actions.MoveByAction", "arc.scene.actions.MoveToAction", "arc.scene.actions.OriginAction", "arc.scene.actions.ParallelAction", "arc.scene.actions.RelativeTemporalAction", "arc.scene.actions.RemoveAction", "arc.scene.actions.RemoveActorAction", "arc.scene.actions.RemoveListenerAction", "arc.scene.actions.RepeatAction", "arc.scene.actions.RotateByAction", "arc.scene.actions.RotateToAction", "arc.scene.actions.RunnableAction", "arc.scene.actions.ScaleByAction", "arc.scene.actions.ScaleToAction", "arc.scene.actions.SequenceAction", "arc.scene.actions.SizeByAction", "arc.scene.actions.SizeToAction", "arc.scene.actions.TemporalAction", "arc.scene.actions.TimeScaleAction", "arc.scene.actions.TouchableAction", "arc.scene.actions.TranslateByAction", "arc.scene.actions.VisibleAction", "arc.scene.event.ChangeListener", "arc.scene.event.ChangeListener$ChangeEvent", "arc.scene.event.ClickListener", "arc.scene.event.DragListener", "arc.scene.event.DragScrollListener", "arc.scene.event.ElementGestureListener", "arc.scene.event.EventListener", "arc.scene.event.FocusListener", "arc.scene.event.FocusListener$FocusEvent", "arc.scene.event.FocusListener$FocusEvent$Type", "arc.scene.event.HandCursorListener", "arc.scene.event.IbeamCursorListener", "arc.scene.event.InputEvent", "arc.scene.event.InputEvent$Type", "arc.scene.event.InputListener", "arc.scene.event.SceneEvent", "arc.scene.event.Touchable", "arc.scene.event.VisibilityEvent", "arc.scene.event.VisibilityListener", "arc.scene.style.BaseDrawable", "arc.scene.style.Drawable", "arc.scene.style.NinePatchDrawable", "arc.scene.style.ScaledNinePatchDrawable", "arc.scene.style.Style", "arc.scene.style.TextureRegionDrawable", "arc.scene.style.TiledDrawable", "arc.scene.style.TransformDrawable", "arc.scene.ui.Button", "arc.scene.ui.Button$ButtonStyle", "arc.scene.ui.ButtonGroup", "arc.scene.ui.CheckBox", "arc.scene.ui.CheckBox$CheckBoxStyle", "arc.scene.ui.ColorImage", "arc.scene.ui.Dialog", "arc.scene.ui.Dialog$DialogStyle", "arc.scene.ui.Image", "arc.scene.ui.ImageButton", "arc.scene.ui.ImageButton$ImageButtonStyle", "arc.scene.ui.KeybindDialog", "arc.scene.ui.KeybindDialog$KeybindDialogStyle", "arc.scene.ui.Label", "arc.scene.ui.Label$LabelStyle", "arc.scene.ui.ProgressBar", "arc.scene.ui.ProgressBar$ProgressBarStyle", "arc.scene.ui.ScrollPane", "arc.scene.ui.ScrollPane$ScrollPaneStyle", "arc.scene.ui.SettingsDialog", "arc.scene.ui.SettingsDialog$SettingsTable", "arc.scene.ui.SettingsDialog$SettingsTable$CheckSetting", "arc.scene.ui.SettingsDialog$SettingsTable$Setting", "arc.scene.ui.SettingsDialog$SettingsTable$SliderSetting", "arc.scene.ui.SettingsDialog$StringProcessor", "arc.scene.ui.Slider", "arc.scene.ui.Slider$SliderStyle", "arc.scene.ui.TextArea", "arc.scene.ui.TextArea$TextAreaListener", "arc.scene.ui.TextButton", "arc.scene.ui.TextButton$TextButtonStyle", "arc.scene.ui.TextField", "arc.scene.ui.TextField$DefaultOnscreenKeyboard", "arc.scene.ui.TextField$OnscreenKeyboard", "arc.scene.ui.TextField$TextFieldClickListener", "arc.scene.ui.TextField$TextFieldFilter", "arc.scene.ui.TextField$TextFieldListener", "arc.scene.ui.TextField$TextFieldStyle", "arc.scene.ui.TextField$TextFieldValidator", "arc.scene.ui.Tooltip", "arc.scene.ui.Tooltip$Tooltips", "arc.scene.ui.Touchpad", "arc.scene.ui.Touchpad$TouchpadStyle", "arc.scene.ui.TreeElement", "arc.scene.ui.TreeElement$Node", "arc.scene.ui.TreeElement$TreeStyle", "arc.scene.ui.layout.Cell", "arc.scene.ui.layout.Collapser", "arc.scene.ui.layout.HorizontalGroup", "arc.scene.ui.layout.Scl", "arc.scene.ui.layout.Stack", "arc.scene.ui.layout.Table", "arc.scene.ui.layout.Table$DrawRect", "arc.scene.ui.layout.VerticalGroup", "arc.scene.ui.layout.WidgetGroup", "arc.scene.utils.ArraySelection", "arc.scene.utils.Cullable", "arc.scene.utils.Disableable", "arc.scene.utils.DragAndDrop", "arc.scene.utils.DragAndDrop$Payload", "arc.scene.utils.DragAndDrop$Source", "arc.scene.utils.DragAndDrop$Target", "arc.scene.utils.Elements", "arc.scene.utils.Layout", "arc.scene.utils.Selection", "arc.struct.Array", "arc.struct.Array$ArrayIterable", "arc.struct.ArrayMap", "arc.struct.ArrayMap$Entries", "arc.struct.ArrayMap$Keys", "arc.struct.ArrayMap$Values", "arc.struct.AtomicQueue", "arc.struct.BinaryHeap", "arc.struct.BinaryHeap$Node", "arc.struct.Bits", "arc.struct.BooleanArray", "arc.struct.ByteArray", "arc.struct.CharArray", "arc.struct.ComparableTimSort", "arc.struct.DelayedRemovalArray", "arc.struct.EnumSet", "arc.struct.EnumSet$EnumSetIterator", "arc.struct.FloatArray", "arc.struct.GridBits", "arc.struct.GridMap", "arc.struct.IdentityMap", "arc.struct.IdentityMap$Entries", "arc.struct.IdentityMap$Entry", "arc.struct.IdentityMap$Keys", "arc.struct.IdentityMap$Values", "arc.struct.IntArray", "arc.struct.IntFloatMap", "arc.struct.IntFloatMap$Entries", "arc.struct.IntFloatMap$Entry", "arc.struct.IntFloatMap$Keys", "arc.struct.IntFloatMap$Values", "arc.struct.IntIntMap", "arc.struct.IntIntMap$Entries", "arc.struct.IntIntMap$Entry", "arc.struct.IntIntMap$Keys", "arc.struct.IntIntMap$Values", "arc.struct.IntMap", "arc.struct.IntMap$Entries", "arc.struct.IntMap$Entry", "arc.struct.IntMap$Keys", "arc.struct.IntMap$Values", "arc.struct.IntQueue", "arc.struct.IntSet", "arc.struct.IntSet$IntSetIterator", "arc.struct.LongArray", "arc.struct.LongMap", "arc.struct.LongMap$Entries", "arc.struct.LongMap$Entry", "arc.struct.LongMap$Keys", "arc.struct.LongMap$Values", "arc.struct.LongQueue", "arc.struct.ObjectFloatMap", "arc.struct.ObjectFloatMap$Entries", "arc.struct.ObjectFloatMap$Entry", "arc.struct.ObjectFloatMap$Keys", "arc.struct.ObjectFloatMap$Values", "arc.struct.ObjectIntMap", "arc.struct.ObjectIntMap$Entries", "arc.struct.ObjectIntMap$Entry", "arc.struct.ObjectIntMap$Keys", "arc.struct.ObjectIntMap$Values", "arc.struct.ObjectMap", "arc.struct.ObjectMap$Entries", "arc.struct.ObjectMap$Entry", "arc.struct.ObjectMap$Keys", "arc.struct.ObjectMap$Values", "arc.struct.ObjectSet", "arc.struct.ObjectSet$ObjectSetIterator", "arc.struct.OrderedMap", "arc.struct.OrderedMap$OrderedMapEntries", "arc.struct.OrderedMap$OrderedMapKeys", "arc.struct.OrderedMap$OrderedMapValues", "arc.struct.OrderedSet", "arc.struct.OrderedSet$OrderedSetIterator", "arc.struct.PooledLinkedList", "arc.struct.PooledLinkedList$Item", "arc.struct.Queue", "arc.struct.Queue$QueueIterable", "arc.struct.ShortArray", "arc.struct.SnapshotArray", "arc.struct.Sort", "arc.struct.SortedIntList", "arc.struct.SortedIntList$Iterator", "arc.struct.SortedIntList$Node", "arc.struct.StringMap", "arc.struct.TimSort", "arc.util.I18NBundle", "arc.util.Time", "java.io.PrintStream", "java.lang.Object", "java.lang.Runnable", "java.lang.String", "java.lang.System", "mindustry.Vars", "mindustry.ai.BlockIndexer", "mindustry.ai.Pathfinder", "mindustry.ai.Pathfinder$PathData", "mindustry.ai.Pathfinder$PathTarget", "mindustry.ai.Pathfinder$PathTileStruct", "mindustry.ai.WaveSpawner", "mindustry.content.Blocks", "mindustry.content.Bullets", "mindustry.content.Fx", "mindustry.content.Items", "mindustry.content.Liquids", "mindustry.content.Loadouts", "mindustry.content.Mechs", "mindustry.content.StatusEffects", "mindustry.content.TechTree", "mindustry.content.TechTree$TechNode", "mindustry.content.TypeIDs", "mindustry.content.UnitTypes", "mindustry.content.Zones", "mindustry.core.ContentLoader", "mindustry.core.Control", "mindustry.core.FileTree", "mindustry.core.GameState", "mindustry.core.GameState$State", "mindustry.core.Logic", "mindustry.core.Platform", "mindustry.core.Renderer", "mindustry.core.UI", "mindustry.core.Version", "mindustry.core.World", "mindustry.core.World$Raycaster", "mindustry.ctype.Content", "mindustry.ctype.Content$ModContentInfo", "mindustry.ctype.ContentList", "mindustry.ctype.ContentType", "mindustry.ctype.MappableContent", "mindustry.ctype.UnlockableContent", "mindustry.editor.DrawOperation", "mindustry.editor.DrawOperation$OpType", "mindustry.editor.DrawOperation$TileOpStruct", "mindustry.editor.EditorTile", "mindustry.editor.EditorTool", "mindustry.editor.MapEditor", "mindustry.editor.MapEditor$Context", "mindustry.editor.MapEditorDialog", "mindustry.editor.MapGenerateDialog", "mindustry.editor.MapInfoDialog", "mindustry.editor.MapLoadDialog", "mindustry.editor.MapRenderer", "mindustry.editor.MapResizeDialog", "mindustry.editor.MapSaveDialog", "mindustry.editor.MapView", "mindustry.editor.OperationStack", "mindustry.editor.WaveInfoDialog", "mindustry.entities.Damage", "mindustry.entities.Damage$PropCellStruct", "mindustry.entities.Effects", "mindustry.entities.Effects$Effect", "mindustry.entities.Effects$EffectContainer", "mindustry.entities.Effects$EffectProvider", "mindustry.entities.Effects$EffectRenderer", "mindustry.entities.Effects$ScreenshakeProvider", "mindustry.entities.Entities", "mindustry.entities.EntityCollisions", "mindustry.entities.EntityGroup", "mindustry.entities.Predict", "mindustry.entities.TargetPriority", "mindustry.entities.Units", "mindustry.entities.bullet.ArtilleryBulletType", "mindustry.entities.bullet.BasicBulletType", "mindustry.entities.bullet.BombBulletType", "mindustry.entities.bullet.BulletType", "mindustry.entities.bullet.FlakBulletType", "mindustry.entities.bullet.HealBulletType", "mindustry.entities.bullet.LiquidBulletType", "mindustry.entities.bullet.MassDriverBolt", "mindustry.entities.bullet.MissileBulletType", "mindustry.entities.effect.Decal", "mindustry.entities.effect.Fire", "mindustry.entities.effect.GroundEffectEntity", "mindustry.entities.effect.GroundEffectEntity$GroundEffect", "mindustry.entities.effect.ItemTransfer", "mindustry.entities.effect.Lightning", "mindustry.entities.effect.Puddle", "mindustry.entities.effect.RubbleDecal", "mindustry.entities.effect.ScorchDecal", "mindustry.entities.traits.AbsorbTrait", "mindustry.entities.traits.BelowLiquidTrait", "mindustry.entities.traits.BuilderMinerTrait", "mindustry.entities.traits.BuilderTrait", "mindustry.entities.traits.BuilderTrait$BuildDataStatic", "mindustry.entities.traits.BuilderTrait$BuildRequest", "mindustry.entities.traits.DamageTrait", "mindustry.entities.traits.DrawTrait", "mindustry.entities.traits.Entity", "mindustry.entities.traits.HealthTrait", "mindustry.entities.traits.KillerTrait", "mindustry.entities.traits.MinerTrait", "mindustry.entities.traits.MoveTrait", "mindustry.entities.traits.SaveTrait", "mindustry.entities.traits.Saveable", "mindustry.entities.traits.ScaleTrait", "mindustry.entities.traits.ShooterTrait", "mindustry.entities.traits.SolidTrait", "mindustry.entities.traits.SpawnerTrait", "mindustry.entities.traits.SyncTrait", "mindustry.entities.traits.TargetTrait", "mindustry.entities.traits.TeamTrait", "mindustry.entities.traits.TimeTrait", "mindustry.entities.traits.TypeTrait", "mindustry.entities.traits.VelocityTrait", "mindustry.entities.type.BaseEntity", "mindustry.entities.type.BaseUnit", "mindustry.entities.type.Bullet", "mindustry.entities.type.DestructibleEntity", "mindustry.entities.type.EffectEntity", "mindustry.entities.type.Player", "mindustry.entities.type.SolidEntity", "mindustry.entities.type.TileEntity", "mindustry.entities.type.TimedEntity", "mindustry.entities.type.Unit", "mindustry.entities.type.base.BaseDrone", "mindustry.entities.type.base.BuilderDrone", "mindustry.entities.type.base.FlyingUnit", "mindustry.entities.type.base.GroundUnit", "mindustry.entities.type.base.HoverUnit", "mindustry.entities.type.base.MinerDrone", "mindustry.entities.type.base.RepairDrone", "mindustry.entities.units.StateMachine", "mindustry.entities.units.Statuses", "mindustry.entities.units.Statuses$StatusEntry", "mindustry.entities.units.UnitCommand", "mindustry.entities.units.UnitDrops", "mindustry.entities.units.UnitState", "mindustry.game.DefaultWaves", "mindustry.game.Difficulty", "mindustry.game.EventType", "mindustry.game.EventType$BlockBuildBeginEvent", "mindustry.game.EventType$BlockBuildEndEvent", "mindustry.game.EventType$BlockDestroyEvent", "mindustry.game.EventType$BlockInfoEvent", "mindustry.game.EventType$BuildSelectEvent", "mindustry.game.EventType$ClientLoadEvent", "mindustry.game.EventType$CommandIssueEvent", "mindustry.game.EventType$ContentReloadEvent", "mindustry.game.EventType$CoreItemDeliverEvent", "mindustry.game.EventType$DepositEvent", "mindustry.game.EventType$DisposeEvent", "mindustry.game.EventType$GameOverEvent", "mindustry.game.EventType$LaunchEvent", "mindustry.game.EventType$LaunchItemEvent", "mindustry.game.EventType$LineConfirmEvent", "mindustry.game.EventType$LoseEvent", "mindustry.game.EventType$MapMakeEvent", "mindustry.game.EventType$MapPublishEvent", "mindustry.game.EventType$MechChangeEvent", "mindustry.game.EventType$PlayEvent", "mindustry.game.EventType$PlayerBanEvent", "mindustry.game.EventType$PlayerChatEvent", "mindustry.game.EventType$PlayerConnect", "mindustry.game.EventType$PlayerIpBanEvent", "mindustry.game.EventType$PlayerIpUnbanEvent", "mindustry.game.EventType$PlayerJoin", "mindustry.game.EventType$PlayerLeave", "mindustry.game.EventType$PlayerUnbanEvent", "mindustry.game.EventType$ResearchEvent", "mindustry.game.EventType$ResetEvent", "mindustry.game.EventType$ResizeEvent", "mindustry.game.EventType$ServerLoadEvent", "mindustry.game.EventType$StateChangeEvent", "mindustry.game.EventType$TapConfigEvent", "mindustry.game.EventType$TapEvent", "mindustry.game.EventType$TileChangeEvent", "mindustry.game.EventType$Trigger", "mindustry.game.EventType$TurretAmmoDeliverEvent", "mindustry.game.EventType$UnitCreateEvent", "mindustry.game.EventType$UnitDestroyEvent", "mindustry.game.EventType$UnlockEvent", "mindustry.game.EventType$WaveEvent", "mindustry.game.EventType$WinEvent", "mindustry.game.EventType$WithdrawEvent", "mindustry.game.EventType$WorldLoadEvent", "mindustry.game.EventType$ZoneConfigureCompleteEvent", "mindustry.game.EventType$ZoneRequireCompleteEvent", "mindustry.game.Gamemode", "mindustry.game.GlobalData", "mindustry.game.LoopControl", "mindustry.game.MusicControl", "mindustry.game.Objective", "mindustry.game.Objectives", "mindustry.game.Objectives$Launched", "mindustry.game.Objectives$Unlock", "mindustry.game.Objectives$Wave", "mindustry.game.Objectives$ZoneObjective", "mindustry.game.Objectives$ZoneWave", "mindustry.game.Rules", "mindustry.game.Saves", "mindustry.game.Saves$SaveSlot", "mindustry.game.Schematic", "mindustry.game.Schematic$Stile", "mindustry.game.Schematics", "mindustry.game.SoundLoop", "mindustry.game.SpawnGroup", "mindustry.game.Stats", "mindustry.game.Stats$Rank", "mindustry.game.Stats$RankResult", "mindustry.game.Team", "mindustry.game.Teams", "mindustry.game.Teams$BrokenBlock", "mindustry.game.Teams$TeamData", "mindustry.game.Tutorial", "mindustry.game.Tutorial$TutorialStage", "mindustry.gen.BufferItem", "mindustry.gen.Call", "mindustry.gen.Call", "mindustry.gen.Icon", "mindustry.gen.Icon", "mindustry.gen.MethodHash", "mindustry.gen.Musics", "mindustry.gen.Musics", "mindustry.gen.PathTile", "mindustry.gen.PropCell", "mindustry.gen.RemoteReadClient", "mindustry.gen.RemoteReadServer", "mindustry.gen.Serialization", "mindustry.gen.Sounds", "mindustry.gen.Sounds", "mindustry.gen.Tex", "mindustry.gen.Tex", "mindustry.gen.TileOp", "mindustry.graphics.BlockRenderer", "mindustry.graphics.Bloom", "mindustry.graphics.CacheLayer", "mindustry.graphics.Drawf", "mindustry.graphics.FloorRenderer", "mindustry.graphics.IndexedRenderer", "mindustry.graphics.Layer", "mindustry.graphics.LightRenderer", "mindustry.graphics.MenuRenderer", "mindustry.graphics.MinimapRenderer", "mindustry.graphics.MultiPacker", "mindustry.graphics.MultiPacker$PageType", "mindustry.graphics.OverlayRenderer", "mindustry.graphics.Pal", "mindustry.graphics.Pixelator", "mindustry.graphics.Shaders", "mindustry.input.Binding", "mindustry.input.DesktopInput", "mindustry.input.InputHandler", "mindustry.input.InputHandler$PlaceLine", "mindustry.input.MobileInput", "mindustry.input.PlaceMode", "mindustry.input.Placement", "mindustry.input.Placement$DistanceHeuristic", "mindustry.input.Placement$NormalizeDrawResult", "mindustry.input.Placement$NormalizeResult", "mindustry.input.Placement$TileHueristic", "mindustry.maps.Map", "mindustry.maps.Maps", "mindustry.maps.Maps$MapProvider", "mindustry.maps.Maps$ShuffleMode", "mindustry.maps.Maps$ShuffleMode", "mindustry.maps.filters.BlendFilter", "mindustry.maps.filters.ClearFilter", "mindustry.maps.filters.DistortFilter", "mindustry.maps.filters.FilterOption", "mindustry.maps.filters.FilterOption$BlockOption", "mindustry.maps.filters.FilterOption$SliderOption", "mindustry.maps.filters.GenerateFilter", "mindustry.maps.filters.GenerateFilter$GenerateInput", "mindustry.maps.filters.GenerateFilter$GenerateInput$TileProvider", "mindustry.maps.filters.MedianFilter", "mindustry.maps.filters.MirrorFilter", "mindustry.maps.filters.NoiseFilter", "mindustry.maps.filters.OreFilter", "mindustry.maps.filters.OreMedianFilter", "mindustry.maps.filters.RiverNoiseFilter", "mindustry.maps.filters.ScatterFilter", "mindustry.maps.filters.TerrainFilter", "mindustry.maps.generators.BasicGenerator", "mindustry.maps.generators.BasicGenerator$DistanceHeuristic", "mindustry.maps.generators.BasicGenerator$TileHueristic", "mindustry.maps.generators.Generator", "mindustry.maps.generators.MapGenerator", "mindustry.maps.generators.MapGenerator$Decoration", "mindustry.maps.generators.RandomGenerator", "mindustry.maps.zonegen.DesertWastesGenerator", "mindustry.maps.zonegen.OvergrowthGenerator", "mindustry.type.Category", "mindustry.type.ErrorContent", "mindustry.type.Item", "mindustry.type.ItemStack", "mindustry.type.ItemType", "mindustry.type.Liquid", "mindustry.type.LiquidStack", "mindustry.type.Mech", "mindustry.type.Publishable", "mindustry.type.StatusEffect", "mindustry.type.StatusEffect$TransitionHandler", "mindustry.type.TypeID", "mindustry.type.UnitType", "mindustry.type.Weapon", "mindustry.type.WeatherEvent", "mindustry.type.Zone", "mindustry.ui.Bar", "mindustry.ui.BorderImage", "mindustry.ui.Cicon", "mindustry.ui.ContentDisplay", "mindustry.ui.Fonts", "mindustry.ui.GridImage", "mindustry.ui.IconSize", "mindustry.ui.IntFormat", "mindustry.ui.ItemDisplay", "mindustry.ui.ItemImage", "mindustry.ui.ItemsDisplay", "mindustry.ui.Links", "mindustry.ui.Links$LinkEntry", "mindustry.ui.LiquidDisplay", "mindustry.ui.Minimap", "mindustry.ui.MobileButton", "mindustry.ui.MultiReqImage", "mindustry.ui.ReqImage", "mindustry.ui.Styles", "mindustry.ui.dialogs.AboutDialog", "mindustry.ui.dialogs.AdminsDialog", "mindustry.ui.dialogs.BansDialog", "mindustry.ui.dialogs.ColorPicker", "mindustry.ui.dialogs.ContentInfoDialog", "mindustry.ui.dialogs.ControlsDialog", "mindustry.ui.dialogs.CustomGameDialog", "mindustry.ui.dialogs.CustomRulesDialog", "mindustry.ui.dialogs.DatabaseDialog", "mindustry.ui.dialogs.DeployDialog", "mindustry.ui.dialogs.DeployDialog$View", "mindustry.ui.dialogs.DeployDialog$ZoneNode", "mindustry.ui.dialogs.DiscordDialog", "mindustry.ui.dialogs.FileChooser", "mindustry.ui.dialogs.FileChooser$FileHistory", "mindustry.ui.dialogs.FloatingDialog", "mindustry.ui.dialogs.GameOverDialog", "mindustry.ui.dialogs.HostDialog", "mindustry.ui.dialogs.JoinDialog", "mindustry.ui.dialogs.JoinDialog$Server", "mindustry.ui.dialogs.LanguageDialog", "mindustry.ui.dialogs.LoadDialog", "mindustry.ui.dialogs.LoadoutDialog", "mindustry.ui.dialogs.MapPlayDialog", "mindustry.ui.dialogs.MapsDialog", "mindustry.ui.dialogs.MinimapDialog", "mindustry.ui.dialogs.ModsDialog", "mindustry.ui.dialogs.PaletteDialog", "mindustry.ui.dialogs.PausedDialog", "mindustry.ui.dialogs.SaveDialog", "mindustry.ui.dialogs.SchematicsDialog", "mindustry.ui.dialogs.SchematicsDialog$SchematicImage", "mindustry.ui.dialogs.SchematicsDialog$SchematicInfoDialog", "mindustry.ui.dialogs.SettingsMenuDialog", "mindustry.ui.dialogs.TechTreeDialog", "mindustry.ui.dialogs.TechTreeDialog$LayoutNode", "mindustry.ui.dialogs.TechTreeDialog$TechTreeNode", "mindustry.ui.dialogs.TechTreeDialog$View", "mindustry.ui.dialogs.TraceDialog", "mindustry.ui.dialogs.ZoneInfoDialog", "mindustry.ui.fragments.BlockConfigFragment", "mindustry.ui.fragments.BlockInventoryFragment", "mindustry.ui.fragments.ChatFragment", "mindustry.ui.fragments.FadeInFragment", "mindustry.ui.fragments.Fragment", "mindustry.ui.fragments.HudFragment", "mindustry.ui.fragments.LoadingFragment", "mindustry.ui.fragments.MenuFragment", "mindustry.ui.fragments.OverlayFragment", "mindustry.ui.fragments.PlacementFragment", "mindustry.ui.fragments.PlayerListFragment", "mindustry.ui.fragments.ScriptConsoleFragment", "mindustry.ui.layout.BranchTreeLayout", "mindustry.ui.layout.BranchTreeLayout$TreeAlignment", "mindustry.ui.layout.BranchTreeLayout$TreeLocation", "mindustry.ui.layout.RadialTreeLayout", "mindustry.ui.layout.TreeLayout", "mindustry.ui.layout.TreeLayout$TreeNode", "mindustry.world.Block", "mindustry.world.BlockStorage", "mindustry.world.Build", "mindustry.world.CachedTile", "mindustry.world.DirectionalItemBuffer", "mindustry.world.DirectionalItemBuffer$BufferItemStruct", "mindustry.world.Edges", "mindustry.world.ItemBuffer", "mindustry.world.LegacyColorMapper", "mindustry.world.LegacyColorMapper$LegacyBlock", "mindustry.world.Pos", "mindustry.world.StaticTree", "mindustry.world.Tile", "mindustry.world.WorldContext", "mindustry.world.blocks.Attributes", "mindustry.world.blocks.Autotiler", "mindustry.world.blocks.Autotiler$AutotilerHolder", "mindustry.world.blocks.BlockPart", "mindustry.world.blocks.BuildBlock", "mindustry.world.blocks.BuildBlock$BuildEntity", "mindustry.world.blocks.DoubleOverlayFloor", "mindustry.world.blocks.Floor", "mindustry.world.blocks.ItemSelection", "mindustry.world.blocks.LiquidBlock", "mindustry.world.blocks.OreBlock", "mindustry.world.blocks.OverlayFloor", "mindustry.world.blocks.PowerBlock", "mindustry.world.blocks.RespawnBlock", "mindustry.world.blocks.Rock", "mindustry.world.blocks.StaticWall", "mindustry.world.blocks.TreeBlock", "mindustry.world.blocks.defense.DeflectorWall", "mindustry.world.blocks.defense.DeflectorWall$DeflectorEntity", "mindustry.world.blocks.defense.Door", "mindustry.world.blocks.defense.Door$DoorEntity", "mindustry.world.blocks.defense.ForceProjector", "mindustry.world.blocks.defense.ForceProjector$ForceEntity", "mindustry.world.blocks.defense.ForceProjector$ShieldEntity", "mindustry.world.blocks.defense.MendProjector", "mindustry.world.blocks.defense.MendProjector$MendEntity", "mindustry.world.blocks.defense.OverdriveProjector", "mindustry.world.blocks.defense.OverdriveProjector$OverdriveEntity", "mindustry.world.blocks.defense.ShockMine", "mindustry.world.blocks.defense.SurgeWall", "mindustry.world.blocks.defense.Wall", "mindustry.world.blocks.defense.turrets.ArtilleryTurret", "mindustry.world.blocks.defense.turrets.BurstTurret", "mindustry.world.blocks.defense.turrets.ChargeTurret", "mindustry.world.blocks.defense.turrets.ChargeTurret$LaserTurretEntity", "mindustry.world.blocks.defense.turrets.CooledTurret", "mindustry.world.blocks.defense.turrets.DoubleTurret", "mindustry.world.blocks.defense.turrets.ItemTurret", "mindustry.world.blocks.defense.turrets.ItemTurret$ItemEntry", "mindustry.world.blocks.defense.turrets.ItemTurret$ItemTurretEntity", "mindustry.world.blocks.defense.turrets.LaserTurret", "mindustry.world.blocks.defense.turrets.LaserTurret$LaserTurretEntity", "mindustry.world.blocks.defense.turrets.LiquidTurret", "mindustry.world.blocks.defense.turrets.PowerTurret", "mindustry.world.blocks.defense.turrets.Turret", "mindustry.world.blocks.defense.turrets.Turret$AmmoEntry", "mindustry.world.blocks.defense.turrets.Turret$TurretEntity", "mindustry.world.blocks.distribution.ArmoredConveyor", "mindustry.world.blocks.distribution.BufferedItemBridge", "mindustry.world.blocks.distribution.BufferedItemBridge$BufferedItemBridgeEntity", "mindustry.world.blocks.distribution.Conveyor", "mindustry.world.blocks.distribution.Conveyor$ConveyorEntity", "mindustry.world.blocks.distribution.Conveyor$ItemPos", "mindustry.world.blocks.distribution.ExtendingItemBridge", "mindustry.world.blocks.distribution.ItemBridge", "mindustry.world.blocks.distribution.ItemBridge$ItemBridgeEntity", "mindustry.world.blocks.distribution.Junction", "mindustry.world.blocks.distribution.Junction$JunctionEntity", "mindustry.world.blocks.distribution.MassDriver", "mindustry.world.blocks.distribution.MassDriver$DriverBulletData", "mindustry.world.blocks.distribution.MassDriver$DriverState", "mindustry.world.blocks.distribution.MassDriver$MassDriverEntity", "mindustry.world.blocks.distribution.OverflowGate", "mindustry.world.blocks.distribution.OverflowGate$OverflowGateEntity", "mindustry.world.blocks.distribution.Router", "mindustry.world.blocks.distribution.Router$RouterEntity", "mindustry.world.blocks.distribution.Sorter", "mindustry.world.blocks.distribution.Sorter$SorterEntity", "mindustry.world.blocks.liquid.ArmoredConduit", "mindustry.world.blocks.liquid.Conduit", "mindustry.world.blocks.liquid.Conduit$ConduitEntity", "mindustry.world.blocks.liquid.LiquidBridge", "mindustry.world.blocks.liquid.LiquidExtendingBridge", "mindustry.world.blocks.liquid.LiquidJunction", "mindustry.world.blocks.liquid.LiquidOverflowGate", "mindustry.world.blocks.liquid.LiquidRouter", "mindustry.world.blocks.liquid.LiquidTank", "mindustry.world.blocks.logic.LogicBlock", "mindustry.world.blocks.logic.MessageBlock", "mindustry.world.blocks.logic.MessageBlock$MessageBlockEntity", "mindustry.world.blocks.power.Battery", "mindustry.world.blocks.power.BurnerGenerator", "mindustry.world.blocks.power.ConditionalConsumePower", "mindustry.world.blocks.power.DecayGenerator", "mindustry.world.blocks.power.ImpactReactor", "mindustry.world.blocks.power.ImpactReactor$FusionReactorEntity", "mindustry.world.blocks.power.ItemLiquidGenerator", "mindustry.world.blocks.power.ItemLiquidGenerator$ItemLiquidGeneratorEntity", "mindustry.world.blocks.power.LightBlock", "mindustry.world.blocks.power.LightBlock$LightEntity", "mindustry.world.blocks.power.NuclearReactor", "mindustry.world.blocks.power.NuclearReactor$NuclearReactorEntity", "mindustry.world.blocks.power.PowerDiode", "mindustry.world.blocks.power.PowerDistributor", "mindustry.world.blocks.power.PowerGenerator", "mindustry.world.blocks.power.PowerGenerator$GeneratorEntity", "mindustry.world.blocks.power.PowerGraph", "mindustry.world.blocks.power.PowerNode", "mindustry.world.blocks.power.SingleTypeGenerator", "mindustry.world.blocks.power.SolarGenerator", "mindustry.world.blocks.power.ThermalGenerator", "mindustry.world.blocks.production.Cultivator", "mindustry.world.blocks.production.Cultivator$CultivatorEntity", "mindustry.world.blocks.production.Drill", "mindustry.world.blocks.production.Drill$DrillEntity", "mindustry.world.blocks.production.Fracker", "mindustry.world.blocks.production.Fracker$FrackerEntity", "mindustry.world.blocks.production.GenericCrafter", "mindustry.world.blocks.production.GenericCrafter$GenericCrafterEntity", "mindustry.world.blocks.production.GenericSmelter", "mindustry.world.blocks.production.Incinerator", "mindustry.world.blocks.production.Incinerator$IncineratorEntity", "mindustry.world.blocks.production.LiquidConverter", "mindustry.world.blocks.production.Pump", "mindustry.world.blocks.production.Separator", "mindustry.world.blocks.production.SolidPump", "mindustry.world.blocks.production.SolidPump$SolidPumpEntity", "mindustry.world.blocks.sandbox.ItemSource", "mindustry.world.blocks.sandbox.ItemSource$ItemSourceEntity", "mindustry.world.blocks.sandbox.ItemVoid", "mindustry.world.blocks.sandbox.LiquidSource", "mindustry.world.blocks.sandbox.LiquidSource$LiquidSourceEntity", "mindustry.world.blocks.sandbox.PowerSource", "mindustry.world.blocks.sandbox.PowerVoid", "mindustry.world.blocks.storage.CoreBlock", "mindustry.world.blocks.storage.CoreBlock$CoreEntity", "mindustry.world.blocks.storage.LaunchPad", "mindustry.world.blocks.storage.StorageBlock", "mindustry.world.blocks.storage.StorageBlock$StorageBlockEntity", "mindustry.world.blocks.storage.Unloader", "mindustry.world.blocks.storage.Unloader$UnloaderEntity", "mindustry.world.blocks.storage.Vault", "mindustry.world.blocks.units.CommandCenter", "mindustry.world.blocks.units.CommandCenter$CommandCenterEntity", "mindustry.world.blocks.units.MechPad", "mindustry.world.blocks.units.MechPad$MechFactoryEntity", "mindustry.world.blocks.units.RallyPoint", "mindustry.world.blocks.units.RepairPoint", "mindustry.world.blocks.units.RepairPoint$RepairPointEntity", "mindustry.world.blocks.units.UnitFactory", "mindustry.world.blocks.units.UnitFactory$UnitFactoryEntity", "mindustry.world.consumers.Consume", "mindustry.world.consumers.ConsumeItemFilter", "mindustry.world.consumers.ConsumeItems", "mindustry.world.consumers.ConsumeLiquid", "mindustry.world.consumers.ConsumeLiquidBase", "mindustry.world.consumers.ConsumeLiquidFilter", "mindustry.world.consumers.ConsumePower", "mindustry.world.consumers.ConsumeType", "mindustry.world.consumers.Consumers", "mindustry.world.meta.Attribute", "mindustry.world.meta.BlockBars", "mindustry.world.meta.BlockFlag", "mindustry.world.meta.BlockGroup", "mindustry.world.meta.BlockStat", "mindustry.world.meta.BlockStats", "mindustry.world.meta.BuildVisibility", "mindustry.world.meta.PowerType", "mindustry.world.meta.Producers", "mindustry.world.meta.StatCategory", "mindustry.world.meta.StatUnit", "mindustry.world.meta.StatValue", "mindustry.world.meta.values.AmmoListValue", "mindustry.world.meta.values.BooleanValue", "mindustry.world.meta.values.BoosterListValue", "mindustry.world.meta.values.ItemFilterValue", "mindustry.world.meta.values.ItemListValue", "mindustry.world.meta.values.LiquidFilterValue", "mindustry.world.meta.values.LiquidValue", "mindustry.world.meta.values.NumberValue", "mindustry.world.meta.values.StringValue", "mindustry.world.modules.BlockModule", "mindustry.world.modules.ConsumeModule", "mindustry.world.modules.ItemModule", "mindustry.world.modules.ItemModule$ItemCalculator", "mindustry.world.modules.ItemModule$ItemConsumer", "mindustry.world.modules.LiquidModule", "mindustry.world.modules.LiquidModule$LiquidCalculator", "mindustry.world.modules.LiquidModule$LiquidConsumer", "mindustry.world.modules.PowerModule", "mindustry.world.producers.Produce", "mindustry.world.producers.ProduceItem"); +} \ No newline at end of file diff --git a/core/src/io/anuke/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java similarity index 91% rename from core/src/io/anuke/mindustry/mod/ContentParser.java rename to core/src/mindustry/mod/ContentParser.java index 188ad82bee..3ea54d6160 100644 --- a/core/src/io/anuke/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -1,34 +1,34 @@ -package io.anuke.mindustry.mod; +package mindustry.mod; -import io.anuke.arc.*; -import io.anuke.arc.assets.*; -import io.anuke.arc.audio.*; -import io.anuke.arc.audio.mock.*; -import io.anuke.arc.collection.Array; -import io.anuke.arc.collection.*; -import io.anuke.arc.files.*; -import io.anuke.arc.func.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.serialization.*; -import io.anuke.arc.util.serialization.Json.*; -import io.anuke.arc.util.serialization.Jval.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.content.TechTree.*; -import io.anuke.mindustry.ctype.*; -import io.anuke.mindustry.entities.Effects.*; -import io.anuke.mindustry.entities.bullet.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.game.Objectives.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.mod.Mods.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.consumers.*; -import io.anuke.mindustry.world.meta.*; +import arc.*; +import arc.assets.*; +import arc.audio.*; +import arc.audio.mock.*; +import arc.struct.Array; +import arc.struct.*; +import arc.files.*; +import arc.func.*; +import arc.graphics.*; +import arc.util.ArcAnnotate.*; +import arc.util.*; +import arc.util.serialization.*; +import arc.util.serialization.Json.*; +import arc.util.serialization.Jval.*; +import mindustry.*; +import mindustry.content.*; +import mindustry.content.TechTree.*; +import mindustry.ctype.*; +import mindustry.entities.Effects.*; +import mindustry.entities.bullet.*; +import mindustry.entities.type.*; +import mindustry.game.*; +import mindustry.game.Objectives.*; +import mindustry.gen.*; +import mindustry.mod.Mods.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.consumers.*; +import mindustry.world.meta.*; import java.lang.reflect.*; @@ -78,7 +78,7 @@ public class ContentParser{ if(data.isString()){ return field(Bullets.class, data); } - Class bc = data.has("type") ? resolve(data.getString("type"), "io.anuke.mindustry.entities.bullet") : BasicBulletType.class; + Class bc = data.has("type") ? resolve(data.getString("type"), "mindustry.entities.bullet") : BasicBulletType.class; data.remove("type"); BulletType result = make(bc); readFields(result, data); @@ -97,7 +97,7 @@ public class ContentParser{ return sound; }); put(Objective.class, (type, data) -> { - Class oc = data.has("type") ? resolve(data.getString("type"), "io.anuke.mindustry.game.Objectives") : ZoneWave.class; + Class oc = data.has("type") ? resolve(data.getString("type"), "mindustry.game.Objectives") : ZoneWave.class; data.remove("type"); Objective obj = make(oc); readFields(obj, data); @@ -187,18 +187,18 @@ public class ContentParser{ try{ type = resolve(getType(value), - "io.anuke.mindustry.world", - "io.anuke.mindustry.world.blocks", - "io.anuke.mindustry.world.blocks.defense", - "io.anuke.mindustry.world.blocks.defense.turrets", - "io.anuke.mindustry.world.blocks.distribution", - "io.anuke.mindustry.world.blocks.liquid", - "io.anuke.mindustry.world.blocks.logic", - "io.anuke.mindustry.world.blocks.power", - "io.anuke.mindustry.world.blocks.production", - "io.anuke.mindustry.world.blocks.sandbox", - "io.anuke.mindustry.world.blocks.storage", - "io.anuke.mindustry.world.blocks.units" + "mindustry.world", + "mindustry.world.blocks", + "mindustry.world.blocks.defense", + "mindustry.world.blocks.defense.turrets", + "mindustry.world.blocks.distribution", + "mindustry.world.blocks.liquid", + "mindustry.world.blocks.logic", + "mindustry.world.blocks.power", + "mindustry.world.blocks.production", + "mindustry.world.blocks.sandbox", + "mindustry.world.blocks.storage", + "mindustry.world.blocks.units" ); }catch(IllegalArgumentException e){ type = Block.class; @@ -280,7 +280,7 @@ public class ContentParser{ UnitType unit; if(locate(ContentType.unit, name) == null){ - Class type = resolve(legacyUnitMap.get(Strings.capitalize(getType(value)), getType(value)), "io.anuke.mindustry.entities.type.base"); + Class type = resolve(legacyUnitMap.get(Strings.capitalize(getType(value)), getType(value)), "mindustry.entities.type.base"); unit = new UnitType(mod + "-" + name, supply(type)); }else{ unit = locate(ContentType.unit, name); @@ -460,7 +460,7 @@ public class ContentParser{ builder.append("[accent][[").append(e.getClass().getSimpleName().replace("Exception", "")) .append("][] ") .append(e.getMessage() != null ? - e.getMessage().replace("io.anuke.mindustry.", "").replace("io.anuke.arc.", "") : "").append("\n"); + e.getMessage().replace("mindustry.", "").replace("arc.", "") : "").append("\n"); } } return builder.toString(); diff --git a/core/src/io/anuke/mindustry/mod/Mod.java b/core/src/mindustry/mod/Mod.java similarity index 84% rename from core/src/io/anuke/mindustry/mod/Mod.java rename to core/src/mindustry/mod/Mod.java index 5bab31b341..5b4c31b7a0 100644 --- a/core/src/io/anuke/mindustry/mod/Mod.java +++ b/core/src/mindustry/mod/Mod.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.mod; +package mindustry.mod; -import io.anuke.arc.files.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; +import arc.files.*; +import arc.util.*; +import mindustry.*; public class Mod{ /** @return the config file for this plugin, as the file 'mods/[plugin-name]/config.json'.*/ diff --git a/core/src/io/anuke/mindustry/mod/ModLoadingSound.java b/core/src/mindustry/mod/ModLoadingSound.java similarity index 93% rename from core/src/io/anuke/mindustry/mod/ModLoadingSound.java rename to core/src/mindustry/mod/ModLoadingSound.java index 43d30f4617..558b29ce28 100644 --- a/core/src/io/anuke/mindustry/mod/ModLoadingSound.java +++ b/core/src/mindustry/mod/ModLoadingSound.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.mod; +package mindustry.mod; -import io.anuke.arc.audio.*; -import io.anuke.arc.audio.mock.*; -import io.anuke.arc.math.geom.*; -import io.anuke.arc.util.ArcAnnotate.*; +import arc.audio.*; +import arc.audio.mock.*; +import arc.math.geom.*; +import arc.util.ArcAnnotate.*; public class ModLoadingSound implements Sound{ public @NonNull Sound sound = new MockSound(); diff --git a/core/src/io/anuke/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java similarity index 96% rename from core/src/io/anuke/mindustry/mod/Mods.java rename to core/src/mindustry/mod/Mods.java index 7e287301a0..e4da45357b 100644 --- a/core/src/io/anuke/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -1,34 +1,34 @@ -package io.anuke.mindustry.mod; +package mindustry.mod; -import io.anuke.arc.*; -import io.anuke.arc.assets.*; -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.Texture.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.graphics.g2d.TextureAtlas.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.arc.util.io.*; -import io.anuke.arc.util.serialization.*; -import io.anuke.arc.util.serialization.Jval.*; -import io.anuke.mindustry.core.*; -import io.anuke.mindustry.ctype.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.graphics.MultiPacker.*; -import io.anuke.mindustry.plugin.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.assets.*; +import arc.struct.*; +import arc.files.*; +import arc.func.*; +import arc.graphics.*; +import arc.graphics.Texture.*; +import arc.graphics.g2d.*; +import arc.graphics.g2d.TextureAtlas.*; +import arc.scene.ui.*; +import arc.util.*; +import arc.util.ArcAnnotate.*; +import arc.util.io.*; +import arc.util.serialization.*; +import arc.util.serialization.Jval.*; +import mindustry.core.*; +import mindustry.ctype.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.graphics.MultiPacker.*; +import mindustry.plugin.*; +import mindustry.type.*; +import mindustry.ui.*; import java.io.*; import java.net.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class Mods implements Loadable{ private Json json = new Json(); diff --git a/core/src/io/anuke/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java similarity index 88% rename from core/src/io/anuke/mindustry/mod/Scripts.java rename to core/src/mindustry/mod/Scripts.java index d53673f4bf..7a39b774a7 100644 --- a/core/src/io/anuke/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.mod; +package mindustry.mod; -import io.anuke.arc.*; -import io.anuke.arc.files.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.Log.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.mod.Mods.*; +import arc.*; +import arc.files.*; +import arc.util.*; +import arc.util.Log.*; +import mindustry.*; +import mindustry.mod.Mods.*; import org.mozilla.javascript.*; public class Scripts implements Disposable{ @@ -20,7 +20,7 @@ public class Scripts implements Disposable{ context = Vars.platform.getScriptContext(); context.setClassShutter(type -> (ClassAccess.allowedClassNames.contains(type) || type.startsWith("$Proxy") || type.startsWith("adapter") || type.contains("PrintStream") || - type.startsWith("io.anuke.mindustry")) && !type.equals("io.anuke.mindustry.mod.ClassAccess")); + type.startsWith("mindustry")) && !type.equals("mindustry.mod.ClassAccess")); scope = new ImporterTopLevel(context); wrapper = Core.files.internal("scripts/wrapper.js").readString(); diff --git a/core/src/io/anuke/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java similarity index 97% rename from core/src/io/anuke/mindustry/net/Administration.java rename to core/src/mindustry/net/Administration.java index f7815e03d2..cd490eed04 100644 --- a/core/src/io/anuke/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -1,13 +1,13 @@ -package io.anuke.mindustry.net; +package mindustry.net; -import io.anuke.annotations.Annotations.*; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.mindustry.Vars; +import arc.*; +import mindustry.annotations.Annotations.*; +import arc.struct.*; +import mindustry.Vars; -import static io.anuke.mindustry.Vars.headless; -import static io.anuke.mindustry.game.EventType.*; +import static mindustry.Vars.headless; +import static mindustry.game.EventType.*; public class Administration{ /** All player info. Maps UUIDs to info. This persists throughout restarts. */ diff --git a/core/src/io/anuke/mindustry/net/ArcNetProvider.java b/core/src/mindustry/net/ArcNetProvider.java similarity index 97% rename from core/src/io/anuke/mindustry/net/ArcNetProvider.java rename to core/src/mindustry/net/ArcNetProvider.java index 600b80da9a..19ce42e48e 100644 --- a/core/src/io/anuke/mindustry/net/ArcNetProvider.java +++ b/core/src/mindustry/net/ArcNetProvider.java @@ -1,15 +1,15 @@ -package io.anuke.mindustry.net; +package mindustry.net; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.func.*; -import io.anuke.arc.net.*; -import io.anuke.arc.net.FrameworkMessage.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.async.*; -import io.anuke.arc.util.pooling.*; -import io.anuke.mindustry.net.Net.*; -import io.anuke.mindustry.net.Packets.*; +import arc.*; +import arc.struct.*; +import arc.func.*; +import arc.net.*; +import arc.net.FrameworkMessage.*; +import arc.util.*; +import arc.util.async.*; +import arc.util.pooling.*; +import mindustry.net.Net.*; +import mindustry.net.Packets.*; import java.io.*; import java.net.*; @@ -17,7 +17,7 @@ import java.nio.*; import java.nio.channels.*; import java.util.concurrent.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class ArcNetProvider implements NetProvider{ final Client client; diff --git a/core/src/io/anuke/mindustry/net/CrashSender.java b/core/src/mindustry/net/CrashSender.java similarity index 92% rename from core/src/io/anuke/mindustry/net/CrashSender.java rename to core/src/mindustry/net/CrashSender.java index 184e801326..43692c77d6 100644 --- a/core/src/io/anuke/mindustry/net/CrashSender.java +++ b/core/src/mindustry/net/CrashSender.java @@ -1,23 +1,23 @@ -package io.anuke.mindustry.net; +package mindustry.net; -import io.anuke.arc.*; -import io.anuke.arc.Net.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.files.*; -import io.anuke.arc.func.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.io.*; -import io.anuke.arc.util.serialization.*; -import io.anuke.arc.util.serialization.JsonValue.*; -import io.anuke.arc.util.serialization.JsonWriter.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.core.*; +import arc.*; +import arc.Net.*; +import arc.struct.*; +import arc.files.*; +import arc.func.*; +import arc.util.*; +import arc.util.io.*; +import arc.util.serialization.*; +import arc.util.serialization.JsonValue.*; +import arc.util.serialization.JsonWriter.*; +import mindustry.*; +import mindustry.core.*; import java.io.*; import java.text.*; import java.util.*; -import static io.anuke.mindustry.Vars.net; +import static mindustry.Vars.net; public class CrashSender{ diff --git a/core/src/io/anuke/mindustry/net/Host.java b/core/src/mindustry/net/Host.java similarity index 91% rename from core/src/io/anuke/mindustry/net/Host.java rename to core/src/mindustry/net/Host.java index 498e40802e..387fafc043 100644 --- a/core/src/io/anuke/mindustry/net/Host.java +++ b/core/src/mindustry/net/Host.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.net; +package mindustry.net; -import io.anuke.mindustry.game.*; +import mindustry.game.*; public class Host{ public final String name; diff --git a/core/src/io/anuke/mindustry/net/Interpolator.java b/core/src/mindustry/net/Interpolator.java similarity index 86% rename from core/src/io/anuke/mindustry/net/Interpolator.java rename to core/src/mindustry/net/Interpolator.java index dbc9b422ca..b2a544dbd6 100644 --- a/core/src/io/anuke/mindustry/net/Interpolator.java +++ b/core/src/mindustry/net/Interpolator.java @@ -1,19 +1,19 @@ -package io.anuke.mindustry.net; +package mindustry.net; -import io.anuke.arc.math.*; -import io.anuke.arc.math.geom.*; -import io.anuke.arc.util.*; +import arc.math.*; +import arc.math.geom.*; +import arc.util.*; public class Interpolator{ //used for movement - public Vector2 target = new Vector2(); - public Vector2 last = new Vector2(); + public Vec2 target = new Vec2(); + public Vec2 last = new Vec2(); public float[] targets = {}; public float[] lasts = {}; public long lastUpdated, updateSpacing; //current state - public Vector2 pos = new Vector2(); + public Vec2 pos = new Vec2(); public float[] values = {}; public void read(float cx, float cy, float x, float y, float... target1ds){ diff --git a/core/src/io/anuke/mindustry/net/Net.java b/core/src/mindustry/net/Net.java similarity index 96% rename from core/src/io/anuke/mindustry/net/Net.java rename to core/src/mindustry/net/Net.java index a11a9c4089..0ad720713d 100644 --- a/core/src/io/anuke/mindustry/net/Net.java +++ b/core/src/mindustry/net/Net.java @@ -1,20 +1,20 @@ -package io.anuke.mindustry.net; +package mindustry.net; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.func.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.arc.util.pooling.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.net.Packets.*; -import io.anuke.mindustry.net.Streamable.*; +import arc.*; +import arc.struct.*; +import arc.func.*; +import arc.util.*; +import arc.util.ArcAnnotate.*; +import arc.util.pooling.*; +import mindustry.gen.*; +import mindustry.net.Packets.*; +import mindustry.net.Streamable.*; import net.jpountz.lz4.*; import java.io.*; import java.nio.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; @SuppressWarnings("unchecked") public class Net{ diff --git a/core/src/io/anuke/mindustry/net/NetConnection.java b/core/src/mindustry/net/NetConnection.java similarity index 88% rename from core/src/io/anuke/mindustry/net/NetConnection.java rename to core/src/mindustry/net/NetConnection.java index f0d37b2e9f..a09ab097ba 100644 --- a/core/src/io/anuke/mindustry/net/NetConnection.java +++ b/core/src/mindustry/net/NetConnection.java @@ -1,16 +1,16 @@ -package io.anuke.mindustry.net; +package mindustry.net; -import io.anuke.arc.util.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.net.Administration.*; -import io.anuke.mindustry.net.Net.*; -import io.anuke.mindustry.net.Packets.*; +import arc.util.*; +import arc.util.ArcAnnotate.*; +import mindustry.entities.type.*; +import mindustry.gen.*; +import mindustry.net.Administration.*; +import mindustry.net.Net.*; +import mindustry.net.Packets.*; import java.io.*; -import static io.anuke.mindustry.Vars.netServer; +import static mindustry.Vars.netServer; public abstract class NetConnection{ public final String address; diff --git a/core/src/io/anuke/mindustry/net/NetworkIO.java b/core/src/mindustry/net/NetworkIO.java similarity index 92% rename from core/src/io/anuke/mindustry/net/NetworkIO.java rename to core/src/mindustry/net/NetworkIO.java index 2e82e83fa1..d877ac6e3a 100644 --- a/core/src/io/anuke/mindustry/net/NetworkIO.java +++ b/core/src/mindustry/net/NetworkIO.java @@ -1,18 +1,18 @@ -package io.anuke.mindustry.net; +package mindustry.net; -import io.anuke.arc.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.core.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.io.*; -import io.anuke.mindustry.maps.Map; +import arc.*; +import arc.util.*; +import mindustry.core.*; +import mindustry.entities.type.*; +import mindustry.game.*; +import mindustry.io.*; +import mindustry.maps.Map; import java.io.*; import java.nio.*; import java.util.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class NetworkIO{ diff --git a/core/src/io/anuke/mindustry/net/Packet.java b/core/src/mindustry/net/Packet.java similarity index 80% rename from core/src/io/anuke/mindustry/net/Packet.java rename to core/src/mindustry/net/Packet.java index f5feb59c94..f1f45d1ad9 100644 --- a/core/src/io/anuke/mindustry/net/Packet.java +++ b/core/src/mindustry/net/Packet.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.net; +package mindustry.net; -import io.anuke.arc.util.pooling.Pool.Poolable; +import arc.util.pooling.Pool.Poolable; import java.nio.ByteBuffer; diff --git a/core/src/io/anuke/mindustry/net/Packets.java b/core/src/mindustry/net/Packets.java similarity index 96% rename from core/src/io/anuke/mindustry/net/Packets.java rename to core/src/mindustry/net/Packets.java index 6c006a7eba..683983d69b 100644 --- a/core/src/io/anuke/mindustry/net/Packets.java +++ b/core/src/mindustry/net/Packets.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.net; +package mindustry.net; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.util.serialization.*; -import io.anuke.mindustry.core.*; -import io.anuke.mindustry.io.*; +import arc.*; +import arc.struct.*; +import arc.util.serialization.*; +import mindustry.core.*; +import mindustry.io.*; import java.nio.*; diff --git a/core/src/io/anuke/mindustry/net/Registrator.java b/core/src/mindustry/net/Registrator.java similarity index 88% rename from core/src/io/anuke/mindustry/net/Registrator.java rename to core/src/mindustry/net/Registrator.java index 73c729dbcb..8e3c48dc51 100644 --- a/core/src/io/anuke/mindustry/net/Registrator.java +++ b/core/src/mindustry/net/Registrator.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.net; +package mindustry.net; -import io.anuke.arc.collection.ObjectIntMap; -import io.anuke.arc.func.Prov; -import io.anuke.mindustry.net.Packets.*; +import arc.struct.ObjectIntMap; +import arc.func.Prov; +import mindustry.net.Packets.*; public class Registrator{ private static ClassEntry[] classes = { diff --git a/core/src/io/anuke/mindustry/net/Streamable.java b/core/src/mindustry/net/Streamable.java similarity index 93% rename from core/src/io/anuke/mindustry/net/Streamable.java rename to core/src/mindustry/net/Streamable.java index 01cc829412..18171b6cbf 100644 --- a/core/src/io/anuke/mindustry/net/Streamable.java +++ b/core/src/mindustry/net/Streamable.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.net; +package mindustry.net; -import io.anuke.mindustry.net.Packets.StreamBegin; +import mindustry.net.Packets.StreamBegin; import java.io.*; diff --git a/core/src/io/anuke/mindustry/net/ValidateException.java b/core/src/mindustry/net/ValidateException.java similarity index 76% rename from core/src/io/anuke/mindustry/net/ValidateException.java rename to core/src/mindustry/net/ValidateException.java index 08f3f70483..f1291212ab 100644 --- a/core/src/io/anuke/mindustry/net/ValidateException.java +++ b/core/src/mindustry/net/ValidateException.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.net; +package mindustry.net; -import io.anuke.mindustry.entities.type.Player; +import mindustry.entities.type.Player; /** * Thrown when a client sends invalid information. diff --git a/core/src/io/anuke/mindustry/plugin/Plugin.java b/core/src/mindustry/plugin/Plugin.java similarity index 61% rename from core/src/io/anuke/mindustry/plugin/Plugin.java rename to core/src/mindustry/plugin/Plugin.java index ffc8c9f8b7..1f0ab0170c 100644 --- a/core/src/io/anuke/mindustry/plugin/Plugin.java +++ b/core/src/mindustry/plugin/Plugin.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.plugin; +package mindustry.plugin; -import io.anuke.mindustry.mod.*; +import mindustry.mod.*; /** Defines a special type of mod that is always hidden. */ public abstract class Plugin extends Mod{ diff --git a/core/src/io/anuke/mindustry/type/Category.java b/core/src/mindustry/type/Category.java similarity index 96% rename from core/src/io/anuke/mindustry/type/Category.java rename to core/src/mindustry/type/Category.java index c75451bc64..97f5c9d7a6 100644 --- a/core/src/io/anuke/mindustry/type/Category.java +++ b/core/src/mindustry/type/Category.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.type; +package mindustry.type; public enum Category{ /** Offensive turrets. */ diff --git a/core/src/io/anuke/mindustry/type/ErrorContent.java b/core/src/mindustry/type/ErrorContent.java similarity index 68% rename from core/src/io/anuke/mindustry/type/ErrorContent.java rename to core/src/mindustry/type/ErrorContent.java index 91c52207f8..e41f460a96 100644 --- a/core/src/io/anuke/mindustry/type/ErrorContent.java +++ b/core/src/mindustry/type/ErrorContent.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.type; +package mindustry.type; -import io.anuke.mindustry.ctype.*; -import io.anuke.mindustry.ctype.ContentType; +import mindustry.ctype.*; +import mindustry.ctype.ContentType; /** Represents a blank type of content that has an error. Replaces anything that failed to parse. */ public class ErrorContent extends Content{ diff --git a/core/src/io/anuke/mindustry/type/Item.java b/core/src/mindustry/type/Item.java similarity index 82% rename from core/src/io/anuke/mindustry/type/Item.java rename to core/src/mindustry/type/Item.java index 01cff82cd2..f8719c34cb 100644 --- a/core/src/io/anuke/mindustry/type/Item.java +++ b/core/src/mindustry/type/Item.java @@ -1,14 +1,14 @@ -package io.anuke.mindustry.type; +package mindustry.type; -import io.anuke.arc.collection.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.mindustry.ctype.*; -import io.anuke.mindustry.ctype.ContentType; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.world.blocks.*; +import arc.struct.*; +import arc.graphics.*; +import arc.scene.ui.layout.*; +import mindustry.ctype.*; +import mindustry.ctype.ContentType; +import mindustry.ui.*; +import mindustry.world.blocks.*; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; public class Item extends UnlockableContent{ public final Color color; diff --git a/core/src/io/anuke/mindustry/type/ItemStack.java b/core/src/mindustry/type/ItemStack.java similarity index 93% rename from core/src/io/anuke/mindustry/type/ItemStack.java rename to core/src/mindustry/type/ItemStack.java index 723a6e4c24..7fc4d113fa 100644 --- a/core/src/io/anuke/mindustry/type/ItemStack.java +++ b/core/src/mindustry/type/ItemStack.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.type; +package mindustry.type; -import io.anuke.arc.collection.Array; -import io.anuke.mindustry.content.Items; +import arc.struct.Array; +import mindustry.content.Items; public class ItemStack implements Comparable{ public Item item; diff --git a/core/src/io/anuke/mindustry/type/ItemType.java b/core/src/mindustry/type/ItemType.java similarity index 86% rename from core/src/io/anuke/mindustry/type/ItemType.java rename to core/src/mindustry/type/ItemType.java index 40459f070e..3d943c478a 100644 --- a/core/src/io/anuke/mindustry/type/ItemType.java +++ b/core/src/mindustry/type/ItemType.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.type; +package mindustry.type; public enum ItemType{ /** Not used for anything besides crafting inside blocks. */ diff --git a/core/src/io/anuke/mindustry/type/Liquid.java b/core/src/mindustry/type/Liquid.java similarity index 86% rename from core/src/io/anuke/mindustry/type/Liquid.java rename to core/src/mindustry/type/Liquid.java index 0b896a389c..8485d0857d 100644 --- a/core/src/io/anuke/mindustry/type/Liquid.java +++ b/core/src/mindustry/type/Liquid.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.type; +package mindustry.type; -import io.anuke.arc.graphics.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.ctype.*; -import io.anuke.mindustry.ctype.ContentType; -import io.anuke.mindustry.ui.*; +import arc.graphics.*; +import arc.scene.ui.layout.*; +import arc.util.ArcAnnotate.*; +import mindustry.content.*; +import mindustry.ctype.*; +import mindustry.ctype.ContentType; +import mindustry.ui.*; public class Liquid extends UnlockableContent{ public final @NonNull Color color; diff --git a/core/src/io/anuke/mindustry/type/LiquidStack.java b/core/src/mindustry/type/LiquidStack.java similarity index 92% rename from core/src/io/anuke/mindustry/type/LiquidStack.java rename to core/src/mindustry/type/LiquidStack.java index a861525778..76df881fdf 100644 --- a/core/src/io/anuke/mindustry/type/LiquidStack.java +++ b/core/src/mindustry/type/LiquidStack.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.type; +package mindustry.type; public class LiquidStack{ public Liquid liquid; diff --git a/core/src/io/anuke/mindustry/type/Mech.java b/core/src/mindustry/type/Mech.java similarity index 83% rename from core/src/io/anuke/mindustry/type/Mech.java rename to core/src/mindustry/type/Mech.java index 6172827ee8..49745ba129 100644 --- a/core/src/io/anuke/mindustry/type/Mech.java +++ b/core/src/mindustry/type/Mech.java @@ -1,15 +1,15 @@ -package io.anuke.mindustry.type; +package mindustry.type; -import io.anuke.arc.Core; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.TextureRegion; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.ctype.ContentType; -import io.anuke.mindustry.entities.type.Player; -import io.anuke.mindustry.ctype.UnlockableContent; -import io.anuke.mindustry.graphics.Pal; -import io.anuke.mindustry.ui.ContentDisplay; +import arc.Core; +import arc.graphics.Color; +import arc.graphics.g2d.TextureRegion; +import arc.scene.ui.layout.Table; +import arc.util.ArcAnnotate.*; +import mindustry.ctype.ContentType; +import mindustry.entities.type.Player; +import mindustry.ctype.UnlockableContent; +import mindustry.graphics.Pal; +import mindustry.ui.ContentDisplay; public class Mech extends UnlockableContent{ public boolean flying; diff --git a/core/src/io/anuke/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java similarity index 93% rename from core/src/io/anuke/mindustry/type/Planet.java rename to core/src/mindustry/type/Planet.java index 9058b764a9..ec6e0645a3 100644 --- a/core/src/io/anuke/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.type; +package mindustry.type; import io.anuke.arc.scene.ui.layout.*; import io.anuke.mindustry.ctype.*; diff --git a/core/src/io/anuke/mindustry/type/Publishable.java b/core/src/mindustry/type/Publishable.java similarity index 90% rename from core/src/io/anuke/mindustry/type/Publishable.java rename to core/src/mindustry/type/Publishable.java index 5c6c1aade3..5e99f2b4b5 100644 --- a/core/src/io/anuke/mindustry/type/Publishable.java +++ b/core/src/mindustry/type/Publishable.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.type; +package mindustry.type; -import io.anuke.arc.collection.*; -import io.anuke.arc.files.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.*; +import arc.struct.*; +import arc.files.*; +import arc.util.ArcAnnotate.*; +import mindustry.*; /** Defines a piece of content that can be published on the Workshop. */ public interface Publishable{ diff --git a/core/src/io/anuke/mindustry/type/StatusEffect.java b/core/src/mindustry/type/StatusEffect.java similarity index 86% rename from core/src/io/anuke/mindustry/type/StatusEffect.java rename to core/src/mindustry/type/StatusEffect.java index 34d7a9cb77..1ade3af60f 100644 --- a/core/src/io/anuke/mindustry/type/StatusEffect.java +++ b/core/src/mindustry/type/StatusEffect.java @@ -1,16 +1,16 @@ -package io.anuke.mindustry.type; +package mindustry.type; -import io.anuke.arc.collection.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.math.*; -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.*; -import io.anuke.mindustry.entities.Effects.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.entities.units.Statuses.*; +import arc.struct.*; +import arc.graphics.*; +import arc.math.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.ctype.*; +import mindustry.ctype.ContentType; +import mindustry.entities.*; +import mindustry.entities.Effects.*; +import mindustry.entities.type.*; +import mindustry.entities.units.Statuses.*; public class StatusEffect extends MappableContent{ /** Damage dealt by the unit with the effect. */ diff --git a/core/src/io/anuke/mindustry/type/TypeID.java b/core/src/mindustry/type/TypeID.java similarity index 64% rename from core/src/io/anuke/mindustry/type/TypeID.java rename to core/src/mindustry/type/TypeID.java index 5ab6c1f3f5..8630dfa219 100644 --- a/core/src/io/anuke/mindustry/type/TypeID.java +++ b/core/src/mindustry/type/TypeID.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.type; +package mindustry.type; -import io.anuke.arc.func.*; -import io.anuke.mindustry.ctype.*; -import io.anuke.mindustry.ctype.ContentType; -import io.anuke.mindustry.entities.traits.*; +import arc.func.*; +import mindustry.ctype.*; +import mindustry.ctype.ContentType; +import mindustry.entities.traits.*; public class TypeID extends MappableContent{ public final Prov constructor; diff --git a/core/src/io/anuke/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java similarity index 79% rename from core/src/io/anuke/mindustry/type/UnitType.java rename to core/src/mindustry/type/UnitType.java index 85a6882e86..af0e8d5746 100644 --- a/core/src/io/anuke/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -1,19 +1,19 @@ -package io.anuke.mindustry.type; +package mindustry.type; -import io.anuke.arc.*; -import io.anuke.arc.audio.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.func.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.ctype.ContentType; -import io.anuke.mindustry.ctype.UnlockableContent; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.audio.*; +import arc.struct.*; +import arc.func.*; +import arc.graphics.g2d.*; +import arc.scene.ui.layout.*; +import arc.util.ArcAnnotate.*; +import mindustry.content.*; +import mindustry.ctype.ContentType; +import mindustry.ctype.UnlockableContent; +import mindustry.entities.type.*; +import mindustry.game.*; +import mindustry.gen.*; +import mindustry.ui.*; public class UnitType extends UnlockableContent{ public @NonNull TypeID typeID; diff --git a/core/src/io/anuke/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java similarity index 90% rename from core/src/io/anuke/mindustry/type/Weapon.java rename to core/src/mindustry/type/Weapon.java index cd467238d9..0e3583a552 100644 --- a/core/src/io/anuke/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -1,23 +1,23 @@ -package io.anuke.mindustry.type; +package mindustry.type; -import io.anuke.annotations.Annotations.*; -import io.anuke.arc.*; -import io.anuke.arc.audio.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.entities.*; -import io.anuke.mindustry.entities.Effects.*; -import io.anuke.mindustry.entities.bullet.*; -import io.anuke.mindustry.entities.traits.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.entities.type.Bullet; -import io.anuke.mindustry.gen.*; +import arc.*; +import mindustry.annotations.Annotations.*; +import arc.audio.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.util.*; +import arc.util.ArcAnnotate.*; +import mindustry.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.entities.Effects.*; +import mindustry.entities.bullet.*; +import mindustry.entities.traits.*; +import mindustry.entities.type.*; +import mindustry.entities.type.Bullet; +import mindustry.gen.*; -import static io.anuke.mindustry.Vars.net; +import static mindustry.Vars.net; public class Weapon{ public String name; diff --git a/core/src/io/anuke/mindustry/type/Weather.java b/core/src/mindustry/type/Weather.java similarity index 96% rename from core/src/io/anuke/mindustry/type/Weather.java rename to core/src/mindustry/type/Weather.java index bf97bed610..e9abb87472 100644 --- a/core/src/io/anuke/mindustry/type/Weather.java +++ b/core/src/mindustry/type/Weather.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.type; +package mindustry.type; import io.anuke.annotations.Annotations.*; import io.anuke.arc.util.ArcAnnotate.*; @@ -6,7 +6,7 @@ import io.anuke.mindustry.ctype.*; import io.anuke.mindustry.entities.*; import io.anuke.mindustry.entities.traits.*; import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.type.Weather.*; +import mindustry.type.Weather.*; import java.io.*; diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/mindustry/type/Zone.java similarity index 91% rename from core/src/io/anuke/mindustry/type/Zone.java rename to core/src/mindustry/type/Zone.java index de5740a859..a1e09557ab 100644 --- a/core/src/io/anuke/mindustry/type/Zone.java +++ b/core/src/mindustry/type/Zone.java @@ -1,20 +1,20 @@ -package io.anuke.mindustry.type; +package mindustry.type; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.func.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.ctype.ContentType; -import io.anuke.mindustry.ctype.UnlockableContent; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.game.Objectives.*; -import io.anuke.mindustry.maps.generators.*; +import arc.*; +import arc.struct.*; +import arc.func.*; +import arc.graphics.g2d.*; +import arc.scene.ui.layout.*; +import arc.util.ArcAnnotate.*; +import mindustry.content.*; +import mindustry.ctype.ContentType; +import mindustry.ctype.UnlockableContent; +import mindustry.game.EventType.*; +import mindustry.game.*; +import mindustry.game.Objectives.*; +import mindustry.maps.generators.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class Zone extends UnlockableContent{ public @NonNull Generator generator; diff --git a/core/src/io/anuke/mindustry/ui/Bar.java b/core/src/mindustry/ui/Bar.java similarity index 88% rename from core/src/io/anuke/mindustry/ui/Bar.java rename to core/src/mindustry/ui/Bar.java index cc9e87b84b..c04a25167f 100644 --- a/core/src/io/anuke/mindustry/ui/Bar.java +++ b/core/src/mindustry/ui/Bar.java @@ -1,15 +1,15 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.*; -import io.anuke.arc.func.*; -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.*; -import io.anuke.arc.scene.style.*; -import io.anuke.arc.util.pooling.*; -import io.anuke.mindustry.gen.*; +import arc.*; +import arc.func.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.math.geom.*; +import arc.scene.*; +import arc.scene.style.*; +import arc.util.pooling.*; +import mindustry.gen.*; public class Bar extends Element{ private static Rectangle scissor = new Rectangle(); diff --git a/core/src/io/anuke/mindustry/ui/BorderImage.java b/core/src/mindustry/ui/BorderImage.java similarity index 80% rename from core/src/io/anuke/mindustry/ui/BorderImage.java rename to core/src/mindustry/ui/BorderImage.java index cff7b610b1..df077a0c13 100644 --- a/core/src/io/anuke/mindustry/ui/BorderImage.java +++ b/core/src/mindustry/ui/BorderImage.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.graphics.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.scene.ui.Image; -import io.anuke.arc.scene.ui.layout.Scl; -import io.anuke.mindustry.graphics.Pal; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.scene.ui.Image; +import arc.scene.ui.layout.Scl; +import mindustry.graphics.Pal; public class BorderImage extends Image{ public float thickness = 4f; diff --git a/core/src/io/anuke/mindustry/ui/Cicon.java b/core/src/mindustry/ui/Cicon.java similarity index 93% rename from core/src/io/anuke/mindustry/ui/Cicon.java rename to core/src/mindustry/ui/Cicon.java index 71024fddbf..2fc95294fa 100644 --- a/core/src/io/anuke/mindustry/ui/Cicon.java +++ b/core/src/mindustry/ui/Cicon.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; import java.util.*; diff --git a/core/src/io/anuke/mindustry/ui/ContentDisplay.java b/core/src/mindustry/ui/ContentDisplay.java similarity index 95% rename from core/src/io/anuke/mindustry/ui/ContentDisplay.java rename to core/src/mindustry/ui/ContentDisplay.java index 36f100d6a3..b3e49040e0 100644 --- a/core/src/io/anuke/mindustry/ui/ContentDisplay.java +++ b/core/src/mindustry/ui/ContentDisplay.java @@ -1,14 +1,14 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.meta.*; +import arc.*; +import arc.struct.*; +import arc.graphics.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.meta.*; public class ContentDisplay{ diff --git a/core/src/io/anuke/mindustry/ui/Fonts.java b/core/src/mindustry/ui/Fonts.java similarity index 66% rename from core/src/io/anuke/mindustry/ui/Fonts.java rename to core/src/mindustry/ui/Fonts.java index cf30e810aa..5c8699edee 100644 --- a/core/src/io/anuke/mindustry/ui/Fonts.java +++ b/core/src/mindustry/ui/Fonts.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.graphics.g2d.*; +import arc.graphics.g2d.*; public class Fonts{ public static BitmapFont def; diff --git a/core/src/io/anuke/mindustry/ui/GridImage.java b/core/src/mindustry/ui/GridImage.java similarity index 90% rename from core/src/io/anuke/mindustry/ui/GridImage.java rename to core/src/mindustry/ui/GridImage.java index 81916cba40..b561ffc423 100644 --- a/core/src/io/anuke/mindustry/ui/GridImage.java +++ b/core/src/mindustry/ui/GridImage.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.graphics.g2d.Fill; -import io.anuke.arc.scene.Element; +import arc.graphics.g2d.Fill; +import arc.scene.Element; public class GridImage extends Element{ private int imageWidth, imageHeight; diff --git a/core/src/io/anuke/mindustry/ui/IconSize.java b/core/src/mindustry/ui/IconSize.java similarity index 84% rename from core/src/io/anuke/mindustry/ui/IconSize.java rename to core/src/mindustry/ui/IconSize.java index ba3ac5114c..dd3a4b37db 100644 --- a/core/src/io/anuke/mindustry/ui/IconSize.java +++ b/core/src/mindustry/ui/IconSize.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; public enum IconSize{ def(48), diff --git a/core/src/io/anuke/mindustry/ui/IntFormat.java b/core/src/mindustry/ui/IntFormat.java similarity index 89% rename from core/src/io/anuke/mindustry/ui/IntFormat.java rename to core/src/mindustry/ui/IntFormat.java index 695d177707..187e21993f 100644 --- a/core/src/io/anuke/mindustry/ui/IntFormat.java +++ b/core/src/mindustry/ui/IntFormat.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.Core; -import io.anuke.arc.func.Func; +import arc.Core; +import arc.func.Func; /** * A low-garbage way to format bundle strings. diff --git a/core/src/io/anuke/mindustry/ui/ItemDisplay.java b/core/src/mindustry/ui/ItemDisplay.java similarity index 79% rename from core/src/io/anuke/mindustry/ui/ItemDisplay.java rename to core/src/mindustry/ui/ItemDisplay.java index a55a5034c5..6407a95d0a 100644 --- a/core/src/io/anuke/mindustry/ui/ItemDisplay.java +++ b/core/src/mindustry/ui/ItemDisplay.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.type.ItemStack; +import arc.scene.ui.layout.Table; +import mindustry.type.Item; +import mindustry.type.ItemStack; /** An item image with text. */ public class ItemDisplay extends Table{ diff --git a/core/src/io/anuke/mindustry/ui/ItemImage.java b/core/src/mindustry/ui/ItemImage.java similarity index 79% rename from core/src/io/anuke/mindustry/ui/ItemImage.java rename to core/src/mindustry/ui/ItemImage.java index e2ea1b5c23..f04a8f0dab 100644 --- a/core/src/io/anuke/mindustry/ui/ItemImage.java +++ b/core/src/mindustry/ui/ItemImage.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.mindustry.type.*; +import arc.graphics.g2d.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import mindustry.type.*; public class ItemImage extends Stack{ diff --git a/core/src/io/anuke/mindustry/ui/ItemsDisplay.java b/core/src/mindustry/ui/ItemsDisplay.java similarity index 86% rename from core/src/io/anuke/mindustry/ui/ItemsDisplay.java rename to core/src/mindustry/ui/ItemsDisplay.java index e198673c08..432417b305 100644 --- a/core/src/io/anuke/mindustry/ui/ItemsDisplay.java +++ b/core/src/mindustry/ui/ItemsDisplay.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.graphics.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.mindustry.core.GameState.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.type.*; +import arc.graphics.*; +import arc.scene.ui.layout.*; +import mindustry.core.GameState.*; +import mindustry.gen.*; +import mindustry.type.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; /** Displays a list of items, e.g. launched items.*/ public class ItemsDisplay extends Table{ diff --git a/core/src/io/anuke/mindustry/ui/Links.java b/core/src/mindustry/ui/Links.java similarity index 92% rename from core/src/io/anuke/mindustry/ui/Links.java rename to core/src/mindustry/ui/Links.java index 5b6fac5909..a7b1afde19 100644 --- a/core/src/io/anuke/mindustry/ui/Links.java +++ b/core/src/mindustry/ui/Links.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.Core; -import io.anuke.arc.util.Strings; -import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.graphics.Pal; +import arc.Core; +import arc.util.Strings; +import arc.graphics.Color; +import mindustry.graphics.Pal; public class Links{ private static LinkEntry[] links; diff --git a/core/src/io/anuke/mindustry/ui/LiquidDisplay.java b/core/src/mindustry/ui/LiquidDisplay.java similarity index 74% rename from core/src/io/anuke/mindustry/ui/LiquidDisplay.java rename to core/src/mindustry/ui/LiquidDisplay.java index 741491d9b9..7ce5c0504e 100644 --- a/core/src/io/anuke/mindustry/ui/LiquidDisplay.java +++ b/core/src/mindustry/ui/LiquidDisplay.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.scene.ui.Image; -import io.anuke.arc.scene.ui.layout.Stack; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.arc.util.Strings; -import io.anuke.mindustry.type.Liquid; -import io.anuke.mindustry.world.meta.StatUnit; +import arc.graphics.Color; +import arc.scene.ui.Image; +import arc.scene.ui.layout.Stack; +import arc.scene.ui.layout.Table; +import arc.util.Strings; +import mindustry.type.Liquid; +import mindustry.world.meta.StatUnit; /** An ItemDisplay, but for liquids. */ public class LiquidDisplay extends Table{ diff --git a/core/src/io/anuke/mindustry/ui/Minimap.java b/core/src/mindustry/ui/Minimap.java similarity index 89% rename from core/src/io/anuke/mindustry/ui/Minimap.java rename to core/src/mindustry/ui/Minimap.java index dc2817e8f0..b724f4dd39 100644 --- a/core/src/io/anuke/mindustry/ui/Minimap.java +++ b/core/src/mindustry/ui/Minimap.java @@ -1,14 +1,14 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.Core; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.input.KeyCode; -import io.anuke.arc.scene.Element; -import io.anuke.arc.scene.event.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.mindustry.gen.*; +import arc.Core; +import arc.graphics.g2d.Draw; +import arc.input.KeyCode; +import arc.scene.Element; +import arc.scene.event.*; +import arc.scene.ui.layout.*; +import mindustry.gen.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class Minimap extends Table{ diff --git a/core/src/io/anuke/mindustry/ui/MobileButton.java b/core/src/mindustry/ui/MobileButton.java similarity index 66% rename from core/src/io/anuke/mindustry/ui/MobileButton.java rename to core/src/mindustry/ui/MobileButton.java index b674830ebd..736247d45b 100644 --- a/core/src/io/anuke/mindustry/ui/MobileButton.java +++ b/core/src/mindustry/ui/MobileButton.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.scene.style.*; -import io.anuke.arc.scene.ui.ImageButton; -import io.anuke.arc.util.Align; +import arc.scene.style.*; +import arc.scene.ui.ImageButton; +import arc.util.Align; public class MobileButton extends ImageButton{ diff --git a/core/src/io/anuke/mindustry/ui/MultiReqImage.java b/core/src/mindustry/ui/MultiReqImage.java similarity index 82% rename from core/src/io/anuke/mindustry/ui/MultiReqImage.java rename to core/src/mindustry/ui/MultiReqImage.java index 4fa2cf2fc8..6d7f199f57 100644 --- a/core/src/io/anuke/mindustry/ui/MultiReqImage.java +++ b/core/src/mindustry/ui/MultiReqImage.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.collection.Array; -import io.anuke.arc.scene.ui.layout.Stack; -import io.anuke.arc.util.Time; +import arc.struct.Array; +import arc.scene.ui.layout.Stack; +import arc.util.Time; public class MultiReqImage extends Stack{ private Array displays = new Array<>(); diff --git a/core/src/io/anuke/mindustry/ui/ReqImage.java b/core/src/mindustry/ui/ReqImage.java similarity index 72% rename from core/src/io/anuke/mindustry/ui/ReqImage.java rename to core/src/mindustry/ui/ReqImage.java index 17c88a959b..eef8591f63 100644 --- a/core/src/io/anuke/mindustry/ui/ReqImage.java +++ b/core/src/mindustry/ui/ReqImage.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.arc.func.Boolp; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.scene.Element; -import io.anuke.arc.scene.ui.Image; -import io.anuke.arc.scene.ui.layout.Stack; -import io.anuke.arc.scene.ui.layout.Scl; -import io.anuke.mindustry.graphics.Pal; +import arc.func.Boolp; +import arc.graphics.g2d.*; +import arc.scene.Element; +import arc.scene.ui.Image; +import arc.scene.ui.layout.Stack; +import arc.scene.ui.layout.Scl; +import mindustry.graphics.Pal; public class ReqImage extends Stack{ private final Boolp valid; diff --git a/core/src/io/anuke/mindustry/ui/Styles.java b/core/src/mindustry/ui/Styles.java similarity index 93% rename from core/src/io/anuke/mindustry/ui/Styles.java rename to core/src/mindustry/ui/Styles.java index 1f7be8f08c..e28882397f 100644 --- a/core/src/io/anuke/mindustry/ui/Styles.java +++ b/core/src/mindustry/ui/Styles.java @@ -1,25 +1,25 @@ -package io.anuke.mindustry.ui; +package mindustry.ui; -import io.anuke.annotations.Annotations.*; -import io.anuke.arc.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.graphics.g2d.TextureAtlas.*; -import io.anuke.arc.scene.style.*; -import io.anuke.arc.scene.ui.Button.*; -import io.anuke.arc.scene.ui.CheckBox.*; -import io.anuke.arc.scene.ui.Dialog.*; -import io.anuke.arc.scene.ui.ImageButton.*; -import io.anuke.arc.scene.ui.KeybindDialog.*; -import io.anuke.arc.scene.ui.Label.*; -import io.anuke.arc.scene.ui.ScrollPane.*; -import io.anuke.arc.scene.ui.Slider.*; -import io.anuke.arc.scene.ui.TextButton.*; -import io.anuke.arc.scene.ui.TextField.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; +import arc.*; +import mindustry.annotations.Annotations.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.graphics.g2d.TextureAtlas.*; +import arc.scene.style.*; +import arc.scene.ui.Button.*; +import arc.scene.ui.CheckBox.*; +import arc.scene.ui.Dialog.*; +import arc.scene.ui.ImageButton.*; +import arc.scene.ui.KeybindDialog.*; +import arc.scene.ui.Label.*; +import arc.scene.ui.ScrollPane.*; +import arc.scene.ui.Slider.*; +import arc.scene.ui.TextButton.*; +import arc.scene.ui.TextField.*; +import mindustry.gen.*; +import mindustry.graphics.*; -import static io.anuke.mindustry.gen.Tex.*; +import static mindustry.gen.Tex.*; @StyleDefaults public class Styles{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java b/core/src/mindustry/ui/dialogs/AboutDialog.java similarity index 88% rename from core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java rename to core/src/mindustry/ui/dialogs/AboutDialog.java index 83d44a97f2..06a753a38a 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java +++ b/core/src/mindustry/ui/dialogs/AboutDialog.java @@ -1,18 +1,18 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -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.Links.*; +import arc.*; +import arc.struct.*; +import arc.graphics.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.ui.*; +import mindustry.ui.Links.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class AboutDialog extends FloatingDialog{ private Array contributors = new Array<>(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java b/core/src/mindustry/ui/dialogs/AdminsDialog.java similarity index 85% rename from core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java rename to core/src/mindustry/ui/dialogs/AdminsDialog.java index c53cbc3ec7..4b9d23816d 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java +++ b/core/src/mindustry/ui/dialogs/AdminsDialog.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.net.Administration.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import mindustry.gen.*; +import mindustry.net.Administration.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class AdminsDialog extends FloatingDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java b/core/src/mindustry/ui/dialogs/BansDialog.java similarity index 83% rename from core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java rename to core/src/mindustry/ui/dialogs/BansDialog.java index 4a09b24b65..18b9e5b701 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java +++ b/core/src/mindustry/ui/dialogs/BansDialog.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.net.Administration.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import mindustry.gen.*; +import mindustry.net.Administration.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class BansDialog extends FloatingDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ColorPicker.java b/core/src/mindustry/ui/dialogs/ColorPicker.java similarity index 88% rename from core/src/io/anuke/mindustry/ui/dialogs/ColorPicker.java rename to core/src/mindustry/ui/dialogs/ColorPicker.java index 03454d76e5..e5a9c60f01 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ColorPicker.java +++ b/core/src/mindustry/ui/dialogs/ColorPicker.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.func.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; +import arc.func.*; +import arc.graphics.*; +import arc.scene.ui.*; +import mindustry.gen.*; +import mindustry.graphics.*; public class ColorPicker extends FloatingDialog{ private Cons cons = c -> {}; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ContentInfoDialog.java b/core/src/mindustry/ui/dialogs/ContentInfoDialog.java similarity index 70% rename from core/src/io/anuke/mindustry/ui/dialogs/ContentInfoDialog.java rename to core/src/mindustry/ui/dialogs/ContentInfoDialog.java index 3a4abf4d18..e73a0bb427 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ContentInfoDialog.java +++ b/core/src/mindustry/ui/dialogs/ContentInfoDialog.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.scene.ui.ScrollPane; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.ctype.UnlockableContent; +import arc.scene.ui.ScrollPane; +import arc.scene.ui.layout.Table; +import mindustry.ctype.UnlockableContent; public class ContentInfoDialog extends FloatingDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java b/core/src/mindustry/ui/dialogs/ControlsDialog.java similarity index 70% rename from core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java rename to core/src/mindustry/ui/dialogs/ControlsDialog.java index a78051e601..a7179a4d0a 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java +++ b/core/src/mindustry/ui/dialogs/ControlsDialog.java @@ -1,11 +1,10 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.input.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; +import arc.input.*; +import arc.scene.ui.*; +import arc.util.*; +import mindustry.gen.*; +import mindustry.graphics.*; public class ControlsDialog extends KeybindDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/mindustry/ui/dialogs/CustomGameDialog.java similarity index 84% rename from core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java rename to core/src/mindustry/ui/dialogs/CustomGameDialog.java index 74eb693fec..fdc5077821 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomGameDialog.java @@ -1,17 +1,17 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.maps.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.*; +import mindustry.game.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.maps.*; +import mindustry.ui.*; public class CustomGameDialog extends FloatingDialog{ private MapPlayDialog dialog = new MapPlayDialog(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java similarity index 93% rename from core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java rename to core/src/mindustry/ui/dialogs/CustomRulesDialog.java index 201e3411f2..54e4720d65 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -1,24 +1,24 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.func.*; -import io.anuke.arc.graphics.*; -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.mindustry.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.ui.Cicon; -import io.anuke.mindustry.world.*; +import arc.*; +import arc.struct.*; +import arc.func.*; +import arc.graphics.*; +import arc.scene.style.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.*; +import mindustry.content.*; +import mindustry.game.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.ui.Cicon; +import mindustry.world.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class CustomRulesDialog extends FloatingDialog{ private Table main; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/mindustry/ui/dialogs/DatabaseDialog.java similarity index 82% rename from core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java rename to core/src/mindustry/ui/dialogs/DatabaseDialog.java index 406665f431..a78c5c0ccb 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java +++ b/core/src/mindustry/ui/dialogs/DatabaseDialog.java @@ -1,19 +1,19 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.scene.event.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.core.GameState.*; -import io.anuke.mindustry.ctype.*; -import io.anuke.mindustry.ctype.ContentType; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.struct.*; +import arc.graphics.*; +import arc.scene.event.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.*; +import mindustry.core.GameState.*; +import mindustry.ctype.*; +import mindustry.ctype.ContentType; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.ui.*; public class DatabaseDialog extends FloatingDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java b/core/src/mindustry/ui/dialogs/DeployDialog.java similarity index 91% rename from core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java rename to core/src/mindustry/ui/dialogs/DeployDialog.java index a84ff1a73c..dda43d0e13 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java +++ b/core/src/mindustry/ui/dialogs/DeployDialog.java @@ -1,33 +1,33 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -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.math.*; -import io.anuke.arc.math.geom.*; -import io.anuke.arc.scene.*; -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.scene.utils.*; -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.Saves.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.io.SaveIO.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.ui.layout.*; -import io.anuke.mindustry.ui.layout.TreeLayout.*; +import arc.*; +import arc.struct.*; +import arc.func.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.input.*; +import arc.math.*; +import arc.math.geom.*; +import arc.scene.*; +import arc.scene.event.*; +import arc.scene.style.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.scene.utils.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.core.GameState.*; +import mindustry.game.EventType.*; +import mindustry.game.Saves.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.io.SaveIO.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.ui.layout.*; +import mindustry.ui.layout.TreeLayout.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class DeployDialog extends FloatingDialog{ private final float nodeSize = Scl.scl(230f); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java b/core/src/mindustry/ui/dialogs/DiscordDialog.java similarity index 82% rename from core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java rename to core/src/mindustry/ui/dialogs/DiscordDialog.java index 2b87ed6a7d..9886736a01 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java +++ b/core/src/mindustry/ui/dialogs/DiscordDialog.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.Core; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.scene.ui.Dialog; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.Pal; +import arc.Core; +import arc.graphics.Color; +import arc.scene.ui.Dialog; +import mindustry.gen.*; +import mindustry.graphics.Pal; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class DiscordDialog extends Dialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/mindustry/ui/dialogs/FileChooser.java similarity index 94% rename from core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java rename to core/src/mindustry/ui/dialogs/FileChooser.java index e41470ddf1..31003af1bf 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/mindustry/ui/dialogs/FileChooser.java @@ -1,21 +1,21 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.files.*; -import io.anuke.arc.func.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.scene.event.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.pooling.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.struct.*; +import arc.files.*; +import arc.func.*; +import arc.graphics.g2d.*; +import arc.scene.event.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import arc.util.pooling.*; +import mindustry.gen.*; +import mindustry.ui.*; import java.util.*; -import static io.anuke.mindustry.Vars.platform; +import static mindustry.Vars.platform; public class FileChooser extends FloatingDialog{ private static final Fi homeDirectory = Core.files.absolute(Core.files.getExternalStoragePath()); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java b/core/src/mindustry/ui/dialogs/FloatingDialog.java similarity index 81% rename from core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java rename to core/src/mindustry/ui/dialogs/FloatingDialog.java index 09924218d0..6204eb6682 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java +++ b/core/src/mindustry/ui/dialogs/FloatingDialog.java @@ -1,15 +1,15 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.arc.input.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.core.GameState.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; +import arc.*; +import arc.input.*; +import arc.scene.ui.*; +import arc.util.*; +import mindustry.core.GameState.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.graphics.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class FloatingDialog extends Dialog{ private boolean wasPaused; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java b/core/src/mindustry/ui/dialogs/GameOverDialog.java similarity index 90% rename from core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java rename to core/src/mindustry/ui/dialogs/GameOverDialog.java index af64727163..bb9b4fcc8d 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java +++ b/core/src/mindustry/ui/dialogs/GameOverDialog.java @@ -1,14 +1,14 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.mindustry.core.GameState.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.game.Stats.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.Cicon; +import arc.*; +import mindustry.core.GameState.*; +import mindustry.game.*; +import mindustry.game.EventType.*; +import mindustry.game.Stats.*; +import mindustry.type.*; +import mindustry.ui.Cicon; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class GameOverDialog extends FloatingDialog{ private Team winner; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java b/core/src/mindustry/ui/dialogs/HostDialog.java similarity index 89% rename from core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java rename to core/src/mindustry/ui/dialogs/HostDialog.java index 200986f839..196f93d63f 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java +++ b/core/src/mindustry/ui/dialogs/HostDialog.java @@ -1,17 +1,17 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.core.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.graphics.*; +import arc.scene.ui.*; +import arc.util.*; +import mindustry.*; +import mindustry.core.*; +import mindustry.gen.*; +import mindustry.ui.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class HostDialog extends FloatingDialog{ float w = 300; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java similarity index 95% rename from core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java rename to core/src/mindustry/ui/dialogs/JoinDialog.java index 490d2b370f..4c8ae3cc58 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -1,23 +1,23 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.annotations.Annotations.*; -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.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.serialization.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.core.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.net.*; -import io.anuke.mindustry.net.Packets.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import mindustry.annotations.Annotations.*; +import arc.struct.*; +import arc.graphics.*; +import arc.input.*; +import arc.math.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import arc.util.serialization.*; +import mindustry.*; +import mindustry.core.*; +import mindustry.gen.*; +import mindustry.net.*; +import mindustry.net.Packets.*; +import mindustry.ui.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class JoinDialog extends FloatingDialog{ Array servers = new Array<>(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java b/core/src/mindustry/ui/dialogs/LanguageDialog.java similarity index 86% rename from core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java rename to core/src/mindustry/ui/dialogs/LanguageDialog.java index bfe98b9ce8..849c25d2ee 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java +++ b/core/src/mindustry/ui/dialogs/LanguageDialog.java @@ -1,17 +1,17 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.Core; -import io.anuke.arc.collection.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.arc.util.Log; -import io.anuke.arc.util.Strings; -import io.anuke.mindustry.ui.*; +import arc.Core; +import arc.struct.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.Table; +import arc.util.Log; +import arc.util.Strings; +import mindustry.ui.*; import java.util.Locale; -import static io.anuke.mindustry.Vars.locales; -import static io.anuke.mindustry.Vars.ui; +import static mindustry.Vars.locales; +import static mindustry.Vars.ui; public class LanguageDialog extends FloatingDialog{ private Locale lastLocale; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java b/core/src/mindustry/ui/dialogs/LoadDialog.java similarity index 91% rename from core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java rename to core/src/mindustry/ui/dialogs/LoadDialog.java index a1dfe4622a..78e504e6e0 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java +++ b/core/src/mindustry/ui/dialogs/LoadDialog.java @@ -1,25 +1,25 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -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.scene.style.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.core.GameState.*; -import io.anuke.mindustry.game.Saves.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.io.*; -import io.anuke.mindustry.io.SaveIO.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.ui.Styles; +import arc.*; +import arc.struct.*; +import arc.files.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.scene.style.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.core.GameState.*; +import mindustry.game.Saves.*; +import mindustry.gen.*; +import mindustry.io.*; +import mindustry.io.SaveIO.*; +import mindustry.ui.*; +import mindustry.ui.Styles; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class LoadDialog extends FloatingDialog{ ScrollPane pane; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LoadoutDialog.java b/core/src/mindustry/ui/dialogs/LoadoutDialog.java similarity index 91% rename from core/src/io/anuke/mindustry/ui/dialogs/LoadoutDialog.java rename to core/src/mindustry/ui/dialogs/LoadoutDialog.java index f6bd24ff37..9f84c3a616 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LoadoutDialog.java +++ b/core/src/mindustry/ui/dialogs/LoadoutDialog.java @@ -1,16 +1,16 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.input.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.ui.Cicon; +import arc.*; +import arc.struct.*; +import arc.input.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.gen.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.ui.Cicon; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class LoadoutDialog extends FloatingDialog{ private Runnable hider; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java b/core/src/mindustry/ui/dialogs/MapPlayDialog.java similarity index 89% rename from core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java rename to core/src/mindustry/ui/dialogs/MapPlayDialog.java index de6dccaefe..052d18e461 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java +++ b/core/src/mindustry/ui/dialogs/MapPlayDialog.java @@ -1,16 +1,16 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -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.game.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.maps.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import arc.util.ArcAnnotate.*; +import mindustry.game.*; +import mindustry.gen.*; +import mindustry.maps.*; +import mindustry.ui.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class MapPlayDialog extends FloatingDialog{ CustomRulesDialog dialog = new CustomRulesDialog(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java b/core/src/mindustry/ui/dialogs/MapsDialog.java similarity index 93% rename from core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java rename to core/src/mindustry/ui/dialogs/MapsDialog.java index 4fd821d051..99b4f40778 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/mindustry/ui/dialogs/MapsDialog.java @@ -1,21 +1,21 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.input.*; -import io.anuke.arc.math.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.game.EventType.*; -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 arc.*; +import arc.graphics.*; +import arc.input.*; +import arc.math.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.io.*; +import mindustry.maps.*; +import mindustry.ui.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class MapsDialog extends FloatingDialog{ private FloatingDialog dialog; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java b/core/src/mindustry/ui/dialogs/MinimapDialog.java similarity index 85% rename from core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java rename to core/src/mindustry/ui/dialogs/MinimapDialog.java index b527b98456..c8f0163aac 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java +++ b/core/src/mindustry/ui/dialogs/MinimapDialog.java @@ -1,14 +1,14 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.input.*; -import io.anuke.arc.scene.event.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.mindustry.gen.*; +import arc.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.input.*; +import arc.scene.event.*; +import arc.scene.ui.layout.*; +import mindustry.gen.*; -import static io.anuke.mindustry.Vars.renderer; +import static mindustry.Vars.renderer; public class MinimapDialog extends FloatingDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java similarity index 95% rename from core/src/io/anuke/mindustry/ui/dialogs/ModsDialog.java rename to core/src/mindustry/ui/dialogs/ModsDialog.java index b3003cbb0b..96b71b6861 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -1,18 +1,18 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.arc.Net.*; -import io.anuke.arc.files.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.io.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.mod.Mods.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.Net.*; +import arc.files.*; +import arc.util.*; +import arc.util.io.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.mod.Mods.*; +import mindustry.ui.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class ModsDialog extends FloatingDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/PaletteDialog.java b/core/src/mindustry/ui/dialogs/PaletteDialog.java similarity index 75% rename from core/src/io/anuke/mindustry/ui/dialogs/PaletteDialog.java rename to core/src/mindustry/ui/dialogs/PaletteDialog.java index 693a576691..876d88b925 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/PaletteDialog.java +++ b/core/src/mindustry/ui/dialogs/PaletteDialog.java @@ -1,14 +1,14 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.func.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.input.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.ui.*; +import arc.func.*; +import arc.graphics.*; +import arc.input.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import mindustry.gen.*; +import mindustry.ui.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class PaletteDialog extends Dialog{ private Cons cons; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java b/core/src/mindustry/ui/dialogs/PausedDialog.java similarity index 95% rename from core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java rename to core/src/mindustry/ui/dialogs/PausedDialog.java index 1073a98892..01d776bd3b 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java +++ b/core/src/mindustry/ui/dialogs/PausedDialog.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.arc.input.*; -import io.anuke.mindustry.core.GameState.*; -import io.anuke.mindustry.gen.*; +import arc.*; +import arc.input.*; +import mindustry.core.GameState.*; +import mindustry.gen.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class PausedDialog extends FloatingDialog{ private SaveDialog save = new SaveDialog(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java b/core/src/mindustry/ui/dialogs/SaveDialog.java similarity index 81% rename from core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java rename to core/src/mindustry/ui/dialogs/SaveDialog.java index 68b22313b9..0832e80bdf 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java +++ b/core/src/mindustry/ui/dialogs/SaveDialog.java @@ -1,13 +1,13 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.Core; -import io.anuke.arc.scene.ui.TextButton; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.core.GameState.State; -import io.anuke.mindustry.game.Saves.SaveSlot; -import io.anuke.mindustry.gen.*; +import arc.Core; +import arc.scene.ui.TextButton; +import arc.util.Time; +import mindustry.core.GameState.State; +import mindustry.game.Saves.SaveSlot; +import mindustry.gen.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class SaveDialog extends LoadDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java similarity index 94% rename from core/src/io/anuke/mindustry/ui/dialogs/SchematicsDialog.java rename to core/src/mindustry/ui/dialogs/SchematicsDialog.java index 4e10a46160..d12bc4af54 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SchematicsDialog.java +++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java @@ -1,24 +1,24 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -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.scene.style.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.ImageButton.*; -import io.anuke.arc.scene.ui.TextButton.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -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.type.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.struct.*; +import arc.graphics.*; +import arc.graphics.Texture.*; +import arc.graphics.g2d.*; +import arc.scene.style.*; +import arc.scene.ui.*; +import arc.scene.ui.ImageButton.*; +import arc.scene.ui.TextButton.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.core.GameState.*; +import mindustry.game.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.ui.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class SchematicsDialog extends FloatingDialog{ private SchematicInfoDialog info = new SchematicInfoDialog(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java similarity index 93% rename from core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java rename to core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index 26cd33ec93..4c01c10abb 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -1,28 +1,28 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.files.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.graphics.Texture.*; -import io.anuke.arc.input.*; -import io.anuke.arc.scene.*; -import io.anuke.arc.scene.event.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.SettingsDialog.SettingsTable.*; -import io.anuke.arc.scene.ui.TextButton.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.core.GameState.*; -import io.anuke.mindustry.core.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.input.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.struct.*; +import arc.files.*; +import arc.graphics.*; +import arc.graphics.Texture.*; +import arc.input.*; +import arc.scene.*; +import arc.scene.event.*; +import arc.scene.ui.*; +import arc.scene.ui.SettingsDialog.SettingsTable.*; +import arc.scene.ui.TextButton.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.core.GameState.*; +import mindustry.core.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.input.*; +import mindustry.ui.*; -import static io.anuke.arc.Core.bundle; -import static io.anuke.mindustry.Vars.*; +import static arc.Core.bundle; +import static mindustry.Vars.*; public class SettingsMenuDialog extends SettingsDialog{ private SettingsTable graphics; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java b/core/src/mindustry/ui/dialogs/TechTreeDialog.java similarity index 93% rename from core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java rename to core/src/mindustry/ui/dialogs/TechTreeDialog.java index 7a60ad2724..6bbb249a66 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java +++ b/core/src/mindustry/ui/dialogs/TechTreeDialog.java @@ -1,31 +1,31 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -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.*; -import io.anuke.arc.math.geom.*; -import io.anuke.arc.scene.*; -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.mindustry.content.*; -import io.anuke.mindustry.content.TechTree.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.ui.Cicon; -import io.anuke.mindustry.ui.layout.*; -import io.anuke.mindustry.ui.layout.TreeLayout.*; +import arc.*; +import arc.struct.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.input.*; +import arc.math.*; +import arc.math.geom.*; +import arc.scene.*; +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 mindustry.content.*; +import mindustry.content.TechTree.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.ui.Cicon; +import mindustry.ui.layout.*; +import mindustry.ui.layout.TreeLayout.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class TechTreeDialog extends FloatingDialog{ private final float nodeSize = Scl.scl(60f); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/TraceDialog.java b/core/src/mindustry/ui/dialogs/TraceDialog.java similarity index 78% rename from core/src/io/anuke/mindustry/ui/dialogs/TraceDialog.java rename to core/src/mindustry/ui/dialogs/TraceDialog.java index 6635da8a45..9d31780501 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/TraceDialog.java +++ b/core/src/mindustry/ui/dialogs/TraceDialog.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.Core; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.entities.type.Player; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.net.Administration.TraceInfo; +import arc.Core; +import arc.scene.ui.layout.Table; +import mindustry.entities.type.Player; +import mindustry.gen.*; +import mindustry.net.Administration.TraceInfo; public class TraceDialog extends FloatingDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java b/core/src/mindustry/ui/dialogs/ZoneInfoDialog.java similarity index 89% rename from core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java rename to core/src/mindustry/ui/dialogs/ZoneInfoDialog.java index 1bf34b0855..ed1584133c 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java +++ b/core/src/mindustry/ui/dialogs/ZoneInfoDialog.java @@ -1,18 +1,18 @@ -package io.anuke.mindustry.ui.dialogs; +package mindustry.ui.dialogs; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.game.Objectives.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.Cicon; +import arc.*; +import arc.struct.*; +import arc.graphics.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import mindustry.game.*; +import mindustry.game.Objectives.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.ui.Cicon; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class ZoneInfoDialog extends FloatingDialog{ private LoadoutDialog loadout = new LoadoutDialog(); @@ -45,7 +45,7 @@ public class ZoneInfoDialog extends FloatingDialog{ if(i++ % 2 == 0){ iteminfo.row(); } - iteminfo.addImage(stack.item.icon(io.anuke.mindustry.ui.Cicon.small)).size(8 * 3).padRight(1); + iteminfo.addImage(stack.item.icon(mindustry.ui.Cicon.small)).size(8 * 3).padRight(1); iteminfo.add(stack.amount + "").color(Color.lightGray).padRight(5); } }; @@ -85,7 +85,7 @@ public class ZoneInfoDialog extends FloatingDialog{ r.add("$research.list").colspan(2).left(); r.row(); for(Unlock blocko : blocks){ - r.addImage(blocko.block.icon(io.anuke.mindustry.ui.Cicon.small)).size(8 * 3).padRight(5); + r.addImage(blocko.block.icon(mindustry.ui.Cicon.small)).size(8 * 3).padRight(5); r.add(blocko.block.localizedName).color(Color.lightGray).left(); r.addImage(blocko.block.unlocked() ? Icon.checkSmall : Icon.cancelSmall, blocko.block.unlocked() ? Color.lightGray : Color.scarlet).padLeft(3); r.row(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/mindustry/ui/fragments/BlockConfigFragment.java similarity index 84% rename from core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java rename to core/src/mindustry/ui/fragments/BlockConfigFragment.java index 663c275e11..8a6aaceda9 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java +++ b/core/src/mindustry/ui/fragments/BlockConfigFragment.java @@ -1,16 +1,16 @@ -package io.anuke.mindustry.ui.fragments; +package mindustry.ui.fragments; -import io.anuke.arc.*; -import io.anuke.arc.math.*; -import io.anuke.arc.scene.*; -import io.anuke.arc.scene.actions.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.core.GameState.*; -import io.anuke.mindustry.world.*; +import arc.*; +import arc.math.*; +import arc.scene.*; +import arc.scene.actions.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.core.GameState.*; +import mindustry.world.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class BlockConfigFragment extends Fragment{ private Table table = new Table(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java similarity index 86% rename from core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java rename to core/src/mindustry/ui/fragments/BlockInventoryFragment.java index 8dc34edd01..e77a240e36 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java @@ -1,29 +1,29 @@ -package io.anuke.mindustry.ui.fragments; +package mindustry.ui.fragments; -import io.anuke.annotations.Annotations.*; -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.*; -import io.anuke.arc.math.*; -import io.anuke.arc.math.geom.*; -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.layout.*; -import io.anuke.arc.util.*; -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.gen.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.Cicon; -import io.anuke.mindustry.world.*; +import arc.*; +import mindustry.annotations.Annotations.*; +import arc.struct.*; +import arc.func.*; +import arc.graphics.g2d.*; +import arc.input.*; +import arc.math.*; +import arc.math.geom.*; +import arc.scene.*; +import arc.scene.actions.*; +import arc.scene.event.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.core.GameState.*; +import mindustry.entities.*; +import mindustry.entities.type.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.type.*; +import mindustry.ui.Cicon; +import mindustry.world.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class BlockInventoryFragment extends Fragment{ private final static float holdWithdraw = 20f; @@ -199,7 +199,7 @@ public class BlockInventoryFragment extends Fragment{ } private void updateTablePosition(){ - Vector2 v = Core.input.mouseScreen(tile.drawx() + tile.block().size * tilesize / 2f, tile.drawy() + tile.block().size * tilesize / 2f); + Vec2 v = Core.input.mouseScreen(tile.drawx() + tile.block().size * tilesize / 2f, tile.drawy() + tile.block().size * tilesize / 2f); table.pack(); table.setPosition(v.x, v.y, Align.topLeft); } diff --git a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java b/core/src/mindustry/ui/fragments/ChatFragment.java similarity index 91% rename from core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java rename to core/src/mindustry/ui/fragments/ChatFragment.java index c7c168bc84..a6cd4354cf 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/mindustry/ui/fragments/ChatFragment.java @@ -1,24 +1,24 @@ -package io.anuke.mindustry.ui.fragments; +package mindustry.ui.fragments; -import io.anuke.arc.*; -import io.anuke.arc.Input.*; -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.scene.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.Label.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.input.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.Input.*; +import arc.struct.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.scene.*; +import arc.scene.ui.*; +import arc.scene.ui.Label.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.*; +import mindustry.gen.*; +import mindustry.input.*; +import mindustry.ui.*; -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.*; public class ChatFragment extends Table{ private final static int messagesShown = 10; diff --git a/core/src/io/anuke/mindustry/ui/fragments/FadeInFragment.java b/core/src/mindustry/ui/fragments/FadeInFragment.java similarity index 81% rename from core/src/io/anuke/mindustry/ui/fragments/FadeInFragment.java rename to core/src/mindustry/ui/fragments/FadeInFragment.java index 4d903430dc..d6ce32541f 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/FadeInFragment.java +++ b/core/src/mindustry/ui/fragments/FadeInFragment.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.ui.fragments; +package mindustry.ui.fragments; -import io.anuke.arc.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.*; -import io.anuke.arc.scene.*; -import io.anuke.arc.scene.event.*; +import arc.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.scene.*; +import arc.scene.event.*; /** Fades in a black overlay.*/ public class FadeInFragment extends Fragment{ diff --git a/core/src/io/anuke/mindustry/ui/fragments/Fragment.java b/core/src/mindustry/ui/fragments/Fragment.java similarity index 52% rename from core/src/io/anuke/mindustry/ui/fragments/Fragment.java rename to core/src/mindustry/ui/fragments/Fragment.java index f878d5465d..2e66da0652 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/Fragment.java +++ b/core/src/mindustry/ui/fragments/Fragment.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.ui.fragments; +package mindustry.ui.fragments; -import io.anuke.arc.scene.Group; +import arc.scene.Group; public abstract class Fragment{ public abstract void build(Group parent); diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java similarity index 95% rename from core/src/io/anuke/mindustry/ui/fragments/HudFragment.java rename to core/src/mindustry/ui/fragments/HudFragment.java index 8b05c07d5a..80e5dc0185 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -1,38 +1,38 @@ -package io.anuke.mindustry.ui.fragments; +package mindustry.ui.fragments; -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.input.*; -import io.anuke.arc.math.*; -import io.anuke.arc.math.geom.*; -import io.anuke.arc.scene.*; -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.ImageButton.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.core.GameState.*; -import io.anuke.mindustry.ctype.ContentType; -import io.anuke.mindustry.ctype.UnlockableContent; -import io.anuke.mindustry.entities.*; -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.graphics.*; -import io.anuke.mindustry.input.*; -import io.anuke.mindustry.net.Packets.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.ui.Cicon; -import io.anuke.mindustry.ui.dialogs.*; +import arc.*; +import mindustry.annotations.Annotations.*; +import arc.struct.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.input.*; +import arc.math.*; +import arc.math.geom.*; +import arc.scene.*; +import arc.scene.actions.*; +import arc.scene.event.*; +import arc.scene.style.*; +import arc.scene.ui.*; +import arc.scene.ui.ImageButton.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.core.GameState.*; +import mindustry.ctype.ContentType; +import mindustry.ctype.UnlockableContent; +import mindustry.entities.*; +import mindustry.entities.type.*; +import mindustry.game.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.input.*; +import mindustry.net.Packets.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.ui.Cicon; +import mindustry.ui.dialogs.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class HudFragment extends Fragment{ public final PlacementFragment blockfrag = new PlacementFragment(); @@ -208,7 +208,7 @@ public class HudFragment extends Fragment{ if(b.isChecked()){ Element e = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true); if(e == null){ - Vector2 world = Core.input.mouseWorld(); + Vec2 world = Core.input.mouseWorld(); Units.nearby(world.x, world.y, 1f, 1f, unit -> { if(!found[0] && unit instanceof BaseUnit){ if(Core.input.keyTap(KeyCode.MOUSE_LEFT)){ diff --git a/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java b/core/src/mindustry/ui/fragments/LoadingFragment.java similarity index 83% rename from core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java rename to core/src/mindustry/ui/fragments/LoadingFragment.java index dec9860e0d..6cbbeb35fd 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java +++ b/core/src/mindustry/ui/fragments/LoadingFragment.java @@ -1,15 +1,15 @@ -package io.anuke.mindustry.ui.fragments; +package mindustry.ui.fragments; -import io.anuke.arc.func.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.scene.Group; -import io.anuke.arc.scene.actions.*; -import io.anuke.arc.scene.event.Touchable; -import io.anuke.arc.scene.ui.Label; -import io.anuke.arc.scene.ui.TextButton; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.graphics.Pal; -import io.anuke.mindustry.ui.*; +import arc.func.*; +import arc.graphics.*; +import arc.scene.Group; +import arc.scene.actions.*; +import arc.scene.event.Touchable; +import arc.scene.ui.Label; +import arc.scene.ui.TextButton; +import arc.scene.ui.layout.Table; +import mindustry.graphics.Pal; +import mindustry.ui.*; public class LoadingFragment extends Fragment{ private Table table; diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/mindustry/ui/fragments/MenuFragment.java similarity index 93% rename from core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java rename to core/src/mindustry/ui/fragments/MenuFragment.java index abf313183b..535f4d6046 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/mindustry/ui/fragments/MenuFragment.java @@ -1,23 +1,23 @@ -package io.anuke.mindustry.ui.fragments; +package mindustry.ui.fragments; -import io.anuke.arc.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.graphics.g2d.*; -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.style.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.core.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.scene.*; +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 mindustry.core.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.ui.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class MenuFragment extends Fragment{ private Table container, submenu; diff --git a/core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java b/core/src/mindustry/ui/fragments/OverlayFragment.java similarity index 80% rename from core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java rename to core/src/mindustry/ui/fragments/OverlayFragment.java index c2387d1b23..b3116b20b9 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java +++ b/core/src/mindustry/ui/fragments/OverlayFragment.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.ui.fragments; +package mindustry.ui.fragments; -import io.anuke.arc.*; -import io.anuke.arc.scene.event.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.mindustry.*; +import arc.*; +import arc.scene.event.*; +import arc.scene.ui.layout.*; +import mindustry.*; /** Fragment for displaying overlays such as block inventories. */ public class OverlayFragment{ diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java similarity index 95% rename from core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java rename to core/src/mindustry/ui/fragments/PlacementFragment.java index 2a843fd5b9..f02b0ab54f 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/mindustry/ui/fragments/PlacementFragment.java @@ -1,28 +1,28 @@ -package io.anuke.mindustry.ui.fragments; +package mindustry.ui.fragments; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.math.geom.*; -import io.anuke.arc.scene.*; -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.mindustry.content.*; -import io.anuke.mindustry.entities.traits.BuilderTrait.*; -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.input.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.ui.Cicon; -import io.anuke.mindustry.world.*; +import arc.*; +import arc.struct.*; +import arc.graphics.*; +import arc.math.geom.*; +import arc.scene.*; +import arc.scene.event.*; +import arc.scene.style.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.traits.BuilderTrait.*; +import mindustry.entities.type.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.input.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.ui.Cicon; +import mindustry.world.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class PlacementFragment extends Fragment{ final int rowWidth = 4; @@ -433,7 +433,7 @@ public class PlacementFragment extends Fragment{ Block getSelected(){ Block toDisplay = null; - Vector2 v = topTable.stageToLocalCoordinates(Core.input.mouse()); + Vec2 v = topTable.stageToLocalCoordinates(Core.input.mouse()); //setup hovering tile if(!Core.scene.hasMouse() && topTable.hit(v.x, v.y, false) == null){ diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java similarity index 91% rename from core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java rename to core/src/mindustry/ui/fragments/PlayerListFragment.java index e590b910e7..df0d9f7269 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java @@ -1,20 +1,20 @@ -package io.anuke.mindustry.ui.fragments; +package mindustry.ui.fragments; -import io.anuke.arc.*; -import io.anuke.arc.graphics.g2d.*; -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.*; -import io.anuke.mindustry.core.GameState.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.net.*; -import io.anuke.mindustry.net.Packets.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.graphics.g2d.*; +import arc.scene.*; +import arc.scene.event.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.core.GameState.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.net.*; +import mindustry.net.Packets.*; +import mindustry.ui.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class PlayerListFragment extends Fragment{ private boolean visible = false; diff --git a/core/src/io/anuke/mindustry/ui/fragments/ScriptConsoleFragment.java b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java similarity index 91% rename from core/src/io/anuke/mindustry/ui/fragments/ScriptConsoleFragment.java rename to core/src/mindustry/ui/fragments/ScriptConsoleFragment.java index 87b7f76d6e..1f667602de 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/ScriptConsoleFragment.java +++ b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java @@ -1,22 +1,22 @@ -package io.anuke.mindustry.ui.fragments; +package mindustry.ui.fragments; -import io.anuke.arc.*; -import io.anuke.arc.Input.*; -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.scene.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.Label.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.input.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.Input.*; +import arc.struct.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.scene.*; +import arc.scene.ui.*; +import arc.scene.ui.Label.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.*; +import mindustry.input.*; +import mindustry.ui.*; -import static io.anuke.arc.Core.*; -import static io.anuke.mindustry.Vars.*; +import static arc.Core.*; +import static mindustry.Vars.*; public class ScriptConsoleFragment extends Table{ private final static int messagesShown = 30; diff --git a/core/src/io/anuke/mindustry/ui/layout/BranchTreeLayout.java b/core/src/mindustry/ui/layout/BranchTreeLayout.java similarity index 98% rename from core/src/io/anuke/mindustry/ui/layout/BranchTreeLayout.java rename to core/src/mindustry/ui/layout/BranchTreeLayout.java index 5f3f4b6932..b012d68e71 100644 --- a/core/src/io/anuke/mindustry/ui/layout/BranchTreeLayout.java +++ b/core/src/mindustry/ui/layout/BranchTreeLayout.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.ui.layout; +package mindustry.ui.layout; -import io.anuke.arc.collection.*; -import io.anuke.arc.math.geom.*; +import arc.struct.*; +import arc.math.geom.*; /** * Algorithm taken from TreeLayout. diff --git a/core/src/io/anuke/mindustry/ui/layout/RadialTreeLayout.java b/core/src/mindustry/ui/layout/RadialTreeLayout.java similarity index 94% rename from core/src/io/anuke/mindustry/ui/layout/RadialTreeLayout.java rename to core/src/mindustry/ui/layout/RadialTreeLayout.java index e0c8006cb9..65096e86f6 100644 --- a/core/src/io/anuke/mindustry/ui/layout/RadialTreeLayout.java +++ b/core/src/mindustry/ui/layout/RadialTreeLayout.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.ui.layout; +package mindustry.ui.layout; -import io.anuke.arc.collection.*; -import io.anuke.arc.math.*; +import arc.struct.*; +import arc.math.*; public class RadialTreeLayout implements TreeLayout{ private static ObjectSet visited = new ObjectSet<>(); diff --git a/core/src/io/anuke/mindustry/ui/layout/TreeLayout.java b/core/src/mindustry/ui/layout/TreeLayout.java similarity index 93% rename from core/src/io/anuke/mindustry/ui/layout/TreeLayout.java rename to core/src/mindustry/ui/layout/TreeLayout.java index 6b9f4556da..1a44ee708c 100644 --- a/core/src/io/anuke/mindustry/ui/layout/TreeLayout.java +++ b/core/src/mindustry/ui/layout/TreeLayout.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.ui.layout; +package mindustry.ui.layout; public interface TreeLayout{ void layout(TreeNode root); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/mindustry/world/Block.java similarity index 95% rename from core/src/io/anuke/mindustry/world/Block.java rename to core/src/mindustry/world/Block.java index a6f7769d03..9bd64f023a 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -1,42 +1,42 @@ -package io.anuke.mindustry.world; +package mindustry.world; -import io.anuke.annotations.Annotations.*; -import io.anuke.arc.*; -import io.anuke.arc.Graphics.*; -import io.anuke.arc.Graphics.Cursor.*; -import io.anuke.arc.audio.*; -import io.anuke.arc.collection.EnumSet; -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.g2d.TextureAtlas.*; -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.arc.util.pooling.*; -import io.anuke.mindustry.ctype.*; -import io.anuke.mindustry.ctype.ContentType; -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.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.graphics.MultiPacker.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.world.blocks.*; -import io.anuke.mindustry.world.blocks.power.*; -import io.anuke.mindustry.world.consumers.*; -import io.anuke.mindustry.world.meta.*; -import io.anuke.mindustry.world.meta.values.*; +import arc.*; +import mindustry.annotations.Annotations.*; +import arc.Graphics.*; +import arc.Graphics.Cursor.*; +import arc.audio.*; +import arc.struct.EnumSet; +import arc.struct.*; +import arc.func.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.graphics.g2d.TextureAtlas.*; +import arc.math.*; +import arc.math.geom.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import arc.util.ArcAnnotate.*; +import arc.util.pooling.*; +import mindustry.ctype.*; +import mindustry.ctype.ContentType; +import mindustry.entities.*; +import mindustry.entities.effect.*; +import mindustry.entities.traits.BuilderTrait.*; +import mindustry.entities.type.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.graphics.MultiPacker.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.blocks.*; +import mindustry.world.blocks.power.*; +import mindustry.world.consumers.*; +import mindustry.world.meta.*; +import mindustry.world.meta.values.*; import java.util.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class Block extends BlockStorage{ public static final int crackRegions = 8, maxCrackSize = 5; @@ -489,7 +489,7 @@ public class Block extends BlockStorage{ /** Update table alignment after configuring.*/ public void updateTableAlign(Tile tile, Table table){ - Vector2 pos = Core.input.mouseScreen(tile.drawx(), tile.drawy() - tile.block().size * tilesize / 2f - 1); + Vec2 pos = Core.input.mouseScreen(tile.drawx(), tile.drawy() - tile.block().size * tilesize / 2f - 1); table.setPosition(pos.x, pos.y, Align.top); } diff --git a/core/src/io/anuke/mindustry/world/BlockStorage.java b/core/src/mindustry/world/BlockStorage.java similarity index 93% rename from core/src/io/anuke/mindustry/world/BlockStorage.java rename to core/src/mindustry/world/BlockStorage.java index ced126de72..20c1ca8f98 100644 --- a/core/src/io/anuke/mindustry/world/BlockStorage.java +++ b/core/src/mindustry/world/BlockStorage.java @@ -1,21 +1,21 @@ -package io.anuke.mindustry.world; +package mindustry.world; -import io.anuke.arc.collection.Array; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.math.geom.Vector2; -import io.anuke.arc.util.*; -import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.entities.Effects; -import io.anuke.mindustry.entities.effect.Puddle; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.entities.type.Unit; -import io.anuke.mindustry.ctype.UnlockableContent; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.type.Liquid; -import io.anuke.mindustry.world.consumers.Consumers; -import io.anuke.mindustry.world.meta.BlockBars; -import io.anuke.mindustry.world.meta.BlockStats; +import arc.struct.Array; +import arc.math.Mathf; +import arc.math.geom.Vec2; +import arc.util.*; +import mindustry.Vars; +import mindustry.content.Fx; +import mindustry.entities.Effects; +import mindustry.entities.effect.Puddle; +import mindustry.entities.type.TileEntity; +import mindustry.entities.type.Unit; +import mindustry.ctype.UnlockableContent; +import mindustry.type.Item; +import mindustry.type.Liquid; +import mindustry.world.consumers.Consumers; +import mindustry.world.meta.BlockBars; +import mindustry.world.meta.BlockStats; public abstract class BlockStorage extends UnlockableContent{ public boolean hasItems; @@ -83,7 +83,7 @@ public abstract class BlockStorage extends UnlockableContent{ } /** Returns offset for stack placement. */ - public void getStackOffset(Item item, Tile tile, Vector2 trns){ + public void getStackOffset(Item item, Tile tile, Vec2 trns){ } diff --git a/core/src/io/anuke/mindustry/world/Build.java b/core/src/mindustry/world/Build.java similarity index 90% rename from core/src/io/anuke/mindustry/world/Build.java rename to core/src/mindustry/world/Build.java index 276caefba7..dafd9fe38d 100644 --- a/core/src/io/anuke/mindustry/world/Build.java +++ b/core/src/mindustry/world/Build.java @@ -1,19 +1,19 @@ -package io.anuke.mindustry.world; +package mindustry.world; -import io.anuke.annotations.Annotations.Loc; -import io.anuke.annotations.Annotations.Remote; -import io.anuke.arc.Core; -import io.anuke.arc.Events; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.math.geom.*; -import io.anuke.mindustry.content.Blocks; -import io.anuke.mindustry.entities.Units; -import io.anuke.mindustry.game.EventType.BlockBuildBeginEvent; -import io.anuke.mindustry.game.Team; -import io.anuke.mindustry.world.blocks.BuildBlock; -import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity; +import mindustry.annotations.Annotations.Loc; +import mindustry.annotations.Annotations.Remote; +import arc.Core; +import arc.Events; +import arc.math.Mathf; +import arc.math.geom.*; +import mindustry.content.Blocks; +import mindustry.entities.Units; +import mindustry.game.EventType.BlockBuildBeginEvent; +import mindustry.game.Team; +import mindustry.world.blocks.BuildBlock; +import mindustry.world.blocks.BuildBlock.BuildEntity; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class Build{ diff --git a/core/src/io/anuke/mindustry/world/CachedTile.java b/core/src/mindustry/world/CachedTile.java similarity index 85% rename from core/src/io/anuke/mindustry/world/CachedTile.java rename to core/src/mindustry/world/CachedTile.java index dde20ba3be..e46a57d3ba 100644 --- a/core/src/io/anuke/mindustry/world/CachedTile.java +++ b/core/src/mindustry/world/CachedTile.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.world; +package mindustry.world; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.game.Team; -import io.anuke.mindustry.world.modules.*; +import mindustry.entities.type.TileEntity; +import mindustry.game.Team; +import mindustry.world.modules.*; /** * A tile which does not trigger change events and whose entity types are cached. diff --git a/core/src/io/anuke/mindustry/world/DirectionalItemBuffer.java b/core/src/mindustry/world/DirectionalItemBuffer.java similarity index 88% rename from core/src/io/anuke/mindustry/world/DirectionalItemBuffer.java rename to core/src/mindustry/world/DirectionalItemBuffer.java index 2f5d7538b6..5c57376fa1 100644 --- a/core/src/io/anuke/mindustry/world/DirectionalItemBuffer.java +++ b/core/src/mindustry/world/DirectionalItemBuffer.java @@ -1,13 +1,13 @@ -package io.anuke.mindustry.world; +package mindustry.world; -import io.anuke.annotations.Annotations.Struct; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.gen.BufferItem; -import io.anuke.mindustry.type.Item; +import mindustry.annotations.Annotations.Struct; +import arc.util.Time; +import mindustry.gen.BufferItem; +import mindustry.type.Item; import java.io.*; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; public class DirectionalItemBuffer{ public final long[][] buffers; diff --git a/core/src/io/anuke/mindustry/world/Edges.java b/core/src/mindustry/world/Edges.java similarity index 90% rename from core/src/io/anuke/mindustry/world/Edges.java rename to core/src/mindustry/world/Edges.java index 623dd1d434..86d6e31449 100644 --- a/core/src/io/anuke/mindustry/world/Edges.java +++ b/core/src/mindustry/world/Edges.java @@ -1,18 +1,18 @@ -package io.anuke.mindustry.world; +package mindustry.world; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.math.geom.*; +import arc.math.Mathf; +import arc.math.geom.*; import java.util.Arrays; -import static io.anuke.mindustry.Vars.world; +import static mindustry.Vars.world; public class Edges{ private static final int maxSize = 11; private static final int maxRadius = 12; private static Point2[][] edges = new Point2[maxSize][0]; private static Point2[][] edgeInside = new Point2[maxSize][0]; - private static Vector2[][] polygons = new Vector2[maxRadius * 2][0]; + private static Vec2[][] polygons = new Vec2[maxRadius * 2][0]; static{ for(int i = 0; i < maxRadius * 2; i++){ @@ -60,7 +60,7 @@ public class Edges{ tiley + Mathf.clamp(other.y - tiley, -(size - 1) / 2, (size / 2))); } - public static Vector2[] getPixelPolygon(float radius){ + public static Vec2[] getPixelPolygon(float radius){ if(radius < 1 || radius > maxRadius) throw new RuntimeException("Polygon size must be between 1 and " + maxRadius); return polygons[(int)(radius * 2) - 1]; diff --git a/core/src/io/anuke/mindustry/world/ItemBuffer.java b/core/src/mindustry/world/ItemBuffer.java similarity index 93% rename from core/src/io/anuke/mindustry/world/ItemBuffer.java rename to core/src/mindustry/world/ItemBuffer.java index 9c058ce50c..20f414403f 100644 --- a/core/src/io/anuke/mindustry/world/ItemBuffer.java +++ b/core/src/mindustry/world/ItemBuffer.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.world; +package mindustry.world; -import io.anuke.arc.util.*; -import io.anuke.mindustry.type.Item; +import arc.util.*; +import mindustry.type.Item; import java.io.*; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; public class ItemBuffer{ private final float speed; diff --git a/core/src/io/anuke/mindustry/world/LegacyColorMapper.java b/core/src/mindustry/world/LegacyColorMapper.java similarity index 90% rename from core/src/io/anuke/mindustry/world/LegacyColorMapper.java rename to core/src/mindustry/world/LegacyColorMapper.java index e57e99eb3a..8f3f80e953 100644 --- a/core/src/io/anuke/mindustry/world/LegacyColorMapper.java +++ b/core/src/mindustry/world/LegacyColorMapper.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.world; +package mindustry.world; -import io.anuke.arc.collection.IntMap; -import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.content.Blocks; -import io.anuke.mindustry.ctype.ContentList; -import io.anuke.mindustry.world.blocks.Floor; +import arc.struct.IntMap; +import arc.graphics.Color; +import mindustry.content.Blocks; +import mindustry.ctype.ContentList; +import mindustry.world.blocks.Floor; public class LegacyColorMapper implements ContentList{ private static IntMap blockMap = new IntMap<>(); diff --git a/core/src/io/anuke/mindustry/world/Pos.java b/core/src/mindustry/world/Pos.java similarity index 94% rename from core/src/io/anuke/mindustry/world/Pos.java rename to core/src/mindustry/world/Pos.java index 97a4d560b8..995e7a0d77 100644 --- a/core/src/io/anuke/mindustry/world/Pos.java +++ b/core/src/mindustry/world/Pos.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world; +package mindustry.world; /** Methods for a packed position 'struct', contained in an int. */ public class Pos{ diff --git a/core/src/io/anuke/mindustry/world/StaticTree.java b/core/src/mindustry/world/StaticTree.java similarity index 80% rename from core/src/io/anuke/mindustry/world/StaticTree.java rename to core/src/mindustry/world/StaticTree.java index be6b6c4c76..1eeb3f89c2 100644 --- a/core/src/io/anuke/mindustry/world/StaticTree.java +++ b/core/src/mindustry/world/StaticTree.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.world; +package mindustry.world; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.TextureRegion; -import io.anuke.arc.util.Tmp; -import io.anuke.mindustry.world.blocks.StaticWall; +import arc.graphics.g2d.Draw; +import arc.graphics.g2d.TextureRegion; +import arc.util.Tmp; +import mindustry.world.blocks.StaticWall; -import static io.anuke.mindustry.Vars.tilesize; +import static mindustry.Vars.tilesize; public class StaticTree extends StaticWall{ diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java similarity index 95% rename from core/src/io/anuke/mindustry/world/Tile.java rename to core/src/mindustry/world/Tile.java index b3b82a3c45..1ac2871bab 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -1,20 +1,20 @@ -package io.anuke.mindustry.world; +package mindustry.world; -import io.anuke.arc.collection.*; -import io.anuke.arc.func.*; -import io.anuke.arc.math.*; -import io.anuke.arc.math.geom.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.content.*; -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.blocks.*; -import io.anuke.mindustry.world.modules.*; +import arc.struct.*; +import arc.func.*; +import arc.math.*; +import arc.math.geom.*; +import arc.util.ArcAnnotate.*; +import mindustry.content.*; +import mindustry.entities.traits.*; +import mindustry.entities.type.*; +import mindustry.game.*; +import mindustry.gen.*; +import mindustry.type.*; +import mindustry.world.blocks.*; +import mindustry.world.modules.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class Tile implements Position, TargetTrait{ /** Tile traversal cost. */ @@ -449,8 +449,8 @@ public class Tile implements Position, TargetTrait{ } @Override - public Vector2 velocity(){ - return Vector2.ZERO; + public Vec2 velocity(){ + return Vec2.ZERO; } @Override diff --git a/core/src/io/anuke/mindustry/world/Tiles.java b/core/src/mindustry/world/Tiles.java similarity index 96% rename from core/src/io/anuke/mindustry/world/Tiles.java rename to core/src/mindustry/world/Tiles.java index c9f58d7b3d..97d4cf05e4 100644 --- a/core/src/io/anuke/mindustry/world/Tiles.java +++ b/core/src/mindustry/world/Tiles.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.world; +package mindustry.world; -import io.anuke.arc.util.ArcAnnotate.*; +import arc.util.ArcAnnotate.*; import java.util.*; diff --git a/core/src/io/anuke/mindustry/world/WorldContext.java b/core/src/mindustry/world/WorldContext.java similarity index 94% rename from core/src/io/anuke/mindustry/world/WorldContext.java rename to core/src/mindustry/world/WorldContext.java index ceaa528b77..03a6cccea7 100644 --- a/core/src/io/anuke/mindustry/world/WorldContext.java +++ b/core/src/mindustry/world/WorldContext.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world; +package mindustry.world; public interface WorldContext{ diff --git a/core/src/io/anuke/mindustry/world/blocks/Attributes.java b/core/src/mindustry/world/blocks/Attributes.java similarity index 75% rename from core/src/io/anuke/mindustry/world/blocks/Attributes.java rename to core/src/mindustry/world/blocks/Attributes.java index ce343a852c..487b093314 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Attributes.java +++ b/core/src/mindustry/world/blocks/Attributes.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -import io.anuke.mindustry.world.meta.Attribute; +import mindustry.world.meta.Attribute; public class Attributes{ private float[] array = new float[Attribute.values().length]; diff --git a/core/src/io/anuke/mindustry/world/blocks/Autotiler.java b/core/src/mindustry/world/blocks/Autotiler.java similarity index 94% rename from core/src/io/anuke/mindustry/world/blocks/Autotiler.java rename to core/src/mindustry/world/blocks/Autotiler.java index 29e99361a4..4c25ca170d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Autotiler.java +++ b/core/src/mindustry/world/blocks/Autotiler.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -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.entities.traits.BuilderTrait.*; -import io.anuke.mindustry.world.*; +import arc.math.*; +import arc.math.geom.*; +import arc.util.*; +import arc.util.ArcAnnotate.*; +import mindustry.entities.traits.BuilderTrait.*; +import mindustry.world.*; import java.util.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/BlockPart.java b/core/src/mindustry/world/blocks/BlockPart.java similarity index 91% rename from core/src/io/anuke/mindustry/world/blocks/BlockPart.java rename to core/src/mindustry/world/blocks/BlockPart.java index 633685f1d4..ef2b3d1c38 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BlockPart.java +++ b/core/src/mindustry/world/blocks/BlockPart.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.type.Liquid; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; +import mindustry.type.Item; +import mindustry.type.Liquid; +import mindustry.world.Block; +import mindustry.world.Tile; /** * Used for multiblocks. Each block that is not the center of the multiblock is a part. diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/mindustry/world/blocks/BuildBlock.java similarity index 93% rename from core/src/io/anuke/mindustry/world/blocks/BuildBlock.java rename to core/src/mindustry/world/blocks/BuildBlock.java index 4623857790..69d9ba61e8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java +++ b/core/src/mindustry/world/blocks/BuildBlock.java @@ -1,30 +1,30 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -import io.anuke.annotations.Annotations.*; -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.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.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.modules.*; +import arc.*; +import mindustry.annotations.Annotations.*; +import arc.Graphics.*; +import arc.Graphics.Cursor.*; +import arc.graphics.g2d.*; +import arc.math.*; +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.gen.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.*; +import mindustry.world.modules.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class BuildBlock extends Block{ public static final int maxSize = 9; @@ -125,7 +125,7 @@ public class BuildBlock extends Block{ @Override public TextureRegion getDisplayIcon(Tile tile){ BuildEntity entity = tile.ent(); - return (entity.cblock == null ? entity.previous : entity.cblock).icon(io.anuke.mindustry.ui.Cicon.full); + return (entity.cblock == null ? entity.previous : entity.cblock).icon(mindustry.ui.Cicon.full); } @Override @@ -173,7 +173,7 @@ public class BuildBlock extends Block{ if(entity.previous == null) return; - if(Core.atlas.isFound(entity.previous.icon(io.anuke.mindustry.ui.Cicon.full))){ + if(Core.atlas.isFound(entity.previous.icon(mindustry.ui.Cicon.full))){ Draw.rect(entity.previous.icon(Cicon.full), tile.drawx(), tile.drawy(), entity.previous.rotate ? tile.rotation() * 90 : 0); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/DoubleOverlayFloor.java b/core/src/mindustry/world/blocks/DoubleOverlayFloor.java similarity index 77% rename from core/src/io/anuke/mindustry/world/blocks/DoubleOverlayFloor.java rename to core/src/mindustry/world/blocks/DoubleOverlayFloor.java index 7a0a26847d..45d156c164 100644 --- a/core/src/io/anuke/mindustry/world/blocks/DoubleOverlayFloor.java +++ b/core/src/mindustry/world/blocks/DoubleOverlayFloor.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.world.Tile; +import arc.graphics.g2d.Draw; +import arc.math.Mathf; +import mindustry.world.Tile; public class DoubleOverlayFloor extends OverlayFloor{ diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/mindustry/world/blocks/Floor.java similarity index 91% rename from core/src/io/anuke/mindustry/world/blocks/Floor.java rename to core/src/mindustry/world/blocks/Floor.java index 582dc0e520..3fe5cf71a8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Floor.java +++ b/core/src/mindustry/world/blocks/Floor.java @@ -1,22 +1,22 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -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.g2d.TextureAtlas.*; -import io.anuke.arc.math.*; -import io.anuke.arc.math.geom.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.entities.Effects.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.graphics.MultiPacker.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.world.*; +import arc.*; +import arc.struct.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.graphics.g2d.TextureAtlas.*; +import arc.math.*; +import arc.math.geom.*; +import arc.util.ArcAnnotate.*; +import mindustry.content.*; +import mindustry.entities.Effects.*; +import mindustry.graphics.*; +import mindustry.graphics.MultiPacker.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.*; -import static io.anuke.mindustry.Vars.tilesize; +import static mindustry.Vars.tilesize; public class Floor extends Block{ /** number of different variant regions to use */ diff --git a/core/src/io/anuke/mindustry/world/blocks/ItemSelection.java b/core/src/mindustry/world/blocks/ItemSelection.java similarity index 71% rename from core/src/io/anuke/mindustry/world/blocks/ItemSelection.java rename to core/src/mindustry/world/blocks/ItemSelection.java index 26e4a3d5c9..8fe4994d5b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/ItemSelection.java +++ b/core/src/mindustry/world/blocks/ItemSelection.java @@ -1,16 +1,16 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -import io.anuke.arc.collection.*; -import io.anuke.arc.func.*; -import io.anuke.arc.scene.style.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.ui.Cicon; +import arc.struct.*; +import arc.func.*; +import arc.scene.style.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import mindustry.gen.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.ui.Cicon; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class ItemSelection{ diff --git a/core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java b/core/src/mindustry/world/blocks/LiquidBlock.java similarity index 79% rename from core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java rename to core/src/mindustry/world/blocks/LiquidBlock.java index f7b4b9566c..91cb843283 100644 --- a/core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java +++ b/core/src/mindustry/world/blocks/LiquidBlock.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -import io.anuke.arc.Core; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.TextureRegion; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.BlockGroup; -import io.anuke.mindustry.world.modules.LiquidModule; +import arc.Core; +import arc.graphics.g2d.Draw; +import arc.graphics.g2d.TextureRegion; +import mindustry.world.Block; +import mindustry.world.Tile; +import mindustry.world.meta.BlockGroup; +import mindustry.world.modules.LiquidModule; public class LiquidBlock extends Block{ protected TextureRegion liquidRegion, bottomRegion, topRegion; diff --git a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java b/core/src/mindustry/world/blocks/OreBlock.java similarity index 84% rename from core/src/io/anuke/mindustry/world/blocks/OreBlock.java rename to core/src/mindustry/world/blocks/OreBlock.java index 7270ec7aa0..f6c25ef06c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java +++ b/core/src/mindustry/world/blocks/OreBlock.java @@ -1,15 +1,15 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -import io.anuke.annotations.Annotations.*; -import io.anuke.arc.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.graphics.MultiPacker.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; +import arc.*; +import mindustry.annotations.Annotations.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import mindustry.graphics.*; +import mindustry.graphics.MultiPacker.*; +import mindustry.type.*; +import mindustry.world.*; -import static io.anuke.mindustry.Vars.tilesize; +import static mindustry.Vars.tilesize; /**An overlay ore for a specific item type.*/ public class OreBlock extends OverlayFloor{ diff --git a/core/src/io/anuke/mindustry/world/blocks/OverlayFloor.java b/core/src/mindustry/world/blocks/OverlayFloor.java similarity index 70% rename from core/src/io/anuke/mindustry/world/blocks/OverlayFloor.java rename to core/src/mindustry/world/blocks/OverlayFloor.java index a2527e6a67..28c5e81983 100644 --- a/core/src/io/anuke/mindustry/world/blocks/OverlayFloor.java +++ b/core/src/mindustry/world/blocks/OverlayFloor.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.world.Tile; +import arc.graphics.g2d.Draw; +import arc.math.Mathf; +import mindustry.world.Tile; /**A type of floor that is overlaid on top of over floors.*/ public class OverlayFloor extends Floor{ diff --git a/core/src/io/anuke/mindustry/world/blocks/PowerBlock.java b/core/src/mindustry/world/blocks/PowerBlock.java similarity index 63% rename from core/src/io/anuke/mindustry/world/blocks/PowerBlock.java rename to core/src/mindustry/world/blocks/PowerBlock.java index 83e550a7e4..3312267635 100644 --- a/core/src/io/anuke/mindustry/world/blocks/PowerBlock.java +++ b/core/src/mindustry/world/blocks/PowerBlock.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.meta.BlockGroup; +import mindustry.world.Block; +import mindustry.world.meta.BlockGroup; public abstract class PowerBlock extends Block{ diff --git a/core/src/io/anuke/mindustry/world/blocks/RespawnBlock.java b/core/src/mindustry/world/blocks/RespawnBlock.java similarity index 89% rename from core/src/io/anuke/mindustry/world/blocks/RespawnBlock.java rename to core/src/mindustry/world/blocks/RespawnBlock.java index 8171535184..581dec8b21 100644 --- a/core/src/io/anuke/mindustry/world/blocks/RespawnBlock.java +++ b/core/src/mindustry/world/blocks/RespawnBlock.java @@ -1,13 +1,13 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; +import arc.graphics.g2d.*; +import arc.math.*; +import mindustry.entities.type.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.world.*; -import static io.anuke.mindustry.Vars.net; +import static mindustry.Vars.net; public class RespawnBlock{ diff --git a/core/src/io/anuke/mindustry/world/blocks/Rock.java b/core/src/mindustry/world/blocks/Rock.java similarity index 78% rename from core/src/io/anuke/mindustry/world/blocks/Rock.java rename to core/src/mindustry/world/blocks/Rock.java index a178ce74f0..235dd24ee6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Rock.java +++ b/core/src/mindustry/world/blocks/Rock.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -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 io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; +import arc.Core; +import arc.graphics.g2d.Draw; +import arc.graphics.g2d.TextureRegion; +import arc.math.Mathf; +import mindustry.world.Block; +import mindustry.world.Tile; public class Rock extends Block{ protected int variants; diff --git a/core/src/io/anuke/mindustry/world/blocks/StaticWall.java b/core/src/mindustry/world/blocks/StaticWall.java similarity index 83% rename from core/src/io/anuke/mindustry/world/blocks/StaticWall.java rename to core/src/mindustry/world/blocks/StaticWall.java index 0797fee02a..d81e0521db 100644 --- a/core/src/io/anuke/mindustry/world/blocks/StaticWall.java +++ b/core/src/mindustry/world/blocks/StaticWall.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -import io.anuke.arc.Core; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.graphics.CacheLayer; -import io.anuke.mindustry.world.*; +import arc.Core; +import arc.graphics.g2d.*; +import arc.math.Mathf; +import mindustry.graphics.CacheLayer; +import mindustry.world.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class StaticWall extends Rock{ TextureRegion large; diff --git a/core/src/io/anuke/mindustry/world/blocks/TreeBlock.java b/core/src/mindustry/world/blocks/TreeBlock.java similarity index 62% rename from core/src/io/anuke/mindustry/world/blocks/TreeBlock.java rename to core/src/mindustry/world/blocks/TreeBlock.java index 11d110fc31..6ce0ca84d8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/TreeBlock.java +++ b/core/src/mindustry/world/blocks/TreeBlock.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.world.blocks; +package mindustry.world.blocks; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.graphics.Layer; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; +import arc.graphics.g2d.Draw; +import arc.math.Mathf; +import mindustry.graphics.Layer; +import mindustry.world.Block; +import mindustry.world.Tile; public class TreeBlock extends Block{ diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java b/core/src/mindustry/world/blocks/defense/DeflectorWall.java similarity index 74% rename from core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java rename to core/src/mindustry/world/blocks/defense/DeflectorWall.java index 3cc6d177f0..cf8f54a8ce 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java +++ b/core/src/mindustry/world/blocks/defense/DeflectorWall.java @@ -1,15 +1,15 @@ -package io.anuke.mindustry.world.blocks.defense; +package mindustry.world.blocks.defense; -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.entities.type.*; -import io.anuke.mindustry.entities.type.Bullet; -import io.anuke.mindustry.world.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.math.geom.*; +import arc.util.*; +import mindustry.entities.type.*; +import mindustry.entities.type.Bullet; +import mindustry.world.*; -import static io.anuke.mindustry.Vars.tilesize; +import static mindustry.Vars.tilesize; public class DeflectorWall extends Wall{ public static final float hitTime = 10f; @@ -52,7 +52,7 @@ public class DeflectorWall extends Wall{ bullet.hitbox(rect2); - Vector2 position = Geometry.raycastRect(bullet.x - bullet.velocity().x*Time.delta(), bullet.y - bullet.velocity().y*Time.delta(), bullet.x + bullet.velocity().x*Time.delta(), bullet.y + bullet.velocity().y*Time.delta(), + Vec2 position = Geometry.raycastRect(bullet.x - bullet.velocity().x*Time.delta(), bullet.y - bullet.velocity().y*Time.delta(), bullet.x + bullet.velocity().x*Time.delta(), bullet.y + bullet.velocity().y*Time.delta(), rect.setSize(size * tilesize + rect2.width*2 + rect2.height*2).setCenter(entity.x, entity.y)); if(position != null){ diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java b/core/src/mindustry/world/blocks/defense/Door.java similarity index 81% rename from core/src/io/anuke/mindustry/world/blocks/defense/Door.java rename to core/src/mindustry/world/blocks/defense/Door.java index e8bfd2c4b4..27a0d26bff 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java +++ b/core/src/mindustry/world/blocks/defense/Door.java @@ -1,21 +1,21 @@ -package io.anuke.mindustry.world.blocks.defense; +package mindustry.world.blocks.defense; -import io.anuke.annotations.Annotations.*; -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.geom.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.entities.*; -import io.anuke.mindustry.entities.Effects.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.world.*; +import arc.*; +import mindustry.annotations.Annotations.*; +import arc.Graphics.*; +import arc.Graphics.Cursor.*; +import arc.graphics.g2d.*; +import arc.math.geom.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.entities.Effects.*; +import mindustry.entities.type.*; +import mindustry.gen.*; +import mindustry.world.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class Door extends Wall{ protected final static Rectangle rect = new Rectangle(); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java similarity index 92% rename from core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java rename to core/src/mindustry/world/blocks/defense/ForceProjector.java index 466d677b6c..a417c2b9e5 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java @@ -1,24 +1,24 @@ -package io.anuke.mindustry.world.blocks.defense; +package mindustry.world.blocks.defense; -import io.anuke.arc.*; -import io.anuke.arc.func.*; -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.content.*; -import io.anuke.mindustry.entities.*; -import io.anuke.mindustry.entities.traits.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.entities.type.BaseEntity; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.consumers.*; -import io.anuke.mindustry.world.meta.*; +import arc.*; +import arc.func.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.entities.traits.*; +import mindustry.entities.type.*; +import mindustry.entities.type.BaseEntity; +import mindustry.graphics.*; +import mindustry.world.*; +import mindustry.world.consumers.*; +import mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class ForceProjector extends Block{ public final int timerUse = timers++; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java b/core/src/mindustry/world/blocks/defense/MendProjector.java similarity index 90% rename from core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java rename to core/src/mindustry/world/blocks/defense/MendProjector.java index a19d536018..30ea5fbda7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/mindustry/world/blocks/defense/MendProjector.java @@ -1,21 +1,21 @@ -package io.anuke.mindustry.world.blocks.defense; +package mindustry.world.blocks.defense; -import io.anuke.arc.Core; -import io.anuke.arc.collection.IntSet; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.util.*; -import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.entities.Effects; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.meta.*; +import arc.Core; +import arc.struct.IntSet; +import arc.graphics.Color; +import arc.graphics.g2d.*; +import arc.math.Mathf; +import arc.util.*; +import mindustry.content.Fx; +import mindustry.entities.Effects; +import mindustry.entities.type.TileEntity; +import mindustry.graphics.*; +import mindustry.world.*; +import mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class MendProjector extends Block{ private static final IntSet healed = new IntSet(); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java similarity index 91% rename from core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java rename to core/src/mindustry/world/blocks/defense/OverdriveProjector.java index 84e88b2f22..945aeb3602 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java @@ -1,19 +1,19 @@ -package io.anuke.mindustry.world.blocks.defense; +package mindustry.world.blocks.defense; -import io.anuke.arc.Core; -import io.anuke.arc.collection.IntSet; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.meta.*; +import arc.Core; +import arc.struct.IntSet; +import arc.graphics.Color; +import arc.graphics.g2d.*; +import arc.math.Mathf; +import arc.util.Time; +import mindustry.entities.type.TileEntity; +import mindustry.graphics.*; +import mindustry.world.*; +import mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class OverdriveProjector extends Block{ private static final IntSet healed = new IntSet(); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java b/core/src/mindustry/world/blocks/defense/ShockMine.java similarity index 74% rename from core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java rename to core/src/mindustry/world/blocks/defense/ShockMine.java index de72043c7d..4a2381e8ed 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java +++ b/core/src/mindustry/world/blocks/defense/ShockMine.java @@ -1,14 +1,14 @@ -package io.anuke.mindustry.world.blocks.defense; +package mindustry.world.blocks.defense; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.Fill; -import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.entities.effect.Lightning; -import io.anuke.mindustry.entities.type.Unit; -import io.anuke.mindustry.graphics.Layer; -import io.anuke.mindustry.graphics.Pal; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; +import arc.graphics.g2d.Draw; +import arc.graphics.g2d.Fill; +import arc.math.Mathf; +import mindustry.entities.effect.Lightning; +import mindustry.entities.type.Unit; +import mindustry.graphics.Layer; +import mindustry.graphics.Pal; +import mindustry.world.Block; +import mindustry.world.Tile; public class ShockMine extends Block{ public final int timerDamage = timers++; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java b/core/src/mindustry/world/blocks/defense/SurgeWall.java similarity index 66% rename from core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java rename to core/src/mindustry/world/blocks/defense/SurgeWall.java index a1c52ac823..d679169c8b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java +++ b/core/src/mindustry/world/blocks/defense/SurgeWall.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.world.blocks.defense; +package mindustry.world.blocks.defense; -import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.entities.type.Bullet; -import io.anuke.mindustry.entities.effect.Lightning; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.graphics.Pal; +import arc.math.Mathf; +import mindustry.entities.type.Bullet; +import mindustry.entities.effect.Lightning; +import mindustry.entities.type.TileEntity; +import mindustry.graphics.Pal; public class SurgeWall extends Wall{ public float lightningChance = 0.05f; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/Wall.java b/core/src/mindustry/world/blocks/defense/Wall.java similarity index 78% rename from core/src/io/anuke/mindustry/world/blocks/defense/Wall.java rename to core/src/mindustry/world/blocks/defense/Wall.java index 8b60ffd0f2..d790e3f299 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/Wall.java +++ b/core/src/mindustry/world/blocks/defense/Wall.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.world.blocks.defense; +package mindustry.world.blocks.defense; -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 io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.BlockGroup; +import arc.Core; +import arc.graphics.g2d.Draw; +import arc.graphics.g2d.TextureRegion; +import arc.math.Mathf; +import mindustry.world.Block; +import mindustry.world.Tile; +import mindustry.world.meta.BlockGroup; public class Wall extends Block{ public int variants = 0; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java similarity index 69% rename from core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java rename to core/src/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java index 433987d2c6..a74e4abf94 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java @@ -1,13 +1,13 @@ -package io.anuke.mindustry.world.blocks.defense.turrets; +package mindustry.world.blocks.defense.turrets; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.math.geom.Vector2; -import io.anuke.mindustry.entities.Predict; -import io.anuke.mindustry.entities.type.Bullet; -import io.anuke.mindustry.entities.bullet.BulletType; -import io.anuke.mindustry.world.Tile; +import arc.math.Mathf; +import arc.math.geom.Vec2; +import mindustry.entities.Predict; +import mindustry.entities.type.Bullet; +import mindustry.entities.bullet.BulletType; +import mindustry.world.Tile; -import static io.anuke.mindustry.Vars.tilesize; +import static mindustry.Vars.tilesize; /** * Artillery turrets have special shooting calculations done to hit targets. @@ -31,7 +31,7 @@ public class ArtilleryTurret extends ItemTurret{ tr.trns(entity.rotation, size * tilesize / 2); - Vector2 predict = Predict.intercept(tile, entity.target, type.speed); + Vec2 predict = Predict.intercept(tile, entity.target, type.speed); float dst = entity.dst(predict.x, predict.y); float maxTraveled = type.lifetime * type.speed; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java b/core/src/mindustry/world/blocks/defense/turrets/BurstTurret.java similarity index 74% rename from core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java rename to core/src/mindustry/world/blocks/defense/turrets/BurstTurret.java index 3661ec175c..06d91c8ee6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/BurstTurret.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.world.blocks.defense.turrets; +package mindustry.world.blocks.defense.turrets; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.entities.bullet.BulletType; -import io.anuke.mindustry.world.Tile; +import arc.math.Mathf; +import arc.util.Time; +import mindustry.entities.bullet.BulletType; +import mindustry.world.Tile; -import static io.anuke.mindustry.Vars.tilesize; +import static mindustry.Vars.tilesize; public class BurstTurret extends ItemTurret{ public float burstSpacing = 5; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java similarity index 81% rename from core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java rename to core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java index dc12e2425f..9f4b3c8ee2 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java @@ -1,14 +1,14 @@ -package io.anuke.mindustry.world.blocks.defense.turrets; +package mindustry.world.blocks.defense.turrets; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.entities.*; -import io.anuke.mindustry.entities.Effects.*; -import io.anuke.mindustry.entities.bullet.*; -import io.anuke.mindustry.world.*; +import arc.math.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.entities.Effects.*; +import mindustry.entities.bullet.*; +import mindustry.world.*; -import static io.anuke.mindustry.Vars.tilesize; +import static mindustry.Vars.tilesize; public class ChargeTurret extends PowerTurret{ diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java b/core/src/mindustry/world/blocks/defense/turrets/CooledTurret.java similarity index 76% rename from core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java rename to core/src/mindustry/world/blocks/defense/turrets/CooledTurret.java index 9e48e3fc3a..078e626009 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/CooledTurret.java @@ -1,19 +1,19 @@ -package io.anuke.mindustry.world.blocks.defense.turrets; +package mindustry.world.blocks.defense.turrets; -import io.anuke.arc.*; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.entities.*; -import io.anuke.mindustry.entities.Effects.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.consumers.*; -import io.anuke.mindustry.world.meta.*; -import io.anuke.mindustry.world.meta.values.*; +import arc.*; +import arc.math.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.entities.Effects.*; +import mindustry.game.EventType.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.consumers.*; +import mindustry.world.meta.*; +import mindustry.world.meta.values.*; -import static io.anuke.mindustry.Vars.tilesize; +import static mindustry.Vars.tilesize; public class CooledTurret extends Turret{ /** How much reload is lowered by for each unit of liquid of heat capacity. */ diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java b/core/src/mindustry/world/blocks/defense/turrets/DoubleTurret.java similarity index 69% rename from core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java rename to core/src/mindustry/world/blocks/defense/turrets/DoubleTurret.java index 70be09ad4a..2065c0bdcd 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/DoubleTurret.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.world.blocks.defense.turrets; +package mindustry.world.blocks.defense.turrets; -import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.entities.bullet.BulletType; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.BlockStat; -import io.anuke.mindustry.world.meta.StatUnit; +import arc.math.Mathf; +import mindustry.entities.bullet.BulletType; +import mindustry.world.Tile; +import mindustry.world.meta.BlockStat; +import mindustry.world.meta.StatUnit; -import static io.anuke.mindustry.Vars.tilesize; +import static mindustry.Vars.tilesize; public class DoubleTurret extends ItemTurret{ public float shotWidth = 2f; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java similarity index 88% rename from core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java rename to core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java index 393e102d7a..b40b8d58b6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java @@ -1,25 +1,25 @@ -package io.anuke.mindustry.world.blocks.defense.turrets; +package mindustry.world.blocks.defense.turrets; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.entities.bullet.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.graphics.*; -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.consumers.*; -import io.anuke.mindustry.world.meta.*; -import io.anuke.mindustry.world.meta.values.*; +import arc.*; +import arc.struct.*; +import arc.scene.ui.layout.*; +import mindustry.*; +import mindustry.content.*; +import mindustry.entities.bullet.*; +import mindustry.entities.type.*; +import mindustry.game.EventType.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.ui.Cicon; +import mindustry.world.*; +import mindustry.world.consumers.*; +import mindustry.world.meta.*; +import mindustry.world.meta.values.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class ItemTurret extends CooledTurret{ public int maxAmmo = 30; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java similarity index 87% rename from core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java rename to core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java index 422b5b57b8..7a37c7af2b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java @@ -1,17 +1,17 @@ -package io.anuke.mindustry.world.blocks.defense.turrets; +package mindustry.world.blocks.defense.turrets; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.entities.*; -import io.anuke.mindustry.entities.bullet.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.consumers.*; -import io.anuke.mindustry.world.meta.*; -import io.anuke.mindustry.world.meta.values.*; +import arc.math.*; +import arc.util.*; +import mindustry.entities.*; +import mindustry.entities.bullet.*; +import mindustry.entities.type.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.consumers.*; +import mindustry.world.meta.*; +import mindustry.world.meta.values.*; -import static io.anuke.mindustry.Vars.tilesize; +import static mindustry.Vars.tilesize; public class LaserTurret extends PowerTurret{ public float firingMoveFract = 0.25f; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java similarity index 87% rename from core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java rename to core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java index 7192ba09fe..caafd51d2f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -1,18 +1,18 @@ -package io.anuke.mindustry.world.blocks.defense.turrets; +package mindustry.world.blocks.defense.turrets; -import io.anuke.arc.collection.*; -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.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.consumers.*; -import io.anuke.mindustry.world.meta.*; -import io.anuke.mindustry.world.meta.values.*; +import arc.struct.*; +import mindustry.entities.*; +import mindustry.entities.bullet.*; +import mindustry.entities.effect.*; +import mindustry.entities.type.*; +import mindustry.gen.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.consumers.*; +import mindustry.world.meta.*; +import mindustry.world.meta.values.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class LiquidTurret extends Turret{ public ObjectMap ammo = new ObjectMap<>(); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java b/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java similarity index 78% rename from core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java rename to core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java index 1eab2079a8..35b11319b8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.world.blocks.defense.turrets; +package mindustry.world.blocks.defense.turrets; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.entities.bullet.BulletType; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.BlockStat; -import io.anuke.mindustry.world.meta.StatUnit; +import arc.util.ArcAnnotate.*; +import mindustry.entities.bullet.BulletType; +import mindustry.world.Tile; +import mindustry.world.meta.BlockStat; +import mindustry.world.meta.StatUnit; public class PowerTurret extends CooledTurret{ public @NonNull BulletType shootType; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java similarity index 88% rename from core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java rename to core/src/mindustry/world/blocks/defense/turrets/Turret.java index e6c3b129d4..75ca4bcf2d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -1,31 +1,31 @@ -package io.anuke.mindustry.world.blocks.defense.turrets; +package mindustry.world.blocks.defense.turrets; -import io.anuke.arc.Core; -import io.anuke.arc.audio.*; -import io.anuke.arc.collection.Array; -import io.anuke.arc.collection.EnumSet; -import io.anuke.arc.func.Cons2; -import io.anuke.arc.graphics.Blending; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.Angles; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.math.geom.Vector2; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.entities.*; -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.TargetTrait; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.*; +import arc.Core; +import arc.audio.*; +import arc.struct.Array; +import arc.struct.EnumSet; +import arc.func.Cons2; +import arc.graphics.Blending; +import arc.graphics.Color; +import arc.graphics.g2d.*; +import arc.math.Angles; +import arc.math.Mathf; +import arc.math.geom.Vec2; +import arc.util.Time; +import mindustry.content.Fx; +import mindustry.entities.*; +import mindustry.entities.Effects.Effect; +import mindustry.entities.type.Bullet; +import mindustry.entities.bullet.BulletType; +import mindustry.entities.traits.TargetTrait; +import mindustry.entities.type.TileEntity; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.world.Block; +import mindustry.world.Tile; +import mindustry.world.meta.*; -import static io.anuke.mindustry.Vars.tilesize; +import static mindustry.Vars.tilesize; public abstract class Turret extends Block{ public final int timerTarget = timers++; @@ -54,8 +54,8 @@ public abstract class Turret extends Block{ public boolean targetAir = true; public boolean targetGround = true; - protected Vector2 tr = new Vector2(); - protected Vector2 tr2 = new Vector2(); + protected Vec2 tr = new Vec2(); + protected Vec2 tr2 = new Vec2(); public TextureRegion baseRegion, heatRegion; @@ -162,7 +162,7 @@ public abstract class Turret extends Block{ float speed = type.speed; if(speed < 0.1f) speed = 9999999f; - Vector2 result = Predict.intercept(entity, entity.target, speed); + Vec2 result = Predict.intercept(entity, entity.target, speed); if(result.isZero()){ result.set(entity.target.getX(), entity.target.getY()); } diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ArmoredConveyor.java b/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java similarity index 83% rename from core/src/io/anuke/mindustry/world/blocks/distribution/ArmoredConveyor.java rename to core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java index c91c16318b..fb6eb261f9 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/ArmoredConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.world.blocks.distribution; +package mindustry.world.blocks.distribution; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; +import mindustry.type.*; +import mindustry.world.*; public class ArmoredConveyor extends Conveyor{ diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java b/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java similarity index 91% rename from core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java rename to core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java index 89b91cb50c..3809fea966 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.world.blocks.distribution; +package mindustry.world.blocks.distribution; -import io.anuke.arc.math.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; +import arc.math.*; +import mindustry.type.*; +import mindustry.world.*; import java.io.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java similarity index 94% rename from core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java rename to core/src/mindustry/world/blocks/distribution/Conveyor.java index a3799def15..23f564df04 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -1,26 +1,26 @@ -package io.anuke.mindustry.world.blocks.distribution; +package mindustry.world.blocks.distribution; -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.math.geom.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.entities.traits.BuilderTrait.*; -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.ui.*; -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.graphics.g2d.*; +import arc.math.*; +import arc.math.geom.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.traits.BuilderTrait.*; +import mindustry.entities.type.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.*; +import mindustry.world.blocks.*; +import mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class Conveyor extends Block implements Autotiler{ private static final float itemSpace = 0.4f; @@ -28,8 +28,8 @@ public class Conveyor extends Block implements Autotiler{ private static ItemPos drawpos = new ItemPos(); private static ItemPos pos1 = new ItemPos(); private static ItemPos pos2 = new ItemPos(); - private final Vector2 tr1 = new Vector2(); - private final Vector2 tr2 = new Vector2(); + private final Vec2 tr1 = new Vec2(); + private final Vec2 tr2 = new Vec2(); private TextureRegion[][] regions = new TextureRegion[7][4]; public float speed = 0f; @@ -283,7 +283,7 @@ public class Conveyor extends Block implements Autotiler{ } @Override - public void getStackOffset(Item item, Tile tile, Vector2 trns){ + public void getStackOffset(Item item, Tile tile, Vec2 trns){ trns.trns(tile.rotation() * 90 + 180f, tilesize / 2f); } diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java b/core/src/mindustry/world/blocks/distribution/ExtendingItemBridge.java similarity index 87% rename from core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java rename to core/src/mindustry/world/blocks/distribution/ExtendingItemBridge.java index 7a0a2b1d06..d5aa4494a7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ExtendingItemBridge.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.world.blocks.distribution; +package mindustry.world.blocks.distribution; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.math.geom.Geometry; -import io.anuke.mindustry.world.Tile; +import arc.graphics.g2d.*; +import arc.math.Mathf; +import arc.math.geom.Geometry; +import mindustry.world.Tile; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class ExtendingItemBridge extends ItemBridge{ diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java similarity index 95% rename from core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java rename to core/src/mindustry/world/blocks/distribution/ItemBridge.java index 3624a1079b..0dd4320e7d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java @@ -1,23 +1,23 @@ -package io.anuke.mindustry.world.blocks.distribution; +package mindustry.world.blocks.distribution; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.collection.IntSet.*; -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.entities.traits.BuilderTrait.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.meta.*; +import arc.*; +import arc.struct.*; +import arc.struct.IntSet.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.math.geom.*; +import arc.util.*; +import mindustry.entities.traits.BuilderTrait.*; +import mindustry.entities.type.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class ItemBridge extends Block{ public final int timerTransport = timers++; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java b/core/src/mindustry/world/blocks/distribution/Junction.java similarity index 85% rename from core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java rename to core/src/mindustry/world/blocks/distribution/Junction.java index 45fea7b8a4..43356ca939 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java +++ b/core/src/mindustry/world/blocks/distribution/Junction.java @@ -1,20 +1,20 @@ -package io.anuke.mindustry.world.blocks.distribution; +package mindustry.world.blocks.distribution; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.entities.type.Unit; -import io.anuke.mindustry.gen.BufferItem; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.DirectionalItemBuffer; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.BlockGroup; +import arc.util.Time; +import mindustry.entities.type.TileEntity; +import mindustry.entities.type.Unit; +import mindustry.gen.BufferItem; +import mindustry.type.Item; +import mindustry.world.Block; +import mindustry.world.DirectionalItemBuffer; +import mindustry.world.Tile; +import mindustry.world.meta.BlockGroup; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; public class Junction extends Block{ public float speed = 26; //frames taken to go through this junction diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java similarity index 94% rename from core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java rename to core/src/mindustry/world/blocks/distribution/MassDriver.java index 1f75a716c8..1156857289 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java @@ -1,23 +1,23 @@ -package io.anuke.mindustry.world.blocks.distribution; +package mindustry.world.blocks.distribution; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.*; -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.Effects.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; +import arc.*; +import arc.struct.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.util.*; +import arc.util.pooling.Pool.*; +import arc.util.pooling.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.entities.Effects.*; +import mindustry.entities.type.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.world.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class MassDriver extends Block{ public float range; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/mindustry/world/blocks/distribution/OverflowGate.java similarity index 92% rename from core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java rename to core/src/mindustry/world/blocks/distribution/OverflowGate.java index a6c8f779ac..185fdf7834 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java +++ b/core/src/mindustry/world/blocks/distribution/OverflowGate.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.world.blocks.distribution; +package mindustry.world.blocks.distribution; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.meta.BlockGroup; +import arc.math.Mathf; +import arc.util.Time; +import mindustry.entities.type.TileEntity; +import mindustry.type.Item; +import mindustry.world.*; +import mindustry.world.meta.BlockGroup; import java.io.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java b/core/src/mindustry/world/blocks/distribution/Router.java similarity index 88% rename from core/src/io/anuke/mindustry/world/blocks/distribution/Router.java rename to core/src/mindustry/world/blocks/distribution/Router.java index 1893af98e2..8cfa4525d0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java +++ b/core/src/mindustry/world/blocks/distribution/Router.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.world.blocks.distribution; +package mindustry.world.blocks.distribution; -import io.anuke.arc.collection.Array; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.meta.BlockGroup; +import arc.struct.Array; +import arc.util.Time; +import mindustry.content.*; +import mindustry.entities.type.TileEntity; +import mindustry.type.Item; +import mindustry.world.*; +import mindustry.world.meta.BlockGroup; public class Router extends Block{ public float speed = 8f; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java b/core/src/mindustry/world/blocks/distribution/Sorter.java similarity index 89% rename from core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java rename to core/src/mindustry/world/blocks/distribution/Sorter.java index 1794161654..89228d02de 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java +++ b/core/src/mindustry/world/blocks/distribution/Sorter.java @@ -1,20 +1,20 @@ -package io.anuke.mindustry.world.blocks.distribution; +package mindustry.world.blocks.distribution; -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.ArcAnnotate.*; -import io.anuke.mindustry.entities.traits.BuilderTrait.*; -import io.anuke.mindustry.entities.type.*; -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.g2d.*; +import arc.math.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import arc.util.ArcAnnotate.*; +import mindustry.entities.traits.BuilderTrait.*; +import mindustry.entities.type.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.blocks.*; +import mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; public class Sorter extends Block{ private static Item lastItem; diff --git a/core/src/io/anuke/mindustry/world/blocks/liquid/ArmoredConduit.java b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java similarity index 78% rename from core/src/io/anuke/mindustry/world/blocks/liquid/ArmoredConduit.java rename to core/src/mindustry/world/blocks/liquid/ArmoredConduit.java index d74087123c..82fe515f0f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/liquid/ArmoredConduit.java +++ b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.world.blocks.liquid; +package mindustry.world.blocks.liquid; -import io.anuke.arc.Core; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.TextureRegion; -import io.anuke.mindustry.type.Liquid; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Edges; -import io.anuke.mindustry.world.Tile; +import arc.Core; +import arc.graphics.g2d.Draw; +import arc.graphics.g2d.TextureRegion; +import mindustry.type.Liquid; +import mindustry.world.Block; +import mindustry.world.Edges; +import mindustry.world.Tile; public class ArmoredConduit extends Conduit{ public TextureRegion capRegion; diff --git a/core/src/io/anuke/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java similarity index 89% rename from core/src/io/anuke/mindustry/world/blocks/liquid/Conduit.java rename to core/src/mindustry/world/blocks/liquid/Conduit.java index 0b6518b956..a1d784f84f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -1,19 +1,19 @@ -package io.anuke.mindustry.world.blocks.liquid; +package mindustry.world.blocks.liquid; -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.math.geom.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.entities.traits.BuilderTrait.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.*; -import io.anuke.mindustry.world.modules.*; +import arc.*; +import arc.struct.*; +import arc.func.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.math.geom.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.traits.BuilderTrait.*; +import mindustry.entities.type.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.blocks.*; +import mindustry.world.modules.*; public class Conduit extends LiquidBlock implements Autotiler{ public final int timerFlow = timers++; diff --git a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidBridge.java b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java similarity index 83% rename from core/src/io/anuke/mindustry/world/blocks/liquid/LiquidBridge.java rename to core/src/mindustry/world/blocks/liquid/LiquidBridge.java index 5575d6d779..b1a790b491 100644 --- a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidBridge.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java @@ -1,13 +1,13 @@ -package io.anuke.mindustry.world.blocks.liquid; +package mindustry.world.blocks.liquid; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.distribution.*; -import io.anuke.mindustry.world.meta.*; +import arc.math.*; +import arc.util.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.blocks.distribution.*; +import mindustry.world.meta.*; -import static io.anuke.mindustry.Vars.world; +import static mindustry.Vars.world; public class LiquidBridge extends ItemBridge{ diff --git a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidExtendingBridge.java b/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java similarity index 82% rename from core/src/io/anuke/mindustry/world/blocks/liquid/LiquidExtendingBridge.java rename to core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java index 1753e17d55..8b7840e9ad 100644 --- a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidExtendingBridge.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java @@ -1,13 +1,13 @@ -package io.anuke.mindustry.world.blocks.liquid; +package mindustry.world.blocks.liquid; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.distribution.*; -import io.anuke.mindustry.world.meta.*; +import arc.math.*; +import arc.util.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.blocks.distribution.*; +import mindustry.world.meta.*; -import static io.anuke.mindustry.Vars.world; +import static mindustry.Vars.world; public class LiquidExtendingBridge extends ExtendingItemBridge{ diff --git a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidJunction.java b/core/src/mindustry/world/blocks/liquid/LiquidJunction.java similarity index 80% rename from core/src/io/anuke/mindustry/world/blocks/liquid/LiquidJunction.java rename to core/src/mindustry/world/blocks/liquid/LiquidJunction.java index d917437d8a..881213705a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidJunction.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidJunction.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.world.blocks.liquid; +package mindustry.world.blocks.liquid; -import io.anuke.arc.*; -import io.anuke.arc.graphics.g2d.*; -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.graphics.g2d.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.blocks.*; +import mindustry.world.meta.*; public class LiquidJunction extends LiquidBlock{ diff --git a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidOverflowGate.java b/core/src/mindustry/world/blocks/liquid/LiquidOverflowGate.java similarity index 83% rename from core/src/io/anuke/mindustry/world/blocks/liquid/LiquidOverflowGate.java rename to core/src/mindustry/world/blocks/liquid/LiquidOverflowGate.java index 3004835249..1f6ceac925 100644 --- a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidOverflowGate.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidOverflowGate.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.world.blocks.liquid; +package mindustry.world.blocks.liquid; -import io.anuke.arc.*; -import io.anuke.arc.graphics.g2d.*; -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.graphics.g2d.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.blocks.*; +import mindustry.world.meta.*; //TODO implement later public class LiquidOverflowGate extends LiquidBlock{ diff --git a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidRouter.java b/core/src/mindustry/world/blocks/liquid/LiquidRouter.java similarity index 76% rename from core/src/io/anuke/mindustry/world/blocks/liquid/LiquidRouter.java rename to core/src/mindustry/world/blocks/liquid/LiquidRouter.java index e5c4103a3c..35f7e09ea8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidRouter.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidRouter.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.world.blocks.liquid; +package mindustry.world.blocks.liquid; -import io.anuke.mindustry.type.Liquid; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.LiquidBlock; +import mindustry.type.Liquid; +import mindustry.world.Tile; +import mindustry.world.blocks.LiquidBlock; public class LiquidRouter extends LiquidBlock{ diff --git a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidTank.java b/core/src/mindustry/world/blocks/liquid/LiquidTank.java similarity index 70% rename from core/src/io/anuke/mindustry/world/blocks/liquid/LiquidTank.java rename to core/src/mindustry/world/blocks/liquid/LiquidTank.java index c8303771a6..89dd558dc2 100644 --- a/core/src/io/anuke/mindustry/world/blocks/liquid/LiquidTank.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidTank.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world.blocks.liquid; +package mindustry.world.blocks.liquid; public class LiquidTank extends LiquidRouter{ diff --git a/core/src/io/anuke/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java similarity index 55% rename from core/src/io/anuke/mindustry/world/blocks/logic/LogicBlock.java rename to core/src/mindustry/world/blocks/logic/LogicBlock.java index ccb78c365c..a1f7ef7069 100644 --- a/core/src/io/anuke/mindustry/world/blocks/logic/LogicBlock.java +++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.world.blocks.logic; +package mindustry.world.blocks.logic; -import io.anuke.mindustry.world.Block; +import mindustry.world.Block; public class LogicBlock extends Block{ diff --git a/core/src/io/anuke/mindustry/world/blocks/logic/MessageBlock.java b/core/src/mindustry/world/blocks/logic/MessageBlock.java similarity index 86% rename from core/src/io/anuke/mindustry/world/blocks/logic/MessageBlock.java rename to core/src/mindustry/world/blocks/logic/MessageBlock.java index 0d00c50d09..cb7498138d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/logic/MessageBlock.java +++ b/core/src/mindustry/world/blocks/logic/MessageBlock.java @@ -1,26 +1,26 @@ -package io.anuke.mindustry.world.blocks.logic; +package mindustry.world.blocks.logic; -import io.anuke.annotations.Annotations.*; -import io.anuke.arc.*; -import io.anuke.arc.Input.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.graphics.g2d.*; -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.pooling.*; -import io.anuke.mindustry.entities.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.net.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.ui.dialogs.*; -import io.anuke.mindustry.world.*; +import arc.*; +import mindustry.annotations.Annotations.*; +import arc.Input.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.geom.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import arc.util.pooling.*; +import mindustry.entities.*; +import mindustry.entities.type.*; +import mindustry.gen.*; +import mindustry.net.*; +import mindustry.ui.*; +import mindustry.ui.dialogs.*; +import mindustry.world.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class MessageBlock extends Block{ protected static int maxTextLength = 220; @@ -142,7 +142,7 @@ public class MessageBlock extends Block{ @Override public void updateTableAlign(Tile tile, Table table){ - Vector2 pos = Core.input.mouseScreen(tile.drawx(), tile.drawy() + tile.block().size * tilesize / 2f + 1); + Vec2 pos = Core.input.mouseScreen(tile.drawx(), tile.drawy() + tile.block().size * tilesize / 2f + 1); table.setPosition(pos.x, pos.y, Align.bottom); } diff --git a/core/src/io/anuke/mindustry/world/blocks/power/Battery.java b/core/src/mindustry/world/blocks/power/Battery.java similarity index 78% rename from core/src/io/anuke/mindustry/world/blocks/power/Battery.java rename to core/src/mindustry/world/blocks/power/Battery.java index 48a776affb..2783984747 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/Battery.java +++ b/core/src/mindustry/world/blocks/power/Battery.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; public class Battery extends PowerDistributor{ diff --git a/core/src/io/anuke/mindustry/world/blocks/power/BurnerGenerator.java b/core/src/mindustry/world/blocks/power/BurnerGenerator.java similarity index 74% rename from core/src/io/anuke/mindustry/world/blocks/power/BurnerGenerator.java rename to core/src/mindustry/world/blocks/power/BurnerGenerator.java index dba75d1e0c..fee2d5135a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/BurnerGenerator.java +++ b/core/src/mindustry/world/blocks/power/BurnerGenerator.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.type.Liquid; +import mindustry.type.Item; +import mindustry.type.Liquid; public class BurnerGenerator extends ItemLiquidGenerator{ diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ConditionalConsumePower.java b/core/src/mindustry/world/blocks/power/ConditionalConsumePower.java similarity index 69% rename from core/src/io/anuke/mindustry/world/blocks/power/ConditionalConsumePower.java rename to core/src/mindustry/world/blocks/power/ConditionalConsumePower.java index 1f9dadd3e9..fa94ea64cc 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ConditionalConsumePower.java +++ b/core/src/mindustry/world/blocks/power/ConditionalConsumePower.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -import io.anuke.arc.func.Boolf; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.world.consumers.ConsumePower; +import arc.func.Boolf; +import mindustry.entities.type.TileEntity; +import mindustry.world.consumers.ConsumePower; /** A power consumer that only activates sometimes. */ public class ConditionalConsumePower extends ConsumePower{ diff --git a/core/src/io/anuke/mindustry/world/blocks/power/DecayGenerator.java b/core/src/mindustry/world/blocks/power/DecayGenerator.java similarity index 78% rename from core/src/io/anuke/mindustry/world/blocks/power/DecayGenerator.java rename to core/src/mindustry/world/blocks/power/DecayGenerator.java index 18b3cd47df..e9fee90eee 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/DecayGenerator.java +++ b/core/src/mindustry/world/blocks/power/DecayGenerator.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -import io.anuke.mindustry.type.Item; +import mindustry.type.Item; public class DecayGenerator extends ItemLiquidGenerator{ diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java b/core/src/mindustry/world/blocks/power/ImpactReactor.java similarity index 90% rename from core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java rename to core/src/mindustry/world/blocks/power/ImpactReactor.java index e74eab58ef..2c47bdf465 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java +++ b/core/src/mindustry/world/blocks/power/ImpactReactor.java @@ -1,22 +1,22 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -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.content.*; -import io.anuke.mindustry.entities.*; -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.world.*; -import io.anuke.mindustry.world.meta.*; +import arc.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.ui.*; +import mindustry.world.*; +import mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class ImpactReactor extends PowerGenerator{ public final int timerUse = timers++; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java similarity index 92% rename from core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java rename to core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java index c0c9e240cf..1eb1cf6033 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java +++ b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java @@ -1,19 +1,19 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -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.content.*; -import io.anuke.mindustry.entities.*; -import io.anuke.mindustry.entities.Effects.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.consumers.*; -import io.anuke.mindustry.world.meta.*; +import arc.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.entities.Effects.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.consumers.*; +import mindustry.world.meta.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; /** * Power generation block which can use items, liquids or both as input sources for power production. diff --git a/core/src/io/anuke/mindustry/world/blocks/power/LightBlock.java b/core/src/mindustry/world/blocks/power/LightBlock.java similarity index 85% rename from core/src/io/anuke/mindustry/world/blocks/power/LightBlock.java rename to core/src/mindustry/world/blocks/power/LightBlock.java index 989775dc40..ad65313954 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/LightBlock.java +++ b/core/src/mindustry/world/blocks/power/LightBlock.java @@ -1,17 +1,17 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -import io.anuke.arc.graphics.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.world.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.entities.type.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.world.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class LightBlock extends Block{ private static int lastColor = 0; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java b/core/src/mindustry/world/blocks/power/NuclearReactor.java similarity index 89% rename from core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java rename to core/src/mindustry/world/blocks/power/NuclearReactor.java index 5957a92ac6..31f95f10a6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/mindustry/world/blocks/power/NuclearReactor.java @@ -1,30 +1,30 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -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.content.*; -import io.anuke.mindustry.entities.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.consumers.*; -import io.anuke.mindustry.world.meta.*; +import arc.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.math.geom.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.*; +import mindustry.world.consumers.*; +import mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class NuclearReactor extends PowerGenerator{ public final int timerFuel = timers++; - public final Vector2 tr = new Vector2(); + public final Vec2 tr = new Vec2(); public Color lightColor = Color.valueOf("7f19ea"); public Color coolColor = new Color(1, 1, 1, 0f); diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerDiode.java b/core/src/mindustry/world/blocks/power/PowerDiode.java similarity index 85% rename from core/src/io/anuke/mindustry/world/blocks/power/PowerDiode.java rename to core/src/mindustry/world/blocks/power/PowerDiode.java index 1dee0636a5..282e716286 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerDiode.java +++ b/core/src/mindustry/world/blocks/power/PowerDiode.java @@ -1,16 +1,16 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -import io.anuke.arc.Core; -import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.ui.Bar; -import io.anuke.arc.util.Eachable; -import io.anuke.mindustry.ui.Cicon; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.Block; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.mindustry.graphics.Pal; -import io.anuke.arc.graphics.g2d.TextureRegion; -import io.anuke.mindustry.entities.traits.BuilderTrait; +import arc.Core; +import arc.math.Mathf; +import mindustry.ui.Bar; +import arc.util.Eachable; +import mindustry.ui.Cicon; +import mindustry.world.Tile; +import mindustry.world.Block; +import arc.graphics.g2d.Draw; +import mindustry.graphics.Pal; +import arc.graphics.g2d.TextureRegion; +import mindustry.entities.traits.BuilderTrait; public class PowerDiode extends Block{ public TextureRegion arrow; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerDistributor.java b/core/src/mindustry/world/blocks/power/PowerDistributor.java similarity index 65% rename from core/src/io/anuke/mindustry/world/blocks/power/PowerDistributor.java rename to core/src/mindustry/world/blocks/power/PowerDistributor.java index 38ef286d78..6a9bf0b302 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerDistributor.java +++ b/core/src/mindustry/world/blocks/power/PowerDistributor.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -import io.anuke.mindustry.world.blocks.PowerBlock; +import mindustry.world.blocks.PowerBlock; public class PowerDistributor extends PowerBlock{ diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java b/core/src/mindustry/world/blocks/power/PowerGenerator.java similarity index 84% rename from core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java rename to core/src/mindustry/world/blocks/power/PowerGenerator.java index 7612e9ff16..b7cff15bd7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java +++ b/core/src/mindustry/world/blocks/power/PowerGenerator.java @@ -1,13 +1,13 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -import io.anuke.arc.Core; -import io.anuke.arc.collection.EnumSet; -import io.anuke.arc.util.Strings; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.graphics.Pal; -import io.anuke.mindustry.ui.Bar; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.*; +import arc.Core; +import arc.struct.EnumSet; +import arc.util.Strings; +import mindustry.entities.type.TileEntity; +import mindustry.graphics.Pal; +import mindustry.ui.Bar; +import mindustry.world.Tile; +import mindustry.world.meta.*; import java.io.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java b/core/src/mindustry/world/blocks/power/PowerGraph.java similarity index 98% rename from core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java rename to core/src/mindustry/world/blocks/power/PowerGraph.java index 43a782d2e8..be5d593797 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java +++ b/core/src/mindustry/world/blocks/power/PowerGraph.java @@ -1,11 +1,11 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.consumers.*; +import arc.*; +import arc.struct.*; +import arc.math.*; +import arc.util.*; +import mindustry.world.*; +import mindustry.world.consumers.*; public class PowerGraph{ private final static Queue queue = new Queue<>(); diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java similarity index 94% rename from core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java rename to core/src/mindustry/world/blocks/power/PowerNode.java index bfd60a2cdb..7a267abeef 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/mindustry/world/blocks/power/PowerNode.java @@ -1,28 +1,28 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -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.math.*; -import io.anuke.arc.math.geom.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.ui.*; -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.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.math.geom.*; +import arc.util.*; +import arc.util.ArcAnnotate.*; +import mindustry.entities.type.*; +import mindustry.graphics.*; +import mindustry.ui.*; +import mindustry.world.*; +import mindustry.world.blocks.*; +import mindustry.world.meta.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class PowerNode extends PowerBlock{ protected static boolean returnValue = false; protected final ObjectSet graphs = new ObjectSet<>(); - protected final Vector2 t1 = new Vector2(), t2 = new Vector2(); + protected final Vec2 t1 = new Vec2(), t2 = new Vec2(); public TextureRegion laser, laserEnd; public float laserRange = 6; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/SingleTypeGenerator.java b/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java similarity index 73% rename from core/src/io/anuke/mindustry/world/blocks/power/SingleTypeGenerator.java rename to core/src/mindustry/world/blocks/power/SingleTypeGenerator.java index 231533fc8c..22a668160e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/SingleTypeGenerator.java +++ b/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.type.Liquid; +import mindustry.type.Item; +import mindustry.type.Liquid; public class SingleTypeGenerator extends ItemLiquidGenerator{ diff --git a/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java b/core/src/mindustry/world/blocks/power/SolarGenerator.java similarity index 79% rename from core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java rename to core/src/mindustry/world/blocks/power/SolarGenerator.java index 81712ba4bc..75a23c9d6f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java +++ b/core/src/mindustry/world/blocks/power/SolarGenerator.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -import io.anuke.arc.collection.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.meta.*; +import arc.struct.*; +import mindustry.world.*; +import mindustry.world.meta.*; -import static io.anuke.mindustry.Vars.state; +import static mindustry.Vars.state; public class SolarGenerator extends PowerGenerator{ diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java b/core/src/mindustry/world/blocks/power/ThermalGenerator.java similarity index 81% rename from core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java rename to core/src/mindustry/world/blocks/power/ThermalGenerator.java index 61570c66df..6c1debe03b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java +++ b/core/src/mindustry/world/blocks/power/ThermalGenerator.java @@ -1,15 +1,15 @@ -package io.anuke.mindustry.world.blocks.power; +package mindustry.world.blocks.power; -import io.anuke.arc.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.math.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.entities.*; -import io.anuke.mindustry.entities.Effects.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.meta.*; +import arc.*; +import arc.graphics.*; +import arc.math.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.entities.Effects.*; +import mindustry.world.*; +import mindustry.world.meta.*; -import static io.anuke.mindustry.Vars.renderer; +import static mindustry.Vars.renderer; public class ThermalGenerator extends PowerGenerator{ public Effect generateEffect = Fx.none; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java b/core/src/mindustry/world/blocks/production/Cultivator.java similarity index 87% rename from core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java rename to core/src/mindustry/world/blocks/production/Cultivator.java index 640f438b40..e34929188c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java +++ b/core/src/mindustry/world/blocks/production/Cultivator.java @@ -1,17 +1,17 @@ -package io.anuke.mindustry.world.blocks.production; +package mindustry.world.blocks.production; -import io.anuke.arc.Core; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.math.RandomXS128; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.graphics.Pal; -import io.anuke.mindustry.ui.Bar; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.Attribute; +import arc.Core; +import arc.graphics.Color; +import arc.graphics.g2d.*; +import arc.math.Mathf; +import arc.math.RandomXS128; +import arc.util.Time; +import mindustry.content.Fx; +import mindustry.entities.type.TileEntity; +import mindustry.graphics.Pal; +import mindustry.ui.Bar; +import mindustry.world.Tile; +import mindustry.world.meta.Attribute; import java.io.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java similarity index 93% rename from core/src/io/anuke/mindustry/world/blocks/production/Drill.java rename to core/src/mindustry/world/blocks/production/Drill.java index 1ef45a3c2f..0a9975e69f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -1,23 +1,23 @@ -package io.anuke.mindustry.world.blocks.production; +package mindustry.world.blocks.production; -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.content.*; -import io.anuke.mindustry.entities.*; -import io.anuke.mindustry.entities.Effects.*; -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.ui.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.meta.*; +import arc.*; +import arc.struct.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.entities.Effects.*; +import mindustry.entities.type.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.*; +import mindustry.world.meta.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class Drill extends Block{ public float hardnessDrillMultiplier = 50f; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java b/core/src/mindustry/world/blocks/production/Fracker.java similarity index 92% rename from core/src/io/anuke/mindustry/world/blocks/production/Fracker.java rename to core/src/mindustry/world/blocks/production/Fracker.java index d70d8e878c..5642830c2e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java +++ b/core/src/mindustry/world/blocks/production/Fracker.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.world.blocks.production; +package mindustry.world.blocks.production; -import io.anuke.arc.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.meta.*; +import arc.*; +import arc.graphics.g2d.*; +import mindustry.world.*; +import mindustry.world.meta.*; public class Fracker extends SolidPump{ public float itemUseTime = 100f; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java b/core/src/mindustry/world/blocks/production/GenericCrafter.java similarity index 89% rename from core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java rename to core/src/mindustry/world/blocks/production/GenericCrafter.java index 00075370e4..7261effb4c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java +++ b/core/src/mindustry/world/blocks/production/GenericCrafter.java @@ -1,18 +1,18 @@ -package io.anuke.mindustry.world.blocks.production; +package mindustry.world.blocks.production; -import io.anuke.arc.func.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.entities.*; -import io.anuke.mindustry.entities.Effects.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.consumers.*; -import io.anuke.mindustry.world.meta.*; +import arc.func.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.entities.Effects.*; +import mindustry.entities.type.*; +import mindustry.gen.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.consumers.*; +import mindustry.world.meta.*; import java.io.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/GenericSmelter.java b/core/src/mindustry/world/blocks/production/GenericSmelter.java similarity index 83% rename from core/src/io/anuke/mindustry/world/blocks/production/GenericSmelter.java rename to core/src/mindustry/world/blocks/production/GenericSmelter.java index 3fe9e1eb7a..4e74edecd0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/GenericSmelter.java +++ b/core/src/mindustry/world/blocks/production/GenericSmelter.java @@ -1,13 +1,13 @@ -package io.anuke.mindustry.world.blocks.production; +package mindustry.world.blocks.production; -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.world.*; +import arc.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.util.*; +import mindustry.world.*; -import static io.anuke.mindustry.Vars.renderer; +import static mindustry.Vars.renderer; /** A GenericCrafter with a new glowing region drawn on top. */ public class GenericSmelter extends GenericCrafter{ diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java b/core/src/mindustry/world/blocks/production/Incinerator.java similarity index 78% rename from core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java rename to core/src/mindustry/world/blocks/production/Incinerator.java index 656476c4d8..61d5d05ee8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java +++ b/core/src/mindustry/world/blocks/production/Incinerator.java @@ -1,18 +1,18 @@ -package io.anuke.mindustry.world.blocks.production; +package mindustry.world.blocks.production; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.Fill; -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.Effects.Effect; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.type.Liquid; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; +import arc.graphics.Color; +import arc.graphics.g2d.Draw; +import arc.graphics.g2d.Fill; +import arc.math.Mathf; +import arc.util.Time; +import mindustry.content.Fx; +import mindustry.entities.Effects; +import mindustry.entities.Effects.Effect; +import mindustry.entities.type.TileEntity; +import mindustry.type.Item; +import mindustry.type.Liquid; +import mindustry.world.Block; +import mindustry.world.Tile; public class Incinerator extends Block{ public Effect effect = Fx.fuelburn; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/LiquidConverter.java b/core/src/mindustry/world/blocks/production/LiquidConverter.java similarity index 86% rename from core/src/io/anuke/mindustry/world/blocks/production/LiquidConverter.java rename to core/src/mindustry/world/blocks/production/LiquidConverter.java index 95fdc2184f..b604867434 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/LiquidConverter.java +++ b/core/src/mindustry/world/blocks/production/LiquidConverter.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.world.blocks.production; +package mindustry.world.blocks.production; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.consumers.ConsumeLiquidBase; -import io.anuke.mindustry.world.consumers.ConsumeType; -import io.anuke.mindustry.world.meta.BlockStat; +import mindustry.world.Tile; +import mindustry.world.consumers.ConsumeLiquidBase; +import mindustry.world.consumers.ConsumeType; +import mindustry.world.meta.BlockStat; public class LiquidConverter extends GenericCrafter{ diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java b/core/src/mindustry/world/blocks/production/Pump.java similarity index 86% rename from core/src/io/anuke/mindustry/world/blocks/production/Pump.java rename to core/src/mindustry/world/blocks/production/Pump.java index 9142cc49af..010e7cb041 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java +++ b/core/src/mindustry/world/blocks/production/Pump.java @@ -1,19 +1,19 @@ -package io.anuke.mindustry.world.blocks.production; +package mindustry.world.blocks.production; -import io.anuke.arc.Core; -import io.anuke.arc.collection.Array; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.TextureRegion; -import io.anuke.mindustry.graphics.Layer; -import io.anuke.mindustry.type.Liquid; -import io.anuke.mindustry.ui.Cicon; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.LiquidBlock; -import io.anuke.mindustry.world.meta.*; +import arc.Core; +import arc.struct.Array; +import arc.graphics.Color; +import arc.graphics.g2d.Draw; +import arc.graphics.g2d.TextureRegion; +import mindustry.graphics.Layer; +import mindustry.type.Liquid; +import mindustry.ui.Cicon; +import mindustry.world.Tile; +import mindustry.world.blocks.LiquidBlock; +import mindustry.world.meta.*; -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 Pump extends LiquidBlock{ protected final Array drawTiles = new Array<>(); diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Separator.java b/core/src/mindustry/world/blocks/production/Separator.java similarity index 87% rename from core/src/io/anuke/mindustry/world/blocks/production/Separator.java rename to core/src/mindustry/world/blocks/production/Separator.java index c297851e67..64ab3783c2 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Separator.java +++ b/core/src/mindustry/world/blocks/production/Separator.java @@ -1,15 +1,15 @@ -package io.anuke.mindustry.world.blocks.production; +package mindustry.world.blocks.production; -import io.anuke.arc.graphics.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.production.GenericCrafter.*; -import io.anuke.mindustry.world.consumers.*; -import io.anuke.mindustry.world.meta.*; -import io.anuke.mindustry.world.meta.values.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.util.ArcAnnotate.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.blocks.production.GenericCrafter.*; +import mindustry.world.consumers.*; +import mindustry.world.meta.*; +import mindustry.world.meta.values.*; /** * Extracts a random list of items from an input item and an input liquid. diff --git a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java b/core/src/mindustry/world/blocks/production/SolidPump.java similarity index 86% rename from core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java rename to core/src/mindustry/world/blocks/production/SolidPump.java index e7ac5b0c14..854d4be010 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java +++ b/core/src/mindustry/world/blocks/production/SolidPump.java @@ -1,20 +1,20 @@ -package io.anuke.mindustry.world.blocks.production; +package mindustry.world.blocks.production; -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 io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.entities.Effects; -import io.anuke.mindustry.entities.Effects.Effect; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.graphics.Pal; -import io.anuke.mindustry.type.Liquid; -import io.anuke.mindustry.ui.Bar; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.Attribute; -import io.anuke.mindustry.world.meta.BlockStat; +import arc.Core; +import arc.graphics.g2d.Draw; +import arc.graphics.g2d.TextureRegion; +import arc.math.Mathf; +import mindustry.content.Fx; +import mindustry.content.Liquids; +import mindustry.entities.Effects; +import mindustry.entities.Effects.Effect; +import mindustry.entities.type.TileEntity; +import mindustry.graphics.Pal; +import mindustry.type.Liquid; +import mindustry.ui.Bar; +import mindustry.world.Tile; +import mindustry.world.meta.Attribute; +import mindustry.world.meta.BlockStat; /** * Pump that makes liquid from solids and takes in power. Only works on solid floor blocks. diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/mindustry/world/blocks/sandbox/ItemSource.java similarity index 84% rename from core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java rename to core/src/mindustry/world/blocks/sandbox/ItemSource.java index 46e1e86ee2..2ff49b70d8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java +++ b/core/src/mindustry/world/blocks/sandbox/ItemSource.java @@ -1,19 +1,19 @@ -package io.anuke.mindustry.world.blocks.sandbox; +package mindustry.world.blocks.sandbox; -import io.anuke.arc.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.entities.traits.BuilderTrait.*; -import io.anuke.mindustry.entities.type.*; -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.graphics.g2d.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.entities.traits.BuilderTrait.*; +import mindustry.entities.type.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.blocks.*; +import mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; public class ItemSource extends Block{ private static Item lastItem; diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemVoid.java b/core/src/mindustry/world/blocks/sandbox/ItemVoid.java similarity index 66% rename from core/src/io/anuke/mindustry/world/blocks/sandbox/ItemVoid.java rename to core/src/mindustry/world/blocks/sandbox/ItemVoid.java index 2a59aeab8b..1271cbac6f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemVoid.java +++ b/core/src/mindustry/world/blocks/sandbox/ItemVoid.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.world.blocks.sandbox; +package mindustry.world.blocks.sandbox; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; +import mindustry.type.Item; +import mindustry.world.Block; +import mindustry.world.Tile; public class ItemVoid extends Block{ diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java similarity index 84% rename from core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java rename to core/src/mindustry/world/blocks/sandbox/LiquidSource.java index ac260679a7..d1ff0be0dd 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java +++ b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java @@ -1,24 +1,24 @@ -package io.anuke.mindustry.world.blocks.sandbox; +package mindustry.world.blocks.sandbox; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.graphics.g2d.*; -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.entities.traits.BuilderTrait.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.ui.Cicon; -import io.anuke.mindustry.world.*; +import arc.*; +import arc.struct.*; +import arc.graphics.g2d.*; +import arc.scene.style.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import arc.util.ArcAnnotate.*; +import mindustry.entities.traits.BuilderTrait.*; +import mindustry.entities.type.*; +import mindustry.gen.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.ui.Cicon; +import mindustry.world.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class LiquidSource extends Block{ public static Liquid lastLiquid; diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/PowerSource.java b/core/src/mindustry/world/blocks/sandbox/PowerSource.java similarity index 66% rename from core/src/io/anuke/mindustry/world/blocks/sandbox/PowerSource.java rename to core/src/mindustry/world/blocks/sandbox/PowerSource.java index 9c95ccd689..e7efd5e034 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/PowerSource.java +++ b/core/src/mindustry/world/blocks/sandbox/PowerSource.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.world.blocks.sandbox; +package mindustry.world.blocks.sandbox; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.power.PowerNode; +import mindustry.world.Tile; +import mindustry.world.blocks.power.PowerNode; public class PowerSource extends PowerNode{ diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/PowerVoid.java b/core/src/mindustry/world/blocks/sandbox/PowerVoid.java similarity index 63% rename from core/src/io/anuke/mindustry/world/blocks/sandbox/PowerVoid.java rename to core/src/mindustry/world/blocks/sandbox/PowerVoid.java index 549183c0be..ba778d2688 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/PowerVoid.java +++ b/core/src/mindustry/world/blocks/sandbox/PowerVoid.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.world.blocks.sandbox; +package mindustry.world.blocks.sandbox; -import io.anuke.mindustry.world.blocks.PowerBlock; -import io.anuke.mindustry.world.meta.BlockStat; +import mindustry.world.blocks.PowerBlock; +import mindustry.world.meta.BlockStat; public class PowerVoid extends PowerBlock{ diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java similarity index 90% rename from core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java rename to core/src/mindustry/world/blocks/storage/CoreBlock.java index 557dddce45..7c766fd1d3 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -1,27 +1,27 @@ -package io.anuke.mindustry.world.blocks.storage; +package mindustry.world.blocks.storage; -import io.anuke.annotations.Annotations.*; -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.math.geom.*; -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.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.*; -import io.anuke.mindustry.world.meta.*; -import io.anuke.mindustry.world.modules.*; +import arc.*; +import mindustry.annotations.Annotations.*; +import arc.struct.*; +import arc.func.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.math.geom.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.entities.traits.*; +import mindustry.entities.type.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.*; +import mindustry.world.blocks.*; +import mindustry.world.meta.*; +import mindustry.world.modules.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class CoreBlock extends StorageBlock{ public Mech mech = Mechs.starter; diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java b/core/src/mindustry/world/blocks/storage/LaunchPad.java similarity index 73% rename from core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java rename to core/src/mindustry/world/blocks/storage/LaunchPad.java index 92aa7ae75c..ea0a257e84 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java +++ b/core/src/mindustry/world/blocks/storage/LaunchPad.java @@ -1,24 +1,24 @@ -package io.anuke.mindustry.world.blocks.storage; +package mindustry.world.blocks.storage; -import io.anuke.arc.*; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.Lines; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.entities.Effects; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.graphics.Pal; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.type.ItemType; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.BlockStat; -import io.anuke.mindustry.world.meta.StatUnit; +import arc.*; +import arc.graphics.g2d.Draw; +import arc.graphics.g2d.Lines; +import arc.math.Mathf; +import arc.util.Time; +import mindustry.Vars; +import mindustry.content.Fx; +import mindustry.entities.Effects; +import mindustry.entities.type.TileEntity; +import mindustry.game.EventType.*; +import mindustry.graphics.Pal; +import mindustry.type.Item; +import mindustry.type.ItemType; +import mindustry.world.Tile; +import mindustry.world.meta.BlockStat; +import mindustry.world.meta.StatUnit; -import static io.anuke.mindustry.Vars.data; -import static io.anuke.mindustry.Vars.world; +import static mindustry.Vars.data; +import static mindustry.Vars.world; public class LaunchPad extends StorageBlock{ public final int timerLaunch = timers++; diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/StorageBlock.java b/core/src/mindustry/world/blocks/storage/StorageBlock.java similarity index 88% rename from core/src/io/anuke/mindustry/world/blocks/storage/StorageBlock.java rename to core/src/mindustry/world/blocks/storage/StorageBlock.java index 710f97fbe3..29aa7860b5 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/StorageBlock.java +++ b/core/src/mindustry/world/blocks/storage/StorageBlock.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.world.blocks.storage; +package mindustry.world.blocks.storage; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; +import arc.util.ArcAnnotate.*; +import mindustry.entities.type.TileEntity; +import mindustry.type.Item; +import mindustry.world.Block; +import mindustry.world.Tile; public abstract class StorageBlock extends Block{ diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java b/core/src/mindustry/world/blocks/storage/Unloader.java similarity index 90% rename from core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java rename to core/src/mindustry/world/blocks/storage/Unloader.java index 8186ade094..b63e7a04bb 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java +++ b/core/src/mindustry/world/blocks/storage/Unloader.java @@ -1,18 +1,18 @@ -package io.anuke.mindustry.world.blocks.storage; +package mindustry.world.blocks.storage; -import io.anuke.arc.graphics.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.entities.traits.BuilderTrait.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.entities.traits.BuilderTrait.*; +import mindustry.entities.type.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.blocks.*; import java.io.*; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; public class Unloader extends Block{ public float speed = 1f; diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/Vault.java b/core/src/mindustry/world/blocks/storage/Vault.java similarity index 78% rename from core/src/io/anuke/mindustry/world/blocks/storage/Vault.java rename to core/src/mindustry/world/blocks/storage/Vault.java index 4ee9cf97b7..dcfad3942f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/Vault.java +++ b/core/src/mindustry/world/blocks/storage/Vault.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world.blocks.storage; +package mindustry.world.blocks.storage; public class Vault extends StorageBlock{ diff --git a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java b/core/src/mindustry/world/blocks/units/CommandCenter.java similarity index 84% rename from core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java rename to core/src/mindustry/world/blocks/units/CommandCenter.java index 9423ac6cae..9e9312af75 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/mindustry/world/blocks/units/CommandCenter.java @@ -1,27 +1,27 @@ -package io.anuke.mindustry.world.blocks.units; +package mindustry.world.blocks.units; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.graphics.g2d.*; -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.entities.*; -import io.anuke.mindustry.entities.Effects.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.entities.units.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.meta.*; +import arc.*; +import arc.struct.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.entities.Effects.*; +import mindustry.entities.type.*; +import mindustry.entities.units.*; +import mindustry.game.EventType.*; +import mindustry.game.*; +import mindustry.graphics.*; +import mindustry.ui.*; +import mindustry.world.*; +import mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class CommandCenter extends Block{ protected TextureRegion[] commandRegions = new TextureRegion[UnitCommand.all.length]; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java b/core/src/mindustry/world/blocks/units/MechPad.java similarity index 86% rename from core/src/io/anuke/mindustry/world/blocks/units/MechPad.java rename to core/src/mindustry/world/blocks/units/MechPad.java index 54bc28fb03..9ff7223dc6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java +++ b/core/src/mindustry/world/blocks/units/MechPad.java @@ -1,28 +1,28 @@ -package io.anuke.mindustry.world.blocks.units; +package mindustry.world.blocks.units; -import io.anuke.annotations.Annotations.*; -import io.anuke.arc.*; -import io.anuke.arc.collection.EnumSet; -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.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.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.meta.*; +import arc.*; +import mindustry.annotations.Annotations.*; +import arc.struct.EnumSet; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.math.geom.*; +import arc.util.*; +import arc.util.ArcAnnotate.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.entities.traits.*; +import mindustry.entities.type.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.blocks.*; +import mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class MechPad extends Block{ public @NonNull Mech mech; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/RallyPoint.java b/core/src/mindustry/world/blocks/units/RallyPoint.java similarity index 53% rename from core/src/io/anuke/mindustry/world/blocks/units/RallyPoint.java rename to core/src/mindustry/world/blocks/units/RallyPoint.java index c4d467a19b..c79e08e3e4 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/RallyPoint.java +++ b/core/src/mindustry/world/blocks/units/RallyPoint.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.world.blocks.units; +package mindustry.world.blocks.units; -import io.anuke.arc.collection.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.meta.*; +import arc.struct.*; +import mindustry.world.*; +import mindustry.world.meta.*; public class RallyPoint extends Block{ diff --git a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java b/core/src/mindustry/world/blocks/units/RepairPoint.java similarity index 86% rename from core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java rename to core/src/mindustry/world/blocks/units/RepairPoint.java index 11b8fd89e6..183404148d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java +++ b/core/src/mindustry/world/blocks/units/RepairPoint.java @@ -1,22 +1,22 @@ -package io.anuke.mindustry.world.blocks.units; +package mindustry.world.blocks.units; -import io.anuke.arc.Core; -import io.anuke.arc.collection.EnumSet; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.Angles; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.math.geom.Rectangle; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.entities.Units; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.entities.type.Unit; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.*; +import arc.Core; +import arc.struct.EnumSet; +import arc.graphics.Color; +import arc.graphics.g2d.*; +import arc.math.Angles; +import arc.math.Mathf; +import arc.math.geom.Rectangle; +import arc.util.Time; +import mindustry.entities.Units; +import mindustry.entities.type.TileEntity; +import mindustry.entities.type.Unit; +import mindustry.graphics.*; +import mindustry.world.Block; +import mindustry.world.Tile; +import mindustry.world.meta.*; -import static io.anuke.mindustry.Vars.tilesize; +import static mindustry.Vars.tilesize; public class RepairPoint extends Block{ private static Rectangle rect = new Rectangle(); diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java similarity index 85% rename from core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java rename to core/src/mindustry/world/blocks/units/UnitFactory.java index 8879f991b5..ac3e20f0bb 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/mindustry/world/blocks/units/UnitFactory.java @@ -1,30 +1,30 @@ -package io.anuke.mindustry.world.blocks.units; +package mindustry.world.blocks.units; -import io.anuke.annotations.Annotations.Loc; -import io.anuke.annotations.Annotations.Remote; -import io.anuke.arc.*; -import io.anuke.arc.collection.EnumSet; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.entities.Effects; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.graphics.Pal; -import io.anuke.mindustry.graphics.Shaders; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.Bar; -import io.anuke.mindustry.ui.Cicon; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.consumers.ConsumeItems; -import io.anuke.mindustry.world.consumers.ConsumeType; -import io.anuke.mindustry.world.meta.*; +import arc.*; +import mindustry.annotations.Annotations.Loc; +import mindustry.annotations.Annotations.Remote; +import arc.struct.EnumSet; +import arc.graphics.g2d.*; +import arc.math.Mathf; +import mindustry.Vars; +import mindustry.content.Fx; +import mindustry.entities.Effects; +import mindustry.entities.type.*; +import mindustry.game.EventType.*; +import mindustry.gen.Call; +import mindustry.graphics.Pal; +import mindustry.graphics.Shaders; +import mindustry.type.*; +import mindustry.ui.Bar; +import mindustry.ui.Cicon; +import mindustry.world.Block; +import mindustry.world.Tile; +import mindustry.world.consumers.ConsumeItems; +import mindustry.world.consumers.ConsumeType; +import mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class UnitFactory extends Block{ public UnitType unitType; diff --git a/core/src/io/anuke/mindustry/world/consumers/Consume.java b/core/src/mindustry/world/consumers/Consume.java similarity index 86% rename from core/src/io/anuke/mindustry/world/consumers/Consume.java rename to core/src/mindustry/world/consumers/Consume.java index 2e176cc670..b419f68d13 100644 --- a/core/src/io/anuke/mindustry/world/consumers/Consume.java +++ b/core/src/mindustry/world/consumers/Consume.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.world.consumers; +package mindustry.world.consumers; -import io.anuke.arc.collection.*; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.BlockStats; +import arc.struct.*; +import arc.scene.ui.layout.Table; +import mindustry.entities.type.TileEntity; +import mindustry.world.Tile; +import mindustry.world.meta.BlockStats; /** An abstract class that defines a type of resource that a block can consume. */ public abstract class Consume{ diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java b/core/src/mindustry/world/consumers/ConsumeItemFilter.java similarity index 78% rename from core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java rename to core/src/mindustry/world/consumers/ConsumeItemFilter.java index 93e05c17aa..2dcab1a841 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java +++ b/core/src/mindustry/world/consumers/ConsumeItemFilter.java @@ -1,18 +1,18 @@ -package io.anuke.mindustry.world.consumers; +package mindustry.world.consumers; -import io.anuke.arc.collection.*; -import io.anuke.arc.func.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.entities.type.*; -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.meta.*; -import io.anuke.mindustry.world.meta.values.*; +import arc.struct.*; +import arc.func.*; +import arc.scene.ui.layout.*; +import arc.util.ArcAnnotate.*; +import mindustry.entities.type.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.ui.Cicon; +import mindustry.world.*; +import mindustry.world.meta.*; +import mindustry.world.meta.values.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class ConsumeItemFilter extends Consume{ public final @NonNull diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java b/core/src/mindustry/world/consumers/ConsumeItems.java similarity index 77% rename from core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java rename to core/src/mindustry/world/consumers/ConsumeItems.java index 0b5c7bc5bc..c5f904bfeb 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java +++ b/core/src/mindustry/world/consumers/ConsumeItems.java @@ -1,15 +1,15 @@ -package io.anuke.mindustry.world.consumers; +package mindustry.world.consumers; -import io.anuke.arc.collection.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.entities.type.*; -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.meta.*; -import io.anuke.mindustry.world.meta.values.*; +import arc.struct.*; +import arc.scene.ui.layout.*; +import arc.util.ArcAnnotate.*; +import mindustry.entities.type.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.ui.Cicon; +import mindustry.world.*; +import mindustry.world.meta.*; +import mindustry.world.meta.values.*; public class ConsumeItems extends Consume{ public final @NonNull ItemStack[] items; diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java b/core/src/mindustry/world/consumers/ConsumeLiquid.java similarity index 74% rename from core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java rename to core/src/mindustry/world/consumers/ConsumeLiquid.java index faaf5dc4ca..dcb318150a 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java +++ b/core/src/mindustry/world/consumers/ConsumeLiquid.java @@ -1,14 +1,14 @@ -package io.anuke.mindustry.world.consumers; +package mindustry.world.consumers; -import io.anuke.arc.collection.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.mindustry.entities.type.*; -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.meta.*; +import arc.struct.*; +import arc.scene.ui.layout.*; +import arc.util.ArcAnnotate.*; +import mindustry.entities.type.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.ui.Cicon; +import mindustry.world.*; +import mindustry.world.meta.*; public class ConsumeLiquid extends ConsumeLiquidBase{ public final @NonNull Liquid liquid; diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidBase.java b/core/src/mindustry/world/consumers/ConsumeLiquidBase.java similarity index 89% rename from core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidBase.java rename to core/src/mindustry/world/consumers/ConsumeLiquidBase.java index 34190338f2..229121863d 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidBase.java +++ b/core/src/mindustry/world/consumers/ConsumeLiquidBase.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.world.consumers; +package mindustry.world.consumers; -import io.anuke.mindustry.entities.type.TileEntity; +import mindustry.entities.type.TileEntity; public abstract class ConsumeLiquidBase extends Consume{ /** amount used per frame */ diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java b/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java similarity index 70% rename from core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java rename to core/src/mindustry/world/consumers/ConsumeLiquidFilter.java index 1da3e86e50..9d8450cfb8 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java +++ b/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java @@ -1,19 +1,19 @@ -package io.anuke.mindustry.world.consumers; +package mindustry.world.consumers; -import io.anuke.arc.collection.*; -import io.anuke.arc.func.Boolf; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.type.Liquid; -import io.anuke.mindustry.ui.Cicon; -import io.anuke.mindustry.ui.MultiReqImage; -import io.anuke.mindustry.ui.ReqImage; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.BlockStat; -import io.anuke.mindustry.world.meta.BlockStats; -import io.anuke.mindustry.world.meta.values.LiquidFilterValue; +import arc.struct.*; +import arc.func.Boolf; +import arc.scene.ui.layout.Table; +import mindustry.entities.type.TileEntity; +import mindustry.type.Liquid; +import mindustry.ui.Cicon; +import mindustry.ui.MultiReqImage; +import mindustry.ui.ReqImage; +import mindustry.world.Tile; +import mindustry.world.meta.BlockStat; +import mindustry.world.meta.BlockStats; +import mindustry.world.meta.values.LiquidFilterValue; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; public class ConsumeLiquidFilter extends ConsumeLiquidBase{ public final Boolf filter; diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java b/core/src/mindustry/world/consumers/ConsumePower.java similarity index 90% rename from core/src/io/anuke/mindustry/world/consumers/ConsumePower.java rename to core/src/mindustry/world/consumers/ConsumePower.java index 3343332fc4..5df011349a 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java +++ b/core/src/mindustry/world/consumers/ConsumePower.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.world.consumers; +package mindustry.world.consumers; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.*; +import arc.math.Mathf; +import arc.scene.ui.layout.Table; +import mindustry.entities.type.TileEntity; +import mindustry.world.Tile; +import mindustry.world.meta.*; /** Consumer class for blocks which consume power while being connected to a power graph. */ public class ConsumePower extends Consume{ diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeType.java b/core/src/mindustry/world/consumers/ConsumeType.java similarity index 57% rename from core/src/io/anuke/mindustry/world/consumers/ConsumeType.java rename to core/src/mindustry/world/consumers/ConsumeType.java index 572332f9df..9a68a050cc 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeType.java +++ b/core/src/mindustry/world/consumers/ConsumeType.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world.consumers; +package mindustry.world.consumers; public enum ConsumeType{ item, diff --git a/core/src/io/anuke/mindustry/world/consumers/Consumers.java b/core/src/mindustry/world/consumers/Consumers.java similarity index 88% rename from core/src/io/anuke/mindustry/world/consumers/Consumers.java rename to core/src/mindustry/world/consumers/Consumers.java index 2c66a03596..b6ebd7391a 100644 --- a/core/src/io/anuke/mindustry/world/consumers/Consumers.java +++ b/core/src/mindustry/world/consumers/Consumers.java @@ -1,13 +1,13 @@ -package io.anuke.mindustry.world.consumers; +package mindustry.world.consumers; -import io.anuke.arc.collection.*; -import io.anuke.arc.func.Boolf; -import io.anuke.arc.util.Structs; -import io.anuke.mindustry.Vars; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.blocks.power.ConditionalConsumePower; -import io.anuke.mindustry.world.meta.BlockStats; +import arc.struct.*; +import arc.func.Boolf; +import arc.util.Structs; +import mindustry.Vars; +import mindustry.entities.type.TileEntity; +import mindustry.type.*; +import mindustry.world.blocks.power.ConditionalConsumePower; +import mindustry.world.meta.BlockStats; public class Consumers{ private Consume[] map = new Consume[ConsumeType.values().length]; diff --git a/core/src/io/anuke/mindustry/world/meta/Attribute.java b/core/src/mindustry/world/meta/Attribute.java similarity index 90% rename from core/src/io/anuke/mindustry/world/meta/Attribute.java rename to core/src/mindustry/world/meta/Attribute.java index 0604adeba2..815f471c9d 100644 --- a/core/src/io/anuke/mindustry/world/meta/Attribute.java +++ b/core/src/mindustry/world/meta/Attribute.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world.meta; +package mindustry.world.meta; public enum Attribute{ /** Heat of this block. Used for calculating output of thermal generators. */ diff --git a/core/src/io/anuke/mindustry/world/meta/BlockBars.java b/core/src/mindustry/world/meta/BlockBars.java similarity index 72% rename from core/src/io/anuke/mindustry/world/meta/BlockBars.java rename to core/src/mindustry/world/meta/BlockBars.java index 11706bc510..5b319332ce 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockBars.java +++ b/core/src/mindustry/world/meta/BlockBars.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.world.meta; +package mindustry.world.meta; -import io.anuke.arc.collection.OrderedMap; -import io.anuke.arc.func.Func; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.ui.Bar; +import arc.struct.OrderedMap; +import arc.func.Func; +import mindustry.entities.type.TileEntity; +import mindustry.ui.Bar; public class BlockBars{ private OrderedMap> bars = new OrderedMap<>(); diff --git a/core/src/io/anuke/mindustry/world/meta/BlockFlag.java b/core/src/mindustry/world/meta/BlockFlag.java similarity index 92% rename from core/src/io/anuke/mindustry/world/meta/BlockFlag.java rename to core/src/mindustry/world/meta/BlockFlag.java index 477d6a6ce6..0fd2ca9c43 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockFlag.java +++ b/core/src/mindustry/world/meta/BlockFlag.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world.meta; +package mindustry.world.meta; /** Stores special flags of blocks for easy querying. */ public enum BlockFlag{ diff --git a/core/src/io/anuke/mindustry/world/meta/BlockGroup.java b/core/src/mindustry/world/meta/BlockGroup.java similarity index 70% rename from core/src/io/anuke/mindustry/world/meta/BlockGroup.java rename to core/src/mindustry/world/meta/BlockGroup.java index dd90943ea0..24e8166990 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockGroup.java +++ b/core/src/mindustry/world/meta/BlockGroup.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world.meta; +package mindustry.world.meta; public enum BlockGroup{ none, walls, turrets, transportation, power, liquids, drills diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStat.java b/core/src/mindustry/world/meta/BlockStat.java similarity index 96% rename from core/src/io/anuke/mindustry/world/meta/BlockStat.java rename to core/src/mindustry/world/meta/BlockStat.java index 7cea1a1277..162df3dd37 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockStat.java +++ b/core/src/mindustry/world/meta/BlockStat.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.world.meta; +package mindustry.world.meta; -import io.anuke.arc.Core; +import arc.Core; import java.util.Locale; diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStats.java b/core/src/mindustry/world/meta/BlockStats.java similarity index 90% rename from core/src/io/anuke/mindustry/world/meta/BlockStats.java rename to core/src/mindustry/world/meta/BlockStats.java index dbf3ea0afc..931482a49a 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockStats.java +++ b/core/src/mindustry/world/meta/BlockStats.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.world.meta; +package mindustry.world.meta; -import io.anuke.arc.collection.Array; -import io.anuke.arc.collection.ObjectMap.Entry; -import io.anuke.arc.collection.OrderedMap; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.meta.values.*; +import arc.struct.Array; +import arc.struct.ObjectMap.Entry; +import arc.struct.OrderedMap; +import mindustry.type.*; +import mindustry.world.meta.values.*; /** Hold and organizes a list of block stats. */ public class BlockStats{ diff --git a/core/src/io/anuke/mindustry/world/meta/BuildVisibility.java b/core/src/mindustry/world/meta/BuildVisibility.java similarity index 82% rename from core/src/io/anuke/mindustry/world/meta/BuildVisibility.java rename to core/src/mindustry/world/meta/BuildVisibility.java index 6197312ebc..e26e29e86b 100644 --- a/core/src/io/anuke/mindustry/world/meta/BuildVisibility.java +++ b/core/src/mindustry/world/meta/BuildVisibility.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.world.meta; +package mindustry.world.meta; -import io.anuke.arc.func.*; -import io.anuke.mindustry.*; +import arc.func.*; +import mindustry.*; public enum BuildVisibility{ hidden(() -> false), diff --git a/core/src/io/anuke/mindustry/world/meta/PowerType.java b/core/src/mindustry/world/meta/PowerType.java similarity index 62% rename from core/src/io/anuke/mindustry/world/meta/PowerType.java rename to core/src/mindustry/world/meta/PowerType.java index 2c1ba8eb81..3f870ce85a 100644 --- a/core/src/io/anuke/mindustry/world/meta/PowerType.java +++ b/core/src/mindustry/world/meta/PowerType.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world.meta; +package mindustry.world.meta; public enum PowerType{ consumer, diff --git a/core/src/io/anuke/mindustry/world/meta/Producers.java b/core/src/mindustry/world/meta/Producers.java similarity index 77% rename from core/src/io/anuke/mindustry/world/meta/Producers.java rename to core/src/mindustry/world/meta/Producers.java index 2b430ee28a..576341b4ad 100644 --- a/core/src/io/anuke/mindustry/world/meta/Producers.java +++ b/core/src/mindustry/world/meta/Producers.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.world.meta; +package mindustry.world.meta; -import io.anuke.mindustry.ctype.Content; +import mindustry.ctype.Content; public class Producers{ private Content output; diff --git a/core/src/io/anuke/mindustry/world/meta/StatCategory.java b/core/src/mindustry/world/meta/StatCategory.java similarity index 79% rename from core/src/io/anuke/mindustry/world/meta/StatCategory.java rename to core/src/mindustry/world/meta/StatCategory.java index fa7944c55f..5f244674a4 100644 --- a/core/src/io/anuke/mindustry/world/meta/StatCategory.java +++ b/core/src/mindustry/world/meta/StatCategory.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.world.meta; +package mindustry.world.meta; -import io.anuke.arc.Core; +import arc.Core; /** A specific category for a stat. */ public enum StatCategory{ diff --git a/core/src/io/anuke/mindustry/world/meta/StatUnit.java b/core/src/mindustry/world/meta/StatUnit.java similarity index 90% rename from core/src/io/anuke/mindustry/world/meta/StatUnit.java rename to core/src/mindustry/world/meta/StatUnit.java index 3b22ad68a5..5136280e8a 100644 --- a/core/src/io/anuke/mindustry/world/meta/StatUnit.java +++ b/core/src/mindustry/world/meta/StatUnit.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.world.meta; +package mindustry.world.meta; -import io.anuke.arc.Core; +import arc.Core; import java.util.Locale; diff --git a/core/src/io/anuke/mindustry/world/meta/StatValue.java b/core/src/mindustry/world/meta/StatValue.java similarity index 79% rename from core/src/io/anuke/mindustry/world/meta/StatValue.java rename to core/src/mindustry/world/meta/StatValue.java index fd1e8a69bc..1a978b71e9 100644 --- a/core/src/io/anuke/mindustry/world/meta/StatValue.java +++ b/core/src/mindustry/world/meta/StatValue.java @@ -1,6 +1,6 @@ -package io.anuke.mindustry.world.meta; +package mindustry.world.meta; -import io.anuke.arc.scene.ui.layout.Table; +import arc.scene.ui.layout.Table; /** * A base interface for a value of a stat that is displayed. diff --git a/core/src/io/anuke/mindustry/world/meta/values/AmmoListValue.java b/core/src/mindustry/world/meta/values/AmmoListValue.java similarity index 82% rename from core/src/io/anuke/mindustry/world/meta/values/AmmoListValue.java rename to core/src/mindustry/world/meta/values/AmmoListValue.java index c19503c5d1..3819be4e48 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/AmmoListValue.java +++ b/core/src/mindustry/world/meta/values/AmmoListValue.java @@ -1,19 +1,19 @@ -package io.anuke.mindustry.world.meta.values; +package mindustry.world.meta.values; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -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.mindustry.content.*; -import io.anuke.mindustry.ctype.UnlockableContent; -import io.anuke.mindustry.entities.bullet.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.ui.Cicon; -import io.anuke.mindustry.world.meta.*; +import arc.*; +import arc.struct.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.ctype.UnlockableContent; +import mindustry.entities.bullet.*; +import mindustry.gen.*; +import mindustry.ui.Cicon; +import mindustry.world.meta.*; -import static io.anuke.mindustry.Vars.tilesize; +import static mindustry.Vars.tilesize; public class AmmoListValue implements StatValue{ private final ObjectMap map; diff --git a/core/src/io/anuke/mindustry/world/meta/values/BooleanValue.java b/core/src/mindustry/world/meta/values/BooleanValue.java similarity index 65% rename from core/src/io/anuke/mindustry/world/meta/values/BooleanValue.java rename to core/src/mindustry/world/meta/values/BooleanValue.java index 49e2967e7e..7f399ca702 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/BooleanValue.java +++ b/core/src/mindustry/world/meta/values/BooleanValue.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.world.meta.values; +package mindustry.world.meta.values; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.world.meta.StatValue; +import arc.scene.ui.layout.Table; +import mindustry.world.meta.StatValue; public class BooleanValue implements StatValue{ private final boolean value; diff --git a/core/src/io/anuke/mindustry/world/meta/values/BoosterListValue.java b/core/src/mindustry/world/meta/values/BoosterListValue.java similarity index 81% rename from core/src/io/anuke/mindustry/world/meta/values/BoosterListValue.java rename to core/src/mindustry/world/meta/values/BoosterListValue.java index 30c1ff0765..40d0b21d13 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/BoosterListValue.java +++ b/core/src/mindustry/world/meta/values/BoosterListValue.java @@ -1,15 +1,15 @@ -package io.anuke.mindustry.world.meta.values; +package mindustry.world.meta.values; -import io.anuke.arc.*; -import io.anuke.arc.func.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.Cicon; -import io.anuke.mindustry.world.meta.*; +import arc.*; +import arc.func.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.gen.*; +import mindustry.type.*; +import mindustry.ui.Cicon; +import mindustry.world.meta.*; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; public class BoosterListValue implements StatValue{ protected float reload, maxUsed, multiplier; diff --git a/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java b/core/src/mindustry/world/meta/values/ItemFilterValue.java similarity index 61% rename from core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java rename to core/src/mindustry/world/meta/values/ItemFilterValue.java index 2bdaa32377..72928e173f 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java +++ b/core/src/mindustry/world/meta/values/ItemFilterValue.java @@ -1,13 +1,13 @@ -package io.anuke.mindustry.world.meta.values; +package mindustry.world.meta.values; -import io.anuke.arc.collection.Array; -import io.anuke.arc.func.Boolf; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.ui.ItemDisplay; -import io.anuke.mindustry.world.meta.StatValue; +import arc.struct.Array; +import arc.func.Boolf; +import arc.scene.ui.layout.Table; +import mindustry.type.Item; +import mindustry.ui.ItemDisplay; +import mindustry.world.meta.StatValue; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; public class ItemFilterValue implements StatValue{ private final Boolf filter; diff --git a/core/src/io/anuke/mindustry/world/meta/values/ItemListValue.java b/core/src/mindustry/world/meta/values/ItemListValue.java similarity index 71% rename from core/src/io/anuke/mindustry/world/meta/values/ItemListValue.java rename to core/src/mindustry/world/meta/values/ItemListValue.java index 87d7732718..f6e1acc654 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/ItemListValue.java +++ b/core/src/mindustry/world/meta/values/ItemListValue.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.world.meta.values; +package mindustry.world.meta.values; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.type.ItemStack; -import io.anuke.mindustry.ui.ItemDisplay; -import io.anuke.mindustry.world.meta.StatValue; +import arc.scene.ui.layout.Table; +import mindustry.type.ItemStack; +import mindustry.ui.ItemDisplay; +import mindustry.world.meta.StatValue; public class ItemListValue implements StatValue{ private final ItemStack[] stacks; diff --git a/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java b/core/src/mindustry/world/meta/values/LiquidFilterValue.java similarity index 70% rename from core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java rename to core/src/mindustry/world/meta/values/LiquidFilterValue.java index 99f6ea4a31..9e44f97ed2 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java +++ b/core/src/mindustry/world/meta/values/LiquidFilterValue.java @@ -1,13 +1,13 @@ -package io.anuke.mindustry.world.meta.values; +package mindustry.world.meta.values; -import io.anuke.arc.collection.Array; -import io.anuke.arc.func.Boolf; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.type.Liquid; -import io.anuke.mindustry.ui.LiquidDisplay; -import io.anuke.mindustry.world.meta.StatValue; +import arc.struct.Array; +import arc.func.Boolf; +import arc.scene.ui.layout.Table; +import mindustry.type.Liquid; +import mindustry.ui.LiquidDisplay; +import mindustry.world.meta.StatValue; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; public class LiquidFilterValue implements StatValue{ private final Boolf filter; diff --git a/core/src/io/anuke/mindustry/world/meta/values/LiquidValue.java b/core/src/mindustry/world/meta/values/LiquidValue.java similarity index 67% rename from core/src/io/anuke/mindustry/world/meta/values/LiquidValue.java rename to core/src/mindustry/world/meta/values/LiquidValue.java index be6eabc3f1..f6782da6ae 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/LiquidValue.java +++ b/core/src/mindustry/world/meta/values/LiquidValue.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.world.meta.values; +package mindustry.world.meta.values; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.type.Liquid; -import io.anuke.mindustry.ui.LiquidDisplay; -import io.anuke.mindustry.world.meta.StatValue; +import arc.scene.ui.layout.Table; +import mindustry.type.Liquid; +import mindustry.ui.LiquidDisplay; +import mindustry.world.meta.StatValue; public class LiquidValue implements StatValue{ private final Liquid liquid; diff --git a/core/src/io/anuke/mindustry/world/meta/values/NumberValue.java b/core/src/mindustry/world/meta/values/NumberValue.java similarity index 74% rename from core/src/io/anuke/mindustry/world/meta/values/NumberValue.java rename to core/src/mindustry/world/meta/values/NumberValue.java index 11080bc7b3..fd10d28f1d 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/NumberValue.java +++ b/core/src/mindustry/world/meta/values/NumberValue.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.world.meta.values; +package mindustry.world.meta.values; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.arc.util.Strings; -import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.mindustry.world.meta.StatValue; +import arc.scene.ui.layout.Table; +import arc.util.Strings; +import mindustry.world.meta.StatUnit; +import mindustry.world.meta.StatValue; /** * A stat that is a number with a unit attacked. diff --git a/core/src/io/anuke/mindustry/world/meta/values/StringValue.java b/core/src/mindustry/world/meta/values/StringValue.java similarity index 62% rename from core/src/io/anuke/mindustry/world/meta/values/StringValue.java rename to core/src/mindustry/world/meta/values/StringValue.java index 1b90d6b2ca..4bc102a8d4 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/StringValue.java +++ b/core/src/mindustry/world/meta/values/StringValue.java @@ -1,8 +1,8 @@ -package io.anuke.mindustry.world.meta.values; +package mindustry.world.meta.values; -import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.arc.util.Strings; -import io.anuke.mindustry.world.meta.StatValue; +import arc.scene.ui.layout.Table; +import arc.util.Strings; +import mindustry.world.meta.StatValue; public class StringValue implements StatValue{ private final String value; diff --git a/core/src/io/anuke/mindustry/world/modules/BlockModule.java b/core/src/mindustry/world/modules/BlockModule.java similarity index 86% rename from core/src/io/anuke/mindustry/world/modules/BlockModule.java rename to core/src/mindustry/world/modules/BlockModule.java index 377ba9c099..6d00713944 100644 --- a/core/src/io/anuke/mindustry/world/modules/BlockModule.java +++ b/core/src/mindustry/world/modules/BlockModule.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world.modules; +package mindustry.world.modules; import java.io.*; diff --git a/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java b/core/src/mindustry/world/modules/ConsumeModule.java similarity index 92% rename from core/src/io/anuke/mindustry/world/modules/ConsumeModule.java rename to core/src/mindustry/world/modules/ConsumeModule.java index 29252af34d..44f8d471d4 100644 --- a/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java +++ b/core/src/mindustry/world/modules/ConsumeModule.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.world.modules; +package mindustry.world.modules; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.world.consumers.Consume; +import mindustry.entities.type.TileEntity; +import mindustry.world.consumers.Consume; import java.io.*; diff --git a/core/src/io/anuke/mindustry/world/modules/ItemModule.java b/core/src/mindustry/world/modules/ItemModule.java similarity index 95% rename from core/src/io/anuke/mindustry/world/modules/ItemModule.java rename to core/src/mindustry/world/modules/ItemModule.java index 7e146d8ab0..8fc338dcbd 100644 --- a/core/src/io/anuke/mindustry/world/modules/ItemModule.java +++ b/core/src/mindustry/world/modules/ItemModule.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.world.modules; +package mindustry.world.modules; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.type.ItemStack; +import mindustry.type.Item; +import mindustry.type.ItemStack; import java.io.*; import java.util.Arrays; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; public class ItemModule extends BlockModule{ private int[] items = new int[content.items().size]; diff --git a/core/src/io/anuke/mindustry/world/modules/LiquidModule.java b/core/src/mindustry/world/modules/LiquidModule.java similarity index 95% rename from core/src/io/anuke/mindustry/world/modules/LiquidModule.java rename to core/src/mindustry/world/modules/LiquidModule.java index c0cce49dac..19ad109341 100644 --- a/core/src/io/anuke/mindustry/world/modules/LiquidModule.java +++ b/core/src/mindustry/world/modules/LiquidModule.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.world.modules; +package mindustry.world.modules; -import io.anuke.arc.math.*; -import io.anuke.mindustry.type.Liquid; +import arc.math.*; +import mindustry.type.Liquid; import java.io.*; import java.util.Arrays; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; public class LiquidModule extends BlockModule{ private float[] liquids = new float[content.liquids().size]; diff --git a/core/src/io/anuke/mindustry/world/modules/PowerModule.java b/core/src/mindustry/world/modules/PowerModule.java similarity index 89% rename from core/src/io/anuke/mindustry/world/modules/PowerModule.java rename to core/src/mindustry/world/modules/PowerModule.java index f0c76e2aaf..e1500f85e7 100644 --- a/core/src/io/anuke/mindustry/world/modules/PowerModule.java +++ b/core/src/mindustry/world/modules/PowerModule.java @@ -1,7 +1,7 @@ -package io.anuke.mindustry.world.modules; +package mindustry.world.modules; -import io.anuke.arc.collection.IntArray; -import io.anuke.mindustry.world.blocks.power.PowerGraph; +import arc.struct.IntArray; +import mindustry.world.blocks.power.PowerGraph; import java.io.DataInput; import java.io.DataOutput; diff --git a/core/src/mindustry/world/producers/Produce.java b/core/src/mindustry/world/producers/Produce.java new file mode 100644 index 0000000000..478e9f35d9 --- /dev/null +++ b/core/src/mindustry/world/producers/Produce.java @@ -0,0 +1,4 @@ +package mindustry.world.producers; + +public class Produce{ +} diff --git a/core/src/mindustry/world/producers/ProduceItem.java b/core/src/mindustry/world/producers/ProduceItem.java new file mode 100644 index 0000000000..8f0b5129fb --- /dev/null +++ b/core/src/mindustry/world/producers/ProduceItem.java @@ -0,0 +1,4 @@ +package mindustry.world.producers; + +public class ProduceItem{ +} diff --git a/desktop/build.gradle b/desktop/build.gradle index acf5e0ae79..efedf8c57b 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -6,7 +6,7 @@ apply plugin: "java" sourceCompatibility = 1.8 sourceSets.main.java.srcDirs = [ "src/" ] -project.ext.mainClassName = "io.anuke.mindustry.desktop.DesktopLauncher" +project.ext.mainClassName = "mindustry.desktop.DesktopLauncher" project.ext.assetsDir = new File("../core/assets") def enableTemplates = true diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java similarity index 94% rename from desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java rename to desktop/src/mindustry/desktop/DesktopLauncher.java index b1b76c171a..27b967f94e 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/mindustry/desktop/DesktopLauncher.java @@ -1,32 +1,32 @@ -package io.anuke.mindustry.desktop; +package mindustry.desktop; +import arc.*; +import arc.Files.*; +import arc.backend.sdl.*; +import arc.files.*; +import arc.func.*; +import arc.math.*; +import arc.struct.*; +import arc.util.*; +import arc.util.serialization.*; import club.minnced.discord.rpc.*; import com.codedisaster.steamworks.*; -import io.anuke.arc.*; -import io.anuke.arc.Files.*; -import io.anuke.arc.backends.sdl.*; import io.anuke.arc.backends.sdl.jni.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.files.*; -import io.anuke.arc.func.*; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.serialization.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.core.GameState.*; -import io.anuke.mindustry.core.*; -import io.anuke.mindustry.desktop.steam.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.net.*; -import io.anuke.mindustry.net.Net.*; -import io.anuke.mindustry.type.*; +import mindustry.*; +import mindustry.core.GameState.*; +import mindustry.core.*; +import mindustry.desktop.steam.*; +import mindustry.game.EventType.*; +import mindustry.net.*; +import mindustry.net.Net.*; +import mindustry.type.*; import java.io.*; import java.net.*; import java.nio.charset.*; import java.util.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class DesktopLauncher extends ClientLauncher{ public final static String discordID = "610508934456934412"; diff --git a/desktop/src/io/anuke/mindustry/desktop/steam/SAchievement.java b/desktop/src/mindustry/desktop/steam/SAchievement.java similarity index 98% rename from desktop/src/io/anuke/mindustry/desktop/steam/SAchievement.java rename to desktop/src/mindustry/desktop/steam/SAchievement.java index 8ca7681b5a..d7c8390cd6 100644 --- a/desktop/src/io/anuke/mindustry/desktop/steam/SAchievement.java +++ b/desktop/src/mindustry/desktop/steam/SAchievement.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.desktop.steam; +package mindustry.desktop.steam; public enum SAchievement{ completeTutorial, diff --git a/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java b/desktop/src/mindustry/desktop/steam/SNet.java similarity index 96% rename from desktop/src/io/anuke/mindustry/desktop/steam/SNet.java rename to desktop/src/mindustry/desktop/steam/SNet.java index a3c8e5b178..cb23befebe 100644 --- a/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java +++ b/desktop/src/mindustry/desktop/steam/SNet.java @@ -1,28 +1,28 @@ -package io.anuke.mindustry.desktop.steam; +package mindustry.desktop.steam; +import arc.*; import com.codedisaster.steamworks.*; import com.codedisaster.steamworks.SteamFriends.*; import com.codedisaster.steamworks.SteamMatchmaking.*; import com.codedisaster.steamworks.SteamNetworking.*; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.func.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.pooling.*; -import io.anuke.mindustry.core.GameState.*; -import io.anuke.mindustry.core.Version; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.net.ArcNetProvider.*; -import io.anuke.mindustry.net.*; -import io.anuke.mindustry.net.Net.*; -import io.anuke.mindustry.net.Packets.*; +import arc.struct.*; +import arc.func.*; +import arc.util.*; +import arc.util.pooling.*; +import mindustry.core.GameState.*; +import mindustry.core.Version; +import mindustry.game.EventType.*; +import mindustry.game.*; +import mindustry.net.ArcNetProvider.*; +import mindustry.net.*; +import mindustry.net.Net.*; +import mindustry.net.Packets.*; import java.io.*; import java.nio.*; import java.util.concurrent.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, SteamFriendsCallback, NetProvider{ public final SteamNetworking snet = new SteamNetworking(this); diff --git a/desktop/src/io/anuke/mindustry/desktop/steam/SStat.java b/desktop/src/mindustry/desktop/steam/SStat.java similarity index 94% rename from desktop/src/io/anuke/mindustry/desktop/steam/SStat.java rename to desktop/src/mindustry/desktop/steam/SStat.java index 900e5a6cde..b9438350f0 100644 --- a/desktop/src/io/anuke/mindustry/desktop/steam/SStat.java +++ b/desktop/src/mindustry/desktop/steam/SStat.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.desktop.steam; +package mindustry.desktop.steam; public enum SStat{ unitsDestroyed, diff --git a/desktop/src/io/anuke/mindustry/desktop/steam/SStats.java b/desktop/src/mindustry/desktop/steam/SStats.java similarity index 94% rename from desktop/src/io/anuke/mindustry/desktop/steam/SStats.java rename to desktop/src/mindustry/desktop/steam/SStats.java index 7c083d5546..ee1ab916bc 100644 --- a/desktop/src/io/anuke/mindustry/desktop/steam/SStats.java +++ b/desktop/src/mindustry/desktop/steam/SStats.java @@ -1,20 +1,20 @@ -package io.anuke.mindustry.desktop.steam; +package mindustry.desktop.steam; +import arc.*; import com.codedisaster.steamworks.*; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.entities.units.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.game.Stats.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; +import arc.struct.*; +import arc.util.*; +import mindustry.*; +import mindustry.content.*; +import mindustry.entities.type.*; +import mindustry.entities.units.*; +import mindustry.game.EventType.*; +import mindustry.game.Stats.*; +import mindustry.type.*; +import mindustry.world.*; -import static io.anuke.mindustry.Vars.*; -import static io.anuke.mindustry.desktop.steam.SAchievement.*; +import static mindustry.Vars.*; +import static mindustry.desktop.steam.SAchievement.*; @SuppressWarnings("unchecked") public class SStats implements SteamUserStatsCallback{ diff --git a/desktop/src/io/anuke/mindustry/desktop/steam/SUser.java b/desktop/src/mindustry/desktop/steam/SUser.java similarity index 92% rename from desktop/src/io/anuke/mindustry/desktop/steam/SUser.java rename to desktop/src/mindustry/desktop/steam/SUser.java index 6e828b36c7..730b12763e 100644 --- a/desktop/src/io/anuke/mindustry/desktop/steam/SUser.java +++ b/desktop/src/mindustry/desktop/steam/SUser.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.desktop.steam; +package mindustry.desktop.steam; import com.codedisaster.steamworks.*; import com.codedisaster.steamworks.SteamAuth.*; diff --git a/desktop/src/io/anuke/mindustry/desktop/steam/SVars.java b/desktop/src/mindustry/desktop/steam/SVars.java similarity index 82% rename from desktop/src/io/anuke/mindustry/desktop/steam/SVars.java rename to desktop/src/mindustry/desktop/steam/SVars.java index d4c669cde6..599f9f912a 100644 --- a/desktop/src/io/anuke/mindustry/desktop/steam/SVars.java +++ b/desktop/src/mindustry/desktop/steam/SVars.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.desktop.steam; +package mindustry.desktop.steam; public class SVars{ public final static int steamID = 1127400; diff --git a/desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java b/desktop/src/mindustry/desktop/steam/SWorkshop.java similarity index 96% rename from desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java rename to desktop/src/mindustry/desktop/steam/SWorkshop.java index 480830e1e3..4ede21944e 100644 --- a/desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java +++ b/desktop/src/mindustry/desktop/steam/SWorkshop.java @@ -1,22 +1,22 @@ -package io.anuke.mindustry.desktop.steam; +package mindustry.desktop.steam; +import arc.*; import com.codedisaster.steamworks.*; import com.codedisaster.steamworks.SteamRemoteStorage.*; import com.codedisaster.steamworks.SteamUGC.*; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.files.*; -import io.anuke.arc.func.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.maps.*; -import io.anuke.mindustry.mod.Mods.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.dialogs.*; +import arc.struct.*; +import arc.files.*; +import arc.func.*; +import arc.scene.ui.*; +import arc.util.*; +import mindustry.game.*; +import mindustry.gen.*; +import mindustry.maps.*; +import mindustry.mod.Mods.*; +import mindustry.type.*; +import mindustry.ui.dialogs.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class SWorkshop implements SteamUGCCallback{ public final SteamUGC ugc = new SteamUGC(this); diff --git a/ios/build.gradle b/ios/build.gradle index 0f5e0ec6b3..7096572def 100644 --- a/ios/build.gradle +++ b/ios/build.gradle @@ -4,7 +4,7 @@ sourceCompatibility = '1.8' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' ext{ - mainClassName = "io.anuke.mindustry.IOSLauncher" + mainClassName = "mindustry.ios.IOSLauncher" } task copyAssets(){ diff --git a/ios/robovm.xml b/ios/robovm.xml index a1ce5b92bc..cc970c87a4 100644 --- a/ios/robovm.xml +++ b/ios/robovm.xml @@ -19,9 +19,9 @@ net.jpountz.lz4.** - io.anuke.arc.scene.** - io.anuke.mindustry.gen.Call - io.anuke.mindustry.net.** + arc.scene.** + mindustry.gen.Call + mindustry.net.** com.android.okhttp.HttpHandler com.android.okhttp.HttpsHandler com.android.org.conscrypt.** diff --git a/ios/src/io/anuke/mindustry/IOSLauncher.java b/ios/src/mindustry/ios/IOSLauncher.java similarity index 95% rename from ios/src/io/anuke/mindustry/IOSLauncher.java rename to ios/src/mindustry/ios/IOSLauncher.java index 9ecbb6c75d..5e0102db79 100644 --- a/ios/src/io/anuke/mindustry/IOSLauncher.java +++ b/ios/src/mindustry/ios/IOSLauncher.java @@ -1,16 +1,17 @@ -package io.anuke.mindustry; +package mindustry.ios; +import arc.*; import com.badlogic.gdx.backends.iosrobovm.*; -import io.anuke.arc.*; -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.io.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.game.Saves.*; -import io.anuke.mindustry.io.*; -import io.anuke.mindustry.ui.*; +import arc.files.*; +import arc.func.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import arc.util.io.*; +import mindustry.*; +import mindustry.game.EventType.*; +import mindustry.game.Saves.*; +import mindustry.io.*; +import mindustry.ui.*; import org.robovm.apple.coregraphics.*; import org.robovm.apple.foundation.*; import org.robovm.apple.uikit.*; @@ -20,7 +21,7 @@ import java.io.*; import java.util.*; import java.util.zip.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; import static org.robovm.apple.foundation.NSPathUtilities.getDocumentsDirectory; public class IOSLauncher extends IOSApplication.Delegate{ diff --git a/server/build.gradle b/server/build.gradle index 09299943fa..ad1b49bf7b 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -3,7 +3,7 @@ apply plugin: "java" sourceCompatibility = 1.8 sourceSets.main.java.srcDirs = ["src/"] -project.ext.mainClassName = "io.anuke.mindustry.server.ServerLauncher" +project.ext.mainClassName = "mindustry.server.ServerLauncher" project.ext.assetsDir = new File("../core/assets") ext.getServerFolder = { diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java similarity index 96% rename from server/src/io/anuke/mindustry/server/ServerControl.java rename to server/src/mindustry/server/ServerControl.java index b27253149c..b821d5dcd5 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -1,32 +1,32 @@ -package io.anuke.mindustry.server; +package mindustry.server; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.collection.Array.*; -import io.anuke.arc.files.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.ArcAnnotate.*; -import io.anuke.arc.util.Timer; -import io.anuke.arc.util.CommandHandler.*; -import io.anuke.arc.util.Timer.*; -import io.anuke.arc.util.serialization.*; -import io.anuke.arc.util.serialization.JsonValue.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.core.GameState.*; -import io.anuke.mindustry.core.*; -import io.anuke.mindustry.entities.*; -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.io.*; -import io.anuke.mindustry.maps.Map; -import io.anuke.mindustry.maps.*; -import io.anuke.mindustry.maps.Maps.*; -import io.anuke.mindustry.mod.Mods.*; -import io.anuke.mindustry.net.Administration.*; -import io.anuke.mindustry.net.Packets.*; -import io.anuke.mindustry.type.*; +import arc.*; +import arc.struct.*; +import arc.struct.Array.*; +import arc.files.*; +import arc.util.*; +import arc.util.ArcAnnotate.*; +import arc.util.Timer; +import arc.util.CommandHandler.*; +import arc.util.Timer.*; +import arc.util.serialization.*; +import arc.util.serialization.JsonValue.*; +import mindustry.*; +import mindustry.core.GameState.*; +import mindustry.core.*; +import mindustry.entities.*; +import mindustry.entities.type.*; +import mindustry.game.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.io.*; +import mindustry.maps.Map; +import mindustry.maps.*; +import mindustry.maps.Maps.*; +import mindustry.mod.Mods.*; +import mindustry.net.Administration.*; +import mindustry.net.Packets.*; +import mindustry.type.*; import java.io.*; import java.net.*; @@ -34,8 +34,8 @@ import java.time.*; import java.time.format.*; import java.util.*; -import static io.anuke.arc.util.Log.*; -import static io.anuke.mindustry.Vars.*; +import static arc.util.Log.*; +import static mindustry.Vars.*; public class ServerControl implements ApplicationListener{ private static final int roundExtraTime = 12; @@ -822,7 +822,7 @@ public class ServerControl implements ApplicationListener{ } }); - handler.register("gc", "Trigger a grabage collection. Testing only.", arg -> { + handler.register("gc", "Trigger a grabage struct. Testing only.", arg -> { int pre = (int)(Core.app.getJavaHeap() / 1024 / 1024); System.gc(); int post = (int)(Core.app.getJavaHeap() / 1024 / 1024); diff --git a/server/src/io/anuke/mindustry/server/ServerLauncher.java b/server/src/mindustry/server/ServerLauncher.java similarity index 81% rename from server/src/io/anuke/mindustry/server/ServerLauncher.java rename to server/src/mindustry/server/ServerLauncher.java index 1210d81606..28738ceb7e 100644 --- a/server/src/io/anuke/mindustry/server/ServerLauncher.java +++ b/server/src/mindustry/server/ServerLauncher.java @@ -1,24 +1,24 @@ -package io.anuke.mindustry.server; +package mindustry.server; -import io.anuke.arc.*; -import io.anuke.arc.backends.headless.*; -import io.anuke.arc.files.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.core.*; -import io.anuke.mindustry.ctype.*; -import io.anuke.mindustry.game.EventType.*; -import io.anuke.mindustry.mod.*; -import io.anuke.mindustry.mod.Mods.*; -import io.anuke.mindustry.net.Net; -import io.anuke.mindustry.net.*; +import arc.*; +import arc.backend.headless.*; +import arc.files.*; +import arc.util.*; +import mindustry.*; +import mindustry.core.*; +import mindustry.ctype.*; +import mindustry.game.EventType.*; +import mindustry.mod.*; +import mindustry.mod.Mods.*; +import mindustry.net.Net; +import mindustry.net.*; import java.time.*; -import static io.anuke.arc.util.Log.format; -import static io.anuke.mindustry.Vars.*; -import static io.anuke.mindustry.server.ServerControl.*; +import static arc.util.Log.format; +import static mindustry.Vars.*; +import static mindustry.server.ServerControl.*; public class ServerLauncher implements ApplicationListener{ static String[] args; diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java index ba99b07049..338e9b7597 100644 --- a/tests/src/test/java/ApplicationTests.java +++ b/tests/src/test/java/ApplicationTests.java @@ -1,28 +1,28 @@ -import io.anuke.arc.ApplicationCore; -import io.anuke.arc.Core; -import io.anuke.arc.backends.headless.HeadlessApplication; -import io.anuke.arc.collection.*; -import io.anuke.arc.math.geom.Point2; -import io.anuke.arc.util.Log; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.core.GameState.State; -import io.anuke.mindustry.core.*; -import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest; -import io.anuke.mindustry.entities.type.BaseUnit; -import io.anuke.mindustry.entities.type.base.*; -import io.anuke.mindustry.game.Team; -import io.anuke.mindustry.io.SaveIO; -import io.anuke.mindustry.maps.Map; -import io.anuke.mindustry.net.*; -import io.anuke.mindustry.ctype.ContentType; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.BlockPart; +import arc.ApplicationCore; +import arc.Core; +import arc.backend.headless.HeadlessApplication; +import arc.struct.*; +import arc.math.geom.Point2; +import arc.util.Log; +import arc.util.Time; +import mindustry.Vars; +import mindustry.content.*; +import mindustry.core.GameState.State; +import mindustry.core.*; +import mindustry.entities.traits.BuilderTrait.BuildRequest; +import mindustry.entities.type.BaseUnit; +import mindustry.entities.type.base.*; +import mindustry.game.Team; +import mindustry.io.SaveIO; +import mindustry.maps.Map; +import mindustry.net.*; +import mindustry.ctype.ContentType; +import mindustry.type.Item; +import mindustry.world.*; +import mindustry.world.blocks.BlockPart; import org.junit.jupiter.api.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; import static org.junit.jupiter.api.Assertions.*; public class ApplicationTests{ diff --git a/tests/src/test/java/IOTests.java b/tests/src/test/java/IOTests.java index 7771b33dde..240334f6dd 100644 --- a/tests/src/test/java/IOTests.java +++ b/tests/src/test/java/IOTests.java @@ -1,5 +1,5 @@ -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.io.TypeIO; +import mindustry.game.*; +import mindustry.io.TypeIO; import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/tests/src/test/java/ZoneTests.java b/tests/src/test/java/ZoneTests.java index eee1de8708..2a044d5b75 100644 --- a/tests/src/test/java/ZoneTests.java +++ b/tests/src/test/java/ZoneTests.java @@ -1,15 +1,15 @@ -import io.anuke.arc.collection.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.core.*; -import io.anuke.mindustry.core.GameState.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.io.SaveIO.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.storage.*; +import arc.struct.*; +import arc.util.*; +import mindustry.core.*; +import mindustry.core.GameState.*; +import mindustry.game.*; +import mindustry.io.SaveIO.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.blocks.storage.*; import org.junit.jupiter.api.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.DynamicTest.dynamicTest; diff --git a/tests/src/test/java/power/DirectConsumerTests.java b/tests/src/test/java/power/DirectConsumerTests.java index 0892b13d88..19933045fe 100644 --- a/tests/src/test/java/power/DirectConsumerTests.java +++ b/tests/src/test/java/power/DirectConsumerTests.java @@ -1,12 +1,12 @@ package power; -import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.content.UnitTypes; -import io.anuke.mindustry.type.ItemStack; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.power.PowerGenerator; -import io.anuke.mindustry.world.blocks.power.PowerGraph; -import io.anuke.mindustry.world.blocks.units.UnitFactory; +import mindustry.content.Items; +import mindustry.content.UnitTypes; +import mindustry.type.ItemStack; +import mindustry.world.Tile; +import mindustry.world.blocks.power.PowerGenerator; +import mindustry.world.blocks.power.PowerGraph; +import mindustry.world.blocks.units.UnitFactory; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/tests/src/test/java/power/FakeGraphics.java b/tests/src/test/java/power/FakeGraphics.java index bce7d8fbff..378f675224 100644 --- a/tests/src/test/java/power/FakeGraphics.java +++ b/tests/src/test/java/power/FakeGraphics.java @@ -1,9 +1,9 @@ package power; -import io.anuke.arc.Graphics; -import io.anuke.arc.Graphics.Cursor.SystemCursor; -import io.anuke.arc.graphics.*; -import io.anuke.arc.graphics.glutils.GLVersion; +import arc.Graphics; +import arc.Graphics.Cursor.SystemCursor; +import arc.graphics.*; +import arc.graphics.gl.GLVersion; public class FakeGraphics extends Graphics{ static int frame; diff --git a/tests/src/test/java/power/ItemLiquidGeneratorTests.java b/tests/src/test/java/power/ItemLiquidGeneratorTests.java index 5e5a2ed034..7111c79658 100644 --- a/tests/src/test/java/power/ItemLiquidGeneratorTests.java +++ b/tests/src/test/java/power/ItemLiquidGeneratorTests.java @@ -1,13 +1,13 @@ package power; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.core.*; -import io.anuke.mindustry.game.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.power.*; +import arc.util.*; +import mindustry.*; +import mindustry.content.*; +import mindustry.core.*; +import mindustry.game.*; +import mindustry.type.*; +import mindustry.world.*; +import mindustry.world.blocks.power.*; import org.junit.jupiter.api.*; import java.util.*; diff --git a/tests/src/test/java/power/PowerTestFixture.java b/tests/src/test/java/power/PowerTestFixture.java index 1cd8930449..fd445a2c25 100644 --- a/tests/src/test/java/power/PowerTestFixture.java +++ b/tests/src/test/java/power/PowerTestFixture.java @@ -1,20 +1,20 @@ package power; -import io.anuke.arc.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.content.*; -import io.anuke.mindustry.core.*; -import io.anuke.mindustry.ctype.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.*; -import io.anuke.mindustry.world.blocks.power.*; -import io.anuke.mindustry.world.modules.*; +import arc.*; +import arc.util.*; +import mindustry.*; +import mindustry.content.*; +import mindustry.core.*; +import mindustry.ctype.*; +import mindustry.world.*; +import mindustry.world.blocks.*; +import mindustry.world.blocks.power.*; +import mindustry.world.modules.*; import org.junit.jupiter.api.*; import java.lang.reflect.*; -import static io.anuke.mindustry.Vars.content; +import static mindustry.Vars.content; /** * This class provides objects commonly used by power related unit tests. diff --git a/tests/src/test/java/power/PowerTests.java b/tests/src/test/java/power/PowerTests.java index b3353cfc2c..f017bf6e82 100644 --- a/tests/src/test/java/power/PowerTests.java +++ b/tests/src/test/java/power/PowerTests.java @@ -1,11 +1,11 @@ package power; -import io.anuke.arc.*; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.power.*; -import io.anuke.mindustry.world.consumers.*; +import arc.*; +import arc.math.*; +import arc.util.*; +import mindustry.world.*; +import mindustry.world.blocks.power.*; +import mindustry.world.consumers.*; import org.junit.jupiter.api.*; import static org.junit.jupiter.api.Assertions.*; diff --git a/tools/build.gradle b/tools/build.gradle index 6a2825747a..ea158a66a1 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -297,7 +297,7 @@ task pack(dependsOn: classes){ //run generation task; generate all needed sprites file(genFolder).mkdirs() javaexec{ - main = "io.anuke.mindustry.tools.ImagePacker" + main = "mindustry.tools.ImagePacker" classpath = sourceSets.main.runtimeClasspath standardInput = System.in workingDir = genFolder @@ -310,7 +310,7 @@ task pack(dependsOn: classes){ } jvmArgs("-Djava.awt.headless=true") - main = "io.anuke.mindustry.tools.Upscaler" + main = "mindustry.tools.Upscaler" classpath = sourceSets.main.runtimeClasspath standardInput = System.in workingDir = "../core/assets-raw/sprites_out/ui/icons" @@ -351,7 +351,7 @@ task pack(dependsOn: classes){ task genSprites(dependsOn: classes, type: JavaExec){ finalizedBy 'antialiasGen' - main = "io.anuke.mindustry.tools.ImagePacker" + main = "mindustry.tools.ImagePacker" classpath = sourceSets.main.runtimeClasspath jvmArgs("-Djava.awt.headless=true") standardInput = System.in @@ -361,7 +361,7 @@ task genSprites(dependsOn: classes, type: JavaExec){ task updateBundles(dependsOn: classes, type: JavaExec){ file(genFolder).mkdirs() - main = "io.anuke.mindustry.tools.BundleLauncher" + main = "mindustry.tools.BundleLauncher" classpath = sourceSets.main.runtimeClasspath standardInput = System.in workingDir = "../core/assets/bundles/" diff --git a/tools/src/io/anuke/mindustry/tools/BundleLauncher.java b/tools/src/mindustry/tools/BundleLauncher.java similarity index 92% rename from tools/src/io/anuke/mindustry/tools/BundleLauncher.java rename to tools/src/mindustry/tools/BundleLauncher.java index 454aa7bd1b..668d4665fe 100644 --- a/tools/src/io/anuke/mindustry/tools/BundleLauncher.java +++ b/tools/src/mindustry/tools/BundleLauncher.java @@ -1,10 +1,10 @@ -package io.anuke.mindustry.tools; +package mindustry.tools; -import io.anuke.arc.collection.*; -import io.anuke.arc.files.*; -import io.anuke.arc.func.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.io.*; +import arc.struct.*; +import arc.files.*; +import arc.func.*; +import arc.util.*; +import arc.util.io.*; import java.io.*; diff --git a/tools/src/io/anuke/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java similarity index 95% rename from tools/src/io/anuke/mindustry/tools/Generators.java rename to tools/src/mindustry/tools/Generators.java index e1ad420f50..d49a55e452 100644 --- a/tools/src/io/anuke/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -1,20 +1,20 @@ -package io.anuke.mindustry.tools; +package mindustry.tools; -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.math.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.noise.*; -import io.anuke.mindustry.ctype.*; -import io.anuke.mindustry.tools.ImagePacker.*; -import io.anuke.mindustry.type.*; -import io.anuke.mindustry.ui.*; -import io.anuke.mindustry.world.*; -import io.anuke.mindustry.world.blocks.*; +import arc.struct.*; +import arc.files.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import arc.util.*; +import arc.util.noise.*; +import mindustry.ctype.*; +import mindustry.tools.ImagePacker.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.*; +import mindustry.world.blocks.*; -import static io.anuke.mindustry.Vars.*; +import static mindustry.Vars.*; public class Generators{ diff --git a/tools/src/io/anuke/mindustry/tools/Image.java b/tools/src/mindustry/tools/Image.java similarity index 94% rename from tools/src/io/anuke/mindustry/tools/Image.java rename to tools/src/mindustry/tools/Image.java index f7c987762b..0407783614 100644 --- a/tools/src/io/anuke/mindustry/tools/Image.java +++ b/tools/src/mindustry/tools/Image.java @@ -1,9 +1,9 @@ -package io.anuke.mindustry.tools; +package mindustry.tools; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.TextureRegion; -import io.anuke.arc.util.Structs; -import io.anuke.mindustry.tools.ImagePacker.GenRegion; +import arc.graphics.Color; +import arc.graphics.g2d.TextureRegion; +import arc.util.Structs; +import mindustry.tools.ImagePacker.GenRegion; import javax.imageio.ImageIO; import java.awt.*; diff --git a/tools/src/io/anuke/mindustry/tools/ImagePacker.java b/tools/src/mindustry/tools/ImagePacker.java similarity index 92% rename from tools/src/io/anuke/mindustry/tools/ImagePacker.java rename to tools/src/mindustry/tools/ImagePacker.java index 226155a245..74ff81e9b0 100644 --- a/tools/src/io/anuke/mindustry/tools/ImagePacker.java +++ b/tools/src/mindustry/tools/ImagePacker.java @@ -1,14 +1,14 @@ -package io.anuke.mindustry.tools; +package mindustry.tools; -import io.anuke.arc.*; -import io.anuke.arc.collection.*; -import io.anuke.arc.files.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.graphics.g2d.TextureAtlas.*; -import io.anuke.arc.util.*; -import io.anuke.arc.util.Log.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.core.*; +import arc.*; +import arc.struct.*; +import arc.files.*; +import arc.graphics.g2d.*; +import arc.graphics.g2d.TextureAtlas.*; +import arc.util.*; +import arc.util.Log.*; +import mindustry.*; +import mindustry.core.*; import javax.imageio.*; import java.awt.image.*; diff --git a/tools/src/io/anuke/mindustry/tools/ScriptStubGenerator.java b/tools/src/mindustry/tools/ScriptStubGenerator.java similarity index 78% rename from tools/src/io/anuke/mindustry/tools/ScriptStubGenerator.java rename to tools/src/mindustry/tools/ScriptStubGenerator.java index c2110eb4e1..d13bbbdd49 100644 --- a/tools/src/io/anuke/mindustry/tools/ScriptStubGenerator.java +++ b/tools/src/mindustry/tools/ScriptStubGenerator.java @@ -1,15 +1,15 @@ -package io.anuke.mindustry.tools; +package mindustry.tools; -import io.anuke.arc.*; -import io.anuke.arc.collection.Array; -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.g2d.TextureAtlas.*; -import io.anuke.arc.math.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.gen.*; +import arc.*; +import arc.struct.Array; +import arc.struct.*; +import arc.files.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.graphics.g2d.TextureAtlas.*; +import arc.math.*; +import arc.util.*; +import mindustry.gen.*; import org.reflections.*; import org.reflections.scanners.*; import org.reflections.util.*; @@ -21,7 +21,7 @@ import java.util.*; public class ScriptStubGenerator{ public static void main(String[] args){ - String base = "io.anuke.mindustry"; + String base = "mindustry"; Array blacklist = Array.with("plugin", "mod", "net", "io", "tools"); Array nameBlacklist = Array.with("ClientLauncher", "NetClient", "NetServer", "ClassAccess"); Array> whitelist = Array.with(Draw.class, Fill.class, Lines.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class, @@ -29,9 +29,9 @@ public class ScriptStubGenerator{ Sounds.class, Musics.class, Call.class, Texture.class, TextureData.class, Pixmap.class, I18NBundle.class); Array nopackage = Array.with("java.lang", "java"); - String fileTemplate = "package io.anuke.mindustry.mod;\n" + + String fileTemplate = "package mindustry.mod;\n" + "\n" + - "import io.anuke.arc.collection.*;\n" + + "import arc.struct.*;\n" + "//obviously autogenerated, do not touch\n" + "public class ClassAccess{\n" + "\tpublic static final ObjectSet allowedClassNames = ObjectSet.with($ALLOWED_CLASS_NAMES$);\n" + @@ -45,10 +45,10 @@ public class ScriptStubGenerator{ .setScanners(new SubTypesScanner(false), new ResourcesScanner()) .setUrls(ClasspathHelper.forClassLoader(classLoadersList.toArray(new ClassLoader[0]))) .filterInputsBy(new FilterBuilder() - .include(FilterBuilder.prefix("io.anuke.mindustry")) - .include(FilterBuilder.prefix("io.anuke.arc.func")) - .include(FilterBuilder.prefix("io.anuke.arc.collection")) - .include(FilterBuilder.prefix("io.anuke.arc.scene")) + .include(FilterBuilder.prefix("mindustry")) + .include(FilterBuilder.prefix("arc.func")) + .include(FilterBuilder.prefix("arc.struct")) + .include(FilterBuilder.prefix("arc.scene")) )); Array> classes = Array.with(reflections.getSubTypesOf(Object.class)); @@ -72,7 +72,7 @@ public class ScriptStubGenerator{ //Log.info(result); new Fi("core/assets/scripts/global.js").writeString(result.toString()); - new Fi("core/src/io/anuke/mindustry/mod/ClassAccess.java").writeString(fileTemplate + new Fi("core/src/mindustry/mod/ClassAccess.java").writeString(fileTemplate .replace("$ALLOWED_CLASSES$", classes.toString(", ", type -> type.getName() + ".class")) .replace("$ALLOWED_CLASS_NAMES$", classes.toString(", ", type -> "\"" + type.getName() + "\""))); } diff --git a/tools/src/io/anuke/mindustry/tools/SquareMarcher.java b/tools/src/mindustry/tools/SquareMarcher.java similarity index 94% rename from tools/src/io/anuke/mindustry/tools/SquareMarcher.java rename to tools/src/mindustry/tools/SquareMarcher.java index de5f142df5..2261260b46 100644 --- a/tools/src/io/anuke/mindustry/tools/SquareMarcher.java +++ b/tools/src/mindustry/tools/SquareMarcher.java @@ -1,14 +1,14 @@ -package io.anuke.mindustry.tools; +package mindustry.tools; -import io.anuke.arc.Core; -import io.anuke.arc.files.Fi; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.Pixmap; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.Fill; -import io.anuke.arc.graphics.glutils.FrameBuffer; -import io.anuke.arc.util.ScreenUtils; -import io.anuke.arc.util.Tmp; +import arc.Core; +import arc.files.Fi; +import arc.graphics.Color; +import arc.graphics.Pixmap; +import arc.graphics.g2d.Draw; +import arc.graphics.g2d.Fill; +import arc.graphics.gl.FrameBuffer; +import arc.util.ScreenUtils; +import arc.util.Tmp; public class SquareMarcher{ final int resolution; diff --git a/tools/src/io/anuke/mindustry/tools/Upscaler.java b/tools/src/mindustry/tools/Upscaler.java similarity index 82% rename from tools/src/io/anuke/mindustry/tools/Upscaler.java rename to tools/src/mindustry/tools/Upscaler.java index 6ba497ff98..de83fad5c0 100644 --- a/tools/src/io/anuke/mindustry/tools/Upscaler.java +++ b/tools/src/mindustry/tools/Upscaler.java @@ -1,12 +1,12 @@ -package io.anuke.mindustry.tools; +package mindustry.tools; -import io.anuke.arc.*; -import io.anuke.arc.backends.sdl.*; -import io.anuke.arc.files.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.ui.*; +import arc.*; +import arc.backend.sdl.*; +import arc.files.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.util.*; +import mindustry.ui.*; public class Upscaler{ public static void main(String[] args){