diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java index c75b6af249..07fb4ce0c0 100644 --- a/android/src/io/anuke/mindustry/AndroidLauncher.java +++ b/android/src/io/anuke/mindustry/AndroidLauncher.java @@ -8,7 +8,7 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.provider.Settings.Secure; +import android.provider.Core.settings.Secure; import android.telephony.TelephonyManager; import android.util.Log; import com.badlogic.gdx.Gdx; @@ -26,10 +26,10 @@ import io.anuke.mindustry.game.Saves.SaveSlot; import io.anuke.mindustry.io.SaveIO; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.ui.dialogs.FileChooser; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.scene.ui.layout.Unit; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Strings; import java.io.File; import java.io.FileInputStream; @@ -171,7 +171,7 @@ public class AndroidLauncher extends PatchedAndroidApplication{ SaveSlot slot = control.saves.importSave(file); ui.load.runLoadSave(slot); }catch(IOException e){ - ui.showError(Bundles.format("text.save.import.fail", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("text.save.import.fail", Strings.parseException(e, false))); } }else{ ui.showError("$text.save.import.invalid"); diff --git a/annotations/src/main/java/io/anuke/annotations/RemoteWriteGenerator.java b/annotations/src/main/java/io/anuke/annotations/RemoteWriteGenerator.java index 51845d0900..4ee8aec0df 100644 --- a/annotations/src/main/java/io/anuke/annotations/RemoteWriteGenerator.java +++ b/annotations/src/main/java/io/anuke/annotations/RemoteWriteGenerator.java @@ -129,7 +129,7 @@ public class RemoteWriteGenerator{ method.beginControlFlow("if(" + getCheckString(methodEntry.where) + ")"); //add statement to create packet from pool - method.addStatement("$1N packet = $2N.obtain($1N.class, $1N::new)", "io.anuke.mindustry.net.Packets.InvokePacket", "io.anuke.ucore.util.Pooling"); + method.addStatement("$1N packet = $2N.obtain($1N.class, $1N::new)", "io.anuke.mindustry.net.Packets.InvokePacket", "io.anuke.arc.util.Pooling"); //assign buffer method.addStatement("packet.writeBuffer = TEMP_BUFFER"); //assign priority diff --git a/annotations/src/main/java/io/anuke/annotations/SerializeAnnotationProcessor.java b/annotations/src/main/java/io/anuke/annotations/SerializeAnnotationProcessor.java index e42b877495..2fad06df7c 100644 --- a/annotations/src/main/java/io/anuke/annotations/SerializeAnnotationProcessor.java +++ b/annotations/src/main/java/io/anuke/annotations/SerializeAnnotationProcessor.java @@ -53,7 +53,7 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{ TypeSpec.Builder serializer = TypeSpec.anonymousClassBuilder("") .addSuperinterface(ParameterizedTypeName.get( - ClassName.bestGuess("io.anuke.ucore.io.TypeSerializer"), type)); + ClassName.bestGuess("io.anuke.arc.io.TypeSerializer"), type)); MethodSpec.Builder writeMethod = MethodSpec.methodBuilder("write") .returns(void.class) @@ -84,8 +84,8 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{ writeMethod.addStatement("stream.write" + capName + "(object." + name + ")"); readMethod.addStatement("object." + name + "= stream.read" + capName + "()"); }else{ - writeMethod.addStatement("io.anuke.ucore.core.Settings.getSerializer(" + typeName+ ".class).write(stream, object." + name + ")"); - readMethod.addStatement("object." + name + " = (" +typeName+")io.anuke.ucore.core.Settings.getSerializer(" + typeName+ ".class).read(stream)"); + writeMethod.addStatement("io.anuke.arc.core.Core.settings.getSerializer(" + typeName+ ".class).write(stream, object." + name + ")"); + readMethod.addStatement("object." + name + " = (" +typeName+")io.anuke.arc.core.Core.settings.getSerializer(" + typeName+ ".class).read(stream)"); } } @@ -94,7 +94,7 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{ serializer.addMethod(writeMethod.build()); serializer.addMethod(readMethod.build()); - method.addStatement("io.anuke.ucore.core.Settings.setSerializer($N, $L)", Utils.elementUtils.getBinaryName(elem).toString().replace('$', '.') + ".class", serializer.build()); + method.addStatement("io.anuke.arc.core.Core.settings.setSerializer($N, $L)", Utils.elementUtils.getBinaryName(elem).toString().replace('$', '.') + ".class", serializer.build()); } classBuilder.addMethod(method.build()); diff --git a/core/src/io/anuke/mindustry/Mindustry.java b/core/src/io/anuke/mindustry/Mindustry.java index ce5c64e8bb..c0ad31f3eb 100644 --- a/core/src/io/anuke/mindustry/Mindustry.java +++ b/core/src/io/anuke/mindustry/Mindustry.java @@ -1,20 +1,28 @@ package io.anuke.mindustry; +import io.anuke.arc.ApplicationListener; +import io.anuke.arc.Core; +import io.anuke.arc.Events; +import io.anuke.arc.Settings; +import io.anuke.arc.utils.Log; +import io.anuke.arc.utils.Time; +import io.anuke.arc.utils.TimeUtils; import io.anuke.mindustry.core.*; import io.anuke.mindustry.game.EventType.GameLoadEvent; import io.anuke.mindustry.io.BundleLoader; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.modules.ModuleCore; -import io.anuke.ucore.util.Log; import static io.anuke.mindustry.Vars.*; -public class Mindustry extends ModuleCore{ +public class Mindustry implements ApplicationListener{ + private long lastFrameTime; - @Override - public void init(){ - Timers.mark(); + public Mindustry(){ + Time.setDeltaProvider(() -> { + float result = Core.graphics.getDeltaTime() * 60f; + return Float.isNaN(result) || Float.isInfinite(result) ? 1f : Math.min(result, 60f / 10f); + }); + + Time.mark(); Vars.init(); @@ -22,26 +30,40 @@ public class Mindustry extends ModuleCore{ BundleLoader.load(); content.load(); - module(logic = new Logic()); - module(world = new World()); - module(control = new Control()); - module(renderer = new Renderer()); - module(ui = new UI()); - module(netServer = new NetServer()); - module(netClient = new NetClient()); + Core.app.addListener(logic = new Logic()); + Core.app.addListener(world = new World()); + Core.app.addListener(control = new Control()); + Core.app.addListener(renderer = new Renderer()); + Core.app.addListener(ui = new UI()); + Core.app.addListener(netServer = new NetServer()); + Core.app.addListener(netClient = new NetClient()); } @Override - public void postInit(){ - Log.info("Time to load [total]: {0}", Timers.elapsed()); + public void init(){ + Log.info("Time to load [total]: {0}", Time.elapsed()); Events.fire(new GameLoadEvent()); } @Override - public void render(){ - threads.handleBeginRender(); - super.render(); - threads.handleEndRender(); + public void update(){ + lastFrameTime = TimeUtils.millis(); + + //TODO ??render it all?? + + int fpsCap = Core.settings.getInt("fpscap", 125); + + if(fpsCap <= 120){ + long target = 1000/fpsCap; + long elapsed = TimeUtils.timeSinceMillis(lastFrameTime); + if(elapsed < target){ + try{ + Thread.sleep(target - elapsed); + }catch(InterruptedException e){ + e.printStackTrace(); + } + } + } } } diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 676f6be729..4fa818fa9c 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -17,13 +17,13 @@ import io.anuke.mindustry.game.Version; import io.anuke.mindustry.gen.Serialization; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.world.blocks.defense.ForceProjector.ShieldEntity; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.entities.Entities; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.impl.EffectEntity; -import io.anuke.ucore.entities.trait.DrawTrait; -import io.anuke.ucore.scene.ui.layout.Unit; -import io.anuke.ucore.util.Translator; +import io.anuke.arc.core.Settings; +import io.anuke.arc.entities.Entities; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.entities.impl.EffectEntity; +import io.anuke.arc.entities.trait.DrawTrait; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.util.Translator; import java.util.Arrays; import java.util.Locale; @@ -173,7 +173,7 @@ public class Vars{ ios = Core.app.getType() == ApplicationType.iOS; android = Core.app.getType() == ApplicationType.Android; - dataDirectory = Settings.getDataDirectory(appName); + dataDirectory = Core.settings.getDataDirectory(appName); screenshotDirectory = dataDirectory.child("screenshots/"); customMapDirectory = dataDirectory.child("maps/"); saveDirectory = dataDirectory.child("saves/"); diff --git a/core/src/io/anuke/mindustry/ai/BlockIndexer.java b/core/src/io/anuke/mindustry/ai/BlockIndexer.java index 81cc149e96..3277e53e5c 100644 --- a/core/src/io/anuke/mindustry/ai/BlockIndexer.java +++ b/core/src/io/anuke/mindustry/ai/BlockIndexer.java @@ -11,12 +11,12 @@ import io.anuke.mindustry.game.Teams.TeamData; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockFlag; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.function.Predicate; -import io.anuke.ucore.util.EnumSet; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.ThreadArray; +import io.anuke.arc.core.Events; +import io.anuke.arc.function.Predicate; +import io.anuke.arc.util.EnumSet; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.ThreadArray; import static io.anuke.mindustry.Vars.*; diff --git a/core/src/io/anuke/mindustry/ai/Pathfinder.java b/core/src/io/anuke/mindustry/ai/Pathfinder.java index 2d85629476..ac7a07c727 100644 --- a/core/src/io/anuke/mindustry/ai/Pathfinder.java +++ b/core/src/io/anuke/mindustry/ai/Pathfinder.java @@ -11,10 +11,10 @@ import io.anuke.mindustry.game.Teams.TeamData; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockFlag; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Structs; +import io.anuke.arc.core.Events; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Structs; import static io.anuke.mindustry.Vars.state; import static io.anuke.mindustry.Vars.world; @@ -168,7 +168,7 @@ public class Pathfinder{ } private void clear(){ - Timers.mark(); + Time.mark(); paths = new PathData[Team.all.length]; blocked.clear(); diff --git a/core/src/io/anuke/mindustry/ai/WaveSpawner.java b/core/src/io/anuke/mindustry/ai/WaveSpawner.java index eea73cea0d..8a80641e57 100644 --- a/core/src/io/anuke/mindustry/ai/WaveSpawner.java +++ b/core/src/io/anuke/mindustry/ai/WaveSpawner.java @@ -9,10 +9,10 @@ import io.anuke.mindustry.game.SpawnGroup; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Waves; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.util.GridBits; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Structs; +import io.anuke.arc.core.Events; +import io.anuke.arc.util.GridBits; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Structs; import java.io.DataInput; import java.io.DataOutput; diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index 8d99633814..839cfd1290 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -17,12 +17,12 @@ import io.anuke.mindustry.maps.TutorialSector; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.Mech; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.unitGroups; @@ -100,7 +100,7 @@ public class Mechs implements ContentList{ Effects.shake(1f, 1f, player); Effects.effect(UnitFx.landShock, player); for(int i = 0; i < 8; i++){ - Timers.run(Mathf.random(8f), () -> Lightning.create(player.getTeam(), Palette.lancerLaser, 17f, player.x, player.y, Mathf.random(360f), 14)); + Time.run(Mathf.random(8f), () -> Lightning.create(player.getTeam(), Palette.lancerLaser, 17f, player.x, player.y, Mathf.random(360f), 14)); } } } @@ -205,7 +205,7 @@ public class Mechs implements ContentList{ float alpha = Core.batch.getColor().a; Shaders.build.progress = player.shootHeat; Shaders.build.region = armorRegion; - Shaders.build.time = Timers.time() / 10f; + Shaders.build.time = Time.time() / 10f; Shaders.build.color.set(Palette.accent).a = player.shootHeat; Graphics.shader(Shaders.build); Draw.alpha(1f); @@ -257,7 +257,7 @@ public class Mechs implements ContentList{ @Override public void updateAlt(Player player){ float scl = scld(player); - if(Mathf.chance(Timers.delta() * (0.15*scl))){ + if(Mathf.chance(Time.delta() * (0.15*scl))){ Effects.effect(BulletFx.hitLancer, Palette.lancerLaser, player.x, player.y); Lightning.create(player.getTeam(), Palette.lancerLaser, 10f, player.x + player.getVelocity().x, player.y + player.getVelocity().y, player.rotation, 14); diff --git a/core/src/io/anuke/mindustry/content/StatusEffects.java b/core/src/io/anuke/mindustry/content/StatusEffects.java index 62e1de504f..de817c5568 100644 --- a/core/src/io/anuke/mindustry/content/StatusEffects.java +++ b/core/src/io/anuke/mindustry/content/StatusEffects.java @@ -6,9 +6,9 @@ import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.StatusEffect; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Mathf; public class StatusEffects implements ContentList{ public static StatusEffect none, burning, freezing, wet, melting, tarred, overdrive, shielded, shocked; @@ -38,7 +38,7 @@ public class StatusEffects implements ContentList{ public void update(Unit unit, float time){ unit.damagePeriodic(0.04f); - if(Mathf.chance(Timers.delta() * 0.2f)){ + if(Mathf.chance(Time.delta() * 0.2f)){ Effects.effect(EnvironmentFx.burning, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); } } @@ -54,7 +54,7 @@ public class StatusEffects implements ContentList{ @Override public void update(Unit unit, float time){ - if(Mathf.chance(Timers.delta() * 0.15f)){ + if(Mathf.chance(Time.delta() * 0.15f)){ Effects.effect(EnvironmentFx.freezing, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); } } @@ -79,7 +79,7 @@ public class StatusEffects implements ContentList{ @Override public void update(Unit unit, float time){ - if(Mathf.chance(Timers.delta() * 0.15f)){ + if(Mathf.chance(Time.delta() * 0.15f)){ Effects.effect(EnvironmentFx.wet, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); } } @@ -105,7 +105,7 @@ public class StatusEffects implements ContentList{ public void update(Unit unit, float time){ unit.damagePeriodic(0.3f); - if(Mathf.chance(Timers.delta() * 0.2f)){ + if(Mathf.chance(Time.delta() * 0.2f)){ Effects.effect(EnvironmentFx.melting, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); } } @@ -118,7 +118,7 @@ public class StatusEffects implements ContentList{ @Override public void update(Unit unit, float time){ - if(Mathf.chance(Timers.delta() * 0.15f)){ + if(Mathf.chance(Time.delta() * 0.15f)){ Effects.effect(EnvironmentFx.oily, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); } } @@ -143,9 +143,9 @@ public class StatusEffects implements ContentList{ @Override public void update(Unit unit, float time){ //idle regen boosted - unit.health += 0.01f * Timers.delta(); + unit.health += 0.01f * Time.delta(); - if(Mathf.chance(Timers.delta() * 0.25f)){ + if(Mathf.chance(Time.delta() * 0.25f)){ Effects.effect(EnvironmentFx.overdriven, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f), 0f, unit); } } diff --git a/core/src/io/anuke/mindustry/content/blocks/Blocks.java b/core/src/io/anuke/mindustry/content/blocks/Blocks.java index b28d0ce587..87d863b07f 100644 --- a/core/src/io/anuke/mindustry/content/blocks/Blocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/Blocks.java @@ -10,10 +10,10 @@ import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.*; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Mathf; public class Blocks extends BlockList implements ContentList{ public static Block air, blockpart, spawn, space, metalfloor, deepwater, water, lava, tar, stone, @@ -41,7 +41,7 @@ public class Blocks extends BlockList implements ContentList{ public void draw(Tile tile){ Draw.color(Color.SCARLET); - Lines.circle(tile.worldx(), tile.worldy(), 4f +Mathf.absin(Timers.time(), 6f, 6f)); + Lines.circle(tile.worldx(), tile.worldy(), 4f +Mathf.absin(Time.time(), 6f, 6f)); Draw.color(); } }; diff --git a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java index b22c30a8f1..e0e56e5d3f 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java @@ -17,10 +17,10 @@ import io.anuke.mindustry.world.blocks.PowerBlock; import io.anuke.mindustry.world.blocks.distribution.Sorter; import io.anuke.mindustry.world.blocks.power.PowerNode; import io.anuke.mindustry.world.meta.BlockStat; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.scene.ui.ButtonGroup; -import io.anuke.ucore.scene.ui.ImageButton; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.scene.ui.ButtonGroup; +import io.anuke.arc.scene.ui.ImageButton; +import io.anuke.arc.scene.ui.layout.Table; import java.io.DataInput; import java.io.DataOutput; diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java index 8654d5bd5b..600f8d21e2 100644 --- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java @@ -8,9 +8,9 @@ import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.defense.turrets.*; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; public class TurretBlocks extends BlockList implements ContentList{ public static Block duo, /*scatter,*/ diff --git a/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java b/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java index 158c4240fa..fcb4d41055 100644 --- a/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.entities.bullet.FlakBulletType; import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.game.ContentList; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.util.Mathf; public class FlakBullets extends BulletList implements ContentList{ public static BulletType plastic, explosive, surge; diff --git a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java index eef5a08fd0..e5b2bc39d2 100644 --- a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java @@ -8,8 +8,8 @@ import io.anuke.mindustry.entities.bullet.MissileBulletType; import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.game.ContentList; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Mathf; public class MissileBullets extends BulletList implements ContentList{ public static BulletType explosive, incindiary, surge, javelin, swarm; @@ -92,7 +92,7 @@ public class MissileBullets extends BulletList implements ContentList{ @Override public void update(Bullet b){ super.update(b); - b.getVelocity().rotate(Mathf.sin(Timers.time() + b.id * 4422, 8f, 2f)); + b.getVelocity().rotate(Mathf.sin(Time.time() + b.id * 4422, 8f, 2f)); } }; @@ -117,7 +117,7 @@ public class MissileBullets extends BulletList implements ContentList{ @Override public void update(Bullet b){ super.update(b); - b.getVelocity().rotate(Mathf.sin(Timers.time() + b.id * 4422, 8f, 2f)); + b.getVelocity().rotate(Mathf.sin(Time.time() + b.id * 4422, 8f, 2f)); } }; } diff --git a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java index 9f89f4e926..685613814e 100644 --- a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java @@ -18,11 +18,11 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.BuildBlock; import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.*; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.*; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.content; import static io.anuke.mindustry.Vars.world; @@ -105,18 +105,18 @@ public class TurretBullets extends BulletList implements ContentList{ @Override public void update(Bullet b){ - if(Mathf.chance(0.04 * Timers.delta())){ + if(Mathf.chance(0.04 * Time.delta())){ Tile tile = world.tileWorld(b.x, b.y); if(tile != null){ Fire.create(tile); } } - if(Mathf.chance(0.1 * Timers.delta())){ + if(Mathf.chance(0.1 * Time.delta())){ Effects.effect(EnvironmentFx.fireballsmoke, b.x, b.y); } - if(Mathf.chance(0.1 * Timers.delta())){ + if(Mathf.chance(0.1 * Time.delta())){ Effects.effect(EnvironmentFx.ballfire, b.x, b.y); } } @@ -213,10 +213,10 @@ public class TurretBullets extends BulletList implements ContentList{ Lines.lineAngle(b.x, b.y, b.angle(), baseLen); for(int s = 0; s < colors.length; s++){ - Draw.color(tmpColor.set(colors[s]).mul(1f + Mathf.absin(Timers.time(), 1f, 0.1f))); + Draw.color(tmpColor.set(colors[s]).mul(1f + Mathf.absin(Time.time(), 1f, 0.1f))); for(int i = 0; i < tscales.length; i++){ vector.trns(b.angle() + 180f, (lenscales[i] - 1f) * 35f); - Lines.stroke((9f + Mathf.absin(Timers.time(), 0.8f, 1.5f)) * b.fout() * strokes[s] * tscales[i]); + Lines.stroke((9f + Mathf.absin(Time.time(), 0.8f, 1.5f)) * b.fout() * strokes[s] * tscales[i]); Lines.lineAngle(b.x + vector.x, b.y + vector.y, b.angle(), baseLen * lenscales[i], CapStyle.none); } } diff --git a/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java b/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java index e1c6d5b27d..67d51f3899 100644 --- a/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java @@ -12,7 +12,7 @@ import io.anuke.mindustry.entities.effect.Fire; import io.anuke.mindustry.entities.effect.Puddle; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.world; diff --git a/core/src/io/anuke/mindustry/content/fx/BlockFx.java b/core/src/io/anuke/mindustry/content/fx/BlockFx.java index 167f80b8ef..5155ae9d20 100644 --- a/core/src/io/anuke/mindustry/content/fx/BlockFx.java +++ b/core/src/io/anuke/mindustry/content/fx/BlockFx.java @@ -4,14 +4,14 @@ import io.anuke.arc.graphics.Color; import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.game.ContentList; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.graphics.Hue; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Tmp; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.graphics.Hue; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Tmp; import static io.anuke.mindustry.Vars.tilesize; diff --git a/core/src/io/anuke/mindustry/content/fx/BulletFx.java b/core/src/io/anuke/mindustry/content/fx/BulletFx.java index 5cfc74454b..dffe6b4357 100644 --- a/core/src/io/anuke/mindustry/content/fx/BulletFx.java +++ b/core/src/io/anuke/mindustry/content/fx/BulletFx.java @@ -3,12 +3,12 @@ package io.anuke.mindustry.content.fx; import io.anuke.arc.graphics.Color; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.game.ContentList; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; public class BulletFx extends FxList implements ContentList{ public static Effect hitBulletSmall, hitFuse, hitBulletBig, hitFlameSmall, hitLiquid, hitLaser, hitLancer, hitMeltdown, despawn, flakExplosion, blastExplosion, plasticExplosion, diff --git a/core/src/io/anuke/mindustry/content/fx/EnvironmentFx.java b/core/src/io/anuke/mindustry/content/fx/EnvironmentFx.java index 7a8e4e367f..8dadc54f43 100644 --- a/core/src/io/anuke/mindustry/content/fx/EnvironmentFx.java +++ b/core/src/io/anuke/mindustry/content/fx/EnvironmentFx.java @@ -5,11 +5,11 @@ import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.type.Item; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; public class EnvironmentFx extends FxList implements ContentList{ public static Effect burning, fire, smoke, steam, fireballsmoke, ballfire, freezing, melting, wet, oily, overdriven, dropItem; diff --git a/core/src/io/anuke/mindustry/content/fx/ExplosionFx.java b/core/src/io/anuke/mindustry/content/fx/ExplosionFx.java index 56b904e2e3..e0f16caa55 100644 --- a/core/src/io/anuke/mindustry/content/fx/ExplosionFx.java +++ b/core/src/io/anuke/mindustry/content/fx/ExplosionFx.java @@ -3,12 +3,12 @@ package io.anuke.mindustry.content.fx; import io.anuke.arc.graphics.Color; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.game.ContentList; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; public class ExplosionFx extends FxList implements ContentList{ public static Effect shockwave, bigShockwave, nuclearShockwave, explosion, blockExplosion, blockExplosionSmoke; diff --git a/core/src/io/anuke/mindustry/content/fx/Fx.java b/core/src/io/anuke/mindustry/content/fx/Fx.java index dad54c2726..9879a13b86 100644 --- a/core/src/io/anuke/mindustry/content/fx/Fx.java +++ b/core/src/io/anuke/mindustry/content/fx/Fx.java @@ -3,11 +3,11 @@ package io.anuke.mindustry.content.fx; import io.anuke.arc.graphics.Color; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.game.ContentList; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Angles; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Angles; import static io.anuke.mindustry.Vars.tilesize; diff --git a/core/src/io/anuke/mindustry/content/fx/ShootFx.java b/core/src/io/anuke/mindustry/content/fx/ShootFx.java index 9c2741b65d..9d7a8b37af 100644 --- a/core/src/io/anuke/mindustry/content/fx/ShootFx.java +++ b/core/src/io/anuke/mindustry/content/fx/ShootFx.java @@ -4,13 +4,13 @@ import io.anuke.arc.graphics.Color; import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.game.ContentList; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.graphics.Shapes; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.graphics.Shapes; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; public class ShootFx extends FxList implements ContentList{ public static Effect shootSmall, shootHeal, shootSmallSmoke, shootBig, shootBig2, shootBigSmoke, shootBigSmoke2, shootSmallFlame, shootLiquid, shellEjectSmall, shellEjectMedium, shellEjectBig, lancerLaserShoot, lancerLaserShootSmoke, lancerLaserCharge, lancerLaserChargeBegin, lightningCharge, lightningShoot; diff --git a/core/src/io/anuke/mindustry/content/fx/UnitFx.java b/core/src/io/anuke/mindustry/content/fx/UnitFx.java index 9efcb08699..a8850b30ce 100644 --- a/core/src/io/anuke/mindustry/content/fx/UnitFx.java +++ b/core/src/io/anuke/mindustry/content/fx/UnitFx.java @@ -3,12 +3,12 @@ package io.anuke.mindustry.content.fx; import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.game.ContentList; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; public class UnitFx extends FxList implements ContentList{ public static Effect vtolHover, unitDrop, unitPickup, unitLand, pickup, healWave, heal, landShock; diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java index 29bd394ff5..4d4c25bacc 100644 --- a/core/src/io/anuke/mindustry/core/ContentLoader.java +++ b/core/src/io/anuke/mindustry/core/ContentLoader.java @@ -1,8 +1,10 @@ package io.anuke.mindustry.core; -import io.anuke.arc.utils.Array; -import io.anuke.arc.utils.ObjectMap; -import io.anuke.arc.utils.ObjectSet; +import io.anuke.arc.collection.Array; +import io.anuke.arc.collection.ObjectMap; +import io.anuke.arc.collection.ObjectSet; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.utils.Log; import io.anuke.mindustry.content.*; import io.anuke.mindustry.content.blocks.*; import io.anuke.mindustry.content.bullets.*; @@ -24,9 +26,6 @@ import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.ColorMapper; import io.anuke.mindustry.world.LegacyColorMapper; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.ThreadArray; /** * Loads all game content. @@ -114,7 +113,7 @@ public class ContentLoader{ registerTypes(); for(ContentType type : ContentType.values()){ - contentMap[type.ordinal()] = new ThreadArray<>(); + contentMap[type.ordinal()] = new Array<>(); contentNameMap[type.ordinal()] = new ObjectMap<>(); } diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 76fe798042..20d35591e2 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -1,7 +1,17 @@ package io.anuke.mindustry.core; +import io.anuke.arc.ApplicationListener; import io.anuke.arc.Core; +import io.anuke.arc.Events; +import io.anuke.arc.Settings; +import io.anuke.arc.entities.Effects; +import io.anuke.arc.entities.EntityQuery; import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.TextureAtlas; +import io.anuke.arc.input.KeyCode; +import io.anuke.arc.utils.Interval; +import io.anuke.arc.utils.Strings; +import io.anuke.arc.utils.Time; import io.anuke.mindustry.content.Mechs; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.Player; @@ -11,7 +21,7 @@ import io.anuke.mindustry.game.EventType.*; import io.anuke.mindustry.game.Saves; import io.anuke.mindustry.game.Unlocks; import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.input.DefaultKeybinds; +import io.anuke.mindustry.input.Binding; import io.anuke.mindustry.input.DesktopInput; import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.input.MobileInput; @@ -20,16 +30,10 @@ import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.ui.dialogs.FloatingDialog; -import io.anuke.ucore.core.*; -import io.anuke.ucore.entities.EntityQuery; -import io.anuke.ucore.modules.Module; -import io.anuke.ucore.util.Atlas; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Strings; -import io.anuke.ucore.util.Timer; import java.io.IOException; +import static io.anuke.arc.Core.scene; import static io.anuke.mindustry.Vars.*; /** @@ -38,11 +42,11 @@ import static io.anuke.mindustry.Vars.*; * Should not handle any logic-critical state. * This class is not created in the headless server. */ -public class Control extends Module{ +public class Control implements ApplicationListener{ public final Saves saves; public final Unlocks unlocks; - private Timer timerRPC = new Timer(), timerUnlock = new Timer(); + private Interval timerRPC = new Interval(), timerUnlock = new Interval(); private boolean hiscore = false; private boolean wasPaused = false; private InputHandler[] inputs = {}; @@ -52,22 +56,18 @@ public class Control extends Module{ saves = new Saves(); unlocks = new Unlocks(); - Inputs.useControllers(true); - - Core.input.setCatchBackKey(true); + Core.input.setCatch(KeyCode.BACK, true); Effects.setShakeFalloff(10000f); content.initialize(Content::init); - Core.atlas = new Atlas("sprites.atlas"); - Core.atlas.setErrorRegion("error"); + Core.atlas = new TextureAtlas("sprites.atlas"); content.initialize(Content::load); unlocks.load(); - DefaultKeybinds.load(); - - Settings.defaultList( + Core.settings.setAppName(appName); + Core.settings.defaults( "ip", "localhost", "color-0", Color.rgba8888(playerColors[8]), "color-1", Color.rgba8888(playerColors[11]), @@ -77,15 +77,13 @@ public class Control extends Module{ "lastBuild", 0 ); - KeyBinds.load(); - addPlayer(0); saves.load(); Events.on(StateChangeEvent.class, event -> { if((event.from == State.playing && event.to == State.menu) || (event.from == State.menu && event.to != State.menu)){ - Timers.runTask(5f, Platform.instance::updateRPC); + Time.runTask(5f, Platform.instance::updateRPC); } }); @@ -99,7 +97,7 @@ public class Control extends Module{ Events.on(WorldLoadGraphicsEvent.class, event -> { if(mobile){ - Core.app.postRunnable(() -> Core.camera.position.set(players[0].x, players[0].y, 0)); + Core.app.post(() -> Core.camera.position.set(players[0])); } }); @@ -115,11 +113,11 @@ public class Control extends Module{ Events.on(WaveEvent.class, event -> { - int last = Settings.getInt("hiscore" + world.getMap().name, 0); + int last = Core.settings.getInt("hiscore" + world.getMap().name, 0); if(state.wave > last && !state.mode.infiniteResources && !state.mode.disableWaveTimer && world.getSector() == null){ - Settings.putInt("hiscore" + world.getMap().name, state.wave); - Settings.save(); + Core.settings.put("hiscore" + world.getMap().name, state.wave); + Core.settings.save(); hiscore = true; } @@ -131,12 +129,9 @@ public class Control extends Module{ if(world.getSector() != null && world.getSector().hasSave()){ world.getSector().getSave().delete(); } - - threads.runGraphics(() -> { - Effects.shake(5, 6, Core.camera.position.x, Core.camera.position.y); - //the restart dialog can show info for any number of scenarios - Call.onGameOver(event.winner); - }); + Effects.shake(5, 6, Core.camera.position.x, Core.camera.position.y); + //the restart dialog can show info for any number of scenarios + Call.onGameOver(event.winner); }); //autohost for pvp sectors @@ -146,8 +141,8 @@ public class Control extends Module{ Net.host(port); players[0].isAdmin = true; }catch(IOException e){ - ui.showError(Bundles.format("text.server.error", Strings.parseException(e, false))); - threads.runDelay(() -> state.set(State.menu)); + ui.showError(Core.bundle.format("text.server.error", Strings.parseException(e, false))); + Core.app.post(() -> state.set(State.menu)); } } }); @@ -171,9 +166,9 @@ public class Control extends Module{ Player setTo = (index == 0 ? null : players[0]); Player player = new Player(); - player.name = Settings.getString("name"); + player.name = Core.settings.getString("name"); player.mech = mobile ? Mechs.starterMobile : Mechs.starterDesktop; - player.color.set(Settings.getInt("color-" + index)); + player.color.set(Core.settings.getInt("color-" + index)); player.isLocal = true; player.playerIndex = index; player.isMobile = mobile; @@ -196,7 +191,7 @@ public class Control extends Module{ } inputs[index] = input; - Inputs.addProcessor(input); + Core.input.addInputProcessor(input); } public void removePlayer(){ @@ -287,14 +282,14 @@ public class Control extends Module{ Platform.instance.updateRPC(); - if(!Settings.getBool("4.0-warning-2", false)){ + if(!Core.settings.getBool("4.0-warning-2", false)){ - Timers.run(5f, () -> { + Time.run(5f, () -> { FloatingDialog dialog = new FloatingDialog("[accent]WARNING![]"); dialog.buttons().addButton("$text.ok", () -> { dialog.hide(); - Settings.putBool("4.0-warning-2", true); - Settings.save(); + Core.settings.put("4.0-warning-2", true); + Core.settings.save(); }).size(100f, 60f); dialog.content().add("Reminder: The beta version you are about to play is very unstable, and is [accent]not representative of the final 4.0 release.[]\n\n " + "\nThere is currently[scarlet] no sound implemented[]; this is intentional.\n" + @@ -344,26 +339,26 @@ public class Control extends Module{ } } - if(Inputs.keyTap("pause") && !ui.restart.isShown() && (state.is(State.paused) || state.is(State.playing))){ + if(Core.input.keyTap(Binding.pause) && !ui.restart.isShown() && (state.is(State.paused) || state.is(State.playing))){ state.set(state.is(State.playing) ? State.paused : State.playing); } - if(Inputs.keyTap("menu") && !ui.restart.isShown()){ + if(Core.input.keyTap(Binding.menu) && !ui.restart.isShown()){ if(ui.chatfrag.chatOpen()){ ui.chatfrag.hide(); - }else if(!ui.paused.isShown() && !ui.hasDialog()){ + }else if(!ui.paused.isShown() && !scene.hasDialog()){ ui.paused.show(); state.set(State.paused); } } - if(!mobile && Inputs.keyTap("screenshot") && !ui.chatfrag.chatOpen()){ + if(!mobile && Core.input.keyTap(Binding.screenshot) && !ui.chatfrag.chatOpen()){ renderer.takeMapScreenshot(); } }else{ if(!state.isPaused()){ - Timers.update(); + Time.update(); } } } diff --git a/core/src/io/anuke/mindustry/core/GameState.java b/core/src/io/anuke/mindustry/core/GameState.java index 96a36fad8a..6d9e71b2e7 100644 --- a/core/src/io/anuke/mindustry/core/GameState.java +++ b/core/src/io/anuke/mindustry/core/GameState.java @@ -5,7 +5,7 @@ import io.anuke.mindustry.game.EventType.StateChangeEvent; import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.game.Teams; import io.anuke.mindustry.net.Net; -import io.anuke.ucore.core.Events; +import io.anuke.arc.core.Events; import static io.anuke.mindustry.Vars.unitGroups; import static io.anuke.mindustry.Vars.waveTeam; diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java index 9eb2fbf86a..97bc5de319 100644 --- a/core/src/io/anuke/mindustry/core/Logic.java +++ b/core/src/io/anuke/mindustry/core/Logic.java @@ -16,12 +16,12 @@ import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.Entities; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.EntityQuery; -import io.anuke.ucore.modules.Module; +import io.anuke.arc.core.Events; +import io.anuke.arc.core.Timers; +import io.anuke.arc.entities.Entities; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.entities.EntityQuery; +import io.anuke.arc.modules.Module; import static io.anuke.mindustry.Vars.*; @@ -85,7 +85,7 @@ public class Logic extends Module{ state.gameOver = false; state.teams = new Teams(); - Timers.clear(); + Time.clear(); Entities.clear(); TileEntity.sleepingEntities = 0; @@ -179,10 +179,10 @@ public class Logic extends Module{ if(!state.is(State.menu)){ if(!state.isPaused()){ - Timers.update(); + Time.update(); if(!state.mode.disableWaveTimer && !state.mode.disableWaves && !state.gameOver){ - state.wavetime -= Timers.delta(); + state.wavetime -= Time.delta(); } if(!Net.client() && state.wavetime <= 0 && !state.mode.disableWaves){ diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java index 721b6e9bfc..6efafcb511 100644 --- a/core/src/io/anuke/mindustry/core/NetClient.java +++ b/core/src/io/anuke/mindustry/core/NetClient.java @@ -25,16 +25,16 @@ import io.anuke.mindustry.net.Packets.*; import io.anuke.mindustry.net.ValidateException; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.modules.ItemModule; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.Entities; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.io.ReusableByteArrayInputStream; -import io.anuke.ucore.modules.Module; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Timer; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Settings; +import io.anuke.arc.core.Timers; +import io.anuke.arc.entities.Entities; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.io.ReusableByteArrayInputStream; +import io.anuke.arc.modules.Module; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Timer; import java.io.DataInputStream; import java.io.IOException; @@ -114,7 +114,7 @@ public class NetClient extends Module{ Net.handleClient(Disconnect.class, packet -> { if(quiet) return; - Timers.runTask(3f, ui.loadfrag::hide); + Time.runTask(3f, ui.loadfrag::hide); state.set(State.menu); @@ -347,7 +347,7 @@ public class NetClient extends Module{ }else if(!connecting){ Net.disconnect(); }else{ //...must be connecting - timeoutTime += Timers.delta(); + timeoutTime += Time.delta(); if(timeoutTime > dataTimeout){ Log.err("Failed to load data!"); ui.loadfrag.hide(); @@ -369,8 +369,8 @@ public class NetClient extends Module{ ui.loadfrag.hide(); ui.join.hide(); Net.setClientLoaded(true); - Core.app.postRunnable(Call::connectConfirm); - Timers.runTask(40f, Platform.instance::updateRPC); + Core.app.post(Call::connectConfirm); + Time.runTask(40f, Platform.instance::updateRPC); } private void reset(){ @@ -437,14 +437,14 @@ public class NetClient extends Module{ } String getUsid(String ip){ - if(Settings.getString("usid-" + ip, null) != null){ - return Settings.getString("usid-" + ip, null); + if(Core.settings.getString("usid-" + ip, null) != null){ + return Core.settings.getString("usid-" + ip, null); }else{ byte[] bytes = new byte[8]; new Random().nextBytes(bytes); String result = new String(Base64Coder.encode(bytes)); - Settings.putString("usid-" + ip, result); - Settings.save(); + Core.settings.putString("usid-" + ip, result); + Core.settings.save(); return result; } } diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index 59fd981986..0978b87899 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -25,18 +25,18 @@ import io.anuke.mindustry.net.*; import io.anuke.mindustry.net.Administration.PlayerInfo; import io.anuke.mindustry.net.Packets.*; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.Entities; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.EntityQuery; -import io.anuke.ucore.entities.trait.Entity; -import io.anuke.ucore.io.ByteBufferOutput; -import io.anuke.ucore.io.CountableByteArrayOutputStream; -import io.anuke.ucore.modules.Module; -import io.anuke.ucore.util.Structs; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Events; +import io.anuke.arc.core.Timers; +import io.anuke.arc.entities.Entities; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.entities.EntityQuery; +import io.anuke.arc.entities.trait.Entity; +import io.anuke.arc.io.ByteBufferOutput; +import io.anuke.arc.io.CountableByteArrayOutputStream; +import io.anuke.arc.modules.Module; +import io.anuke.arc.util.Structs; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.Mathf; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -256,7 +256,7 @@ public class NetServer extends Module{ private static void scheduleSnapshot(Runnable r){ if(debugSnapshots){ if(!Mathf.chance(snapshotDropchance)){ - Timers.run(maxSnapshotDelay / 1000f * 60f, r); + Time.run(maxSnapshotDelay / 1000f * 60f, r); } }else{ r.run(); @@ -437,7 +437,7 @@ public class NetServer extends Module{ if(!headless && !closing && Net.server() && state.is(State.menu)){ closing = true; threads.runGraphics(() -> ui.loadfrag.show("$text.server.closing")); - Timers.runTask(5f, () -> { + Time.runTask(5f, () -> { Net.closeServer(); ui.loadfrag.hide(); closing = false; @@ -474,7 +474,7 @@ public class NetServer extends Module{ Call.onKick(connection, reason); - Timers.runTask(2f, con::close); + Time.runTask(2f, con::close); admins.save(); } @@ -618,7 +618,7 @@ public class NetServer extends Module{ if(!player.timer.get(Player.timerSync, serverSyncTime) || !connection.hasConnected) continue; //reset stream to begin writing - Timers.mark(); + Time.mark(); syncStream.reset(); writeSnapshot(player, dataStream); diff --git a/core/src/io/anuke/mindustry/core/Platform.java b/core/src/io/anuke/mindustry/core/Platform.java index 0199948965..6616a8e557 100644 --- a/core/src/io/anuke/mindustry/core/Platform.java +++ b/core/src/io/anuke/mindustry/core/Platform.java @@ -4,12 +4,12 @@ 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; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.scene.ui.Dialog; -import io.anuke.ucore.scene.ui.TextField; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Settings; +import io.anuke.arc.core.Timers; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.scene.ui.Dialog; +import io.anuke.arc.scene.ui.TextField; import java.util.Random; @@ -57,7 +57,7 @@ public abstract class Platform { }).width(90f).name("okb"); dialog.show(); - Timers.runTask(1f, () -> { + Time.runTask(1f, () -> { to.setCursorPosition(to.getText().length()); Core.scene.setKeyboardFocus(to); Core.input.setOnscreenKeyboardVisible(true); @@ -76,13 +76,13 @@ public abstract class Platform { } /**Must be a base64 string 8 bytes in length.*/ public String getUUID(){ - String uuid = Settings.getString("uuid", ""); + String uuid = Core.settings.getString("uuid", ""); if(uuid.isEmpty()){ byte[] result = new byte[8]; new Random().nextBytes(result); uuid = new String(Base64Coder.encode(result)); - Settings.putString("uuid", uuid); - Settings.save(); + Core.settings.putString("uuid", uuid); + Core.settings.save(); return uuid; } return uuid; diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 2fccf2c520..47ca4db461 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -23,30 +23,30 @@ import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.world.blocks.defense.ForceProjector.ShieldEntity; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.entities.EntityDraw; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.impl.EffectEntity; -import io.anuke.ucore.entities.trait.DrawTrait; -import io.anuke.ucore.entities.trait.Entity; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.function.Predicate; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.graphics.Surface; -import io.anuke.ucore.modules.RendererModule; -import io.anuke.ucore.scene.utils.Cursors; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Pooling; -import io.anuke.ucore.util.Translator; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Settings; +import io.anuke.arc.entities.EntityDraw; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.entities.impl.EffectEntity; +import io.anuke.arc.entities.trait.DrawTrait; +import io.anuke.arc.entities.trait.Entity; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.function.Predicate; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.graphics.Surface; +import io.anuke.arc.modules.RendererModule; +import io.anuke.arc.scene.utils.Cursors; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Pooling; +import io.anuke.arc.util.Translator; import static io.anuke.mindustry.Vars.*; -import static io.anuke.ucore.core.Core.batch; -import static io.anuke.ucore.core.Core.camera; +import static io.anuke.arc.core.Core.batch; +import static io.anuke.arc.core.Core.camera; public class Renderer extends RendererModule{ public final Surface effectSurface; @@ -69,7 +69,7 @@ public class Renderer extends RendererModule{ Core.cameraScale = baseCameraScale; Effects.setEffectProvider((effect, color, x, y, rotation, data) -> { if(effect == Fx.none) return; - if(Settings.getBool("effects")){ + if(Core.settings.getBool("effects")){ Rectangle view = rect.setSize(camera.viewportWidth, camera.viewportHeight) .setCenter(camera.position.x, camera.position.y); Rectangle pos = rect2.setSize(effect.size).setCenter(x, y); @@ -381,7 +381,7 @@ public class Renderer extends RendererModule{ } public void clampScale(){ - float s = io.anuke.ucore.scene.ui.layout.Unit.dp.scl(1f); + float s = io.anuke.arc.scene.ui.layout.Unit.dp.scl(1f); targetscale = Mathf.clamp(targetscale, Math.round(s * 2), Math.round(s * 5)); } @@ -422,7 +422,7 @@ public class Renderer extends RendererModule{ pixelSurface.setSize(pw, ph, false); Graphics.getEffectSurface().setSize(pw, ph, false); - ui.showInfoFade(Bundles.format("text.screenshot", file.toString())); + ui.showInfoFade(Core.bundle.format("text.screenshot", file.toString())); } } diff --git a/core/src/io/anuke/mindustry/core/ThreadHandler.java b/core/src/io/anuke/mindustry/core/ThreadHandler.java deleted file mode 100644 index c427be3788..0000000000 --- a/core/src/io/anuke/mindustry/core/ThreadHandler.java +++ /dev/null @@ -1,54 +0,0 @@ -package io.anuke.mindustry.core; - -import io.anuke.arc.Core; -import io.anuke.arc.utils.TimeUtils; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.core.Timers; - -public class ThreadHandler{ - private long lastFrameTime; - - public ThreadHandler(){ - Timers.setDeltaProvider(() -> { - float result = Core.graphics.getDeltaTime() * 60f; - return Float.isNaN(result) || Float.isInfinite(result) ? 1f : Math.min(result, 60f / 10f); - }); - } - - public void run(Runnable r){ - r.run(); - } - - public void runGraphics(Runnable r){ - r.run(); - } - - public void runDelay(Runnable r){ - Core.app.postRunnable(r); - } - - public long getFrameID(){ - return Core.graphics.getFrameId(); - } - - public void handleBeginRender(){ - lastFrameTime = TimeUtils.millis(); - } - - public void handleEndRender(){ - int fpsCap = Settings.getInt("fpscap", 125); - - if(fpsCap <= 120){ - long target = 1000/fpsCap; - long elapsed = TimeUtils.timeSinceMillis(lastFrameTime); - if(elapsed < target){ - try{ - Thread.sleep(target - elapsed); - }catch(InterruptedException e){ - e.printStackTrace(); - } - } - } - } - -} diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index c631a1aaf1..b63e5cc59f 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -15,23 +15,23 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.ui.dialogs.*; import io.anuke.mindustry.ui.fragments.*; -import io.anuke.ucore.core.*; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.modules.SceneModule; -import io.anuke.ucore.scene.Group; -import io.anuke.ucore.scene.Skin; -import io.anuke.ucore.scene.actions.Actions; -import io.anuke.ucore.scene.ui.Dialog; -import io.anuke.ucore.scene.ui.TextField; -import io.anuke.ucore.scene.ui.TextField.TextFieldFilter; -import io.anuke.ucore.scene.ui.TooltipManager; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.scene.ui.layout.Unit; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.core.*; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.modules.SceneModule; +import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.Skin; +import io.anuke.arc.scene.actions.Actions; +import io.anuke.arc.scene.ui.Dialog; +import io.anuke.arc.scene.ui.TextField; +import io.anuke.arc.scene.ui.TextField.TextFieldFilter; +import io.anuke.arc.scene.ui.TooltipManager; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.util.Strings; import static io.anuke.mindustry.Vars.*; -import static io.anuke.ucore.scene.actions.Actions.*; +import static io.anuke.arc.scene.actions.Actions.*; public class UI extends SceneModule{ private FreeTypeFontGenerator generator; @@ -87,7 +87,7 @@ public class UI extends SceneModule{ TooltipManager.getInstance().animations = false; - Settings.setErrorHandler(() -> Timers.run(1f, () -> showError("[crimson]Failed to access local storage.\nSettings will not be saved."))); + Core.settings.setErrorHandler(() -> Time.run(1f, () -> showError("[crimson]Failed to access local storage.\nSettings will not be saved."))); Dialog.closePadR = -1; Dialog.closePadT = 5; @@ -202,7 +202,7 @@ public class UI extends SceneModule{ public void loadGraphics(String text, Runnable call){ loadfrag.show(text); - Timers.runTask(7f, () -> { + Time.runTask(7f, () -> { call.run(); loadfrag.hide(); }); @@ -214,7 +214,7 @@ public class UI extends SceneModule{ public void loadLogic(String text, Runnable call){ loadfrag.show(text); - Timers.runTask(7f, () -> + Time.runTask(7f, () -> threads.run(() -> { call.run(); threads.runGraphics(loadfrag::hide); diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java index d1f880678b..c1cb55ea7e 100644 --- a/core/src/io/anuke/mindustry/core/World.java +++ b/core/src/io/anuke/mindustry/core/World.java @@ -18,11 +18,11 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Pos; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.OreBlock; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.EntityQuery; -import io.anuke.ucore.modules.Module; -import io.anuke.ucore.util.*; +import io.anuke.arc.core.Events; +import io.anuke.arc.core.Timers; +import io.anuke.arc.entities.EntityQuery; +import io.anuke.arc.modules.Module; +import io.anuke.arc.util.*; import static io.anuke.mindustry.Vars.*; @@ -209,8 +209,8 @@ public class World extends Module{ currentSector = sector; state.difficulty = sectors.getDifficulty(sector); state.mode = sector.currentMission().getMode(); - Timers.mark(); - Timers.mark(); + Time.mark(); + Time.mark(); logic.reset(); @@ -247,7 +247,7 @@ public class World extends Module{ Log.err(e); if(!headless){ ui.showError("$text.map.invalid"); - threads.runDelay(() -> state.set(State.menu)); + Core.app.post(() -> state.set(State.menu)); invalidMap = true; } generating = false; @@ -277,13 +277,13 @@ public class World extends Module{ invalidMap = false; } - if(invalidMap) threads.runDelay(() -> state.set(State.menu)); + if(invalidMap) Core.app.post(() -> state.set(State.menu)); } public void notifyChanged(Tile tile){ if(!generating){ - threads.runDelay(() -> Events.fire(new TileChangeEvent(tile))); + Core.app.post(() -> Events.fire(new TileChangeEvent(tile))); } } diff --git a/core/src/io/anuke/mindustry/editor/DrawOperation.java b/core/src/io/anuke/mindustry/editor/DrawOperation.java index 55b57cf7af..ed5b95bcef 100755 --- a/core/src/io/anuke/mindustry/editor/DrawOperation.java +++ b/core/src/io/anuke/mindustry/editor/DrawOperation.java @@ -4,7 +4,7 @@ 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; +import io.anuke.arc.util.Bits; public class DrawOperation{ /** diff --git a/core/src/io/anuke/mindustry/editor/EditorTool.java b/core/src/io/anuke/mindustry/editor/EditorTool.java index 4a89d6f6a7..4117fb6746 100644 --- a/core/src/io/anuke/mindustry/editor/EditorTool.java +++ b/core/src/io/anuke/mindustry/editor/EditorTool.java @@ -7,9 +7,9 @@ import io.anuke.mindustry.maps.MapTileData.DataPosition; import io.anuke.mindustry.maps.MapTileData.TileDataMarker; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.Floor; -import io.anuke.ucore.function.IntPositionConsumer; -import io.anuke.ucore.util.Structs; -import io.anuke.ucore.util.Bits; +import io.anuke.arc.function.IntPositionConsumer; +import io.anuke.arc.util.Structs; +import io.anuke.arc.util.Bits; import static io.anuke.mindustry.Vars.content; import static io.anuke.mindustry.Vars.ui; diff --git a/core/src/io/anuke/mindustry/editor/MapEditor.java b/core/src/io/anuke/mindustry/editor/MapEditor.java index ee0420df3d..7a873307c6 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditor.java +++ b/core/src/io/anuke/mindustry/editor/MapEditor.java @@ -10,9 +10,9 @@ import io.anuke.mindustry.maps.MapTileData.DataPosition; import io.anuke.mindustry.maps.MapTileData.TileDataMarker; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.Floor; -import io.anuke.ucore.util.Structs; -import io.anuke.ucore.util.Bits; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.util.Structs; +import io.anuke.arc.util.Bits; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.content; public class MapEditor{ public static final int[] brushSizes = {1, 2, 3, 4, 5, 9, 15}; diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index 8a64da0a5f..83702fb54e 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -21,23 +21,23 @@ import io.anuke.mindustry.maps.MapTileData; import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.ui.dialogs.FloatingDialog; import io.anuke.mindustry.world.Block; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Inputs; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.input.Input; -import io.anuke.ucore.scene.actions.Actions; -import io.anuke.ucore.scene.ui.*; -import io.anuke.ucore.scene.ui.layout.Stack; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.scene.ui.layout.Unit; -import io.anuke.ucore.scene.utils.UIUtils; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Inputs; +import io.anuke.arc.core.Timers; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.input.Input; +import io.anuke.arc.scene.actions.Actions; +import io.anuke.arc.scene.ui.*; +import io.anuke.arc.scene.ui.layout.Stack; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.scene.utils.UIUtils; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Strings; import java.io.DataInputStream; import java.io.InputStream; @@ -106,7 +106,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ editor.beginEdit(data, meta.tags, false); view.clearStack(); }catch(Exception e){ - ui.showError(Bundles.format("text.editor.errorimageload", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("text.editor.errorimageload", Strings.parseException(e, false))); Log.err(e); } }), true, mapExtension), @@ -120,7 +120,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ editor.beginEdit(data, editor.getTags(), false); view.clearStack(); }catch (Exception e){ - ui.showError(Bundles.format("text.editor.errorimageload", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("text.editor.errorimageload", Strings.parseException(e, false))); Log.err(e); } }), true, "png") @@ -139,7 +139,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ } MapIO.writeMap(result.write(false), editor.getTags(), editor.getMap()); }catch(Exception e){ - ui.showError(Bundles.format("text.editor.errorimagesave", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("text.editor.errorimagesave", Strings.parseException(e, false))); Log.err(e); } }); @@ -175,7 +175,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ editor.beginEdit(data, meta.tags, false); view.clearStack(); }catch(Exception e){ - ui.showError(Bundles.format("text.editor.errormapload", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("text.editor.errormapload", Strings.parseException(e, false))); Log.err(e); } })); @@ -214,7 +214,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ } shownWithMap = false; - Timers.runTask(10f, Platform.instance::updateRPC); + Time.runTask(10f, Platform.instance::updateRPC); }); hidden(() -> { @@ -311,7 +311,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ show(); }catch(Exception e){ Log.err(e); - ui.showError(Bundles.format("text.editor.errorimageload", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("text.editor.errorimageload", Strings.parseException(e, false))); } }); } diff --git a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java index 92b647738a..14ba9ea2c3 100644 --- a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java @@ -3,9 +3,9 @@ package io.anuke.mindustry.editor; 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; -import io.anuke.ucore.scene.ui.TextArea; -import io.anuke.ucore.scene.ui.TextField; +import io.anuke.arc.core.Settings; +import io.anuke.arc.scene.ui.TextArea; +import io.anuke.arc.scene.ui.TextField; public class MapInfoDialog extends FloatingDialog{ private final MapEditor editor; @@ -53,10 +53,10 @@ public class MapInfoDialog extends FloatingDialog{ content().add("$text.editor.author").padRight(8).left(); - author = content().addField(tags.get("author", Settings.getString("mapAuthor", "")), text -> { + author = content().addField(tags.get("author", Core.settings.getString("mapAuthor", "")), text -> { tags.put("author", text); - Settings.putString("mapAuthor", text); - Settings.save(); + Core.settings.putString("mapAuthor", text); + Core.settings.save(); }).size(400, 55f).get(); author.setMessageText("$text.unknown"); diff --git a/core/src/io/anuke/mindustry/editor/MapLoadDialog.java b/core/src/io/anuke/mindustry/editor/MapLoadDialog.java index 14c0f2d7d0..37a5ad9257 100644 --- a/core/src/io/anuke/mindustry/editor/MapLoadDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapLoadDialog.java @@ -4,11 +4,11 @@ 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; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.scene.ui.ButtonGroup; -import io.anuke.ucore.scene.ui.ScrollPane; -import io.anuke.ucore.scene.ui.TextButton; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.scene.ui.ButtonGroup; +import io.anuke.arc.scene.ui.ScrollPane; +import io.anuke.arc.scene.ui.TextButton; +import io.anuke.arc.scene.ui.layout.Table; import static io.anuke.mindustry.Vars.world; diff --git a/core/src/io/anuke/mindustry/editor/MapRenderer.java b/core/src/io/anuke/mindustry/editor/MapRenderer.java index abe1509da3..036eea3bfa 100644 --- a/core/src/io/anuke/mindustry/editor/MapRenderer.java +++ b/core/src/io/anuke/mindustry/editor/MapRenderer.java @@ -9,13 +9,13 @@ 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; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.IndexedRenderer; -import io.anuke.ucore.util.Structs; -import io.anuke.ucore.util.Bits; -import io.anuke.ucore.util.Geometry; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.IndexedRenderer; +import io.anuke.arc.util.Structs; +import io.anuke.arc.util.Bits; +import io.anuke.arc.util.Geometry; import static io.anuke.mindustry.Vars.content; import static io.anuke.mindustry.Vars.tilesize; diff --git a/core/src/io/anuke/mindustry/editor/MapResizeDialog.java b/core/src/io/anuke/mindustry/editor/MapResizeDialog.java index 84f2ae4d51..77cd201a69 100644 --- a/core/src/io/anuke/mindustry/editor/MapResizeDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapResizeDialog.java @@ -2,11 +2,11 @@ package io.anuke.mindustry.editor; import io.anuke.mindustry.maps.MapTileData; import io.anuke.mindustry.ui.dialogs.FloatingDialog; -import io.anuke.ucore.function.BiConsumer; -import io.anuke.ucore.scene.ui.ButtonGroup; -import io.anuke.ucore.scene.ui.TextButton; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.function.BiConsumer; +import io.anuke.arc.scene.ui.ButtonGroup; +import io.anuke.arc.scene.ui.TextButton; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Mathf; public class MapResizeDialog extends FloatingDialog{ int[] validMapSizes = {200, 300, 400, 500}; diff --git a/core/src/io/anuke/mindustry/editor/MapSaveDialog.java b/core/src/io/anuke/mindustry/editor/MapSaveDialog.java index a8a377b921..1b2f2de543 100644 --- a/core/src/io/anuke/mindustry/editor/MapSaveDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapSaveDialog.java @@ -3,9 +3,9 @@ package io.anuke.mindustry.editor; import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.ui.dialogs.FloatingDialog; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.scene.ui.TextButton; -import io.anuke.ucore.scene.ui.TextField; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.scene.ui.TextButton; +import io.anuke.arc.scene.ui.TextField; import static io.anuke.mindustry.Vars.ui; import static io.anuke.mindustry.Vars.world; diff --git a/core/src/io/anuke/mindustry/editor/MapView.java b/core/src/io/anuke/mindustry/editor/MapView.java index c5dc74451b..d82e820b88 100644 --- a/core/src/io/anuke/mindustry/editor/MapView.java +++ b/core/src/io/anuke/mindustry/editor/MapView.java @@ -13,20 +13,20 @@ 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; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Inputs; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.scene.Element; -import io.anuke.ucore.scene.event.InputEvent; -import io.anuke.ucore.scene.event.InputListener; -import io.anuke.ucore.scene.event.Touchable; -import io.anuke.ucore.scene.ui.TextField; -import io.anuke.ucore.scene.ui.layout.Unit; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Tmp; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Inputs; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.scene.Element; +import io.anuke.arc.scene.event.InputEvent; +import io.anuke.arc.scene.event.InputListener; +import io.anuke.arc.scene.event.Touchable; +import io.anuke.arc.scene.ui.TextField; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Tmp; import static io.anuke.mindustry.Vars.mobile; import static io.anuke.mindustry.Vars.ui; @@ -214,7 +214,7 @@ public class MapView extends Element implements GestureListener{ super.act(delta); if(Core.scene.getKeyboardFocus() == null || !(Core.scene.getKeyboardFocus() instanceof TextField) && - !Inputs.keyDown(io.anuke.ucore.input.Input.CONTROL_LEFT)){ + !Inputs.keyDown(io.anuke.arc.input.Input.CONTROL_LEFT)){ float ax = Inputs.getAxis("move_x"); float ay = Inputs.getAxis("move_y"); offsetx -= ax * 15f / zoom; diff --git a/core/src/io/anuke/mindustry/entities/Damage.java b/core/src/io/anuke/mindustry/entities/Damage.java index 54e3b157a1..42905e4648 100644 --- a/core/src/io/anuke/mindustry/entities/Damage.java +++ b/core/src/io/anuke/mindustry/entities/Damage.java @@ -13,14 +13,14 @@ import io.anuke.mindustry.game.Team; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.function.Predicate; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Physics; -import io.anuke.ucore.util.Translator; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.core.Timers; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.function.Predicate; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Physics; +import io.anuke.arc.util.Translator; import static io.anuke.mindustry.Vars.*; @@ -34,19 +34,19 @@ public class Damage{ public static void dynamicExplosion(float x, float y, float flammability, float explosiveness, float power, float radius, Color color){ for(int i = 0; i < Mathf.clamp(power / 20, 0, 6); i++){ int branches = 5 + Mathf.clamp((int) (power / 30), 1, 20); - Timers.run(i * 2f + Mathf.random(4f), () -> Lightning.create(Team.none, Palette.power, 3, + Time.run(i * 2f + Mathf.random(4f), () -> Lightning.create(Team.none, Palette.power, 3, x, y, Mathf.random(360f), branches + Mathf.range(2))); } for(int i = 0; i < Mathf.clamp(flammability / 4, 0, 30); i++){ - Timers.run(i / 2f, () -> Call.createBullet(TurretBullets.fireball, x, y, Mathf.random(360f))); + Time.run(i / 2f, () -> Call.createBullet(TurretBullets.fireball, x, y, Mathf.random(360f))); } int waves = Mathf.clamp((int) (explosiveness / 4), 0, 30); for(int i = 0; i < waves; i++){ int f = i; - Timers.run(i * 2f, () -> { + Time.run(i * 2f, () -> { threads.run(() -> Damage.damage(x, y, Mathf.clamp(radius + explosiveness, 0, 50f) * ((f + 1f) / waves), explosiveness / 2f)); Effects.effect(ExplosionFx.blockExplosionSmoke, x + Mathf.range(radius), y + Mathf.range(radius)); }); diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 5c03efb4bc..283cc2dd9e 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -24,13 +24,13 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.Floor; import io.anuke.mindustry.world.blocks.storage.CoreBlock.CoreEntity; -import io.anuke.ucore.core.*; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.EntityQuery; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Hue; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.*; +import io.anuke.arc.core.*; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.entities.EntityQuery; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Hue; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.*; import java.io.DataInput; import java.io.DataOutput; @@ -150,7 +150,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra } if(interpolator.target.dst(interpolator.last) > 1f){ - walktime += Timers.delta(); + walktime += Time.delta(); } } @@ -365,7 +365,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra public void drawStats(){ float x = snappedX(), y = snappedY(); - Draw.color(Color.BLACK, team.color, healthf() + Mathf.absin(Timers.time(), healthf() * 5f, 1f - healthf())); + Draw.color(Color.BLACK, team.color, healthf() + Mathf.absin(Time.time(), healthf() * 5f, 1f - healthf())); Draw.alpha(hitTime / hitDuration); Draw.rect(getPowerCellRegion(), x + Angles.trnsx(rotation, mech.cellTrnsY, 0f), y + Angles.trnsy(rotation, mech.cellTrnsY, 0f), rotation - 90); Draw.color(); @@ -400,7 +400,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra boolean ints = Core.font.usesIntegerPositions(); Core.font.setUseIntegerPositions(false); - Draw.tscl(0.25f / io.anuke.ucore.scene.ui.layout.Unit.dp.scl(1f)); + Draw.tscl(0.25f / io.anuke.arc.scene.ui.layout.Unit.dp.scl(1f)); layout.setText(Core.font, name); Draw.color(0f, 0f, 0f, 0.3f); Draw.rect("blank", x, y + 8 - layout.height / 2, layout.width + 2, layout.height + 3); @@ -435,7 +435,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra Draw.color(Palette.removeBack); - float rad = Mathf.absin(Timers.time(), 7f, 1f) + block.size * tilesize / 2f - 1; + float rad = Mathf.absin(Time.time(), 7f, 1f) + block.size * tilesize / 2f - 1; Lines.square( request.x * tilesize + block.offset(), @@ -454,7 +454,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra Draw.color(Palette.accentBack); - float rad = Mathf.absin(Timers.time(), 7f, 1f) - 2f + request.recipe.result.size * tilesize / 2f; + float rad = Mathf.absin(Time.time(), 7f, 1f) - 2f + request.recipe.result.size * tilesize / 2f; Lines.square( request.x * tilesize + request.recipe.result.offset(), @@ -479,7 +479,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra @Override public void update(){ - hitTime -= Timers.delta(); + hitTime -= Time.delta(); if(Float.isNaN(x) || Float.isNaN(y)){ velocity.set(0f, 0f); @@ -611,7 +611,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra pointerY = vec.y; updateShooting(); - movement.limit(speed).scl(Timers.delta()); + movement.limit(speed).scl(Time.delta()); if(getCarrier() == null){ if(!ui.chatfrag.chatOpen()){ @@ -701,10 +701,10 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra isBoosting = EntityQuery.collisions().overlapsTile(rect) || distanceTo(targetX, targetY) > 85f; - velocity.add(movement.scl(Timers.delta())); + velocity.add(movement.scl(Time.delta())); if(velocity.len() <= 0.2f && mech.flying){ - rotation += Mathf.sin(Timers.time() + id * 99, 10f, 1f); + rotation += Mathf.sin(Time.time() + id * 99, 10f, 1f); }else if(target == null){ rotation = Mathf.slerpDelta(rotation, velocity.angle(), velocity.len() / 10f); } @@ -715,8 +715,8 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra if(mech.flying){ //hovering effect - x += Mathf.sin(Timers.time() + id * 999, 25f, 0.08f); - y += Mathf.cos(Timers.time() + id * 999, 25f, 0.08f); + x += Mathf.sin(Time.time() + id * 999, 25f, 0.08f); + y += Mathf.cos(Time.time() + id * 999, 25f, 0.08f); } //update shooting if not building, not mining and there's ammo left @@ -726,7 +726,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra if(mobile){ if(target == null){ isShooting = false; - if(Settings.getBool("autotarget")){ + if(Core.settings.getBool("autotarget")){ target = Units.getClosestTarget(team, x, y, getWeapon().getAmmo().getRange()); if(mech.canHeal && target == null){ diff --git a/core/src/io/anuke/mindustry/entities/Predict.java b/core/src/io/anuke/mindustry/entities/Predict.java index e38be8b2ba..6e94d0620f 100644 --- a/core/src/io/anuke/mindustry/entities/Predict.java +++ b/core/src/io/anuke/mindustry/entities/Predict.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.entities; import io.anuke.arc.math.Vector2; import io.anuke.mindustry.entities.traits.TargetTrait; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.util.Mathf; /** * Class for predicting shoot angles based on velocities of targets. diff --git a/core/src/io/anuke/mindustry/entities/StatusController.java b/core/src/io/anuke/mindustry/entities/StatusController.java index b7d0927b4a..d08e32e23d 100644 --- a/core/src/io/anuke/mindustry/entities/StatusController.java +++ b/core/src/io/anuke/mindustry/entities/StatusController.java @@ -6,10 +6,10 @@ import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.entities.traits.Saveable; import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.StatusEffect; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Pooling; -import io.anuke.ucore.util.ThreadArray; -import io.anuke.ucore.util.Tmp; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Pooling; +import io.anuke.arc.util.ThreadArray; +import io.anuke.arc.util.Tmp; import java.io.DataInput; import java.io.DataOutput; @@ -88,7 +88,7 @@ public class StatusController implements Saveable{ removals.clear(); for(StatusEntry entry : statuses){ - entry.time = Math.max(entry.time - Timers.delta(), 0); + entry.time = Math.max(entry.time - Time.delta(), 0); if(entry.time <= 0){ Pooling.free(entry); diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java index e5f7d8f5d3..86c69b2cfc 100644 --- a/core/src/io/anuke/mindustry/entities/TileEntity.java +++ b/core/src/io/anuke/mindustry/entities/TileEntity.java @@ -20,13 +20,13 @@ import io.anuke.mindustry.world.modules.ConsumeModule; import io.anuke.mindustry.world.modules.ItemModule; import io.anuke.mindustry.world.modules.LiquidModule; import io.anuke.mindustry.world.modules.PowerModule; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.impl.BaseEntity; -import io.anuke.ucore.entities.trait.HealthTrait; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Timer; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Timers; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.entities.impl.BaseEntity; +import io.anuke.arc.entities.trait.HealthTrait; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Timer; import java.io.DataInput; import java.io.DataOutput; @@ -89,12 +89,12 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ /**Scaled delta.*/ public float delta(){ - return Timers.delta() * timeScale; + return Time.delta() * timeScale; } /**Call when nothing is happening to the entity. This increments the internal sleep timer.*/ public void sleep(){ - sleepTime += Timers.delta(); + sleepTime += Time.delta(); if(!sleeping && sleepTime >= timeToSleep){ remove(); sleeping = true; @@ -265,12 +265,12 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ public void update(){ //TODO better smoke effect, this one is awful if(health != 0 && health < tile.block().health && !(tile.block() instanceof Wall) && - Mathf.chance(0.009f * Timers.delta() * (1f - health / tile.block().health))){ + Mathf.chance(0.009f * Time.delta() * (1f - health / tile.block().health))){ Effects.effect(Fx.smoke, x + Mathf.range(4), y + Mathf.range(4)); } - timeScaleDuration -= Timers.delta(); + timeScaleDuration -= Time.delta(); if(timeScaleDuration <= 0f || !tile.block().canOverdrive){ timeScale = 1f; } diff --git a/core/src/io/anuke/mindustry/entities/Unit.java b/core/src/io/anuke/mindustry/entities/Unit.java index 50f4b27b73..fd9c50e7bd 100644 --- a/core/src/io/anuke/mindustry/entities/Unit.java +++ b/core/src/io/anuke/mindustry/entities/Unit.java @@ -15,16 +15,16 @@ import io.anuke.mindustry.type.Weapon; import io.anuke.mindustry.world.Pos; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.Floor; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.impl.DestructibleEntity; -import io.anuke.ucore.entities.trait.DamageTrait; -import io.anuke.ucore.entities.trait.DrawTrait; -import io.anuke.ucore.entities.trait.SolidTrait; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Timers; +import io.anuke.arc.entities.impl.DestructibleEntity; +import io.anuke.arc.entities.trait.DamageTrait; +import io.anuke.arc.entities.trait.DrawTrait; +import io.anuke.arc.entities.trait.SolidTrait; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -235,11 +235,11 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ status.update(this); - velocity.limit(getMaxVelocity()).scl(1f + (status.getSpeedMultiplier()-1f) * Timers.delta()); + velocity.limit(getMaxVelocity()).scl(1f + (status.getSpeedMultiplier()-1f) * Time.delta()); if(isFlying()){ - x += velocity.x * Timers.delta(); - y += velocity.y * Timers.delta(); + x += velocity.x * Time.delta(); + y += velocity.y * Time.delta(); }else{ boolean onLiquid = floor.isLiquid; @@ -255,7 +255,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ } } - if(onLiquid && velocity.len() > 0.4f && Mathf.chance((velocity.len() * floor.speedMultiplier) * 0.06f * Timers.delta())){ + if(onLiquid && velocity.len() > 0.4f && Mathf.chance((velocity.len() * floor.speedMultiplier) * 0.06f * Time.delta())){ Effects.effect(floor.walkEffect, floor.liquidColor, x, y); } @@ -268,8 +268,8 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ } if(onLiquid && floor.drownTime > 0){ - drownTime += Timers.delta() * 1f / floor.drownTime; - if(Mathf.chance(Timers.delta() * 0.05f)){ + drownTime += Time.delta() * 1f / floor.drownTime; + if(Mathf.chance(Time.delta() * 0.05f)){ Effects.effect(floor.drownUpdateEffect, floor.liquidColor, x, y); } }else{ @@ -283,12 +283,12 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ } float px = x, py = y; - move(velocity.x * floor.speedMultiplier * Timers.delta(), velocity.y * floor.speedMultiplier * Timers.delta()); + move(velocity.x * floor.speedMultiplier * Time.delta(), velocity.y * floor.speedMultiplier * Time.delta()); if(Math.abs(px - x) <= 0.0001f) velocity.x = 0f; if(Math.abs(py - y) <= 0.0001f) velocity.y = 0f; } - velocity.scl(Mathf.clamp(1f - getDrag() * (isFlying() ? 1f : floor.dragMultiplier) * Timers.delta())); + velocity.scl(Mathf.clamp(1f - getDrag() * (isFlying() ? 1f : floor.dragMultiplier) * Time.delta())); } public void applyEffect(StatusEffect effect, float intensity){ @@ -297,7 +297,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ } public void damagePeriodic(float amount){ - damage(amount * Timers.delta(), hitTime <= -20 + hitDuration); + damage(amount * Time.delta(), hitTime <= -20 + hitDuration); } public void damage(float amount, boolean withEffect){ @@ -317,7 +317,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ } public void drawStats(){ - Draw.color(Color.BLACK, team.color, healthf() + Mathf.absin(Timers.time(), healthf()*5f, 1f - healthf())); + Draw.color(Color.BLACK, team.color, healthf() + Mathf.absin(Time.time(), healthf()*5f, 1f - healthf())); Draw.alpha(hitTime); Draw.rect(getPowerCellRegion(), x, y, rotation - 90); Draw.color(); diff --git a/core/src/io/anuke/mindustry/entities/Units.java b/core/src/io/anuke/mindustry/entities/Units.java index b0749ce0f2..3ef0c60ac6 100644 --- a/core/src/io/anuke/mindustry/entities/Units.java +++ b/core/src/io/anuke/mindustry/entities/Units.java @@ -7,12 +7,12 @@ import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.EntityQuery; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.function.Predicate; -import io.anuke.ucore.util.EnumSet; -import io.anuke.ucore.util.Geometry; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.entities.EntityQuery; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.function.Predicate; +import io.anuke.arc.util.EnumSet; +import io.anuke.arc.util.Geometry; import static io.anuke.mindustry.Vars.*; diff --git a/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java index e0c9af0c27..9d2b578f02 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.entities.bullet; import io.anuke.mindustry.content.fx.BulletFx; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.graphics.Draw; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.graphics.Draw; //TODO scale velocity depending on fslope() public class ArtilleryBulletType extends BasicBulletType{ diff --git a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java index 32288ef16d..e56799f5a7 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java @@ -6,11 +6,11 @@ import io.anuke.mindustry.entities.Damage; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.graphics.Palette; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; /** * A BulletType for most ammo-based bullets shot from turrets and units. @@ -69,7 +69,7 @@ public class BasicBulletType extends BulletType{ if(homingPower > 0.0001f){ TargetTrait target = Units.getClosestTarget(b.getTeam(), b.x, b.y, homingRange); if(target != null){ - b.getVelocity().setAngle(Angles.moveToward(b.getVelocity().angle(), b.angleTo(target), homingPower * Timers.delta())); + b.getVelocity().setAngle(Angles.moveToward(b.getVelocity().angle(), b.angleTo(target), homingPower * Time.delta())); } } } diff --git a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java index 5b1b461f3a..3825fb6a58 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java +++ b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java @@ -10,15 +10,15 @@ import io.anuke.mindustry.entities.traits.SyncTrait; import io.anuke.mindustry.entities.traits.TeamTrait; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.impl.BulletEntity; -import io.anuke.ucore.entities.trait.Entity; -import io.anuke.ucore.entities.trait.SolidTrait; -import io.anuke.ucore.entities.trait.VelocityTrait; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Pooling; -import io.anuke.ucore.util.Timer; +import io.anuke.arc.core.Timers; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.entities.impl.BulletEntity; +import io.anuke.arc.entities.trait.Entity; +import io.anuke.arc.entities.trait.SolidTrait; +import io.anuke.arc.entities.trait.VelocityTrait; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Pooling; +import io.anuke.arc.util.Timer; import java.io.DataInput; import java.io.DataOutput; @@ -69,7 +69,7 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT bullet.type = type; bullet.lifeScl = lifetimeScl; - bullet.set(x - bullet.velocity.x * Timers.delta(), y - bullet.velocity.y * Timers.delta()); + bullet.set(x - bullet.velocity.x * Time.delta(), y - bullet.velocity.y * Time.delta()); bullet.add(); return bullet; @@ -236,7 +236,7 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT @Override protected void updateLife(){ - time += Timers.delta() * 1f/(lifeScl); + time += Time.delta() * 1f/(lifeScl); time = Mathf.clamp(time, 0, type.lifetime()); if(time >= type.lifetime){ diff --git a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java index b6220dd9dd..61a34a3f47 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java @@ -6,10 +6,10 @@ import io.anuke.mindustry.game.Content; import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.StatusEffect; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.entities.impl.BaseBulletType; -import io.anuke.ucore.util.Translator; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.entities.impl.BaseBulletType; +import io.anuke.arc.util.Translator; public abstract class BulletType extends Content implements BaseBulletType{ public float lifetime; diff --git a/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java index 03328db49c..a85ac932e2 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.entities.bullet; 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; +import io.anuke.arc.core.Timers; public abstract class FlakBulletType extends BasicBulletType{ protected static Rectangle rect = new Rectangle(); @@ -29,7 +29,7 @@ public abstract class FlakBulletType extends BasicBulletType{ if(unit.distanceTo(b) < explodeRange){ b.setData(0); - Timers.run(5f, () -> { + Time.run(5f, () -> { if(b.getData() instanceof Integer){ b.time(b.lifetime()); } diff --git a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java index 70b52f385c..fc65f14008 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java @@ -8,11 +8,11 @@ import io.anuke.mindustry.entities.effect.Fire; import io.anuke.mindustry.entities.effect.Puddle; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.tilesize; import static io.anuke.mindustry.Vars.world; diff --git a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java index 2106e34628..7e17680011 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java @@ -3,9 +3,9 @@ package io.anuke.mindustry.entities.bullet; 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; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Mathf; public class MissileBulletType extends BasicBulletType{ protected Color trailColor = Palette.missileYellowBack; @@ -21,7 +21,7 @@ public class MissileBulletType extends BasicBulletType{ public void update(Bullet b){ super.update(b); - if(Mathf.chance(Timers.delta() * 0.2)){ + if(Mathf.chance(Time.delta() * 0.2)){ Effects.effect(BulletFx.missileTrail, trailColor, b.x, b.y, 2f); } } diff --git a/core/src/io/anuke/mindustry/entities/effect/Decal.java b/core/src/io/anuke/mindustry/entities/effect/Decal.java index 6001c8b1e2..e4504f028a 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Decal.java +++ b/core/src/io/anuke/mindustry/entities/effect/Decal.java @@ -2,11 +2,11 @@ package io.anuke.mindustry.entities.effect; 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; -import io.anuke.ucore.entities.trait.DrawTrait; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.entities.impl.TimedEntity; +import io.anuke.arc.entities.trait.DrawTrait; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.groundEffectGroup; diff --git a/core/src/io/anuke/mindustry/entities/effect/Fire.java b/core/src/io/anuke/mindustry/entities/effect/Fire.java index d7a689c7fc..6c261114fa 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Fire.java +++ b/core/src/io/anuke/mindustry/entities/effect/Fire.java @@ -16,14 +16,14 @@ import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.impl.TimedEntity; -import io.anuke.ucore.util.Structs; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Pooling; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Timers; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.entities.impl.TimedEntity; +import io.anuke.arc.util.Structs; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Pooling; import java.io.DataInput; import java.io.DataOutput; @@ -76,7 +76,7 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{ */ public static void extinguish(Tile tile, float intensity){ if(tile != null && map.containsKey(tile.pos())){ - map.get(tile.pos()).time += intensity * Timers.delta(); + map.get(tile.pos()).time += intensity * Time.delta(); } } @@ -92,11 +92,11 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{ @Override public void update(){ - if(Mathf.chance(0.1 * Timers.delta())){ + if(Mathf.chance(0.1 * Time.delta())){ Effects.effect(EnvironmentFx.fire, x + Mathf.range(4f), y + Mathf.range(4f)); } - if(Mathf.chance(0.05 * Timers.delta())){ + if(Mathf.chance(0.05 * Time.delta())){ Effects.effect(EnvironmentFx.smoke, x + Mathf.range(4f), y + Mathf.range(4f)); } @@ -104,7 +104,7 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{ return; } - time = Mathf.clamp(time + Timers.delta(), 0, lifetime()); + time = Mathf.clamp(time + Time.delta(), 0, lifetime()); if(time >= lifetime() || tile == null){ Call.onFireRemoved(getID()); @@ -118,7 +118,7 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{ float flammability = baseFlammability + puddleFlammability; if(!damage && flammability <= 0){ - time += Timers.delta() * 8; + time += Time.delta() * 8; } if(baseFlammability < 0 || block != tile.block()){ @@ -127,20 +127,20 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{ } if(damage){ - lifetime += Mathf.clamp(flammability / 8f, 0f, 0.6f) * Timers.delta(); + lifetime += Mathf.clamp(flammability / 8f, 0f, 0.6f) * Time.delta(); } - if(flammability > 1f && Mathf.chance(spreadChance * Timers.delta() * Mathf.clamp(flammability / 5f, 0.3f, 2f))){ + if(flammability > 1f && Mathf.chance(spreadChance * Time.delta() * Mathf.clamp(flammability / 5f, 0.3f, 2f))){ GridPoint2 p = Mathf.select(Geometry.d4); Tile other = world.tile(tile.x + p.x, tile.y + p.y); create(other); - if(Mathf.chance(fireballChance * Timers.delta() * Mathf.clamp(flammability / 10.0))){ + if(Mathf.chance(fireballChance * Time.delta() * Mathf.clamp(flammability / 10.0))){ Call.createBullet(TurretBullets.fireball, x, y, Mathf.random(360f)); } } - if(Mathf.chance(0.1 * Timers.delta())){ + if(Mathf.chance(0.1 * Time.delta())){ Puddle p = Puddle.getPuddle(tile); if(p != null){ puddleFlammability = p.getFlammability() / 3f; diff --git a/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java b/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java index ceaceb8ba7..d7f69f7510 100644 --- a/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java +++ b/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java @@ -2,12 +2,12 @@ package io.anuke.mindustry.entities.effect; import io.anuke.mindustry.Vars; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.impl.EffectEntity; -import io.anuke.ucore.core.Effects.EffectRenderer; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.core.Timers; +import io.anuke.arc.entities.impl.EffectEntity; +import io.anuke.arc.core.Effects.EffectRenderer; +import io.anuke.arc.util.Mathf; /** * A ground effect contains an effect that is rendered on the ground layer as opposed to the top layer. @@ -20,7 +20,7 @@ public class GroundEffectEntity extends EffectEntity{ GroundEffect effect = (GroundEffect) this.effect; if(effect.isStatic){ - time += Timers.delta(); + time += Time.delta(); time = Mathf.clamp(time, 0, effect.staticLife); diff --git a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java index 8569d4d0f4..69ad25e106 100644 --- a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java +++ b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java @@ -1,23 +1,23 @@ package io.anuke.mindustry.entities.effect; -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.arc.entities.EntityGroup; +import io.anuke.arc.entities.impl.TimedEntity; +import io.anuke.arc.entities.trait.DrawTrait; +import io.anuke.arc.entities.trait.PosTrait; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.math.Interpolation; +import io.anuke.arc.math.Vector2; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Pooling; +import io.anuke.arc.utils.Time; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.impl.TimedEntity; -import io.anuke.ucore.entities.trait.DrawTrait; -import io.anuke.ucore.entities.trait.PosTrait; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Pooling; import static io.anuke.mindustry.Vars.effectGroup; import static io.anuke.mindustry.Vars.threads; @@ -51,7 +51,7 @@ public class ItemTransfer extends TimedEntity implements DrawTrait{ public static void transferItemTo(Item item, int amount, float x, float y, Tile tile){ if(tile == null || tile.entity == null || tile.entity.items == null) return; for(int i = 0; i < Mathf.clamp(amount / 3, 1, 8); i++){ - Timers.run(i * 3, () -> create(item, x, y, tile, () -> { + Time.run(i * 3, () -> create(item, x, y, tile, () -> { })); } tile.entity.items.add(item, amount); diff --git a/core/src/io/anuke/mindustry/entities/effect/Lightning.java b/core/src/io/anuke/mindustry/entities/effect/Lightning.java index cda35eeaeb..9f096ef9b7 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Lightning.java +++ b/core/src/io/anuke/mindustry/entities/effect/Lightning.java @@ -14,14 +14,14 @@ import io.anuke.mindustry.entities.traits.SyncTrait; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.graphics.Palette; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.impl.TimedEntity; -import io.anuke.ucore.entities.trait.DrawTrait; -import io.anuke.ucore.entities.trait.PosTrait; -import io.anuke.ucore.entities.trait.TimeTrait; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.*; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.entities.impl.TimedEntity; +import io.anuke.arc.entities.trait.DrawTrait; +import io.anuke.arc.entities.trait.PosTrait; +import io.anuke.arc.entities.trait.TimeTrait; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.*; import java.io.DataInput; import java.io.DataOutput; diff --git a/core/src/io/anuke/mindustry/entities/effect/Puddle.java b/core/src/io/anuke/mindustry/entities/effect/Puddle.java index d0c762d407..be2ab5e2b6 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Puddle.java +++ b/core/src/io/anuke/mindustry/entities/effect/Puddle.java @@ -19,18 +19,18 @@ import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.impl.SolidEntity; -import io.anuke.ucore.entities.trait.DrawTrait; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.graphics.Hue; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Pooling; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Timers; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.entities.impl.SolidEntity; +import io.anuke.arc.entities.trait.DrawTrait; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.graphics.Hue; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Pooling; import java.io.DataInput; import java.io.DataOutput; @@ -85,10 +85,10 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai Puddle p = map.get(tile.pos()); - if(generation == 0 && p != null && p.lastRipple <= Timers.time() - 40f){ + if(generation == 0 && p != null && p.lastRipple <= Time.time() - 40f){ Effects.effect(BlockFx.ripple, tile.floor().liquidDrop.color, (tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f); - p.lastRipple = Timers.time(); + p.lastRipple = Time.time(); } return; } @@ -108,9 +108,9 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai }else if(p.liquid == liquid){ p.accepting = Math.max(amount, p.accepting); - if(generation == 0 && p.lastRipple <= Timers.time() - 40f && p.amount >= maxLiquid / 2f){ + if(generation == 0 && p.lastRipple <= Time.time() - 40f && p.amount >= maxLiquid / 2f){ Effects.effect(BlockFx.ripple, p.liquid.color, (tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f); - p.lastRipple = Timers.time(); + p.lastRipple = Time.time(); } }else{ p.amount += reactPuddle(p.liquid, liquid, amount, p.tile, p.x, p.y); @@ -176,13 +176,13 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai //update code float addSpeed = accepting > 0 ? 3f : 0f; - amount -= Timers.delta() * (1f - liquid.viscosity) / (5f + addSpeed); + amount -= Time.delta() * (1f - liquid.viscosity) / (5f + addSpeed); amount += accepting; accepting = 0f; if(amount >= maxLiquid / 1.5f && generation < maxGeneration){ - float deposited = Math.min((amount - maxLiquid / 1.5f) / 4f, 0.3f) * Timers.delta(); + float deposited = Math.min((amount - maxLiquid / 1.5f) / 4f, 0.3f) * Time.delta(); for(GridPoint2 point : Geometry.d4){ Tile other = world.tile(tile.x + point.x, tile.y + point.y); if(other != null && other.block() == Blocks.air && !other.hasCliffs()){ @@ -214,14 +214,14 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai } }); - if(liquid.temperature > 0.7f && tile.entity != null && Mathf.chance(0.3 * Timers.delta())){ + if(liquid.temperature > 0.7f && tile.entity != null && Mathf.chance(0.3 * Time.delta())){ Fire.create(tile); } updateTime = 20f; } - updateTime -= Timers.delta(); + updateTime -= Time.delta(); } @Override @@ -233,10 +233,10 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai float sscl = 20f; Draw.color(Hue.shift(tmp.set(liquid.color), 2, -0.05f)); - Fill.circle(x + Mathf.sin(Timers.time() + seeds * 532, sscl, smag), y + Mathf.sin(Timers.time() + seeds * 53, sscl, smag), f * 8f); + Fill.circle(x + Mathf.sin(Time.time() + seeds * 532, sscl, smag), y + Mathf.sin(Time.time() + seeds * 53, sscl, smag), f * 8f); Angles.randLenVectors(id, 3, f * 6f, (ex, ey) -> { - Fill.circle(x + ex + Mathf.sin(Timers.time() + seeds * 532, sscl, smag), - y + ey + Mathf.sin(Timers.time() + seeds * 53, sscl, smag), f * 5f); + Fill.circle(x + ex + Mathf.sin(Time.time() + seeds * 532, sscl, smag), + y + ey + Mathf.sin(Time.time() + seeds * 53, sscl, smag), f * 5f); seeds++; }); Draw.color(); diff --git a/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java b/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java index 8fb5dedf98..7bc874d861 100644 --- a/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java +++ b/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.entities.effect; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; public class RubbleDecal extends Decal{ private int size; diff --git a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java b/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java index 6585352c4a..fd5df78b11 100644 --- a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java +++ b/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java @@ -2,9 +2,9 @@ package io.anuke.mindustry.entities.effect; 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; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.world; diff --git a/core/src/io/anuke/mindustry/entities/traits/AbsorbTrait.java b/core/src/io/anuke/mindustry/entities/traits/AbsorbTrait.java index 445533dda3..7c6520364c 100644 --- a/core/src/io/anuke/mindustry/entities/traits/AbsorbTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/AbsorbTrait.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.entities.traits; -import io.anuke.ucore.entities.trait.DamageTrait; -import io.anuke.ucore.entities.trait.Entity; +import io.anuke.arc.entities.trait.DamageTrait; +import io.anuke.arc.entities.trait.Entity; public interface AbsorbTrait extends Entity, TeamTrait, DamageTrait{ void absorb(); diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index 4f0bacda4d..1fb1aff758 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -21,16 +21,16 @@ import io.anuke.mindustry.world.Pos; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.BuildBlock; import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.trait.Entity; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.graphics.Shapes; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Events; +import io.anuke.arc.core.Timers; +import io.anuke.arc.entities.trait.Entity; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.graphics.Shapes; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -240,9 +240,9 @@ public interface BuilderTrait extends Entity{ if(!Net.client()){ //deconstructing is 2x as fast if(current.breaking){ - entity.deconstruct(unit, core, 2f / entity.buildCost * Timers.delta() * getBuildPower(tile)); + entity.deconstruct(unit, core, 2f / entity.buildCost * Time.delta() * getBuildPower(tile)); }else{ - entity.construct(unit, core, 1f / entity.buildCost * Timers.delta() * getBuildPower(tile)); + entity.construct(unit, core, 1f / entity.buildCost * Time.delta() * getBuildPower(tile)); } current.progress = entity.progress(); @@ -251,7 +251,7 @@ public interface BuilderTrait extends Entity{ } if(!current.initialized){ - Core.app.postRunnable(() -> Events.fire(new BuildSelectEvent(tile, unit.getTeam(), this, current.breaking))); + Core.app.post(() -> Events.fire(new BuildSelectEvent(tile, unit.getTeam(), this, current.breaking))); current.initialized = true; } } @@ -268,7 +268,7 @@ public interface BuilderTrait extends Entity{ Item item = tile.floor().drops.item; unit.rotation = Mathf.slerpDelta(unit.rotation, unit.angleTo(tile.worldx(), tile.worldy()), 0.4f); - if(Mathf.chance(Timers.delta() * (0.06 - item.hardness * 0.01) * getMinePower())){ + if(Mathf.chance(Time.delta() * (0.06 - item.hardness * 0.01) * getMinePower())){ if(unit.distanceTo(core) < mineTransferRange && core.tile.block().acceptStack(item, 1, core.tile, unit) == 1){ Call.transferItemTo(item, 1, @@ -282,7 +282,7 @@ public interface BuilderTrait extends Entity{ } } - if(Mathf.chance(0.06 * Timers.delta())){ + if(Mathf.chance(0.06 * Time.delta())){ Effects.effect(BlockFx.pulverizeSmall, tile.worldx() + Mathf.range(tilesize / 2f), tile.worldy() + Mathf.range(tilesize / 2f), 0f, item.color); @@ -309,7 +309,7 @@ public interface BuilderTrait extends Entity{ } Draw.color(Palette.accent); - float focusLen = 3.8f + Mathf.absin(Timers.time(), 1.1f, 0.6f); + float focusLen = 3.8f + Mathf.absin(Time.time(), 1.1f, 0.6f); float px = unit.x + Angles.trnsx(unit.rotation, focusLen); float py = unit.y + Angles.trnsy(unit.rotation, focusLen); @@ -332,7 +332,7 @@ public interface BuilderTrait extends Entity{ Lines.line(px, py, x1, y1); Lines.line(px, py, x3, y3); - Fill.circle(px, py, 1.6f + Mathf.absin(Timers.time(), 0.8f, 1.5f)); + Fill.circle(px, py, 1.6f + Mathf.absin(Time.time(), 0.8f, 1.5f)); Draw.color(); } @@ -343,22 +343,22 @@ public interface BuilderTrait extends Entity{ if(tile == null) return; - float focusLen = 4f + Mathf.absin(Timers.time(), 1.1f, 0.5f); + float focusLen = 4f + Mathf.absin(Time.time(), 1.1f, 0.5f); float swingScl = 12f, swingMag = tilesize / 8f; float flashScl = 0.3f; float px = unit.x + Angles.trnsx(unit.rotation, focusLen); float py = unit.y + Angles.trnsy(unit.rotation, focusLen); - float ex = tile.worldx() + Mathf.sin(Timers.time() + 48, swingScl, swingMag); - float ey = tile.worldy() + Mathf.sin(Timers.time() + 48, swingScl + 2f, swingMag); + float ex = tile.worldx() + Mathf.sin(Time.time() + 48, swingScl, swingMag); + float ey = tile.worldy() + Mathf.sin(Time.time() + 48, swingScl + 2f, swingMag); - Draw.color(Color.LIGHT_GRAY, Color.WHITE, 1f - flashScl + Mathf.absin(Timers.time(), 0.5f, flashScl)); + Draw.color(Color.LIGHT_GRAY, Color.WHITE, 1f - flashScl + Mathf.absin(Time.time(), 0.5f, flashScl)); Shapes.laser("minelaser", "minelaser-end", px, py, ex, ey); if(unit instanceof Player && ((Player) unit).isLocal){ Draw.color(Palette.accent); - Lines.poly(tile.worldx(), tile.worldy(), 4, tilesize / 2f * Mathf.sqrt2, Timers.time()); + Lines.poly(tile.worldx(), tile.worldy(), 4, tilesize / 2f * Mathf.sqrt2, Time.time()); } Draw.color(); diff --git a/core/src/io/anuke/mindustry/entities/traits/CarriableTrait.java b/core/src/io/anuke/mindustry/entities/traits/CarriableTrait.java index 296b782154..3755245e8e 100644 --- a/core/src/io/anuke/mindustry/entities/traits/CarriableTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/CarriableTrait.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.entities.traits; -import io.anuke.ucore.entities.trait.SolidTrait; +import io.anuke.arc.entities.trait.SolidTrait; public interface CarriableTrait extends TeamTrait, TargetTrait, SolidTrait{ diff --git a/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java b/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java index fdc052f787..fe0efd79ee 100644 --- a/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java @@ -5,8 +5,8 @@ import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.content.fx.UnitFx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.gen.Call; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.entities.trait.SolidTrait; +import io.anuke.arc.core.Effects; +import io.anuke.arc.entities.trait.SolidTrait; public interface CarryTrait extends TeamTrait, SolidTrait, TargetTrait{ diff --git a/core/src/io/anuke/mindustry/entities/traits/SaveTrait.java b/core/src/io/anuke/mindustry/entities/traits/SaveTrait.java index 4e7009771e..bcf357f4e5 100644 --- a/core/src/io/anuke/mindustry/entities/traits/SaveTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/SaveTrait.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.entities.traits; -import io.anuke.ucore.entities.trait.Entity; +import io.anuke.arc.entities.trait.Entity; /** * Marks an entity as serializable. diff --git a/core/src/io/anuke/mindustry/entities/traits/ShooterTrait.java b/core/src/io/anuke/mindustry/entities/traits/ShooterTrait.java index 12df85dda1..3e93fe85af 100644 --- a/core/src/io/anuke/mindustry/entities/traits/ShooterTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/ShooterTrait.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.entities.traits; import io.anuke.mindustry.type.Weapon; -import io.anuke.ucore.entities.trait.VelocityTrait; -import io.anuke.ucore.util.Timer; +import io.anuke.arc.entities.trait.VelocityTrait; +import io.anuke.arc.util.Timer; public interface ShooterTrait extends VelocityTrait, TeamTrait, InventoryTrait{ diff --git a/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java b/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java index 9509e4eb68..a0d4ecee27 100644 --- a/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java @@ -2,9 +2,9 @@ package io.anuke.mindustry.entities.traits; import io.anuke.mindustry.core.NetClient; import io.anuke.mindustry.net.Interpolator; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.entities.trait.Entity; -import io.anuke.ucore.util.Tmp; +import io.anuke.arc.core.Core; +import io.anuke.arc.entities.trait.Entity; +import io.anuke.arc.util.Tmp; import java.io.DataInput; import java.io.DataOutput; diff --git a/core/src/io/anuke/mindustry/entities/traits/TargetTrait.java b/core/src/io/anuke/mindustry/entities/traits/TargetTrait.java index bdeea6ea33..e599356017 100644 --- a/core/src/io/anuke/mindustry/entities/traits/TargetTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/TargetTrait.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.entities.traits; import io.anuke.mindustry.game.Team; -import io.anuke.ucore.entities.trait.PosTrait; -import io.anuke.ucore.entities.trait.SolidTrait; -import io.anuke.ucore.entities.trait.VelocityTrait; +import io.anuke.arc.entities.trait.PosTrait; +import io.anuke.arc.entities.trait.SolidTrait; +import io.anuke.arc.entities.trait.VelocityTrait; /** * Base interface for targetable entities. diff --git a/core/src/io/anuke/mindustry/entities/traits/TeamTrait.java b/core/src/io/anuke/mindustry/entities/traits/TeamTrait.java index 3c7cbf7dd3..6954258423 100644 --- a/core/src/io/anuke/mindustry/entities/traits/TeamTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/TeamTrait.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.entities.traits; import io.anuke.mindustry.game.Team; -import io.anuke.ucore.entities.trait.Entity; +import io.anuke.arc.entities.trait.Entity; public interface TeamTrait extends Entity{ Team getTeam(); diff --git a/core/src/io/anuke/mindustry/entities/traits/TypeTrait.java b/core/src/io/anuke/mindustry/entities/traits/TypeTrait.java index 958a0cb319..663575bb5f 100644 --- a/core/src/io/anuke/mindustry/entities/traits/TypeTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/TypeTrait.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.entities.traits; -import io.anuke.arc.utils.Array; -import io.anuke.arc.utils.ObjectIntMap; -import io.anuke.ucore.function.Supplier; +import io.anuke.arc.collection.Array; +import io.anuke.arc.collection.ObjectIntMap; +import io.anuke.arc.function.Supplier; public interface TypeTrait{ int[] lastRegisteredID = {0}; diff --git a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java index 900736e9a4..54de336546 100644 --- a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java @@ -24,11 +24,11 @@ import io.anuke.mindustry.type.Weapon; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.units.CommandCenter.CommandCenterEntity; import io.anuke.mindustry.world.meta.BlockFlag; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.*; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Timers; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.*; import java.io.DataInput; import java.io.DataOutput; @@ -77,7 +77,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ Effects.shake(2f, 2f, unit); //must run afterwards so the unit's group is not null when sending the removal packet - threads.runDelay(unit::remove); + Core.app.post(unit::remove); } @Override @@ -282,7 +282,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ @Override public void update(){ - hitTime -= Timers.delta(); + hitTime -= Time.delta(); if(isDead()){ updateRespawning(); diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java index 5fe497d4ba..37d20ac539 100644 --- a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java @@ -10,9 +10,9 @@ import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockFlag; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.*; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.*; import static io.anuke.mindustry.Vars.world; @@ -99,7 +99,7 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{ }); if(target != null){ - circle(60f + Mathf.absin(Timers.time() + id * 23525, 70f, 1200f)); + circle(60f + Mathf.absin(Time.time() + id * 23525, 70f, 1200f)); } } }, @@ -200,11 +200,11 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{ protected void wobble(){ if(Net.client()) return; - x += Mathf.sin(Timers.time() + id * 999, 25f, 0.08f)*Timers.delta(); - y += Mathf.cos(Timers.time() + id * 999, 25f, 0.08f)*Timers.delta(); + x += Mathf.sin(Time.time() + id * 999, 25f, 0.08f)*Time.delta(); + y += Mathf.cos(Time.time() + id * 999, 25f, 0.08f)*Time.delta(); if(velocity.len() <= 0.05f){ - rotation += Mathf.sin(Timers.time() + id * 99, 10f, 2.5f)*Timers.delta(); + rotation += Mathf.sin(Time.time() + id * 99, 10f, 2.5f)*Time.delta(); } } @@ -225,7 +225,7 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{ vec.rotate((circleLength - vec.len()) / circleLength * 180f); } - vec.setLength(speed * Timers.delta()); + vec.setLength(speed * Time.delta()); velocity.add(vec); } @@ -237,7 +237,7 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{ float length = circleLength <= 0.001f ? 1f : Mathf.clamp((distanceTo(target) - circleLength) / 100f, -1f, 1f); - vec.setLength(type.speed * Timers.delta() * length); + vec.setLength(type.speed * Time.delta() * length); if(length < 0) vec.rotate(180f); velocity.add(vec); @@ -255,7 +255,7 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{ vec.setAngle(Mathf.slerpDelta(velocity.angle(), vec.angle(), 0.44f)); } - vec.setLength(type.speed * Timers.delta()); + vec.setLength(type.speed * Time.delta()); velocity.add(vec); } diff --git a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java index d6beb9935a..9c646a146e 100644 --- a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java @@ -12,11 +12,11 @@ import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.Weapon; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.Floor; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Translator; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Translator; import java.io.DataInput; import java.io.DataOutput; @@ -119,14 +119,14 @@ public abstract class GroundUnit extends BaseUnit{ public void update(){ super.update(); - stuckTime = !vec.set(x, y).sub(lastPosition()).isZero(0.0001f) ? 0f : stuckTime + Timers.delta(); + stuckTime = !vec.set(x, y).sub(lastPosition()).isZero(0.0001f) ? 0f : stuckTime + Time.delta(); if(!velocity.isZero()){ baseRotation = Mathf.slerpDelta(baseRotation, velocity.angle(), 0.05f); } if(stuckTime < 1f){ - walkTime += Timers.delta(); + walkTime += Time.delta(); } } @@ -238,12 +238,12 @@ public abstract class GroundUnit extends BaseUnit{ } protected void patrol(){ - vec.trns(baseRotation, type.speed * Timers.delta()); + vec.trns(baseRotation, type.speed * Time.delta()); velocity.add(vec.x, vec.y); vec.trns(baseRotation, type.hitsizeTile); Tile tile = world.tileWorld(x + vec.x, y + vec.y); if((tile == null || tile.solid() || tile.floor().drownTime > 0) || stuckTime > 10f){ - baseRotation += Mathf.sign(id % 2 - 0.5f) * Timers.delta() * 3f; + baseRotation += Mathf.sign(id % 2 - 0.5f) * Time.delta() * 3f; } rotation = Mathf.slerpDelta(rotation, velocity.angle(), type.rotatespeed); @@ -258,7 +258,7 @@ public abstract class GroundUnit extends BaseUnit{ vec.rotate((circleLength - vec.len()) / circleLength * 180f); } - vec.setLength(type.speed * Timers.delta()); + vec.setLength(type.speed * Time.delta()); velocity.add(vec); } @@ -272,7 +272,7 @@ public abstract class GroundUnit extends BaseUnit{ float angle = angleTo(targetTile); - velocity.add(vec.trns(angleTo(targetTile), type.speed*Timers.delta())); + velocity.add(vec.trns(angleTo(targetTile), type.speed*Time.delta())); rotation = Mathf.slerpDelta(rotation, angle, type.rotatespeed); } @@ -296,7 +296,7 @@ public abstract class GroundUnit extends BaseUnit{ float angle = angleTo(targetTile); - velocity.add(vec.trns(angleTo(targetTile), type.speed*Timers.delta())); + velocity.add(vec.trns(angleTo(targetTile), type.speed*Time.delta())); rotation = Mathf.slerpDelta(rotation, angle, type.rotatespeed); } } diff --git a/core/src/io/anuke/mindustry/entities/units/Squad.java b/core/src/io/anuke/mindustry/entities/units/Squad.java index 645ea3bdea..2c08a12a1e 100644 --- a/core/src/io/anuke/mindustry/entities/units/Squad.java +++ b/core/src/io/anuke/mindustry/entities/units/Squad.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.entities.units; import io.anuke.arc.math.Vector2; -import io.anuke.ucore.util.Translator; +import io.anuke.arc.util.Translator; import static io.anuke.mindustry.Vars.threads; diff --git a/core/src/io/anuke/mindustry/entities/units/UnitCommand.java b/core/src/io/anuke/mindustry/entities/units/UnitCommand.java index a6e8c2a005..7aec3e2798 100644 --- a/core/src/io/anuke/mindustry/entities/units/UnitCommand.java +++ b/core/src/io/anuke/mindustry/entities/units/UnitCommand.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.entities.units; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; public enum UnitCommand{ attack, retreat, patrol; @@ -8,7 +8,7 @@ public enum UnitCommand{ private final String localized; UnitCommand(){ - localized = Bundles.get("command." + name()); + localized = Core.bundle.get("command." + name()); } public String localized(){ diff --git a/core/src/io/anuke/mindustry/entities/units/UnitDrops.java b/core/src/io/anuke/mindustry/entities/units/UnitDrops.java index 3780465876..4b304ef6f1 100644 --- a/core/src/io/anuke/mindustry/entities/units/UnitDrops.java +++ b/core/src/io/anuke/mindustry/entities/units/UnitDrops.java @@ -5,7 +5,7 @@ import io.anuke.mindustry.content.Items; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.type.Item; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.util.Mathf; public class UnitDrops{ private static Item[] dropTable; diff --git a/core/src/io/anuke/mindustry/entities/units/UnitType.java b/core/src/io/anuke/mindustry/entities/units/UnitType.java index c3fc8e2df4..55ec6464a7 100644 --- a/core/src/io/anuke/mindustry/entities/units/UnitType.java +++ b/core/src/io/anuke/mindustry/entities/units/UnitType.java @@ -12,12 +12,12 @@ import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Weapon; import io.anuke.mindustry.ui.ContentDisplay; -import io.anuke.ucore.function.Supplier; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.function.Supplier; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.Strings; public class UnitType extends UnlockableContent{ protected final Supplier constructor; @@ -51,11 +51,11 @@ public class UnitType extends UnlockableContent{ public UnitType(String name, Class type, Supplier mainConstructor){ this.name = name; this.constructor = mainConstructor; - this.description = Bundles.getOrNull("unit." + name + ".description"); + this.description = Core.bundle.getOrNull("unit." + name + ".description"); TypeTrait.registerType(type, mainConstructor); - if(!Bundles.has("unit." + this.name + ".name")){ + if(!Core.bundle.has("unit." + this.name + ".name")){ Log.err("Warning: unit '" + name + "' is missing a localized name. Add the follow to bundle.properties:"); Log.err("unit." + this.name + ".name=" + Strings.capitalize(name.replace('-', '_'))); } @@ -68,7 +68,7 @@ public class UnitType extends UnlockableContent{ @Override public String localizedName(){ - return Bundles.get("unit." + name + ".name"); + return Core.bundle.get("unit." + name + ".name"); } @Override 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 cca7b7c45a..0621869780 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java +++ b/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java @@ -15,8 +15,8 @@ import io.anuke.mindustry.entities.units.UnitState; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.AmmoType; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -72,7 +72,7 @@ public class AlphaDrone extends FlyingUnit { if(drone == null) return; Effects.effect(UnitFx.pickup, drone); //must run afterwards so the unit's group is not null when sending the removal packet - threads.runDelay(drone::remove); + Core.app.post(drone::remove); } @Override 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 64aa4b799b..8f0a7b0942 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Drone.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Drone.java @@ -20,11 +20,11 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.BuildBlock; import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity; import io.anuke.mindustry.world.meta.BlockFlag; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Structs; +import io.anuke.arc.core.Events; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Structs; import java.io.DataInput; import java.io.DataOutput; diff --git a/core/src/io/anuke/mindustry/game/Difficulty.java b/core/src/io/anuke/mindustry/game/Difficulty.java index bfbbdd1e90..18b92b4e09 100644 --- a/core/src/io/anuke/mindustry/game/Difficulty.java +++ b/core/src/io/anuke/mindustry/game/Difficulty.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.game; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; public enum Difficulty{ training(3f, 3f), @@ -24,7 +24,7 @@ public enum Difficulty{ @Override public String toString(){ if(value == null){ - value = Bundles.get("setting.difficulty." + name()); + value = Core.bundle.get("setting.difficulty." + name()); } return value; } diff --git a/core/src/io/anuke/mindustry/game/EventType.java b/core/src/io/anuke/mindustry/game/EventType.java index 0724be398a..037f996902 100644 --- a/core/src/io/anuke/mindustry/game/EventType.java +++ b/core/src/io/anuke/mindustry/game/EventType.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.game; +import io.anuke.arc.Events.Event; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.traits.BuilderTrait; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Events.Event; public class EventType{ diff --git a/core/src/io/anuke/mindustry/game/GameMode.java b/core/src/io/anuke/mindustry/game/GameMode.java index cd4057012a..ac14a3949c 100644 --- a/core/src/io/anuke/mindustry/game/GameMode.java +++ b/core/src/io/anuke/mindustry/game/GameMode.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.game; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; public enum GameMode{ waves, @@ -33,12 +33,12 @@ public enum GameMode{ public float respawnTime = 60 * 4; public String description(){ - return Bundles.get("mode." + name() + ".description"); + return Core.bundle.get("mode." + name() + ".description"); } @Override public String toString(){ - return Bundles.get("mode." + name() + ".name"); + return Core.bundle.get("mode." + name() + ".name"); } } diff --git a/core/src/io/anuke/mindustry/game/Saves.java b/core/src/io/anuke/mindustry/game/Saves.java index 487e78ca69..e78dc44334 100644 --- a/core/src/io/anuke/mindustry/game/Saves.java +++ b/core/src/io/anuke/mindustry/game/Saves.java @@ -10,11 +10,11 @@ import io.anuke.mindustry.game.EventType.StateChangeEvent; import io.anuke.mindustry.io.SaveIO; import io.anuke.mindustry.io.SaveMeta; import io.anuke.mindustry.maps.Map; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Strings; -import io.anuke.ucore.util.ThreadArray; +import io.anuke.arc.core.Events; +import io.anuke.arc.core.Settings; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Strings; +import io.anuke.arc.util.ThreadArray; import java.io.IOException; import java.text.SimpleDateFormat; @@ -47,7 +47,7 @@ public class Saves{ public void load(){ saves.clear(); - IntArray slots = Settings.getObject("save-slots", IntArray.class, IntArray::new); + IntArray slots = Core.settings.getObject("save-slots", IntArray.class, IntArray::new); for(int i = 0; i < slots.size; i ++){ int index = slots.get(i); @@ -77,11 +77,11 @@ public class Saves{ } if(!state.is(State.menu) && !state.gameOver && current != null && current.isAutosave()){ - time += Timers.delta(); - if(time > Settings.getInt("saveinterval") * 60){ + time += Time.delta(); + if(time > Core.settings.getInt("saveinterval") * 60){ saving = true; - Timers.runTask(2f, () -> { + Time.runTask(2f, () -> { try{ current.save(); }catch(Exception e){ @@ -146,8 +146,8 @@ public class Saves{ IntArray result = new IntArray(saves.size); for(int i = 0; i < saves.size; i++) result.add(saves.get(i).index); - Settings.putObject("save-slots", result); - Settings.save(); + Core.settings.putObject("save-slots", result); + Core.settings.save(); } public class SaveSlot{ @@ -201,12 +201,12 @@ public class Saves{ } public String getName(){ - return Settings.getString("save-" + index + "-name", "untittled"); + return Core.settings.getString("save-" + index + "-name", "untittled"); } public void setName(String name){ - Settings.putString("save-" + index + "-name", name); - Settings.save(); + Core.settings.putString("save-" + index + "-name", name); + Core.settings.save(); } public int getBuild(){ @@ -226,12 +226,12 @@ public class Saves{ } public boolean isAutosave(){ - return Settings.getBool("save-" + index + "-autosave", true); + return Core.settings.getBool("save-" + index + "-autosave", true); } public void setAutosave(boolean save){ - Settings.putBool("save-" + index + "-autosave", save); - Settings.save(); + Core.settings.putBool("save-" + index + "-autosave", save); + Core.settings.save(); } public void importFile(FileHandle file) throws IOException{ diff --git a/core/src/io/anuke/mindustry/game/Team.java b/core/src/io/anuke/mindustry/game/Team.java index 52f2990618..dfbc4bd777 100644 --- a/core/src/io/anuke/mindustry/game/Team.java +++ b/core/src/io/anuke/mindustry/game/Team.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.game; import io.anuke.arc.graphics.Color; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; public enum Team{ none(Color.valueOf("4d4e58")), @@ -21,6 +21,6 @@ public enum Team{ } public String localized(){ - return Bundles.get("team." + name() + ".name"); + return Core.bundle.get("team." + name() + ".name"); } } diff --git a/core/src/io/anuke/mindustry/game/Teams.java b/core/src/io/anuke/mindustry/game/Teams.java index a02fe973cd..194f5af30c 100644 --- a/core/src/io/anuke/mindustry/game/Teams.java +++ b/core/src/io/anuke/mindustry/game/Teams.java @@ -3,8 +3,8 @@ package io.anuke.mindustry.game; import io.anuke.arc.utils.ObjectSet; import io.anuke.mindustry.Vars; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.util.EnumSet; -import io.anuke.ucore.util.ThreadSet; +import io.anuke.arc.util.EnumSet; +import io.anuke.arc.util.ThreadSet; /** * Class for various team-based utilities. diff --git a/core/src/io/anuke/mindustry/game/UnlockableContent.java b/core/src/io/anuke/mindustry/game/UnlockableContent.java index e82afc00a6..cd8e068af4 100644 --- a/core/src/io/anuke/mindustry/game/UnlockableContent.java +++ b/core/src/io/anuke/mindustry/game/UnlockableContent.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.game; import io.anuke.arc.graphics.g2d.TextureRegion; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.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 9970b33ba4..aa5811b006 100644 --- a/core/src/io/anuke/mindustry/game/Unlocks.java +++ b/core/src/io/anuke/mindustry/game/Unlocks.java @@ -4,8 +4,8 @@ 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; -import io.anuke.ucore.core.Settings; +import io.anuke.arc.core.Events; +import io.anuke.arc.core.Settings; /**Stores player unlocks. Clientside only.*/ public class Unlocks{ @@ -13,7 +13,7 @@ public class Unlocks{ private boolean dirty; static{ - Settings.setSerializer(ContentType.class, (stream, t) -> stream.writeInt(t.ordinal()), stream -> ContentType.values()[stream.readInt()]); + Core.settings.setSerializer(ContentType.class, (stream, t) -> stream.writeInt(t.ordinal()), stream -> ContentType.values()[stream.readInt()]); } /** Returns whether or not this piece of content is unlocked yet.*/ @@ -67,12 +67,12 @@ public class Unlocks{ @SuppressWarnings("unchecked") public void load(){ - unlocked = Settings.getObject("unlockset", ObjectMap.class, ObjectMap::new); + unlocked = Core.settings.getObject("unlockset", ObjectMap.class, ObjectMap::new); } public void save(){ - Settings.putObject("unlockset", unlocked); - Settings.save(); + Core.settings.putObject("unlockset", unlocked); + Core.settings.save(); } } diff --git a/core/src/io/anuke/mindustry/game/Version.java b/core/src/io/anuke/mindustry/game/Version.java index b44ca5deb1..baa484f4f1 100644 --- a/core/src/io/anuke/mindustry/game/Version.java +++ b/core/src/io/anuke/mindustry/game/Version.java @@ -4,7 +4,7 @@ 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 io.anuke.arc.util.Strings; import java.io.IOException; diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java index 644145ff35..ea4caa66fe 100644 --- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java @@ -9,15 +9,15 @@ import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Surface; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Events; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Surface; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.*; -import static io.anuke.ucore.core.Core.camera; +import static io.anuke.arc.core.Core.camera; public class BlockRenderer{ private final static int initialRequests = 32 * 32; diff --git a/core/src/io/anuke/mindustry/graphics/CacheLayer.java b/core/src/io/anuke/mindustry/graphics/CacheLayer.java index 978454bac5..8d4c1fed33 100644 --- a/core/src/io/anuke/mindustry/graphics/CacheLayer.java +++ b/core/src/io/anuke/mindustry/graphics/CacheLayer.java @@ -1,10 +1,10 @@ package io.anuke.mindustry.graphics; import io.anuke.arc.graphics.Color; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Shader; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Shader; import static io.anuke.mindustry.Vars.renderer; diff --git a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java index 8bec526285..e0009c47e1 100644 --- a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java @@ -12,16 +12,16 @@ import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent; import io.anuke.mindustry.maps.Sector; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.Floor; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.CacheBatch; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Structs; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Events; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.CacheBatch; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Structs; import java.util.Arrays; @@ -214,7 +214,7 @@ public class FloorRenderer{ cache = new Chunk[chunksx][chunksy]; cbatch = new CacheBatch(world.width() * world.height() * 4 * 4); - Timers.mark(); + Time.mark(); for(int x = 0; x < chunksx; x++){ for(int y = 0; y < chunksy; y++){ @@ -225,7 +225,7 @@ public class FloorRenderer{ } } - Log.info("Time to cache: {0}", Timers.elapsed()); + Log.info("Time to cache: {0}", Time.elapsed()); } private class Chunk{ diff --git a/core/src/io/anuke/mindustry/graphics/FogRenderer.java b/core/src/io/anuke/mindustry/graphics/FogRenderer.java index f913f4f2b4..92e36d9261 100644 --- a/core/src/io/anuke/mindustry/graphics/FogRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/FogRenderer.java @@ -13,12 +13,12 @@ import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.game.EventType.TileChangeEvent; import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.entities.EntityDraw; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Events; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.entities.EntityDraw; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; import java.nio.ByteBuffer; diff --git a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java index c8ebde6790..3bc143ee93 100644 --- a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java @@ -14,13 +14,13 @@ import io.anuke.mindustry.game.EventType.TileChangeEvent; import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent; import io.anuke.mindustry.world.ColorMapper; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Pixmaps; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.ThreadArray; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Events; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Pixmaps; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.ThreadArray; import static io.anuke.mindustry.Vars.tilesize; import static io.anuke.mindustry.Vars.world; @@ -41,7 +41,7 @@ public class MinimapRenderer implements Disposable{ }); //make sure to call on the graphics thread - Events.on(TileChangeEvent.class, event -> Core.app.postRunnable(() -> update(event.tile))); + Events.on(TileChangeEvent.class, event -> Core.app.post(() -> 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 67ca88fae8..68d312a282 100644 --- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java @@ -13,15 +13,15 @@ import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockBar; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Tmp; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Settings; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Tmp; import static io.anuke.mindustry.Vars.*; @@ -52,7 +52,7 @@ public class OverlayRenderer{ public void drawTop(){ for(Player player : playerGroup.all()){ - if(Settings.getBool("indicators") && player != players[0] && player.getTeam() == players[0].getTeam()){ + if(Core.settings.getBool("indicators") && player != players[0] && player.getTeam() == players[0].getTeam()){ if(!rect.setSize(Core.camera.viewportWidth * Core.camera.zoom * 0.9f, Core.camera.viewportHeight * Core.camera.zoom * 0.9f) .setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x, player.y)){ @@ -91,7 +91,7 @@ public class OverlayRenderer{ if(dst < state.mode.enemyCoreBuildRadius * 1.5f){ Draw.color(Color.DARK_GRAY); Lines.poly(core.drawx(), core.drawy() - 2, 200, state.mode.enemyCoreBuildRadius); - Draw.color(Palette.accent, enemy.color, 0.5f + Mathf.absin(Timers.time(), 10f, 0.5f)); + Draw.color(Palette.accent, enemy.color, 0.5f + Mathf.absin(Time.time(), 10f, 0.5f)); Lines.poly(core.drawx(), core.drawy(), 200, state.mode.enemyCoreBuildRadius); } } @@ -185,14 +185,14 @@ public class OverlayRenderer{ float size = 8; Draw.rect(player.inventory.getItem().item.region, v.x, v.y, size, size); Draw.color(Palette.accent); - Lines.circle(v.x, v.y, 6 + Mathf.absin(Timers.time(), 5f, 1f)); + Lines.circle(v.x, v.y, 6 + Mathf.absin(Time.time(), 5f, 1f)); Draw.reset(); Tile tile = world.tileWorld(v.x, v.y); if(tile != null) tile = tile.target(); if(tile != null && tile.getTeam() == player.getTeam() && tile.block().acceptStack(player.inventory.getItem().item, player.inventory.getItem().amount, tile, player) > 0){ Draw.color(Palette.place); - Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f + 1 + Mathf.absin(Timers.time(), 5f, 1f)); + Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f + 1 + Mathf.absin(Time.time(), 5f, 1f)); Draw.color(); } } diff --git a/core/src/io/anuke/mindustry/graphics/Shaders.java b/core/src/io/anuke/mindustry/graphics/Shaders.java index 9c1dd13176..efb19cb27c 100644 --- a/core/src/io/anuke/mindustry/graphics/Shaders.java +++ b/core/src/io/anuke/mindustry/graphics/Shaders.java @@ -3,11 +3,11 @@ package io.anuke.mindustry.graphics; 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; -import io.anuke.ucore.graphics.Shader; -import io.anuke.ucore.scene.ui.layout.Unit; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Shader; +import io.anuke.arc.scene.ui.layout.Unit; import static io.anuke.mindustry.Vars.tilesize; import static io.anuke.mindustry.Vars.world; @@ -143,7 +143,7 @@ public class Shaders{ shader.setUniformf("u_color", color); shader.setUniformf("u_uv", region.getU(), region.getV()); shader.setUniformf("u_uv2", region.getU2(), region.getV2()); - shader.setUniformf("u_time", Timers.time()); + shader.setUniformf("u_time", Time.time()); shader.setUniformf("u_texsize", region.getTexture().getWidth(), region.getTexture().getHeight()); } } @@ -173,7 +173,7 @@ public class Shaders{ @Override public void apply(){ shader.setUniformf("u_dp", Unit.dp.scl(1f)); - shader.setUniformf("u_time", Timers.time() / Unit.dp.scl(1f)); + shader.setUniformf("u_time", Time.time() / Unit.dp.scl(1f)); shader.setUniformf("u_offset", Core.camera.position.x - Core.camera.viewportWidth / 2 * Core.camera.zoom, Core.camera.position.y - Core.camera.viewportHeight / 2 * Core.camera.zoom); @@ -195,7 +195,7 @@ public class Shaders{ Core.camera.position.y - Core.camera.viewportHeight / 2 * Core.camera.zoom); shader.setUniformf("screensize", Core.camera.viewportWidth* Core.camera.zoom, Core.camera.viewportHeight * Core.camera.zoom); - shader.setUniformf("time", Timers.time()); + shader.setUniformf("time", Time.time()); } } } diff --git a/core/src/io/anuke/mindustry/graphics/Trail.java b/core/src/io/anuke/mindustry/graphics/Trail.java index cde3f9ae98..0258e5ee53 100644 --- a/core/src/io/anuke/mindustry/graphics/Trail.java +++ b/core/src/io/anuke/mindustry/graphics/Trail.java @@ -3,11 +3,11 @@ package io.anuke.mindustry.graphics; 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; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Mathf; /** * Class that renders a colored trail. @@ -29,7 +29,7 @@ public class Trail{ points.add(curx, cury); - while(points.size > (int)(length * 2 / Math.min(Timers.delta(), 1f))){ + while(points.size > (int)(length * 2 / Math.min(Time.delta(), 1f))){ float[] items = points.items; System.arraycopy(items, 2, items, 0, points.size - 2); points.size -= 2; diff --git a/core/src/io/anuke/mindustry/input/Binding.java b/core/src/io/anuke/mindustry/input/Binding.java new file mode 100644 index 0000000000..fb98b686be --- /dev/null +++ b/core/src/io/anuke/mindustry/input/Binding.java @@ -0,0 +1,44 @@ +package io.anuke.mindustry.input; + +import io.anuke.arc.Application.ApplicationType; +import io.anuke.arc.Core; +import io.anuke.arc.KeyBinds.Axis; +import io.anuke.arc.KeyBinds.KeyBind; +import io.anuke.arc.KeyBinds.KeybindValue; +import io.anuke.arc.input.InputDevice.DeviceType; +import io.anuke.arc.input.KeyCode; + +public enum Binding implements KeyBind{ + move_x(new Axis(KeyCode.A, KeyCode.D), "general"), + move_y(new Axis(KeyCode.S, KeyCode.W)), + select(KeyCode.MOUSE_LEFT), + deselect(KeyCode.MOUSE_RIGHT), + break_block(KeyCode.MOUSE_RIGHT), + rotate(new Axis(KeyCode.SCROLL)), + dash(KeyCode.SHIFT_LEFT), + drop_unit(KeyCode.SHIFT_LEFT), + gridMode(KeyCode.CONTROL_LEFT), + gridModeShift(KeyCode.SHIFT_LEFT), + zoom_hold(KeyCode.CONTROL_LEFT, "view"), + zoom(new Axis(KeyCode.SCROLL)), + zoom_minimap(new Axis(KeyCode.MINUS, KeyCode.PLUS)), + menu(Core.app.getType() == ApplicationType.Android ? KeyCode.BACK : KeyCode.ESCAPE), + pause(KeyCode.SPACE), + toggle_menus(KeyCode.C), + screenshot(KeyCode.P), + player_list(KeyCode.TAB, "multiplayer"), + chat(KeyCode.ENTER), + chat_history_prev(KeyCode.UP), + chat_history_next(KeyCode.DOWN), + chat_scroll(new Axis(KeyCode.SCROLL)) + ; + + private final KeybindValue defaultValue; + private final String category; + + Binding(KeybindValue defaultValue, String category){ this.defaultValue = defaultValue; this.category = category; } + Binding(KeybindValue defaultValue){ this(defaultValue, null); } + + @Override public KeybindValue defaultValue(DeviceType type){ return defaultValue; } + @Override public String category(){ return category; } +} diff --git a/core/src/io/anuke/mindustry/input/CursorType.java b/core/src/io/anuke/mindustry/input/CursorType.java index fa26e5f0e9..ac81306ff1 100644 --- a/core/src/io/anuke/mindustry/input/CursorType.java +++ b/core/src/io/anuke/mindustry/input/CursorType.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.input; -import io.anuke.ucore.scene.utils.Cursors; +import io.anuke.arc.scene.utils.Cursors; /** * Type of cursor for displaying on desktop. diff --git a/core/src/io/anuke/mindustry/input/DefaultKeybinds.java b/core/src/io/anuke/mindustry/input/DefaultKeybinds.java deleted file mode 100644 index d3e0c9d969..0000000000 --- a/core/src/io/anuke/mindustry/input/DefaultKeybinds.java +++ /dev/null @@ -1,71 +0,0 @@ -package io.anuke.mindustry.input; - -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; -import io.anuke.ucore.core.KeyBinds.Category; -import io.anuke.ucore.input.Input; - -public class DefaultKeybinds{ - - public static void load(){ - String[] sections = {"player_1"}; - - for(String section : sections){ - - KeyBinds.defaultSection(section, DeviceType.keyboard, - new Category("general"), - "move_x", new Axis(Input.A, Input.D), - "move_y", new Axis(Input.S, Input.W), - "select", Input.MOUSE_LEFT, - "deselect", Input.MOUSE_RIGHT, - "break", Input.MOUSE_RIGHT, - "rotate", new Axis(Input.SCROLL), - "dash", Input.SHIFT_LEFT, - "drop_unit", Input.SHIFT_LEFT, - "gridMode", Input.CONTROL_LEFT, - "gridModeShift", Input.SHIFT_LEFT, - new Category("view"), - "zoom_hold", Input.CONTROL_LEFT, - "zoom", new Axis(Input.SCROLL), - "zoom_minimap", new Axis(Input.MINUS, Input.PLUS), - "menu", Core.app.getType() == ApplicationType.Android ? Input.BACK : Input.ESCAPE, - "pause", Input.SPACE, - "toggle_menus", Input.C, - "screenshot", Input.P, - new Category("multiplayer"), - "player_list", Input.TAB, - "chat", Input.ENTER, - "chat_history_prev", Input.UP, - "chat_history_next", Input.DOWN, - "chat_scroll", new Axis(Input.SCROLL) - ); - - KeyBinds.defaultSection(section, DeviceType.controller, - new Category("general"), - "move_x", new Axis(Input.CONTROLLER_L_STICK_HORIZONTAL_AXIS), - "move_y", new Axis(Input.CONTROLLER_L_STICK_VERTICAL_AXIS), - "cursor_x", new Axis(Input.CONTROLLER_R_STICK_HORIZONTAL_AXIS), - "cursor_y", new Axis(Input.CONTROLLER_R_STICK_VERTICAL_AXIS), - //"select", Input.CONTROLLER_R_BUMPER, - //"break", Input.CONTROLLER_L_BUMPER, - //"shoot", Input.CONTROLLER_R_TRIGGER, - "dash", Input.CONTROLLER_Y, - "rotate_alt", new Axis(Input.CONTROLLER_DPAD_RIGHT, Input.CONTROLLER_DPAD_LEFT), - "rotate", new Axis(Input.CONTROLLER_A, Input.CONTROLLER_B), - new Category("view"), - "zoom_hold", Input.ANY_KEY, - "zoom", new Axis(Input.CONTROLLER_DPAD_DOWN, Input.CONTROLLER_DPAD_UP), - "menu", Input.CONTROLLER_X, - "pause", Input.CONTROLLER_L_TRIGGER, - new Category("multiplayer"), - "player_list", Input.CONTROLLER_START - ); - - } - - KeyBinds.setSectionAlias("default", "player_1"); - } -} diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index 5eaa5ee32c..77a378f509 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -11,15 +11,15 @@ import io.anuke.mindustry.input.PlaceUtils.NormalizeResult; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Inputs; -import io.anuke.ucore.core.Inputs.DeviceType; -import io.anuke.ucore.core.KeyBinds; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.scene.ui.layout.Unit; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Inputs; +import io.anuke.arc.core.Inputs.DeviceType; +import io.anuke.arc.core.KeyBinds; +import io.anuke.arc.core.Settings; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.input.CursorType.*; @@ -310,7 +310,7 @@ public class DesktopInput extends InputHandler{ float ya = Inputs.getAxis(section, "cursor_y"); if(Math.abs(xa) > controllerMin || Math.abs(ya) > controllerMin){ - float scl = Settings.getInt("sensitivity", 100) / 100f * Unit.dp.scl(1f); + float scl = Core.settings.getInt("sensitivity", 100) / 100f * Unit.dp.scl(1f); controlx += xa * baseControllerSpeed * scl; controly -= ya * baseControllerSpeed * scl; controlling = true; diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java index dec9bd29d5..e318911da7 100644 --- a/core/src/io/anuke/mindustry/input/InputHandler.java +++ b/core/src/io/anuke/mindustry/input/InputHandler.java @@ -1,11 +1,16 @@ package io.anuke.mindustry.input; -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.arc.Core; +import io.anuke.arc.Graphics; +import io.anuke.arc.entities.Effects; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.math.Mathf; +import io.anuke.arc.math.geom.Vector2; +import io.anuke.arc.scene.event.InputListener; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.utils.Time; import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.fx.EnvironmentFx; import io.anuke.mindustry.entities.Player; @@ -21,23 +26,15 @@ import io.anuke.mindustry.ui.fragments.OverlayFragment; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Build; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Inputs; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Translator; import static io.anuke.mindustry.Vars.*; -public abstract class InputHandler extends InputAdapter{ +public abstract class InputHandler implements InputListener{ /**Used for dropping items.*/ final static float playerSelectRange = mobile ? 17f : 11f; /**Maximum line length.*/ final static int maxLength = 100; - final static Translator stackTrns = new Translator(); + final static Vector2 stackTrns = new Vector2(); /**Distance on the back from where items originate.*/ final static float backTrns = 3f; @@ -89,12 +86,12 @@ public abstract class InputHandler extends InputAdapter{ for(int i = 0; i < sent; i++){ boolean end = i == sent - 1; - Timers.run(i * 3, () -> { + Time.run(i * 3, () -> { tile.block().getStackOffset(item, tile, stackTrns); ItemTransfer.create(item, - player.x + Angles.trnsx(player.rotation + 180f, backTrns), player.y + Angles.trnsy(player.rotation + 180f, backTrns), - new Translator(tile.drawx() + stackTrns.x, tile.drawy() + stackTrns.y), () -> { + player.x + Mathf.trnsx(player.rotation + 180f, backTrns), player.y + Mathf.trnsy(player.rotation + 180f, backTrns), + new Vector2(tile.drawx() + stackTrns.x, tile.drawy() + stackTrns.y), () -> { if(tile.block() != block || tile.entity == null || tile.entity.items == null) return; tile.block().handleStack(item, removed, tile, player); diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index 8eb82433e7..9ef5172771 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -27,11 +27,11 @@ import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.ui.dialogs.FloatingDialog; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.*; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.*; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.input.PlaceMode.*; @@ -41,7 +41,7 @@ public class MobileInput extends InputHandler implements GestureListener{ private static final float maxPanSpeed = 1.3f; private static Rectangle r1 = new Rectangle(), r2 = new Rectangle(); /** Distance to edge of screen to start panning. */ - private final float edgePan = io.anuke.ucore.scene.ui.layout.Unit.dp.scl(60f); + private final float edgePan = io.anuke.arc.scene.ui.layout.Unit.dp.scl(60f); //gesture data private Vector2 vector = new Vector2(); @@ -191,15 +191,15 @@ public class MobileInput extends InputHandler implements GestureListener{ } void showGuide(String type){ - if(!guides.contains(type) && !Settings.getBool(type, false)){ + if(!guides.contains(type) && !Core.settings.getBool(type, false)){ FloatingDialog dialog = new FloatingDialog("$text." + type + ".title"); dialog.addCloseButton(); dialog.content().left(); dialog.content().add("$text." + type).growX().wrap(); dialog.content().row(); dialog.content().addCheck("$text.showagain", false, checked -> { - Settings.putBool(type, checked); - Settings.save(); + Core.settings.putBool(type, checked); + Core.settings.save(); }).growX().left().get().left(); dialog.show(); guides.add(type); @@ -397,8 +397,8 @@ public class MobileInput extends InputHandler implements GestureListener{ float radius = Interpolation.swingIn.apply(crosshairScale); - Lines.poly(target.getX(), target.getY(), 4, 7f * radius, Timers.time() * 1.5f); - Lines.spikes(target.getX(), target.getY(), 3f * radius, 6f * radius, 4, Timers.time() * 1.5f); + Lines.poly(target.getX(), target.getY(), 4, 7f * radius, Time.time() * 1.5f); + Lines.spikes(target.getX(), target.getY(), 3f * radius, 6f * radius, 4, Time.time() * 1.5f); } Draw.reset(); @@ -697,9 +697,9 @@ public class MobileInput extends InputHandler implements GestureListener{ @Override public boolean zoom(float initialDistance, float distance){ - if(Math.abs(distance - initialDistance) > io.anuke.ucore.scene.ui.layout.Unit.dp.scl(100f) && !zoomed){ + if(Math.abs(distance - initialDistance) > io.anuke.arc.scene.ui.layout.Unit.dp.scl(100f) && !zoomed){ int amount = (distance > initialDistance ? 1 : -1); - renderer.scaleCamera(Math.round(io.anuke.ucore.scene.ui.layout.Unit.dp.scl(amount))); + renderer.scaleCamera(Math.round(io.anuke.arc.scene.ui.layout.Unit.dp.scl(amount))); zoomed = true; return true; } diff --git a/core/src/io/anuke/mindustry/input/PlaceUtils.java b/core/src/io/anuke/mindustry/input/PlaceUtils.java index b74b5b31a8..8e95995554 100644 --- a/core/src/io/anuke/mindustry/input/PlaceUtils.java +++ b/core/src/io/anuke/mindustry/input/PlaceUtils.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.input; import io.anuke.mindustry.world.Block; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.tilesize; diff --git a/core/src/io/anuke/mindustry/io/BundleLoader.java b/core/src/io/anuke/mindustry/io/BundleLoader.java index b6fa4b2084..765802ea05 100644 --- a/core/src/io/anuke/mindustry/io/BundleLoader.java +++ b/core/src/io/anuke/mindustry/io/BundleLoader.java @@ -4,10 +4,10 @@ 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; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Log; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Settings; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Log; import java.util.Locale; @@ -16,13 +16,13 @@ import static io.anuke.mindustry.Vars.headless; public class BundleLoader{ public static void load(){ - Settings.defaults("locale", "default"); - Settings.load(Vars.appName, headless ? "io.anuke.mindustry.server" : "io.anuke.mindustry"); + Core.settings.defaults("locale", "default"); + Core.settings.load(Vars.appName, headless ? "io.anuke.mindustry.server" : "io.anuke.mindustry"); loadBundle(); } private static Locale getLocale(){ - String loc = Settings.getString("locale"); + String loc = Core.settings.getString("locale"); if(loc.equals("default")){ return Locale.getDefault(); }else{ @@ -49,7 +49,7 @@ public class BundleLoader{ Log.info("NOTE: external translation bundle has been loaded."); if(!headless){ - Timers.run(10f, () -> Vars.ui.showInfo("Note: You have successfully loaded an external translation bundle.")); + Time.run(10f, () -> Vars.ui.showInfo("Note: You have successfully loaded an external translation bundle.")); } }catch(Throwable e){ //no external bundle found diff --git a/core/src/io/anuke/mindustry/io/Changelogs.java b/core/src/io/anuke/mindustry/io/Changelogs.java index a9f634f4b5..44d707c7bc 100644 --- a/core/src/io/anuke/mindustry/io/Changelogs.java +++ b/core/src/io/anuke/mindustry/io/Changelogs.java @@ -4,7 +4,7 @@ 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; +import io.anuke.arc.function.Consumer; import static io.anuke.mindustry.Vars.releasesURL; diff --git a/core/src/io/anuke/mindustry/io/Contributors.java b/core/src/io/anuke/mindustry/io/Contributors.java index a03fc5f39c..6fe95d3fc5 100644 --- a/core/src/io/anuke/mindustry/io/Contributors.java +++ b/core/src/io/anuke/mindustry/io/Contributors.java @@ -4,7 +4,7 @@ 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; +import io.anuke.arc.function.Consumer; import static io.anuke.mindustry.Vars.contributorsURL; diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java index ee7b909916..2ee32dbf19 100644 --- a/core/src/io/anuke/mindustry/io/MapIO.java +++ b/core/src/io/anuke/mindustry/io/MapIO.java @@ -19,8 +19,8 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.ColorMapper; import io.anuke.mindustry.world.LegacyColorMapper; import io.anuke.mindustry.world.LegacyColorMapper.LegacyBlock; -import io.anuke.ucore.util.Bits; -import io.anuke.ucore.util.Structs; +import io.anuke.arc.util.Bits; +import io.anuke.arc.util.Structs; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/core/src/io/anuke/mindustry/io/SaveFileVersion.java b/core/src/io/anuke/mindustry/io/SaveFileVersion.java index 488e5e3ade..74273b1662 100644 --- a/core/src/io/anuke/mindustry/io/SaveFileVersion.java +++ b/core/src/io/anuke/mindustry/io/SaveFileVersion.java @@ -13,10 +13,10 @@ import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.BlockPart; -import io.anuke.ucore.entities.Entities; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.trait.Entity; -import io.anuke.ucore.util.Bits; +import io.anuke.arc.entities.Entities; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.entities.trait.Entity; +import io.anuke.arc.util.Bits; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/core/src/io/anuke/mindustry/io/TypeIO.java b/core/src/io/anuke/mindustry/io/TypeIO.java index 535f0fd0fc..2587c3c334 100644 --- a/core/src/io/anuke/mindustry/io/TypeIO.java +++ b/core/src/io/anuke/mindustry/io/TypeIO.java @@ -20,9 +20,9 @@ import io.anuke.mindustry.type.*; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Pos; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.entities.Entities; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.entities.Entities; import java.io.DataInput; import java.io.DataOutput; diff --git a/core/src/io/anuke/mindustry/maps/Map.java b/core/src/io/anuke/mindustry/maps/Map.java index 95f7399608..ae40f59fad 100644 --- a/core/src/io/anuke/mindustry/maps/Map.java +++ b/core/src/io/anuke/mindustry/maps/Map.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.maps; import io.anuke.arc.graphics.Texture; import io.anuke.arc.utils.ObjectMap; -import io.anuke.ucore.function.Supplier; +import io.anuke.arc.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 934800c752..2bdfa05c16 100644 --- a/core/src/io/anuke/mindustry/maps/MapMeta.java +++ b/core/src/io/anuke/mindustry/maps/MapMeta.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.maps; import io.anuke.arc.utils.IntIntMap; import io.anuke.arc.utils.ObjectMap; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; public class MapMeta{ public final int version; @@ -31,7 +31,7 @@ public class MapMeta{ } public String tag(String name){ - return tags.containsKey(name) && !tags.get(name).trim().isEmpty() ? tags.get(name): Bundles.get("text.unknown"); + return tags.containsKey(name) && !tags.get(name).trim().isEmpty() ? tags.get(name): Core.bundle.get("text.unknown"); } public boolean hasOreGen(){ diff --git a/core/src/io/anuke/mindustry/maps/MapTileData.java b/core/src/io/anuke/mindustry/maps/MapTileData.java index b6a15ac1c0..44789f31eb 100644 --- a/core/src/io/anuke/mindustry/maps/MapTileData.java +++ b/core/src/io/anuke/mindustry/maps/MapTileData.java @@ -4,8 +4,8 @@ import io.anuke.arc.utils.IntIntMap; import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.world.Block; -import io.anuke.ucore.util.Bits; -import io.anuke.ucore.util.Structs; +import io.anuke.arc.util.Bits; +import io.anuke.arc.util.Structs; import java.nio.ByteBuffer; diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index b383ccc534..6d63f6cc4c 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -7,9 +7,9 @@ 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; -import io.anuke.ucore.util.ThreadArray; +import io.anuke.arc.function.Supplier; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.ThreadArray; import java.io.DataInputStream; import java.io.IOException; diff --git a/core/src/io/anuke/mindustry/maps/Sector.java b/core/src/io/anuke/mindustry/maps/Sector.java index b9a42dd922..59e19fac78 100644 --- a/core/src/io/anuke/mindustry/maps/Sector.java +++ b/core/src/io/anuke/mindustry/maps/Sector.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.game.Saves.SaveSlot; import io.anuke.mindustry.game.SpawnGroup; import io.anuke.mindustry.maps.missions.*; import io.anuke.mindustry.type.ItemStack; -import io.anuke.ucore.util.Bits; +import io.anuke.arc.util.Bits; import static io.anuke.mindustry.Vars.control; import static io.anuke.mindustry.Vars.headless; diff --git a/core/src/io/anuke/mindustry/maps/SectorPresets.java b/core/src/io/anuke/mindustry/maps/SectorPresets.java index abf3d9eaa3..9e1cd27924 100644 --- a/core/src/io/anuke/mindustry/maps/SectorPresets.java +++ b/core/src/io/anuke/mindustry/maps/SectorPresets.java @@ -12,8 +12,8 @@ import io.anuke.mindustry.content.blocks.UpgradeBlocks; import io.anuke.mindustry.entities.units.UnitCommand; import io.anuke.mindustry.maps.missions.*; import io.anuke.mindustry.type.Item; -import io.anuke.ucore.util.GridMap; -import io.anuke.ucore.util.Structs; +import io.anuke.arc.util.GridMap; +import io.anuke.arc.util.Structs; import static io.anuke.mindustry.Vars.mobile; diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java index 0a1fef1a8b..c8b6d755c5 100644 --- a/core/src/io/anuke/mindustry/maps/Sectors.java +++ b/core/src/io/anuke/mindustry/maps/Sectors.java @@ -27,8 +27,8 @@ import io.anuke.mindustry.type.Recipe.RecipeVisibility; import io.anuke.mindustry.world.ColorMapper; import io.anuke.mindustry.world.blocks.Floor; import io.anuke.mindustry.world.blocks.defense.Wall; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.util.*; +import io.anuke.arc.core.Settings; +import io.anuke.arc.util.*; import static io.anuke.mindustry.Vars.*; @@ -161,7 +161,7 @@ public class Sectors{ } grid.clear(); - Array out = Settings.getObject("sector-data-2", Array.class, Array::new); + Array out = Core.settings.getObject("sector-data-2", Array.class, Array::new); for(Sector sector : out){ @@ -190,8 +190,8 @@ public class Sectors{ } } - Settings.putObject("sector-data-2", out); - Settings.save(); + Core.settings.putObject("sector-data-2", out); + Core.settings.save(); } private void initSector(Sector sector){ @@ -307,7 +307,7 @@ public class Sectors{ } } - Core.app.postRunnable(() -> { + Core.app.post(() -> { 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 bdb835a370..fb88e20bfc 100644 --- a/core/src/io/anuke/mindustry/maps/TutorialSector.java +++ b/core/src/io/anuke/mindustry/maps/TutorialSector.java @@ -62,7 +62,7 @@ public class TutorialSector{ new BlockMission(ProductionBlocks.mechanicalDrill).setMessage("$tutorial.generatordrill"), new BlockMission(PowerBlocks.powerNode).setMessage("$tutorial.node"), //TODO fix positions - new ConditionMission(Bundles.get("text.mission.linknode"), () -> world.tile(54, 52).entity != null && world.tile(54, 52).entity.power != null && world.tile(54, 52).entity.power.amount >= 0.01f) + new ConditionMission(Core.bundle.get("text.mission.linknode"), () -> world.tile(54, 52).entity != null && world.tile(54, 52).entity.power != null && world.tile(54, 52).entity.power.amount >= 0.01f) .setMessage("$tutorial.nodelink"), new ItemMission(Items.silicon, 70).setMessage("$tutorial.silicon"), diff --git a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java index 11d3c7c3db..1606430bf6 100644 --- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java @@ -29,11 +29,11 @@ import io.anuke.mindustry.world.blocks.power.SolarGenerator; import io.anuke.mindustry.world.blocks.storage.CoreBlock; import io.anuke.mindustry.world.blocks.storage.StorageBlock; import io.anuke.mindustry.world.blocks.units.UnitFactory; -import io.anuke.ucore.function.BiFunction; -import io.anuke.ucore.function.IntPositionConsumer; -import io.anuke.ucore.function.TriFunction; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.function.BiFunction; +import io.anuke.arc.function.IntPositionConsumer; +import io.anuke.arc.function.TriFunction; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.content; diff --git a/core/src/io/anuke/mindustry/maps/generation/Generation.java b/core/src/io/anuke/mindustry/maps/generation/Generation.java index 3929a160ad..0c40b71e20 100644 --- a/core/src/io/anuke/mindustry/maps/generation/Generation.java +++ b/core/src/io/anuke/mindustry/maps/generation/Generation.java @@ -6,8 +6,8 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.production.Drill; -import io.anuke.ucore.util.Structs; -import io.anuke.ucore.util.SeedRandom; +import io.anuke.arc.util.Structs; +import io.anuke.arc.util.SeedRandom; public class Generation{ public final Sector sector; diff --git a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java index 575f69325e..e76aad927d 100644 --- a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java @@ -21,12 +21,12 @@ import io.anuke.mindustry.world.Pos; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.Floor; import io.anuke.mindustry.world.blocks.OreBlock; -import io.anuke.ucore.noise.RidgedPerlin; -import io.anuke.ucore.noise.Simplex; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.SeedRandom; -import io.anuke.ucore.util.Structs; +import io.anuke.arc.noise.RidgedPerlin; +import io.anuke.arc.noise.Simplex; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.SeedRandom; +import io.anuke.arc.util.Structs; import static io.anuke.mindustry.Vars.*; diff --git a/core/src/io/anuke/mindustry/maps/missions/ActionMission.java b/core/src/io/anuke/mindustry/maps/missions/ActionMission.java index 55710aa1ff..668232c12d 100644 --- a/core/src/io/anuke/mindustry/maps/missions/ActionMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/ActionMission.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.maps.missions; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; import static io.anuke.mindustry.Vars.threads; @@ -27,6 +27,6 @@ public class ActionMission extends Mission{ @Override public String displayString(){ - return Bundles.get("text.loading"); + return Core.bundle.get("text.loading"); } } diff --git a/core/src/io/anuke/mindustry/maps/missions/BattleMission.java b/core/src/io/anuke/mindustry/maps/missions/BattleMission.java index 175e79c9de..2e53faa50b 100644 --- a/core/src/io/anuke/mindustry/maps/missions/BattleMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/BattleMission.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.game.Team; import io.anuke.mindustry.maps.generation.FortressGenerator; import io.anuke.mindustry.maps.generation.Generation; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; import static io.anuke.mindustry.Vars.*; @@ -43,7 +43,7 @@ public class BattleMission extends MissionWithStartingCore{ @Override public String displayString(){ - return Bundles.get("text.mission.battle"); + return Core.bundle.get("text.mission.battle"); } @Override diff --git a/core/src/io/anuke/mindustry/maps/missions/BlockLocMission.java b/core/src/io/anuke/mindustry/maps/missions/BlockLocMission.java index 00a596e81a..7b7e35eebb 100644 --- a/core/src/io/anuke/mindustry/maps/missions/BlockLocMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/BlockLocMission.java @@ -2,12 +2,12 @@ package io.anuke.mindustry.maps.missions; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.world.Block; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.players; import static io.anuke.mindustry.Vars.tilesize; @@ -36,10 +36,10 @@ public class BlockLocMission extends Mission{ Lines.stroke(2f); Draw.color(Palette.accentBack); - Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset() - 1f, block.size * tilesize/2f + 1f+ Mathf.absin(Timers.time(), 6f, 2f)); + Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset() - 1f, block.size * tilesize/2f + 1f+ Mathf.absin(Time.time(), 6f, 2f)); Draw.color(Palette.accent); - Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset(), block.size * tilesize/2f + 1f+ Mathf.absin(Timers.time(), 6f, 2f)); + Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset(), block.size * tilesize/2f + 1f+ Mathf.absin(Time.time(), 6f, 2f)); if(block.rotate){ @@ -67,6 +67,6 @@ public class BlockLocMission extends Mission{ @Override public String displayString(){ - return Bundles.format("text.mission.block", block.formalName); + return Core.bundle.format("text.mission.block", block.formalName); } } diff --git a/core/src/io/anuke/mindustry/maps/missions/CommandMission.java b/core/src/io/anuke/mindustry/maps/missions/CommandMission.java index a25f5e04f5..44c2ca59e7 100644 --- a/core/src/io/anuke/mindustry/maps/missions/CommandMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/CommandMission.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.maps.missions; import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.entities.units.UnitCommand; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; public class CommandMission extends Mission{ private final UnitCommand command; @@ -24,6 +24,6 @@ public class CommandMission extends Mission{ @Override public String displayString(){ - return Bundles.format("text.mission.command", command.localized()); + return Core.bundle.format("text.mission.command", command.localized()); } } diff --git a/core/src/io/anuke/mindustry/maps/missions/ConditionMission.java b/core/src/io/anuke/mindustry/maps/missions/ConditionMission.java index 68e141633b..1926b44229 100644 --- a/core/src/io/anuke/mindustry/maps/missions/ConditionMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/ConditionMission.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.maps.missions; -import io.anuke.ucore.function.BooleanProvider; +import io.anuke.arc.function.BooleanProvider; public class ConditionMission extends Mission{ private final BooleanProvider complete; diff --git a/core/src/io/anuke/mindustry/maps/missions/ContentMission.java b/core/src/io/anuke/mindustry/maps/missions/ContentMission.java index c4a85afd26..1b93ebe1da 100644 --- a/core/src/io/anuke/mindustry/maps/missions/ContentMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/ContentMission.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.maps.missions; import io.anuke.mindustry.game.UnlockableContent; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; public class ContentMission extends Mission { private final UnlockableContent content; @@ -30,6 +30,6 @@ public class ContentMission extends Mission { @Override public String displayString() { - return Bundles.format("text.mission.create", content.localizedName()); + return Core.bundle.format("text.mission.create", content.localizedName()); } } diff --git a/core/src/io/anuke/mindustry/maps/missions/ItemMission.java b/core/src/io/anuke/mindustry/maps/missions/ItemMission.java index a65eb4bc31..2b628828a3 100644 --- a/core/src/io/anuke/mindustry/maps/missions/ItemMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/ItemMission.java @@ -4,7 +4,7 @@ import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; import static io.anuke.mindustry.Vars.state; @@ -32,11 +32,11 @@ public class ItemMission extends Mission{ public String displayString(){ TileEntity core = Vars.players[0].getClosestCore(); if(core == null) return "imminent doom"; - return Bundles.format("text.mission.resource", item.localizedName(), core.items.get(item), amount); + return Core.bundle.format("text.mission.resource", item.localizedName(), core.items.get(item), amount); } @Override public String menuDisplayString(){ - return Bundles.format("text.mission.resource.menu", item.localizedName(), amount); + return Core.bundle.format("text.mission.resource.menu", item.localizedName(), amount); } } diff --git a/core/src/io/anuke/mindustry/maps/missions/MechMission.java b/core/src/io/anuke/mindustry/maps/missions/MechMission.java index f59710a698..645891a7d6 100644 --- a/core/src/io/anuke/mindustry/maps/missions/MechMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/MechMission.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.maps.missions; import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.type.Mech; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; public class MechMission extends Mission{ private final Mech mech; @@ -24,6 +24,6 @@ public class MechMission extends Mission{ @Override public String displayString(){ - return Bundles.format("text.mission.mech", mech.localizedName()); + return Core.bundle.format("text.mission.mech", mech.localizedName()); } } diff --git a/core/src/io/anuke/mindustry/maps/missions/Mission.java b/core/src/io/anuke/mindustry/maps/missions/Mission.java index 01921dc03e..9bebea354a 100644 --- a/core/src/io/anuke/mindustry/maps/missions/Mission.java +++ b/core/src/io/anuke/mindustry/maps/missions/Mission.java @@ -7,9 +7,9 @@ import io.anuke.mindustry.game.SpawnGroup; import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.maps.Sector; import io.anuke.mindustry.maps.generation.Generation; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.core.Timers; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Bundles; import static io.anuke.mindustry.Vars.*; @@ -76,12 +76,12 @@ public abstract class Mission{ } public void onBegin(){ - Timers.runTask(60f, this::showMessage); + Time.runTask(60f, this::showMessage); } public void onComplete(){ if(showComplete && !headless){ - threads.runGraphics(() -> ui.hudfrag.showToast("[LIGHT_GRAY]"+menuDisplayString() + ":\n" + Bundles.get("text.mission.complete"))); + threads.runGraphics(() -> ui.hudfrag.showToast("[LIGHT_GRAY]"+menuDisplayString() + ":\n" + Core.bundle.get("text.mission.complete"))); } } diff --git a/core/src/io/anuke/mindustry/maps/missions/UnitMission.java b/core/src/io/anuke/mindustry/maps/missions/UnitMission.java index efe097a687..09465a1644 100644 --- a/core/src/io/anuke/mindustry/maps/missions/UnitMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/UnitMission.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.maps.missions; import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.entities.units.UnitType; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; public class UnitMission extends Mission{ private final UnitType type; @@ -24,6 +24,6 @@ public class UnitMission extends Mission{ @Override public String displayString(){ - return Bundles.format("text.mission.unit", type.localizedName()); + return Core.bundle.format("text.mission.unit", type.localizedName()); } } diff --git a/core/src/io/anuke/mindustry/maps/missions/VictoryMission.java b/core/src/io/anuke/mindustry/maps/missions/VictoryMission.java index 46b6153dff..8a4851190b 100644 --- a/core/src/io/anuke/mindustry/maps/missions/VictoryMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/VictoryMission.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.maps.missions; import io.anuke.mindustry.game.GameMode; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Table; public class VictoryMission extends Mission{ @Override diff --git a/core/src/io/anuke/mindustry/maps/missions/WaveMission.java b/core/src/io/anuke/mindustry/maps/missions/WaveMission.java index 34308789b2..74c9fae8d8 100644 --- a/core/src/io/anuke/mindustry/maps/missions/WaveMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/WaveMission.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Waves; import io.anuke.mindustry.maps.Sector; import io.anuke.mindustry.maps.generation.Generation; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; import static io.anuke.mindustry.Vars.*; @@ -59,16 +59,16 @@ public class WaveMission extends MissionWithStartingCore{ @Override public String displayString(){ return state.wave > target ? - Bundles.format( + Core.bundle.format( state.enemies() > 1 ? "text.mission.wave.enemies" : "text.mission.wave.enemy", target, target, state.enemies()) : - Bundles.format("text.mission.wave", state.wave, target, (int)(state.wavetime/60)); + Core.bundle.format("text.mission.wave", state.wave, target, (int)(state.wavetime/60)); } @Override public String menuDisplayString(){ - return Bundles.format("text.mission.wave.menu", target); + return Core.bundle.format("text.mission.wave.menu", target); } @Override diff --git a/core/src/io/anuke/mindustry/net/Administration.java b/core/src/io/anuke/mindustry/net/Administration.java index 97bbf3e6ab..1c573dd62b 100644 --- a/core/src/io/anuke/mindustry/net/Administration.java +++ b/core/src/io/anuke/mindustry/net/Administration.java @@ -4,7 +4,7 @@ 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; +import io.anuke.arc.core.Settings; import static io.anuke.mindustry.Vars.headless; @@ -15,7 +15,7 @@ public class Administration{ private Array bannedIPs = new Array<>(); public Administration(){ - Settings.defaultList( + Core.settings.defaultList( "strict", true ); @@ -23,21 +23,21 @@ public class Administration{ } public void setStrict(boolean on){ - Settings.putBool("strict", on); - Settings.save(); + Core.settings.putBool("strict", on); + Core.settings.save(); } public boolean getStrict(){ - return Settings.getBool("strict"); + return Core.settings.getBool("strict"); } public boolean allowsCustomClients(){ - return Settings.getBool("allow-custom", !headless); + return Core.settings.getBool("allow-custom", !headless); } public void setCustomClients(boolean allowed){ - Settings.putBool("allow-custom", allowed); - Settings.save(); + Core.settings.putBool("allow-custom", allowed); + Core.settings.save(); } /**Call when a player joins to update their information here.*/ @@ -256,15 +256,15 @@ public class Administration{ } public void save(){ - Settings.putObject("player-info", playerInfo); - Settings.putObject("banned-ips", bannedIPs); - Settings.save(); + Core.settings.putObject("player-info", playerInfo); + Core.settings.putObject("banned-ips", bannedIPs); + Core.settings.save(); } @SuppressWarnings("unchecked") private void load(){ - playerInfo = Settings.getObject("player-info", ObjectMap.class, ObjectMap::new); - bannedIPs = Settings.getObject("banned-ips", Array.class, Array::new); + playerInfo = Core.settings.getObject("player-info", ObjectMap.class, ObjectMap::new); + bannedIPs = Core.settings.getObject("banned-ips", Array.class, Array::new); } @Serialize diff --git a/core/src/io/anuke/mindustry/net/Interpolator.java b/core/src/io/anuke/mindustry/net/Interpolator.java index 950310c30d..63a8589040 100644 --- a/core/src/io/anuke/mindustry/net/Interpolator.java +++ b/core/src/io/anuke/mindustry/net/Interpolator.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.net; import io.anuke.arc.math.Vector2; import io.anuke.arc.utils.TimeUtils; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.util.Mathf; public class Interpolator{ //used for movement diff --git a/core/src/io/anuke/mindustry/net/Net.java b/core/src/io/anuke/mindustry/net/Net.java index d0dce9ef8d..9c7e2e6c27 100644 --- a/core/src/io/anuke/mindustry/net/Net.java +++ b/core/src/io/anuke/mindustry/net/Net.java @@ -14,12 +14,12 @@ import io.anuke.mindustry.net.Packets.KickReason; import io.anuke.mindustry.net.Packets.StreamBegin; import io.anuke.mindustry.net.Packets.StreamChunk; import io.anuke.mindustry.net.Streamable.StreamBuilder; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.function.BiConsumer; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.Pooling; +import io.anuke.arc.core.Timers; +import io.anuke.arc.function.BiConsumer; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.Pooling; import java.io.IOException; @@ -60,20 +60,20 @@ public class Net{ String type = t.getClass().toString().toLowerCase(); if(error.equals("mismatch")){ - error = Bundles.get("text.error.mismatch"); + error = Core.bundle.get("text.error.mismatch"); }else if(error.contains("port out of range") || error.contains("invalid argument") || (error.contains("invalid") && error.contains("address"))){ - error = Bundles.get("text.error.invalidaddress"); + error = Core.bundle.get("text.error.invalidaddress"); }else if(error.contains("connection refused") || error.contains("route to host") || type.contains("unknownhost")){ - error = Bundles.get("text.error.unreachable"); + error = Core.bundle.get("text.error.unreachable"); }else if(type.contains("timeout")){ - error = Bundles.get("text.error.timedout"); + error = Core.bundle.get("text.error.timedout"); }else if(error.equals("alreadyconnected")){ - error = Bundles.get("text.error.alreadyconnected"); + error = Core.bundle.get("text.error.alreadyconnected"); }else if(!error.isEmpty()){ - error = Bundles.get("text.error.any"); + error = Core.bundle.get("text.error.any"); } - ui.showText("", Bundles.format("text.connectfail", error)); + ui.showText("", Core.bundle.format("text.connectfail", error)); ui.loadfrag.hide(); if(Net.client()){ @@ -126,7 +126,7 @@ public class Net{ active = true; server = true; - Timers.runTask(60f, Platform.instance::updateRPC); + Time.runTask(60f, Platform.instance::updateRPC); } /** diff --git a/core/src/io/anuke/mindustry/net/NetworkIO.java b/core/src/io/anuke/mindustry/net/NetworkIO.java index 5bd6581bc2..13d1603246 100644 --- a/core/src/io/anuke/mindustry/net/NetworkIO.java +++ b/core/src/io/anuke/mindustry/net/NetworkIO.java @@ -14,10 +14,10 @@ import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.maps.MapMeta; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.BlockPart; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.Entities; -import io.anuke.ucore.util.Bits; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Timers; +import io.anuke.arc.entities.Entities; +import io.anuke.arc.util.Bits; import java.io.*; import java.nio.ByteBuffer; @@ -151,7 +151,7 @@ public class NetworkIO{ Player player = players[0]; try(DataInputStream stream = new DataInputStream(is)){ - Timers.clear(); + Time.clear(); //general state byte mode = stream.readByte(); diff --git a/core/src/io/anuke/mindustry/net/Packets.java b/core/src/io/anuke/mindustry/net/Packets.java index f9015ad45d..d93860032e 100644 --- a/core/src/io/anuke/mindustry/net/Packets.java +++ b/core/src/io/anuke/mindustry/net/Packets.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.net; import io.anuke.arc.utils.Base64Coder; import io.anuke.mindustry.game.Version; import io.anuke.mindustry.io.TypeIO; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; import java.nio.ByteBuffer; @@ -28,11 +28,11 @@ public class Packets{ @Override public String toString(){ - return Bundles.get("text.server.kicked." + name()); + return Core.bundle.get("text.server.kicked." + name()); } public String extraText(){ - return Bundles.getOrNull("text.server.kicked." + name() + ".text"); + return Core.bundle.getOrNull("text.server.kicked." + name() + ".text"); } } diff --git a/core/src/io/anuke/mindustry/net/Registrator.java b/core/src/io/anuke/mindustry/net/Registrator.java index a3d9462e11..97920d478d 100644 --- a/core/src/io/anuke/mindustry/net/Registrator.java +++ b/core/src/io/anuke/mindustry/net/Registrator.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.net; import io.anuke.arc.utils.ObjectIntMap; import io.anuke.mindustry.net.Packets.*; -import io.anuke.ucore.function.Supplier; +import io.anuke.arc.function.Supplier; public class Registrator{ private static ClassEntry[] classes = { diff --git a/core/src/io/anuke/mindustry/type/AmmoType.java b/core/src/io/anuke/mindustry/type/AmmoType.java index 2244a09a1d..00fab82ace 100644 --- a/core/src/io/anuke/mindustry/type/AmmoType.java +++ b/core/src/io/anuke/mindustry/type/AmmoType.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.type; import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.game.Content; -import io.anuke.ucore.core.Effects.Effect; +import io.anuke.arc.core.Effects.Effect; public class AmmoType extends Content { /**The item used. Always null if liquid isn't.*/ diff --git a/core/src/io/anuke/mindustry/type/Item.java b/core/src/io/anuke/mindustry/type/Item.java index 0cd980d3f1..6c1c844f98 100644 --- a/core/src/io/anuke/mindustry/type/Item.java +++ b/core/src/io/anuke/mindustry/type/Item.java @@ -7,11 +7,11 @@ import io.anuke.mindustry.Vars; import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.ui.ContentDisplay; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.Strings; public class Item extends UnlockableContent implements Comparable{ public final String name; @@ -46,9 +46,9 @@ public class Item extends UnlockableContent implements Comparable{ public Item(String name, Color color){ this.name = name; this.color = color; - this.description = Bundles.getOrNull("item." + this.name + ".description"); + this.description = Core.bundle.getOrNull("item." + this.name + ".description"); - if(!Bundles.has("item." + this.name + ".name")){ + if(!Core.bundle.has("item." + this.name + ".name")){ Log.err("Warning: item '" + name + "' is missing a localized name. Add the following to bundle.properties:"); Log.err("item." + this.name + ".name=" + Strings.capitalize(name.replace('-', '_'))); } @@ -70,7 +70,7 @@ public class Item extends UnlockableContent implements Comparable{ @Override public String localizedName(){ - return Bundles.get("item." + this.name + ".name"); + return Core.bundle.get("item." + this.name + ".name"); } @Override diff --git a/core/src/io/anuke/mindustry/type/Liquid.java b/core/src/io/anuke/mindustry/type/Liquid.java index 3af469d385..d143b7cbba 100644 --- a/core/src/io/anuke/mindustry/type/Liquid.java +++ b/core/src/io/anuke/mindustry/type/Liquid.java @@ -5,9 +5,9 @@ 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; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Bundles; public class Liquid extends UnlockableContent{ public final Color color; @@ -36,7 +36,7 @@ public class Liquid extends UnlockableContent{ public Liquid(String name, Color color){ this.name = name; this.color = new Color(color); - this.description = Bundles.getOrNull("liquid." + name + ".description"); + this.description = Core.bundle.getOrNull("liquid." + name + ".description"); } public boolean canExtinguish(){ @@ -55,7 +55,7 @@ public class Liquid extends UnlockableContent{ @Override public String localizedName(){ - return Bundles.get("liquid." + this.name + ".name"); + return Core.bundle.get("liquid." + this.name + ".name"); } @Override diff --git a/core/src/io/anuke/mindustry/type/Mech.java b/core/src/io/anuke/mindustry/type/Mech.java index 95e1fa21d2..cad0baf650 100644 --- a/core/src/io/anuke/mindustry/type/Mech.java +++ b/core/src/io/anuke/mindustry/type/Mech.java @@ -7,9 +7,9 @@ import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.ui.ContentDisplay; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Bundles; public class Mech extends UnlockableContent{ public final String name; @@ -44,11 +44,11 @@ public class Mech extends UnlockableContent{ public Mech(String name, boolean flying){ this.flying = flying; this.name = name; - this.description = Bundles.get("mech." + name + ".description"); + this.description = Core.bundle.get("mech." + name + ".description"); } public String localizedName(){ - return Bundles.get("mech." + name + ".name"); + return Core.bundle.get("mech." + name + ".name"); } public void updateAlt(Player player){} diff --git a/core/src/io/anuke/mindustry/type/Recipe.java b/core/src/io/anuke/mindustry/type/Recipe.java index 5637addaa2..1bcd79306a 100644 --- a/core/src/io/anuke/mindustry/type/Recipe.java +++ b/core/src/io/anuke/mindustry/type/Recipe.java @@ -12,10 +12,10 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.ContentStatValue; import io.anuke.mindustry.world.meta.StatValue; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.Strings; import java.util.Arrays; @@ -118,7 +118,7 @@ public class Recipe extends UnlockableContent{ @Override public void init(){ - if(!Bundles.has("block." + result.name + ".name")){ + if(!Core.bundle.has("block." + result.name + ".name")){ Log.err("WARNING: Recipe block '{0}' does not have a formal name defined. Add the following to bundle.properties:", result.name); Log.err("block.{0}.name={1}", result.name, Strings.capitalize(result.name.replace('-', '_'))); }/*else if(result.fullDescription == null){ diff --git a/core/src/io/anuke/mindustry/type/Weapon.java b/core/src/io/anuke/mindustry/type/Weapon.java index 44a44733bb..4c1e3dfe27 100644 --- a/core/src/io/anuke/mindustry/type/Weapon.java +++ b/core/src/io/anuke/mindustry/type/Weapon.java @@ -11,13 +11,13 @@ import io.anuke.mindustry.entities.traits.ShooterTrait; import io.anuke.mindustry.game.Content; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.net.Net; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Translator; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Translator; public class Weapon extends Content{ public final String name; diff --git a/core/src/io/anuke/mindustry/ui/BorderImage.java b/core/src/io/anuke/mindustry/ui/BorderImage.java index ce88ddfa79..e03b40887f 100644 --- a/core/src/io/anuke/mindustry/ui/BorderImage.java +++ b/core/src/io/anuke/mindustry/ui/BorderImage.java @@ -4,10 +4,10 @@ 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; -import io.anuke.ucore.scene.ui.Image; -import io.anuke.ucore.scene.ui.layout.Unit; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.scene.ui.Image; +import io.anuke.arc.scene.ui.layout.Unit; public class BorderImage extends Image{ private float thickness = 3f; diff --git a/core/src/io/anuke/mindustry/ui/ContentDisplay.java b/core/src/io/anuke/mindustry/ui/ContentDisplay.java index 07db66f19f..a47311da63 100644 --- a/core/src/io/anuke/mindustry/ui/ContentDisplay.java +++ b/core/src/io/anuke/mindustry/ui/ContentDisplay.java @@ -13,10 +13,10 @@ import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.StatCategory; import io.anuke.mindustry.world.meta.StatValue; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Strings; public class ContentDisplay{ @@ -88,13 +88,13 @@ public class ContentDisplay{ table.left().defaults().fillX(); - table.add(Bundles.format("text.item.explosiveness", (int) (item.explosiveness * 100 * 2f))); + table.add(Core.bundle.format("text.item.explosiveness", (int) (item.explosiveness * 100 * 2f))); table.row(); - table.add(Bundles.format("text.item.flammability", (int) (item.flammability * 100 * 2f))); + table.add(Core.bundle.format("text.item.flammability", (int) (item.flammability * 100 * 2f))); table.row(); - table.add(Bundles.format("text.item.radioactivity", (int) (item.radioactivity * 100 * 2f))); + table.add(Core.bundle.format("text.item.radioactivity", (int) (item.radioactivity * 100 * 2f))); table.row(); - table.add(Bundles.format("text.item.fluxiness", (int) (item.fluxiness * 100 * 2f))); + table.add(Core.bundle.format("text.item.fluxiness", (int) (item.fluxiness * 100 * 2f))); table.row(); } @@ -121,15 +121,15 @@ public class ContentDisplay{ table.left().defaults().fillX(); - table.add(Bundles.format("text.item.explosiveness", (int) (liquid.explosiveness * 100 * 2f))); + table.add(Core.bundle.format("text.item.explosiveness", (int) (liquid.explosiveness * 100 * 2f))); table.row(); - table.add(Bundles.format("text.item.flammability", (int) (liquid.flammability * 100 * 2f))); + table.add(Core.bundle.format("text.item.flammability", (int) (liquid.flammability * 100 * 2f))); table.row(); - table.add(Bundles.format("text.liquid.heatcapacity", (int) (liquid.heatCapacity * 100))); + table.add(Core.bundle.format("text.liquid.heatcapacity", (int) (liquid.heatCapacity * 100))); table.row(); - table.add(Bundles.format("text.liquid.temperature", (int) (liquid.temperature * 100))); + table.add(Core.bundle.format("text.liquid.temperature", (int) (liquid.temperature * 100))); table.row(); - table.add(Bundles.format("text.liquid.viscosity", (int) (liquid.viscosity * 100))); + table.add(Core.bundle.format("text.liquid.viscosity", (int) (liquid.viscosity * 100))); table.row(); } @@ -155,23 +155,23 @@ public class ContentDisplay{ table.left().defaults().fillX(); - if(Bundles.has("mech." + mech.name + ".weapon")){ - table.add(Bundles.format("text.mech.weapon", Bundles.get("mech." + mech.name + ".weapon"))); + if(Core.bundle.has("mech." + mech.name + ".weapon")){ + table.add(Core.bundle.format("text.mech.weapon", Core.bundle.get("mech." + mech.name + ".weapon"))); table.row(); } - if(Bundles.has("mech." + mech.name + ".ability")){ - table.add(Bundles.format("text.mech.ability", Bundles.get("mech." + mech.name + ".ability"))); + if(Core.bundle.has("mech." + mech.name + ".ability")){ + table.add(Core.bundle.format("text.mech.ability", Core.bundle.get("mech." + mech.name + ".ability"))); table.row(); } - table.add(Bundles.format("text.mech.armor", mech.armor)); + table.add(Core.bundle.format("text.mech.armor", mech.armor)); table.row(); - table.add(Bundles.format("text.mech.itemcapacity", mech.itemCapacity)); + table.add(Core.bundle.format("text.mech.itemcapacity", mech.itemCapacity)); table.row(); if(mech.drillPower > 0){ - table.add(Bundles.format("text.mech.minespeed", (int) (mech.mineSpeed * 10))); + table.add(Core.bundle.format("text.mech.minespeed", (int) (mech.mineSpeed * 10))); table.row(); - table.add(Bundles.format("text.mech.minepower", mech.drillPower)); + table.add(Core.bundle.format("text.mech.minepower", mech.drillPower)); table.row(); } } @@ -198,9 +198,9 @@ public class ContentDisplay{ table.left().defaults().fillX(); - table.add(Bundles.format("text.unit.health", unit.health)); + table.add(Core.bundle.format("text.unit.health", unit.health)); table.row(); - table.add(Bundles.format("text.unit.speed", Strings.toFixed(unit.speed, 1))); + table.add(Core.bundle.format("text.unit.speed", Strings.toFixed(unit.speed, 1))); table.row(); table.row(); } diff --git a/core/src/io/anuke/mindustry/ui/GridImage.java b/core/src/io/anuke/mindustry/ui/GridImage.java index f41f4c8762..0815041e06 100644 --- a/core/src/io/anuke/mindustry/ui/GridImage.java +++ b/core/src/io/anuke/mindustry/ui/GridImage.java @@ -2,8 +2,8 @@ package io.anuke.mindustry.ui; 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; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.scene.Element; public class GridImage extends Element{ private int imageWidth, imageHeight; diff --git a/core/src/io/anuke/mindustry/ui/ImageStack.java b/core/src/io/anuke/mindustry/ui/ImageStack.java index d443b5f877..7552ceccd0 100644 --- a/core/src/io/anuke/mindustry/ui/ImageStack.java +++ b/core/src/io/anuke/mindustry/ui/ImageStack.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.ui; import io.anuke.arc.graphics.g2d.TextureRegion; -import io.anuke.ucore.scene.ui.Image; -import io.anuke.ucore.scene.ui.layout.Stack; +import io.anuke.arc.scene.ui.Image; +import io.anuke.arc.scene.ui.layout.Stack; public class ImageStack extends Stack{ diff --git a/core/src/io/anuke/mindustry/ui/IntFormat.java b/core/src/io/anuke/mindustry/ui/IntFormat.java index 6c4431a4b0..2dd7eccaa6 100644 --- a/core/src/io/anuke/mindustry/ui/IntFormat.java +++ b/core/src/io/anuke/mindustry/ui/IntFormat.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.ui; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; /** * A low-garbage way to format bundle strings. @@ -17,7 +17,7 @@ public class IntFormat{ public CharSequence get(int value){ if(lastValue != value){ builder.setLength(0); - builder.append(Bundles.format(text, value)); + builder.append(Core.bundle.format(text, value)); } lastValue = value; return builder; diff --git a/core/src/io/anuke/mindustry/ui/ItemDisplay.java b/core/src/io/anuke/mindustry/ui/ItemDisplay.java index 4530d606f0..ff5b6153f3 100644 --- a/core/src/io/anuke/mindustry/ui/ItemDisplay.java +++ b/core/src/io/anuke/mindustry/ui/ItemDisplay.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.ui; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemStack; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Table; /**An item image with text.*/ public class ItemDisplay extends Table{ diff --git a/core/src/io/anuke/mindustry/ui/ItemImage.java b/core/src/io/anuke/mindustry/ui/ItemImage.java index 1d466af4ce..e13026658f 100644 --- a/core/src/io/anuke/mindustry/ui/ItemImage.java +++ b/core/src/io/anuke/mindustry/ui/ItemImage.java @@ -2,10 +2,10 @@ package io.anuke.mindustry.ui; 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; -import io.anuke.ucore.scene.ui.layout.Stack; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.function.Supplier; +import io.anuke.arc.scene.ui.Image; +import io.anuke.arc.scene.ui.layout.Stack; +import io.anuke.arc.scene.ui.layout.Table; public class ItemImage extends Stack{ diff --git a/core/src/io/anuke/mindustry/ui/Links.java b/core/src/io/anuke/mindustry/ui/Links.java index a875d85e78..747a7ef213 100644 --- a/core/src/io/anuke/mindustry/ui/Links.java +++ b/core/src/io/anuke/mindustry/ui/Links.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.ui; import io.anuke.arc.graphics.Color; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; public class Links{ private static LinkEntry[] links; @@ -33,7 +33,7 @@ public class Links{ public LinkEntry(String name, String link, Color color){ this.name = name; this.color = color; - this.description = Bundles.getNotNull("text.link." + name + ".description"); + this.description = Core.bundle.getNotNull("text.link." + name + ".description"); this.link = link; } } diff --git a/core/src/io/anuke/mindustry/ui/LiquidDisplay.java b/core/src/io/anuke/mindustry/ui/LiquidDisplay.java index f639dfe1c5..442707408e 100644 --- a/core/src/io/anuke/mindustry/ui/LiquidDisplay.java +++ b/core/src/io/anuke/mindustry/ui/LiquidDisplay.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.ui; import io.anuke.mindustry.type.Liquid; -import io.anuke.ucore.scene.ui.Image; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.Image; +import io.anuke.arc.scene.ui.layout.Table; /**An ItemDisplay, but for liquids.*/ public class LiquidDisplay extends Table{ diff --git a/core/src/io/anuke/mindustry/ui/MenuButton.java b/core/src/io/anuke/mindustry/ui/MenuButton.java index 27f37c72fa..8eab27c59f 100644 --- a/core/src/io/anuke/mindustry/ui/MenuButton.java +++ b/core/src/io/anuke/mindustry/ui/MenuButton.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.ui; import io.anuke.arc.graphics.Color; import io.anuke.arc.utils.Align; -import io.anuke.ucore.scene.ui.TextButton; +import io.anuke.arc.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 2c8463f857..90811ef6ef 100644 --- a/core/src/io/anuke/mindustry/ui/Minimap.java +++ b/core/src/io/anuke/mindustry/ui/Minimap.java @@ -3,13 +3,13 @@ package io.anuke.mindustry.ui; 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; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.scene.Element; -import io.anuke.ucore.scene.event.InputEvent; -import io.anuke.ucore.scene.event.InputListener; -import io.anuke.ucore.scene.ui.layout.Container; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.scene.Element; +import io.anuke.arc.scene.event.InputEvent; +import io.anuke.arc.scene.event.InputListener; +import io.anuke.arc.scene.ui.layout.Container; import static io.anuke.mindustry.Vars.*; diff --git a/core/src/io/anuke/mindustry/ui/MobileButton.java b/core/src/io/anuke/mindustry/ui/MobileButton.java index 39fbea8778..d6716fdca0 100644 --- a/core/src/io/anuke/mindustry/ui/MobileButton.java +++ b/core/src/io/anuke/mindustry/ui/MobileButton.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.ui; import io.anuke.arc.utils.Align; -import io.anuke.ucore.scene.ui.ImageButton; +import io.anuke.arc.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 c6d5e0ff8e..57674967f9 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java @@ -9,14 +9,14 @@ import io.anuke.mindustry.io.Contributors; import io.anuke.mindustry.io.Contributors.Contributor; import io.anuke.mindustry.ui.Links; import io.anuke.mindustry.ui.Links.LinkEntry; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.scene.ui.ScrollPane; -import io.anuke.ucore.scene.ui.layout.Cell; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.scene.utils.UIUtils; -import io.anuke.ucore.util.OS; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Timers; +import io.anuke.arc.scene.ui.ScrollPane; +import io.anuke.arc.scene.ui.layout.Cell; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.scene.utils.UIUtils; +import io.anuke.arc.util.OS; +import io.anuke.arc.util.Strings; import static io.anuke.mindustry.Vars.ios; import static io.anuke.mindustry.Vars.ui; @@ -78,7 +78,7 @@ public class AboutDialog extends FloatingDialog{ in.add(table).size(w, h).padTop(5).row(); } - shown(() -> Timers.run(1f, () -> Core.scene.setScrollFocus(pane))); + shown(() -> Time.run(1f, () -> Core.scene.setScrollFocus(pane))); content().add(pane).growX(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java index 31496a5e3a..5c1733ba78 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.ui.dialogs; import io.anuke.mindustry.net.Administration.PlayerInfo; -import io.anuke.ucore.scene.ui.ScrollPane; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.ScrollPane; +import io.anuke.arc.scene.ui.layout.Table; import static io.anuke.mindustry.Vars.*; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java index 1a3d8369d7..cc4a5c5fdc 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.ui.dialogs; import io.anuke.mindustry.net.Administration.PlayerInfo; -import io.anuke.ucore.scene.ui.ScrollPane; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.ScrollPane; +import io.anuke.arc.scene.ui.layout.Table; import static io.anuke.mindustry.Vars.*; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java index 5c09c574eb..2c95c7dfb8 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java @@ -6,11 +6,11 @@ import io.anuke.mindustry.Vars; import io.anuke.mindustry.io.Changelogs; import io.anuke.mindustry.io.Changelogs.VersionInfo; import io.anuke.mindustry.game.Version; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.scene.ui.ScrollPane; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.OS; +import io.anuke.arc.core.Settings; +import io.anuke.arc.scene.ui.ScrollPane; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.OS; import static io.anuke.mindustry.Vars.ios; @@ -28,10 +28,10 @@ public class ChangelogDialog extends FloatingDialog{ if(!ios && !OS.isMac){ Changelogs.getChangelog(result -> { versions = result; - Core.app.postRunnable(this::setup); + Core.app.post(this::setup); }, t -> { Log.err(t); - Core.app.postRunnable(this::setup); + Core.app.post(this::setup); }); } } @@ -77,10 +77,10 @@ public class ChangelogDialog extends FloatingDialog{ table.add(in).width(vw).pad(8).row(); } - int lastid = Settings.getInt("lastBuild"); + int lastid = Core.settings.getInt("lastBuild"); if(lastid != 0 && versions.peek().build > lastid){ - Settings.putInt("lastBuild", versions.peek().build); - Settings.save(); + Core.settings.putInt("lastBuild", versions.peek().build); + Core.settings.save(); show(); } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java index 6856373967..4e3ced97d2 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java @@ -2,10 +2,10 @@ package io.anuke.mindustry.ui.dialogs; 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; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.scene.ui.Dialog; +import io.anuke.arc.scene.ui.ImageButton; +import io.anuke.arc.scene.ui.layout.Table; import static io.anuke.mindustry.Vars.playerColors; import static io.anuke.mindustry.Vars.players; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ContentInfoDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ContentInfoDialog.java index 50a2f4cf78..b513ec0800 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ContentInfoDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ContentInfoDialog.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.ui.dialogs; import io.anuke.mindustry.game.UnlockableContent; -import io.anuke.ucore.scene.ui.ScrollPane; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.ScrollPane; +import io.anuke.arc.scene.ui.layout.Table; public class ContentInfoDialog extends FloatingDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java index b5ee366047..2e4639819c 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java @@ -3,8 +3,8 @@ package io.anuke.mindustry.ui.dialogs; 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; +import io.anuke.arc.scene.ui.Image; +import io.anuke.arc.scene.ui.KeybindDialog; public class ControlsDialog extends KeybindDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java index 434fae859e..b8ef727427 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java @@ -8,15 +8,15 @@ import io.anuke.mindustry.game.Difficulty; import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.ui.BorderImage; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.scene.event.Touchable; -import io.anuke.ucore.scene.ui.ButtonGroup; -import io.anuke.ucore.scene.ui.ImageButton; -import io.anuke.ucore.scene.ui.ScrollPane; -import io.anuke.ucore.scene.ui.TextButton; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Settings; +import io.anuke.arc.scene.event.Touchable; +import io.anuke.arc.scene.ui.ButtonGroup; +import io.anuke.arc.scene.ui.ImageButton; +import io.anuke.arc.scene.ui.ScrollPane; +import io.anuke.arc.scene.ui.TextButton; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.*; @@ -104,7 +104,7 @@ public class CustomGameDialog extends FloatingDialog{ image.row(); image.add("[accent]" + map.getDisplayName()).pad(3f).growX().wrap().get().setAlignment(Align.center, Align.center); image.row(); - image.label((() -> Bundles.format("text.level.highscore", Settings.getInt("hiscore" + map.name, 0)))).pad(3f); + image.label((() -> Core.bundle.format("text.level.highscore", Core.settings.getInt("hiscore" + map.name, 0)))).pad(3f); BorderImage border = new BorderImage(map.texture, 3f); border.setScaling(Scaling.fit); @@ -135,7 +135,7 @@ public class CustomGameDialog extends FloatingDialog{ } private void displayGameModeHelp(){ - FloatingDialog d = new FloatingDialog(Bundles.get("mode.text.help.title")); + FloatingDialog d = new FloatingDialog(Core.bundle.get("mode.text.help.title")); d.setFillParent(false); Table table = new Table(); table.defaults().pad(1f); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java index 603925df1f..f37c2156c7 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.ui.dialogs; import io.anuke.arc.Core; import io.anuke.arc.graphics.Color; import io.anuke.mindustry.graphics.Palette; -import io.anuke.ucore.scene.ui.Dialog; +import io.anuke.arc.scene.ui.Dialog; import static io.anuke.mindustry.Vars.discordURL; import static io.anuke.mindustry.Vars.ui; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java index 3c0a578b41..d2b44d6d52 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java @@ -7,17 +7,17 @@ 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; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.function.Predicate; -import io.anuke.ucore.scene.event.Touchable; -import io.anuke.ucore.scene.ui.*; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.scene.ui.layout.Unit; -import io.anuke.ucore.scene.utils.UIUtils; -import io.anuke.ucore.util.OS; -import io.anuke.ucore.util.Pooling; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Timers; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.function.Predicate; +import io.anuke.arc.scene.event.Touchable; +import io.anuke.arc.scene.ui.*; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.scene.utils.UIUtils; +import io.anuke.arc.util.OS; +import io.anuke.arc.util.Pooling; import java.util.Arrays; @@ -264,7 +264,7 @@ public class FileChooser extends FloatingDialog{ @Override public Dialog show(){ - Timers.runTask(2f, () -> { + Time.runTask(2f, () -> { content().clear(); setupWidgets(); super.show(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java index 72fff36dbb..4b2e76a892 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java @@ -7,10 +7,10 @@ import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.EventType.ResizeEvent; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.net.Net; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.scene.ui.Dialog; -import io.anuke.ucore.scene.ui.ScrollPane; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Events; +import io.anuke.arc.scene.ui.Dialog; +import io.anuke.arc.scene.ui.ScrollPane; import static io.anuke.mindustry.Vars.state; @@ -43,7 +43,7 @@ public class FloatingDialog extends Dialog{ boolean[] done = {false}; - shown(() -> Core.app.postRunnable(() -> + shown(() -> Core.app.post(() -> forEach(child -> { if(done[0]) return; @@ -68,7 +68,7 @@ public class FloatingDialog extends Dialog{ keyDown(key -> { if(key == Keys.ESCAPE || key == Keys.BACK) { - Core.app.postRunnable(this::hide); + Core.app.post(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 39776323f3..98d1f55df9 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/GenViewDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/GenViewDialog.java @@ -11,13 +11,13 @@ import io.anuke.mindustry.game.Team; import io.anuke.mindustry.maps.generation.WorldGenerator.GenResult; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.ColorMapper; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.scene.Element; -import io.anuke.ucore.scene.event.InputEvent; -import io.anuke.ucore.scene.event.InputListener; -import io.anuke.ucore.scene.utils.Cursors; -import io.anuke.ucore.util.GridMap; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.scene.Element; +import io.anuke.arc.scene.event.InputEvent; +import io.anuke.arc.scene.event.InputListener; +import io.anuke.arc.scene.utils.Cursors; +import io.anuke.arc.util.GridMap; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.sectorSize; import static io.anuke.mindustry.Vars.world; @@ -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)); } } - Core.app.postRunnable(() -> map.put(wx, wy, new Texture(pixmap))); + Core.app.post(() -> 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 f172df25e5..79c6515947 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java @@ -4,11 +4,11 @@ import io.anuke.arc.graphics.Color; import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.net.Net; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.scene.ui.ImageButton; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.core.Settings; +import io.anuke.arc.core.Timers; +import io.anuke.arc.scene.ui.ImageButton; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Strings; import java.io.IOException; @@ -27,18 +27,18 @@ public class HostDialog extends FloatingDialog{ content().table(t -> { t.add("$text.name").padRight(10); - t.addField(Settings.getString("name"), text -> { + t.addField(Core.settings.getString("name"), text -> { player.name = text; - Settings.put("name", text); - Settings.save(); + Core.settings.put("name", text); + Core.settings.save(); ui.listfrag.rebuild(); }).grow().pad(8).get().setMaxLength(40); ImageButton button = t.addImageButton("white", "clear-full", 40, () -> { new ColorPickDialog().show(color -> { player.color.set(color); - Settings.putInt("color-0", Color.rgba8888(color)); - Settings.save(); + Core.settings.putInt("color-0", Color.rgba8888(color)); + Core.settings.save(); }); }).size(54f).get(); button.update(() -> button.getStyle().imageUpColor = player.color); @@ -49,18 +49,18 @@ public class HostDialog extends FloatingDialog{ content().add().width(65f); content().addButton("$text.host", () -> { - if(Settings.getString("name").trim().isEmpty()){ + if(Core.settings.getString("name").trim().isEmpty()){ ui.showInfo("$text.noname"); return; } ui.loadfrag.show("$text.hosting"); - Timers.runTask(5f, () -> { + Time.runTask(5f, () -> { try{ Net.host(Vars.port); player.isAdmin = true; }catch(IOException e){ - ui.showError(Bundles.format("text.server.error", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("text.server.error", Strings.parseException(e, false))); } ui.loadfrag.hide(); hide(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java index c8b63c73e6..553ad8346e 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java @@ -10,15 +10,15 @@ import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.game.Version; import io.anuke.mindustry.net.Host; import io.anuke.mindustry.net.Net; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.scene.style.Drawable; -import io.anuke.ucore.scene.ui.*; -import io.anuke.ucore.scene.ui.layout.Cell; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.scene.utils.UIUtils; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.core.Settings; +import io.anuke.arc.core.Timers; +import io.anuke.arc.scene.style.Drawable; +import io.anuke.arc.scene.ui.*; +import io.anuke.arc.scene.ui.layout.Cell; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.scene.utils.UIUtils; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Strings; import static io.anuke.mindustry.Vars.*; @@ -47,9 +47,9 @@ public class JoinDialog extends FloatingDialog{ add = new FloatingDialog("$text.joingame.title"); add.content().add("$text.joingame.ip").padRight(5f).left(); - TextField field = add.content().addField(Settings.getString("ip"), text -> { - Settings.putString("ip", text); - Settings.save(); + TextField field = add.content().addField(Core.settings.getString("ip"), text -> { + Core.settings.putString("ip", text); + Core.settings.save(); }).size(320f, 54f).get(); Platform.instance.addDialog(field, 100); @@ -60,19 +60,19 @@ public class JoinDialog extends FloatingDialog{ add.buttons().addButton("$text.ok", () -> { if(renaming == null){ Server server = new Server(); - server.setIP(Settings.getString("ip")); + server.setIP(Core.settings.getString("ip")); servers.add(server); saveServers(); setupRemote(); refreshRemote(); }else{ - renaming.setIP(Settings.getString("ip")); + renaming.setIP(Core.settings.getString("ip")); saveServers(); setupRemote(); refreshRemote(); } add.hide(); - }).disabled(b -> Settings.getString("ip").isEmpty() || Net.active()); + }).disabled(b -> Core.settings.getString("ip").isEmpty() || Net.active()); add.shown(() -> { add.getTitleLabel().setText(renaming != null ? "$text.server.edit" : "$text.server.add"); @@ -145,23 +145,23 @@ public class JoinDialog extends FloatingDialog{ void refreshServer(Server server){ server.content.clear(); - server.content.label(() -> Bundles.get("text.server.refreshing") + Strings.animated(4, 11, ".")); + server.content.label(() -> Core.bundle.get("text.server.refreshing") + Strings.animated(4, 11, ".")); Net.pingHost(server.ip, server.port, host -> { String versionString; if(host.version == -1){ - versionString = Bundles.format("text.server.version", Bundles.get("text.server.custombuild"), ""); + versionString = Core.bundle.format("text.server.version", Core.bundle.get("text.server.custombuild"), ""); }else if(host.version == 0){ - versionString = Bundles.get("text.server.outdated"); + versionString = Core.bundle.get("text.server.outdated"); }else if(host.version < Version.build && Version.build != -1){ - versionString = Bundles.get("text.server.outdated") + "\n" + - Bundles.format("text.server.version", host.version, ""); + versionString = Core.bundle.get("text.server.outdated") + "\n" + + Core.bundle.format("text.server.version", host.version, ""); }else if(host.version > Version.build && Version.build != -1){ - versionString = Bundles.get("text.server.outdated.client") + "\n" + - Bundles.format("text.server.version", host.version, ""); + versionString = Core.bundle.get("text.server.outdated.client") + "\n" + + Core.bundle.format("text.server.version", host.version, ""); }else{ - versionString = Bundles.format("text.server.version", host.version, host.versionType); + versionString = Core.bundle.format("text.server.version", host.version, host.versionType); } server.content.clear(); @@ -169,12 +169,12 @@ public class JoinDialog extends FloatingDialog{ server.content.table(t -> { t.add(versionString).left(); t.row(); - t.add("[lightgray]" + Bundles.format("text.server.hostname", host.name)).left(); + t.add("[lightgray]" + Core.bundle.format("text.server.hostname", host.name)).left(); t.row(); - t.add("[lightgray]" + (host.players != 1 ? Bundles.format("text.players", host.players) : - Bundles.format("text.players.single", host.players))).left(); + t.add("[lightgray]" + (host.players != 1 ? Core.bundle.format("text.players", host.players) : + Core.bundle.format("text.players.single", host.players))).left(); t.row(); - t.add("[lightgray]" + Bundles.format("text.save.map", host.mapname) + " / " + Bundles.format("text.save.wave", host.wave)).left(); + t.add("[lightgray]" + Core.bundle.format("text.save.map", host.mapname) + " / " + Core.bundle.format("text.save.wave", host.wave)).left(); }).expand().left().bottom().padLeft(12f).padBottom(8); }, e -> { @@ -204,17 +204,17 @@ public class JoinDialog extends FloatingDialog{ content().clear(); content().table(t -> { t.add("$text.name").padRight(10); - t.addField(Settings.getString("name"), text -> { + t.addField(Core.settings.getString("name"), text -> { player.name = text; - Settings.put("name", text); - Settings.save(); + Core.settings.put("name", text); + Core.settings.save(); }).grow().pad(8).get().setMaxLength(maxNameLength); ImageButton button = t.addImageButton("white", "clear-full", 40, () -> { new ColorPickDialog().show(color -> { player.color.set(color); - Settings.putInt("color-0", Color.rgba8888(color)); - Settings.save(); + Core.settings.putInt("color-0", Color.rgba8888(color)); + Core.settings.save(); }); }).size(54f).get(); button.update(() -> button.getStyle().imageUpColor = player.color); @@ -248,7 +248,7 @@ public class JoinDialog extends FloatingDialog{ local.clear(); local.background((Drawable)null); - local.table("button", t -> t.label(() -> "[accent]" + Bundles.get("text.hosts.discovering") + Strings.animated(4, 10f, ".")).pad(10f)).growX(); + local.table("button", t -> t.label(() -> "[accent]" + Core.bundle.get("text.hosts.discovering") + Strings.animated(4, 10f, ".")).pad(10f)).growX(); Net.discoverServers(this::addLocalHost, this::finishLocalHosts); } @@ -278,12 +278,12 @@ public class JoinDialog extends FloatingDialog{ .width(w).height(80f).pad(4f).get(); button.left(); button.row(); - button.add("[lightgray]" + (host.players != 1 ? Bundles.format("text.players", host.players) : - Bundles.format("text.players.single", host.players))).padBottom(5); + button.add("[lightgray]" + (host.players != 1 ? Core.bundle.format("text.players", host.players) : + Core.bundle.format("text.players.single", host.players))).padBottom(5); } void connect(String ip, int port){ - if(Settings.getString("name").trim().isEmpty()){ + if(Core.settings.getString("name").trim().isEmpty()){ ui.showInfo("$text.noname"); return; } @@ -295,7 +295,7 @@ public class JoinDialog extends FloatingDialog{ netClient.disconnectQuietly(); }); - Timers.runTask(2f, () -> { + Time.runTask(2f, () -> { Vars.netClient.beginConnecting(); Net.connect(ip, port, () -> { hide(); @@ -310,12 +310,12 @@ public class JoinDialog extends FloatingDialog{ @SuppressWarnings("unchecked") private void loadServers(){ - servers = Settings.getObject("server-list", Array.class, Array::new); + servers = Core.settings.getObject("server-list", Array.class, Array::new); } private void saveServers(){ - Settings.putObject("server-list", servers); - Settings.save(); + Core.settings.putObject("server-list", servers); + Core.settings.save(); } @Serialize diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java index a7a05f4433..dece4b9e89 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java @@ -1,11 +1,11 @@ package io.anuke.mindustry.ui.dialogs; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.scene.ui.ButtonGroup; -import io.anuke.ucore.scene.ui.ScrollPane; -import io.anuke.ucore.scene.ui.TextButton; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Log; +import io.anuke.arc.core.Settings; +import io.anuke.arc.scene.ui.ButtonGroup; +import io.anuke.arc.scene.ui.ScrollPane; +import io.anuke.arc.scene.ui.TextButton; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Log; import java.util.Locale; @@ -33,8 +33,8 @@ public class LanguageDialog extends FloatingDialog{ TextButton button = new TextButton(loc.getDisplayName(loc), "toggle"); button.clicked(() -> { if(getLocale().equals(loc)) return; - Settings.putString("locale", loc.toString()); - Settings.save(); + Core.settings.putString("locale", loc.toString()); + Core.settings.save(); Log.info("Setting locale: {0}", loc.toString()); ui.showInfo("$text.language.restart"); }); @@ -45,7 +45,7 @@ public class LanguageDialog extends FloatingDialog{ } public Locale getLocale(){ - String loc = Settings.getString("locale"); + String loc = Core.settings.getString("locale"); if(loc.equals("default")){ findClosestLocale(); @@ -67,7 +67,7 @@ public class LanguageDialog extends FloatingDialog{ //check exact locale for(Locale l : locales){ if(l.equals(Locale.getDefault())){ - Settings.putString("locale", l.toString()); + Core.settings.putString("locale", l.toString()); return; } } @@ -75,11 +75,11 @@ public class LanguageDialog extends FloatingDialog{ //find by language for(Locale l : locales){ if(l.getLanguage().equals(Locale.getDefault().getLanguage())){ - Settings.putString("locale", l.toString()); + Core.settings.putString("locale", l.toString()); return; } } - Settings.putString("locale", new Locale("en").toString()); + Core.settings.putString("locale", new Locale("en").toString()); } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java index eb4e69b78c..1ded88a8ff 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java @@ -8,14 +8,14 @@ import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.io.SaveIO; import io.anuke.mindustry.game.Saves.SaveSlot; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.scene.ui.ScrollPane; -import io.anuke.ucore.scene.ui.TextButton; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Timers; +import io.anuke.arc.scene.ui.ScrollPane; +import io.anuke.arc.scene.ui.TextButton; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.Strings; import java.io.IOException; @@ -35,7 +35,7 @@ public class LoadDialog extends FloatingDialog{ shown(() -> { setup(); - Timers.runTask(2f, () -> Core.scene.setScrollFocus(pane)); + Time.runTask(2f, () -> Core.scene.setScrollFocus(pane)); }); addCloseButton(); @@ -51,7 +51,7 @@ public class LoadDialog extends FloatingDialog{ slots.marginRight(24); - Timers.runTask(2f, () -> Core.scene.setScrollFocus(pane)); + Time.runTask(2f, () -> Core.scene.setScrollFocus(pane)); Array array = control.saves.getSaveSlots(); @@ -88,12 +88,12 @@ public class LoadDialog extends FloatingDialog{ t.addImageButton("icon-save", "empty", 14 * 3, () -> { if(!ios){ - Platform.instance.showFileChooser(Bundles.get("text.save.export"), "Mindustry Save", file -> { + Platform.instance.showFileChooser(Core.bundle.get("text.save.export"), "Mindustry Save", file -> { try{ slot.exportFile(file); setup(); }catch(IOException e){ - ui.showError(Bundles.format("text.save.export.fail", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("text.save.export.fail", Strings.parseException(e, false))); } }, false, saveExtension); }else{ @@ -102,7 +102,7 @@ public class LoadDialog extends FloatingDialog{ slot.exportFile(file); Platform.instance.shareFile(file); }catch(Exception e){ - ui.showError(Bundles.format("text.save.export.fail", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("text.save.export.fail", Strings.parseException(e, false))); } } }).size(14 * 3).right(); @@ -114,19 +114,19 @@ public class LoadDialog extends FloatingDialog{ button.defaults().padBottom(3); button.row(); - button.add(Bundles.format("text.save.map", color + (slot.getMap() == null ? "Unknown" : slot.getMap().meta.name()))); + button.add(Core.bundle.format("text.save.map", color + (slot.getMap() == null ? "Unknown" : slot.getMap().meta.name()))); button.row(); - button.add(Bundles.get("text.level.mode") + " " + color + slot.getMode()); + button.add(Core.bundle.get("text.level.mode") + " " + color + slot.getMode()); button.row(); - button.add(Bundles.format("text.save.wave", color + slot.getWave())); + button.add(Core.bundle.format("text.save.wave", color + slot.getWave())); button.row(); - button.add(Bundles.format("text.save.difficulty", color + slot.getDifficulty())); + button.add(Core.bundle.format("text.save.difficulty", color + slot.getDifficulty())); button.row(); - button.label(() -> Bundles.format("text.save.autosave", color + Bundles.get(slot.isAutosave() ? "text.on" : "text.off"))); + button.label(() -> Core.bundle.format("text.save.autosave", color + Core.bundle.get(slot.isAutosave() ? "text.on" : "text.off"))); button.row(); - button.label(() -> Bundles.format("text.save.playtime", color + slot.getPlayTime())); + button.label(() -> Core.bundle.format("text.save.playtime", color + slot.getPlayTime())); button.row(); - button.add(Bundles.format("text.save.date", color + slot.getDate())).colspan(2).padTop(5).right(); + button.add(Core.bundle.format("text.save.date", color + slot.getDate())).colspan(2).padTop(5).right(); button.row(); modifyButton(button, slot); @@ -155,14 +155,14 @@ public class LoadDialog extends FloatingDialog{ if(ios) return; slots.addImageTextButton("$text.save.import", "icon-add", 14 * 3, () -> { - Platform.instance.showFileChooser(Bundles.get("text.save.import"), "Mindustry Save", file -> { + Platform.instance.showFileChooser(Core.bundle.get("text.save.import"), "Mindustry Save", file -> { if(SaveIO.isSaveValid(file)){ try{ control.saves.importSave(file); setup(); }catch(IOException e){ e.printStackTrace(); - ui.showError(Bundles.format("text.save.import.fail", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("text.save.import.fail", Strings.parseException(e, false))); } }else{ ui.showError("$text.save.import.invalid"); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LocalPlayerDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LocalPlayerDialog.java index e7374dfed8..d08424a6f3 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LocalPlayerDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LocalPlayerDialog.java @@ -2,10 +2,10 @@ package io.anuke.mindustry.ui.dialogs; 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; -import io.anuke.ucore.scene.ui.layout.Stack; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.scene.ui.Image; +import io.anuke.arc.scene.ui.layout.Stack; +import io.anuke.arc.scene.ui.layout.Table; import static io.anuke.mindustry.Vars.control; import static io.anuke.mindustry.Vars.players; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java index a300403c4d..4f83cd3557 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java @@ -9,15 +9,15 @@ import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.maps.MapMeta; import io.anuke.mindustry.maps.MapTileData; import io.anuke.mindustry.ui.BorderImage; -import io.anuke.ucore.scene.event.Touchable; -import io.anuke.ucore.scene.ui.Image; -import io.anuke.ucore.scene.ui.ScrollPane; -import io.anuke.ucore.scene.ui.TextButton; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.scene.utils.UIUtils; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.scene.event.Touchable; +import io.anuke.arc.scene.ui.Image; +import io.anuke.arc.scene.ui.ScrollPane; +import io.anuke.arc.scene.ui.TextButton; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.scene.utils.UIUtils; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.Strings; import java.io.DataInputStream; @@ -41,7 +41,7 @@ public class MapsDialog extends FloatingDialog{ String name = meta.tags.get("name", file.nameWithoutExtension()); if(world.maps.getByName(name) != null && !world.maps.getByName(name).custom){ - ui.showError(Bundles.format("text.editor.import.exists", name)); + ui.showError(Core.bundle.format("text.editor.import.exists", name)); }else if(world.maps.getByName(name) != null){ ui.showConfirm("$text.confirm", "$text.editor.overwrite.confirm", () -> { world.maps.saveMap(name, data, meta.tags); @@ -53,7 +53,7 @@ public class MapsDialog extends FloatingDialog{ } }catch(Exception e){ - ui.showError(Bundles.format("text.editor.errorimageload", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("text.editor.errorimageload", Strings.parseException(e, false))); Log.err(e); } }, true, mapExtension); @@ -158,7 +158,7 @@ public class MapsDialog extends FloatingDialog{ }).fillX().height(54f).marginLeft(10); table.addImageTextButton("$text.delete", "icon-trash-16", 16 * 2, () -> { - ui.showConfirm("$text.confirm", Bundles.format("text.map.delete", map.name), () -> { + ui.showConfirm("$text.confirm", Core.bundle.format("text.map.delete", map.name), () -> { world.maps.removeMap(map); dialog.hide(); setup(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MissionDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MissionDialog.java index d41b2b7480..7ef474d42b 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MissionDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MissionDialog.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.ui.dialogs; import io.anuke.mindustry.Vars; import io.anuke.mindustry.maps.Sector; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; public class MissionDialog extends FloatingDialog{ @@ -23,7 +23,7 @@ public class MissionDialog extends FloatingDialog{ buttons().addButton("$text.continue", this::hide).size(190f, 64f); - content().add(Bundles.format("text.mission.complete.body", sector.x, sector.y)).pad(10); + content().add(Core.bundle.format("text.mission.complete.body", sector.x, sector.y)).pad(10); show(); } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java index c794b3b1d8..13c508a0db 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java @@ -3,9 +3,9 @@ package io.anuke.mindustry.ui.dialogs; 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; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.scene.style.Drawable; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Bundles; import static io.anuke.mindustry.Vars.*; @@ -33,7 +33,7 @@ public class PausedDialog extends FloatingDialog{ missionTable.background((Drawable) null); if(world.getSector() != null){ missionTable.background("underline"); - missionTable.add(Bundles.format("text.sector", world.getSector().x + ", " + world.getSector().y)); + missionTable.add(Core.bundle.format("text.sector", world.getSector().x + ", " + world.getSector().y)); } } @@ -111,7 +111,7 @@ public class PausedDialog extends FloatingDialog{ control.saves.getCurrent().save(); }catch(Throwable e){ e.printStackTrace(); - threads.runGraphics(() -> ui.showError("[accent]" + Bundles.get("text.savefail"))); + threads.runGraphics(() -> ui.showError("[accent]" + Core.bundle.get("text.savefail"))); } state.set(State.menu); }); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/RestartDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/RestartDialog.java index f61cc21a4d..d248c4dcae 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/RestartDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/RestartDialog.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.ui.dialogs; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.maps.Sector; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; import static io.anuke.mindustry.Vars.*; @@ -28,7 +28,7 @@ public class RestartDialog extends FloatingDialog{ buttons().margin(10); if(state.mode.isPvp){ - content().add(Bundles.format("text.gameover.pvp",winner.localized())).pad(6); + content().add(Core.bundle.format("text.gameover.pvp",winner.localized())).pad(6); buttons().addButton("$text.menu", () -> { hide(); state.set(State.menu); @@ -39,7 +39,7 @@ public class RestartDialog extends FloatingDialog{ content().add("$text.highscore").pad(6); content().row(); } - content().add(Bundles.format("text.wave.lasted", state.wave)).pad(12); + content().add(Core.bundle.format("text.wave.lasted", state.wave)).pad(12); buttons().addButton("$text.menu", () -> { hide(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java index 92ffff5f7a..a5b20b98dd 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java @@ -2,9 +2,9 @@ package io.anuke.mindustry.ui.dialogs; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.Saves.SaveSlot; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.scene.ui.TextButton; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.core.Timers; +import io.anuke.arc.scene.ui.TextButton; +import io.anuke.arc.util.Bundles; import static io.anuke.mindustry.Vars.*; @@ -45,7 +45,7 @@ public class SaveDialog extends LoadDialog{ ui.loadfrag.show("$text.saveload"); - Timers.runTask(5f, () -> { + Time.runTask(5f, () -> { hide(); ui.loadfrag.hide(); try{ @@ -53,7 +53,7 @@ public class SaveDialog extends LoadDialog{ }catch(Throwable e){ e.printStackTrace(); - ui.showError("[accent]" + Bundles.get("text.savefail")); + ui.showError("[accent]" + Core.bundle.get("text.savefail")); } }); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java index 72983830fd..9e4eb6b90a 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java @@ -8,20 +8,20 @@ import io.anuke.arc.utils.Align; import io.anuke.mindustry.Vars; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.maps.Sector; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.scene.Element; -import io.anuke.ucore.scene.Group; -import io.anuke.ucore.scene.event.InputEvent; -import io.anuke.ucore.scene.event.InputListener; -import io.anuke.ucore.scene.event.Touchable; -import io.anuke.ucore.scene.ui.layout.Cell; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.scene.ui.layout.Unit; -import io.anuke.ucore.scene.utils.Cursors; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.scene.Element; +import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.event.InputEvent; +import io.anuke.arc.scene.event.InputListener; +import io.anuke.arc.scene.event.Touchable; +import io.anuke.arc.scene.ui.layout.Cell; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.scene.utils.Cursors; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.world; @@ -84,16 +84,16 @@ public class SectorsDialog extends FloatingDialog{ table.background("button").margin(5); table.defaults().pad(3); - table.add(Bundles.format("text.sector", sector.x + ", " + sector.y)); + table.add(Core.bundle.format("text.sector", sector.x + ", " + sector.y)); table.row(); if(selected.completedMissions < selected.missions.size && !selected.complete){ - table.labelWrap(Bundles.format("text.mission", selected.getDominantMission().menuDisplayString())).growX(); + table.labelWrap(Core.bundle.format("text.mission", selected.getDominantMission().menuDisplayString())).growX(); table.row(); } if(selected.hasSave()){ - table.labelWrap(Bundles.format("text.sector.time", selected.getSave().getPlayTime())).growX(); + table.labelWrap(Core.bundle.format("text.sector.time", selected.getSave().getPlayTime())).growX(); table.row(); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index fbb9631aff..22445262f6 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -8,20 +8,20 @@ import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.net.Net; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.scene.Element; -import io.anuke.ucore.scene.event.InputEvent; -import io.anuke.ucore.scene.event.InputListener; -import io.anuke.ucore.scene.ui.Image; -import io.anuke.ucore.scene.ui.ScrollPane; -import io.anuke.ucore.scene.ui.SettingsDialog; -import io.anuke.ucore.scene.ui.SettingsDialog.SettingsTable.Setting; -import io.anuke.ucore.scene.ui.Slider; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Settings; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.scene.Element; +import io.anuke.arc.scene.event.InputEvent; +import io.anuke.arc.scene.event.InputListener; +import io.anuke.arc.scene.ui.Image; +import io.anuke.arc.scene.ui.ScrollPane; +import io.anuke.arc.scene.ui.SettingsDialog; +import io.anuke.arc.scene.ui.SettingsDialog.SettingsTable.Setting; +import io.anuke.arc.scene.ui.Slider; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Mathf; import java.util.HashMap; import java.util.Map; @@ -134,7 +134,7 @@ public class SettingsMenuDialog extends SettingsDialog{ if(mobile){ game.checkPref("autotarget", true); } - game.sliderPref("saveinterval", 120, 10, 5 * 120, i -> Bundles.format("setting.seconds", i)); + game.sliderPref("saveinterval", 120, 10, 5 * 120, i -> Core.bundle.format("setting.seconds", i)); if(!mobile){ game.checkPref("crashreport", true); @@ -165,14 +165,14 @@ public class SettingsMenuDialog extends SettingsDialog{ dialog.content().addButton("$text.settings.clearall", () -> { ui.showConfirm("$text.confirm", "$text.settings.clearall.confirm", () -> { Map map = new HashMap<>(); - for(String value : Settings.prefs().get().keySet()){ + for(String value : Core.settings.prefs().get().keySet()){ if(value.contains("usid") || value.contains("uuid")){ - map.put(value, Settings.prefs().getString(value)); + map.put(value, Core.settings.prefs().getString(value)); } } - Settings.prefs().clear(); - Settings.prefs().put(map); - Settings.save(); + Core.settings.prefs().clear(); + Core.settings.prefs().put(map); + Core.settings.save(); for(FileHandle file : dataDirectory.list()){ file.deleteDirectory(); @@ -189,7 +189,7 @@ 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))); + graphics.sliderPref("fpscap", 125, 5, 125, 5, s -> (s > 120 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s))); if(!mobile){ graphics.checkPref("vsync", true, b -> Core.graphics.setVSync(b)); @@ -201,8 +201,8 @@ public class SettingsMenuDialog extends SettingsDialog{ } }); - Core.graphics.setVSync(Settings.getBool("vsync")); - if(Settings.getBool("fullscreen")){ + Core.graphics.setVSync(Core.settings.getBool("vsync")); + if(Core.settings.getBool("fullscreen")){ Core.graphics.setFullscreenMode(Core.graphics.getDisplayMode()); } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/TraceDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/TraceDialog.java index 7c58101b03..cbb7d5897a 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/TraceDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/TraceDialog.java @@ -17,15 +17,15 @@ public class TraceDialog extends FloatingDialog{ /* table.defaults().left(); - table.add(Bundles.format("text.trace.playername", player.name)); + table.add(Core.bundle.format("text.trace.playername", player.name)); table.row(); - table.add(Bundles.format("text.trace.ip", info.ip)); + table.add(Core.bundle.format("text.trace.ip", info.ip)); table.row(); - table.add(Bundles.format("text.trace.id", info.uuid)); + table.add(Core.bundle.format("text.trace.id", info.uuid)); table.row(); - table.add(Bundles.format("text.trace.modclient", info.modclient)); + table.add(Core.bundle.format("text.trace.modclient", info.modclient)); table.row(); - table.add(Bundles.format("text.trace.android", info.android)); + table.add(Core.bundle.format("text.trace.android", info.android)); table.row(); table.add().pad(5); @@ -33,19 +33,19 @@ public class TraceDialog extends FloatingDialog{ //disabled until further notice /* - table.add(Bundles.format("text.trace.totalblocksbroken", info.totalBlocksBroken)); + table.add(Core.bundle.format("text.trace.totalblocksbroken", info.totalBlocksBroken)); table.row(); - table.add(Bundles.format("text.trace.structureblocksbroken", info.structureBlocksBroken)); + table.add(Core.bundle.format("text.trace.structureblocksbroken", info.structureBlocksBroken)); table.row(); - table.add(Bundles.format("text.trace.lastblockbroken", info.lastBlockBroken.formalName)); + table.add(Core.bundle.format("text.trace.lastblockbroken", info.lastBlockBroken.formalName)); table.row(); table.add().pad(5); table.row(); - table.add(Bundles.format("text.trace.totalblocksplaced", info.totalBlocksPlaced)); + table.add(Core.bundle.format("text.trace.totalblocksplaced", info.totalBlocksPlaced)); table.row(); - table.add(Bundles.format("text.trace.lastblockplaced", info.lastBlockPlaced.formalName)); + table.add(Core.bundle.format("text.trace.lastblockplaced", info.lastBlockPlaced.formalName)); table.row(); content().add(table); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java index cd8c1e212d..2f7ab00a02 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java @@ -6,12 +6,12 @@ import io.anuke.mindustry.game.Content; import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.type.ContentType; -import io.anuke.ucore.scene.event.HandCursorListener; -import io.anuke.ucore.scene.ui.Image; -import io.anuke.ucore.scene.ui.ScrollPane; -import io.anuke.ucore.scene.ui.Tooltip; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.scene.utils.UIUtils; +import io.anuke.arc.scene.event.HandCursorListener; +import io.anuke.arc.scene.ui.Image; +import io.anuke.arc.scene.ui.ScrollPane; +import io.anuke.arc.scene.ui.Tooltip; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.scene.utils.UIUtils; import static io.anuke.mindustry.Vars.content; import static io.anuke.mindustry.Vars.control; diff --git a/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java index 25bebe7e7f..bc74b9b78e 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java @@ -5,12 +5,12 @@ 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; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.scene.Group; -import io.anuke.ucore.scene.ui.layout.Unit; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.ui.layout.Unit; import static io.anuke.mindustry.Vars.state; diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java index 017a51700d..1b0b3a8d88 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java @@ -9,12 +9,12 @@ import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.scene.Element; -import io.anuke.ucore.scene.Group; -import io.anuke.ucore.scene.actions.Actions; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.scene.Element; +import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.actions.Actions; +import io.anuke.arc.scene.ui.layout.Table; import static io.anuke.mindustry.Vars.state; import static io.anuke.mindustry.Vars.tilesize; diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java index e11950af82..af1d5108d8 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java @@ -11,10 +11,10 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.consumers.Consume; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.scene.Element; -import io.anuke.ucore.scene.Group; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.scene.Element; +import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.ui.layout.Table; import static io.anuke.mindustry.Vars.*; diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java index 7c6dbb2cd8..703f77333a 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java @@ -13,18 +13,18 @@ import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.ui.ItemImage; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.function.BooleanProvider; -import io.anuke.ucore.scene.Group; -import io.anuke.ucore.scene.actions.Actions; -import io.anuke.ucore.scene.event.HandCursorListener; -import io.anuke.ucore.scene.event.InputEvent; -import io.anuke.ucore.scene.event.InputListener; -import io.anuke.ucore.scene.event.Touchable; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Timers; +import io.anuke.arc.function.BooleanProvider; +import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.actions.Actions; +import io.anuke.arc.scene.event.HandCursorListener; +import io.anuke.arc.scene.event.InputEvent; +import io.anuke.arc.scene.event.InputListener; +import io.anuke.arc.scene.event.Touchable; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Strings; import static io.anuke.mindustry.Vars.*; @@ -50,7 +50,7 @@ public class BlockInventoryFragment extends Fragment{ player.inventory.addItem(item, removed); for(int j = 0; j < Mathf.clamp(removed / 3, 1, 8); j++){ - Timers.run(j * 3f, () -> Call.transferItemEffect(item, tile.drawx(), tile.drawy(), player)); + Time.run(j * 3f, () -> Call.transferItemEffect(item, tile.drawx(), tile.drawy(), player)); } } @@ -93,7 +93,7 @@ public class BlockInventoryFragment extends Fragment{ hide(); }else{ if(holding && lastItem != null){ - holdTime += Timers.delta(); + holdTime += Time.delta(); if(holdTime >= holdWithdraw){ int amount = Math.min(tile.entity.items.get(lastItem), player.inventory.itemCapacityUsed(lastItem)); diff --git a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java index a5a2256eb8..516c740f71 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java @@ -12,21 +12,21 @@ import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.net.Net; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Inputs; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.scene.Group; -import io.anuke.ucore.scene.ui.Dialog; -import io.anuke.ucore.scene.ui.Label; -import io.anuke.ucore.scene.ui.Label.LabelStyle; -import io.anuke.ucore.scene.ui.TextField; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.scene.ui.layout.Unit; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Inputs; +import io.anuke.arc.core.Timers; +import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.ui.Dialog; +import io.anuke.arc.scene.ui.Label; +import io.anuke.arc.scene.ui.Label.LabelStyle; +import io.anuke.arc.scene.ui.TextField; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.*; -import static io.anuke.ucore.core.Core.scene; -import static io.anuke.ucore.core.Core.skin; +import static io.anuke.arc.core.Core.scene; +import static io.anuke.arc.core.Core.skin; public class ChatFragment extends Table{ private final static int messagesShown = 10; @@ -134,7 +134,7 @@ public class ChatFragment extends Table{ }).width(90f).name("okb"); dialog.show(); - Timers.runTask(1f, () -> { + Time.runTask(1f, () -> { to.setCursorPosition(to.getText().length()); Core.scene.setKeyboardFocus(to); Core.input.setOnscreenKeyboardVisible(true); @@ -194,7 +194,7 @@ public class ChatFragment extends Table{ batch.setColor(Color.WHITE); if(fadetime > 0 && !chatOpen) - fadetime -= Timers.delta() / 180f; + fadetime -= Time.delta() / 180f; } private void sendMessage(){ diff --git a/core/src/io/anuke/mindustry/ui/fragments/Fragment.java b/core/src/io/anuke/mindustry/ui/fragments/Fragment.java index 080c2c4a05..f878d5465d 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/Fragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/Fragment.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.ui.fragments; -import io.anuke.ucore.scene.Group; +import io.anuke.arc.scene.Group; public abstract class Fragment{ public abstract void build(Group parent); diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index a65ea01936..c1f8f49e6a 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -18,21 +18,21 @@ import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.ui.IntFormat; import io.anuke.mindustry.ui.Minimap; import io.anuke.mindustry.ui.dialogs.FloatingDialog; -import io.anuke.ucore.core.*; -import io.anuke.ucore.graphics.Hue; -import io.anuke.ucore.scene.Element; -import io.anuke.ucore.scene.Group; -import io.anuke.ucore.scene.actions.Actions; -import io.anuke.ucore.scene.event.Touchable; -import io.anuke.ucore.scene.ui.Image; -import io.anuke.ucore.scene.ui.ImageButton; -import io.anuke.ucore.scene.ui.Label; -import io.anuke.ucore.scene.ui.TextButton; -import io.anuke.ucore.scene.ui.layout.Stack; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.scene.ui.layout.Unit; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.*; +import io.anuke.arc.graphics.Hue; +import io.anuke.arc.scene.Element; +import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.actions.Actions; +import io.anuke.arc.scene.event.Touchable; +import io.anuke.arc.scene.ui.Image; +import io.anuke.arc.scene.ui.ImageButton; +import io.anuke.arc.scene.ui.Label; +import io.anuke.arc.scene.ui.TextButton; +import io.anuke.arc.scene.ui.layout.Stack; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.*; @@ -139,7 +139,7 @@ public class HudFragment extends Fragment{ if(Net.hasClient()){ t.label(() -> ping.get(Net.getPing())).visible(Net::client).colspan(2); } - }).size(-1).visible(() -> Settings.getBool("fps")).update(t -> t.setTranslation(0, (!waves.isVisible() ? wavetable.getHeight() : Math.min(wavetable.getTranslation().y, wavetable.getHeight())))).get(); + }).size(-1).visible(() -> Core.settings.getBool("fps")).update(t -> t.setTranslation(0, (!waves.isVisible() ? wavetable.getHeight() : Math.min(wavetable.getTranslation().y, wavetable.getHeight())))).get(); //make wave box appear below rest of menu if(mobile){ @@ -149,7 +149,7 @@ public class HudFragment extends Fragment{ //minimap parent.fill(t -> t.top().right().add(new Minimap()) - .visible(() -> !state.is(State.menu) && Settings.getBool("minimap"))); + .visible(() -> !state.is(State.menu) && Core.settings.getBool("minimap"))); //paused table parent.fill(t -> { @@ -193,12 +193,12 @@ public class HudFragment extends Fragment{ coreAttackOpacity = Mathf.lerpDelta(coreAttackOpacity, 0f, 0.1f); } - coreAttackTime -= Timers.delta(); + coreAttackTime -= Time.delta(); return coreAttackOpacity > 0; }); t.table("button", top -> top.add("$text.coreattack").pad(2) - .update(label -> label.setColor(Hue.mix(Color.ORANGE, Color.SCARLET, Mathf.absin(Timers.time(), 2f, 1f))))); + .update(label -> label.setColor(Hue.mix(Color.ORANGE, Color.SCARLET, Mathf.absin(Time.time(), 2f, 1f))))); }); //'saving' indicator @@ -378,9 +378,9 @@ public class HudFragment extends Fragment{ enemiesf.get(state.enemies())) : wavef.get(state.wave) + "\n" + (!state.mode.disableWaveTimer ? - Bundles.format("text.wave.waiting", (int)(state.wavetime/60)) : - Bundles.get("text.waiting"))) : - Bundles.format("text.mission.display", world.getSector().currentMission().displayString())).growX().pad(8f); + Core.bundle.format("text.wave.waiting", (int)(state.wavetime/60)) : + Core.bundle.get("text.waiting"))) : + Core.bundle.format("text.mission.display", world.getSector().currentMission().displayString())).growX().pad(8f); table.clicked(() -> { if(world.getSector() != null && world.getSector().currentMission().hasMessage()){ diff --git a/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java b/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java index 3ea3df3685..87bd4a48ce 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java @@ -1,11 +1,11 @@ package io.anuke.mindustry.ui.fragments; import io.anuke.mindustry.graphics.Palette; -import io.anuke.ucore.scene.Group; -import io.anuke.ucore.scene.event.Touchable; -import io.anuke.ucore.scene.ui.Label; -import io.anuke.ucore.scene.ui.TextButton; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.event.Touchable; +import io.anuke.arc.scene.ui.Label; +import io.anuke.arc.scene.ui.TextButton; +import io.anuke.arc.scene.ui.layout.Table; public class LoadingFragment extends Fragment{ private Table table; diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index c9b4309c58..b99deb4d7b 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -8,10 +8,10 @@ import io.anuke.mindustry.game.Version; import io.anuke.mindustry.ui.MenuButton; import io.anuke.mindustry.ui.MobileButton; import io.anuke.mindustry.ui.dialogs.FloatingDialog; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.scene.Group; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.core.Events; +import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Strings; import static io.anuke.mindustry.Vars.*; diff --git a/core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java b/core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java index f19ec137a4..239d597c81 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.ui.fragments; import io.anuke.mindustry.input.InputHandler; -import io.anuke.ucore.scene.Group; +import io.anuke.arc.scene.Group; /** * Fragment for displaying overlays such as block inventories. One is created for each input handler. diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index b533fa2b4d..c60d71f3da 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -16,18 +16,18 @@ import io.anuke.mindustry.ui.ImageStack; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.OreBlock; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Inputs; -import io.anuke.ucore.input.Input; -import io.anuke.ucore.scene.Group; -import io.anuke.ucore.scene.actions.Actions; -import io.anuke.ucore.scene.event.Touchable; -import io.anuke.ucore.scene.ui.ButtonGroup; -import io.anuke.ucore.scene.ui.Image; -import io.anuke.ucore.scene.ui.ImageButton; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.core.Events; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Inputs; +import io.anuke.arc.input.Input; +import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.actions.Actions; +import io.anuke.arc.scene.event.Touchable; +import io.anuke.arc.scene.ui.ButtonGroup; +import io.anuke.arc.scene.ui.Image; +import io.anuke.arc.scene.ui.ImageButton; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Bundles; import static io.anuke.mindustry.Vars.*; @@ -177,7 +177,7 @@ public class PlacementFragment extends Fragment{ header.left(); header.add(new ImageStack(lastDisplay.getCompactIcon())).size(8 * 4); header.labelWrap(() -> - !control.unlocks.isUnlocked(Recipe.getByResult(lastDisplay)) ? Bundles.get("text.blocks.unknown") : lastDisplay.formalName) + !control.unlocks.isUnlocked(Recipe.getByResult(lastDisplay)) ? Core.bundle.get("text.blocks.unknown") : lastDisplay.formalName) .left().width(190f).padLeft(5); header.add().growX(); if(control.unlocks.isUnlocked(Recipe.getByResult(lastDisplay))){ diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java index affab2d0fb..d11ec99849 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java @@ -8,16 +8,16 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.NetConnection; import io.anuke.mindustry.net.Packets.AdminAction; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.scene.Group; -import io.anuke.ucore.scene.event.Touchable; -import io.anuke.ucore.scene.ui.Image; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.scene.ui.layout.Unit; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Timer; +import io.anuke.arc.core.Core; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.event.Touchable; +import io.anuke.arc.scene.ui.Image; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Timer; import static io.anuke.mindustry.Vars.*; @@ -46,7 +46,7 @@ public class PlayerListFragment extends Fragment{ }); cont.table("button", pane -> { - pane.label(() -> Bundles.format(playerGroup.size() == 1 ? "text.players.single" : "text.players", playerGroup.size())); + pane.label(() -> Core.bundle.format(playerGroup.size() == 1 ? "text.players.single" : "text.players", playerGroup.size())); pane.row(); pane.pane(content).grow().get().setScrollingDisabled(true, false); pane.row(); diff --git a/core/src/io/anuke/mindustry/world/BaseBlock.java b/core/src/io/anuke/mindustry/world/BaseBlock.java index 91515e7ea1..f24d04f1a8 100644 --- a/core/src/io/anuke/mindustry/world/BaseBlock.java +++ b/core/src/io/anuke/mindustry/world/BaseBlock.java @@ -13,10 +13,10 @@ import io.anuke.mindustry.world.consumers.ConsumeItem; import io.anuke.mindustry.world.consumers.ConsumeLiquid; import io.anuke.mindustry.world.consumers.Consumers; import io.anuke.mindustry.world.meta.Producers; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Translator; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Translator; public abstract class BaseBlock extends MappableContent{ public boolean hasItems; @@ -164,15 +164,15 @@ public abstract class BaseBlock extends MappableContent{ Liquid other = next.entity.liquids.current(); if((other.flammability > 0.3f && liquid.temperature > 0.7f) || (liquid.flammability > 0.3f && other.temperature > 0.7f)){ - tile.entity.damage(1 * Timers.delta()); - next.entity.damage(1 * Timers.delta()); - if(Mathf.chance(0.1 * Timers.delta())){ + tile.entity.damage(1 * Time.delta()); + next.entity.damage(1 * Time.delta()); + if(Mathf.chance(0.1 * Time.delta())){ Effects.effect(EnvironmentFx.fire, (tile.worldx() + next.worldx()) / 2f, (tile.worldy() + next.worldy()) / 2f); } }else if((liquid.temperature > 0.7f && other.temperature < 0.55f) || (other.temperature > 0.7f && liquid.temperature < 0.55f)){ - tile.entity.liquids.remove(liquid, Math.min(tile.entity.liquids.get(liquid), 0.7f * Timers.delta())); - if(Mathf.chance(0.2f * Timers.delta())){ + tile.entity.liquids.remove(liquid, Math.min(tile.entity.liquids.get(liquid), 0.7f * Time.delta())); + if(Mathf.chance(0.2f * Time.delta())){ Effects.effect(EnvironmentFx.steam, (tile.worldx() + next.worldx()) / 2f, (tile.worldy() + next.worldy()) / 2f); } } diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index a1027732a3..ce4743c663 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -21,14 +21,14 @@ import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.world.meta.*; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Hue; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.EnumSet; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Hue; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.EnumSet; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.*; @@ -116,8 +116,8 @@ public class Block extends BaseBlock { public Block(String name){ this.name = name; - this.formalName = Bundles.get("block." + name + ".name", name); - this.fullDescription = Bundles.getOrNull("block." + name + ".description"); + this.formalName = Core.bundle.get("block." + name + ".name", name); + this.fullDescription = Core.bundle.getOrNull("block." + name + ".description"); this.solid = false; } @@ -413,7 +413,7 @@ public class Block extends BaseBlock { float splash = Mathf.clamp(amount / 4f, 0f, 10f); for(int i = 0; i < Mathf.clamp(amount / 5, 0, 30); i++){ - Timers.run(i / 2f, () -> { + Time.run(i / 2f, () -> { Tile other = world.tile(tile.x + Mathf.range(size / 2), tile.y + Mathf.range(size / 2)); if(other != null){ Puddle.deposit(other, liquid, splash); diff --git a/core/src/io/anuke/mindustry/world/Build.java b/core/src/io/anuke/mindustry/world/Build.java index 0cf6fd8b50..d847e29e75 100644 --- a/core/src/io/anuke/mindustry/world/Build.java +++ b/core/src/io/anuke/mindustry/world/Build.java @@ -10,8 +10,8 @@ import io.anuke.mindustry.game.Team; import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity; -import io.anuke.ucore.core.Events; -import io.anuke.ucore.util.Geometry; +import io.anuke.arc.core.Events; +import io.anuke.arc.util.Geometry; import static io.anuke.mindustry.Vars.*; @@ -59,7 +59,7 @@ public class Build{ } Tile ftile = tile; - threads.runDelay(() -> Events.fire(new BlockBuildBeginEvent(ftile, team, true))); + Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(ftile, team, true))); } /**Places a BuildBlock at this location.*/ @@ -101,7 +101,7 @@ public class Build{ } } - threads.runDelay(() -> Events.fire(new BlockBuildBeginEvent(tile, team, false))); + Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(tile, team, false))); } /**Returns whether a tile can be placed at this location by this team.*/ diff --git a/core/src/io/anuke/mindustry/world/Edges.java b/core/src/io/anuke/mindustry/world/Edges.java index 33aee6b85c..d00cc85ee4 100644 --- a/core/src/io/anuke/mindustry/world/Edges.java +++ b/core/src/io/anuke/mindustry/world/Edges.java @@ -2,8 +2,8 @@ package io.anuke.mindustry.world; import io.anuke.arc.math.GridPoint2; import io.anuke.arc.math.Vector2; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; import java.util.Arrays; diff --git a/core/src/io/anuke/mindustry/world/ItemBuffer.java b/core/src/io/anuke/mindustry/world/ItemBuffer.java index 0a174a36d0..08e6ff824c 100644 --- a/core/src/io/anuke/mindustry/world/ItemBuffer.java +++ b/core/src/io/anuke/mindustry/world/ItemBuffer.java @@ -2,8 +2,8 @@ package io.anuke.mindustry.world; import io.anuke.arc.utils.NumberUtils; import io.anuke.mindustry.type.Item; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Bits; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Bits; import static io.anuke.mindustry.Vars.*; public class ItemBuffer{ @@ -23,7 +23,7 @@ public class ItemBuffer{ public void accept(Item item, short data){ //if(!accepts()) return; - buffer[index++] = Bits.packLong(NumberUtils.floatToIntBits(Timers.time()), Bits.packInt((short) item.id, data)); + buffer[index++] = Bits.packLong(NumberUtils.floatToIntBits(Time.time()), Bits.packInt((short) item.id, data)); } public void accept(Item item){ @@ -35,7 +35,7 @@ public class ItemBuffer{ long l = buffer[0]; float time = NumberUtils.intBitsToFloat(Bits.getLeftInt(l)); - if(Timers.time() >= time + speed || Timers.time() < time){ + if(Time.time() >= time + speed || Time.time() < time){ return content.item(Bits.getLeftShort(Bits.getRightInt(l))); } } @@ -47,7 +47,7 @@ public class ItemBuffer{ long l = buffer[0]; float time = NumberUtils.intBitsToFloat(Bits.getLeftInt(l)); - if(Timers.time() >= time + speed || Timers.time() < time){ + if(Time.time() >= time + speed || Time.time() < time){ return Bits.getRightShort(Bits.getRightInt(l)); } } diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index 73ee2cd19e..0cff80e015 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -13,10 +13,10 @@ import io.anuke.mindustry.world.modules.ConsumeModule; import io.anuke.mindustry.world.modules.ItemModule; import io.anuke.mindustry.world.modules.LiquidModule; import io.anuke.mindustry.world.modules.PowerModule; -import io.anuke.ucore.entities.trait.PosTrait; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.util.Bits; -import io.anuke.ucore.util.Geometry; +import io.anuke.arc.entities.trait.PosTrait; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.util.Bits; +import io.anuke.arc.util.Geometry; import static io.anuke.mindustry.Vars.*; diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java index 1e8bb26562..4a23cb0ee6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java @@ -24,11 +24,11 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockBar; import io.anuke.mindustry.world.modules.ItemModule; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -60,20 +60,20 @@ public class BuildBlock extends Block{ tile.setRotation(rotation); world.setBlock(tile, block, team); Effects.effect(Fx.placeBlock, tile.drawx(), tile.drawy(), block.size); - threads.runDelay(() -> tile.block().placed(tile)); + Core.app.post(() -> tile.block().placed(tile)); //last builder was this local client player, call placed() if(!headless && builderID == players[0].id){ //this is run delayed, since if this is called on the server, all clients need to recieve the onBuildFinish() //event first before they can recieve the placed() event modification results - threads.runDelay(() -> tile.block().playerPlaced(tile)); + Core.app.post(() -> tile.block().playerPlaced(tile)); } } @Override public String getDisplayName(Tile tile){ BuildEntity entity = tile.entity(); - return Bundles.format("block.constructing", entity.recipe == null ? entity.previous.formalName : entity.recipe.result.formalName); + return Core.bundle.format("block.constructing", entity.recipe == null ? entity.previous.formalName : entity.recipe.result.formalName); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java index 5b744d3513..9a037d5038 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Floor.java +++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java @@ -11,13 +11,13 @@ import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.type.StatusEffect; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.function.BiPredicate; -import io.anuke.ucore.function.Predicate; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Structs; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.function.BiPredicate; +import io.anuke.arc.function.Predicate; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Structs; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; public class Floor extends Block{ //TODO implement proper bitmasking diff --git a/core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java b/core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java index aa7d75f263..a65b937883 100644 --- a/core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/LiquidBlock.java @@ -5,7 +5,7 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockGroup; import io.anuke.mindustry.world.modules.LiquidModule; -import io.anuke.ucore.graphics.Draw; +import io.anuke.arc.graphics.Draw; public class LiquidBlock extends Block{ protected TextureRegion liquidRegion, bottomRegion, topRegion; diff --git a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java index 9b1b08833c..5129e2bbdc 100644 --- a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java @@ -6,8 +6,8 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; public class OreBlock extends Floor{ public Floor base; diff --git a/core/src/io/anuke/mindustry/world/blocks/Rock.java b/core/src/io/anuke/mindustry/world/blocks/Rock.java index 1d809e74d3..c616fd0433 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Rock.java +++ b/core/src/io/anuke/mindustry/world/blocks/Rock.java @@ -3,8 +3,8 @@ package io.anuke.mindustry.world.blocks; 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; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; public class Rock extends Block{ protected TextureRegion[] shadowRegions, regions; diff --git a/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java b/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java index 88d7fc324b..a7e932149f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java +++ b/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java @@ -2,12 +2,12 @@ package io.anuke.mindustry.world.blocks; import io.anuke.arc.utils.Array; import io.anuke.mindustry.type.Item; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.function.Supplier; -import io.anuke.ucore.scene.style.TextureRegionDrawable; -import io.anuke.ucore.scene.ui.ButtonGroup; -import io.anuke.ucore.scene.ui.ImageButton; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.function.Supplier; +import io.anuke.arc.scene.style.TextureRegionDrawable; +import io.anuke.arc.scene.ui.ButtonGroup; +import io.anuke.arc.scene.ui.ImageButton; +import io.anuke.arc.scene.ui.layout.Table; import static io.anuke.mindustry.Vars.content; import static io.anuke.mindustry.Vars.control; 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 9a7431544c..2f469e93cd 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java @@ -7,11 +7,11 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Physics; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Physics; import static io.anuke.mindustry.Vars.tilesize; @@ -41,7 +41,7 @@ public class DeflectorWall extends Wall{ Draw.rect("blank", tile.drawx(), tile.drawy(), tilesize * size, tilesize * size); Draw.reset(); - entity.hit = Mathf.clamp(entity.hit - Timers.delta() / hitTime); + entity.hit = Mathf.clamp(entity.hit - Time.delta() / hitTime); Graphics.setNormalBlending(); } 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 198fa371a1..ed6498da21 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java @@ -8,9 +8,9 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.input.CursorType; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.graphics.Draw; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.graphics.Draw; import java.io.DataInput; import java.io.DataOutput; 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 848db83e92..d7ca799ded 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java @@ -14,16 +14,16 @@ import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter; import io.anuke.mindustry.world.meta.BlockBar; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.EntityQuery; -import io.anuke.ucore.entities.impl.BaseEntity; -import io.anuke.ucore.entities.trait.DrawTrait; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Timers; +import io.anuke.arc.entities.EntityGroup; +import io.anuke.arc.entities.EntityQuery; +import io.anuke.arc.entities.impl.BaseEntity; +import io.anuke.arc.entities.trait.DrawTrait; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -95,7 +95,7 @@ public class ForceProjector extends Block { entity.radscl = Mathf.lerpDelta(entity.radscl, entity.broken ? 0f : 1f, 0.05f); - if(Mathf.chance(Timers.delta() * entity.buildup / breakage * 0.1f)){ + if(Mathf.chance(Time.delta() * entity.buildup / breakage * 0.1f)){ Effects.effect(BlockFx.reactorsmoke, tile.drawx() + Mathf.range(tilesize/2f), tile.drawy() + Mathf.range(tilesize/2f)); } @@ -117,7 +117,7 @@ public class ForceProjector extends Block { scale *= (cooldownLiquid * (1f+(entity.liquids.current().heatCapacity-0.4f)*0.9f)); } - entity.buildup -= Timers.delta()*scale; + entity.buildup -= Time.delta()*scale; } if(entity.broken && entity.buildup <= 0 && entity.warmup >= 0.9f){ @@ -131,7 +131,7 @@ public class ForceProjector extends Block { } if(entity.hit > 0f){ - entity.hit -= 1f/5f * Timers.delta(); + entity.hit -= 1f/5f * Time.delta(); } float realRadius = realRadius(entity); 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 1de6d18e18..225d9b7993 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java @@ -8,13 +8,13 @@ import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Hue; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Hue; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -108,10 +108,10 @@ public class MendProjector extends Block{ super.draw(tile); MendEntity entity = tile.entity(); - float f = 1f - (Timers.time() / 100f) % 1f; + float f = 1f - (Time.time() / 100f) % 1f; Draw.color(color, phase, entity.phaseHeat); - Draw.alpha(entity.heat * Mathf.absin(Timers.time(), 10f, 1f) * 0.5f); + Draw.alpha(entity.heat * Mathf.absin(Time.time(), 10f, 1f) * 0.5f); Graphics.setAdditiveBlending(); Draw.rect(topRegion, tile.drawx(), tile.drawy()); 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 4f8d706abf..8a633ea66b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java @@ -8,13 +8,13 @@ import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Hue; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Hue; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -58,7 +58,7 @@ public class OverdriveProjector extends Block{ public void update(Tile tile){ OverdriveEntity entity = tile.entity(); entity.heat = Mathf.lerpDelta(entity.heat, entity.cons.valid() ? 1f : 0f, 0.08f); - entity.charge += entity.heat * Timers.delta(); + entity.charge += entity.heat * Time.delta(); entity.phaseHeat = Mathf.lerpDelta(entity.phaseHeat, (float)entity.items.get(consumes.item()) / itemCapacity, 0.1f); @@ -111,10 +111,10 @@ public class OverdriveProjector extends Block{ super.draw(tile); OverdriveEntity entity = tile.entity(); - float f = 1f - (Timers.time() / 100f) % 1f; + float f = 1f - (Time.time() / 100f) % 1f; Draw.color(color, phase, entity.phaseHeat); - Draw.alpha(entity.heat * Mathf.absin(Timers.time(), 10f, 1f) * 0.5f); + Draw.alpha(entity.heat * Mathf.absin(Time.time(), 10f, 1f) * 0.5f); Graphics.setAdditiveBlending(); Draw.rect(topRegion, tile.drawx(), tile.drawy()); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java b/core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java index 46a13ec978..225041ef45 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java @@ -6,9 +6,9 @@ import io.anuke.mindustry.graphics.Layer; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.util.Mathf; public class ShockMine extends Block{ protected int timerDamage = timers ++; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java b/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java index 5ed61ffaf3..ff62f9d2bc 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java @@ -4,7 +4,7 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.graphics.Palette; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.util.Mathf; public class SurgeWall extends Wall{ protected float lightningChance = 0.05f; 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 3143c2cbb2..a9ae8bf536 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 @@ -5,7 +5,7 @@ import io.anuke.mindustry.entities.Predict; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.tilesize; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java index c0bd3da94b..172b0294b4 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java @@ -2,8 +2,8 @@ package io.anuke.mindustry.world.blocks.defense.turrets; import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.tilesize; @@ -21,7 +21,7 @@ public class BurstTurret extends ItemTurret{ entity.heat = 1f; for(int i = 0; i < shots; i++){ - Timers.run(burstSpacing * i, () -> { + Time.run(burstSpacing * i, () -> { if(!(tile.entity instanceof TurretEntity) || !hasAmmo(tile)) return; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java index 562c0779de..ab3718b47e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java @@ -4,10 +4,10 @@ import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.tilesize; @@ -33,7 +33,7 @@ public class ChargeTurret extends PowerTurret{ Effects.effect(chargeBeginEffect, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation); for(int i = 0; i < chargeEffects; i++){ - Timers.run(Mathf.random(chargeMaxDelay), () -> { + Time.run(Mathf.random(chargeMaxDelay), () -> { if(!isTurret(tile)) return; tr.trns(entity.rotation, size * tilesize / 2); Effects.effect(chargeEffect, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation); @@ -42,7 +42,7 @@ public class ChargeTurret extends PowerTurret{ entity.shooting = true; - Timers.run(chargeTime, () -> { + Time.run(chargeTime, () -> { if(!isTurret(tile)) return; tr.trns(entity.rotation, size * tilesize / 2); entity.recoil = recoil; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java index 4fc7b9fb41..dd98334f61 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java @@ -4,10 +4,10 @@ import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.tilesize; @@ -33,7 +33,7 @@ public class CooledTurret extends Turret{ TurretEntity entity = tile.entity(); Liquid liquid = entity.liquids.current(); - float used = Math.min(Math.min(entity.liquids.get(liquid), maxCoolantUsed * Timers.delta()), Math.max(0, ((reload - entity.reload) / coolantMultiplier) / liquid.heatCapacity)); + float used = Math.min(Math.min(entity.liquids.get(liquid), maxCoolantUsed * Time.delta()), Math.max(0, ((reload - entity.reload) / coolantMultiplier) / liquid.heatCapacity)); entity.reload += (used * liquid.heatCapacity) / liquid.heatCapacity; entity.liquids.remove(liquid, used); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java index 1601b15a4c..9fc55716ca 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.world.blocks.defense.turrets; import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.tilesize; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java index 35536236bb..c9e9fda485 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java @@ -7,10 +7,10 @@ import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.tilesize; @@ -39,7 +39,7 @@ public class LaserTurret extends PowerTurret{ entity.bullet.time(0f); entity.heat = 1f; entity.recoil = recoil; - entity.bulletLife -= Timers.delta(); + entity.bulletLife -= Time.delta(); if(entity.bulletLife <= 0f){ entity.bullet = null; } @@ -63,7 +63,7 @@ public class LaserTurret extends PowerTurret{ }else{ Liquid liquid = entity.liquids.current(); - float used = Math.min(Math.min(entity.liquids.get(liquid), maxCoolantUsed * Timers.delta()), Math.max(0, ((reload - entity.reload) / coolantMultiplier) / liquid.heatCapacity)); + float used = Math.min(Math.min(entity.liquids.get(liquid), maxCoolantUsed * Time.delta()), Math.max(0, ((reload - entity.reload) / coolantMultiplier) / liquid.heatCapacity)); entity.reload += (used * liquid.heatCapacity) / liquid.heatCapacity; entity.liquids.remove(liquid, used); 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 b535e639eb..b1b17ff3f1 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 @@ -10,7 +10,7 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockBar; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.values.LiquidFilterValue; -import io.anuke.ucore.core.Effects; +import io.anuke.arc.core.Effects; import static io.anuke.mindustry.Vars.tilesize; import static io.anuke.mindustry.Vars.world; 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 3f8dac221e..b0fd1105b2 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 @@ -22,14 +22,14 @@ import io.anuke.mindustry.world.meta.BlockFlag; import io.anuke.mindustry.world.meta.BlockGroup; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.function.BiConsumer; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.*; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Timers; +import io.anuke.arc.function.BiConsumer; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.*; import java.io.DataInput; import java.io.DataOutput; @@ -254,7 +254,7 @@ public abstract class Turret extends Block{ entry.amount -= ammoPerShot; if(entry.amount == 0) entity.ammo.pop(); entity.totalAmmo -= ammoPerShot; - Timers.run(reload / 2f, () -> ejectEffects(tile)); + Time.run(reload / 2f, () -> ejectEffects(tile)); return entry.type; } diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java index 57230d5471..e11a2570ea 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/BufferedItemBridge.java @@ -4,7 +4,7 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.ItemBuffer; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.util.Mathf; public class BufferedItemBridge extends ExtendingItemBridge{ protected int timerAccept = timers++; 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 8f6237e664..50eb9759d9 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java @@ -6,8 +6,8 @@ import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.LiquidBlock; import io.anuke.mindustry.world.modules.LiquidModule; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; 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 20de6aebb0..04a2ee25a1 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java @@ -12,9 +12,9 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockGroup; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.*; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.*; import java.io.DataInput; import java.io.DataOutput; @@ -95,7 +95,7 @@ public class Conveyor extends Block{ ConveyorEntity entity = tile.entity(); byte rotation = tile.getRotation(); - int frame = entity.clogHeat <= 0.5f ? (int) (((Timers.time() * speed * 8f * entity.timeScale)) % 4) : 0; + int frame = entity.clogHeat <= 0.5f ? (int) (((Time.time() * speed * 8f * entity.timeScale)) % 4) : 0; Draw.rect(regions[Mathf.clamp(entity.blendbits, 0, regions.length - 1)][Mathf.clamp(frame, 0, regions[0].length - 1)], tile.drawx(), tile.drawy(), tilesize * entity.blendsclx, tilesize * entity.blendscly, rotation*90); } diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java index a072628481..2f41b4eac0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java @@ -1,11 +1,11 @@ package io.anuke.mindustry.world.blocks.distribution; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.graphics.CapStyle; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.graphics.CapStyle; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.tilesize; import static io.anuke.mindustry.Vars.world; 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 d99a116992..219da66646 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java @@ -18,12 +18,12 @@ import io.anuke.mindustry.world.Edges; import io.anuke.mindustry.world.Pos; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockGroup; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.CapStyle; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.CapStyle; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -127,7 +127,7 @@ public class ItemBridge extends Block{ Draw.color(linked ? Palette.place : Palette.breakInvalid); Lines.square(other.drawx(), other.drawy(), - other.block().size * tilesize / 2f + 1f + (linked ? 0f : Mathf.absin(Timers.time(), 4f, 1f))); + other.block().size * tilesize / 2f + 1f + (linked ? 0f : Mathf.absin(Time.time(), 4f, 1f))); } } } @@ -212,7 +212,7 @@ public class ItemBridge extends Block{ int i = tile.absoluteRelativeTo(other.x, other.y); - Draw.color(Color.WHITE, Color.BLACK, Mathf.absin(Timers.time(), 6f, 0.07f)); + Draw.color(Color.WHITE, Color.BLACK, Mathf.absin(Time.time(), 6f, 0.07f)); Draw.alpha(Math.max(entity.uptime, 0.25f)); Draw.rect(endRegion, tile.drawx(), tile.drawy(), i * 90 + 90); 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 1428184a67..166352f2b9 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java @@ -6,8 +6,8 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockGroup; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Bits; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Bits; import static io.anuke.mindustry.Vars.content; @@ -40,7 +40,7 @@ public class Junction extends Block{ long l = buffer.items[0]; float time = NumberUtils.intBitsToFloat(Bits.getLeftInt(l)); - if(Timers.time() >= time + speed || Timers.time() < time){ + if(Time.time() >= time + speed || Time.time() < time){ Item item = content.item(Bits.getRightInt(l)); Tile dest = tile.getNearby(i); @@ -61,7 +61,7 @@ public class Junction extends Block{ @Override public void handleItem(Item item, Tile tile, Tile source){ JunctionEntity entity = tile.entity(); - long value = Bits.packLong(NumberUtils.floatToIntBits(Timers.time()), item.id); + long value = Bits.packLong(NumberUtils.floatToIntBits(Time.time()), item.id); int relative = source.relativeTo(tile.x, tile.y); entity.buffers[relative].add(value); } diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidBridge.java index 97a495cc54..2e06ade6af 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidBridge.java @@ -4,8 +4,8 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockGroup; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.world; @@ -23,8 +23,8 @@ public class LiquidBridge extends ItemBridge{ public void update(Tile tile){ ItemBridgeEntity entity = tile.entity(); - entity.time += entity.cycleSpeed * Timers.delta(); - entity.time2 += (entity.cycleSpeed - 1f) * Timers.delta(); + entity.time += entity.cycleSpeed * Time.delta(); + entity.time2 += (entity.cycleSpeed - 1f) * Time.delta(); Tile other = world.tile(entity.link); if(!linkValid(tile, other) ){ 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 5ca2ccedda..c23fd46895 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidExtendingBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidExtendingBridge.java @@ -6,8 +6,8 @@ import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Pos; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockGroup; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.world; @@ -25,8 +25,8 @@ public class LiquidExtendingBridge extends ExtendingItemBridge{ public void update(Tile tile){ ItemBridgeEntity entity = tile.entity(); - entity.time += entity.cycleSpeed * Timers.delta(); - entity.time2 += (entity.cycleSpeed - 1f) * Timers.delta(); + entity.time += entity.cycleSpeed * Time.delta(); + entity.time2 += (entity.cycleSpeed - 1f) * Time.delta(); Tile other = world.tile(entity.link); if(!linkValid(tile, other)){ 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 ce10cda6ba..231e8fa68e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java @@ -6,7 +6,7 @@ import io.anuke.mindustry.world.BarType; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.LiquidBlock; import io.anuke.mindustry.world.meta.BlockStat; -import io.anuke.ucore.graphics.Draw; +import io.anuke.arc.graphics.Draw; public class LiquidJunction extends LiquidBlock{ 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 6c2c390688..4dcd94574f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java @@ -21,14 +21,14 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Pooling; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Pooling; import java.io.DataInput; import java.io.DataOutput; @@ -198,7 +198,7 @@ public class MassDriver extends Block{ @Override public void drawConfigure(Tile tile){ - float sin = Mathf.absin(Timers.time(), 6f, 1f); + float sin = Mathf.absin(Time.time(), 6f, 1f); Draw.color(Palette.accent); Lines.stroke(1f); diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java index b8a845928f..c7787a9431 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java @@ -3,8 +3,8 @@ package io.anuke.mindustry.world.blocks.distribution; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Edges; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Mathf; public class OverflowGate extends Router{ @@ -23,7 +23,7 @@ public class OverflowGate extends Router{ } if(entity.lastItem != null){ - entity.time += 1f/speed * Timers.delta(); + entity.time += 1f/speed * Time.delta(); Tile target = getTileTarget(tile, entity.lastItem, entity.lastInput, false); if(target != null && (entity.time >= 1f)){ 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 0524f7b000..9bf005e445 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Edges; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockGroup; -import io.anuke.ucore.core.Timers; +import io.anuke.arc.core.Timers; public class Router extends Block{ protected float speed = 8f; @@ -38,7 +38,7 @@ public class Router extends Block{ } if(entity.lastItem != null){ - entity.time += 1f/speed * Timers.delta(); + entity.time += 1f/speed * Time.delta(); Tile target = getTileTarget(tile, entity.lastItem, entity.lastInput, false); if(target != null && (entity.time >= 1f || !(target.block() instanceof Router))){ diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java index d8e5b57594..e5e08293fb 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java @@ -10,9 +10,9 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.SelectionTrait; import io.anuke.mindustry.world.meta.BlockGroup; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -40,7 +40,7 @@ public class Sorter extends Block implements SelectionTrait{ @Override public void playerPlaced(Tile tile){ - threads.runDelay(() -> Call.setSorterItem(null, tile, lastItem)); + Core.app.post(() -> Call.setSorterItem(null, tile, lastItem)); } @Remote(targets = Loc.both, called = Loc.both, forward = true) 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 34c6b4b014..e57c843265 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java @@ -7,10 +7,10 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.production.GenericCrafter.GenericCrafterEntity; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; public class FusionReactor extends PowerGenerator{ protected int plasmas = 4; @@ -46,9 +46,9 @@ public class FusionReactor extends PowerGenerator{ entity.warmup = Mathf.lerpDelta(entity.warmup, 0f, 0.01f); } - float powerAdded = Math.min(powerCapacity - entity.power.amount, maxPowerProduced * Mathf.pow(entity.warmup, 4f) * Timers.delta()); + float powerAdded = Math.min(powerCapacity - entity.power.amount, maxPowerProduced * Mathf.pow(entity.warmup, 4f) * Time.delta()); entity.power.amount += powerAdded; - entity.totalProgress += entity.warmup * Timers.delta(); + entity.totalProgress += entity.warmup * Time.delta(); tile.entity.power.graph.update(); } @@ -81,11 +81,11 @@ public class FusionReactor extends PowerGenerator{ Graphics.setAdditiveBlending(); for(int i = 0; i < plasmas; i++){ - float r = 29f + Mathf.absin(Timers.time(), 2f + i * 1f, 5f - i * 0.5f); + float r = 29f + Mathf.absin(Time.time(), 2f + i * 1f, 5f - i * 0.5f); Draw.color(plasma1, plasma2, (float) i / plasmas); - Draw.alpha((0.3f + Mathf.absin(Timers.time(), 2f + i * 2f, 0.3f + i * 0.05f)) * entity.warmup); - Draw.rect(name + "-plasma-" + i, tile.drawx(), tile.drawy(), r, r, Timers.time() * (12 + i * 6f) * entity.warmup); + Draw.alpha((0.3f + Mathf.absin(Time.time(), 2f + i * 2f, 0.3f + i * 0.05f)) * entity.warmup); + Draw.rect(name + "-plasma-" + i, tile.drawx(), tile.drawy(), r, r, Time.time() * (12 + i * 6f) * entity.warmup); } Draw.color(); 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 ab69434175..6a7641ac9f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java @@ -11,11 +11,11 @@ import io.anuke.mindustry.world.consumers.ConsumeItemFilter; import io.anuke.mindustry.world.meta.BlockBar; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -68,7 +68,7 @@ public abstract class ItemGenerator extends PowerGenerator{ if(entity.generateTime > 0){ Draw.color(heatColor); float alpha = (entity.items.total() > 0 ? 1f : Mathf.clamp(entity.generateTime)); - alpha = alpha * 0.7f + Mathf.absin(Timers.time(), 12f, 0.3f) * alpha; + alpha = alpha * 0.7f + Mathf.absin(Time.time(), 12f, 0.3f) * alpha; Draw.alpha(alpha); Draw.rect(topRegion, tile.drawx(), tile.drawy()); Draw.reset(); diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java index 9aac369832..b637954bbd 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java @@ -5,9 +5,9 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.content; import static io.anuke.mindustry.Vars.tilesize; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/LiquidGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/LiquidGenerator.java index 8a8ed8ca25..50ef97a01a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/LiquidGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/LiquidGenerator.java @@ -6,10 +6,10 @@ import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.power.ItemGenerator.ItemGeneratorEntity; import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; public abstract class LiquidGenerator extends PowerGenerator{ protected float minEfficiency = 0.2f; 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 a6cac3e1eb..9bb7f0e7f3 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java @@ -14,11 +14,11 @@ import io.anuke.mindustry.world.meta.BlockBar; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; import io.anuke.mindustry.world.meta.values.LiquidFilterValue; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Translator; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Translator; import java.io.DataInput; import java.io.DataOutput; @@ -140,21 +140,21 @@ public class NuclearReactor extends PowerGenerator{ Effects.shake(6f, 16f, tile.worldx(), tile.worldy()); Effects.effect(ExplosionFx.nuclearShockwave, tile.worldx(), tile.worldy()); for(int i = 0; i < 6; i++){ - Timers.run(Mathf.random(40), () -> Effects.effect(BlockFx.nuclearcloud, tile.worldx(), tile.worldy())); + Time.run(Mathf.random(40), () -> Effects.effect(BlockFx.nuclearcloud, tile.worldx(), tile.worldy())); } Damage.damage(tile.worldx(), tile.worldy(), explosionRadius * tilesize, explosionDamage * 4); for(int i = 0; i < 20; i++){ - Timers.run(Mathf.random(50), () -> { + Time.run(Mathf.random(50), () -> { tr.rnd(Mathf.random(40f)); Effects.effect(ExplosionFx.explosion, tr.x + tile.worldx(), tr.y + tile.worldy()); }); } for(int i = 0; i < 70; i++){ - Timers.run(Mathf.random(80), () -> { + Time.run(Mathf.random(80), () -> { tr.rnd(Mathf.random(120f)); Effects.effect(BlockFx.nuclearsmoke, tr.x + tile.worldx(), tr.y + tile.worldy()); }); @@ -182,7 +182,7 @@ public class NuclearReactor extends PowerGenerator{ if(entity.heat > flashThreshold){ float flash = 1f + ((entity.heat - flashThreshold) / (1f - flashThreshold)) * 5.4f; - entity.flash += flash * Timers.delta(); + entity.flash += flash * Time.delta(); Draw.color(Color.RED, Color.YELLOW, Mathf.absin(entity.flash, 9f, 1f)); Draw.alpha(0.6f); Draw.rect(lightsRegion, tile.drawx(), tile.drawy()); diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java index 8423ffefa2..b9d6254e16 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.world.blocks.power; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.world.meta.BlockFlag; -import io.anuke.ucore.util.EnumSet; +import io.anuke.arc.util.EnumSet; public class PowerGenerator extends PowerDistributor{ 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 5cd5634709..db85f4a8d2 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java @@ -12,13 +12,13 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.PowerBlock; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.Translator; +import io.anuke.arc.core.Settings; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.Translator; import static io.anuke.mindustry.Vars.*; @@ -159,7 +159,7 @@ public class PowerNode extends PowerBlock{ Lines.stroke(1f); Lines.circle(tile.drawx(), tile.drawy(), - tile.block().size * tilesize / 2f + 1f + Mathf.absin(Timers.time(), 4f, 1f)); + tile.block().size * tilesize / 2f + 1f + Mathf.absin(Time.time(), 4f, 1f)); Lines.poly(tile.drawx(), tile.drawy(), 50, laserRange*tilesize); @@ -173,7 +173,7 @@ public class PowerNode extends PowerBlock{ Draw.color(linked ? Palette.place : Palette.breakInvalid); Lines.circle(link.drawx(), link.drawy(), - link.block().size * tilesize / 2f + 1f + (linked ? 0f : Mathf.absin(Timers.time(), 4f, 1f))); + link.block().size * tilesize / 2f + 1f + (linked ? 0f : Mathf.absin(Time.time(), 4f, 1f))); if((entity.power.links.size >= maxNodes || (link.block() instanceof PowerNode && link.entity.power.links.size >= ((PowerNode) link.block()).maxNodes)) && !linked){ Draw.color(); @@ -196,7 +196,7 @@ public class PowerNode extends PowerBlock{ @Override public void drawLayer(Tile tile){ - if(!Settings.getBool("lasers")) return; + if(!Core.settings.getBool("lasers")) return; TileEntity entity = tile.entity(); @@ -250,7 +250,7 @@ public class PowerNode extends PowerBlock{ x2 += t2.x; y2 += t2.y; - Draw.color(Palette.powerLight, Palette.power, Mathf.absin(Timers.time(), 8f, 1f)); + Draw.color(Palette.powerLight, Palette.power, Mathf.absin(Time.time(), 8f, 1f)); Lines.stroke(2f); Lines.line(x1, y1, x2, y2); } diff --git a/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java index 02c3bfc245..f915af34f6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java @@ -3,8 +3,8 @@ package io.anuke.mindustry.world.blocks.power; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.EnumSet; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.EnumSet; public class SolarGenerator extends PowerGenerator{ /** @@ -26,7 +26,7 @@ public class SolarGenerator extends PowerGenerator{ @Override public void update(Tile tile){ - addPower(tile, generation * Timers.delta()); + addPower(tile, generation * Time.delta()); tile.entity.power.graph.update(); } 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 f6a0eafc27..a15864b4a6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Compressor.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Compressor.java @@ -4,8 +4,8 @@ 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; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; public class Compressor extends PowerCrafter{ protected TextureRegion liquidRegion, topRegion; 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 21ae7112a8..55b5e4cb1f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java @@ -9,11 +9,11 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Mathf; -import io.anuke.ucore.util.SeedRandom; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Mathf; +import io.anuke.arc.util.SeedRandom; import java.io.DataInput; import java.io.DataOutput; @@ -78,7 +78,7 @@ public class Cultivator extends Drill{ for(int i = 0; i < 12; i++){ float offset = random.nextFloat() * 999999f; float x = random.range(4f), y = random.range(4f); - float life = 1f - (((Timers.time() + offset) / 50f) % recurrence); + float life = 1f - (((Time.time() + offset) / 50f) % recurrence); if(life > 0){ Lines.stroke(entity.warmup * (life * 1f + 0.2f)); 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 53acab914b..50e0be317d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java @@ -16,12 +16,12 @@ import io.anuke.mindustry.world.consumers.ConsumeLiquid; import io.anuke.mindustry.world.meta.BlockGroup; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.content; public class Drill extends Block{ @@ -95,7 +95,7 @@ public class Drill extends Block{ if(drawRim){ Graphics.setAdditiveBlending(); Draw.color(heatColor); - Draw.alpha(entity.warmup * ts * (1f - s + Mathf.absin(Timers.time(), 3f, s))); + Draw.alpha(entity.warmup * ts * (1f - s + Mathf.absin(Time.time(), 3f, s))); Draw.rect(rimRegion, tile.drawx(), tile.drawy()); Draw.color(); Graphics.setNormalBlending(); @@ -193,7 +193,7 @@ public class Drill extends Block{ entity.progress += entity.delta() * entity.dominantItems * speed * entity.warmup; - if(Mathf.chance(Timers.delta() * updateEffectChance * entity.warmup)) + if(Mathf.chance(Time.delta() * updateEffectChance * entity.warmup)) Effects.effect(updateEffect, entity.x + Mathf.range(size * 2f), entity.y + Mathf.range(size * 2f)); }else{ entity.warmup = Mathf.lerpDelta(entity.warmup, 0f, warmupSpeed); 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 200fb4c965..fd20bb489b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java @@ -5,7 +5,7 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.consumers.ConsumeItem; -import io.anuke.ucore.graphics.Draw; +import io.anuke.arc.graphics.Draw; public class Fracker extends SolidPump{ protected final float itemUseTime = 100f; 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 5a5fd41e03..904a82fc40 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java @@ -12,11 +12,11 @@ import io.anuke.mindustry.world.consumers.ConsumeItem; import io.anuke.mindustry.world.meta.BlockBar; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -87,7 +87,7 @@ public class GenericCrafter extends Block{ entity.totalProgress += entity.delta(); entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, 0.02f); - if(Mathf.chance(Timers.delta() * updateEffectChance)) + if(Mathf.chance(Time.delta() * updateEffectChance)) Effects.effect(updateEffect, entity.x + Mathf.range(size * 4f), entity.y + Mathf.range(size * 4)); }else{ entity.warmup = Mathf.lerp(entity.warmup, 0f, 0.02f); 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 a9ca1a7b84..c1960cdeb7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java @@ -8,12 +8,12 @@ import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.BarType; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.util.Mathf; public class Incinerator extends Block{ protected Effect effect = BlockFx.fuelburn; @@ -56,7 +56,7 @@ public class Incinerator extends Block{ float g = 0.3f; float r = 0.06f; - Draw.alpha(((1f - g) + Mathf.absin(Timers.time(), 8f, g) + Mathf.random(r) - r) * entity.heat); + Draw.alpha(((1f - g) + Mathf.absin(Time.time(), 8f, g) + Mathf.random(r) - r) * entity.heat); Draw.tint(flameColor); Fill.circle(tile.drawx(), tile.drawy(), 2f); diff --git a/core/src/io/anuke/mindustry/world/blocks/production/LiquidMixer.java b/core/src/io/anuke/mindustry/world/blocks/production/LiquidMixer.java index 01e96fb5c3..5a3bde03ae 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/LiquidMixer.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/LiquidMixer.java @@ -10,7 +10,7 @@ import io.anuke.mindustry.world.meta.BlockBar; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; import io.anuke.mindustry.world.modules.LiquidModule; -import io.anuke.ucore.graphics.Draw; +import io.anuke.arc.graphics.Draw; public class LiquidMixer extends LiquidBlock{ protected Liquid outputLiquid; 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 f6249686c3..ec4ae5efc5 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java @@ -5,10 +5,10 @@ import io.anuke.mindustry.Vars; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Mathf; public class PhaseWeaver extends PowerSmelter{ protected TextureRegion bottomRegion; 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 a88f0a9e55..05643bf14d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/PlastaniumCompressor.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/PlastaniumCompressor.java @@ -2,8 +2,8 @@ package io.anuke.mindustry.world.blocks.production; 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; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; public class PlastaniumCompressor extends GenericCrafter{ protected TextureRegion topRegion; 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 f4d0abceb0..dc9b794842 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java @@ -12,12 +12,12 @@ import io.anuke.mindustry.world.blocks.PowerBlock; import io.anuke.mindustry.world.meta.BlockBar; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -104,7 +104,7 @@ public class PowerSmelter extends PowerBlock{ if(Mathf.chance(entity.delta() * burnEffectChance)) Effects.effect(burnEffect, entity.x + Mathf.range(size * 4f), entity.y + Mathf.range(size * 4)); }else{ - entity.heat -= 1f / heatUpTime * Timers.delta(); + entity.heat -= 1f / heatUpTime * Time.delta(); } entity.heat = Mathf.clamp(entity.heat); @@ -187,13 +187,13 @@ public class PowerSmelter extends PowerBlock{ float r = 0.06f; float cr = Mathf.random(0.1f); - Draw.alpha(((1f - g) + Mathf.absin(Timers.time(), 8f, g) + Mathf.random(r) - r) * entity.heat); + Draw.alpha(((1f - g) + Mathf.absin(Time.time(), 8f, g) + Mathf.random(r) - r) * entity.heat); Draw.tint(flameColor); - Fill.circle(tile.drawx(), tile.drawy(), 3f + Mathf.absin(Timers.time(), 5f, 2f) + cr); + Fill.circle(tile.drawx(), tile.drawy(), 3f + Mathf.absin(Time.time(), 5f, 2f) + cr); Draw.color(1f, 1f, 1f, entity.heat); Draw.rect(topRegion, tile.drawx(), tile.drawy()); - Fill.circle(tile.drawx(), tile.drawy(), 1.9f + Mathf.absin(Timers.time(), 5f, 1f) + cr); + Fill.circle(tile.drawx(), tile.drawy(), 1.9f + Mathf.absin(Time.time(), 5f, 1f) + cr); Draw.color(); } 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 dd7d87d4ac..11aee84d76 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Pulverizer.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Pulverizer.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.world.blocks.production; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.graphics.Draw; +import io.anuke.arc.graphics.Draw; public class Pulverizer extends GenericCrafter{ protected TextureRegion rotatorRegion; 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 b8de5fc2e4..66f49d39f7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java @@ -10,7 +10,7 @@ import io.anuke.mindustry.world.consumers.ConsumeLiquid; import io.anuke.mindustry.world.meta.BlockGroup; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.graphics.Draw; +import io.anuke.arc.graphics.Draw; public class Pump extends LiquidBlock{ protected final Array drawTiles = new Array<>(); diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Separator.java b/core/src/io/anuke/mindustry/world/blocks/production/Separator.java index 4fe5637f97..c87bd9374b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Separator.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Separator.java @@ -12,9 +12,9 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.production.GenericCrafter.GenericCrafterEntity; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.values.ItemFilterValue; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Mathf; /** * Extracts a random list of items from an input item and an input liquid. diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java b/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java index f1b7200598..e50fa95736 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java @@ -13,12 +13,12 @@ import io.anuke.mindustry.world.consumers.ConsumeItems; import io.anuke.mindustry.world.meta.BlockBar; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Fill; +import io.anuke.arc.util.Mathf; import static io.anuke.mindustry.Vars.*; @@ -177,12 +177,12 @@ public class Smelter extends Block{ if(entity.heat > 0f){ float g = 0.1f; - Draw.alpha(((1f - g) + Mathf.absin(Timers.time(), 8f, g)) * entity.heat); + Draw.alpha(((1f - g) + Mathf.absin(Time.time(), 8f, g)) * entity.heat); Draw.tint(flameColor); - Fill.circle(tile.drawx(), tile.drawy(), 2f + Mathf.absin(Timers.time(), 5f, 0.8f)); + Fill.circle(tile.drawx(), tile.drawy(), 2f + Mathf.absin(Time.time(), 5f, 0.8f)); Draw.color(1f, 1f, 1f, entity.heat); - Fill.circle(tile.drawx(), tile.drawy(), 1f + Mathf.absin(Timers.time(), 5f, 0.7f)); + Fill.circle(tile.drawx(), tile.drawy(), 1f + Mathf.absin(Time.time(), 5f, 0.7f)); Draw.color(); } 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 26c5390307..cfb26702e0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java @@ -7,10 +7,10 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.util.Mathf; /** * Pump that makes liquid from solids and takes in power. Only works on solid floor blocks. diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java index 72da901159..ca25eb3a6b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java @@ -22,13 +22,13 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.BarType; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockFlag; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.EnumSet; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.EnumSet; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -202,7 +202,7 @@ public class CoreBlock extends StorageBlock{ Call.onUnitRespawn(tile, entity.currentUnit); } }else if(!netServer.isWaitingForPlayers()){ - entity.warmup += Timers.delta(); + entity.warmup += Time.delta(); if(entity.solid && entity.warmup > 60f && unitGroups[tile.getTeamID()].getByID(entity.droneID) == null && !Net.client()){ 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 72c5da2b88..6c8d7c2bdf 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/SortedUnloader.java @@ -10,8 +10,8 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.SelectionTrait; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.scene.ui.layout.Table; import java.io.DataInput; import java.io.DataOutput; @@ -46,7 +46,7 @@ public class SortedUnloader extends Block implements SelectionTrait{ @Override public void playerPlaced(Tile tile){ - threads.runDelay(() -> Call.setSortedUnloaderItem(null, tile, lastItem)); + Core.app.post(() -> Call.setSortedUnloaderItem(null, tile, lastItem)); } @Remote(targets = Loc.both, called = Loc.both, forward = true) 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 2c81810d7e..c37347d70a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java @@ -16,13 +16,13 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockFlag; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.scene.ui.ButtonGroup; -import io.anuke.ucore.scene.ui.ImageButton; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.EnumSet; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.scene.ui.ButtonGroup; +import io.anuke.arc.scene.ui.ImageButton; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.EnumSet; import java.io.DataInput; import java.io.DataOutput; 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 3e7f247d57..f273edd4e7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java @@ -19,13 +19,13 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.consumers.ConsumePowerExact; import io.anuke.mindustry.world.meta.BlockStat; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Geometry; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Geometry; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -110,7 +110,7 @@ public class MechPad extends Block{ public void drawSelect(Tile tile){ Draw.color(Palette.accent); for(int i = 0; i < 4; i ++){ - float length = tilesize * size/2f + 3 + Mathf.absin(Timers.time(), 5f, 2f); + float length = tilesize * size/2f + 3 + Mathf.absin(Time.time(), 5f, 2f); Draw.rect("transfer-arrow", tile.drawx() + Geometry.d4[i].x * length, tile.drawy() + Geometry.d4[i].y * length, (i+2) * 90); } Draw.color(); 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 b728892c01..962d749a63 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java @@ -15,13 +15,13 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Effects.Effect; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; @@ -230,7 +230,7 @@ public class Reconstructor extends Block{ boolean stayOpen = false; if(entity.current != null){ - entity.time += Timers.delta(); + entity.time += Time.delta(); entity.solid = true; @@ -243,7 +243,7 @@ public class Reconstructor extends Block{ ReconstructorEntity other = world.tile(entity.link).entity(); - entity.updateTime -= Timers.delta() / departTime; + entity.updateTime -= Time.delta() / departTime; if(entity.updateTime <= 0f){ //no power? death. if(other.power.amount < powerPerTeleport){ @@ -260,7 +260,7 @@ public class Reconstructor extends Block{ entity.current = null; } }else{ //else, arriving - entity.updateTime -= Timers.delta() / arriveTime; + entity.updateTime -= Time.delta() / arriveTime; if(entity.updateTime <= 0f){ entity.solid = false; 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 a3757c1049..9ce7c5b569 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java @@ -11,13 +11,13 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockFlag; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.graphics.Shapes; -import io.anuke.ucore.util.Angles; -import io.anuke.ucore.util.EnumSet; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Timers; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.graphics.Shapes; +import io.anuke.arc.util.Angles; +import io.anuke.arc.util.EnumSet; +import io.anuke.arc.util.Mathf; public class RepairPoint extends Block{ private static Rectangle rect = new Rectangle(); @@ -87,15 +87,15 @@ public class RepairPoint extends Block{ entity.target.health >= entity.target.maxHealth())){ entity.target = null; }else if(entity.target != null){ - entity.target.health += repairSpeed * Timers.delta() * entity.strength; + entity.target.health += repairSpeed * Time.delta() * entity.strength; entity.target.clampHealth(); entity.rotation = Mathf.slerpDelta(entity.rotation, entity.angleTo(entity.target), 0.5f); } if(entity.target != null && entity.cons.valid()){ - entity.strength = Mathf.lerpDelta(entity.strength, 1f, 0.08f * Timers.delta()); + entity.strength = Mathf.lerpDelta(entity.strength, 1f, 0.08f * Time.delta()); }else{ - entity.strength = Mathf.lerpDelta(entity.strength, 0f, 0.07f * Timers.delta()); + entity.strength = Mathf.lerpDelta(entity.strength, 0f, 0.07f * Time.delta()); } if(entity.timer.get(timerTarget, 20)){ 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 211d7b5494..74c5938e9d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java @@ -23,12 +23,12 @@ import io.anuke.mindustry.world.meta.BlockFlag; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; import io.anuke.mindustry.world.modules.ItemModule; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.EnumSet; -import io.anuke.ucore.util.Mathf; +import io.anuke.arc.core.Effects; +import io.anuke.arc.core.Graphics; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Lines; +import io.anuke.arc.util.EnumSet; +import io.anuke.arc.util.Mathf; import java.io.DataInput; import java.io.DataOutput; diff --git a/core/src/io/anuke/mindustry/world/consumers/Consume.java b/core/src/io/anuke/mindustry/world/consumers/Consume.java index 754ffcf9c4..3902245284 100644 --- a/core/src/io/anuke/mindustry/world/consumers/Consume.java +++ b/core/src/io/anuke/mindustry/world/consumers/Consume.java @@ -5,8 +5,8 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.meta.BlockStats; -import io.anuke.ucore.scene.ui.Tooltip; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.Tooltip; +import io.anuke.arc.scene.ui.layout.Table; import static io.anuke.mindustry.Vars.mobile; diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java index 9476e43eff..76e659759a 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.ui.ItemImage; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Table; public class ConsumeItem extends Consume{ private final Item item; diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java index 7c5621bace..bd7ad6a8ba 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java @@ -7,8 +7,8 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.values.ItemFilterValue; -import io.anuke.ucore.function.Predicate; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.function.Predicate; +import io.anuke.arc.scene.ui.layout.Table; import static io.anuke.mindustry.Vars.*; public class ConsumeItemFilter extends Consume{ diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java index b46c984c2d..8ba9fdbb64 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.values.ItemListValue; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Table; public class ConsumeItems extends Consume{ private ItemStack[] items; diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java index be204b4dc0..c5ee119a8f 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java @@ -6,7 +6,7 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Table; public class ConsumeLiquid extends Consume{ protected final float use; diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java index 3562f4c1c5..632a21cfd0 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java @@ -8,8 +8,8 @@ import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.StatUnit; import io.anuke.mindustry.world.meta.values.LiquidFilterValue; -import io.anuke.ucore.function.Predicate; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.function.Predicate; +import io.anuke.arc.scene.ui.layout.Table; import static io.anuke.mindustry.Vars.content; diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java b/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java index d05ba2c4fa..a38ece0027 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java @@ -5,7 +5,7 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Table; public class ConsumePower extends Consume{ protected final float use; diff --git a/core/src/io/anuke/mindustry/world/consumers/Consumers.java b/core/src/io/anuke/mindustry/world/consumers/Consumers.java index bbac912e22..d3276542bf 100644 --- a/core/src/io/anuke/mindustry/world/consumers/Consumers.java +++ b/core/src/io/anuke/mindustry/world/consumers/Consumers.java @@ -6,8 +6,8 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Block; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.util.ThreadArray; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.util.ThreadArray; public class Consumers{ private ObjectMap, Consume> map = new ObjectMap<>(); diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStat.java b/core/src/io/anuke/mindustry/world/meta/BlockStat.java index 834e8f3ce2..e6c90e5506 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockStat.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockStat.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.meta; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; import java.util.Locale; @@ -57,6 +57,6 @@ public enum BlockStat{ } public String localized(){ - return Bundles.get("text.blocks." + name().toLowerCase(Locale.ROOT)); + return Core.bundle.get("text.blocks." + name().toLowerCase(Locale.ROOT)); } } diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStats.java b/core/src/io/anuke/mindustry/world/meta/BlockStats.java index ae3de7eb86..aea14d7e50 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockStats.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockStats.java @@ -7,8 +7,8 @@ import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.meta.values.*; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Log; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Log; import java.util.Locale; @@ -56,7 +56,7 @@ public class BlockStats{ /**Adds a stat value.*/ public void add(BlockStat stat, StatValue value){ - if(!Bundles.has("text.blocks." + stat.name().toLowerCase(Locale.ROOT))){ + if(!Core.bundle.has("text.blocks." + stat.name().toLowerCase(Locale.ROOT))){ if(!errorWhenMissing){ Log.err("Warning: No bundle entry for stat type \"" + stat + "\"!"); }else{ @@ -64,7 +64,7 @@ public class BlockStats{ } } - if(!Bundles.has("text.category." + stat.category.name().toLowerCase(Locale.ROOT))){ + if(!Core.bundle.has("text.category." + stat.category.name().toLowerCase(Locale.ROOT))){ if(!errorWhenMissing){ Log.err("Warning: No bundle entry for stat category \"" + stat.category + "\"!"); }else{ diff --git a/core/src/io/anuke/mindustry/world/meta/StatUnit.java b/core/src/io/anuke/mindustry/world/meta/StatUnit.java index 532b7c497f..f7586b025a 100644 --- a/core/src/io/anuke/mindustry/world/meta/StatUnit.java +++ b/core/src/io/anuke/mindustry/world/meta/StatUnit.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.meta; -import io.anuke.ucore.util.Bundles; +import io.anuke.arc.util.Bundles; import java.util.Locale; @@ -22,6 +22,6 @@ public enum StatUnit{ public String localized(){ if(this == none) return ""; - return Bundles.get("text.unit." + name().toLowerCase(Locale.ROOT)); + return Core.bundle.get("text.unit." + name().toLowerCase(Locale.ROOT)); } } diff --git a/core/src/io/anuke/mindustry/world/meta/StatValue.java b/core/src/io/anuke/mindustry/world/meta/StatValue.java index df53cc2947..fd1e8a69bc 100644 --- a/core/src/io/anuke/mindustry/world/meta/StatValue.java +++ b/core/src/io/anuke/mindustry/world/meta/StatValue.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.meta; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Table; /** * A base interface for a value of a stat that is displayed. diff --git a/core/src/io/anuke/mindustry/world/meta/values/BooleanValue.java b/core/src/io/anuke/mindustry/world/meta/values/BooleanValue.java index 7adb9bb0b5..d3b4d7139f 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/BooleanValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/BooleanValue.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.meta.values; import io.anuke.mindustry.world.meta.StatValue; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Table; public class BooleanValue implements StatValue{ private final boolean value; 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 c75c26c8b2..e41a3a307a 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java @@ -4,8 +4,8 @@ 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; -import io.anuke.ucore.function.Predicate; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.function.Predicate; +import io.anuke.arc.scene.ui.layout.Table; import static io.anuke.mindustry.Vars.content; diff --git a/core/src/io/anuke/mindustry/world/meta/values/ItemListValue.java b/core/src/io/anuke/mindustry/world/meta/values/ItemListValue.java index af9ab67af2..a316eb26a7 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/ItemListValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/ItemListValue.java @@ -5,7 +5,7 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.ui.ItemDisplay; import io.anuke.mindustry.world.meta.ContentStatValue; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Table; public class ItemListValue implements ContentStatValue{ private final Item[] items; diff --git a/core/src/io/anuke/mindustry/world/meta/values/ItemValue.java b/core/src/io/anuke/mindustry/world/meta/values/ItemValue.java index 2b54142976..97d10985da 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/ItemValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/ItemValue.java @@ -5,7 +5,7 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.ui.ItemDisplay; import io.anuke.mindustry.world.meta.ContentStatValue; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Table; public class ItemValue implements ContentStatValue{ private final ItemStack item; 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 efafdba7a8..becd6cb304 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java @@ -4,8 +4,8 @@ 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; -import io.anuke.ucore.function.Predicate; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.function.Predicate; +import io.anuke.arc.scene.ui.layout.Table; import static io.anuke.mindustry.Vars.content; diff --git a/core/src/io/anuke/mindustry/world/meta/values/LiquidValue.java b/core/src/io/anuke/mindustry/world/meta/values/LiquidValue.java index 0dcc6c03c7..cd2bd85b6e 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/LiquidValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/LiquidValue.java @@ -4,7 +4,7 @@ import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.ui.LiquidDisplay; import io.anuke.mindustry.world.meta.ContentStatValue; -import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Table; public class LiquidValue implements ContentStatValue{ private final Liquid liquid; diff --git a/core/src/io/anuke/mindustry/world/meta/values/NumberValue.java b/core/src/io/anuke/mindustry/world/meta/values/NumberValue.java index d72f69e877..8c8a058297 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/NumberValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/NumberValue.java @@ -2,8 +2,8 @@ package io.anuke.mindustry.world.meta.values; import io.anuke.mindustry.world.meta.StatUnit; import io.anuke.mindustry.world.meta.StatValue; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Strings; /** * A stat that is a number with a unit attacked. diff --git a/core/src/io/anuke/mindustry/world/meta/values/StringValue.java b/core/src/io/anuke/mindustry/world/meta/values/StringValue.java index 1a0bc458d0..f51884621a 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/StringValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/StringValue.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.world.meta.values; import io.anuke.mindustry.world.meta.StatValue; -import io.anuke.ucore.scene.ui.layout.Table; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Strings; public class StringValue implements StatValue{ private final String value; diff --git a/desktop/src/io/anuke/mindustry/desktop/CrashHandler.java b/desktop/src/io/anuke/mindustry/desktop/CrashHandler.java index d3bb8e1976..af88b624ad 100644 --- a/desktop/src/io/anuke/mindustry/desktop/CrashHandler.java +++ b/desktop/src/io/anuke/mindustry/desktop/CrashHandler.java @@ -6,9 +6,9 @@ import com.badlogic.gdx.utils.JsonWriter.OutputType; import io.anuke.mindustry.Vars; import io.anuke.mindustry.game.Version; import io.anuke.mindustry.net.Net; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.OS; +import io.anuke.arc.core.Settings; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.OS; import java.io.PrintWriter; import java.io.StringWriter; @@ -25,7 +25,7 @@ public class CrashHandler{ try{ //check crash report setting - if(!Settings.getBool("crashreport")){ + if(!Core.settings.getBool("crashreport")){ return; } }catch(Throwable ignored){ diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java index 0604d62e53..d611603f76 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java @@ -12,9 +12,9 @@ import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.ui.dialogs.FileChooser; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.util.OS; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.util.OS; +import io.anuke.arc.util.Strings; import java.net.NetworkInterface; import java.util.Enumeration; diff --git a/ios/robovm.xml b/ios/robovm.xml index efa0df89f0..a7a06eeb22 100644 --- a/ios/robovm.xml +++ b/ios/robovm.xml @@ -19,7 +19,7 @@ net.jpountz.lz4.** - io.anuke.ucore.scene.** + io.anuke.arc.scene.** io.anuke.mindustry.gen.Call io.anuke.mindustry.net.** com.android.okhttp.HttpHandler diff --git a/ios/src/io/anuke/mindustry/IOSLauncher.java b/ios/src/io/anuke/mindustry/IOSLauncher.java index 4938e4457f..8ed13f374b 100644 --- a/ios/src/io/anuke/mindustry/IOSLauncher.java +++ b/ios/src/io/anuke/mindustry/IOSLauncher.java @@ -10,9 +10,9 @@ import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.game.Saves.SaveSlot; import io.anuke.mindustry.io.SaveIO; import io.anuke.mindustry.net.Net; -import io.anuke.ucore.scene.ui.layout.Unit; -import io.anuke.ucore.util.Bundles; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.arc.util.Bundles; +import io.anuke.arc.util.Strings; import org.robovm.apple.foundation.NSAutoreleasePool; import org.robovm.apple.foundation.NSURL; import org.robovm.apple.uikit.*; @@ -47,7 +47,7 @@ public class IOSLauncher extends IOSApplication.Delegate { p.getPopoverPresentationController().setSourceView(UIApplication.getSharedApplication().getKeyWindow().getRootViewController().getView()); UIApplication.getSharedApplication().getKeyWindow().getRootViewController() - .presentViewController(p, true, () -> io.anuke.ucore.util.Log.info("Success! Presented {0}", to)); + .presentViewController(p, true, () -> io.anuke.arc.util.Log.info("Success! Presented {0}", to)); } @Override @@ -102,7 +102,7 @@ public class IOSLauncher extends IOSApplication.Delegate { SaveSlot slot = control.saves.importSave(file); ui.load.runLoadSave(slot); }catch (IOException e){ - ui.showError(Bundles.format("text.save.import.fail", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("text.save.import.fail", Strings.parseException(e, false))); } }else{ ui.showError("$text.save.import.invalid"); diff --git a/kryonet/src/io/anuke/kryonet/ByteSerializer.java b/kryonet/src/io/anuke/kryonet/ByteSerializer.java index 119a876658..ace1ac8db2 100644 --- a/kryonet/src/io/anuke/kryonet/ByteSerializer.java +++ b/kryonet/src/io/anuke/kryonet/ByteSerializer.java @@ -4,8 +4,8 @@ import com.esotericsoftware.kryonet.FrameworkMessage; import com.esotericsoftware.kryonet.serialization.Serialization; import io.anuke.mindustry.net.Packet; import io.anuke.mindustry.net.Registrator; -import io.anuke.ucore.function.Supplier; -import io.anuke.ucore.util.Pooling; +import io.anuke.arc.function.Supplier; +import io.anuke.arc.util.Pooling; import java.nio.ByteBuffer; diff --git a/kryonet/src/io/anuke/kryonet/KryoClient.java b/kryonet/src/io/anuke/kryonet/KryoClient.java index abed5b9e2c..069a72ee3e 100644 --- a/kryonet/src/io/anuke/kryonet/KryoClient.java +++ b/kryonet/src/io/anuke/kryonet/KryoClient.java @@ -10,8 +10,8 @@ import io.anuke.mindustry.net.Net.SendMode; import io.anuke.mindustry.net.NetworkIO; import io.anuke.mindustry.net.Packets.Connect; import io.anuke.mindustry.net.Packets.Disconnect; -import io.anuke.ucore.function.Consumer; -import io.anuke.ucore.util.Pooling; +import io.anuke.arc.function.Consumer; +import io.anuke.arc.util.Pooling; import net.jpountz.lz4.LZ4Factory; import net.jpountz.lz4.LZ4FastDecompressor; @@ -71,7 +71,7 @@ public class KryoClient implements ClientProvider{ c.id = connection.getID(); if(connection.getRemoteAddressTCP() != null) c.addressTCP = connection.getRemoteAddressTCP().toString(); - threads.runDelay(() -> Net.handleClientReceived(c)); + Core.app.post(() -> Net.handleClientReceived(c)); } @Override @@ -81,14 +81,14 @@ public class KryoClient implements ClientProvider{ } Disconnect c = new Disconnect(); - threads.runDelay(() -> Net.handleClientReceived(c)); + Core.app.post(() -> Net.handleClientReceived(c)); } @Override public void received(Connection connection, Object object){ if(object instanceof FrameworkMessage) return; - threads.runDelay(() -> { + Core.app.post(() -> { try{ Net.handleClientReceived(object); }catch(Exception e){ diff --git a/kryonet/src/io/anuke/kryonet/KryoCore.java b/kryonet/src/io/anuke/kryonet/KryoCore.java index 01d582edc6..e5169433ff 100644 --- a/kryonet/src/io/anuke/kryonet/KryoCore.java +++ b/kryonet/src/io/anuke/kryonet/KryoCore.java @@ -2,7 +2,7 @@ package io.anuke.kryonet; import com.esotericsoftware.minlog.Log; import com.esotericsoftware.minlog.Log.Logger; -import io.anuke.ucore.util.ColorCodes; +import io.anuke.arc.util.ColorCodes; import java.io.PrintWriter; import java.io.StringWriter; @@ -55,7 +55,7 @@ public class KryoCore{ if(headless) builder.append(ColorCodes.RESET); - io.anuke.ucore.util.Log.info("&b" + builder.toString()); + io.anuke.arc.util.Log.info("&b" + builder.toString()); } }); } diff --git a/kryonet/src/io/anuke/kryonet/KryoServer.java b/kryonet/src/io/anuke/kryonet/KryoServer.java index bd8437b688..77a4dffd4e 100644 --- a/kryonet/src/io/anuke/kryonet/KryoServer.java +++ b/kryonet/src/io/anuke/kryonet/KryoServer.java @@ -16,8 +16,8 @@ import io.anuke.mindustry.net.Packets.Connect; import io.anuke.mindustry.net.Packets.Disconnect; import io.anuke.mindustry.net.Packets.StreamBegin; import io.anuke.mindustry.net.Packets.StreamChunk; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Log; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Log; import net.jpountz.lz4.LZ4Compressor; import net.jpountz.lz4.LZ4Factory; @@ -65,7 +65,7 @@ public class KryoServer implements ServerProvider{ Log.info("&bRecieved connection: {0}", c.addressTCP); connections.add(kn); - threads.runDelay(() -> Net.handleServerReceived(kn.id, c)); + Core.app.post(() -> Net.handleServerReceived(kn.id, c)); } @Override @@ -76,7 +76,7 @@ public class KryoServer implements ServerProvider{ Disconnect c = new Disconnect(); c.id = k.id; - threads.runDelay(() -> { + Core.app.post(() -> { Net.handleServerReceived(k.id, c); connections.remove(k); }); @@ -87,7 +87,7 @@ public class KryoServer implements ServerProvider{ KryoConnection k = getByKryoID(connection.getID()); if(object instanceof FrameworkMessage || k == null) return; - threads.runDelay(() -> { + Core.app.post(() -> { try{ Net.handleServerReceived(k.id, object); }catch(ValidateException e){ @@ -254,7 +254,7 @@ public class KryoServer implements ServerProvider{ } private void handleException(Throwable e){ - Timers.run(0f, () -> { + Time.run(0f, () -> { throw new RuntimeException(e); }); } diff --git a/server/src/io/anuke/mindustry/server/CrashHandler.java b/server/src/io/anuke/mindustry/server/CrashHandler.java index e3b7f33fd0..eb55f17ec7 100644 --- a/server/src/io/anuke/mindustry/server/CrashHandler.java +++ b/server/src/io/anuke/mindustry/server/CrashHandler.java @@ -6,9 +6,9 @@ import com.badlogic.gdx.utils.JsonWriter.OutputType; import io.anuke.mindustry.Vars; import io.anuke.mindustry.game.Version; import io.anuke.mindustry.net.Net; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.OS; +import io.anuke.arc.core.Settings; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.OS; import java.io.PrintWriter; import java.io.StringWriter; @@ -29,7 +29,7 @@ public class CrashHandler{ //if getting the crash report property failed, OR if it set to false... don't send it try{ - if(!Settings.getBool("crashreport")) return; + if(!Core.settings.getBool("crashreport")) return; }catch(Throwable ignored){ return; } diff --git a/server/src/io/anuke/mindustry/server/MindustryServer.java b/server/src/io/anuke/mindustry/server/MindustryServer.java index 8d7297cae9..ab6c4ad21a 100644 --- a/server/src/io/anuke/mindustry/server/MindustryServer.java +++ b/server/src/io/anuke/mindustry/server/MindustryServer.java @@ -6,7 +6,7 @@ import io.anuke.mindustry.core.NetServer; import io.anuke.mindustry.core.World; import io.anuke.mindustry.game.Content; import io.anuke.mindustry.io.BundleLoader; -import io.anuke.ucore.modules.ModuleCore; +import io.anuke.arc.modules.ModuleCore; import static io.anuke.mindustry.Vars.*; diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index 22c1ab47f1..1d43381736 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -23,14 +23,14 @@ import io.anuke.mindustry.net.Packets.KickReason; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemType; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.*; -import io.anuke.ucore.modules.Module; -import io.anuke.ucore.util.CommandHandler; -import io.anuke.ucore.util.CommandHandler.Command; -import io.anuke.ucore.util.CommandHandler.Response; -import io.anuke.ucore.util.CommandHandler.ResponseType; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.Strings; +import io.anuke.arc.core.*; +import io.anuke.arc.modules.Module; +import io.anuke.arc.util.CommandHandler; +import io.anuke.arc.util.CommandHandler.Command; +import io.anuke.arc.util.CommandHandler.Response; +import io.anuke.arc.util.CommandHandler.ResponseType; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.Strings; import java.io.IOException; import java.time.LocalDateTime; @@ -38,7 +38,7 @@ import java.time.format.DateTimeFormatter; import java.util.Scanner; import static io.anuke.mindustry.Vars.*; -import static io.anuke.ucore.util.Log.*; +import static io.anuke.arc.util.Log.*; public class ServerControl extends Module{ private static final int roundExtraTime = 12; @@ -55,7 +55,7 @@ public class ServerControl extends Module{ public ServerControl(String[] args){ - Settings.defaultList( + Core.settings.defaultList( "shufflemode", "normal", "bans", "", "admins", "", @@ -90,13 +90,13 @@ public class ServerControl extends Module{ String result = "[" + dateTime.format(LocalDateTime.now()) + "] " + format(text + "&fr", args); System.out.println(result); - if(Settings.getBool("logging")){ + if(Core.settings.getBool("logging")){ logToFile("[" + dateTime.format(LocalDateTime.now()) + "] " + format(text + "&fr", false, args)); } } }); - Timers.setDeltaProvider(() -> Gdx.graphics.getDeltaTime() * 60f); + Time.setDeltaProvider(() -> Gdx.graphics.getDeltaTime() * 60f); Effects.setScreenShakeProvider((a, b) -> {}); Effects.setEffectProvider((a, b, c, d, e, f) -> {}); Sounds.setHeadless(true); @@ -136,8 +136,8 @@ public class ServerControl extends Module{ world.sectors.save(); gameOvers = 0; inExtraRound = true; - Settings.putInt("sector_x", world.getSector().x + 1); - Settings.save(); + Core.settings.putInt("sector_x", world.getSector().x + 1); + Core.settings.save(); Call.onInfoMessage("[accent]Sector conquered![]\n" + roundExtraTime + " seconds until deployment in next sector."); @@ -148,7 +148,7 @@ public class ServerControl extends Module{ if(inExtraRound) return; info("Game over!"); - if(Settings.getBool("shuffle")){ + if(Core.settings.getBool("shuffle")){ if(world.getSector() == null){ if(world.maps.all().size > 0){ Array maps = world.maps.customMaps().size == 0 ? world.maps.defaultMaps() : world.maps.customMaps(); @@ -174,13 +174,13 @@ public class ServerControl extends Module{ }else{ Call.onInfoMessage("[SCARLET]Sector has been lost.[]\nRe-deploying in " + roundExtraTime + " seconds."); if(gameOvers >= 2){ - Settings.putInt("sector_y", Settings.getInt("sector_y") < 0 ? Settings.getInt("sector_y") + 1 : Settings.getInt("sector_y") - 1); - Settings.save(); + Core.settings.putInt("sector_y", Core.settings.getInt("sector_y") < 0 ? Core.settings.getInt("sector_y") + 1 : Core.settings.getInt("sector_y") - 1); + Core.settings.save(); gameOvers = 0; } gameOvers ++; playSectorMap(); - info("Re-trying sector map: {0} {1}", Settings.getInt("sector_x"), Settings.getInt("sector_y")); + info("Re-trying sector map: {0} {1}", Core.settings.getInt("sector_x"), Core.settings.getInt("sector_y")); } }else{ netServer.kickAll(KickReason.gameover); @@ -261,7 +261,7 @@ public class ServerControl extends Module{ logic.play(); }else{ - info("&fiNo map specified. Loading sector {0}, {1}.", Settings.getInt("sector_x"), Settings.getInt("sector_y")); + info("&fiNo map specified. Loading sector {0}, {1}.", Core.settings.getInt("sector_x"), Core.settings.getInt("sector_y")); playSectorMap(false); } @@ -272,7 +272,7 @@ public class ServerControl extends Module{ handler.register("port", "[port]", "Sets or displays the port for hosting the server.", arg -> { if(arg.length == 0){ - info("&lyPort: &lc{0}", Settings.getInt("port")); + info("&lyPort: &lc{0}", Core.settings.getInt("port")); }else{ int port = Strings.parseInt(arg[0]); if(port < 0 || port > 65535){ @@ -280,8 +280,8 @@ public class ServerControl extends Module{ return; } info("&lyPort set to {0}.", port); - Settings.putInt("port", port); - Settings.save(); + Core.settings.putInt("port", port); + Core.settings.save(); } }); @@ -305,7 +305,7 @@ public class ServerControl extends Module{ info("&ly {0} seconds until next wave.", (int) (state.wavetime / 60)); } - info(" &ly{0} FPS.", (int) (60f / Timers.delta())); + info(" &ly{0} FPS.", (int) (60f / Time.delta())); info(" &ly{0} MB used.", Gdx.app.getJavaHeap() / 1024 / 1024); if(playerGroup.size() > 0){ @@ -341,9 +341,9 @@ public class ServerControl extends Module{ handler.register("setsector", " ", "Sets the next sector to be played. Does not affect current game.", arg -> { try{ - Settings.putInt("sector_x", Integer.parseInt(arg[0])); - Settings.putInt("sector_y", Integer.parseInt(arg[1])); - Settings.save(); + Core.settings.putInt("sector_x", Integer.parseInt(arg[0])); + Core.settings.putInt("sector_y", Integer.parseInt(arg[1])); + Core.settings.save(); info("Sector position set."); }catch(NumberFormatException e){ err("Invalid coordinates."); @@ -378,15 +378,15 @@ public class ServerControl extends Module{ handler.register("crashreport", "", "Disables or enables automatic crash reporting", arg -> { boolean value = arg[0].equalsIgnoreCase("on"); - Settings.putBool("crashreport", value); - Settings.save(); + Core.settings.putBool("crashreport", value); + Core.settings.save(); info("Crash reporting is now {0}.", value ? "on" : "off"); }); handler.register("logging", "", "Disables or enables server logs", arg -> { boolean value = arg[0].equalsIgnoreCase("on"); - Settings.putBool("logging", value); - Settings.save(); + Core.settings.putBool("logging", value); + Core.settings.save(); info("Logging is now {0}.", value ? "on" : "off"); }); @@ -419,8 +419,8 @@ public class ServerControl extends Module{ err("Invalid shuffle mode."); return; } - Settings.putBool("shuffle", arg[0].equals("on")); - Settings.save(); + Core.settings.putBool("shuffle", arg[0].equals("on")); + Core.settings.save(); info("Shuffle mode set to '{0}'.", arg[0]); }); @@ -712,7 +712,7 @@ public class ServerControl extends Module{ } private void playSectorMap(boolean wait){ - int x = Settings.getInt("sector_x"), y = Settings.getInt("sector_y"); + int x = Core.settings.getInt("sector_x"), y = Core.settings.getInt("sector_y"); if(world.sectors.get(x, y) == null){ world.sectors.createSector(x, y); } @@ -758,8 +758,8 @@ public class ServerControl extends Module{ private void host(){ try{ - Net.host(Settings.getInt("port")); - info("&lcOpened a server on port {0}.", Settings.getInt("port")); + Net.host(Core.settings.getInt("port")); + info("&lcOpened a server on port {0}.", Core.settings.getInt("port")); }catch(IOException e){ err(e); state.set(State.menu); diff --git a/server/src/io/anuke/mindustry/server/ServerLauncher.java b/server/src/io/anuke/mindustry/server/ServerLauncher.java index fb7fd882dc..9a45d607cf 100644 --- a/server/src/io/anuke/mindustry/server/ServerLauncher.java +++ b/server/src/io/anuke/mindustry/server/ServerLauncher.java @@ -7,8 +7,8 @@ import com.badlogic.gdx.backends.headless.HeadlessApplicationConfiguration; import io.anuke.kryonet.KryoClient; import io.anuke.kryonet.KryoServer; import io.anuke.mindustry.net.Net; -import io.anuke.ucore.core.Settings; -import io.anuke.ucore.util.EmptyLogger; +import io.anuke.arc.core.Settings; +import io.anuke.arc.util.EmptyLogger; public class ServerLauncher extends HeadlessApplication{ @@ -26,7 +26,7 @@ public class ServerLauncher extends HeadlessApplication{ Net.setServerProvider(new KryoServer()); HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration(); - Settings.setPrefHandler((appName) -> Gdx.files.local("config")); + Core.settings.setPrefHandler((appName) -> Gdx.files.local("config")); new ServerLauncher(new MindustryServer(args), config); }catch(Throwable t){ diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java index b690f63880..ef5229000c 100644 --- a/tests/src/test/java/ApplicationTests.java +++ b/tests/src/test/java/ApplicationTests.java @@ -24,10 +24,10 @@ import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Edges; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.modules.ModuleCore; -import io.anuke.ucore.util.EmptyLogger; -import io.anuke.ucore.util.Log; +import io.anuke.arc.core.Timers; +import io.anuke.arc.modules.ModuleCore; +import io.anuke.arc.util.EmptyLogger; +import io.anuke.arc.util.Log; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -98,7 +98,7 @@ public class ApplicationTests{ @BeforeEach void resetWorld(){ - Timers.setDeltaProvider(() -> 1f); + Time.setDeltaProvider(() -> 1f); logic.reset(); state.set(State.menu); } @@ -179,11 +179,11 @@ public class ApplicationTests{ @Test void timers(){ boolean[] ran = {false}; - Timers.run(1.9999f, () -> ran[0] = true); + Time.run(1.9999f, () -> ran[0] = true); - Timers.update(); + Time.update(); assertFalse(ran[0]); - Timers.update(); + Time.update(); assertTrue(ran[0]); } @@ -243,7 +243,7 @@ public class ApplicationTests{ d1.addBuildRequest(new BuildRequest(0, 0, 0, Recipe.getByResult(DefenseBlocks.copperWallLarge))); d2.addBuildRequest(new BuildRequest(1, 1, 0, Recipe.getByResult(DefenseBlocks.copperWallLarge))); - Timers.setDeltaProvider(() -> 9999999f); + Time.setDeltaProvider(() -> 9999999f); d1.updateBuilding(d1); d2.updateBuilding(d2); @@ -265,14 +265,14 @@ public class ApplicationTests{ d1.addBuildRequest(new BuildRequest(0, 0, 0, Recipe.getByResult(DefenseBlocks.copperWallLarge))); d2.addBuildRequest(new BuildRequest(1, 1)); - Timers.setDeltaProvider(() -> 3f); + Time.setDeltaProvider(() -> 3f); d1.updateBuilding(d1); - Timers.setDeltaProvider(() -> 1f); + Time.setDeltaProvider(() -> 1f); d2.updateBuilding(d2); assertEquals(content.getByName(ContentType.block, "build2"), world.tile(0, 0).block()); - Timers.setDeltaProvider(() -> 9999f); + Time.setDeltaProvider(() -> 9999f); d1.updateBuilding(d1); d2.updateBuilding(d2); diff --git a/tools/src/io/anuke/mindustry/BundleLauncher.java b/tools/src/io/anuke/mindustry/BundleLauncher.java index 47dd648088..b60b46eda0 100644 --- a/tools/src/io/anuke/mindustry/BundleLauncher.java +++ b/tools/src/io/anuke/mindustry/BundleLauncher.java @@ -3,8 +3,8 @@ package io.anuke.mindustry; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.OrderedMap; import com.badlogic.gdx.utils.PropertiesUtils; -import io.anuke.ucore.function.BiFunction; -import io.anuke.ucore.util.Log; +import io.anuke.arc.function.BiFunction; +import io.anuke.arc.util.Log; import java.io.File; import java.io.FileInputStream; diff --git a/tools/src/io/anuke/mindustry/Generators.java b/tools/src/io/anuke/mindustry/Generators.java index e4d0bf7b10..6af829e9b1 100644 --- a/tools/src/io/anuke/mindustry/Generators.java +++ b/tools/src/io/anuke/mindustry/Generators.java @@ -10,8 +10,8 @@ import io.anuke.mindustry.type.Mech; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.Floor; import io.anuke.mindustry.world.blocks.OreBlock; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Hue; +import io.anuke.arc.graphics.Draw; +import io.anuke.arc.graphics.Hue; import static io.anuke.mindustry.Vars.*; public class Generators { diff --git a/tools/src/io/anuke/mindustry/Image.java b/tools/src/io/anuke/mindustry/Image.java index 7a5f19d311..69c0c6be6b 100644 --- a/tools/src/io/anuke/mindustry/Image.java +++ b/tools/src/io/anuke/mindustry/Image.java @@ -2,7 +2,7 @@ package io.anuke.mindustry; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.TextureRegion; -import io.anuke.ucore.util.Structs; +import io.anuke.arc.util.Structs; import javax.imageio.ImageIO; import java.awt.*; diff --git a/tools/src/io/anuke/mindustry/ImageContext.java b/tools/src/io/anuke/mindustry/ImageContext.java index c05fc30df4..c8b5d832d5 100644 --- a/tools/src/io/anuke/mindustry/ImageContext.java +++ b/tools/src/io/anuke/mindustry/ImageContext.java @@ -6,12 +6,12 @@ import com.badlogic.gdx.graphics.g2d.TextureAtlas.TextureAtlasData.Region; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.utils.ObjectMap; import io.anuke.mindustry.core.ContentLoader; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Atlas; -import io.anuke.ucore.util.Log; -import io.anuke.ucore.util.Log.LogHandler; -import io.anuke.ucore.util.Log.NoopLogHandler; +import io.anuke.arc.core.Core; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Atlas; +import io.anuke.arc.util.Log; +import io.anuke.arc.util.Log.LogHandler; +import io.anuke.arc.util.Log.NoopLogHandler; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; @@ -89,9 +89,9 @@ public class ImageContext { } public void generate(String name, Runnable run){ - Timers.mark(); + Time.mark(); run.run(); - Log.info("&ly[Generator]&lc Time to generate &lm{0}&lc: &lg{1}&lcms", name, Timers.elapsed()); + Log.info("&ly[Generator]&lc Time to generate &lm{0}&lc: &lg{1}&lcms", name, Time.elapsed()); } public Image create(int width, int height){ diff --git a/tools/src/io/anuke/mindustry/PackerLauncher.java b/tools/src/io/anuke/mindustry/PackerLauncher.java index 7aaf89ddf6..df2e3f4f8e 100644 --- a/tools/src/io/anuke/mindustry/PackerLauncher.java +++ b/tools/src/io/anuke/mindustry/PackerLauncher.java @@ -1,7 +1,7 @@ package io.anuke.mindustry; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Log; +import io.anuke.arc.core.Timers; +import io.anuke.arc.util.Log; import java.io.IOException; @@ -11,9 +11,9 @@ public class PackerLauncher { Vars.headless = true; ImageContext context = new ImageContext(); context.load(); - Timers.mark(); + Time.mark(); Generators.generate(context); - Log.info("&ly[Generator]&lc Total time to generate: &lg{0}&lcms", Timers.elapsed()); + Log.info("&ly[Generator]&lc Total time to generate: &lg{0}&lcms", Time.elapsed()); Log.info("&ly[Generator]&lc Total images created: &lg{0}", Image.total()); Image.dispose(); }