From 149cdba83ab7fb2e458bd599eb9a63ac6d1de266 Mon Sep 17 00:00:00 2001
From: sharlottes <seeseafood@naver.com>
Date: Tue, 12 Apr 2022 00:38:53 +0900
Subject: [PATCH] to the left

---
 assets/sprites/ui/bars/sidebar.9.png | Bin 286 -> 252 bytes
 src/UnitInfo/core/HudUi.java         |  59 +--------------------------
 src/UnitInfo/core/Main.java          |   1 -
 src/UnitInfo/ui/HUDFragment.java     |  12 +++---
 src/UnitInfo/ui/TaskbarTable.java    |  10 ++---
 5 files changed, 12 insertions(+), 70 deletions(-)

diff --git a/assets/sprites/ui/bars/sidebar.9.png b/assets/sprites/ui/bars/sidebar.9.png
index 06a1885742b10d3100bd831b947f01b1d43699cb..2589331ed846d2a6878c584b05dfd0d7a7b2c982 100644
GIT binary patch
delta 224
zcmV<603ZLJ0{j7xB!9z6L_t(|UhS4K3d1lE1pPTZGOu;GKvK-!*|PB-Dl#yTLMu(@
zY}-Bdi{4|5v3JS058>D?-!I{?LpG#v)FnGIUTzsR8z&bzWYkQYT;h^ZXK`|YQ$`)d
z$=EHUsyG>T$fzt%MqM&$nXs@5iyv~h(<JN@_YbSA!U8$mX;~8XLk@Szs3pP}v_u$V
zvZz3YP8m~01u}NYn4_pbE^x@0v#3BWd0NKIM6LUupMwtBkiwB$zF)$jQ@;H)-w*Aq
amw5yDn7f3F5_`q~0000<MNUMnLSTa1iDu0J

delta 258
zcmV+d0sa2`0iFVoB!A^eL_t(o3C-4F4#FS|1>j-48dvd9UWLQWJq=9;4+e{+?T<O6
zjBgz}!geqA$zfqKe;XbUW1PjzS|mTE6duy*oUBA;#wE-G1zZ<qg#zq}1B({wc>Zse
z|L^Z;#jH`d$qMEHRl&TVPB2d>fq6p-3@2r*`t_Cb=61FC(R*Qyf&s8)??6mA8nj}g
zgEjM9!-ls$niVRqO)GZ%eZ0!V)ols`!W#F5VaLcSVu_QAdBX_|74w8U!93wAm=_#f
z^uQrnyN+M4-VsZRRxD51T64Ky^Ro-X#8$XVm?cj0iQK;S2PyYT(J@QNO#lD@07*qo
IM6N<$f|`tXQvd(}

diff --git a/src/UnitInfo/core/HudUi.java b/src/UnitInfo/core/HudUi.java
index 1befa49..afbd883 100644
--- a/src/UnitInfo/core/HudUi.java
+++ b/src/UnitInfo/core/HudUi.java
@@ -17,21 +17,17 @@ import mindustry.*;
 import mindustry.entities.Units;
 import mindustry.game.*;
 import mindustry.gen.*;
-import mindustry.graphics.*;
 import mindustry.logic.Ranged;
 import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 import mindustry.world.blocks.defense.turrets.*;
-import mindustry.world.blocks.storage.*;
 
 import static UnitInfo.SVars.*;
 import static arc.Core.*;
 import static mindustry.Vars.*;
 
 public class HudUi {
-    public Table mainTable = new Table();
-    public Table baseTable = new Table();
     public Table waveInfoTable = new Table();
     public SchemDisplay schemTable;
 
@@ -42,7 +38,6 @@ public class HudUi {
     public boolean waveShown;
 
     public float a;
-    public int uiIndex = 3;
 
     @SuppressWarnings("unchecked")
     public <T extends Teamc> T getTarget(){
@@ -89,8 +84,6 @@ public class HudUi {
                     Log.warn("ui scaling reached zero");
                     modUiScale = 0.25f;
                 }
-                mainTable.clearChildren();
-                addTable();
             }
 
             if(settings.getBool("autoShooting")) {
@@ -208,9 +201,8 @@ public class HudUi {
     }
 
     public void addSchemTable() {
-        Table table = (Table) scene.find("minimap/position");
-        table.row();
-        schemTable=new SchemDisplay();
+        Table table = ((Table) scene.find("minimap/position")).row();
+        schemTable = new SchemDisplay();
         table.add(schemTable);
     }
 
@@ -266,51 +258,4 @@ public class HudUi {
                 return waveShown;
             })).left().top()).fillX();
     }
-
-    public void reset(int index, Seq<Button> buttons, Label label, Table table, Table labelTable, String hud){
-        uiIndex = index;
-        buttons.each(b -> b.setChecked(buttons.indexOf(b) == index));
-        label.setText(bundle.get(hud));
-        table.removeChild(baseTable);
-        labelTable.setPosition(buttons.items[uiIndex].x, buttons.items[uiIndex].y);
-        baseTable = table.table(tt -> tt.stack(labelTable).align(Align.left).left().visible(() -> settings.getBool("infoui"))).left().get();
-        a = 1f;
-    }
-
-    public void addTable(){
-        mainTable = new Table(table -> {
-            table.left();
-
-            Label label = new Label("");
-            label.setColor(Pal.stat);
-            label.update(() -> {
-                a = Mathf.lerpDelta(a, 0f, 0.025f);
-                label.color.a = a;
-            });
-            label.setStyle(new Label.LabelStyle(){{
-                font = Fonts.outline;
-                fontColor = Color.white;
-                background = Styles.black8;
-            }});
-            label.setFontScale(Scl.scl(modUiScale));
-            Table labelTable = new Table(t -> t.add(label).left().padRight(Scl.scl(modUiScale) * 40 * 8f));
-
-            table.table(t -> {
-                Seq<Button> buttons = Seq.with(null, null, null, null);
-                Seq<String> strs = Seq.with("hud.unit", "hud.wave", "hud.item", "hud.cancel");
-                Seq<TextureRegionDrawable> icons = Seq.with(Icon.units, Icon.fileText, Icon.copy, Icon.cancel);
-                for(int i = 0; i < buttons.size; i++){
-                    int finalI = i;
-                    buttons.set(i, t.button(new ScaledNinePatchDrawable(new NinePatch(icons.get(i).getRegion()), modUiScale), Styles.clearToggleTransi, () ->
-                        reset(finalI, buttons, label, table, labelTable, strs.get(finalI))).size(Scl.scl(modUiScale) * 5 * 8f).get());
-                    t.row();
-                }
-            });
-            baseTable = table.table(tt -> tt.stack(labelTable).align(Align.left).left().visible(() -> settings.getBool("infoui"))).left().get();
-
-            table.fillParent = true;
-            table.visibility = () -> ui.hudfrag.shown && !ui.minimapfrag.shown();
-        });
-        ui.hudGroup.addChild(mainTable);
-    }
 }
diff --git a/src/UnitInfo/core/Main.java b/src/UnitInfo/core/Main.java
index 0c91c54..1a5b189 100644
--- a/src/UnitInfo/core/Main.java
+++ b/src/UnitInfo/core/Main.java
@@ -43,7 +43,6 @@ public class Main extends Mod {
             WindowTables.init();
             new HUDFragment().build(Vars.ui.hudGroup);
             hud = new HudUi();
-            hud.addTable();
             hud.addWaveInfoTable();
             hud.addSchemTable();
             hud.setEvents();
diff --git a/src/UnitInfo/ui/HUDFragment.java b/src/UnitInfo/ui/HUDFragment.java
index e9418b7..7c93b95 100644
--- a/src/UnitInfo/ui/HUDFragment.java
+++ b/src/UnitInfo/ui/HUDFragment.java
@@ -12,12 +12,7 @@ public class HUDFragment extends Fragment{
             t.name = "Windows";
             t.visible(() -> parent.visible);
 
-            // windows (totally not a copyright violation)
-            t.center().right();
-            t.add(unitTable).size(250f).visible(false);
-            t.add(waveTable).size(250f).visible(false);
-            t.add(coreTable).size(250f).visible(false);
-
+            t.center().left();
             // sidebar
             t.add(new TaskbarTable(
                     unitTable,
@@ -25,6 +20,11 @@ public class HUDFragment extends Fragment{
                     coreTable
             )).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.update(()->{
                 for (Element child : t.getChildren()) {
                     if(child instanceof Updatable u) u.update();
diff --git a/src/UnitInfo/ui/TaskbarTable.java b/src/UnitInfo/ui/TaskbarTable.java
index 5d2ae44..b1ea186 100644
--- a/src/UnitInfo/ui/TaskbarTable.java
+++ b/src/UnitInfo/ui/TaskbarTable.java
@@ -11,16 +11,14 @@ public class TaskbarTable extends Table{
 
     public TaskbarTable(WindowTable... items){
         visible = true;
-        table(MindowsTex.sidebar,t -> {
+        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)
-                        .padLeft(5f);
+                    w.visible(visibility);
+                }).disabled(b -> w.visible).size(40f).padRight(5f);
                 t.row();
             }
-        }).right().center().width(40f);
+        }).left().center().width(40f);
     }
 }
\ No newline at end of file