refactoring

assets/bundles/bundle.properties

@@ -72,24 +72,22 @@ setting.elementdebug.description = Show all Element outline
 setting.hiddenElem.name = Display hidden element
 setting.hiddenElem.description = display hidden element outline too.
 
-setting.shar-title = UnitInfo Settings
+setting.shar-title = unitinfo Settings
 setting.shar-ui = Overlay UI Settings
 setting.shar-draw = Overdrawing Settings
 
 #Hud
 hud.schematic-list = Schematic List
-hud.unit = Unit Info
+
-hud.wave = Wave Info
+#Window
-hud.item = Resource Info
+window.unit.name = Unit Display
-hud.cancel = Hidden
+window.wave.name = Wave Display
-hud.enabled = [accent]Enabled[]
+window.core.name = Core Display
-hud.disabled = [gray]Disabled[]
+window.player.name = Player Display
-hud.pathline = Path Line
+window.tool.name = Tool Display
-hud.unitline = Unit Line
+window.editor.name = Map Editor Display
-hud.logicline = Logic Line
 
 #Other
-sec =  sec
 default-bar = default bar
 th-bar = th bar
 empty = [lightgray]<Empty>[]

assets/bundles/bundle_ko.properties

@@ -89,7 +89,7 @@ setting.hiddenElem.description = 숨겨진 요소의 외곽선도 표시합니
 setting.autoShooting.name = 자동 사격 활성화
 setting.autoShooting.description =
 
-setting.shar-title = UnitInfo 설정
+setting.shar-title = unitinfo 설정
 setting.shar-ui = 정보UI 설정
 setting.shar-range = 자동 사거리 설정
 setting.shar-opacity = 투명도 설정

assets/bundles/bundle_ru.properties

@@ -77,7 +77,7 @@ setting.distanceLine.description = display dotted lines and numbers how far away
 setting.autoShooting.name = Включить автострельбу.
 setting.autoShooting.description = [red]не читери, не будь какахой
 
-setting.shar-title = Настройки UnitInfo
+setting.shar-title = Настройки unitinfo
 setting.shar-wave = InfoTap Setting
 setting.shar-range = AutoRange Setting
 setting.shar-opacity = Opacity Setting

assets/bundles/bundle_tr.properties

@@ -83,7 +83,7 @@ setting.spawnerarrow.description =
 setting.autoShooting.name = Enable Auto Shooting
 setting.autoShooting.description = no don't do hack
 
-setting.shar-title = UnitInfo Ayarları
+setting.shar-title = unitinfo Ayarları
 setting.shar-ui = Arayüz Ayarları
 setting.shar-range = Oto-Uzaklık Ayarları
 setting.shar-opacity = Opaklık Ayarları

assets/bundles/bundle_uk_UA.properties

@@ -86,7 +86,7 @@ setting.spawnerarrow.description = Показує стрілку, направл
 setting.autoShooting.name = Увімкнути автострільбу
 setting.autoShooting.description = Не треба, ти ж не гакер.
 
-setting.shar-title = Налаштування UnitInfo
+setting.shar-title = Налаштування unitinfo
 setting.shar-ui = Налаштування накладання інтерфейсу
 setting.shar-range = Налаштування автоматичного діапазону
 setting.shar-opacity = Налаштування прозорості

assets/mod.json

@@ -4,7 +4,7 @@
   "author": "Sharlotte",
   "description": "The mod displays more information in-game, such as unit/building, wave, core, tile, item/unit total info etc",
   "version": "1.5.5",
-  "main": "UnitInfo.core.Main",
+  "main": "unitinfo.core.Main",
   "minGameVersion": "135",
   "dependencies": [],
   "hidden": true,

gradle.properties

@@ -1,5 +1,5 @@
 # Filename of output file (dexify prepends 'dexed-') (people will hate you if it isn't .jar)
-pArtifactFilename = UnitInfo.jar
+pArtifactFilename = unitinfo.jar
 # Group of project (should line up with dirs in src/)
 pGroup = sharlotte
 # Version of Mindustry to use (if not working, consult jitpack.io)

src/UnitInfo/ui/HUDFragment.java

@@ -1,41 +0,0 @@
-package UnitInfo.ui;
-
-import arc.scene.*;
-import mindustry.ui.fragments.*;
-
-import static UnitInfo.ui.windows.WindowTables.*;
-
-public class HUDFragment extends Fragment{
-    @Override
-    public void build(Group parent){
-        parent.fill(t -> {
-            t.name = "Windows";
-            t.visible(() -> parent.visible);
-
-            t.center().left();
-            // sidebar
-            t.add(new TaskbarTable(
-                    unitTable,
-                    waveTable,
-                    coreTable,
-                    playerTable,
-                    toolTable,
-                    editorTable
-            )).visible(TaskbarTable.visibility);
-
-            // windows (totally not a copyright violation)
-            t.add(unitTable).size(250f).visible(false);
-            t.add(waveTable).size(250f).visible(false);
-            t.add(coreTable).size(250f).visible(false);
-            t.add(playerTable).size(250f).visible(false);
-            t.add(toolTable).size(250f).visible(false);
-            t.add(editorTable).size(250f).visible(false);
-
-            t.update(()->{
-                for (Element child : t.getChildren()) {
-                    if(child instanceof Updatable u) u.update();
-                }
-            });
-        });
-    };
-}

src/UnitInfo/ui/MindowsTex.java

@@ -1,12 +0,0 @@
-package UnitInfo.ui;
-
-import arc.*;
-import arc.scene.style.*;
-
-public class MindowsTex{
-    public static Drawable sidebar;
-
-    public static void init(){
-        sidebar = Core.atlas.drawable("unitinfo-sidebar");
-    }
-}

src/UnitInfo/ui/TaskbarTable.java

@@ -1,24 +0,0 @@
-package UnitInfo.ui;
-
-import UnitInfo.ui.windows.WindowTable;
-import arc.func.*;
-import arc.scene.ui.layout.*;
-import mindustry.*;
-import mindustry.ui.*;
-
-public class TaskbarTable extends Table{
-    public static Boolp visibility = () -> Vars.ui.hudfrag.shown && !Vars.ui.minimapfrag.shown();
-
-    public TaskbarTable(WindowTable... items){
-        visible = true;
-        table(MindowsTex.sidebar, t -> {
-            t.top().center();
-            for(WindowTable w : items){
-                t.button(w.icon, Styles.emptyi, () -> {
-                    w.visible(visibility);
-                }).disabled(b -> w.visible).size(40f).padRight(5f);
-                t.row();
-            }
-        }).left().center().width(40f);
-    }
-}

src/UnitInfo/ui/windows/WindowTables.java

@@ -1,16 +0,0 @@
-package UnitInfo.ui.windows;
-
-public class WindowTables {
-    public static WindowTable
-            unitTable, waveTable, coreTable, playerTable, toolTable;
-    public static MapEditorDisplay editorTable;
-
-    public static void init() {
-        unitTable = new UnitDisplay();
-        waveTable = new WaveDisplay();
-        coreTable = new CoreDisplay();
-        playerTable = new PlayerDisplay();
-        toolTable = new ToolDisplay();
-        editorTable = new MapEditorDisplay();
-    }
-}

src/unitinfo/SUtils.java

@@ -1,4 +1,4 @@
-package UnitInfo;
+package unitinfo;
 
 import arc.graphics.g2d.*;
 import arc.math.Mathf;
@@ -21,8 +21,8 @@ import mindustry.world.Tile;
 
 import java.lang.reflect.*;
 
-import static UnitInfo.SVars.locked;
+import static unitinfo.SVars.locked;
-import static UnitInfo.SVars.target;
+import static unitinfo.SVars.target;
 import static arc.Core.input;
 import static arc.Core.settings;
 import static mindustry.Vars.player;

src/unitinfo/SVars.java

@@ -1,13 +1,12 @@
-package UnitInfo;
+package unitinfo;
 
-import UnitInfo.core.*;
+import unitinfo.core.*;
-import UnitInfo.shaders.LineShader;
+import unitinfo.shaders.LineShader;
-import UnitInfo.shaders.RangeShader;
+import unitinfo.shaders.RangeShader;
 import arc.graphics.g2d.TextureRegion;
 import mindustry.gen.Teamc;
 
 import static arc.Core.atlas;
-import static arc.Core.settings;
 
 public class SVars {
     public static HudUi hud = new HudUi();

src/unitinfo/core/BarInfo.java

@@ -1,4 +1,4 @@
-package UnitInfo.core;
+package unitinfo.core;
 
 import arc.graphics.*;
 import arc.math.*;
@@ -25,7 +25,7 @@ import mindustry.world.consumers.*;
 
 import java.lang.reflect.*;
 
-import static UnitInfo.SUtils.floatFormat;
+import static unitinfo.SUtils.floatFormat;
 import static arc.Core.*;
 import static mindustry.Vars.*;
 

src/unitinfo/core/ContentJSON.java

@@ -1,4 +1,4 @@
-package UnitInfo.core;
+package unitinfo.core;
 
 import arc.Core;
 import arc.struct.Seq;
@@ -98,7 +98,7 @@ public class ContentJSON {
                 data.add(name, obj);
             });
             try {
-                modDirectory.child("UnitInfo").child(content.peek().getContentType().toString() + ".json").writeString(data.toString(Stringify.FORMATTED));
+                modDirectory.child("unitinfo").child(content.peek().getContentType().toString() + ".json").writeString(data.toString(Stringify.FORMATTED));
             } catch (Throwable e){
                 Log.warn(e.getMessage());
             }

src/unitinfo/core/HudUi.java

@@ -1,11 +1,8 @@
-package UnitInfo.core;
+package unitinfo.core;
 
-import UnitInfo.ui.windows.*;
+import unitinfo.ui.SchemDisplay;
 
 import arc.*;
-import arc.graphics.*;
-import arc.math.*;
-import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
 
@@ -14,8 +11,8 @@ import mindustry.gen.*;
 import mindustry.graphics.Pal;
 import mindustry.ui.*;
 
-import static UnitInfo.SUtils.*;
+import static unitinfo.SUtils.*;
-import static UnitInfo.SVars.*;
+import static unitinfo.SVars.*;
 import static arc.Core.*;
 import static mindustry.Vars.*;
 

src/unitinfo/core/Main.java

@@ -1,19 +1,20 @@
-package UnitInfo.core;
+package unitinfo.core;
 
-import UnitInfo.shaders.*;
+import unitinfo.shaders.*;
-import UnitInfo.ui.*;
+import unitinfo.ui.*;
-import UnitInfo.ui.draws.OverDraws;
+import unitinfo.ui.draws.OverDraws;
-import UnitInfo.ui.windows.*;
+import unitinfo.ui.windows.*;
 import arc.*;
 import arc.struct.*;
 import mindustry.*;
 import mindustry.game.EventType.*;
 import mindustry.mod.*;
 
-import static UnitInfo.SVars.*;
+import static unitinfo.SVars.*;
 import static arc.Core.*;
 import static mindustry.Vars.*;
-import static UnitInfo.SUtils.*;
+import static unitinfo.SUtils.*;
+import static unitinfo.ui.windows.WindowManager.windows;
 
 public class Main extends Mod {
     @Override
@@ -36,13 +37,23 @@ public class Main extends Mod {
             }
         });
 
+        Events.run(Trigger.update, () -> {
+            for (Window window : windows) {
+                if(window instanceof Updatable u) u.update();
+            }
+        });
+
+        Events.on(ContentInitEvent.class, e -> {
+            Windows.load();
+        });
+
         Events.on(ClientLoadEvent.class, e -> {
+            Windows.load();
             SettingS.init();
-            MindowsTex.init();
+            WindowManager.init();
-            WindowTables.init();
             OverDraws.init();
 
-            new HUDFragment().build(Vars.ui.hudGroup);
+            //new HUDFragment().build(Vars.ui.hudGroup);
             hud = new HudUi();
             hud.addWaveInfoTable();
             hud.addSchemTable();
@@ -58,9 +69,5 @@ public class Main extends Mod {
 
             if(jsonGen) ContentJSON.save();
         });
-
-        Events.on(WorldLoadEvent.class, e -> {
-            ((CoreDisplay) WindowTables.coreTable).resetUsed();
-        });
     }
 }

src/unitinfo/core/OverDrawer.java

@@ -1,7 +1,7 @@
-package UnitInfo.core;
+package unitinfo.core;
 
-import UnitInfo.ui.draws.OverDraw;
+import unitinfo.ui.draws.OverDraw;
-import UnitInfo.ui.draws.OverDraws;
+import unitinfo.ui.draws.OverDraws;
 import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
@@ -13,7 +13,7 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.ui.*;
 
-import static UnitInfo.SVars.*;
+import static unitinfo.SVars.*;
 import static arc.Core.*;
 import static mindustry.Vars.*;
 

src/unitinfo/core/SettingS.java

@@ -1,4 +1,4 @@
-package UnitInfo.core;
+package unitinfo.core;
 
 import arc.*;
 import arc.func.*;

src/unitinfo/core/SharSetting.java

@@ -1,4 +1,4 @@
-package UnitInfo.core;
+package unitinfo.core;
 
 import arc.Core;
 import arc.scene.ui.layout.Table;

src/unitinfo/shaders/LineShader.java

@@ -1,4 +1,4 @@
-package UnitInfo.shaders;
+package unitinfo.shaders;
 
 import arc.Core;
 import arc.graphics.gl.Shader;

src/unitinfo/shaders/RangeShader.java

@@ -1,4 +1,4 @@
-package UnitInfo.shaders;
+package unitinfo.shaders;
 
 import arc.Core;
 import arc.graphics.gl.Shader;

src/unitinfo/ui/EditorTool.java

@@ -1,6 +1,5 @@
-package UnitInfo.ui;
+package unitinfo.ui;
 
-import UnitInfo.ui.windows.WindowTables;
 import arc.func.Boolf;
 import arc.func.Cons;
 import arc.input.KeyCode;
@@ -14,9 +13,9 @@ import mindustry.game.Team;
 import mindustry.world.Block;
 import mindustry.world.Tile;
 
-import static UnitInfo.ui.windows.MapEditorDisplay.drawTeam;
+import static unitinfo.ui.windows.MapEditorDisplay.drawTeam;
-import static UnitInfo.ui.windows.MapEditorDisplay.selected;
+import static unitinfo.ui.windows.MapEditorDisplay.selected;
-import static UnitInfo.ui.windows.WindowTables.editorTable;
+import static unitinfo.ui.windows.Windows.editorTable;
 import static mindustry.Vars.world;
 
 public enum EditorTool{

src/unitinfo/ui/ElementDisplay.java

@@ -1,4 +1,4 @@
-package UnitInfo.ui;
+package unitinfo.ui;
 
 import arc.graphics.g2d.Draw;
 import arc.graphics.g2d.Lines;

src/unitinfo/ui/FreeBar.java

@@ -1,4 +1,4 @@
-package UnitInfo.ui;
+package unitinfo.ui;
 
 import arc.graphics.g2d.*;
 import arc.math.*;

src/unitinfo/ui/OverScrollPane.java

@@ -1,4 +1,4 @@
-package UnitInfo.ui;
+package unitinfo.ui;
 
 import arc.math.geom.Vec2;
 import arc.scene.Element;

src/unitinfo/ui/SBar.java

@@ -1,6 +1,6 @@
-package UnitInfo.ui;
+package unitinfo.ui;
 
-import UnitInfo.SUtils;
+import unitinfo.SUtils;
 import arc.*;
 import arc.func.*;
 import arc.graphics.*;

src/unitinfo/ui/SIcons.java

@@ -1,4 +1,4 @@
-package UnitInfo.ui;
+package unitinfo.ui;
 
 import arc.Core;
 import arc.graphics.g2d.TextureRegion;

src/unitinfo/ui/SchemDisplay.java

@@ -1,6 +1,6 @@
-package UnitInfo.ui.windows;
+package unitinfo.ui;
 
-import UnitInfo.SUtils;
+import unitinfo.SUtils;
 import arc.Core;
 import arc.func.Cons;
 import arc.func.Floatf;

src/unitinfo/ui/Updatable.java

@@ -1,4 +1,4 @@
-package UnitInfo.ui;
+package unitinfo.ui;
 
 public interface Updatable {
     void update();

src/unitinfo/ui/draws/BlockDraw.java

@@ -1,14 +1,9 @@
-package UnitInfo.ui.draws;
+package unitinfo.ui.draws;
 
-import arc.scene.Element;
 import arc.scene.style.TextureRegionDrawable;
-import arc.scene.ui.CheckBox;
-import arc.scene.ui.layout.Table;
-import mindustry.Vars;
 import mindustry.gen.Groups;
-import mindustry.ui.Styles;
 
-import static UnitInfo.core.OverDrawer.isInCamera;
+import static unitinfo.core.OverDrawer.isInCamera;
 import static arc.Core.settings;
 
 public class BlockDraw extends OverDraw {

src/unitinfo/ui/draws/LinkDraw.java

@@ -1,14 +1,11 @@
-package UnitInfo.ui.draws;
+package unitinfo.ui.draws;
 
 import arc.graphics.Color;
 import arc.graphics.g2d.Draw;
 import arc.graphics.g2d.Lines;
 import arc.math.Angles;
 import arc.math.Mathf;
-import arc.scene.Element;
 import arc.scene.style.TextureRegionDrawable;
-import arc.scene.ui.CheckBox;
-import arc.scene.ui.layout.Table;
 import arc.struct.IntSeq;
 import arc.struct.Seq;
 import arc.util.Time;
@@ -19,14 +16,13 @@ import mindustry.gen.Groups;
 import mindustry.graphics.Drawf;
 import mindustry.graphics.Layer;
 import mindustry.graphics.Pal;
-import mindustry.ui.Styles;
 import mindustry.world.blocks.distribution.MassDriver;
 import mindustry.world.blocks.payloads.PayloadMassDriver;
 
 import static arc.Core.atlas;
 import static arc.Core.settings;
 import static mindustry.Vars.*;
-import static UnitInfo.SVars.*;
+import static unitinfo.SVars.*;
 
 public class LinkDraw extends OverDraw {
     Seq<MassDriver.MassDriverBuild> linkedMasses = new Seq<>();

src/unitinfo/ui/draws/OverDraw.java

@@ -1,10 +1,9 @@
-package UnitInfo.ui.draws;
+package unitinfo.ui.draws;
 
 import arc.scene.Element;
 import arc.scene.style.TextureRegionDrawable;
 import arc.scene.ui.CheckBox;
 import arc.scene.ui.layout.Table;
-import arc.struct.ObjectMap;
 import arc.struct.Seq;
 import mindustry.ui.Styles;
 

src/unitinfo/ui/draws/OverDraws.java

@@ -1,4 +1,4 @@
-package UnitInfo.ui.draws;
+package unitinfo.ui.draws;
 
 import mindustry.gen.Icon;
 

src/unitinfo/ui/draws/RangeDraw.java

@@ -1,24 +1,20 @@
-package UnitInfo.ui.draws;
+package unitinfo.ui.draws;
 
 import arc.graphics.Color;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.FrameBuffer;
-import arc.scene.Element;
 import arc.scene.style.TextureRegionDrawable;
-import arc.scene.ui.CheckBox;
-import arc.scene.ui.layout.Table;
 import arc.struct.ObjectMap;
 import arc.struct.Seq;
 import mindustry.game.Team;
 import mindustry.gen.*;
 import mindustry.graphics.Drawf;
-import mindustry.ui.Styles;
 import mindustry.world.blocks.defense.turrets.BaseTurret;
 import mindustry.world.blocks.defense.turrets.TractorBeamTurret;
 import mindustry.world.blocks.defense.turrets.Turret;
 
-import static UnitInfo.SVars.turretRange;
+import static unitinfo.SVars.turretRange;
-import static UnitInfo.core.OverDrawer.isInCamera;
+import static unitinfo.core.OverDrawer.isInCamera;
 import static arc.Core.*;
 import static mindustry.Vars.player;
 

src/unitinfo/ui/draws/UnitDraw.java

@@ -1,18 +1,13 @@
-package UnitInfo.ui.draws;
+package unitinfo.ui.draws;
 
-import UnitInfo.ui.FreeBar;
+import unitinfo.ui.FreeBar;
-import arc.Core;
 import arc.graphics.g2d.Lines;
 import arc.math.Angles;
 import arc.math.Mathf;
-import arc.scene.Element;
 import arc.scene.style.TextureRegionDrawable;
-import arc.scene.ui.CheckBox;
 import arc.scene.ui.layout.Scl;
-import arc.scene.ui.layout.Table;
 import arc.struct.Seq;
 import arc.util.Align;
-import arc.util.Log;
 import arc.util.Tmp;
 import mindustry.Vars;
 import mindustry.ai.Pathfinder;
@@ -21,19 +16,17 @@ import mindustry.entities.units.UnitCommand;
 import mindustry.entities.units.UnitController;
 import mindustry.game.Team;
 import mindustry.gen.Groups;
-import mindustry.gen.Tex;
 import mindustry.graphics.Pal;
 import mindustry.logic.LUnitControl;
 import mindustry.ui.Fonts;
-import mindustry.ui.Styles;
 import mindustry.world.Tile;
 import mindustry.world.blocks.storage.CoreBlock;
 import mindustry.world.blocks.units.CommandCenter;
 
 import java.util.Objects;
 
-import static UnitInfo.core.OverDrawer.isInCamera;
+import static unitinfo.core.OverDrawer.isInCamera;
-import static UnitInfo.core.OverDrawer.isOutCamera;
+import static unitinfo.core.OverDrawer.isOutCamera;
 import static arc.Core.settings;
 import static mindustry.Vars.*;
 

src/unitinfo/ui/draws/UtilDraw.java

@@ -1,26 +1,13 @@
-package UnitInfo.ui.draws;
+package unitinfo.ui.draws;
 
-import arc.Events;
-import arc.func.Boolf;
-import arc.func.Cons;
 import arc.input.KeyCode;
 import arc.math.Angles;
 import arc.math.geom.Geometry;
-import arc.math.geom.Point2;
 import arc.scene.style.TextureRegionDrawable;
-import arc.scene.ui.Button;
-import arc.scene.ui.CheckBox;
-import arc.scene.ui.layout.Table;
-import arc.struct.IntSeq;
-import arc.util.Structs;
-import mindustry.content.Blocks;
 import mindustry.entities.Units;
-import mindustry.game.EventType;
 import mindustry.game.Team;
 import mindustry.gen.*;
 import mindustry.logic.Ranged;
-import mindustry.world.Block;
-import mindustry.world.Tile;
 import mindustry.world.blocks.ControlBlock;
 import mindustry.world.blocks.defense.turrets.Turret;
 

src/unitinfo/ui/windows/CoreDisplay.java

@@ -1,11 +1,12 @@
-package UnitInfo.ui.windows;
+package unitinfo.ui.windows;
 
-import UnitInfo.ui.*;
+import arc.Events;
+import mindustry.game.EventType;
+import unitinfo.ui.*;
 import arc.Core;
 import arc.graphics.Color;
 import arc.math.Mathf;
 import arc.math.geom.Vec2;
-import arc.scene.Element;
 import arc.scene.event.HandCursorListener;
 import arc.scene.style.*;
 import arc.scene.ui.*;
@@ -26,29 +27,23 @@ import mindustry.world.blocks.storage.CoreBlock;
 
 import static mindustry.Vars.*;
 
-public class CoreDisplay extends WindowTable implements Updatable {
+public class CoreDisplay extends Window implements Updatable {
     Vec2 scrollPos = new Vec2(0, 0);
     ObjectMap<Team, ItemData> itemData = new ObjectMap<>();
     float heat;
 
     public CoreDisplay()  {
-        super("Core Display", Icon.list, t -> {});
+        super(Icon.list, "core");
         resetUsed();
     }
 
     @Override
-    public void build() {
+    public void build(Table table) {
         scrollPos = new Vec2(0, 0);
 
-        top();
+        table.background(Styles.black8).top();
-        topBar();
+        table.add(new OverScrollPane(rebuild(), Styles.nonePane, scrollPos).disableScroll(true, false)).name("core-pane");
-
+        Events.on(EventType.WorldLoadEvent.class, e -> resetUsed());
-        table(Styles.black8, t -> {
-            ScrollPane pane = new OverScrollPane(rebuild(), Styles.nonePane, scrollPos).disableScroll(true, false);
-            t.add(pane).name("core-pane");
-        }).top().right().grow().get().parent = null;
-
-        resizeButton();
     }
 
     @Override

src/unitinfo/ui/windows/MapEditorDisplay.java

@@ -1,17 +1,15 @@
-package UnitInfo.ui.windows;
+package unitinfo.ui.windows;
 
-import UnitInfo.ui.EditorTool;
+import unitinfo.ui.EditorTool;
-import UnitInfo.ui.OverScrollPane;
+import unitinfo.ui.OverScrollPane;
-import UnitInfo.ui.Updatable;
+import unitinfo.ui.Updatable;
 import arc.Core;
-import arc.Events;
 import arc.func.Boolf;
 import arc.func.Cons;
 import arc.func.Prov;
 import arc.graphics.Color;
 import arc.input.KeyCode;
 import arc.math.Mathf;
-import arc.math.geom.Point2;
 import arc.math.geom.Vec2;
 import arc.scene.event.Touchable;
 import arc.scene.style.TextureRegionDrawable;
@@ -19,17 +17,13 @@ import arc.scene.ui.*;
 import arc.scene.ui.layout.Scl;
 import arc.scene.ui.layout.Table;
 import arc.scene.utils.Elem;
-import arc.struct.IntSeq;
 import arc.struct.Seq;
 import arc.util.*;
 import mindustry.Vars;
 import mindustry.content.Blocks;
-import mindustry.editor.DrawOperation;
-import mindustry.game.EventType;
 import mindustry.game.Team;
 import mindustry.gen.Icon;
 import mindustry.gen.Tex;
-import mindustry.gen.TileOp;
 import mindustry.graphics.Pal;
 import mindustry.ui.Styles;
 import mindustry.world.Block;
@@ -37,41 +31,35 @@ import mindustry.world.Tile;
 
 import static mindustry.Vars.*;
 
-public class MapEditorDisplay extends WindowTable implements Updatable {
+public class MapEditorDisplay extends Window implements Updatable {
     Vec2 scrollPos = new Vec2(0, 0);
     TextField search;
     Table window;
     float heat;
     float brushSize = -1;
-    UnitInfo.ui.EditorTool tool;
+    unitinfo.ui.EditorTool tool;
 
     public static Team drawTeam = Team.sharded;
     public static Block selected = Blocks.router;
 
     public MapEditorDisplay()  {
-        super("Map Editor Display", Icon.map, t -> {});
+        super(Icon.map, "editor");
     }
 
     @Override
-    public void build() {
+    public void build(Table table) {
         scrollPos = new Vec2(0, 0);
         search = Elem.newField(null, f->{});
-        search.setMessageText("Search...");
+        search.setMessageText(Core.bundle.get("players.search")+"...");
-
-        top();
-        topBar();
-
-        table(Styles.black8, table -> {
         window = table;
+
+        table.top().background(Styles.black8);
         table.table(t->{
             t.left().background(Tex.underline2);
             t.label(()->"[accent]"+selected.localizedName+"[] "+selected.emoji());
             t.add(search).growX().pad(8).name("search");
         }).growX().row();
         table.add(new OverScrollPane(rebuild(), Styles.nonePane, scrollPos).disableScroll(true, false)).grow().name("editor-pane");
-        }).top().right().grow().get().parent = null;
-
-        resizeButton();
     }
 
     boolean hold = false;
@@ -128,7 +116,7 @@ public class MapEditorDisplay extends WindowTable implements Updatable {
                     tools.top().left();
                     tools.table(title -> title.left().background(Tex.underline2).add("Tools [accent]"+(tool==null?"":tool.name())+"[]")).growX().row();
                     tools.table(bt->{
-                        Cons<UnitInfo.ui.EditorTool> addTool = tool -> {
+                        Cons<unitinfo.ui.EditorTool> addTool = tool -> {
                             ImageButton button = new ImageButton(ui.getIcon(tool.name()), Styles.clearTogglei);
                             button.clicked(() -> {
                                 button.toggle();
@@ -147,11 +135,11 @@ public class MapEditorDisplay extends WindowTable implements Updatable {
                             bt.stack(button, mode);
                         };
 
-                        addTool.get(UnitInfo.ui.EditorTool.line);
+                        addTool.get(unitinfo.ui.EditorTool.line);
-                        addTool.get(UnitInfo.ui.EditorTool.pencil);
+                        addTool.get(unitinfo.ui.EditorTool.pencil);
-                        addTool.get(UnitInfo.ui.EditorTool.eraser);
+                        addTool.get(unitinfo.ui.EditorTool.eraser);
-                        addTool.get(UnitInfo.ui.EditorTool.fill);
+                        addTool.get(unitinfo.ui.EditorTool.fill);
-                        addTool.get(UnitInfo.ui.EditorTool.spray);
+                        addTool.get(unitinfo.ui.EditorTool.spray);
                     });
                     tools.row();
                     Slider slider = new Slider(1, 16, 1, false);
@@ -203,7 +191,7 @@ public class MapEditorDisplay extends WindowTable implements Updatable {
 
             ImageButton button = cont.button(Tex.whiteui, Styles.clearToggleTransi, 24, () -> {
                 if(closeSelect) control.input.frag.config.hideConfig();
-            }).group(group).tooltip(t->t.background(Styles.black8).add(item.localizedName)).get();
+            }).group(group).tooltip(t->t.background(Styles.black8).add(item.localizedName.replace(search.getText(), "[accent]"+search.getText()+"[]"))).get();
             button.changed(() -> consumer.get(button.isChecked() ? item : null));
             button.getStyle().imageUp = new TextureRegionDrawable(item.uiIcon);
             button.update(() -> button.setChecked(holder.get() == item));

src/unitinfo/ui/windows/PlayerDisplay.java

@@ -1,7 +1,7 @@
-package UnitInfo.ui.windows;
+package unitinfo.ui.windows;
 
-import UnitInfo.ui.OverScrollPane;
+import unitinfo.ui.OverScrollPane;
-import UnitInfo.ui.Updatable;
+import unitinfo.ui.Updatable;
 import arc.Core;
 import arc.graphics.Color;
 import arc.graphics.g2d.Draw;
@@ -20,7 +20,7 @@ import mindustry.ui.*;
 import static mindustry.Vars.*;
 
 
-public class PlayerDisplay extends WindowTable implements Updatable {
+public class PlayerDisplay extends Window implements Updatable {
     Vec2 scrollPos = new Vec2(0, 0);
     TextField search;
     ImageButton.ImageButtonStyle ustyle;
@@ -28,11 +28,11 @@ public class PlayerDisplay extends WindowTable implements Updatable {
     float heat;
 
     public PlayerDisplay() {
-        super("Player Display", Icon.players, t -> {});
+        super(Icon.players, "player");
     }
 
     @Override
-    public void build() {
+    public void build(Table table) {
         scrollPos = new Vec2(0, 0);
         search = Elem.newField(null, f->{});
         search.setMessageText(Core.bundle.get("players.search"));
@@ -45,16 +45,10 @@ public class PlayerDisplay extends WindowTable implements Updatable {
             imageOverColor = Color.lightGray;
         }};
 
-        top();
+        table.background(Styles.black8).top();
-        topBar();
-
-        table(Styles.black8, table -> {
         table.label(()-> Core.bundle.format(Groups.player.size() == 1 ? "players.single" : "players", Groups.player.size())).row();
         table.add(search).growX().pad(8).name("search").maxTextLength(maxNameLength).row();
         table.add(new OverScrollPane(rebuild(), Styles.nonePane, scrollPos).disableScroll(true, false)).grow().name("player-pane");
-        }).top().right().grow().get().parent = null;
-
-        resizeButton();
     }
 
     @Override

src/unitinfo/ui/windows/ToolDisplay.java

@@ -1,50 +1,39 @@
-package UnitInfo.ui.windows;
+package unitinfo.ui.windows;
 
-import UnitInfo.ui.OverScrollPane;
+import unitinfo.ui.OverScrollPane;
-import UnitInfo.ui.Updatable;
+import unitinfo.ui.Updatable;
-import UnitInfo.ui.draws.OverDraw;
+import unitinfo.ui.draws.OverDraw;
-import UnitInfo.ui.draws.OverDraws;
+import unitinfo.ui.draws.OverDraws;
-import UnitInfo.ui.draws.UnitDraw;
-import arc.math.Scaled;
 import arc.math.geom.Vec2;
 import arc.scene.ui.ScrollPane;
 import arc.scene.ui.layout.Table;
-import arc.util.Scaling;
 import arc.util.Time;
 import mindustry.gen.Icon;
 import mindustry.gen.Tex;
 import mindustry.graphics.Pal;
 import mindustry.ui.Styles;
 
-public class ToolDisplay extends WindowTable implements Updatable {
+public class ToolDisplay extends Window implements Updatable {
     Vec2 scrollPos = new Vec2(0, 0);
     OverDraw selected;
     float heat;
 
     public ToolDisplay() {
-        super("Tool Display", Icon.edit, t -> {
+        super(Icon.edit, "tool");
-        });
     }
 
     @Override
-    public void build() {
+    public void build(Table table) {
         scrollPos = new Vec2(0, 0);
 
-        top();
+        table.background(Styles.black8).top().left();
-        topBar();
+        table.table(pane->{
-
-        table(Styles.black8, t -> {
-            t.left();
-            t.table(pane->{
             pane.add(new OverScrollPane(rebuild(), Styles.nonePane, scrollPos).disableScroll(true, false)).name("tool-pane");
         }).top().marginLeft(4f).marginRight(12f);
-            t.table(stats->{
+        table.table(stats->{
             stats.top();
             stats.add(rebuildStats()).name("tool-stats");
         }).growY();
-        }).top().right().grow().get().parent = null;
-
-        resizeButton();
     }
 
     @Override

src/unitinfo/ui/windows/UnitDisplay.java

@@ -1,11 +1,9 @@
-package UnitInfo.ui.windows;
+package unitinfo.ui.windows;
 
-import UnitInfo.SVars;
+import unitinfo.core.BarInfo;
-import UnitInfo.core.BarInfo;
+import unitinfo.ui.SBar;
-import UnitInfo.ui.SBar;
+import unitinfo.ui.SIcons;
-import UnitInfo.ui.SIcons;
+import unitinfo.ui.Updatable;
-import UnitInfo.ui.Updatable;
-import UnitInfo.ui.windows.WindowTable;
 import arc.Core;
 import arc.func.Prov;
 import arc.graphics.Color;
@@ -38,28 +36,26 @@ import mindustry.world.blocks.distribution.MassDriver;
 import mindustry.world.blocks.payloads.Payload;
 import mindustry.world.blocks.power.*;
 
-import static UnitInfo.SVars.*;
+import static unitinfo.SVars.*;
-import static UnitInfo.SUtils.*;
+import static unitinfo.SUtils.*;
 import static arc.Core.*;
 import static mindustry.Vars.*;
 
-public class UnitDisplay extends WindowTable implements Updatable {
+public class UnitDisplay extends Window implements Updatable {
     static Seq<Color> lastColors = Seq.with(Color.clear,Color.clear,Color.clear,Color.clear,Color.clear,Color.clear);
     static final Rect scissor = new Rect();
     float scrollPos;
 
     public UnitDisplay() {
-        super("Unit Display", Icon.units, t -> {});
+        super(Icon.units, "unit");
     }
 
     @Override
-    public void build() {
+    public void build(Table table) {
-        top();
+        table.top().background(Styles.black8);
-        topBar();
 
         //TODO: add new UnitInfoDisplay(), new WeaponDisplay();
-        table(Styles.black8, t -> {
+        table.table(Tex.underline2, tt -> {
-            t.table(Tex.underline2, tt -> {
             tt.stack(
                 new Table(ttt -> {
                     Prov<TextureRegionDrawable> reg = () -> {
@@ -90,7 +86,7 @@ public class UnitDisplay extends WindowTable implements Updatable {
                         i.getStyle().imageUp = reg.get().tint(Tmp.c1.set(locked ? Color.red.cpy().shiftHue(2 * Time.time) : Color.white));
                         i.getStyle().imageDown = reg.get().tint(Tmp.c1.mul(Color.darkGray));
                         i.layout();
-                        }).size(4 * 8f).get().parent = null;
+                    }).size(4 * 8f);
                 }),
                 new Table(ttt -> {
                     ttt.stack(
@@ -104,7 +100,7 @@ public class UnitDisplay extends WindowTable implements Updatable {
                             temp.add(label).center();
                             temp.pack();
                         })
-                        ).padLeft(2 * 8f).padBottom(2 * 8f).get().parent = null;
+                    ).padLeft(2 * 8f).padBottom(2 * 8f);
                 })
             );
 
@@ -119,7 +115,7 @@ public class UnitDisplay extends WindowTable implements Updatable {
                     else name = b.block.localizedName;
                 }
                 return "[accent]" + (name.length() > 13 ? name.substring(0, 13) + "..." : name) + "[]";
-                }).get().parent = null;
+            });
 
             tt.addListener(new Tooltip(to -> {
                 Teamc target = getTarget();
@@ -138,15 +134,14 @@ public class UnitDisplay extends WindowTable implements Updatable {
                     ? "(" + 0 + ", " + 0 + ")"
                     : "(" + Strings.fixed(target.x() / tilesize, 2) + ", " + Strings.fixed(target.y() / tilesize, 2) + ")").row();
             }));
-                tt.update(() -> tt.setBackground(((NinePatchDrawable) Tex.underline2).tint(getTarget() == null ? Color.gray : getTarget().team().color))).parent = null;
+            tt.update(() -> tt.setBackground(((NinePatchDrawable) Tex.underline2).tint(getTarget() == null ? Color.gray : getTarget().team().color)));
         }).row();
-            ScrollPane pane = t.pane(Styles.nonePane, new Table(tt -> {
+        ScrollPane pane = table.pane(Styles.nonePane, new Table(tt -> {
             for (int i = 0; i < 6; i++) {
                 addBar(tt, i);
                 tt.row();
             }
         }).left()).top().right().grow().get();
-            pane.parent = null;
         pane.update(() -> {
             Element result = scene.hit(input.mouseX(), input.mouseY(), true);
             if(pane.hasScroll() && (result == null || !result.isDescendantOf(pane)))
@@ -157,8 +152,6 @@ public class UnitDisplay extends WindowTable implements Updatable {
         pane.setOverscroll(false, false);
         pane.setScrollingDisabled(true, false);
         pane.setScrollYForce(scrollPos);
-        }).top().right().grow().get().parent = null;
-        resizeButton();
     }
 
     public void lockTarget() {

src/unitinfo/ui/windows/WaveDisplay.java

@@ -1,12 +1,10 @@
-package UnitInfo.ui.windows;
+package unitinfo.ui.windows;
 
-import UnitInfo.ui.OverScrollPane;
+import unitinfo.ui.OverScrollPane;
 import arc.Events;
 import arc.graphics.Color;
-import arc.input.KeyCode;
 import arc.math.Mathf;
 import arc.math.geom.Vec2;
-import arc.scene.event.HandCursorListener;
 import arc.scene.event.Touchable;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
@@ -24,21 +22,19 @@ import static arc.Core.settings;
 import static mindustry.Vars.*;
 
 
-public class WaveDisplay extends WindowTable {
+public class WaveDisplay extends Window {
     static Vec2 scrollPos = new Vec2(0, 0);
 
     public WaveDisplay() {
-        super("Wave Display", Icon.waves, t -> {});
+        super(Icon.waves, "wave");
     }
 
     @Override
-    public void build() {
+    public void build(Table table) {
-        top();
+        table.background(Styles.black8).top();
-        topBar();
 
-        table(Styles.black8, t -> {
         ScrollPane pane = new OverScrollPane(rebuild(), Styles.nonePane, scrollPos).disableScroll(true, false);
-            t.add(pane);
+        table.add(pane);
         Events.on(EventType.WorldLoadEvent.class, e -> {
             pane.clearChildren();
             pane.setWidget(rebuild());
@@ -47,9 +43,6 @@ public class WaveDisplay extends WindowTable {
             pane.clearChildren();
             pane.setWidget(rebuild());
         });
-        }).top().right().grow().get().parent = null;
-
-        resizeButton();
     }
 
     public ObjectIntMap<SpawnGroup> getWaveGroup(int index) {

src/unitinfo/ui/windows/Window.java

@@ -1,5 +1,6 @@
-package UnitInfo.ui.windows;
+package unitinfo.ui.windows;
 
+import arc.*;
 import arc.func.*;
 import arc.input.*;
 import arc.math.geom.*;
@@ -10,56 +11,60 @@ import arc.util.*;
 import mindustry.gen.*;
 import mindustry.ui.*;
 
-import java.awt.*;
+public class Window extends Table{
-
-public class WindowTable extends Table{
-    public Cons<Table> content, onClose;
     public TextureRegionDrawable icon;
-    public float maxWindowHeight, maxWindowWidth;
+    public int id;
-    public boolean maxWidthEnabled = false, maxHeightEnabled = false;
+    public Cons<Table> content;
+    public boolean shown = false;
 
-    public WindowTable() {
+    public float minWindowWidth = 160, minWindowHeight = 60;
-        this("none", Icon.none, c->{});
+    public float maxWindowWidth = Float.MAX_VALUE, maxWindowHeight = Float.MAX_VALUE;
+
+    public Window(TextureRegionDrawable icon, String name){
+        this(icon, name, null);
     }
 
-    public WindowTable(String title, TextureRegionDrawable icon, Cons<Table> content){
+    public Window(TextureRegionDrawable icon, String name, Cons<Table> content){
-        this(title, icon, content, t -> t.visible(() -> false));
-    }
-
-    public WindowTable(String title, TextureRegionDrawable icon, Cons<Table> content, Cons<Table> onClose){
-        this.name = title;
-        this.icon = icon;
         this.content = content;
-        this.onClose = onClose;
+        this.name = name;
-        build();
+        this.icon = icon;
+
+        titleBar();
+        pane(t -> {
+            t.setBackground(Styles.black5);
+            t.top().left();
+            build(t);
+        }).grow().top().left().get().setScrollingDisabled(true, true);
+        bottomBar();
+
+        setPosition(Core.graphics.getWidth() / 2f - getWidth() / 2f, Core.graphics.getHeight() / 2f - getHeight() / 2f);
+        id = WindowManager.register(this);
+
+        visible(() -> shown);
     }
 
-    public void build(){
+    protected void build(Table t){
-        top();
+        if(content != null) content.get(t);
-        topBar();
-
-        // window contents
-        table(Styles.black5, t -> {
-            content.get(t);
-        }).grow();
-
-        resizeButton();
     }
 
-    public void topBar(){
+    protected void titleBar(){
         table(t -> {
+            // icon and title
             t.table(Tex.buttonEdge1, b -> {
                 b.top().left();
-                b.image(icon).size(20f).padLeft(15).top().left();
+                b.image(() -> icon == null ? Icon.none.getRegion() : icon.getRegion()).size(20f).padLeft(15).top().left();
                 b.pane(Styles.nonePane, p -> {
                     p.top().left();
-                    p.labelWrap(name).padLeft(20).top().left().get().setAlignment(Align.topLeft);
+                    p.labelWrap(() -> Core.bundle.get("window."+name+".name")).padLeft(20).top().left().get().setAlignment(Align.topLeft);
-                }).top().left().height(40f).growX().get().setScrollingDisabled(true, true);
+                }).left().height(40f).growX().get().setScrollingDisabled(true, true);
             }).maxHeight(40f).grow();
+            
+            // exit button
             t.table(Tex.buttonEdge3, b -> {
-                b.button(Icon.cancel, Styles.emptyi, () -> onClose.get(this));
+                b.button(Icon.cancel, Styles.emptyi, () -> shown = false);
             }).maxHeight(40f).width(80f).growY();
 
+            // handles the dragging.
             t.touchable = Touchable.enabled;
             t.addListener(new InputListener(){
                 float lastX, lastY;
@@ -68,15 +73,16 @@ public class WindowTable extends Table{
                     Vec2 v = t.localToStageCoordinates(Tmp.v1.set(x, y));
                     lastX = v.x;
                     lastY = v.y;
-                    t.toFront();
+                    toFront();
                     return true;
                 }
 
                 @Override
-                public void touchDragged(InputEvent event, float x, float y, int pointer) {
+                public void touchDragged(InputEvent event, float dx, float dy, int pointer) {
-                    Vec2 v = t.localToStageCoordinates(Tmp.v1.set(x, y));
+                    Vec2 v = t.localToStageCoordinates(Tmp.v1.set(dx, dy));
+
+                    setPosition( x + (v.x - lastX),  y + (v.y - lastY));
 
-                    moveBy(v.x - lastX, v.y - lastY);
                     lastX = v.x;
                     lastY = v.y;
                 }
@@ -85,7 +91,7 @@ public class WindowTable extends Table{
         row();
     }
 
-    public void resizeButton(){
+    protected void bottomBar(){
         row();
         table(Styles.black5, t -> {
             t.table().growX();
@@ -110,8 +116,8 @@ public class WindowTable extends Table{
 
                         // will softlock if initial size is smaller than minimum
                         // so don't do that!
-                        if(getWidth() + w < 160f || (getWidth() + w > maxWindowWidth && maxWidthEnabled)) w = 0;
+                        if(getWidth() + w < minWindowWidth || getWidth() + w > maxWindowWidth) w = 0;
-                        if(getHeight() - h  < 160f || (getHeight() - h > maxWindowHeight && maxHeightEnabled)) h = 0;
+                        if(getHeight() - h < minWindowHeight || getHeight() - h > maxWindowHeight) h = 0;
                         sizeBy(w, -h);
                         moveBy(0, h);
                         lastX = v.x;
@@ -122,13 +128,7 @@ public class WindowTable extends Table{
         }).height(20f).growX();
     }
 
-    public void setMaxWindowWidth(float maxWindowWidth){
+    public void toggle(){
-        this.maxWindowWidth = maxWindowWidth;
+        shown = !shown;
-        maxWidthEnabled = true;
-    }
-
-    public void setMaxWindowHeight(float maxWindowHeight){
-        this.maxWindowHeight = maxWindowHeight;
-        maxHeightEnabled = true;
     }
 }

src/unitinfo/ui/windows/WindowManager.java

@@ -0,0 +1,55 @@
+package unitinfo.ui.windows;
+
+import arc.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.ui.*;
+
+public class WindowManager {
+    public static Seq<Window> windows = new Seq<>();
+
+    public static void init(){
+        Log.info(windows.size);
+
+        Vars.ui.hudGroup.fill(t -> {
+            t.name = "Windows";
+            for(Window window : windows){
+                t.add(window);
+            }
+        });
+
+        Vars.ui.hudGroup.fill(t -> {
+            t.center().left();
+            t.table(Core.atlas.drawable("unitinfo-sidebar"), b -> {
+                b.name = "Window Buttons";
+                b.left();
+
+                for(Window window : windows){
+                    b.button(window.icon, Styles.emptyi, () -> {
+                        window.toggle();
+
+                        // Disabling the parent's layout fixes issues with updating elements inside windows.
+                        // However, it also disables the layout of all its children, so we need to re-enable them.
+                        window.parent.setLayoutEnabled(false);
+                        window.setLayoutEnabled(true);
+                        for(Window w : windows){
+                            w.setLayoutEnabled(true);
+                        }
+                    }).disabled(window.shown)
+                        .size(40f)
+                        .tooltip(tt -> {
+                            tt.setBackground(Styles.black6);
+                            tt.label(() -> Core.bundle.get("window."+window.name+".name")).pad(2f);
+                        });
+                    b.row();
+                }
+            }).left();
+        });
+    }
+
+    public static int register(Window window){
+        windows.add(window);
+        return windows.size - 1;
+    }
+}

src/unitinfo/ui/windows/Windows.java

@@ -0,0 +1,25 @@
+package unitinfo.ui.windows;
+
+import arc.util.*;
+import mindustry.gen.*;
+import unitinfo.ui.windows.*;
+
+public class Windows {
+    public static MapEditorDisplay editorTable;
+
+    public static void load(){
+        new UnitDisplay();
+        new WaveDisplay();
+        new CoreDisplay();
+        new PlayerDisplay();
+        new ToolDisplay();
+        editorTable = new MapEditorDisplay();
+        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();
+        });
+    }
+}