From 64ccdab90c886ee8d7ae95172a56bdb9b654c9cc Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 17 Oct 2018 13:41:25 -0400 Subject: [PATCH] Removed extra trace info (for now) --- .../anuke/mindustry/ui/dialogs/SectorsDialog.java | 15 +++------------ .../anuke/mindustry/ui/dialogs/TraceDialog.java | 6 ++++-- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java index 8f528121e3..b320b76a16 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java @@ -9,7 +9,6 @@ import io.anuke.ucore.core.Graphics; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.scene.Element; -import io.anuke.ucore.scene.event.ClickListener; import io.anuke.ucore.scene.event.InputEvent; import io.anuke.ucore.scene.event.InputListener; import io.anuke.ucore.scene.ui.layout.Unit; @@ -18,7 +17,8 @@ import io.anuke.ucore.scene.utils.ScissorStack; import io.anuke.ucore.util.Bundles; import io.anuke.ucore.util.Mathf; -import static io.anuke.mindustry.Vars.*; +import static io.anuke.mindustry.Vars.ui; +import static io.anuke.mindustry.Vars.world; public class SectorsDialog extends FloatingDialog{ private Rectangle clip = new Rectangle(); @@ -59,10 +59,6 @@ public class SectorsDialog extends FloatingDialog{ ui.loadLogic(() -> world.sectors.playSector(selected)); }).disabled(b -> selected == null) .fillX().height(64f).colspan(2).update(t -> t.setText(selected != null && selected.hasSave() ? "$text.sector.resume" : "$text.sector.deploy")); - - - - } void selectSector(Sector sector){ @@ -108,12 +104,7 @@ public class SectorsDialog extends FloatingDialog{ } }); - addListener(new ClickListener(){ - @Override - public void clicked(InputEvent event, float x, float y){ - clicked = true; - } - }); + clicked(() -> clicked = true); } @Override diff --git a/core/src/io/anuke/mindustry/ui/dialogs/TraceDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/TraceDialog.java index 39eece4f47..2cb70b4346 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/TraceDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/TraceDialog.java @@ -16,7 +16,7 @@ public class TraceDialog extends FloatingDialog{ public void show(Player player, TraceInfo info){ content().clear(); - Table table = new Table("button"); + Table table = new Table("clear"); table.margin(14); table.defaults().pad(1); @@ -35,6 +35,8 @@ public class TraceDialog extends FloatingDialog{ table.add().pad(5); table.row(); + //disabled until further notice +/* table.add(Bundles.format("text.trace.totalblocksbroken", info.totalBlocksBroken)); table.row(); table.add(Bundles.format("text.trace.structureblocksbroken", info.structureBlocksBroken)); @@ -48,7 +50,7 @@ public class TraceDialog extends FloatingDialog{ table.add(Bundles.format("text.trace.totalblocksplaced", info.totalBlocksPlaced)); table.row(); table.add(Bundles.format("text.trace.lastblockplaced", info.lastBlockPlaced.formalName)); - table.row(); + table.row();*/ content().add(table);