diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index b0e4475812..989b5dd893 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -17,6 +17,7 @@ android:appCategory="game" android:label="@string/app_name" android:theme="@style/GdxTheme" android:fullBackupContent="@xml/backup_rules"> + { 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)); } }); diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java index 5f7035cb7e..9eb2fbf86a 100644 --- a/core/src/io/anuke/mindustry/core/Logic.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java index bf124f9be2..721b6e9bfc 100644 --- a/core/src/io/anuke/mindustry/core/NetClient.java +++ b/core/src/io/anuke/mindustry/core/NetClient.java @@ -1,10 +1,10 @@ package io.anuke.mindustry.core; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.utils.Base64Coder; -import com.badlogic.gdx.utils.IntSet; -import com.badlogic.gdx.utils.TimeUtils; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.utils.Base64Coder; +import io.anuke.arc.utils.IntSet; +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); } diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index a88ea19301..59fd981986 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -1,13 +1,13 @@ package io.anuke.mindustry.core; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.Colors; -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.IntMap; -import com.badlogic.gdx.utils.ObjectSet; -import com.badlogic.gdx.utils.TimeUtils; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.Colors; +import io.anuke.arc.math.Rectangle; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.IntMap; +import io.anuke.arc.utils.ObjectSet; +import io.anuke.arc.utils.TimeUtils; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.content.Mechs; diff --git a/core/src/io/anuke/mindustry/core/Platform.java b/core/src/io/anuke/mindustry/core/Platform.java index 0064c066c3..0199948965 100644 --- a/core/src/io/anuke/mindustry/core/Platform.java +++ b/core/src/io/anuke/mindustry/core/Platform.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.core; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.Input.Keys; -import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.utils.Base64Coder; +import io.anuke.arc.Core; +import io.anuke.arc.Input.Keys; +import io.anuke.arc.files.FileHandle; +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)) - .visible(() -> Gdx.app.getClipboard() != null && Gdx.app.getClipboard().getContents() != null && !Gdx.app.getClipboard().getContents().isEmpty()).width(65f); + use[0].paste(Core.app.getClipboard().getContents(), false)) + .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); }); }); } diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index df097fc0f9..2fccf2c520 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -1,16 +1,16 @@ package io.anuke.mindustry.core; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.Pixmap; -import com.badlogic.gdx.graphics.PixmapIO; -import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.BufferUtils; -import com.badlogic.gdx.utils.ScreenUtils; -import com.badlogic.gdx.utils.TimeUtils; +import io.anuke.arc.Core; +import io.anuke.arc.files.FileHandle; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.Pixmap; +import io.anuke.arc.graphics.PixmapIO; +import io.anuke.arc.graphics.g2d.SpriteBatch; +import io.anuke.arc.math.Rectangle; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.BufferUtils; +import io.anuke.arc.utils.ScreenUtils; +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 } } diff --git a/core/src/io/anuke/mindustry/core/ThreadHandler.java b/core/src/io/anuke/mindustry/core/ThreadHandler.java index 700b816a92..c427be3788 100644 --- a/core/src/io/anuke/mindustry/core/ThreadHandler.java +++ b/core/src/io/anuke/mindustry/core/ThreadHandler.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.core; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.utils.TimeUtils; +import io.anuke.arc.Core; +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(){ diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index 27e8fd3569..c631a1aaf1 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -1,14 +1,14 @@ package io.anuke.mindustry.core; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.Input.Keys; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.Colors; -import com.badlogic.gdx.graphics.g2d.BitmapFont; -import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator; -import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter; -import com.badlogic.gdx.math.Interpolation; -import com.badlogic.gdx.utils.Align; +import io.anuke.arc.Core; +import io.anuke.arc.Input.Keys; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.Colors; +import io.anuke.arc.graphics.g2d.BitmapFont; +import io.anuke.arc.graphics.g2d.freetype.FreeTypeFontGenerator; +import io.anuke.arc.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter; +import io.anuke.arc.math.Interpolation; +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); } } diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java index 58dedd6e2a..d1f880678b 100644 --- a/core/src/io/anuke/mindustry/core/World.java +++ b/core/src/io/anuke/mindustry/core/World.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.core; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.ObjectMap; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.ObjectMap; import io.anuke.mindustry.ai.BlockIndexer; import io.anuke.mindustry.ai.Pathfinder; import io.anuke.mindustry.ai.WaveSpawner; diff --git a/core/src/io/anuke/mindustry/editor/DrawOperation.java b/core/src/io/anuke/mindustry/editor/DrawOperation.java index d2b434e21f..55b57cf7af 100755 --- a/core/src/io/anuke/mindustry/editor/DrawOperation.java +++ b/core/src/io/anuke/mindustry/editor/DrawOperation.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.editor; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.IntSet; +import io.anuke.arc.utils.Array; +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; diff --git a/core/src/io/anuke/mindustry/editor/EditorTool.java b/core/src/io/anuke/mindustry/editor/EditorTool.java index 6eca7e8fd4..4a89d6f6a7 100644 --- a/core/src/io/anuke/mindustry/editor/EditorTool.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/editor/MapEditor.java b/core/src/io/anuke/mindustry/editor/MapEditor.java index 532e720622..ee0420df3d 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditor.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index 1fe31ead15..8a64da0a5f 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -1,15 +1,15 @@ package io.anuke.mindustry.editor; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.Pixmap; -import com.badlogic.gdx.graphics.g2d.Batch; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Align; -import com.badlogic.gdx.utils.Disposable; -import com.badlogic.gdx.utils.ObjectMap; +import io.anuke.arc.Core; +import io.anuke.arc.files.FileHandle; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.Pixmap; +import io.anuke.arc.graphics.g2d.Batch; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.Align; +import io.anuke.arc.utils.Disposable; +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)) : - Math.min(Gdx.graphics.getDisplayMode().height / amount, baseSize); + float size = mobile ? (int) (Math.min(Core.graphics.getHeight(), Core.graphics.getWidth()) / amount / Unit.dp.scl(1f)) : + Math.min(Core.graphics.getDisplayMode().height / amount, baseSize); clearChildren(); table(cont -> { diff --git a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java index 6f4a046d45..92b647738a 100644 --- a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/editor/MapLoadDialog.java b/core/src/io/anuke/mindustry/editor/MapLoadDialog.java index c819cd0a3a..14c0f2d7d0 100644 --- a/core/src/io/anuke/mindustry/editor/MapLoadDialog.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/editor/MapRenderer.java b/core/src/io/anuke/mindustry/editor/MapRenderer.java index bd4b7b8f43..abe1509da3 100644 --- a/core/src/io/anuke/mindustry/editor/MapRenderer.java +++ b/core/src/io/anuke/mindustry/editor/MapRenderer.java @@ -1,11 +1,11 @@ package io.anuke.mindustry.editor; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.utils.Disposable; -import com.badlogic.gdx.utils.IntSet; -import com.badlogic.gdx.utils.IntSet.IntSetIterator; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.utils.Disposable; +import io.anuke.arc.utils.IntSet; +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; diff --git a/core/src/io/anuke/mindustry/editor/MapView.java b/core/src/io/anuke/mindustry/editor/MapView.java index baa0edca5c..c5dc74451b 100644 --- a/core/src/io/anuke/mindustry/editor/MapView.java +++ b/core/src/io/anuke/mindustry/editor/MapView.java @@ -1,15 +1,15 @@ package io.anuke.mindustry.editor; -import com.badlogic.gdx.Input.Buttons; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.Batch; -import com.badlogic.gdx.input.GestureDetector; -import com.badlogic.gdx.input.GestureDetector.GestureListener; -import com.badlogic.gdx.math.Bresenham2; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.Input.Buttons; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.Batch; +import io.anuke.arc.input.GestureDetector; +import io.anuke.arc.input.GestureDetector.GestureListener; +import io.anuke.arc.math.Bresenham2; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.math.Rectangle; +import io.anuke.arc.math.Vector2; +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; diff --git a/core/src/io/anuke/mindustry/editor/OperationStack.java b/core/src/io/anuke/mindustry/editor/OperationStack.java index 402da3cf5e..6824083279 100755 --- a/core/src/io/anuke/mindustry/editor/OperationStack.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/entities/Damage.java b/core/src/io/anuke/mindustry/entities/Damage.java index 23f00d7e10..54e3b157a1 100644 --- a/core/src/io/anuke/mindustry/entities/Damage.java +++ b/core/src/io/anuke/mindustry/entities/Damage.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.entities; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.math.Vector2; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.math.Rectangle; +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; diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index fe59b17711..5c03efb4bc 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -1,11 +1,11 @@ package io.anuke.mindustry.entities; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.GlyphLayout; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Queue; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.GlyphLayout; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.Rectangle; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.Queue; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.content.Mechs; diff --git a/core/src/io/anuke/mindustry/entities/Predict.java b/core/src/io/anuke/mindustry/entities/Predict.java index 09d589bffd..e38be8b2ba 100644 --- a/core/src/io/anuke/mindustry/entities/Predict.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/entities/StatusController.java b/core/src/io/anuke/mindustry/entities/StatusController.java index 2df186d4c8..b7d0927b4a 100644 --- a/core/src/io/anuke/mindustry/entities/StatusController.java +++ b/core/src/io/anuke/mindustry/entities/StatusController.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.entities; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.graphics.Color; +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; diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java index 7df1e6d659..e5f7d8f5d3 100644 --- a/core/src/io/anuke/mindustry/entities/TileEntity.java +++ b/core/src/io/anuke/mindustry/entities/TileEntity.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.entities; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.ObjectSet; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.Array; +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; diff --git a/core/src/io/anuke/mindustry/entities/Unit.java b/core/src/io/anuke/mindustry/entities/Unit.java index 198d44b283..50f4b27b73 100644 --- a/core/src/io/anuke/mindustry/entities/Unit.java +++ b/core/src/io/anuke/mindustry/entities/Unit.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.entities; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.math.Vector2; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.Rectangle; +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; diff --git a/core/src/io/anuke/mindustry/entities/Units.java b/core/src/io/anuke/mindustry/entities/Units.java index 0d0584371c..b0749ce0f2 100644 --- a/core/src/io/anuke/mindustry/entities/Units.java +++ b/core/src/io/anuke/mindustry/entities/Units.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.entities; -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.math.Vector2; +import io.anuke.arc.math.Rectangle; +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; diff --git a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java index d130585cae..32288ef16d 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java +++ b/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 com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.Color; +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; diff --git a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java index f918d6ce8b..5b1b461f3a 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java index 6d5f272836..03328db49c 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java index fa8b7164ee..70b52f385c 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java +++ b/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 com.badlogic.gdx.math.GridPoint2; +import io.anuke.arc.graphics.Color; +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; diff --git a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java index 7e75370183..2106e34628 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/entities/effect/Decal.java b/core/src/io/anuke/mindustry/entities/effect/Decal.java index 64c9facba6..6001c8b1e2 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Decal.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/entities/effect/Fire.java b/core/src/io/anuke/mindustry/entities/effect/Fire.java index bf6e58c698..d7a689c7fc 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Fire.java +++ b/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 com.badlogic.gdx.utils.IntMap; -import com.badlogic.gdx.utils.Pool.Poolable; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.utils.IntMap; +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; diff --git a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java index 90e35dd496..8569d4d0f4 100644 --- a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java +++ b/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 com.badlogic.gdx.math.Vector2; +import io.anuke.arc.math.Interpolation; +import io.anuke.arc.math.Vector2; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.entities.Unit; diff --git a/core/src/io/anuke/mindustry/entities/effect/Lightning.java b/core/src/io/anuke/mindustry/entities/effect/Lightning.java index 1cf162f286..cda35eeaeb 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Lightning.java +++ b/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 com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.IntSet; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.math.Rectangle; +import io.anuke.arc.utils.Array; +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; diff --git a/core/src/io/anuke/mindustry/entities/effect/Puddle.java b/core/src/io/anuke/mindustry/entities/effect/Puddle.java index ce9dfc4926..d0c762d407 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Puddle.java +++ b/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 com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.utils.IntMap; -import com.badlogic.gdx.utils.Pool.Poolable; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.math.Rectangle; +import io.anuke.arc.utils.IntMap; +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; diff --git a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java b/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java index 7bfc3e369e..6585352c4a 100644 --- a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index d4aad07db6..4f0bacda4d 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/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 com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.Queue; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.utils.Array; +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; } } diff --git a/core/src/io/anuke/mindustry/entities/traits/TypeTrait.java b/core/src/io/anuke/mindustry/entities/traits/TypeTrait.java index 774b2b4143..958a0cb319 100644 --- a/core/src/io/anuke/mindustry/entities/traits/TypeTrait.java +++ b/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 com.badlogic.gdx.utils.ObjectIntMap; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.ObjectIntMap; import io.anuke.ucore.function.Supplier; public interface TypeTrait{ diff --git a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java index f40e21c2c2..900736e9a4 100644 --- a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java +++ b/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 com.badlogic.gdx.math.Rectangle; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.Rectangle; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.Vars; diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java index e72390c51e..5fe497d4ba 100644 --- a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java index db01ba1ab1..d6beb9935a 100644 --- a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java +++ b/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 com.badlogic.gdx.math.Vector2; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.math.Vector2; import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.Predict; import io.anuke.mindustry.entities.TileEntity; diff --git a/core/src/io/anuke/mindustry/entities/units/Squad.java b/core/src/io/anuke/mindustry/entities/units/Squad.java index 1068de0a6b..645ea3bdea 100644 --- a/core/src/io/anuke/mindustry/entities/units/Squad.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/entities/units/UnitType.java b/core/src/io/anuke/mindustry/entities/units/UnitType.java index c18928262b..c3fc8e2df4 100644 --- a/core/src/io/anuke/mindustry/entities/units/UnitType.java +++ b/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 com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.utils.ObjectSet; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +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; diff --git a/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java b/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java index 478854cfc0..cca7b7c45a 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/entities/units/types/Drone.java b/core/src/io/anuke/mindustry/entities/units/types/Drone.java index b47215d4ea..64aa4b799b 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Drone.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/game/Saves.java b/core/src/io/anuke/mindustry/game/Saves.java index 9e40b65e3c..487e78ca69 100644 --- a/core/src/io/anuke/mindustry/game/Saves.java +++ b/core/src/io/anuke/mindustry/game/Saves.java @@ -1,10 +1,10 @@ package io.anuke.mindustry.game; -import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.IntArray; -import com.badlogic.gdx.utils.IntMap; -import com.badlogic.gdx.utils.TimeUtils; +import io.anuke.arc.files.FileHandle; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.IntArray; +import io.anuke.arc.utils.IntMap; +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; diff --git a/core/src/io/anuke/mindustry/game/Team.java b/core/src/io/anuke/mindustry/game/Team.java index 2bace764e2..52f2990618 100644 --- a/core/src/io/anuke/mindustry/game/Team.java +++ b/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{ diff --git a/core/src/io/anuke/mindustry/game/Teams.java b/core/src/io/anuke/mindustry/game/Teams.java index 7b004b37d2..a02fe973cd 100644 --- a/core/src/io/anuke/mindustry/game/Teams.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/game/UnlockableContent.java b/core/src/io/anuke/mindustry/game/UnlockableContent.java index fc90949927..e82afc00a6 100644 --- a/core/src/io/anuke/mindustry/game/UnlockableContent.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/game/Unlocks.java b/core/src/io/anuke/mindustry/game/Unlocks.java index 04109296ca..9970b33ba4 100644 --- a/core/src/io/anuke/mindustry/game/Unlocks.java +++ b/core/src/io/anuke/mindustry/game/Unlocks.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.game; -import com.badlogic.gdx.utils.ObjectMap; -import com.badlogic.gdx.utils.ObjectSet; +import io.anuke.arc.utils.ObjectMap; +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; diff --git a/core/src/io/anuke/mindustry/game/Version.java b/core/src/io/anuke/mindustry/game/Version.java index 44d4aac4b1..b44ca5deb1 100644 --- a/core/src/io/anuke/mindustry/game/Version.java +++ b/core/src/io/anuke/mindustry/game/Version.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.game; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.utils.ObjectMap; -import com.badlogic.gdx.utils.PropertiesUtils; +import io.anuke.arc.Core; +import io.anuke.arc.files.FileHandle; +import io.anuke.arc.utils.ObjectMap; +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 map = new ObjectMap<>(); PropertiesUtils.load(map, file.reader()); diff --git a/core/src/io/anuke/mindustry/game/Waves.java b/core/src/io/anuke/mindustry/game/Waves.java index 12fe04c959..2241916c3a 100644 --- a/core/src/io/anuke/mindustry/game/Waves.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java index 5b679ccdf4..644145ff35 100644 --- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.graphics; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.IntSet; -import com.badlogic.gdx.utils.Sort; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.IntSet; +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; diff --git a/core/src/io/anuke/mindustry/graphics/CacheLayer.java b/core/src/io/anuke/mindustry/graphics/CacheLayer.java index 4a13487541..978454bac5 100644 --- a/core/src/io/anuke/mindustry/graphics/CacheLayer.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java index 36510734d7..8bec526285 100644 --- a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java @@ -1,13 +1,13 @@ package io.anuke.mindustry.graphics; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.GL20; -import com.badlogic.gdx.graphics.OrthographicCamera; -import com.badlogic.gdx.utils.IntArray; -import com.badlogic.gdx.utils.IntSet; -import com.badlogic.gdx.utils.IntSet.IntSetIterator; -import com.badlogic.gdx.utils.ObjectSet; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.GL20; +import io.anuke.arc.graphics.OrthographicCamera; +import io.anuke.arc.utils.IntArray; +import io.anuke.arc.utils.IntSet; +import io.anuke.arc.utils.IntSet.IntSetIterator; +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(){ diff --git a/core/src/io/anuke/mindustry/graphics/FogRenderer.java b/core/src/io/anuke/mindustry/graphics/FogRenderer.java index 7c920c78b0..f913f4f2b4 100644 --- a/core/src/io/anuke/mindustry/graphics/FogRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/FogRenderer.java @@ -1,14 +1,14 @@ package io.anuke.mindustry.graphics; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.GL20; -import com.badlogic.gdx.graphics.Pixmap.Format; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.graphics.glutils.FrameBuffer; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.Disposable; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.GL20; +import io.anuke.arc.graphics.Pixmap.Format; +import io.anuke.arc.graphics.Texture; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.glutils.FrameBuffer; +import io.anuke.arc.utils.Array; +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); - Gdx.gl.glReadPixels(0, 0, world.width(), world.height(), GL20.GL_RGBA, GL20.GL_UNSIGNED_BYTE, pixelBuffer); + Core.gl.glPixelStorei(GL20.GL_PACK_ALIGNMENT, 1); + 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(); } diff --git a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java index e900b2feef..c8ebde6790 100644 --- a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java @@ -1,13 +1,13 @@ package io.anuke.mindustry.graphics; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Pixmap; -import com.badlogic.gdx.graphics.Pixmap.Format; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.Disposable; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.Pixmap; +import io.anuke.arc.graphics.Pixmap.Format; +import io.anuke.arc.graphics.Texture; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.Rectangle; +import io.anuke.arc.utils.Array; +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(){ diff --git a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java index 3c070132fa..67ca88fae8 100644 --- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java @@ -1,10 +1,10 @@ package io.anuke.mindustry.graphics; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.math.MathUtils; -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.math.MathUtils; +import io.anuke.arc.math.Rectangle; +import io.anuke.arc.math.Vector2; +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; diff --git a/core/src/io/anuke/mindustry/graphics/Palette.java b/core/src/io/anuke/mindustry/graphics/Palette.java index 437a36034c..0ffcf551be 100644 --- a/core/src/io/anuke/mindustry/graphics/Palette.java +++ b/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 diff --git a/core/src/io/anuke/mindustry/graphics/Shaders.java b/core/src/io/anuke/mindustry/graphics/Shaders.java index 254234f419..9c1dd13176 100644 --- a/core/src/io/anuke/mindustry/graphics/Shaders.java +++ b/core/src/io/anuke/mindustry/graphics/Shaders.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.graphics; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.Color; +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.setUniformi("u_time", (int)(time += Gdx.graphics.getDeltaTime() * 60f)); + shader.setUniformf("u_resolution", Core.graphics.getWidth(), Core.graphics.getHeight()); + 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()); diff --git a/core/src/io/anuke/mindustry/graphics/Trail.java b/core/src/io/anuke/mindustry/graphics/Trail.java index bd34dc7002..cde3f9ae98 100644 --- a/core/src/io/anuke/mindustry/graphics/Trail.java +++ b/core/src/io/anuke/mindustry/graphics/Trail.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.graphics; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.FloatArray; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.FloatArray; import io.anuke.ucore.core.Timers; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Fill; diff --git a/core/src/io/anuke/mindustry/input/DefaultKeybinds.java b/core/src/io/anuke/mindustry/input/DefaultKeybinds.java index 19639b7466..d3e0c9d969 100644 --- a/core/src/io/anuke/mindustry/input/DefaultKeybinds.java +++ b/core/src/io/anuke/mindustry/input/DefaultKeybinds.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.input; -import com.badlogic.gdx.Application.ApplicationType; -import com.badlogic.gdx.Gdx; +import io.anuke.arc.Application.ApplicationType; +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, diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index d6881fc58a..5eaa5ee32c 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.input; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.Core; +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 cursorY = tileY(Gdx.input.getY()); + int cursorX = tileX(Core.input.getX()); + 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()); - int cursorX = tileX(Gdx.input.getX()); - int cursorY = tileY(Gdx.input.getY()); + Tile selected = tileAt(Core.input.getX(), Core.input.getY()); + int cursorX = tileX(Core.input.getX()); + 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()); - selectY = tileY(Gdx.input.getY()); + selectX = tileX(Core.input.getX()); + 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()); - controly = Mathf.clamp(controly, 0, Gdx.graphics.getHeight()); + controlx = Mathf.clamp(controlx, 0, Core.graphics.getWidth()); + 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(); - controly = Gdx.input.getY(); + controlx = Core.input.getX(); + controly = Core.input.getY(); } } diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java index ac8007737c..dec9bd29d5 100644 --- a/core/src/io/anuke/mindustry/input/InputHandler.java +++ b/core/src/io/anuke/mindustry/input/InputHandler.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.input; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.InputAdapter; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.math.Vector2; +import io.anuke.arc.Core; +import io.anuke.arc.InputAdapter; +import io.anuke.arc.graphics.Color; +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(){ diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index f4272a40cb..8eb82433e7 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -1,16 +1,16 @@ package io.anuke.mindustry.input; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.input.GestureDetector; -import com.badlogic.gdx.input.GestureDetector.GestureListener; -import com.badlogic.gdx.math.Interpolation; -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Align; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.ObjectSet; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.input.GestureDetector; +import io.anuke.arc.input.GestureDetector.GestureListener; +import io.anuke.arc.math.Interpolation; +import io.anuke.arc.math.Rectangle; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.Align; +import io.anuke.arc.utils.Array; +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 tileY = tileY(Gdx.input.getY()); + int tileX = tileX(Core.input.getX()); + 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){ - panX = (screenX - Gdx.graphics.getWidth()) + edgePan; + if(screenX >= Core.graphics.getWidth() - edgePan){ + panX = (screenX - Core.graphics.getWidth()) + edgePan; } if(screenY <= edgePan){ panY = -(edgePan - screenY); } - if(screenY >= Gdx.graphics.getHeight() - edgePan){ - panY = (screenY - Gdx.graphics.getHeight()) + edgePan; + if(screenY >= Core.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; } diff --git a/core/src/io/anuke/mindustry/io/BundleLoader.java b/core/src/io/anuke/mindustry/io/BundleLoader.java index 53643dc81f..b6fa4b2084 100644 --- a/core/src/io/anuke/mindustry/io/BundleLoader.java +++ b/core/src/io/anuke/mindustry/io/BundleLoader.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.io; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.utils.I18NBundle; +import io.anuke.arc.Core; +import io.anuke.arc.files.FileHandle; +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); diff --git a/core/src/io/anuke/mindustry/io/Changelogs.java b/core/src/io/anuke/mindustry/io/Changelogs.java index e1b28c71ed..a9f634f4b5 100644 --- a/core/src/io/anuke/mindustry/io/Changelogs.java +++ b/core/src/io/anuke/mindustry/io/Changelogs.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.io; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.JsonReader; -import com.badlogic.gdx.utils.JsonValue; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.JsonReader; +import io.anuke.arc.utils.JsonValue; import io.anuke.mindustry.net.Net; import io.anuke.ucore.function.Consumer; diff --git a/core/src/io/anuke/mindustry/io/Contributors.java b/core/src/io/anuke/mindustry/io/Contributors.java index f7c6e0f4b1..a03fc5f39c 100644 --- a/core/src/io/anuke/mindustry/io/Contributors.java +++ b/core/src/io/anuke/mindustry/io/Contributors.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.io; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.JsonReader; -import com.badlogic.gdx.utils.JsonValue; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.JsonReader; +import io.anuke.arc.utils.JsonValue; import io.anuke.mindustry.net.Net; import io.anuke.ucore.function.Consumer; diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java index 7dea904ef3..ee7b909916 100644 --- a/core/src/io/anuke/mindustry/io/MapIO.java +++ b/core/src/io/anuke/mindustry/io/MapIO.java @@ -1,11 +1,11 @@ package io.anuke.mindustry.io; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.Pixmap; -import com.badlogic.gdx.graphics.Pixmap.Format; -import com.badlogic.gdx.utils.IntIntMap; -import com.badlogic.gdx.utils.ObjectMap; -import com.badlogic.gdx.utils.ObjectMap.Entry; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.Pixmap; +import io.anuke.arc.graphics.Pixmap.Format; +import io.anuke.arc.utils.IntIntMap; +import io.anuke.arc.utils.ObjectMap; +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; diff --git a/core/src/io/anuke/mindustry/io/SaveFileVersion.java b/core/src/io/anuke/mindustry/io/SaveFileVersion.java index 0b4b40f5d2..488e5e3ade 100644 --- a/core/src/io/anuke/mindustry/io/SaveFileVersion.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/io/SaveIO.java b/core/src/io/anuke/mindustry/io/SaveIO.java index c13fe96662..960d4cf20b 100644 --- a/core/src/io/anuke/mindustry/io/SaveIO.java +++ b/core/src/io/anuke/mindustry/io/SaveIO.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.io; -import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.IntArray; -import com.badlogic.gdx.utils.IntMap; +import io.anuke.arc.files.FileHandle; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.IntArray; +import io.anuke.arc.utils.IntMap; import io.anuke.mindustry.Vars; import io.anuke.mindustry.io.versions.Save16; diff --git a/core/src/io/anuke/mindustry/io/TypeIO.java b/core/src/io/anuke/mindustry/io/TypeIO.java index 2d0f9feb08..535f0fd0fc 100644 --- a/core/src/io/anuke/mindustry/io/TypeIO.java +++ b/core/src/io/anuke/mindustry/io/TypeIO.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.io; -import com.badlogic.gdx.graphics.Color; +import io.anuke.arc.graphics.Color; import io.anuke.annotations.Annotations.ReadClass; import io.anuke.annotations.Annotations.WriteClass; import io.anuke.mindustry.entities.Player; diff --git a/core/src/io/anuke/mindustry/io/versions/Save16.java b/core/src/io/anuke/mindustry/io/versions/Save16.java index 7a4fc1e79e..f705cd1b4b 100644 --- a/core/src/io/anuke/mindustry/io/versions/Save16.java +++ b/core/src/io/anuke/mindustry/io/versions/Save16.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.io.versions; -import com.badlogic.gdx.utils.TimeUtils; +import io.anuke.arc.utils.TimeUtils; import io.anuke.mindustry.game.Difficulty; import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.game.Version; diff --git a/core/src/io/anuke/mindustry/maps/Map.java b/core/src/io/anuke/mindustry/maps/Map.java index 1ad60c0e1d..95f7399608 100644 --- a/core/src/io/anuke/mindustry/maps/Map.java +++ b/core/src/io/anuke/mindustry/maps/Map.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.maps; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.utils.ObjectMap; +import io.anuke.arc.graphics.Texture; +import io.anuke.arc.utils.ObjectMap; import io.anuke.ucore.function.Supplier; import java.io.InputStream; diff --git a/core/src/io/anuke/mindustry/maps/MapMeta.java b/core/src/io/anuke/mindustry/maps/MapMeta.java index 2f13ee59b9..934800c752 100644 --- a/core/src/io/anuke/mindustry/maps/MapMeta.java +++ b/core/src/io/anuke/mindustry/maps/MapMeta.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.maps; -import com.badlogic.gdx.utils.IntIntMap; -import com.badlogic.gdx.utils.ObjectMap; +import io.anuke.arc.utils.IntIntMap; +import io.anuke.arc.utils.ObjectMap; import io.anuke.ucore.util.Bundles; public class MapMeta{ diff --git a/core/src/io/anuke/mindustry/maps/MapTileData.java b/core/src/io/anuke/mindustry/maps/MapTileData.java index e48b902032..b6a15ac1c0 100644 --- a/core/src/io/anuke/mindustry/maps/MapTileData.java +++ b/core/src/io/anuke/mindustry/maps/MapTileData.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.maps; -import com.badlogic.gdx.utils.IntIntMap; +import io.anuke.arc.utils.IntIntMap; import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.world.Block; diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index 74936f00f8..b383ccc534 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -1,11 +1,11 @@ package io.anuke.mindustry.maps; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.Disposable; -import com.badlogic.gdx.utils.ObjectMap; +import io.anuke.arc.Core; +import io.anuke.arc.files.FileHandle; +import io.anuke.arc.graphics.Texture; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.Disposable; +import io.anuke.arc.utils.ObjectMap; import io.anuke.mindustry.io.MapIO; import io.anuke.ucore.function.Supplier; import io.anuke.ucore.util.Log; @@ -62,7 +62,7 @@ public class Maps implements Disposable{ public void load(){ try { for (String name : defaultMapNames) { - FileHandle file = Gdx.files.internal("maps/" + name + "." + mapExtension); + FileHandle file = Core.files.internal("maps/" + name + "." + mapExtension); loadMap(file.nameWithoutExtension(), file::read, false); } }catch (IOException e){ diff --git a/core/src/io/anuke/mindustry/maps/Sector.java b/core/src/io/anuke/mindustry/maps/Sector.java index e184409ae1..b9a42dd922 100644 --- a/core/src/io/anuke/mindustry/maps/Sector.java +++ b/core/src/io/anuke/mindustry/maps/Sector.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.maps; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.graphics.Texture; +import io.anuke.arc.utils.Array; import io.anuke.annotations.Annotations.Serialize; import io.anuke.mindustry.game.Saves.SaveSlot; import io.anuke.mindustry.game.SpawnGroup; diff --git a/core/src/io/anuke/mindustry/maps/SectorPresets.java b/core/src/io/anuke/mindustry/maps/SectorPresets.java index 08fa7f1b19..abf3d9eaa3 100644 --- a/core/src/io/anuke/mindustry/maps/SectorPresets.java +++ b/core/src/io/anuke/mindustry/maps/SectorPresets.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.maps; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.Mechs; diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java index b2d4b6cb1b..0a1fef1a8b 100644 --- a/core/src/io/anuke/mindustry/maps/Sectors.java +++ b/core/src/io/anuke/mindustry/maps/Sectors.java @@ -1,13 +1,13 @@ package io.anuke.mindustry.maps; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Pixmap; -import com.badlogic.gdx.graphics.Pixmap.Format; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.Array.ArrayIterable; -import com.badlogic.gdx.utils.async.AsyncExecutor; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.Pixmap; +import io.anuke.arc.graphics.Pixmap.Format; +import io.anuke.arc.graphics.Texture; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.Array.ArrayIterable; +import io.anuke.arc.utils.async.AsyncExecutor; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.Difficulty; @@ -307,7 +307,7 @@ public class Sectors{ } } - Gdx.app.postRunnable(() -> { + Core.app.postRunnable(() -> { sector.texture = new Texture(pixmap); pixmap.dispose(); }); diff --git a/core/src/io/anuke/mindustry/maps/TutorialSector.java b/core/src/io/anuke/mindustry/maps/TutorialSector.java index b597cc9ec0..bdb835a370 100644 --- a/core/src/io/anuke/mindustry/maps/TutorialSector.java +++ b/core/src/io/anuke/mindustry/maps/TutorialSector.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.maps; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.blocks.CraftingBlocks; import io.anuke.mindustry.content.blocks.ProductionBlocks; diff --git a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java index def5cf1e0c..11d3c7c3db 100644 --- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java @@ -1,10 +1,10 @@ package io.anuke.mindustry.maps.generation; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.IntIntMap; -import com.badlogic.gdx.utils.Predicate; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.IntIntMap; +import io.anuke.arc.utils.Predicate; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.blocks.*; diff --git a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java index 8686b6c80d..575f69325e 100644 --- a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java @@ -1,10 +1,10 @@ package io.anuke.mindustry.maps.generation; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.IntArray; -import com.badlogic.gdx.utils.ObjectMap; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.IntArray; +import io.anuke.arc.utils.ObjectMap; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.OreBlocks; diff --git a/core/src/io/anuke/mindustry/maps/missions/BattleMission.java b/core/src/io/anuke/mindustry/maps/missions/BattleMission.java index e1f5bc5614..175e79c9de 100644 --- a/core/src/io/anuke/mindustry/maps/missions/BattleMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/BattleMission.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.maps.missions; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.Vars; import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.game.Team; diff --git a/core/src/io/anuke/mindustry/maps/missions/LineBlockMission.java b/core/src/io/anuke/mindustry/maps/missions/LineBlockMission.java index 918788b55c..26a1b5c01c 100644 --- a/core/src/io/anuke/mindustry/maps/missions/LineBlockMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/LineBlockMission.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.maps.missions; -import com.badlogic.gdx.math.Bresenham2; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.math.Bresenham2; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.world.Block; public class LineBlockMission extends Mission{ diff --git a/core/src/io/anuke/mindustry/maps/missions/Mission.java b/core/src/io/anuke/mindustry/maps/missions/Mission.java index eba443be21..01921dc03e 100644 --- a/core/src/io/anuke/mindustry/maps/missions/Mission.java +++ b/core/src/io/anuke/mindustry/maps/missions/Mission.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.maps.missions; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.game.SpawnGroup; import io.anuke.mindustry.game.UnlockableContent; diff --git a/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java b/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java index a134891329..405946f2cd 100644 --- a/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java +++ b/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.maps.missions; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.content.blocks.StorageBlocks; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.maps.generation.Generation; diff --git a/core/src/io/anuke/mindustry/maps/missions/Missions.java b/core/src/io/anuke/mindustry/maps/missions/Missions.java index bc0b139185..8ba6e71e8e 100644 --- a/core/src/io/anuke/mindustry/maps/missions/Missions.java +++ b/core/src/io/anuke/mindustry/maps/missions/Missions.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.maps.missions; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.world.Block; diff --git a/core/src/io/anuke/mindustry/maps/missions/WaveMission.java b/core/src/io/anuke/mindustry/maps/missions/WaveMission.java index e31120af00..34308789b2 100644 --- a/core/src/io/anuke/mindustry/maps/missions/WaveMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/WaveMission.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.maps.missions; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.game.SpawnGroup; import io.anuke.mindustry.game.Team; diff --git a/core/src/io/anuke/mindustry/net/Administration.java b/core/src/io/anuke/mindustry/net/Administration.java index 1f7d2288af..97bbf3e6ab 100644 --- a/core/src/io/anuke/mindustry/net/Administration.java +++ b/core/src/io/anuke/mindustry/net/Administration.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.net; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.ObjectMap; -import com.badlogic.gdx.utils.ObjectSet; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.ObjectMap; +import io.anuke.arc.utils.ObjectSet; import io.anuke.annotations.Annotations.Serialize; import io.anuke.ucore.core.Settings; diff --git a/core/src/io/anuke/mindustry/net/Interpolator.java b/core/src/io/anuke/mindustry/net/Interpolator.java index b184875d88..950310c30d 100644 --- a/core/src/io/anuke/mindustry/net/Interpolator.java +++ b/core/src/io/anuke/mindustry/net/Interpolator.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.net; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.TimeUtils; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.TimeUtils; import io.anuke.ucore.util.Mathf; public class Interpolator{ diff --git a/core/src/io/anuke/mindustry/net/Net.java b/core/src/io/anuke/mindustry/net/Net.java index 13548a2872..d0dce9ef8d 100644 --- a/core/src/io/anuke/mindustry/net/Net.java +++ b/core/src/io/anuke/mindustry/net/Net.java @@ -1,13 +1,13 @@ package io.anuke.mindustry.net; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.Net.HttpRequest; -import com.badlogic.gdx.Net.HttpResponse; -import com.badlogic.gdx.Net.HttpResponseListener; -import com.badlogic.gdx.net.HttpRequestBuilder; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.IntMap; -import com.badlogic.gdx.utils.ObjectMap; +import io.anuke.arc.Core; +import io.anuke.arc.Net.HttpRequest; +import io.anuke.arc.Net.HttpResponse; +import io.anuke.arc.Net.HttpResponseListener; +import io.anuke.arc.net.HttpRequestBuilder; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.IntMap; +import io.anuke.arc.utils.ObjectMap; import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.net.Packets.KickReason; @@ -347,7 +347,7 @@ public class Net{ HttpRequest req = new HttpRequestBuilder().newRequest() .method(method).url(url).content(body).build(); - Gdx.net.sendHttpRequest(req, new HttpResponseListener(){ + Core.net.sendHttpRequest(req, new HttpResponseListener(){ @Override public void handleHttpResponse(HttpResponse httpResponse){ listener.accept(httpResponse.getResultAsString()); diff --git a/core/src/io/anuke/mindustry/net/NetworkIO.java b/core/src/io/anuke/mindustry/net/NetworkIO.java index f8a9a5ddbe..5bd6581bc2 100644 --- a/core/src/io/anuke/mindustry/net/NetworkIO.java +++ b/core/src/io/anuke/mindustry/net/NetworkIO.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.net; -import com.badlogic.gdx.utils.ObjectMap; -import com.badlogic.gdx.utils.ObjectMap.Entry; -import com.badlogic.gdx.utils.TimeUtils; +import io.anuke.arc.utils.ObjectMap; +import io.anuke.arc.utils.ObjectMap.Entry; +import io.anuke.arc.utils.TimeUtils; import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.game.GameMode; diff --git a/core/src/io/anuke/mindustry/net/Packet.java b/core/src/io/anuke/mindustry/net/Packet.java index ef34666dbb..ee80bbbebe 100644 --- a/core/src/io/anuke/mindustry/net/Packet.java +++ b/core/src/io/anuke/mindustry/net/Packet.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.net; -import com.badlogic.gdx.utils.Pool.Poolable; +import io.anuke.arc.utils.Pool.Poolable; import java.nio.ByteBuffer; diff --git a/core/src/io/anuke/mindustry/net/Packets.java b/core/src/io/anuke/mindustry/net/Packets.java index 1d3ef834e7..f9015ad45d 100644 --- a/core/src/io/anuke/mindustry/net/Packets.java +++ b/core/src/io/anuke/mindustry/net/Packets.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.net; -import com.badlogic.gdx.utils.Base64Coder; +import io.anuke.arc.utils.Base64Coder; import io.anuke.mindustry.game.Version; import io.anuke.mindustry.io.TypeIO; import io.anuke.ucore.util.Bundles; diff --git a/core/src/io/anuke/mindustry/net/Registrator.java b/core/src/io/anuke/mindustry/net/Registrator.java index 1fd12cca26..a3d9462e11 100644 --- a/core/src/io/anuke/mindustry/net/Registrator.java +++ b/core/src/io/anuke/mindustry/net/Registrator.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.net; -import com.badlogic.gdx.utils.ObjectIntMap; +import io.anuke.arc.utils.ObjectIntMap; import io.anuke.mindustry.net.Packets.*; import io.anuke.ucore.function.Supplier; diff --git a/core/src/io/anuke/mindustry/type/Item.java b/core/src/io/anuke/mindustry/type/Item.java index 62e91451ed..0cd980d3f1 100644 --- a/core/src/io/anuke/mindustry/type/Item.java +++ b/core/src/io/anuke/mindustry/type/Item.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.type; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.Vars; import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.graphics.Palette; diff --git a/core/src/io/anuke/mindustry/type/Liquid.java b/core/src/io/anuke/mindustry/type/Liquid.java index 3dbb52fbe9..3af469d385 100644 --- a/core/src/io/anuke/mindustry/type/Liquid.java +++ b/core/src/io/anuke/mindustry/type/Liquid.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.type; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.ui.ContentDisplay; diff --git a/core/src/io/anuke/mindustry/type/Mech.java b/core/src/io/anuke/mindustry/type/Mech.java index 744bf11be1..95e1fa21d2 100644 --- a/core/src/io/anuke/mindustry/type/Mech.java +++ b/core/src/io/anuke/mindustry/type/Mech.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.type; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.content.Weapons; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.game.UnlockableContent; diff --git a/core/src/io/anuke/mindustry/type/Recipe.java b/core/src/io/anuke/mindustry/type/Recipe.java index daa84726e7..5637addaa2 100644 --- a/core/src/io/anuke/mindustry/type/Recipe.java +++ b/core/src/io/anuke/mindustry/type/Recipe.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.type; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.ObjectMap; -import com.badlogic.gdx.utils.OrderedMap; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.ObjectMap; +import io.anuke.arc.utils.OrderedMap; import io.anuke.mindustry.Vars; import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.game.UnlockableContent; diff --git a/core/src/io/anuke/mindustry/type/StatusEffect.java b/core/src/io/anuke/mindustry/type/StatusEffect.java index 1d8282354b..88fcaa7021 100644 --- a/core/src/io/anuke/mindustry/type/StatusEffect.java +++ b/core/src/io/anuke/mindustry/type/StatusEffect.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.type; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.utils.ObjectSet; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.utils.ObjectSet; import io.anuke.mindustry.entities.StatusController.StatusEntry; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.game.Content; diff --git a/core/src/io/anuke/mindustry/type/Weapon.java b/core/src/io/anuke/mindustry/type/Weapon.java index 1a4e9159cd..44a44733bb 100644 --- a/core/src/io/anuke/mindustry/type/Weapon.java +++ b/core/src/io/anuke/mindustry/type/Weapon.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.type; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.Vars; diff --git a/core/src/io/anuke/mindustry/ui/BorderImage.java b/core/src/io/anuke/mindustry/ui/BorderImage.java index 66d3913500..ce88ddfa79 100644 --- a/core/src/io/anuke/mindustry/ui/BorderImage.java +++ b/core/src/io/anuke/mindustry/ui/BorderImage.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.ui; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.Batch; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.Texture; +import io.anuke.arc.graphics.g2d.Batch; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.graphics.Palette; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Lines; diff --git a/core/src/io/anuke/mindustry/ui/ContentDisplay.java b/core/src/io/anuke/mindustry/ui/ContentDisplay.java index 25da82eaa8..07db66f19f 100644 --- a/core/src/io/anuke/mindustry/ui/ContentDisplay.java +++ b/core/src/io/anuke/mindustry/ui/ContentDisplay.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.ui; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.utils.OrderedMap; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.utils.OrderedMap; import io.anuke.mindustry.entities.units.UnitType; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.type.Item; diff --git a/core/src/io/anuke/mindustry/ui/GridImage.java b/core/src/io/anuke/mindustry/ui/GridImage.java index 01792f5fbb..f41f4c8762 100644 --- a/core/src/io/anuke/mindustry/ui/GridImage.java +++ b/core/src/io/anuke/mindustry/ui/GridImage.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.ui; -import com.badlogic.gdx.graphics.g2d.Batch; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.Batch; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.scene.Element; diff --git a/core/src/io/anuke/mindustry/ui/ImageStack.java b/core/src/io/anuke/mindustry/ui/ImageStack.java index 2ca0063e48..d443b5f877 100644 --- a/core/src/io/anuke/mindustry/ui/ImageStack.java +++ b/core/src/io/anuke/mindustry/ui/ImageStack.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.ui; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.ucore.scene.ui.Image; import io.anuke.ucore.scene.ui.layout.Stack; diff --git a/core/src/io/anuke/mindustry/ui/ItemImage.java b/core/src/io/anuke/mindustry/ui/ItemImage.java index 64007340af..1d466af4ce 100644 --- a/core/src/io/anuke/mindustry/ui/ItemImage.java +++ b/core/src/io/anuke/mindustry/ui/ItemImage.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.ui; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.type.ItemStack; import io.anuke.ucore.function.Supplier; import io.anuke.ucore.scene.ui.Image; diff --git a/core/src/io/anuke/mindustry/ui/Links.java b/core/src/io/anuke/mindustry/ui/Links.java index 891e44f7f8..a875d85e78 100644 --- a/core/src/io/anuke/mindustry/ui/Links.java +++ b/core/src/io/anuke/mindustry/ui/Links.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.ui; -import com.badlogic.gdx.graphics.Color; +import io.anuke.arc.graphics.Color; import io.anuke.ucore.util.Bundles; public class Links{ diff --git a/core/src/io/anuke/mindustry/ui/MenuButton.java b/core/src/io/anuke/mindustry/ui/MenuButton.java index a7e1062bfc..27f37c72fa 100644 --- a/core/src/io/anuke/mindustry/ui/MenuButton.java +++ b/core/src/io/anuke/mindustry/ui/MenuButton.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.ui; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.utils.Align; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.utils.Align; import io.anuke.ucore.scene.ui.TextButton; public class MenuButton extends TextButton{ diff --git a/core/src/io/anuke/mindustry/ui/Minimap.java b/core/src/io/anuke/mindustry/ui/Minimap.java index ae87725d75..2c8463f857 100644 --- a/core/src/io/anuke/mindustry/ui/Minimap.java +++ b/core/src/io/anuke/mindustry/ui/Minimap.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.ui; -import com.badlogic.gdx.graphics.Texture.TextureFilter; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.Texture.TextureFilter; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.graphics.Shaders; import io.anuke.ucore.core.Core; import io.anuke.ucore.core.Graphics; diff --git a/core/src/io/anuke/mindustry/ui/MobileButton.java b/core/src/io/anuke/mindustry/ui/MobileButton.java index 68999a260c..39fbea8778 100644 --- a/core/src/io/anuke/mindustry/ui/MobileButton.java +++ b/core/src/io/anuke/mindustry/ui/MobileButton.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.ui; -import com.badlogic.gdx.utils.Align; +import io.anuke.arc.utils.Align; import io.anuke.ucore.scene.ui.ImageButton; public class MobileButton extends ImageButton{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java index 4cfa262779..c6d5e0ff8e 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.ObjectSet; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.ObjectSet; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.io.Contributors; import io.anuke.mindustry.io.Contributors.Contributor; @@ -69,9 +69,9 @@ public class AboutDialog extends FloatingDialog{ }).padLeft(8); table.addImageButton("icon-link", 14 * 3, () -> { - if(!Gdx.net.openURI(link.link)){ + if(!Core.net.openURI(link.link)){ ui.showError("$text.linkfail"); - Gdx.app.getClipboard().setContents(link.link); + Core.app.getClipboard().setContents(link.link); } }).size(h - 5, h); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java index 9d2e094eb1..5c09c574eb 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.Core; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.Vars; import io.anuke.mindustry.io.Changelogs; import io.anuke.mindustry.io.Changelogs.VersionInfo; @@ -28,10 +28,10 @@ public class ChangelogDialog extends FloatingDialog{ if(!ios && !OS.isMac){ Changelogs.getChangelog(result -> { versions = result; - Gdx.app.postRunnable(this::setup); + Core.app.postRunnable(this::setup); }, t -> { Log.err(t); - Gdx.app.postRunnable(this::setup); + Core.app.postRunnable(this::setup); }); } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java index a9c282b065..6856373967 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.Input.Keys; -import com.badlogic.gdx.graphics.Color; +import io.anuke.arc.Input.Keys; +import io.anuke.arc.graphics.Color; import io.anuke.ucore.function.Consumer; import io.anuke.ucore.scene.ui.Dialog; import io.anuke.ucore.scene.ui.ImageButton; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java index c9c2901a6b..b5ee366047 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.Input.Keys; -import com.badlogic.gdx.utils.Align; +import io.anuke.arc.Input.Keys; +import io.anuke.arc.utils.Align; import io.anuke.mindustry.graphics.Palette; import io.anuke.ucore.scene.ui.Image; import io.anuke.ucore.scene.ui.KeybindDialog; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java index 1a5f218489..434fae859e 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.utils.Align; -import com.badlogic.gdx.utils.Scaling; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.utils.Align; +import io.anuke.arc.utils.Scaling; import io.anuke.mindustry.game.Difficulty; import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.maps.Map; @@ -38,7 +38,7 @@ public class CustomGameDialog extends FloatingDialog{ ScrollPane pane = new ScrollPane(maps); pane.setFadeScrollBars(false); - int maxwidth = (Gdx.graphics.getHeight() > Gdx.graphics.getHeight() ? 2 : 4); + int maxwidth = (Core.graphics.getHeight() > Core.graphics.getHeight() ? 2 : 4); Table selmode = new Table(); ButtonGroup group = new ButtonGroup<>(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java index e4571b2447..603925df1f 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Color; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.Color; import io.anuke.mindustry.graphics.Palette; import io.anuke.ucore.scene.ui.Dialog; @@ -40,12 +40,12 @@ public class DiscordDialog extends Dialog{ buttons().addButton("$text.back", this::hide); buttons().addButton("$text.copylink", () -> { - Gdx.app.getClipboard().setContents(discordURL); + Core.app.getClipboard().setContents(discordURL); }); buttons().addButton("$text.openlink", () -> { - if(!Gdx.net.openURI(discordURL)){ + if(!Core.net.openURI(discordURL)){ ui.showError("$text.linkfail"); - Gdx.app.getClipboard().setContents(discordURL); + Core.app.getClipboard().setContents(discordURL); } }); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java index b608f3527c..3c0a578b41 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java @@ -1,10 +1,10 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.graphics.g2d.GlyphLayout; -import com.badlogic.gdx.utils.Align; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.Core; +import io.anuke.arc.files.FileHandle; +import io.anuke.arc.graphics.g2d.GlyphLayout; +import io.anuke.arc.utils.Align; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.Platform; import io.anuke.ucore.core.Core; @@ -27,8 +27,8 @@ public class FileChooser extends FloatingDialog{ public static Predicate jpegFilter = file -> file.extension().equalsIgnoreCase("png") || file.extension().equalsIgnoreCase("jpg") || file.extension().equalsIgnoreCase("jpeg"); public static Predicate defaultFilter = file -> true; private Table files; - private FileHandle homeDirectory = Gdx.files.absolute(OS.isMac ? OS.getProperty("user.home") + "/Downloads/" : - Gdx.files.getExternalStoragePath()); + private FileHandle homeDirectory = Core.files.absolute(OS.isMac ? OS.getProperty("user.home") + "/Downloads/" : + Core.files.getExternalStoragePath()); private FileHandle directory = homeDirectory; private ScrollPane pane; private TextField navigation, filefield; @@ -82,7 +82,7 @@ public class FileChooser extends FloatingDialog{ pane = new ScrollPane(files){ public float getPrefHeight(){ - return Gdx.graphics.getHeight(); + return Core.graphics.getHeight(); } }; pane.setOverscroll(false, false); @@ -142,7 +142,7 @@ public class FileChooser extends FloatingDialog{ content.add(icontable).expandX().fillX(); content.row(); - content.center().add(pane).width(UIUtils.portrait() ? Gdx.graphics.getWidth() / Unit.dp.scl(1) : Gdx.graphics.getWidth() / Unit.dp.scl(2)).colspan(3).grow(); + content.center().add(pane).width(UIUtils.portrait() ? Core.graphics.getWidth() / Unit.dp.scl(1) : Core.graphics.getWidth() / Unit.dp.scl(2)).colspan(3).grow(); content.row(); if(!open){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java index 600c59c193..72fff36dbb 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.Input.Keys; -import com.badlogic.gdx.utils.Align; +import io.anuke.arc.Core; +import io.anuke.arc.Input.Keys; +import io.anuke.arc.utils.Align; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.EventType.ResizeEvent; import io.anuke.mindustry.graphics.Palette; @@ -43,7 +43,7 @@ public class FloatingDialog extends Dialog{ boolean[] done = {false}; - shown(() -> Gdx.app.postRunnable(() -> + shown(() -> Core.app.postRunnable(() -> forEach(child -> { if(done[0]) return; @@ -68,7 +68,7 @@ public class FloatingDialog extends Dialog{ keyDown(key -> { if(key == Keys.ESCAPE || key == Keys.BACK) { - Gdx.app.postRunnable(this::hide); + Core.app.postRunnable(this::hide); } }); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/GenViewDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/GenViewDialog.java index 64a8a21bec..39776323f3 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/GenViewDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/GenViewDialog.java @@ -1,11 +1,11 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Pixmap; -import com.badlogic.gdx.graphics.Pixmap.Format; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.async.AsyncExecutor; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.Pixmap; +import io.anuke.arc.graphics.Pixmap.Format; +import io.anuke.arc.graphics.Texture; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.async.AsyncExecutor; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.maps.generation.WorldGenerator.GenResult; @@ -89,7 +89,7 @@ public class GenViewDialog extends FloatingDialog{ pixmap.drawPixel(i, sectorSize - 1 - j, ColorMapper.colorFor(result.floor, result.wall, Team.none, result.elevation, (byte)0)); } } - Gdx.app.postRunnable(() -> map.put(wx, wy, new Texture(pixmap))); + Core.app.postRunnable(() -> map.put(wx, wy, new Texture(pixmap))); return pixmap; }); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java index b896ec75fd..f172df25e5 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.graphics.Color; +import io.anuke.arc.graphics.Color; import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.net.Net; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java index 853f758f57..c8b63c73e6 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.math.MathUtils; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.math.MathUtils; +import io.anuke.arc.utils.Array; import io.anuke.annotations.Annotations.Serialize; import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.Platform; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java index d402ed9eeb..eb4e69b78c 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.Core; +import io.anuke.arc.files.FileHandle; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.Platform; @@ -98,7 +98,7 @@ public class LoadDialog extends FloatingDialog{ }, false, saveExtension); }else{ try{ - FileHandle file = Gdx.files.local("save-" + slot.getName() + "." + Vars.saveExtension); + FileHandle file = Core.files.local("save-" + slot.getName() + "." + Vars.saveExtension); slot.exportFile(file); Platform.instance.shareFile(file); }catch(Exception e){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LocalPlayerDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LocalPlayerDialog.java index 7ef5786ee3..e7374dfed8 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LocalPlayerDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LocalPlayerDialog.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.utils.Scaling; +import io.anuke.arc.utils.Scaling; import io.anuke.mindustry.entities.Player; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.scene.ui.Image; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java index bed08f9954..a300403c4d 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.utils.Scaling; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.utils.Scaling; import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.io.MapIO; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java index fc6b0ad57a..c794b3b1d8 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.Input.Keys; +import io.anuke.arc.Input.Keys; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.net.Net; import io.anuke.ucore.scene.style.Drawable; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java index c38cfc31f6..72983830fd 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java @@ -1,10 +1,10 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Align; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.Align; import io.anuke.mindustry.Vars; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.maps.Sector; @@ -118,7 +118,7 @@ public class SectorsDialog extends FloatingDialog{ }).pad(-5).growX().padTop(0); table.pack(); - table.act(Gdx.graphics.getDeltaTime()); + table.act(Core.graphics.getDeltaTime()); } public Sector getSelected(){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index c088808401..fbb9631aff 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.Input.Keys; -import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.utils.Align; +import io.anuke.arc.Core; +import io.anuke.arc.Input.Keys; +import io.anuke.arc.files.FileHandle; +import io.anuke.arc.utils.Align; import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.graphics.Palette; @@ -178,7 +178,7 @@ public class SettingsMenuDialog extends SettingsDialog{ file.deleteDirectory(); } - Gdx.app.exit(); + Core.app.exit(); }); }); dialog.content().row(); @@ -192,18 +192,18 @@ public class SettingsMenuDialog extends SettingsDialog{ graphics.sliderPref("fpscap", 125, 5, 125, 5, s -> (s > 120 ? Bundles.get("setting.fpscap.none") : Bundles.format("setting.fpscap.text", s))); if(!mobile){ - graphics.checkPref("vsync", true, b -> Gdx.graphics.setVSync(b)); + graphics.checkPref("vsync", true, b -> Core.graphics.setVSync(b)); graphics.checkPref("fullscreen", false, b -> { if(b){ - Gdx.graphics.setFullscreenMode(Gdx.graphics.getDisplayMode()); + Core.graphics.setFullscreenMode(Core.graphics.getDisplayMode()); }else{ - Gdx.graphics.setWindowedMode(600, 480); + Core.graphics.setWindowedMode(600, 480); } }); - Gdx.graphics.setVSync(Settings.getBool("vsync")); + Core.graphics.setVSync(Settings.getBool("vsync")); if(Settings.getBool("fullscreen")){ - Gdx.graphics.setFullscreenMode(Gdx.graphics.getDisplayMode()); + Core.graphics.setFullscreenMode(Core.graphics.getDisplayMode()); } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java index a1d58ea766..cd8c1e212d 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.ui.dialogs; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.Vars; import io.anuke.mindustry.game.Content; import io.anuke.mindustry.game.UnlockableContent; diff --git a/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java index ab5cfec300..25bebe7e7f 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.ui.fragments; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Shaders; @@ -18,7 +18,6 @@ public class BackgroundFragment extends Fragment{ @Override public void build(Group parent){ - Core.scene.table().addRect((a, b, w, h) -> { Draw.colorl(0.1f); Fill.crect(0, 0, w, h); @@ -28,7 +27,7 @@ public class BackgroundFragment extends Fragment{ Graphics.shader(); Draw.color(); - boolean portrait = Gdx.graphics.getWidth() < Gdx.graphics.getHeight(); + boolean portrait = Core.graphics.getWidth() < Core.graphics.getHeight(); float logoscl = (int) Unit.dp.scl(7) * (portrait ? 5f / 7f : 1f); TextureRegion logo = Core.skin.getRegion("logotext"); float logow = logo.getRegionWidth() * logoscl; diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java index b122811e16..017a51700d 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.ui.fragments; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.math.Interpolation; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Align; +import io.anuke.arc.Core; +import io.anuke.arc.math.Interpolation; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.Align; import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.input.InputHandler; @@ -75,7 +75,7 @@ public class BlockConfigFragment extends Fragment{ } public boolean hasConfigMouse(){ - Element e = Core.scene.hit(Gdx.input.getX(), Gdx.graphics.getHeight() - Gdx.input.getY(), true); + Element e = Core.scene.hit(Core.input.getX(), Core.graphics.getHeight() - Core.input.getY(), true); return e != null && (e == table || e.isDescendantOf(table)); } diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java index 78ec16761b..e11950af82 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java @@ -1,10 +1,10 @@ package io.anuke.mindustry.ui.fragments; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Align; -import com.badlogic.gdx.utils.ObjectSet; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.Align; +import io.anuke.arc.utils.ObjectSet; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.graphics.Palette; @@ -91,7 +91,7 @@ public class BlockConsumeFragment extends Fragment{ table.setPosition(v.x, v.y, Align.topRight); }); - table.act(Gdx.graphics.getDeltaTime()); + table.act(Core.graphics.getDeltaTime()); } public void hide(){ diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java index e193b04ed2..7c6dbb2cd8 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.ui.fragments; -import com.badlogic.gdx.math.Interpolation; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Align; -import com.badlogic.gdx.utils.IntSet; +import io.anuke.arc.math.Interpolation; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.Align; +import io.anuke.arc.utils.IntSet; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.core.GameState.State; diff --git a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java index 3d96883b34..a5a2256eb8 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java @@ -1,13 +1,13 @@ package io.anuke.mindustry.ui.fragments; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.Input.Keys; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.Batch; -import com.badlogic.gdx.graphics.g2d.BitmapFont; -import com.badlogic.gdx.graphics.g2d.GlyphLayout; -import com.badlogic.gdx.utils.Align; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.Core; +import io.anuke.arc.Input.Keys; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.Batch; +import io.anuke.arc.graphics.g2d.BitmapFont; +import io.anuke.arc.graphics.g2d.GlyphLayout; +import io.anuke.arc.utils.Align; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.gen.Call; @@ -129,7 +129,7 @@ public class ChatFragment extends Table{ chatfield.appendText(to.getText()); chatfield.change(); dialog.hide(); - Gdx.input.setOnscreenKeyboardVisible(false); + Core.input.setOnscreenKeyboardVisible(false); toggle(); }).width(90f).name("okb"); @@ -137,7 +137,7 @@ public class ChatFragment extends Table{ Timers.runTask(1f, () -> { to.setCursorPosition(to.getText().length()); Core.scene.setKeyboardFocus(to); - Gdx.input.setOnscreenKeyboardVisible(true); + Core.input.setOnscreenKeyboardVisible(true); }); }); } diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 9037574c38..a65ea01936 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -1,12 +1,12 @@ package io.anuke.mindustry.ui.fragments; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.Interpolation; -import com.badlogic.gdx.utils.Align; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.Scaling; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.Interpolation; +import io.anuke.arc.utils.Align; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.Scaling; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.EventType.StateChangeEvent; import io.anuke.mindustry.game.Team; @@ -134,7 +134,7 @@ public class HudFragment extends Fragment{ IntFormat fps = new IntFormat("text.fps"); IntFormat tps = new IntFormat("text.tps"); IntFormat ping = new IntFormat("text.ping"); - t.label(() -> fps.get(Gdx.graphics.getFramesPerSecond())).padRight(10); + t.label(() -> fps.get(Core.graphics.getFramesPerSecond())).padRight(10); t.row(); if(Net.hasClient()){ t.label(() -> ping.get(Net.getPing())).visible(Net::client).colspan(2); diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index 7272968b4f..c9b4309c58 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.ui.fragments; -import com.badlogic.gdx.Gdx; +import io.anuke.arc.Core; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.game.EventType.ResizeEvent; @@ -50,7 +50,7 @@ public class MenuFragment extends Fragment{ private void buildMobile(){ container.clear(); - container.setSize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); + container.setSize(Core.graphics.getWidth(), Core.graphics.getHeight()); float size = 120f; float isize = 14f * 4; @@ -66,7 +66,7 @@ public class MenuFragment extends Fragment{ unlocks = new MobileButton("icon-unlocks", isize, "$text.unlocks", ui.unlocks::show), donate = new MobileButton("icon-donate", isize, "$text.donate", Platform.instance::openDonations); - if(Gdx.graphics.getWidth() > Gdx.graphics.getHeight()){ + if(Core.graphics.getWidth() > Core.graphics.getHeight()){ container.add(play); container.add(join); container.add(load); @@ -134,7 +134,7 @@ public class MenuFragment extends Fragment{ out.row(); - out.add(new MenuButton("icon-exit", "$text.quit", Gdx.app::exit)).width(bw).colspan(2); + out.add(new MenuButton("icon-exit", "$text.quit", Core.app::exit)).width(bw).colspan(2); }); } diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index 378e212125..b533fa2b4d 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.ui.fragments; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.math.Interpolation; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.math.Interpolation; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent; diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java index d9876ef1b3..affab2d0fb 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.ui.fragments; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.g2d.Batch; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.g2d.Batch; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.graphics.Palette; @@ -39,7 +39,7 @@ public class PlayerListFragment extends Fragment{ if(visible && timer.get(20)){ rebuild(); content.pack(); - content.act(Gdx.graphics.getDeltaTime()); + content.act(Core.graphics.getDeltaTime()); //TODO hack Core.scene.act(0f); } diff --git a/core/src/io/anuke/mindustry/world/BarType.java b/core/src/io/anuke/mindustry/world/BarType.java index e5ed5a6d3b..e36a7f4def 100644 --- a/core/src/io/anuke/mindustry/world/BarType.java +++ b/core/src/io/anuke/mindustry/world/BarType.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world; -import com.badlogic.gdx.graphics.Color; +import io.anuke.arc.graphics.Color; public enum BarType{ health(Color.SCARLET), diff --git a/core/src/io/anuke/mindustry/world/BaseBlock.java b/core/src/io/anuke/mindustry/world/BaseBlock.java index 804f12703c..91515e7ea1 100644 --- a/core/src/io/anuke/mindustry/world/BaseBlock.java +++ b/core/src/io/anuke/mindustry/world/BaseBlock.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.fx.EnvironmentFx; import io.anuke.mindustry.entities.TileEntity; diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 0e574b0303..a1027732a3 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.world; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.IntArray; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.IntArray; import io.anuke.mindustry.entities.Damage; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; diff --git a/core/src/io/anuke/mindustry/world/Build.java b/core/src/io/anuke/mindustry/world/Build.java index 991f747387..0cf6fd8b50 100644 --- a/core/src/io/anuke/mindustry/world/Build.java +++ b/core/src/io/anuke/mindustry/world/Build.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.world; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.math.Vector2; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.math.Rectangle; +import io.anuke.arc.math.Vector2; import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.game.EventType.BlockBuildBeginEvent; diff --git a/core/src/io/anuke/mindustry/world/ColorMapper.java b/core/src/io/anuke/mindustry/world/ColorMapper.java index 6d3bdea310..a82a232668 100644 --- a/core/src/io/anuke/mindustry/world/ColorMapper.java +++ b/core/src/io/anuke/mindustry/world/ColorMapper.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.world; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.utils.IntMap; -import com.badlogic.gdx.utils.ObjectIntMap; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.utils.IntMap; +import io.anuke.arc.utils.ObjectIntMap; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.type.ContentType; diff --git a/core/src/io/anuke/mindustry/world/Edges.java b/core/src/io/anuke/mindustry/world/Edges.java index 3ccae39ba1..33aee6b85c 100644 --- a/core/src/io/anuke/mindustry/world/Edges.java +++ b/core/src/io/anuke/mindustry/world/Edges.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.math.Vector2; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.math.Vector2; import io.anuke.ucore.util.Geometry; import io.anuke.ucore.util.Mathf; diff --git a/core/src/io/anuke/mindustry/world/ItemBuffer.java b/core/src/io/anuke/mindustry/world/ItemBuffer.java index ff257db381..0a174a36d0 100644 --- a/core/src/io/anuke/mindustry/world/ItemBuffer.java +++ b/core/src/io/anuke/mindustry/world/ItemBuffer.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world; -import com.badlogic.gdx.utils.NumberUtils; +import io.anuke.arc.utils.NumberUtils; import io.anuke.mindustry.type.Item; import io.anuke.ucore.core.Timers; import io.anuke.ucore.util.Bits; diff --git a/core/src/io/anuke/mindustry/world/LegacyColorMapper.java b/core/src/io/anuke/mindustry/world/LegacyColorMapper.java index bf35c27995..c61a608652 100644 --- a/core/src/io/anuke/mindustry/world/LegacyColorMapper.java +++ b/core/src/io/anuke/mindustry/world/LegacyColorMapper.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.utils.IntMap; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.utils.IntMap; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.OreBlocks; diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index 9bf67eb13e..73ee2cd19e 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.world; -import com.badlogic.gdx.math.GridPoint2; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.math.GridPoint2; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.traits.TargetTrait; diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java index 2d23ec889b..1e8bb26562 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.content.fx.ExplosionFx; diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java index 87dc7b630b..5b744d3513 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Floor.java +++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java @@ -1,10 +1,10 @@ package io.anuke.mindustry.world.blocks; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.MathUtils; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.IntIntMap; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.MathUtils; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.IntIntMap; import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.type.Liquid; diff --git a/core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java b/core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java index 1d640466c6..aa7d75f263 100644 --- a/core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +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; diff --git a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java index 5fcaeb9765..9b1b08833c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.blocks; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.MathUtils; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.MathUtils; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.world.Block; diff --git a/core/src/io/anuke/mindustry/world/blocks/Rock.java b/core/src/io/anuke/mindustry/world/blocks/Rock.java index aecca1b444..1d809e74d3 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Rock.java +++ b/core/src/io/anuke/mindustry/world/blocks/Rock.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.ucore.graphics.Draw; diff --git a/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java b/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java index 8d31879965..88d7fc324b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java +++ b/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.type.Item; import io.anuke.ucore.function.Consumer; import io.anuke.ucore.function.Supplier; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java b/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java index a8aa57e19a..9a7431544c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.world.blocks.defense; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.math.Vector2; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.math.Rectangle; +import io.anuke.arc.math.Vector2; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.game.Team; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java index 1c17e6e9d0..198fa371a1 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.blocks.defense; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.Rectangle; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.Rectangle; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java index 343faa4a9e..848db83e92 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.blocks.defense; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.content.fx.BulletFx; import io.anuke.mindustry.entities.TileEntity; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java index 80cff5f2d5..1de6d18e18 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.world.blocks.defense; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.IntSet; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.IntSet; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.world.Block; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java index a19d6c9649..4f8d706abf 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.world.blocks.defense; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.IntSet; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.IntSet; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.world.Block; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java index 0dd8aa1e2e..3143c2cbb2 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.defense.turrets; -import com.badlogic.gdx.math.Vector2; +import io.anuke.arc.math.Vector2; import io.anuke.mindustry.entities.Predict; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.type.AmmoType; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java index 283c155c3a..ae6938bc1f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.defense.turrets; -import com.badlogic.gdx.utils.ObjectMap; +import io.anuke.arc.utils.ObjectMap; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.type.AmmoEntry; import io.anuke.mindustry.type.AmmoType; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java index 4d71e00681..b535e639eb 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.defense.turrets; -import com.badlogic.gdx.utils.ObjectMap; +import io.anuke.arc.utils.ObjectMap; import io.anuke.mindustry.entities.effect.Fire; import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.type.Item; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java index 5026064b88..3f8dac221e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.world.blocks.defense.turrets; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.entities.Predict; import io.anuke.mindustry.entities.TileEntity; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java index 1abaf16411..8f6237e664 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.distribution; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java index 2812a79a43..20de6aebb0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.world.blocks.distribution; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.LongArray; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.LongArray; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.graphics.Layer; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java index 5d15e6ae9c..d99a116992 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java @@ -1,10 +1,10 @@ package io.anuke.mindustry.world.blocks.distribution; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.utils.IntArray; -import com.badlogic.gdx.utils.IntSet; -import com.badlogic.gdx.utils.IntSet.IntSetIterator; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.utils.IntArray; +import io.anuke.arc.utils.IntSet; +import io.anuke.arc.utils.IntSet.IntSetIterator; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.entities.Player; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java index 88359454cc..1428184a67 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.distribution; -import com.badlogic.gdx.utils.NumberUtils; +import io.anuke.arc.utils.NumberUtils; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Block; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidExtendingBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidExtendingBridge.java index 7f28ea8ec5..5ca2ccedda 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidExtendingBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidExtendingBridge.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.distribution; -import com.badlogic.gdx.utils.IntSet.IntSetIterator; +import io.anuke.arc.utils.IntSet.IntSetIterator; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Pos; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java index ac779754bc..ce10cda6ba 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.distribution; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.BarType; import io.anuke.mindustry.world.Tile; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java index 2c901785c1..6c2c390688 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.world.blocks.distribution; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.utils.ObjectSet; -import com.badlogic.gdx.utils.Pool.Poolable; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.utils.ObjectSet; +import io.anuke.arc.utils.Pool.Poolable; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.content.bullets.TurretBullets; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java index 1705c812db..0524f7b000 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.distribution; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.BarType; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java index d8959d0038..34c6b4b014 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.blocks.power; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.production.GenericCrafter.GenericCrafterEntity; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java index 285cebb5fc..ab69434175 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.blocks.power; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java index 5ea084d47a..a6cac3e1eb 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.blocks.power; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.content.fx.ExplosionFx; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java index af6bdb543b..c1e59a9431 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.world.blocks.power; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.IntSet; -import com.badlogic.gdx.utils.ObjectSet; -import com.badlogic.gdx.utils.Queue; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.IntSet; +import io.anuke.arc.utils.ObjectSet; +import io.anuke.arc.utils.Queue; import io.anuke.mindustry.world.Tile; import static io.anuke.mindustry.Vars.threads; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java index 3ac43cc98d..5cd5634709 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.power; -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.Player; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Compressor.java b/core/src/io/anuke/mindustry/world/blocks/production/Compressor.java index 189dfd1456..f6a0eafc27 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Compressor.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Compressor.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.blocks.production; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.production.GenericCrafter.GenericCrafterEntity; import io.anuke.ucore.graphics.Draw; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java index b3a7c6ef8d..21ae7112a8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.blocks.production; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.fx.Fx; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java index 212a71168b..53acab914b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.world.blocks.production; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.ObjectIntMap; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.utils.Array; +import io.anuke.arc.utils.ObjectIntMap; import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.entities.TileEntity; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java b/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java index 4c8fd24934..200fb4c965 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.production; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Tile; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java index a0e08537f3..5a5fd41e03 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.production; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.entities.TileEntity; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java b/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java index 0076498e26..a9ca1a7b84 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.production; -import com.badlogic.gdx.graphics.Color; +import io.anuke.arc.graphics.Color; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java b/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java index c14533d27f..f6249686c3 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.production; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.Vars; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Shaders; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/PlastaniumCompressor.java b/core/src/io/anuke/mindustry/world/blocks/production/PlastaniumCompressor.java index 6b8a931b1c..a88f0a9e55 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/PlastaniumCompressor.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/PlastaniumCompressor.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.production; -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.Mathf; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java b/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java index a1e587315a..f4d0abceb0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.blocks.production; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Pulverizer.java b/core/src/io/anuke/mindustry/world/blocks/production/Pulverizer.java index 72f80e138b..dd7d87d4ac 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Pulverizer.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Pulverizer.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.production; -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; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java index 939587fa60..b8de5fc2e4 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.blocks.production; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.graphics.Layer; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Separator.java b/core/src/io/anuke/mindustry/world/blocks/production/Separator.java index 50ab3fa2cb..4fe5637f97 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Separator.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Separator.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.blocks.production; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.entities.TileEntity; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java b/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java index e0481663f8..f1b7200598 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.production; -import com.badlogic.gdx.graphics.Color; +import io.anuke.arc.graphics.Color; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java index 46a30bca31..26c5390307 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.production; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.entities.TileEntity; diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java index 33f98fd2ce..72da901159 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.storage; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.Vars; diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java b/core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java index 7db33b0cac..72c5da2b88 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.storage; -import com.badlogic.gdx.graphics.Color; +import io.anuke.arc.graphics.Color; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.entities.Player; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java index f8ca2beb6a..2c81810d7e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.world.blocks.units; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.utils.ObjectSet; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.utils.ObjectSet; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.content.fx.BlockFx; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java index e2c226a348..3e7f247d57 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.units; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.Vars; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java b/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java index 128c962086..b728892c01 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.units; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.Vars; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java index c581103634..a3757c1049 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.world.blocks.units; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.math.Rectangle; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.Rectangle; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.Units; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java index d7856bf1b3..211d7b5494 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.units; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.Vars; diff --git a/core/src/io/anuke/mindustry/world/consumers/Consume.java b/core/src/io/anuke/mindustry/world/consumers/Consume.java index f8456fc9e9..754ffcf9c4 100644 --- a/core/src/io/anuke/mindustry/world/consumers/Consume.java +++ b/core/src/io/anuke/mindustry/world/consumers/Consume.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.consumers; -import com.badlogic.gdx.graphics.Color; +import io.anuke.arc.graphics.Color; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.world.Block; diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java index c7c24114a4..7c5621bace 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.consumers; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Block; diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java index 03750ffa3b..3562f4c1c5 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.consumers; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Block; diff --git a/core/src/io/anuke/mindustry/world/consumers/Consumers.java b/core/src/io/anuke/mindustry/world/consumers/Consumers.java index 5ebf1dd1cd..bbac912e22 100644 --- a/core/src/io/anuke/mindustry/world/consumers/Consumers.java +++ b/core/src/io/anuke/mindustry/world/consumers/Consumers.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.consumers; -import com.badlogic.gdx.utils.ObjectMap; -import com.badlogic.gdx.utils.ObjectSet; +import io.anuke.arc.utils.ObjectMap; +import io.anuke.arc.utils.ObjectSet; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.Liquid; diff --git a/core/src/io/anuke/mindustry/world/meta/BlockBars.java b/core/src/io/anuke/mindustry/world/meta/BlockBars.java index 35507b616b..39e7078e15 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockBars.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockBars.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.meta; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.world.BarType; public class BlockBars{ diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStats.java b/core/src/io/anuke/mindustry/world/meta/BlockStats.java index 105222cf7a..ae3de7eb86 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockStats.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockStats.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.meta; -import com.badlogic.gdx.utils.ObjectMap.Entry; -import com.badlogic.gdx.utils.OrderedMap; +import io.anuke.arc.utils.ObjectMap.Entry; +import io.anuke.arc.utils.OrderedMap; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.Liquid; diff --git a/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java b/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java index 0f917dda71..c75c26c8b2 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.meta.values; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.ui.ItemDisplay; import io.anuke.mindustry.world.meta.StatValue; diff --git a/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java b/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java index 7c5d638be9..efafdba7a8 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.meta.values; -import com.badlogic.gdx.utils.Array; +import io.anuke.arc.utils.Array; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.ui.LiquidDisplay; import io.anuke.mindustry.world.meta.StatValue; diff --git a/core/src/io/anuke/mindustry/world/modules/PowerModule.java b/core/src/io/anuke/mindustry/world/modules/PowerModule.java index b2a7342e84..84a31a2df1 100644 --- a/core/src/io/anuke/mindustry/world/modules/PowerModule.java +++ b/core/src/io/anuke/mindustry/world/modules/PowerModule.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.modules; -import com.badlogic.gdx.utils.IntArray; +import io.anuke.arc.utils.IntArray; import io.anuke.mindustry.world.blocks.power.PowerGraph; import java.io.DataInput; diff --git a/settings.gradle b/settings.gradle index e788ba34a4..88ac45956d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,11 +15,13 @@ if(new File(settingsDir, 'local.properties').exists()){ } if(System.properties["release"] == null || System.properties["release"] == "false"){ - if (new File(settingsDir, '../uCore').exists()) { - include ':uCore' - project(':uCore').projectDir = new File(settingsDir, '../uCore') + if (new File(settingsDir, '../Arc').exists()) { + //ARC ARC ARC ARC ARC + include ':Arc' + project(':Arc').projectDir = new File(settingsDir, '../Arc') + include ':Arc:core' + project(':Arc:core').projectDir = new File(settingsDir, '../Arc/core') } - if (new File(settingsDir, '../GDXGifRecorder').exists()) { include ':GDXGifRecorder' project(':GDXGifRecorder').projectDir = new File(settingsDir, '../GDXGifRecorder')