diff --git a/build.gradle b/build.gradle index 2c937ec278..59a84fe698 100644 --- a/build.gradle +++ b/build.gradle @@ -79,7 +79,7 @@ project(":core") { apply plugin: "java" dependencies { - compile 'com.github.anuken:ucore:fa05e4e0d1' + compile 'com.github.anuken:ucore:e3f3890a4c' compile "com.badlogicgames.gdx:gdx:$gdxVersion" compile "com.badlogicgames.gdx:gdx-ai:1.8.1" } diff --git a/core/assets/maps/delta.png b/core/assets/maps/delta.png index ef5a6eafbd..9e2c2f6713 100644 Binary files a/core/assets/maps/delta.png and b/core/assets/maps/delta.png differ diff --git a/core/assets/maps/map.png b/core/assets/maps/map.png deleted file mode 100644 index 6b0358b633..0000000000 Binary files a/core/assets/maps/map.png and /dev/null differ diff --git a/core/src/io/anuke/mindustry/Control.java b/core/src/io/anuke/mindustry/Control.java index 5bb71ff718..01493b9346 100644 --- a/core/src/io/anuke/mindustry/Control.java +++ b/core/src/io/anuke/mindustry/Control.java @@ -47,9 +47,7 @@ public class Control extends Module{ float respawntime; public Control(){ - String[] args = Mindustry.args; - - if(args.length > 0 && args[0].equals("-debug")){ + if(Mindustry.args.contains("-debug", false)){ Vars.debug = true; } diff --git a/core/src/io/anuke/mindustry/Mindustry.java b/core/src/io/anuke/mindustry/Mindustry.java index 50f5a0f153..41b6ead324 100644 --- a/core/src/io/anuke/mindustry/Mindustry.java +++ b/core/src/io/anuke/mindustry/Mindustry.java @@ -2,6 +2,8 @@ package io.anuke.mindustry; import java.util.Date; +import com.badlogic.gdx.utils.Array; + import io.anuke.mindustry.GameState.State; import io.anuke.mindustry.io.Formatter; import io.anuke.ucore.core.Inputs; @@ -9,7 +11,7 @@ import io.anuke.ucore.core.Timers; import io.anuke.ucore.modules.ModuleCore; public class Mindustry extends ModuleCore { - public static String[] args = {}; + public static Array args = new Array<>(); public static Formatter formatter = new Formatter(){ @Override diff --git a/core/src/io/anuke/mindustry/Renderer.java b/core/src/io/anuke/mindustry/Renderer.java index 465fb4361a..41d9e01931 100644 --- a/core/src/io/anuke/mindustry/Renderer.java +++ b/core/src/io/anuke/mindustry/Renderer.java @@ -40,7 +40,7 @@ public class Renderer extends RendererModule{ Core.cameraScale = baseCameraScale; pixelate(); - Draw.addSurface("shadow", Core.cameraScale); + Graphics.addSurface("shadow", Core.cameraScale); Shaders.create(); } @@ -141,7 +141,7 @@ public class Renderer extends RendererModule{ OrthographicCamera camera = Core.camera; - Draw.end(); + Graphics.end(); int crangex = (int) (camera.viewportWidth / (chunksize * tilesize)) + 1; int crangey = (int) (camera.viewportHeight / (chunksize * tilesize)) + 1; @@ -162,7 +162,7 @@ public class Renderer extends RendererModule{ } } - Draw.begin(); + Graphics.begin(); Draw.reset(); int rangex = (int) (camera.viewportWidth * camera.zoom / tilesize / 2) + 2; @@ -175,7 +175,7 @@ public class Renderer extends RendererModule{ //2 = over blocks for(int l = (noshadows ? 1 : 0); l < 3; l++){ if(l == 0){ - Draw.surface("shadow"); + Graphics.surface("shadow"); } for(int x = -rangex; x <= rangex; x++){ @@ -200,7 +200,7 @@ public class Renderer extends RendererModule{ if(l == 0){ Draw.color(0, 0, 0, 0.15f); - Draw.flushSurface(); + Graphics.flushSurface(); Draw.color(); } } @@ -348,8 +348,8 @@ public class Renderer extends RendererModule{ public void setCameraScale(int amount){ targetscale = amount; clampScale(); - Draw.getSurface("pixel").setScale(targetscale); - Draw.getSurface("shadow").setScale(targetscale); + Graphics.getSurface("pixel").setScale(targetscale); + Graphics.getSurface("shadow").setScale(targetscale); } public void scaleCamera(int amount){ diff --git a/core/src/io/anuke/mindustry/UI.java b/core/src/io/anuke/mindustry/UI.java index 6ec7f04563..85d627fc00 100644 --- a/core/src/io/anuke/mindustry/UI.java +++ b/core/src/io/anuke/mindustry/UI.java @@ -80,7 +80,7 @@ public class UI extends SceneModule{ TextureRegion back = Draw.region("background"); float backscl = 5; - Draw.batch().draw(back, w/2 - back.getRegionWidth()*backscl/2, h/2 - back.getRegionHeight()*backscl/2, + Core.batch.draw(back, w/2 - back.getRegionWidth()*backscl/2, h/2 - back.getRegionHeight()*backscl/2, back.getRegionWidth()*backscl, back.getRegionHeight()*backscl); float logoscl = (int)Unit.dp.inPixels(7); @@ -89,7 +89,7 @@ public class UI extends SceneModule{ float logoh = logo.getRegionHeight()*logoscl; Draw.color(); - Draw.batch().draw(logo, w/2 - logow/2, h - logoh + 15, logow, logoh); + Core.batch.draw(logo, w/2 - logow/2, h - logoh + 15, logow, logoh); Draw.color(); @@ -386,6 +386,10 @@ public class UI extends SceneModule{ levels.show(); }); + new button("Tutorial", ()->{ + //TODO + }); + if(Gdx.app.getType() != ApplicationType.WebGL){ row(); diff --git a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java index 10cdf1d52e..e29b905dea 100644 --- a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java +++ b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java @@ -12,9 +12,7 @@ import io.anuke.mindustry.entities.BulletType; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.World; -import io.anuke.ucore.core.Draw; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Timers; +import io.anuke.ucore.core.*; import io.anuke.ucore.entities.*; import io.anuke.ucore.util.Mathf; @@ -173,12 +171,12 @@ public class Enemy extends DestructibleEntity{ String region = ClassReflection.getSimpleName(getClass()).toLowerCase() + "-t" + Mathf.clamp(tier, 1, 3); //TODO is this really necessary? - Draw.getShader(Outline.class).color.set(tierColors[tier-1]); - Draw.getShader(Outline.class).region = Draw.region(region); + Graphics.getShader(Outline.class).color.set(tierColors[tier-1]); + Graphics.getShader(Outline.class).region = Draw.region(region); - Draw.shader(Outline.class); + Graphics.shader(Outline.class); Draw.color(); Draw.rect(region, x, y, direction.angle()-90); - Draw.shader(); + Graphics.shader(); } } diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 1ef0c9c4a4..9eadf7daa9 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -6,6 +6,7 @@ import java.util.Date; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration; +import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.Mindustry; import io.anuke.mindustry.io.Formatter; @@ -34,7 +35,7 @@ public class DesktopLauncher { } }; - Mindustry.args = arg; + Mindustry.args = Array.with(arg); new Lwjgl3Application(new Mindustry(), config); }