Initial creation of Arc port

android/AndroidManifest.xml

@@ -17,6 +17,7 @@
             android:appCategory="game"
             android:label="@string/app_name"
             android:theme="@style/GdxTheme" android:fullBackupContent="@xml/backup_rules">
+        <meta-data android:name="android.max_aspect" android:value="2.1" />
         <activity
             android:name="io.anuke.mindustry.AndroidLauncher"
             android:label="@string/app_name"

android/build.gradle

@@ -43,7 +43,6 @@ dependencies {
     natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a"
     natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"
     natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64"
-    implementation "com.badlogicgames.gdx:gdx-controllers-android:$gdxVersion"
 }
 
 task deploy(type: Copy){

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

@@ -4,7 +4,7 @@ import com.badlogic.gdx.backends.android.AndroidApplication;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-public class PatchedAndroidApplication extends AndroidApplication {
+public abstract class PatchedAndroidApplication extends AndroidApplication {
     private final ExecutorService exec = Executors.newSingleThreadExecutor();
 
     @Override

build.gradle

@@ -168,19 +168,21 @@ project(":core"){
         def comp = System.properties["release"] == null || System.properties["release"] == "false"
         if(!comp) println("Note: Compiling release build.")
 
-        if(new File(projectDir.parent, '../uCore').exists() && comp){
+        if(new File(projectDir.parent, '../Arc').exists() && comp){
-            compile project(":uCore")
+            compile project(":Arc:core")
         }else{
-            compile "com.github.anuken:ucore:$uCoreVersion"
+            //TODO compile arc from jitpack
+            //compile 'com.github.Anuken.Arc:arc:-SNAPSHOT'
         }
 
-        if(new File(projectDir.parent, '../GDXGifRecorder').exists() && comp){
+       // if(new File(projectDir.parent, '../GDXGifRecorder').exists() && comp){
-            compile project(":GDXGifRecorder")
+       //     compile project(":GDXGifRecorder")
-        }
+       // }
 
-        compile "com.badlogicgames.gdx:gdx:$gdxVersion"
+
-        compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion"
+        //compile "com.badlogicgames.gdx:gdx:$gdxVersion"
-        compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
+        //compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion"
+        //compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
 
         compileOnly project(":annotations")
         annotationProcessor project(":annotations")

core/src/io/anuke/mindustry/Vars.java

@@ -1,9 +1,9 @@
 package io.anuke.mindustry;
 
-import com.badlogic.gdx.Application.ApplicationType;
+import io.anuke.arc.Application.ApplicationType;
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.files.FileHandle;
+import io.anuke.arc.files.FileHandle;
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.core.*;
 import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.entities.TileEntity;
@@ -128,7 +128,7 @@ public class Vars{
         Serialization.init();
 
         //load locales
-        String[] stra = Gdx.files.internal("locales").readString().split("\n");
+        String[] stra = Core.files.internal("locales").readString().split("\n");
         locales = new Locale[stra.length];
         for(int i = 0; i < locales.length; i++){
             String code = stra[i];
@@ -169,9 +169,9 @@ public class Vars{
         state = new GameState();
         threads = new ThreadHandler();
 
-        mobile = Gdx.app.getType() == ApplicationType.Android || Gdx.app.getType() == ApplicationType.iOS || testMobile;
+        mobile = Core.app.getType() == ApplicationType.Android || Core.app.getType() == ApplicationType.iOS || testMobile;
-        ios = Gdx.app.getType() == ApplicationType.iOS;
+        ios = Core.app.getType() == ApplicationType.iOS;
-        android = Gdx.app.getType() == ApplicationType.Android;
+        android = Core.app.getType() == ApplicationType.Android;
 
         dataDirectory = Settings.getDataDirectory(appName);
         screenshotDirectory = dataDirectory.child("screenshots/");

core/src/io/anuke/mindustry/ai/BlockIndexer.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.ai;
 
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
-import com.badlogic.gdx.utils.*;
+import io.anuke.arc.utils.*;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;

core/src/io/anuke/mindustry/ai/Pathfinder.java

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.ai;
 
-import com.badlogic.gdx.math.GridPoint2;
+import io.anuke.arc.math.GridPoint2;
-import com.badlogic.gdx.utils.IntArray;
+import io.anuke.arc.utils.IntArray;
-import com.badlogic.gdx.utils.Queue;
+import io.anuke.arc.utils.Queue;
-import com.badlogic.gdx.utils.TimeUtils;
+import io.anuke.arc.utils.TimeUtils;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
 import io.anuke.mindustry.game.EventType.WorldLoadEvent;
 import io.anuke.mindustry.game.Team;

core/src/io/anuke/mindustry/ai/WaveSpawner.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.ai;
 
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.units.BaseUnit;
 import io.anuke.mindustry.entities.units.Squad;

core/src/io/anuke/mindustry/content/Items.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.Item;

core/src/io/anuke/mindustry/content/Liquids.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.Liquid;

core/src/io/anuke/mindustry/content/Mechs.java

@@ -1,8 +1,8 @@
 package io.anuke.mindustry.content;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
 import io.anuke.mindustry.content.fx.BulletFx;
 import io.anuke.mindustry.content.fx.UnitFx;
 import io.anuke.mindustry.entities.Player;

core/src/io/anuke/mindustry/content/UnitTypes.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.content;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.utils.ObjectSet;
+import io.anuke.arc.utils.ObjectSet;
 import io.anuke.mindustry.entities.units.UnitType;
 import io.anuke.mindustry.entities.units.types.*;
 import io.anuke.mindustry.game.ContentList;

core/src/io/anuke/mindustry/content/blocks/Blocks.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.blocks;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.Liquids;
 import io.anuke.mindustry.content.StatusEffects;

core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.blocks;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.Liquids;
 import io.anuke.mindustry.content.fx.BlockFx;

core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.blocks;
 
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.Liquids;

core/src/io/anuke/mindustry/content/blocks/OreBlocks.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.blocks;
 
-import com.badlogic.gdx.utils.ObjectMap;
+import io.anuke.arc.utils.ObjectMap;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.blocks.Floor;

core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.blocks;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.Liquids;
 import io.anuke.mindustry.content.fx.BlockFx;

core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.content.blocks;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.mindustry.content.AmmoTypes;
 import io.anuke.mindustry.content.fx.ShootFx;
 import io.anuke.mindustry.type.AmmoType;

core/src/io/anuke/mindustry/content/bullets/MissileBullets.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.bullets;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.content.fx.BulletFx;
 import io.anuke.mindustry.entities.bullet.Bullet;
 import io.anuke.mindustry.entities.bullet.BulletType;

core/src/io/anuke/mindustry/content/bullets/StandardBullets.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.bullets;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.content.fx.BulletFx;
 import io.anuke.mindustry.entities.bullet.BasicBulletType;
 import io.anuke.mindustry.entities.bullet.BulletType;

core/src/io/anuke/mindustry/content/bullets/TurretBullets.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.bullets;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.content.Liquids;
 import io.anuke.mindustry.content.StatusEffects;
 import io.anuke.mindustry.content.fx.BlockFx;

core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.bullets;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.content.Liquids;
 import io.anuke.mindustry.content.fx.BlockFx;
 import io.anuke.mindustry.content.fx.BulletFx;

core/src/io/anuke/mindustry/content/fx/BlockFx.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.fx;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;

core/src/io/anuke/mindustry/content/fx/BulletFx.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.fx;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.ucore.core.Effects.Effect;

core/src/io/anuke/mindustry/content/fx/EnvironmentFx.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.fx;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.content.Liquids;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.graphics.Palette;

core/src/io/anuke/mindustry/content/fx/ExplosionFx.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.fx;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.ucore.core.Effects.Effect;

core/src/io/anuke/mindustry/content/fx/Fx.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.fx;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.ucore.core.Effects.Effect;

core/src/io/anuke/mindustry/content/fx/ShootFx.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content.fx;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;

core/src/io/anuke/mindustry/core/ContentLoader.java

@@ -1,8 +1,8 @@
 package io.anuke.mindustry.core;
 
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.ObjectMap;
+import io.anuke.arc.utils.ObjectMap;
-import com.badlogic.gdx.utils.ObjectSet;
+import io.anuke.arc.utils.ObjectSet;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.content.blocks.*;
 import io.anuke.mindustry.content.bullets.*;

core/src/io/anuke/mindustry/core/Control.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.core;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.content.Mechs;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.Player;
@@ -54,7 +54,7 @@ public class Control extends Module{
 
         Inputs.useControllers(true);
 
-        Gdx.input.setCatchBackKey(true);
+        Core.input.setCatchBackKey(true);
 
         Effects.setShakeFalloff(10000f);
 
@@ -99,7 +99,7 @@ public class Control extends Module{
 
         Events.on(WorldLoadGraphicsEvent.class, event -> {
             if(mobile){
-                Gdx.app.postRunnable(() -> Core.camera.position.set(players[0].x, players[0].y, 0));
+                Core.app.postRunnable(() -> Core.camera.position.set(players[0].x, players[0].y, 0));
             }
         });
 

core/src/io/anuke/mindustry/core/Logic.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.core;
 
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.Vars;

core/src/io/anuke/mindustry/core/NetClient.java

@@ -1,10 +1,10 @@
 package io.anuke.mindustry.core;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.utils.Base64Coder;
+import io.anuke.arc.utils.Base64Coder;
-import com.badlogic.gdx.utils.IntSet;
+import io.anuke.arc.utils.IntSet;
-import com.badlogic.gdx.utils.TimeUtils;
+import io.anuke.arc.utils.TimeUtils;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.PacketPriority;
 import io.anuke.annotations.Annotations.Remote;
@@ -369,7 +369,7 @@ public class NetClient extends Module{
         ui.loadfrag.hide();
         ui.join.hide();
         Net.setClientLoaded(true);
-        Gdx.app.postRunnable(Call::connectConfirm);
+        Core.app.postRunnable(Call::connectConfirm);
         Timers.runTask(40f, Platform.instance::updateRPC);
     }
 

core/src/io/anuke/mindustry/core/NetServer.java

@@ -1,13 +1,13 @@
 package io.anuke.mindustry.core;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.Colors;
+import io.anuke.arc.graphics.Colors;
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.IntMap;
+import io.anuke.arc.utils.IntMap;
-import com.badlogic.gdx.utils.ObjectSet;
+import io.anuke.arc.utils.ObjectSet;
-import com.badlogic.gdx.utils.TimeUtils;
+import io.anuke.arc.utils.TimeUtils;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.Mechs;

core/src/io/anuke/mindustry/core/Platform.java

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.core;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.Input.Keys;
+import io.anuke.arc.Input.Keys;
-import com.badlogic.gdx.files.FileHandle;
+import io.anuke.arc.files.FileHandle;
-import com.badlogic.gdx.utils.Base64Coder;
+import io.anuke.arc.utils.Base64Coder;
 import io.anuke.ucore.core.Core;
 import io.anuke.ucore.core.Settings;
 import io.anuke.ucore.core.Timers;
@@ -39,8 +39,8 @@ public abstract class Platform {
                     .visible(() -> !use[0].getSelection().isEmpty()).width(65f);
 
             dialog.content().addImageButton("icon-paste", "clear", 16*3, () ->
-                    use[0].paste(Gdx.app.getClipboard().getContents(), false))
+                    use[0].paste(Core.app.getClipboard().getContents(), false))
-                    .visible(() -> Gdx.app.getClipboard() != null && Gdx.app.getClipboard().getContents() != null && !Gdx.app.getClipboard().getContents().isEmpty()).width(65f);
+                    .visible(() -> Core.app.getClipboard() != null && Core.app.getClipboard().getContents() != null && !Core.app.getClipboard().getContents().isEmpty()).width(65f);
 
             TextField to = dialog.content().addField(field.getText(), t-> {}).pad(15).width(250f).get();
             to.setMaxLength(maxLength);
@@ -53,14 +53,14 @@ public abstract class Platform {
                 field.appendText(to.getText());
                 field.change();
                 dialog.hide();
-                Gdx.input.setOnscreenKeyboardVisible(false);
+                Core.input.setOnscreenKeyboardVisible(false);
             }).width(90f).name("okb");
 
             dialog.show();
             Timers.runTask(1f, () -> {
                 to.setCursorPosition(to.getText().length());
                 Core.scene.setKeyboardFocus(to);
-                Gdx.input.setOnscreenKeyboardVisible(true);
+                Core.input.setOnscreenKeyboardVisible(true);
             });
         });
     }

core/src/io/anuke/mindustry/core/Renderer.java

@@ -1,16 +1,16 @@
 package io.anuke.mindustry.core;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.files.FileHandle;
+import io.anuke.arc.files.FileHandle;
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.Pixmap;
+import io.anuke.arc.graphics.Pixmap;
-import com.badlogic.gdx.graphics.PixmapIO;
+import io.anuke.arc.graphics.PixmapIO;
-import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import io.anuke.arc.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
-import com.badlogic.gdx.utils.BufferUtils;
+import io.anuke.arc.utils.BufferUtils;
-import com.badlogic.gdx.utils.ScreenUtils;
+import io.anuke.arc.utils.ScreenUtils;
-import com.badlogic.gdx.utils.TimeUtils;
+import io.anuke.arc.utils.TimeUtils;
 import io.anuke.mindustry.content.fx.Fx;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.Player;
@@ -173,11 +173,11 @@ public class Renderer extends RendererModule{
                 camera.position.set((int) camera.position.x, (int) camera.position.y, 0);
             }
 
-            if(Gdx.graphics.getHeight() / Core.cameraScale % 2 == 1){
+            if(Core.graphics.getHeight() / Core.cameraScale % 2 == 1){
                 camera.position.add(0, -0.5f, 0);
             }
 
-            if(Gdx.graphics.getWidth() / Core.cameraScale % 2 == 1){
+            if(Core.graphics.getWidth() / Core.cameraScale % 2 == 1){
                 camera.position.add(-0.5f, 0, 0);
             }
 
@@ -187,7 +187,7 @@ public class Renderer extends RendererModule{
         }
 
         if(!ui.chatfrag.chatOpen()){
-            renderer.record(); //this only does something if GdxGifRecorder is on the class path, which it usually isn't
+            renderer.record(); //this only does something if CoreGifRecorder is on the class path, which it usually isn't
         }
     }
 

core/src/io/anuke/mindustry/core/ThreadHandler.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.core;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.utils.TimeUtils;
+import io.anuke.arc.utils.TimeUtils;
 import io.anuke.ucore.core.Settings;
 import io.anuke.ucore.core.Timers;
 
@@ -10,7 +10,7 @@ public class ThreadHandler{
 
     public ThreadHandler(){
         Timers.setDeltaProvider(() -> {
-            float result = Gdx.graphics.getDeltaTime() * 60f;
+            float result = Core.graphics.getDeltaTime() * 60f;
             return Float.isNaN(result) || Float.isInfinite(result) ? 1f : Math.min(result, 60f / 10f);
         });
     }
@@ -24,11 +24,11 @@ public class ThreadHandler{
     }
 
     public void runDelay(Runnable r){
-        Gdx.app.postRunnable(r);
+        Core.app.postRunnable(r);
     }
 
     public long getFrameID(){
-        return Gdx.graphics.getFrameId();
+        return Core.graphics.getFrameId();
     }
 
     public void handleBeginRender(){

core/src/io/anuke/mindustry/core/UI.java

@@ -1,14 +1,14 @@
 package io.anuke.mindustry.core;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.Input.Keys;
+import io.anuke.arc.Input.Keys;
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.Colors;
+import io.anuke.arc.graphics.Colors;
-import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import io.anuke.arc.graphics.g2d.BitmapFont;
-import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
+import io.anuke.arc.graphics.g2d.freetype.FreeTypeFontGenerator;
-import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter;
+import io.anuke.arc.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter;
-import com.badlogic.gdx.math.Interpolation;
+import io.anuke.arc.math.Interpolation;
-import com.badlogic.gdx.utils.Align;
+import io.anuke.arc.utils.Align;
 import io.anuke.mindustry.editor.MapEditorDialog;
 import io.anuke.mindustry.game.EventType.ResizeEvent;
 import io.anuke.mindustry.graphics.Palette;
@@ -70,7 +70,7 @@ public class UI extends SceneModule{
         Dialog.setShowAction(() -> sequence(
             alpha(0f),
             originCenter(),
-            moveToAligned(Gdx.graphics.getWidth() / 2f, Gdx.graphics.getHeight() / 2f, Align.center),
+            moveToAligned(Core.graphics.getWidth() / 2f, Core.graphics.getHeight() / 2f, Align.center),
             scaleTo(0.0f, 1f),
             parallel(
                 scaleTo(1f, 1f, 0.1f, Interpolation.fade),
@@ -96,7 +96,7 @@ public class UI extends SceneModule{
     }
     
     void generateFonts(){
-        generator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/pixel.ttf"));
+        generator = new FreeTypeFontGenerator(Core.files.internal("fonts/pixel.ttf"));
         FreeTypeFontParameter param = new FreeTypeFontParameter();
         param.size = (int)(14*2 * Math.max(Unit.dp.scl(1f), 0.5f));
         param.shadowColor = Color.DARK_GRAY;
@@ -113,7 +113,7 @@ public class UI extends SceneModule{
     protected void loadSkin(){
         skin = new Skin(Core.atlas);
         generateFonts();
-        skin.load(Gdx.files.internal("ui/uiskin.json"));
+        skin.load(Core.files.internal("ui/uiskin.json"));
 
         for(BitmapFont font : skin.getAll(BitmapFont.class).values()){
             font.setUseIntegerPositions(true);
@@ -139,7 +139,7 @@ public class UI extends SceneModule{
 
                 float scl = Unit.dp.scl(3f);
 
-                Draw.rect("controller-cursor", input.getMouseX(), Gdx.graphics.getHeight() - input.getMouseY(), 16 * scl, 16 * scl);
+                Draw.rect("controller-cursor", input.getMouseX(), Core.graphics.getHeight() - input.getMouseY(), 16 * scl, 16 * scl);
             }
         }
 

core/src/io/anuke/mindustry/core/World.java

@@ -1,8 +1,8 @@
 package io.anuke.mindustry.core;
 
-import com.badlogic.gdx.math.GridPoint2;
+import io.anuke.arc.math.GridPoint2;
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.ObjectMap;
+import io.anuke.arc.utils.ObjectMap;
 import io.anuke.mindustry.ai.BlockIndexer;
 import io.anuke.mindustry.ai.Pathfinder;
 import io.anuke.mindustry.ai.WaveSpawner;

core/src/io/anuke/mindustry/editor/DrawOperation.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.editor;
 
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.IntSet;
+import io.anuke.arc.utils.IntSet;
 import io.anuke.mindustry.maps.MapTileData;
 import io.anuke.mindustry.maps.MapTileData.TileDataMarker;
 import io.anuke.ucore.util.Bits;

core/src/io/anuke/mindustry/editor/EditorTool.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.editor;
 
-import com.badlogic.gdx.utils.IntArray;
+import io.anuke.arc.utils.IntArray;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.maps.MapTileData;
 import io.anuke.mindustry.maps.MapTileData.DataPosition;

core/src/io/anuke/mindustry/editor/MapEditor.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.editor;
 
-import com.badlogic.gdx.utils.ObjectMap;
+import io.anuke.arc.utils.ObjectMap;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.editor.DrawOperation.TileOperation;

core/src/io/anuke/mindustry/editor/MapEditorDialog.java

@@ -1,15 +1,15 @@
 package io.anuke.mindustry.editor;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.files.FileHandle;
+import io.anuke.arc.files.FileHandle;
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.Pixmap;
+import io.anuke.arc.graphics.Pixmap;
-import com.badlogic.gdx.graphics.g2d.Batch;
+import io.anuke.arc.graphics.g2d.Batch;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
-import com.badlogic.gdx.utils.Align;
+import io.anuke.arc.utils.Align;
-import com.badlogic.gdx.utils.Disposable;
+import io.anuke.arc.utils.Disposable;
-import com.badlogic.gdx.utils.ObjectMap;
+import io.anuke.arc.utils.ObjectMap;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.blocks.StorageBlocks;
 import io.anuke.mindustry.core.Platform;
@@ -341,8 +341,8 @@ public class MapEditorDialog extends Dialog implements Disposable{
     public void build(){
         float amount = 10f, baseSize = 60f;
 
-        float size = mobile ? (int) (Math.min(Gdx.graphics.getHeight(), Gdx.graphics.getWidth()) / amount / Unit.dp.scl(1f)) :
+        float size = mobile ? (int) (Math.min(Core.graphics.getHeight(), Core.graphics.getWidth()) / amount / Unit.dp.scl(1f)) :
-                Math.min(Gdx.graphics.getDisplayMode().height / amount, baseSize);
+                Math.min(Core.graphics.getDisplayMode().height / amount, baseSize);
 
         clearChildren();
         table(cont -> {

core/src/io/anuke/mindustry/editor/MapInfoDialog.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.editor;
 
-import com.badlogic.gdx.utils.ObjectMap;
+import io.anuke.arc.utils.ObjectMap;
 import io.anuke.mindustry.core.Platform;
 import io.anuke.mindustry.ui.dialogs.FloatingDialog;
 import io.anuke.ucore.core.Settings;

core/src/io/anuke/mindustry/editor/MapLoadDialog.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.editor;
 
-import com.badlogic.gdx.utils.Scaling;
+import io.anuke.arc.utils.Scaling;
 import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.ui.BorderImage;
 import io.anuke.mindustry.ui.dialogs.FloatingDialog;

core/src/io/anuke/mindustry/editor/MapRenderer.java

@@ -1,11 +1,11 @@
 package io.anuke.mindustry.editor;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.math.GridPoint2;
+import io.anuke.arc.math.GridPoint2;
-import com.badlogic.gdx.utils.Disposable;
+import io.anuke.arc.utils.Disposable;
-import com.badlogic.gdx.utils.IntSet;
+import io.anuke.arc.utils.IntSet;
-import com.badlogic.gdx.utils.IntSet.IntSetIterator;
+import io.anuke.arc.utils.IntSet.IntSetIterator;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.maps.MapTileData.DataPosition;
 import io.anuke.mindustry.world.Block;

core/src/io/anuke/mindustry/editor/MapView.java

@@ -1,15 +1,15 @@
 package io.anuke.mindustry.editor;
 
-import com.badlogic.gdx.Input.Buttons;
+import io.anuke.arc.Input.Buttons;
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.Batch;
+import io.anuke.arc.graphics.g2d.Batch;
-import com.badlogic.gdx.input.GestureDetector;
+import io.anuke.arc.input.GestureDetector;
-import com.badlogic.gdx.input.GestureDetector.GestureListener;
+import io.anuke.arc.input.GestureDetector.GestureListener;
-import com.badlogic.gdx.math.Bresenham2;
+import io.anuke.arc.math.Bresenham2;
-import com.badlogic.gdx.math.GridPoint2;
+import io.anuke.arc.math.GridPoint2;
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
 import io.anuke.mindustry.editor.DrawOperation.TileOperation;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.ui.GridImage;

core/src/io/anuke/mindustry/editor/OperationStack.java

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

core/src/io/anuke/mindustry/entities/Damage.java

@@ -1,8 +1,8 @@
 package io.anuke.mindustry.entities;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
 import io.anuke.mindustry.content.bullets.TurretBullets;
 import io.anuke.mindustry.content.fx.ExplosionFx;
 import io.anuke.mindustry.content.fx.Fx;

core/src/io/anuke/mindustry/entities/Player.java

@@ -1,11 +1,11 @@
 package io.anuke.mindustry.entities;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import io.anuke.arc.graphics.g2d.GlyphLayout;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
-import com.badlogic.gdx.utils.Queue;
+import io.anuke.arc.utils.Queue;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.Mechs;

core/src/io/anuke/mindustry/entities/Predict.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.entities;
 
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
 import io.anuke.mindustry.entities.traits.TargetTrait;
 import io.anuke.ucore.util.Mathf;
 

core/src/io/anuke/mindustry/entities/StatusController.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.entities;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
 import io.anuke.mindustry.content.StatusEffects;
 import io.anuke.mindustry.entities.traits.Saveable;
 import io.anuke.mindustry.type.ContentType;

core/src/io/anuke/mindustry/entities/TileEntity.java

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.entities;
 
-import com.badlogic.gdx.math.GridPoint2;
+import io.anuke.arc.math.GridPoint2;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.ObjectSet;
+import io.anuke.arc.utils.ObjectSet;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.fx.Fx;

core/src/io/anuke/mindustry/entities/Unit.java

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.entities;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.game.Team;

core/src/io/anuke/mindustry/entities/Units.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.entities;
 
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
 import io.anuke.mindustry.entities.traits.TargetTrait;
 import io.anuke.mindustry.entities.units.BaseUnit;
 import io.anuke.mindustry.game.Team;

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

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.entities.bullet;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.mindustry.entities.Damage;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.traits.TargetTrait;

core/src/io/anuke/mindustry/entities/bullet/Bullet.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.entities.bullet;
 
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.entities.Unit;

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

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.entities.bullet;
 
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
 import io.anuke.mindustry.content.fx.BulletFx;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.ucore.core.Timers;

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

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.entities.bullet;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.math.GridPoint2;
+import io.anuke.arc.math.GridPoint2;
 import io.anuke.mindustry.content.fx.BulletFx;
 import io.anuke.mindustry.content.fx.Fx;
 import io.anuke.mindustry.entities.effect.Fire;

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

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.entities.bullet;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.content.fx.BulletFx;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.ucore.core.Effects;

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

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.entities.effect;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.entities.traits.BelowLiquidTrait;
 import io.anuke.ucore.entities.EntityGroup;
 import io.anuke.ucore.entities.impl.TimedEntity;

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

@@ -1,8 +1,8 @@
 package io.anuke.mindustry.entities.effect;
 
-import com.badlogic.gdx.math.GridPoint2;
+import io.anuke.arc.math.GridPoint2;
-import com.badlogic.gdx.utils.IntMap;
+import io.anuke.arc.utils.IntMap;
-import com.badlogic.gdx.utils.Pool.Poolable;
+import io.anuke.arc.utils.Pool.Poolable;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.StatusEffects;

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

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.entities.effect;
 
-import com.badlogic.gdx.math.Interpolation;
+import io.anuke.arc.math.Interpolation;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.entities.Unit;

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

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.entities.effect;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.IntSet;
+import io.anuke.arc.utils.IntSet;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.bullets.TurretBullets;

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

@@ -1,10 +1,10 @@
 package io.anuke.mindustry.entities.effect;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.math.GridPoint2;
+import io.anuke.arc.math.GridPoint2;
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
-import com.badlogic.gdx.utils.IntMap;
+import io.anuke.arc.utils.IntMap;
-import com.badlogic.gdx.utils.Pool.Poolable;
+import io.anuke.arc.utils.Pool.Poolable;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.Liquids;

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

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.entities.effect;
 
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.ucore.graphics.Draw;
 import io.anuke.ucore.util.Angles;

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

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.entities.traits;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.Queue;
+import io.anuke.arc.utils.Queue;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.content.fx.BlockFx;
@@ -251,7 +251,7 @@ public interface BuilderTrait extends Entity{
         }
 
         if(!current.initialized){
-            Gdx.app.postRunnable(() -> Events.fire(new BuildSelectEvent(tile, unit.getTeam(), this, current.breaking)));
+            Core.app.postRunnable(() -> Events.fire(new BuildSelectEvent(tile, unit.getTeam(), this, current.breaking)));
             current.initialized = true;
         }
     }

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

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.entities.traits;
 
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.ObjectIntMap;
+import io.anuke.arc.utils.ObjectIntMap;
 import io.anuke.ucore.function.Supplier;
 
 public interface TypeTrait{

core/src/io/anuke/mindustry/entities/units/BaseUnit.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.entities.units;
 
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.Vars;

core/src/io/anuke/mindustry/entities/units/FlyingUnit.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.entities.units;
 
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
 import io.anuke.mindustry.entities.Predict;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.traits.CarriableTrait;

core/src/io/anuke/mindustry/entities/units/GroundUnit.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.entities.units;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.entities.Predict;
 import io.anuke.mindustry.entities.TileEntity;

core/src/io/anuke/mindustry/entities/units/Squad.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.entities.units;
 
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
 import io.anuke.ucore.util.Translator;
 
 import static io.anuke.mindustry.Vars.threads;

core/src/io/anuke/mindustry/entities/units/UnitType.java

@@ -1,8 +1,8 @@
 package io.anuke.mindustry.entities.units;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.utils.ObjectSet;
+import io.anuke.arc.utils.ObjectSet;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.Weapons;
 import io.anuke.mindustry.entities.traits.TypeTrait;

core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.entities.units.types;
 
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.Vars;

core/src/io/anuke/mindustry/entities/units/types/Drone.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.entities.units.types;
 
-import com.badlogic.gdx.utils.Queue;
+import io.anuke.arc.utils.Queue;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.entities.TileEntity;

core/src/io/anuke/mindustry/game/Saves.java

@@ -1,10 +1,10 @@
 package io.anuke.mindustry.game;
 
-import com.badlogic.gdx.files.FileHandle;
+import io.anuke.arc.files.FileHandle;
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.IntArray;
+import io.anuke.arc.utils.IntArray;
-import com.badlogic.gdx.utils.IntMap;
+import io.anuke.arc.utils.IntMap;
-import com.badlogic.gdx.utils.TimeUtils;
+import io.anuke.arc.utils.TimeUtils;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.game.EventType.StateChangeEvent;
 import io.anuke.mindustry.io.SaveIO;

core/src/io/anuke/mindustry/game/Team.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.game;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.ucore.util.Bundles;
 
 public enum Team{

core/src/io/anuke/mindustry/game/Teams.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.game;
 
-import com.badlogic.gdx.utils.ObjectSet;
+import io.anuke.arc.utils.ObjectSet;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.ucore.util.EnumSet;

core/src/io/anuke/mindustry/game/UnlockableContent.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.game;
 
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.ucore.scene.ui.layout.Table;
 
 import static io.anuke.mindustry.Vars.control;

core/src/io/anuke/mindustry/game/Unlocks.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.game;
 
-import com.badlogic.gdx.utils.ObjectMap;
+import io.anuke.arc.utils.ObjectMap;
-import com.badlogic.gdx.utils.ObjectSet;
+import io.anuke.arc.utils.ObjectSet;
 import io.anuke.mindustry.game.EventType.UnlockEvent;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.ucore.core.Events;

core/src/io/anuke/mindustry/game/Version.java

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.game;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.files.FileHandle;
+import io.anuke.arc.files.FileHandle;
-import com.badlogic.gdx.utils.ObjectMap;
+import io.anuke.arc.utils.ObjectMap;
-import com.badlogic.gdx.utils.PropertiesUtils;
+import io.anuke.arc.utils.PropertiesUtils;
 import io.anuke.ucore.util.Strings;
 
 import java.io.IOException;
@@ -22,7 +22,7 @@ public class Version{
 
     public static void init(){
         try{
-            FileHandle file = Gdx.files.internal("version.properties");
+            FileHandle file = Core.files.internal("version.properties");
 
             ObjectMap<String, String> map = new ObjectMap<>();
             PropertiesUtils.load(map, file.reader());

core/src/io/anuke/mindustry/game/Waves.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.game;
 
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.StatusEffects;
 import io.anuke.mindustry.content.UnitTypes;

core/src/io/anuke/mindustry/graphics/BlockRenderer.java

@@ -1,8 +1,8 @@
 package io.anuke.mindustry.graphics;
 
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.IntSet;
+import io.anuke.arc.utils.IntSet;
-import com.badlogic.gdx.utils.Sort;
+import io.anuke.arc.utils.Sort;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
 import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent;

core/src/io/anuke/mindustry/graphics/CacheLayer.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.graphics;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 import io.anuke.ucore.core.Core;
 import io.anuke.ucore.core.Graphics;
 import io.anuke.ucore.graphics.Draw;

core/src/io/anuke/mindustry/graphics/FloorRenderer.java

@@ -1,13 +1,13 @@
 package io.anuke.mindustry.graphics;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.GL20;
+import io.anuke.arc.graphics.GL20;
-import com.badlogic.gdx.graphics.OrthographicCamera;
+import io.anuke.arc.graphics.OrthographicCamera;
-import com.badlogic.gdx.utils.IntArray;
+import io.anuke.arc.utils.IntArray;
-import com.badlogic.gdx.utils.IntSet;
+import io.anuke.arc.utils.IntSet;
-import com.badlogic.gdx.utils.IntSet.IntSetIterator;
+import io.anuke.arc.utils.IntSet.IntSetIterator;
-import com.badlogic.gdx.utils.ObjectSet;
+import io.anuke.arc.utils.ObjectSet;
 import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent;
 import io.anuke.mindustry.maps.Sector;
 import io.anuke.mindustry.world.Tile;
@@ -106,7 +106,7 @@ public class FloorRenderer{
         cbatch.setProjectionMatrix(Core.camera.combined);
         cbatch.beginDraw();
 
-        Gdx.gl.glEnable(GL20.GL_BLEND);
+        Core.gl.glEnable(GL20.GL_BLEND);
     }
 
     public void endDraw(){

core/src/io/anuke/mindustry/graphics/FogRenderer.java

@@ -1,14 +1,14 @@
 package io.anuke.mindustry.graphics;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.GL20;
+import io.anuke.arc.graphics.GL20;
-import com.badlogic.gdx.graphics.Pixmap.Format;
+import io.anuke.arc.graphics.Pixmap.Format;
-import com.badlogic.gdx.graphics.Texture;
+import io.anuke.arc.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.graphics.glutils.FrameBuffer;
+import io.anuke.arc.graphics.glutils.FrameBuffer;
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.Disposable;
+import io.anuke.arc.utils.Disposable;
 import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
 import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent;
@@ -72,8 +72,8 @@ public class FogRenderer implements Disposable{
 
         buffer.begin();
         pixelBuffer.position(0);
-        Gdx.gl.glPixelStorei(GL20.GL_PACK_ALIGNMENT, 1);
+        Core.gl.glPixelStorei(GL20.GL_PACK_ALIGNMENT, 1);
-        Gdx.gl.glReadPixels(0, 0, world.width(), world.height(), GL20.GL_RGBA, GL20.GL_UNSIGNED_BYTE, pixelBuffer);
+        Core.gl.glReadPixels(0, 0, world.width(), world.height(), GL20.GL_RGBA, GL20.GL_UNSIGNED_BYTE, pixelBuffer);
 
         pixelBuffer.position(0);
         for(int i = 0; i < world.width() * world.height(); i++){
@@ -162,7 +162,7 @@ public class FogRenderer implements Disposable{
         Graphics.shader();
 
         Graphics.setScreen();
-        Core.batch.draw(renderer.pixelSurface.texture(), 0, Gdx.graphics.getHeight(), Gdx.graphics.getWidth(), -Gdx.graphics.getHeight());
+        Core.batch.draw(renderer.pixelSurface.texture(), 0, Core.graphics.getHeight(), Core.graphics.getWidth(), -Core.graphics.getHeight());
         Graphics.end();
     }
 

core/src/io/anuke/mindustry/graphics/MinimapRenderer.java

@@ -1,13 +1,13 @@
 package io.anuke.mindustry.graphics;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.graphics.Pixmap;
+import io.anuke.arc.graphics.Pixmap;
-import com.badlogic.gdx.graphics.Pixmap.Format;
+import io.anuke.arc.graphics.Pixmap.Format;
-import com.badlogic.gdx.graphics.Texture;
+import io.anuke.arc.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.Disposable;
+import io.anuke.arc.utils.Disposable;
 import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
@@ -41,7 +41,7 @@ public class MinimapRenderer implements Disposable{
         });
 
         //make sure to call on the graphics thread
-        Events.on(TileChangeEvent.class, event -> Gdx.app.postRunnable(() -> update(event.tile)));
+        Events.on(TileChangeEvent.class, event -> Core.app.postRunnable(() -> update(event.tile)));
     }
 
     public Texture getTexture(){

core/src/io/anuke/mindustry/graphics/OverlayRenderer.java

@@ -1,10 +1,10 @@
 package io.anuke.mindustry.graphics;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.math.MathUtils;
+import io.anuke.arc.math.MathUtils;
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.entities.TileEntity;

core/src/io/anuke/mindustry/graphics/Palette.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.graphics;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
 
 public class Palette{
     public static final Color

core/src/io/anuke/mindustry/graphics/Shaders.java

@@ -1,8 +1,8 @@
 package io.anuke.mindustry.graphics;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.ucore.core.Core;
 import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.graphics.Draw;
@@ -54,8 +54,8 @@ public class Shaders{
         public void apply(){
             time = time % 158;
 
-            shader.setUniformf("u_resolution", Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
+            shader.setUniformf("u_resolution", Core.graphics.getWidth(), Core.graphics.getHeight());
-            shader.setUniformi("u_time", (int)(time += Gdx.graphics.getDeltaTime() * 60f));
+            shader.setUniformi("u_time", (int)(time += Core.graphics.getDeltaTime() * 60f));
             shader.setUniformf("u_uv", Draw.getBlankRegion().getU(), Draw.getBlankRegion().getV());
             shader.setUniformf("u_scl", Unit.dp.scl(1f));
             shader.setUniformf("u_uv2", Draw.getBlankRegion().getU2(), Draw.getBlankRegion().getV2());

core/src/io/anuke/mindustry/graphics/Trail.java

@@ -1,8 +1,8 @@
 package io.anuke.mindustry.graphics;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
-import com.badlogic.gdx.utils.FloatArray;
+import io.anuke.arc.utils.FloatArray;
 import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.graphics.Draw;
 import io.anuke.ucore.graphics.Fill;

core/src/io/anuke/mindustry/input/DefaultKeybinds.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.input;
 
-import com.badlogic.gdx.Application.ApplicationType;
+import io.anuke.arc.Application.ApplicationType;
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
 import io.anuke.ucore.core.Inputs.Axis;
 import io.anuke.ucore.core.Inputs.DeviceType;
 import io.anuke.ucore.core.KeyBinds;
@@ -31,7 +31,7 @@ public class DefaultKeybinds{
                 "zoom_hold", Input.CONTROL_LEFT,
                 "zoom", new Axis(Input.SCROLL),
                 "zoom_minimap", new Axis(Input.MINUS, Input.PLUS),
-                "menu", Gdx.app.getType() == ApplicationType.Android ? Input.BACK : Input.ESCAPE,
+                "menu", Core.app.getType() == ApplicationType.Android ? Input.BACK : Input.ESCAPE,
                 "pause", Input.SPACE,
                 "toggle_menus", Input.C,
                 "screenshot", Input.P,

core/src/io/anuke/mindustry/input/DesktopInput.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.input;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.Player;
@@ -71,8 +71,8 @@ public class DesktopInput extends InputHandler{
 
     @Override
     public void drawOutlined(){
-        int cursorX = tileX(Gdx.input.getX());
+        int cursorX = tileX(Core.input.getX());
-        int cursorY = tileY(Gdx.input.getY());
+        int cursorY = tileY(Core.input.getY());
 
         //draw selection(s)
         if(mode == placing && recipe != null){
@@ -169,7 +169,7 @@ public class DesktopInput extends InputHandler{
 
         rotation = Mathf.mod(rotation + (int) Inputs.getAxisTapped(section, "rotate"), 4);
 
-        Tile cursor = tileAt(Gdx.input.getX(), Gdx.input.getY());
+        Tile cursor = tileAt(Core.input.getX(), Core.input.getY());
 
         if(player.isDead()){
             cursorType = normal;
@@ -199,9 +199,9 @@ public class DesktopInput extends InputHandler{
     }
 
     void pollInput(){
-        Tile selected = tileAt(Gdx.input.getX(), Gdx.input.getY());
+        Tile selected = tileAt(Core.input.getX(), Core.input.getY());
-        int cursorX = tileX(Gdx.input.getX());
+        int cursorX = tileX(Core.input.getX());
-        int cursorY = tileY(Gdx.input.getY());
+        int cursorY = tileY(Core.input.getY());
 
         if(Inputs.keyTap(section, "deselect")){
             player.setMineTile(null);
@@ -232,8 +232,8 @@ public class DesktopInput extends InputHandler{
         }else if(Inputs.keyTap(section, "break") && !ui.hasMouse()){
             //is recalculated because setting the mode to breaking removes potential multiblock cursor offset
             mode = breaking;
-            selectX = tileX(Gdx.input.getX());
+            selectX = tileX(Core.input.getX());
-            selectY = tileY(Gdx.input.getY());
+            selectY = tileY(Core.input.getY());
         }
 
 
@@ -278,12 +278,12 @@ public class DesktopInput extends InputHandler{
 
     @Override
     public float getMouseX(){
-        return !controlling ? Gdx.input.getX() : controlx;
+        return !controlling ? Core.input.getX() : controlx;
     }
 
     @Override
     public float getMouseY(){
-        return !controlling ? Gdx.input.getY() : controly;
+        return !controlling ? Core.input.getY() : controly;
     }
 
     @Override
@@ -295,7 +295,7 @@ public class DesktopInput extends InputHandler{
     public void updateController(){
         //TODO no controller support
         //TODO move controller input to new class, ControllerInput
-        boolean mousemove = Gdx.input.getDeltaX() > 1 || Gdx.input.getDeltaY() > 1;
+        boolean mousemove = Core.input.getDeltaX() > 1 || Core.input.getDeltaY() > 1;
 
         if(state.is(State.menu)){
             droppingItem = false;
@@ -316,22 +316,22 @@ public class DesktopInput extends InputHandler{
                 controlling = true;
 
                 if(player.playerIndex == 0){
-                    Gdx.input.setCursorCatched(true);
+                    Core.input.setCursorCatched(true);
                 }
 
                 Inputs.getProcessor().touchDragged((int) getMouseX(), (int) getMouseY(), player.playerIndex);
             }
 
-            controlx = Mathf.clamp(controlx, 0, Gdx.graphics.getWidth());
+            controlx = Mathf.clamp(controlx, 0, Core.graphics.getWidth());
-            controly = Mathf.clamp(controly, 0, Gdx.graphics.getHeight());
+            controly = Mathf.clamp(controly, 0, Core.graphics.getHeight());
         }else{
             controlling = false;
-            Gdx.input.setCursorCatched(false);
+            Core.input.setCursorCatched(false);
         }
 
         if(!controlling){
-            controlx = Gdx.input.getX();
+            controlx = Core.input.getX();
-            controly = Gdx.input.getY();
+            controly = Core.input.getY();
         }
     }
 

core/src/io/anuke/mindustry/input/InputHandler.java

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.input;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.InputAdapter;
+import io.anuke.arc.InputAdapter;
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.content.blocks.Blocks;
@@ -130,11 +130,11 @@ public abstract class InputHandler extends InputAdapter{
     }
 
     public float getMouseX(){
-        return Gdx.input.getX();
+        return Core.input.getX();
     }
 
     public float getMouseY(){
-        return Gdx.input.getY();
+        return Core.input.getY();
     }
 
     public void resetCursor(){

core/src/io/anuke/mindustry/input/MobileInput.java

@@ -1,16 +1,16 @@
 package io.anuke.mindustry.input;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.arc.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.input.GestureDetector;
+import io.anuke.arc.input.GestureDetector;
-import com.badlogic.gdx.input.GestureDetector.GestureListener;
+import io.anuke.arc.input.GestureDetector.GestureListener;
-import com.badlogic.gdx.math.Interpolation;
+import io.anuke.arc.math.Interpolation;
-import com.badlogic.gdx.math.Rectangle;
+import io.anuke.arc.math.Rectangle;
-import com.badlogic.gdx.math.Vector2;
+import io.anuke.arc.math.Vector2;
-import com.badlogic.gdx.utils.Align;
+import io.anuke.arc.utils.Align;
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.ObjectSet;
+import io.anuke.arc.utils.ObjectSet;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.content.fx.Fx;
 import io.anuke.mindustry.core.GameState.State;
@@ -321,8 +321,8 @@ public class MobileInput extends InputHandler implements GestureListener{
 
         //Draw lines
         if(lineMode){
-            int tileX = tileX(Gdx.input.getX());
+            int tileX = tileX(Core.input.getX());
-            int tileY = tileY(Gdx.input.getY());
+            int tileY = tileY(Core.input.getY());
 
             //draw placing
             if(mode == placing && recipe != null){
@@ -615,7 +615,7 @@ public class MobileInput extends InputHandler implements GestureListener{
             lineScale = Mathf.lerpDelta(lineScale, 1f, 0.1f);
 
             //When in line mode, pan when near screen edges automatically
-            if(Gdx.input.isTouched(0) && lineMode){
+            if(Core.input.isTouched(0) && lineMode){
                 float screenX = Graphics.mouse().x, screenY = Graphics.mouse().y;
 
                 float panX = 0, panY = 0;
@@ -624,19 +624,19 @@ public class MobileInput extends InputHandler implements GestureListener{
                     panX = -(edgePan - screenX);
                 }
 
-                if(screenX >= Gdx.graphics.getWidth() - edgePan){
+                if(screenX >= Core.graphics.getWidth() - edgePan){
-                    panX = (screenX - Gdx.graphics.getWidth()) + edgePan;
+                    panX = (screenX - Core.graphics.getWidth()) + edgePan;
                 }
 
                 if(screenY <= edgePan){
                     panY = -(edgePan - screenY);
                 }
 
-                if(screenY >= Gdx.graphics.getHeight() - edgePan){
+                if(screenY >= Core.graphics.getHeight() - edgePan){
-                    panY = (screenY - Gdx.graphics.getHeight()) + edgePan;
+                    panY = (screenY - Core.graphics.getHeight()) + edgePan;
                 }
 
-                vector.set(panX, panY).scl((Core.camera.viewportWidth * Core.camera.zoom) / Gdx.graphics.getWidth());
+                vector.set(panX, panY).scl((Core.camera.viewportWidth * Core.camera.zoom) / Core.graphics.getWidth());
                 vector.limit(maxPanSpeed);
 
                 //pan view
@@ -663,7 +663,7 @@ public class MobileInput extends InputHandler implements GestureListener{
         if(!canPan) return false;
 
         //can't pan in line mode with one finger or while dropping items!
-        if((lineMode && !Gdx.input.isTouched(1)) || droppingItem){
+        if((lineMode && !Core.input.isTouched(1)) || droppingItem){
             return false;
         }
 

core/src/io/anuke/mindustry/io/BundleLoader.java

@@ -1,8 +1,8 @@
 package io.anuke.mindustry.io;
 
-import com.badlogic.gdx.Gdx;
+import io.anuke.arc.Core;
-import com.badlogic.gdx.files.FileHandle;
+import io.anuke.arc.files.FileHandle;
-import com.badlogic.gdx.utils.I18NBundle;
+import io.anuke.arc.utils.I18NBundle;
 import io.anuke.mindustry.Vars;
 import io.anuke.ucore.core.Core;
 import io.anuke.ucore.core.Settings;
@@ -42,7 +42,7 @@ public class BundleLoader{
         I18NBundle.setExceptionOnMissingKey(false);
         try{
             //try loading external bundle
-            FileHandle handle = Gdx.files.local("bundle");
+            FileHandle handle = Core.files.local("bundle");
 
             Locale locale = Locale.ENGLISH;
             Core.bundle = I18NBundle.createBundle(handle, locale);
@@ -54,7 +54,7 @@ public class BundleLoader{
         }catch(Throwable e){
             //no external bundle found
 
-            FileHandle handle = Gdx.files.internal("bundles/bundle");
+            FileHandle handle = Core.files.internal("bundles/bundle");
 
             Locale locale = getLocale();
             Locale.setDefault(locale);

core/src/io/anuke/mindustry/io/Changelogs.java

@@ -1,8 +1,8 @@
 package io.anuke.mindustry.io;
 
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.JsonReader;
+import io.anuke.arc.utils.JsonReader;
-import com.badlogic.gdx.utils.JsonValue;
+import io.anuke.arc.utils.JsonValue;
 import io.anuke.mindustry.net.Net;
 import io.anuke.ucore.function.Consumer;
 

core/src/io/anuke/mindustry/io/Contributors.java

@@ -1,8 +1,8 @@
 package io.anuke.mindustry.io;
 
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.JsonReader;
+import io.anuke.arc.utils.JsonReader;
-import com.badlogic.gdx.utils.JsonValue;
+import io.anuke.arc.utils.JsonValue;
 import io.anuke.mindustry.net.Net;
 import io.anuke.ucore.function.Consumer;
 

core/src/io/anuke/mindustry/io/MapIO.java

@@ -1,11 +1,11 @@
 package io.anuke.mindustry.io;
 
-import com.badlogic.gdx.graphics.Color;
+import io.anuke.arc.graphics.Color;
-import com.badlogic.gdx.graphics.Pixmap;
+import io.anuke.arc.graphics.Pixmap;
-import com.badlogic.gdx.graphics.Pixmap.Format;
+import io.anuke.arc.graphics.Pixmap.Format;
-import com.badlogic.gdx.utils.IntIntMap;
+import io.anuke.arc.utils.IntIntMap;
-import com.badlogic.gdx.utils.ObjectMap;
+import io.anuke.arc.utils.ObjectMap;
-import com.badlogic.gdx.utils.ObjectMap.Entry;
+import io.anuke.arc.utils.ObjectMap.Entry;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.content.blocks.StorageBlocks;
 import io.anuke.mindustry.game.Team;

core/src/io/anuke/mindustry/io/SaveFileVersion.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.io;
 
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.content.blocks.StorageBlocks;
 import io.anuke.mindustry.entities.traits.SaveTrait;

core/src/io/anuke/mindustry/io/SaveIO.java

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.io;
 
-import com.badlogic.gdx.files.FileHandle;
+import io.anuke.arc.files.FileHandle;
-import com.badlogic.gdx.utils.Array;
+import io.anuke.arc.utils.Array;
-import com.badlogic.gdx.utils.IntArray;
+import io.anuke.arc.utils.IntArray;
-import com.badlogic.gdx.utils.IntMap;
+import io.anuke.arc.utils.IntMap;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.io.versions.Save16;