From 0c76cd3ec8acc792492de5b32524e63ea71b6fd3 Mon Sep 17 00:00:00 2001
From: sharlotte <seeseafood@naver.com>
Date: Thu, 26 Aug 2021 09:55:08 +0900
Subject: [PATCH] fixed item tap

---
 src/UnitInfo/core/BarInfo.java         | 12 ------------
 src/UnitInfo/core/HudUi.java           | 13 +++++++------
 src/UnitInfo/core/SettingS.java        |  2 +-
 src/UnitInfo/ui/CoresItemsDisplay.java | 17 +++++++++++------
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/UnitInfo/core/BarInfo.java b/src/UnitInfo/core/BarInfo.java
index cdb76c6..174fe96 100644
--- a/src/UnitInfo/core/BarInfo.java
+++ b/src/UnitInfo/core/BarInfo.java
@@ -38,18 +38,6 @@ public class BarInfo {
     static Seq<String> strings = Seq.with("","","","","","");
     static FloatSeq numbers = FloatSeq.with(0f,0f,0f,0f,0f,0f);
     static Seq<Color> colors = Seq.with(Color.clear,Color.clear,Color.clear,Color.clear,Color.clear,Color.clear);
-    static Field linkedCore; // Versions below 130 don't have this public
-
-    static {
-        if(Version.build <= 129) {
-            try {
-                linkedCore = StorageBlock.StorageBuild.class.getDeclaredField("linkedCore");
-            } catch (NoSuchFieldException e) {
-                e.printStackTrace();
-            }
-            linkedCore.setAccessible(true);
-        }
-    }
 
     public static <T extends Teamc> void getInfo(T target) throws IllegalAccessException, NoSuchFieldException {
         for(int i = 0; i < 6; i++) { //init
diff --git a/src/UnitInfo/core/HudUi.java b/src/UnitInfo/core/HudUi.java
index 4aaf366..a3bffe8 100644
--- a/src/UnitInfo/core/HudUi.java
+++ b/src/UnitInfo/core/HudUi.java
@@ -1072,16 +1072,17 @@ public class HudUi {
     }
 
     public void setItem(Table table){
+        table.left().defaults().minWidth(Scl.scl(modUiScale) * 54 * 8f).align(Align.center);
         table.table().update(t -> {
             t.clear();
             for(int i = 0; i < coreItems.tables.size; i++){
                 if((state.rules.pvp && coreItems.teams[i] != player.team()) || coreItems.teams[i].cores().isEmpty()) continue;
                 int finalI = i;
-                Label label = new Label(() -> "[#" + coreItems.teams[finalI].color.toString() + "]" + coreItems.teams[finalI].name + "[]");
-                label.setFontScale(modUiScale);
-                t.background(Tex.underline2).add(label).center();
-                t.row();
-                t.add(coreItems.tables.get(i)).left();
+                t.table(tt -> {
+                    tt.center().defaults().minWidth(Scl.scl(modUiScale) * 54 * 8f);
+                    coreItems.tables.get(finalI).setBackground(((NinePatchDrawable)Tex.underline2).tint(coreItems.teams[finalI].color));
+                    tt.add(coreItems.tables.get(finalI)).left();
+                }).pad(4);
                 t.row();
             }
         });
@@ -1107,7 +1108,7 @@ public class HudUi {
         });
 
         itemTable = new Table(table -> {
-            table.left().defaults().width(Scl.scl(modUiScale) * 54 * 8f).height(Scl.scl(modUiScale) * 32 * 8f).align(Align.left);
+            table.left().defaults().minWidth(Scl.scl(modUiScale) * 54 * 8f).height(Scl.scl(modUiScale) * 32 * 8f).align(Align.left);
             table.table(Tex.button, t -> {
                 t.add(itemPane);
                 t.update(() -> {
diff --git a/src/UnitInfo/core/SettingS.java b/src/UnitInfo/core/SettingS.java
index ad3728d..81c7d98 100644
--- a/src/UnitInfo/core/SettingS.java
+++ b/src/UnitInfo/core/SettingS.java
@@ -106,7 +106,7 @@ public class SettingS {
         Seq<Seq<SharSetting>> settingSeq = new Seq<>();
         Seq<SharSetting> tapSeq = new Seq<>();
         addGraphicSlideSetting("barstyle", 0, 0, 5, 1, s -> s == 0 ? "default bar" : s + "th bar", tapSeq);
-        addGraphicSlideSetting("infoUiScale", 100, 50, 100, 5, s -> s + "%", tapSeq);
+        addGraphicSlideSetting("infoUiScale", 75, 50, 100, 5, s -> s + "%", tapSeq);
         addGraphicSlideSetting("coreItemCheckRate", 60, 6, 180, 6, s -> Strings.fixed(s/60f,1) + "sec", tapSeq);
         addGraphicTypeSetting("wavemax", 0, 100,200, true, () -> true, s -> s + "waves", tapSeq);
         addGraphicCheckSetting("infoui", true, tapSeq);
diff --git a/src/UnitInfo/ui/CoresItemsDisplay.java b/src/UnitInfo/ui/CoresItemsDisplay.java
index 554f76a..3067d45 100644
--- a/src/UnitInfo/ui/CoresItemsDisplay.java
+++ b/src/UnitInfo/ui/CoresItemsDisplay.java
@@ -91,6 +91,11 @@ public class CoresItemsDisplay {
                 }
             });
 
+
+            Label label1 = new Label(() -> "[#" + team.color.toString() + "]" + team.name + "[]");
+            label1.setFontScale(modUiScale);
+            t.add(label1).row();
+            t.row();
             t.table(coretable -> {
                 final int[] i = {0};
                 for(CoreBlock.CoreBuild core : team.cores()) {
@@ -165,16 +170,16 @@ public class CoresItemsDisplay {
                 unitTable.clear();
                 final int[] i = {0};
                 for(UnitType unit : content.units()){
-                    unitTable.table(tt -> {
-                        tt.center();
-                        if(unit != UnitTypes.block && Groups.unit.contains(u -> u.type == unit && u.team == team)){
+                    if(unit != UnitTypes.block && Groups.unit.contains(u -> u.type == unit && u.team == team)){
+                        unitTable.table(tt -> {
+                            tt.center();
                             tt.image(unit.uiIcon).size(iconSmall * modUiScale).padRight(3 * modUiScale).tooltip(ttt -> ttt.background(Styles.black6).margin(2f * modUiScale).add(unit.localizedName).style(Styles.outlineLabel));
                             Label label = new Label(() -> core == null ? "0" : UI.formatAmount(Groups.unit.count(u -> u.team == team && u.type == unit)));
                             label.setFontScale(modUiScale);
                             tt.add(label).padRight(3 * modUiScale).minWidth(5 * 8f * modUiScale).left();
-                            if(++i[0] % 5 == 0) unitTable.row();
-                        }
-                    });
+                        });
+                        if(++i[0] % 5 == 0) unitTable.row();
+                    }
                 }
             });
         });