From 4b29d2800cbf64f34dba5e6bcf37be4c792c2e89 Mon Sep 17 00:00:00 2001
From: sharlottes <60801210+sharlottes@users.noreply.github.com>
Date: Tue, 4 May 2021 17:22:23 +0900
Subject: [PATCH] what is this white bar

---
 README.md                    | 29 ++---------------------------
 assets/mod.json              |  2 +-
 src/UnitInfo/core/HudUi.java |  8 ++++----
 src/UnitInfo/ui/SBar.java    |  8 ++++----
 4 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index bd1518b..77d7c96 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,2 @@
-# Mindustry Mod Template
-A blank template for Mindustry mods with an existing Gradle configuration to compile and dex-ify, and Github Actions to automatically do both and upload the artifacts.
-
-## Compiling
-JDK 8.\
-Task `dexify` requires `d8` from Android `build-tools` > `28.0.1`.
-
-Plain Jar is for JVMs (desktop).\
-Dexed Jar is for for JVMs (desktop) and ARTs (Android).\
-These two are separate in order to decrease size of mod download.
-
-### Windows
-Plain Jar: `gradlew build`\
-Dexify Plain Jar: `gradlew dexify`\
-Build Plain & Dexify Jar: `gradlew buildDex`
-
-### *nix
-Plain Jar: `./gradlew build`\
-Dexify Plain Jar: `./gradlew dexify`\
-Build Plain & Dexify Jar: `./gradlew buildDex`
-
-## I have no idea what I'm doing with this
-
-1. Rename directories in `src/` to avoid collisions with other mods that didn't.
-2. Change `pGroup` in `gradle.properties` to match up with the new directories.
-3. Update `main` in `assets/mod.json` to line up with renamed directories.
-4. Refer to [Compiling](#compiling).
+# Unit Information
+The mod displays more information for unit, such as health, armor, shield, weapon/weapon reload etc.   
\ No newline at end of file
diff --git a/assets/mod.json b/assets/mod.json
index a7fb0dd..ad14710 100644
--- a/assets/mod.json
+++ b/assets/mod.json
@@ -7,6 +7,6 @@
   "main": "UnitInfo.core.Main",
   "minGameVersion": "126",
   "dependencies": [],
-  "hidden": false,
+  "hidden": true,
   "java": true
 }
diff --git a/src/UnitInfo/core/HudUi.java b/src/UnitInfo/core/HudUi.java
index 8de1cb7..d3ad70a 100644
--- a/src/UnitInfo/core/HudUi.java
+++ b/src/UnitInfo/core/HudUi.java
@@ -36,16 +36,16 @@ public class HudUi {
     }
     
     public void reset(Table table){
+        addTable();
         table.remove();
         table.reset();
-        addTable();
     }
     
     public void addTable(){
         Vars.ui.hudGroup.addChild(new Table(table -> {
             Unit unit = getUnit();
             table.update(() -> {
-                if(getUnit() != unit) reset(table);
+                if(getUnit() != unit || getUnit().type == null) reset(table);
             });
             table.left();
             table.table(scene.getStyle(Button.ButtonStyle.class).up, t -> {
@@ -95,9 +95,9 @@ public class HudUi {
                     )).growX().left();
                     tt.row();
                     if(getUnit() instanceof Payloadc) tt.add(new SBar(
-                            () -> Core.bundle.format("shar-stat.payloadCapacity", Mathf.round(((Payloadc)getUnit()).payloadUsed()), Mathf.round(unit.type().payloadCapacity)),
+                            () -> Core.bundle.format("shar-stat.payloadCapacity", Mathf.round(((Payloadc)getUnit()).payloadUsed()), Mathf.round(getUnit().type().payloadCapacity)),
                             () -> Pal.items,
-                            () -> Mathf.clamp(((Payloadc)getUnit()).payloadUsed() / unit.type().payloadCapacity)
+                            () -> Mathf.clamp(((Payloadc)getUnit()).payloadUsed() / getUnit().type().payloadCapacity)
                     )).growX().left();
 
                 });
diff --git a/src/UnitInfo/ui/SBar.java b/src/UnitInfo/ui/SBar.java
index 8b4d1c7..b167191 100644
--- a/src/UnitInfo/ui/SBar.java
+++ b/src/UnitInfo/ui/SBar.java
@@ -107,19 +107,19 @@ public class SBar extends Element{
         blink = Mathf.lerpDelta(blink, 0f, 0.2f);
         value = Mathf.lerpDelta(value, computed, 0.15f);
 
-        NinePatchDrawable bar = (NinePatchDrawable) drawable("shar-barS");
+        NinePatchDrawable bar = (NinePatchDrawable) drawable("unitinfo-barS");
         Draw.colorl(0.1f);
         bar.draw(x, y, width, height);
         Draw.color(color, blinkColor, blink);
 
-        NinePatchDrawable top = (NinePatchDrawable) drawable("shar-barS-top");
+        NinePatchDrawable top = (NinePatchDrawable) drawable("unitinfo-barS-top");
         float topWidth = width * value;
 
-        if(topWidth > Core.atlas.find("shar-bar-top").width){
+        if(topWidth > Core.atlas.find("unitinfo-bar-top").width){
             top.draw(x, y, topWidth, height);
         }else{
             if(ScissorStack.push(scissor.set(x, y, topWidth, height))){
-                top.draw(x, y, Core.atlas.find("shar-bar-top").width, height);
+                top.draw(x, y, Core.atlas.find("unitinfo-bar-top").width, height);
                 ScissorStack.pop();
             }
         }