From 0bc93735c0e59e7bca8bc94b1e1e21985e304ff2 Mon Sep 17 00:00:00 2001
From: sharlottes <seeseafood@naver.com>
Date: Sun, 24 Apr 2022 15:48:41 +0900
Subject: [PATCH] code cleanup with refactoring

---
 src/unitinfo/core/Main.java                  |  3 +-
 src/unitinfo/ui/display/WaveInfoDisplay.java | 33 +++++++++++++++++---
 src/unitinfo/ui/windows/Windows.java         | 10 ------
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/unitinfo/core/Main.java b/src/unitinfo/core/Main.java
index f31e9cb..e8d760e 100644
--- a/src/unitinfo/core/Main.java
+++ b/src/unitinfo/core/Main.java
@@ -36,11 +36,12 @@ public class Main extends Mod {
             for (Window window : windows) {
                 if(window instanceof Updatable u) u.update();
             }
+
             if((input.keyDown(KeyCode.shiftRight) || input.keyDown(KeyCode.shiftLeft))) {
                 if(input.keyTap(KeyCode.r)) {
                     if(target==getTarget()) locked = !locked;
                     target = getTarget();
-                };
+                }
             }
         });
 
diff --git a/src/unitinfo/ui/display/WaveInfoDisplay.java b/src/unitinfo/ui/display/WaveInfoDisplay.java
index d75a15d..41294b1 100644
--- a/src/unitinfo/ui/display/WaveInfoDisplay.java
+++ b/src/unitinfo/ui/display/WaveInfoDisplay.java
@@ -5,6 +5,9 @@ import arc.util.*;
 import mindustry.gen.*;
 import mindustry.graphics.Pal;
 import mindustry.ui.*;
+import mindustry.world.Block;
+import mindustry.world.Tile;
+import mindustry.world.blocks.environment.Floor;
 
 import static unitinfo.SUtils.*;
 import static unitinfo.SVars.*;
@@ -20,11 +23,33 @@ public class WaveInfoDisplay {
             table.table(head -> {
                 head.table(image -> {
                     image.left();
-                    image.image(() -> getTile() == null || getTile().floor().uiIcon == error ? clear : getTile().floor().uiIcon).size(iconSmall);
-                    image.image(() -> getTile() == null || getTile().overlay().uiIcon == error ? clear : getTile().overlay().uiIcon).size(iconSmall);
-                    image.image(() -> getTile() == null || getTile().block().uiIcon == error ? clear : getTile().block().uiIcon).size(iconSmall);
+                    image.image(() -> {
+                        Tile tile = getTile();
+                        if(tile == null) return clear;
+                        Floor floor = tile.floor();
+                        if(floor.uiIcon == error) return clear;
+                        return floor.uiIcon;
+                    }).size(iconSmall);
+                    image.image(() -> {
+                        Tile tile = getTile();
+                        if(tile == null) return clear;
+                        Floor floor = tile.overlay();
+                        if(floor.uiIcon == error) return clear;
+                        return floor.uiIcon;
+                    }).size(iconSmall);
+                    image.image(() -> {
+                        Tile tile = getTile();
+                        if(tile == null) return clear;
+                        Block floor = tile.block();
+                        if(floor.uiIcon == error) return clear;
+                        return floor.uiIcon;
+                    }).size(iconSmall);
                 });
-                head.label(() -> Strings.format("(@, @)", getTile() == null ? "NaN" : getTile().x, getTile() == null ? "NaN" : getTile().y)).center();
+                head.label(() -> {
+                    Tile tile = getTile();
+                    if(tile == null) return "(NaN, NaN)";
+                    return Strings.format("(@, @)", tile.x, tile.y);
+                }).center();
             });
             table.row();
             table.image().height(4f).color(Pal.gray).growX().row();
diff --git a/src/unitinfo/ui/windows/Windows.java b/src/unitinfo/ui/windows/Windows.java
index 7d58029..95f4630 100644
--- a/src/unitinfo/ui/windows/Windows.java
+++ b/src/unitinfo/ui/windows/Windows.java
@@ -1,8 +1,5 @@
 package unitinfo.ui.windows;
 
-import arc.util.*;
-import mindustry.gen.*;
-
 public class Windows {
     public static MapEditorWindow editorTable;
 
@@ -13,12 +10,5 @@ public class Windows {
         new PlayerWindow();
         new ToolWindow();
         editorTable = new MapEditorWindow();
-        new Window(Icon.box, "test-window", t -> {
-            t.labelWrap(() -> t.parent.x + ", " + t.parent.y).top().right().growX();
-            t.row();
-            t.labelWrap(() -> t.parent.getWidth() + ", " + t.parent.getHeight()).top().right().growX();
-            t.row();
-            t.labelWrap(() -> "T: " + Time.time).top().right().growX();
-        });
     }
 }