celanaeflrkl;ekdda;FEACELANEAEALACLEANCLEANCEA

assets/bundles/bundle.properties

@@ -3,6 +3,9 @@ shar-stat.health = Health: {0}
 shar-stat.shield = Shield: {0}
 shar-stat.payloadCapacity = Payloads: {0}² / {1}²
 shar-stat.itemCapacity = Items: {0} / {1}
+shar-stat.liquidCapacity = Liquid: {0} / {1}
+shar-stat.powerCapacity = Power: {0} / {1}
+shar-stat.powerUsage = Power: {0} / {1}
 shar-stat.ammos = Ammo: {0} / {1}
 shar-stat.commandUnits = Commands: {0} / {1}
 shar-stat.reload = Reload: {0}%
@@ -10,6 +13,7 @@ shar-stat.charge = Charge: {0}%
 shar-stat.itemAmmo = Ammo : {0} / {1}
 shar-stat.liquidAmmo = Liquid: {0}
 shar-stat.power = Power: {0} / {1}
+shar-stat.progress = Construct: {0}%
 shar-stat-waveAmount = [lightgray]amount:[] {0}
 shar-stat-waveShield = [lightgray]shield:[] {0}
 shar-stat.waveStatus = [lightgray]status:[]
@@ -46,6 +50,9 @@ setting.select.name = Display select Arrow
 setting.unithealthui.name = Display Unit Bar
 setting.ssim.name = Change Bar style [lightgray](made by ssim)[]
 setting.shar.name = Change Bar style [lightgray](made by shar)[]
+setting.shar1.name = Change Bar style [lightgray](made by shar)[]
+setting.shar2.name = Change Bar style [lightgray](made by shar)[]
+setting.shar3.name = Change Bar style [lightgray](made by shar)[]
 setting.gaycursor.name = Enable mouse trail effect. [lightgray](only for desktop)[]
 
 #Dialog

assets/bundles/bundle_ko.properties

@@ -3,6 +3,9 @@ shar-stat.health = 체력: {0}
 shar-stat.shield = 방어막: {0}
 shar-stat.payloadCapacity = 화물: {0}² / {1}²
 shar-stat.itemCapacity = 아이템: {0} / {1}
+shar-stat.liquidCapacity = 액체: {0} / {1}
+shar-stat.powerCapacity = 전력: {0} / {1}
+shar-stat.powerUsage = 전력: {0} / {1}
 shar-stat.ammos = 탄약: {0} / {1}
 shar-stat.commandUnits = 지휘 유닛: {0} / {1}
 shar-stat.reload = 재장전: {0}%
@@ -10,6 +13,7 @@ shar-stat.charge = 충전: {0}%
 shar-stat.itemAmmo = 탄약 : {0} / {1}
 shar-stat.liquidAmmo = 액체: {0}
 shar-stat.power = 전력: {0} / {1}
+shar-stat.progress = 건설: {0}%
 shar-stat-waveAmount = [lightgray]유닛 수:[] {0}
 shar-stat-waveShield = [lightgray]방어막:[] {0}
 shar-stat.waveStatus = [lightgray]상태이상:[]
@@ -48,6 +52,9 @@ setting.select.name = 선택 화살표 표시
 setting.unithealthui.name = 유닛 바 표시
 setting.ssim.name = 바 스타일 변경 [lightgray](ssim 만듬)[]
 setting.shar.name = 바 스타일 변경 [lightgray](shar 만듬)[]
+setting.shar1.name = 바 스타일 변경 [lightgray](shar 만듬)[]
+setting.shar2.name = 바 스타일 변경 [lightgray](shar 만듬)[]
+setting.shar3.name = 바 스타일 변경 [lightgray](shar 만듬)[]
 setting.gaycursor.name = 마우스 꼬리효과 [lightgray](PC 전용)[]
 
 #Dialog

src/UnitInfo/core/BarInfo.java

@@ -13,8 +13,10 @@ import mindustry.entities.abilities.ForceFieldAbility;
 import mindustry.entities.abilities.ShieldRegenFieldAbility;
 import mindustry.gen.*;
 import mindustry.graphics.Pal;
+import mindustry.world.blocks.ConstructBlock;
 import mindustry.world.blocks.defense.turrets.*;
 import mindustry.world.blocks.storage.*;
+import mindustry.world.consumers.ConsumePower;
 
 
 import static arc.Core.bundle;
@@ -22,9 +24,9 @@ import static mindustry.Vars.content;
 import static mindustry.Vars.state;
 
 public class BarInfo {
-    Seq<String> strings = new Seq<>();
+    Seq<String> strings = new Seq<>(new String[]{"","","","","",""});
-    Seq<Color> colors = new Seq<>();
+    Seq<Float> numbers = new Seq<>(new Float[]{0f,0f,0f,0f,0f,0f});
-    Seq<Float> numbers = new Seq<>();
+    Seq<Color> colors = new Seq<>(new Color[]{Color.clear,Color.clear,Color.clear,Color.clear,Color.clear,Color.clear});
 
     public <T extends Teamc> Seq<String> returnStrings(T target){
         getInfo(target);
@@ -41,9 +43,9 @@ public class BarInfo {
 
     public <T extends Teamc> void getInfo(T target){
         for(int i = 0; i < 6; i++) { //init
-            strings.add("[lightgray]<Empty>[]");
+            strings.set(i, "[lightgray]<Empty>[]");
-            colors.add(Color.clear);
+            colors.set(i, Color.clear);
-            numbers.add(0f);
+            numbers.set(i, 0f);
         }
         
         
@@ -51,19 +53,12 @@ public class BarInfo {
         if(target instanceof Healthc) {
             strings.set(0, Core.bundle.format("shar-stat.health", Strings.fixed(((Healthc)target).health(), 1)));
             colors.set(0, Pal.health);
-            numbers.set(0, ((Healthc) target).health());
+            numbers.set(0, ((Healthc) target).healthf());
         }
 
         
         
-        if(target instanceof BlockUnitUnit && ((BlockUnitUnit)target).tile() instanceof Turret.TurretBuild) {
+        if(target instanceof Turret.TurretBuild){
-            Turret.TurretBuild turretBuild = ((Turret.TurretBuild)((BlockUnitUnit)target).tile());
-            float value = Mathf.clamp(turretBuild.reload / ((Turret)turretBuild.block).reloadTime) * 100f;
-            strings.set(1, Core.bundle.format("shar-stat.reload", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2))));
-            colors.set(1, Pal.accent.cpy().lerp(Color.orange, Mathf.clamp(turretBuild.reload / ((Turret)turretBuild.block).reloadTime)));
-            numbers.set(1, turretBuild.reload / ((Turret)turretBuild.block).reloadTime);
-        }
-        else if(target instanceof Turret.TurretBuild){
             float value = Mathf.clamp(((Turret.TurretBuild)target).reload / ((Turret)((Turret.TurretBuild)target).block).reloadTime) * 100f;
             strings.set(1, Core.bundle.format("shar-stat.reload", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2))));
             colors.set(1, Pal.accent.cpy().lerp(Color.orange, Mathf.clamp(((Turret.TurretBuild)target).reload / ((Turret)((Turret.TurretBuild)target).block).reloadTime)));
@@ -73,26 +68,32 @@ public class BarInfo {
             float max1 = ((ShieldRegenFieldAbility)content.units().copy().filter(ut -> ut.abilities.find(abil -> abil instanceof ShieldRegenFieldAbility) != null).sort(ut -> ((ShieldRegenFieldAbility)ut.abilities.find(abil -> abil instanceof ShieldRegenFieldAbility)).max).peek().abilities.find(abil -> abil instanceof ShieldRegenFieldAbility)).max;
             float max2 = 0f;
             if(((Unit)target).type().abilities.find(abil -> abil instanceof ForceFieldAbility) != null) max2 = ((ForceFieldAbility) ((Unit)target).type().abilities.find(abil -> abil instanceof ForceFieldAbility)).max;
-            strings.set(1, Core.bundle.format("shar-stat.shield", Strings.fixed(((Shieldc)target).shield(),1)));   
+            strings.set(1, Core.bundle.format("shar-stat.shield", Strings.fixed(((Shieldc)target).shield(),1)));
             colors.set(1, Pal.surge);
             numbers.set(1, ((Unit)target).shield() / Math.max(max1, max2));
         }
+        else if(target instanceof ConstructBlock.ConstructBuild){
+            ConstructBlock.ConstructBuild construct = (ConstructBlock.ConstructBuild) target;
+            strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed(construct.progress * 100, 1)));
+            colors.set(1, Pal.darkerMetal);
+            numbers.set(1, construct.progress);
+        }
 
         
-        if(target instanceof ItemTurret.ItemTurretBuild || (target instanceof BlockUnitUnit && ((BlockUnitUnit)target).tile() instanceof ItemTurret.ItemTurretBuild)) {
+        if(target instanceof ItemTurret.ItemTurretBuild) {
-            ItemTurret.ItemTurretBuild turretBuild = target instanceof ItemTurret.ItemTurretBuild ? (ItemTurret.ItemTurretBuild) target : (ItemTurret.ItemTurretBuild)((BlockUnitUnit)target).tile();
+            ItemTurret.ItemTurretBuild turretBuild = (ItemTurret.ItemTurretBuild) target;
             strings.set(2, bundle.format("shar-stat.itemAmmo", turretBuild.totalAmmo, ((ItemTurret)turretBuild.block).maxAmmo));
             colors.set(2, turretBuild.hasAmmo() ? ((ItemTurret)turretBuild.block).ammoTypes.findKey(turretBuild.peekAmmo(), true).color : Pal.ammo);
             numbers.set(2, turretBuild.totalAmmo / (((ItemTurret)turretBuild.block).maxAmmo * 1f));
         }
-        else if(target instanceof LiquidTurret.LiquidTurretBuild || (target instanceof BlockUnitUnit && ((BlockUnitUnit)target).tile() instanceof LiquidTurret.LiquidTurretBuild)){
+        else if(target instanceof LiquidTurret.LiquidTurretBuild){
-            LiquidTurret.LiquidTurretBuild turretBuild = target instanceof LiquidTurret.LiquidTurretBuild ? (LiquidTurret.LiquidTurretBuild)target : ((LiquidTurret.LiquidTurretBuild)((BlockUnitUnit)target).tile());
+            LiquidTurret.LiquidTurretBuild turretBuild = (LiquidTurret.LiquidTurretBuild)target;
             strings.set(2, bundle.format("shar-stat.liquidAmmo", Strings.fixed(turretBuild.liquids.get(turretBuild.liquids.current()), 1)  + " / " + Strings.fixed(turretBuild.block.liquidCapacity, 1)));
             colors.set(2, turretBuild.liquids.current().color);
             numbers.set(2, turretBuild.liquids.get(turretBuild.liquids.current()) / turretBuild.block.liquidCapacity);
         }
-        else if(target instanceof PowerTurret.PowerTurretBuild || (target instanceof BlockUnitUnit && ((BlockUnitUnit)target).tile() instanceof PowerTurret.PowerTurretBuild)){
+        else if(target instanceof PowerTurret.PowerTurretBuild){
-            PowerTurret.PowerTurretBuild entity = target instanceof PowerTurret.PowerTurretBuild ? (PowerTurret.PowerTurretBuild)target : ((PowerTurret.PowerTurretBuild)((BlockUnitUnit)target).tile());
+            PowerTurret.PowerTurretBuild entity = (PowerTurret.PowerTurretBuild)target;
             float max = entity.block.consumes.getPower().usage;
             float v = entity.power.status * entity.power.graph.getLastScaledPowerIn();
             strings.set(2, bundle.format("shar-stat.power", (int)(Math.min(v,max) * 60), (int)(max * 60)));
@@ -129,15 +130,16 @@ public class BarInfo {
 
         
         
-        if(target instanceof Turret.TurretBuild || (target instanceof BlockUnitUnit && ((BlockUnitUnit) target).tile() instanceof Turret.TurretBuild)){
+        if(target instanceof Turret.TurretBuild){
-            Turret turret = target instanceof Turret.TurretBuild ? (Turret)((Turret.TurretBuild)target).block : (Turret)(((BlockUnitUnit) target).tile()).block;
+            Turret turret = (Turret)((Turret.TurretBuild)target).block;
-            if(turret.chargeTime > 0f) return;
+            if(turret.chargeTime > 0f) {
-            float value = Mathf.clamp(Main.hud.heat2 / turret.chargeTime) * 100f;
+                float value = Mathf.clamp(Main.hud.heat2 / turret.chargeTime) * 100f;
-            strings.set(3, Core.bundle.format("shar-stat.charge", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2))));
+                strings.set(3, Core.bundle.format("shar-stat.charge", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2))));
-            colors.set(3, Pal.surge.cpy().lerp(Pal.accent, Main.hud.heat2 / turret.chargeTime));
+                colors.set(3, Pal.surge.cpy().lerp(Pal.accent, Main.hud.heat2 / turret.chargeTime));
-            numbers.set(3, Main.hud.heat2 / turret.chargeTime);
+                numbers.set(3, Main.hud.heat2 / turret.chargeTime);
+            }
         }
-        else if(target instanceof Unit && !(target instanceof BlockUnitUnit) && ((Unit) target).type != null) {
+        else if(target instanceof Unit && ((Unit) target).type != null) {
             strings.set(3, Core.bundle.format("shar-stat.commandUnits", Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == target), ((Unit)target).type().commandLimit));
             colors.set(3, Pal.powerBar.cpy().lerp(Pal.surge.cpy().mul(Pal.lighterOrange), Mathf.absin(Time.time, 7f / (1f + Mathf.clamp(Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == target) / (((Unit)target).type().commandLimit * 1f))), 1f)));
             numbers.set(3, Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == target) / (((Unit)target).type().commandLimit * 1f));
@@ -150,14 +152,27 @@ public class BarInfo {
             colors.set(4, Pal.items);
             numbers.set(4, ((Payloadc)target).payloadUsed() / ((Unit)target).type().payloadCapacity);
         }
+        else if(target instanceof Building && ((Building) target).block.hasLiquids){
+            Building build = (Building) target;
+            strings.set(4, Core.bundle.format("shar-stat.liquidCapacity", Strings.fixed(build.liquids.currentAmount(),1), Strings.fixed(build.block.liquidCapacity,1)));
+            colors.set(4, build.liquids.current().color);
+            numbers.set(4, build.liquids.currentAmount()/build.block.liquidCapacity);
+        }
 
 
 
-        if(target instanceof Unit && state.rules.unitAmmo&& ((Unit) target).type != null){
+        if(target instanceof Unit && state.rules.unitAmmo && ((Unit) target).type != null){
             strings.set(5, Core.bundle.format("shar-stat.ammos", ((Unit)target).ammo(), ((Unit)target).type().ammoCapacity));
             colors.set(5, ((Unit)target).type().ammoType.color);
             numbers.set(5, ((Unit)target).ammof());
         }
-
+        else if(target instanceof Building && ((Building) target).block.hasPower && ((Building) target).block.consumes.hasPower()){
+            Building build = (Building) target;
+            ConsumePower cons = build.block.consumes.getPower();
+            if(cons.buffered) strings.set(5, Core.bundle.format("shar-stat.powerCapacity", Strings.fixed(build.power.status * cons.capacity * 60f, 1), Strings.fixed(cons.capacity * 60f, 1)));
+            else strings.set(5, Core.bundle.format("shar-stat.powerUsage", Strings.fixed(build.power.status * cons.usage * 60f, 1), Strings.fixed(cons.usage * 60f, 1)));
+            colors.set(5,Pal.powerBar);
+            numbers.set(5, Mathf.zero(cons.requestedPower(build)) && build.power.graph.getPowerProduced() + build.power.graph.getBatteryStored() > 0f ? 1f : build.power.status);
+        }
     }
 }

src/UnitInfo/core/HudUi.java

@@ -2,7 +2,6 @@ package UnitInfo.core;
 
 import UnitInfo.ui.*;
 import arc.*;
-import arc.func.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.input.KeyCode;
@@ -25,6 +24,7 @@ import mindustry.input.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.*;
+import mindustry.world.blocks.ConstructBlock;
 import mindustry.world.blocks.defense.turrets.*;
 import mindustry.world.blocks.storage.*;
 
@@ -68,7 +68,10 @@ public class HudUi {
         Seq<Unit> units = Groups.unit.intersect(Core.input.mouseWorldX(), Core.input.mouseWorldY(), 4, 4);
         if(units.size > 0) return (T) units.peek();
         if(getTile() != null && getTile().build != null) return (T) getTile().build;
-        else return (T) player.unit();
+        else {
+            if(player.unit() instanceof BlockUnitUnit && ((BlockUnitUnit)player.unit()).tile() != null) return (T)((BlockUnitUnit)player.unit()).tile();
+            return (T) player.unit();
+        }
     }
 
     public @Nullable Tile getTile(){
@@ -246,91 +249,24 @@ public class HudUi {
             add(new Table(){{
                 left();
                 update(() -> {
-                    if((!(getUnit() instanceof BlockUnitUnit) || (
+                    if(!(getUnit() instanceof Turret.TurretBuild) || (
-                        !(((BlockUnitUnit)getUnit()).tile() instanceof ItemTurret.ItemTurretBuild)
-                        && !(((BlockUnitUnit)getUnit()).tile() instanceof LiquidTurret.LiquidTurretBuild)
-                        && !(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild)))
-                    || (!(getUnit() instanceof Turret.TurretBuild) || (
                         !(getUnit() instanceof ItemTurret.ItemTurretBuild)
                             && !(getUnit() instanceof LiquidTurret.LiquidTurretBuild)
-                            && !(getUnit() instanceof PowerTurret.PowerTurretBuild)))){
+                            && !(getUnit() instanceof PowerTurret.PowerTurretBuild))){
                         clearChildren();
                         image = null;
                         return;
                     }
-
-                    if(getUnit() instanceof BlockUnitUnit){
-                        Element imaget = new Element();
-                        if(((BlockUnitUnit)getUnit()).tile() instanceof ItemTurret.ItemTurretBuild){
-                            MultiReqImage itemReq = new MultiReqImage();
-                            for(Item item : ((ItemTurret) ((BlockUnitUnit) getUnit()).tile().block).ammoTypes.keys())
-                                itemReq.add(new ReqImage(item.uiIcon, () -> ((ItemTurret.ItemTurretBuild)((BlockUnitUnit) getUnit()).tile()).hasAmmo()));
-                            imaget = itemReq;
-
-                            if(((ItemTurret.ItemTurretBuild)((BlockUnitUnit) getUnit()).tile()).hasAmmo())
-                                imaget = new Image(((ItemTurret) ((BlockUnitUnit) getUnit()).tile().block).ammoTypes.findKey(((ItemTurret.ItemTurretBuild)((BlockUnitUnit) getUnit()).tile()).peekAmmo(), true).uiIcon).setScaling(Scaling.fit);
-
-                        }
-                        else if(((BlockUnitUnit)getUnit()).tile() instanceof LiquidTurret.LiquidTurretBuild){
-                            LiquidTurret.LiquidTurretBuild entity = ((LiquidTurret.LiquidTurretBuild)((BlockUnitUnit)getUnit()).tile());
-                            Func<Building, Liquid> current;
-                            current = entity1 -> entity1.liquids == null ? Liquids.water : entity1.liquids.current();
-
-                            MultiReqImage liquidReq = new MultiReqImage();
-                            for(Liquid liquid : ((LiquidTurret) ((BlockUnitUnit) getUnit()).tile().block).ammoTypes.keys())
-                                liquidReq.add(new ReqImage(liquid.uiIcon, () -> ((LiquidTurret.LiquidTurretBuild)((BlockUnitUnit) getUnit()).tile()).hasAmmo()));
-                            imaget = liquidReq;
-
-                            if(((LiquidTurret.LiquidTurretBuild)((BlockUnitUnit) getUnit()).tile()).hasAmmo())
-                                imaget = new Image(current.get(entity).uiIcon).setScaling(Scaling.fit);
-                        }
-                        else if(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild){
-                            imaget = new ReqImage(Icon.power.getRegion(), () -> ((BlockUnitUnit)getUnit()).tile().power.status * ((BlockUnitUnit)getUnit()).tile().power.graph.getLastScaledPowerIn() > 0f){
-                                {
-                                    {
-                                    add(new Image(Icon.power.getRegion()));
-                                    add(new Element(){
-                                        @Override
-                                        public void draw(){
-                                        Building entity = ((BlockUnitUnit)getUnit()).tile();
-                                        float max = entity.block.consumes.getPower().usage;
-                                        float v = entity.power.status * entity.power.graph.getLastScaledPowerIn();
-
-                                        Lines.stroke(Scl.scl(2f), Pal.removeBack);
-                                        Draw.alpha(1 - v/max);
-                                        Lines.line(x, y - 2f + height, x + width, y - 2f);
-                                        Draw.color(Pal.remove);
-                                        Draw.alpha(1 - v/max);
-                                        Lines.line(x, y + height, x + width, y);
-                                        Draw.reset();
-                                        }
-                                    });
-                                }}
-                            };
-                        }
-
-                        if(image != null){
-                            if(imaget.getClass() != image.getClass() || imaget.getClass() == Image.class){
-                                clearChildren();
-                                add(imaget).size(iconSmall).padBottom(2 * 8f).padRight(3 * 8f);
-                                image = imaget;
-                            }
-                        }
-                        else {
-                            add(imaget).size(iconSmall).padBottom(2 * 8f).padRight(3 * 8f);
-                            image = imaget;
-                        }
-                    }
                     if(getUnit() instanceof Turret.TurretBuild){
                         Element imaget = new Element();
                         if(getUnit() instanceof ItemTurret.ItemTurretBuild){
-                            MultiReqImage itemReq = new MultiReqImage();
+                            ItemTurret.ItemTurretBuild turretBuild = getUnit();
-                            for(Item item : ((ItemTurret) ((ItemTurret.ItemTurretBuild) getUnit()).block).ammoTypes.keys())
+                            if(turretBuild.hasAmmo()) imaget = new Image(((ItemTurret)turretBuild.block).ammoTypes.findKey(turretBuild.peekAmmo(), true).uiIcon);
-                                itemReq.add(new ReqImage(item.uiIcon, () -> ((ItemTurret.ItemTurretBuild)getUnit()).hasAmmo()));
+                            else {MultiReqImage itemReq = new MultiReqImage();
-                            imaget = itemReq;
+                                for(Item item : ((ItemTurret) turretBuild.block).ammoTypes.keys())
-
+                                    itemReq.add(new ReqImage(item.uiIcon, turretBuild::hasAmmo));
-                            if(((ItemTurret.ItemTurretBuild)((BlockUnitUnit) getUnit()).tile()).hasAmmo())
+                                imaget = itemReq;
-                                imaget = new Image(((ItemTurret) ((ItemTurret.ItemTurretBuild) getUnit()).block).ammoTypes.findKey(((ItemTurret.ItemTurretBuild) getUnit()).peekAmmo(), true).uiIcon).setScaling(Scaling.fit);
+                            }
                         }
                         else if(getUnit() instanceof LiquidTurret.LiquidTurretBuild){
                             LiquidTurret.LiquidTurretBuild entity = getUnit();
@@ -391,7 +327,7 @@ public class HudUi {
                     }
                     @Override
                     public void draw() {
-                        if(getUnit() instanceof Building || (getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild)) return;
+                        if(getUnit() instanceof Building) return;
                         super.draw();
                     }
                 }.setScaling(Scaling.fit)).size(Scl.scl(30f)).padBottom(Scl.scl(4 * 8f)).padRight(Scl.scl(6 * 8f));
@@ -400,9 +336,9 @@ public class HudUi {
         }});
 
         bars.add(new SBar(
-                () -> strings.get(3),
+            () -> strings.get(3),
-                () -> colors.get(3),
+            () -> colors.get(3),
-                () -> numbers.get(3)
+            () -> numbers.get(3)
         ));
 
         bars.add(new SBar(
@@ -533,14 +469,10 @@ public class HudUi {
                         add(new Table(ttt -> ttt.add(new Image(){{
                             update(() -> {
                                 TextureRegion region = Core.atlas.find("clear");
-                                if(getUnit() instanceof Unit){
+                                if(getUnit() instanceof Unit && ((Unit)getUnit()).type() != null) region = ((Unit)getUnit()).type().uiIcon;
-                                    if(getUnit() instanceof BlockUnitUnit && ((Unit)getUnit()).type() != null)
+                                else if(getUnit() instanceof Building && ((Building)getUnit()).block() != null) {
-                                        region = ((BlockUnitUnit)getUnit()).tile().block.uiIcon;
+                                        if(getUnit() instanceof ConstructBlock.ConstructBuild) region = ((ConstructBlock.ConstructBuild) getUnit()).current.uiIcon;
-                                    else if(getUnit() != null && ((Unit)getUnit()).type() != null)
+                                        else region = ((Building) getUnit()).block.uiIcon;
-                                        region = ((Unit)getUnit()).type().uiIcon;
-                                }
-                                else if(getUnit() instanceof Buildingc && ((Buildingc)getUnit()).block() != null) {
-                                        region = ((Buildingc) getUnit()).block().uiIcon;
                                 }
                                 setDrawable(region);
                             });
@@ -553,7 +485,7 @@ public class HudUi {
                                 }){
                                     @Override
                                     public void draw() {
-                                        if(getUnit() instanceof Building || (getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild)) return;
+                                        if(getUnit() instanceof Building) return;
                                         super.draw();
                                     }
                                 });
@@ -566,7 +498,7 @@ public class HudUi {
                                 }){
                                     @Override
                                     public void draw() {
-                                        if(getUnit() instanceof Building || (getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild)) return;
+                                        if(getUnit() instanceof Building) return;
                                         super.draw();
                                     }
                                 });
@@ -575,22 +507,18 @@ public class HudUi {
                     }};
 
                     Label label = new Label(() -> {
-                        String name = "";
+                        String name = "";if (getUnit() instanceof Unit && ((Unit) getUnit()).type() != null)
-                        if (getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild)
-                            name = "[accent]" + ((BlockUnitUnit) getUnit()).tile().block.localizedName + "[]";
-                        else if (getUnit() instanceof Unit && ((Unit) getUnit()).type() != null)
                             name = "[accent]" + ((Unit) getUnit()).type().localizedName + "[]";
-                        else if (getUnit() instanceof Buildingc && ((Buildingc) getUnit()).block() != null) {
+                        else if (getUnit() instanceof Building && ((Building) getUnit()).block() != null) {
-                            name = "[accent]" + ((Buildingc) getUnit()).block().localizedName + "[]";
+                            if(getUnit() instanceof ConstructBlock.ConstructBuild) name = "[accent]" + ((ConstructBlock.ConstructBuild) getUnit()).current.localizedName + "[]";
+                            else name = "[accent]" + ((Building) getUnit()).block.localizedName + "[]";
                         }
                         return name;
                     });
 
                     label.setFontScale(Scl.scl());
                     TextButton button = Elem.newButton("?", Styles.clearPartialt, () -> {
-                        if (getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild)
+                        if (getUnit() instanceof Unit && ((Unit) getUnit()).type() != null)
-                            ui.content.show(((BlockUnitUnit) getUnit()).tile().block);
-                        else if (getUnit() instanceof Unit && ((Unit) getUnit()).type() != null)
                             ui.content.show(((Unit) getUnit()).type());
                         else if (getUnit() instanceof Buildingc && ((Buildingc) getUnit()).block() != null) {
                             ui.content.show(((Buildingc) getUnit()).block());
@@ -627,9 +555,8 @@ public class HudUi {
                 strings = info.returnStrings(getUnit());
                 numbers = info.returnNumbers(getUnit());
                 colors = info.returnColors(getUnit());
-                if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild){
+                if(getUnit() instanceof Turret.TurretBuild){
-                    Turret.TurretBuild entity = ((Turret.TurretBuild)((BlockUnitUnit) getUnit()).tile());
+                    if(((Turret.TurretBuild)getUnit()).charging) heat2 += Time.delta;
-                    if(entity.charging) heat2 += Time.delta;
                     else heat2 = 0f;
                 }
                 heat += Time.delta;

src/UnitInfo/core/Setting.java

@@ -290,6 +290,9 @@ public class Setting {
         addGraphicCheckSetting("unithealthui", true);
         addGraphicCheckSetting("ssim", false);
         addGraphicCheckSetting("shar", false);
+        addGraphicCheckSetting("shar1", false);
+        addGraphicCheckSetting("shar2", false);
+        addGraphicCheckSetting("shar3", false);
         addGraphicCheckSetting("gaycursor", false);
     }
 }

src/UnitInfo/ui/SBar.java

@@ -55,11 +55,12 @@ public class SBar extends Element{
 
     @Override
     public void draw(){
-        boolean valid = true;
+        if(fraction == null) return;
-        if(fraction == null || !valid) return;
         boolean ssim = Core.settings.getBool("ssim");
         boolean shar = Core.settings.getBool("shar");
-
+        boolean shar1 = Core.settings.getBool("shar1");
+        boolean shar2 = Core.settings.getBool("shar2");
+        boolean shar3 = Core.settings.getBool("shar3");
         float computed;
         try{
             computed = Mathf.clamp(fraction.get());
@@ -95,6 +96,22 @@ public class SBar extends Element{
             top = (NinePatchDrawable) drawable("unitinfo-barSSS-top", 25, 25, 17, 17);
             spriteWidth = Core.atlas.find("unitinfo-barSSS").width;
         }
+        else if(shar1){
+            bar = (NinePatchDrawable) drawable("unitinfo-barSSSS", 25, 25, 17, 17);
+            top = (NinePatchDrawable) drawable("unitinfo-barSSSS-top", 25, 25, 17, 17);
+            spriteWidth = Core.atlas.find("unitinfo-barSSSS").width;
+        }
+        else if(shar2){
+            bar = (NinePatchDrawable) drawable("unitinfo-barSSSSS", 27, 27, 16, 16);
+            top = (NinePatchDrawable) drawable("unitinfo-barSSSSS-top", 27, 27, 16, 16);
+            spriteWidth = Core.atlas.find("unitinfo-barSSSSS").width;
+        }
+        else if(shar3){
+            bar = (NinePatchDrawable) drawable("unitinfo-barSSSSSS", 32, 32, 16, 16);
+            top = (NinePatchDrawable) drawable("unitinfo-barSSSSSS-top", 32, 32, 16, 16);
+            spriteWidth = Core.atlas.find("unitinfo-barSSSSSS").width;
+        }
+
 
         Draw.colorl(0.1f);
         bar.draw(x, y, width, height);