diff --git a/build.gradle b/build.gradle index 0dfc8affba..086c056df0 100644 --- a/build.gradle +++ b/build.gradle @@ -268,7 +268,7 @@ project(":tools"){ compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop" - compile arcModule("backends:backend-lwjgl3") + compile arcModule("backends:backend-sdl") } } diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index 8059329566..0bbc2defbd 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -20,7 +20,7 @@ import static io.anuke.mindustry.Vars.*; public class Maps implements Disposable{ /** List of all built-in maps. Filenames only. */ - private static String[] defaultMapNames = {"fortress", "labyrinth", "islands", "tendrils", "caldera", "glacier", "veins", "canyon", "shattered", "wasteland"}; + private static String[] defaultMapNames = {"fortress", "labyrinth", "islands", "tendrils", "caldera", "glacier", "shattered", "wasteland", "veins", "canyon"}; /** All maps stored in an ordered array. */ private Array maps = new Array<>(); /** Serializer for meta. */ diff --git a/tools/src/io/anuke/mindustry/Upscaler.java b/tools/src/io/anuke/mindustry/Upscaler.java index 1d6308049f..c2fcdb608a 100644 --- a/tools/src/io/anuke/mindustry/Upscaler.java +++ b/tools/src/io/anuke/mindustry/Upscaler.java @@ -1,16 +1,11 @@ package io.anuke.mindustry; -import io.anuke.arc.ApplicationListener; -import io.anuke.arc.Core; -import io.anuke.arc.backends.lwjgl3.Lwjgl3Application; -import io.anuke.arc.backends.lwjgl3.Lwjgl3ApplicationConfiguration; -import io.anuke.arc.files.FileHandle; -import io.anuke.arc.graphics.Pixmap; -import io.anuke.arc.graphics.Pixmaps; -import io.anuke.arc.graphics.g2d.SpriteBatch; -import io.anuke.arc.graphics.g2d.TextureAtlas; -import io.anuke.arc.util.Log; -import io.anuke.arc.util.Time; +import io.anuke.arc.*; +import io.anuke.arc.backends.sdl.*; +import io.anuke.arc.files.*; +import io.anuke.arc.graphics.*; +import io.anuke.arc.graphics.g2d.*; +import io.anuke.arc.util.*; public class Upscaler{ static Res[] resolutions = { @@ -20,13 +15,13 @@ public class Upscaler{ }; public static void main(String[] args){ - new Lwjgl3Application(new ApplicationListener(){ + new SdlApplication(new ApplicationListener(){ @Override public void init(){ scale(); } - }, new Lwjgl3ApplicationConfiguration(){{ - setInitialVisible(false); + }, new SdlConfig(){{ + initialVisible = false; }}); }