diff --git a/src/UnitInfo/SVars.java b/src/UnitInfo/SVars.java index e2fc8a1..f4791de 100644 --- a/src/UnitInfo/SVars.java +++ b/src/UnitInfo/SVars.java @@ -1,14 +1,13 @@ package UnitInfo; -import UnitInfo.core.HudUi; -import UnitInfo.core.PlayerParser; -import UnitInfo.core.Setting; -import arc.Core; -import arc.files.Fi; -import arc.struct.Seq; +import UnitInfo.core.*; +import arc.files.*; +import arc.struct.*; + +import static mindustry.Vars.*; public class SVars { - public static Fi modRoot = Core.settings.getDataDirectory().child("mods/UnitInfo"); + public static Fi modRoot = modDirectory.child("UnitInfo"); public static Seq playerInfos = new Seq<>(); public static Setting settingAdder = new Setting(); diff --git a/src/UnitInfo/core/BarInfo.java b/src/UnitInfo/core/BarInfo.java index 93cfd6e..eaba949 100644 --- a/src/UnitInfo/core/BarInfo.java +++ b/src/UnitInfo/core/BarInfo.java @@ -30,9 +30,9 @@ import static mindustry.Vars.content; import static mindustry.Vars.state; public class BarInfo { - static Seq strings = new Seq<>(new String[]{"","","","","",""}); - static Seq numbers = new Seq<>(new Float[]{0f,0f,0f,0f,0f,0f}); - static Seq colors = new Seq<>(new Color[]{Color.clear,Color.clear,Color.clear,Color.clear,Color.clear,Color.clear}); + static Seq strings = Seq.with("","","","","",""); + static Seq numbers = Seq.with(0f,0f,0f,0f,0f,0f); + static Seq colors = Seq.with(Color.clear,Color.clear,Color.clear,Color.clear,Color.clear,Color.clear); public static String format(float number){ if(number >= 10000) return UI.formatAmount((long)number); @@ -48,46 +48,44 @@ public class BarInfo { } - if(target instanceof Healthc) { - strings.set(0, Core.bundle.format("shar-stat.health", Strings.fixed(((Healthc)target).health(), 1))); + if(target instanceof Healthc healthc){ + strings.set(0, Core.bundle.format("shar-stat.health", Strings.fixed(healthc.health(), 1))); colors.set(0, Pal.health); - numbers.set(0, ((Healthc) target).healthf()); + numbers.set(0, healthc.healthf()); } - if(target instanceof Turret.TurretBuild){ - strings.set(1, Core.bundle.format("shar-stat.reload", Strings.fixed((((Turret.TurretBuild)target).reload / ((Turret)((Turret.TurretBuild)target).block).reloadTime) * 100f, 1))); - colors.set(1, Pal.accent.cpy().lerp(Color.orange, Mathf.clamp(((Turret.TurretBuild)target).reload / ((Turret)((Turret.TurretBuild)target).block).reloadTime))); - numbers.set(1, ((Turret.TurretBuild)target).reload / ((Turret)((Turret.TurretBuild)target).block).reloadTime); + if(target instanceof Turret.TurretBuild turret){ + strings.set(1, Core.bundle.format("shar-stat.reload", Strings.fixed((turret.reload / ((Turret)turret.block).reloadTime) * 100f, 1))); + colors.set(1, Pal.accent.cpy().lerp(Color.orange, Mathf.clamp((turret.reload / ((Turret)turret.block).reloadTime)))); + numbers.set(1, turret.reload / ((Turret)turret.block).reloadTime); } - else if(target instanceof Unit && ((Unit) target).type != null){ - 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; + else if(target instanceof Unit unit && unit.type != null){ + float max1 = ((ShieldRegenFieldAbility)content.units().copy().filter(ut -> ut.abilities.contains(abil -> abil instanceof ShieldRegenFieldAbility)).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", format(((Shieldc)target).shield()))); + ForceFieldAbility ffa; + if((ffa = (ForceFieldAbility) unit.type().abilities.find(abil -> abil instanceof ForceFieldAbility)) != null) max2 = ffa.max; + strings.set(1, Core.bundle.format("shar-stat.shield", format(unit.shield()))); colors.set(1, Pal.surge); - numbers.set(1, ((Unit)target).shield() / Math.max(max1, max2)); + numbers.set(1, unit.shield() / Math.max(max1, max2)); } - else if(target instanceof ConstructBlock.ConstructBuild){ - ConstructBlock.ConstructBuild construct = (ConstructBlock.ConstructBuild) target; + else if(target instanceof ConstructBlock.ConstructBuild build){ + ConstructBlock.ConstructBuild construct = build; 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); } - else if(target instanceof UnitFactory.UnitFactoryBuild){ - UnitFactory.UnitFactoryBuild factory = (UnitFactory.UnitFactoryBuild) target; - strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed(factory.fraction() * 100f, 1))); + else if(target instanceof UnitFactory.UnitFactoryBuild build){ + strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed(build.fraction() * 100f, 1))); colors.set(1, Pal.darkerMetal); - numbers.set(1, factory.fraction()); + numbers.set(1, build.fraction()); } - else if(target instanceof Reconstructor.ReconstructorBuild){ - Reconstructor.ReconstructorBuild reconstruct = (Reconstructor.ReconstructorBuild) target; + else if(target instanceof Reconstructor.ReconstructorBuild reconstruct){ strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed(reconstruct.fraction() * 100, 1))); colors.set(1, Pal.darkerMetal); numbers.set(1, reconstruct.fraction()); } - else if(target instanceof ForceProjector.ForceBuild){ - ForceProjector.ForceBuild force = (ForceProjector.ForceBuild) target; + else if(target instanceof ForceProjector.ForceBuild force){ ForceProjector forceBlock = (ForceProjector) force.block; float max = forceBlock.shieldHealth + forceBlock.phaseShieldBoost * force.phaseHeat; strings.set(1, Core.bundle.format("shar-stat.shield", format(max-force.buildup), max)); @@ -96,96 +94,89 @@ public class BarInfo { } - if(target instanceof ItemTurret.ItemTurretBuild) { - ItemTurret.ItemTurretBuild turretBuild = (ItemTurret.ItemTurretBuild) target; + if(target instanceof ItemTurret.ItemTurretBuild turretBuild) { strings.set(2, bundle.format("shar-stat.itemAmmo", format(turretBuild.totalAmmo), format(((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){ - LiquidTurret.LiquidTurretBuild turretBuild = (LiquidTurret.LiquidTurretBuild)target; + else if(target instanceof LiquidTurret.LiquidTurretBuild turretBuild){ strings.set(2, bundle.format("shar-stat.liquidAmmo", format(turretBuild.liquids.get(turretBuild.liquids.current())), format(turretBuild.block.liquidCapacity))); 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){ - PowerTurret.PowerTurretBuild entity = (PowerTurret.PowerTurretBuild)target; + else if(target instanceof PowerTurret.PowerTurretBuild entity){ float max = entity.block.consumes.getPower().usage; float v = entity.power.status * entity.power.graph.getLastScaledPowerIn(); strings.set(2, bundle.format("shar-stat.power", format(Math.min(v,max) * 60), format(max * 60))); colors.set(2, Pal.powerBar); numbers.set(2, v/max); } - else if(target instanceof Building && ((Building)target).block.hasItems) { - if(target instanceof CoreBlock.CoreBuild){ - CoreBlock.CoreBuild core = (CoreBlock.CoreBuild)target; - strings.set(2, bundle.format("shar-stat.itemCapacity", format(((Building) target).items.total()), format(core.storageCapacity * content.items().count(UnlockableContent::unlockedNow)))); - numbers.set(2, ((Building)target).items.total() / (core.storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f)); + else if(target instanceof Building b && b.block.hasItems) { + if(target instanceof CoreBlock.CoreBuild cb){ + strings.set(2, bundle.format("shar-stat.itemCapacity", format(((Building) target).items.total()), format(cb.storageCapacity * content.items().count(UnlockableContent::unlockedNow)))); + numbers.set(2, cb.items.total() / (cb.storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f)); } - else if(target instanceof StorageBlock.StorageBuild && !((StorageBlock.StorageBuild)target).canPickup()){ + else if(target instanceof StorageBlock.StorageBuild sb && !sb.canPickup()){ for(int i = 0; i < 4; i++) { - Building build = ((Building) target).nearby(i); - if(build instanceof CoreBlock.CoreBuild){ - strings.set(2, bundle.format("shar-stat.itemCapacity", format(((Building) target).items.total()), format(((CoreBlock.CoreBuild) build).storageCapacity * content.items().count(UnlockableContent::unlockedNow)))); - numbers.set(2, ((Building)target).items.total() / (((CoreBlock.CoreBuild) build).storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f)); + Building build = sb.nearby(i); + if(build instanceof CoreBlock.CoreBuild cb){ + strings.set(2, bundle.format("shar-stat.itemCapacity", format(sb.items.total()), format(cb.storageCapacity * content.items().count(UnlockableContent::unlockedNow)))); + numbers.set(2, sb.items.total() / (cb.storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f)); break; } } } else { - strings.set(2, bundle.format("shar-stat.itemCapacity", format(((Building)target).items.total()), format(((Building)target).block.itemCapacity))); - numbers.set(2, ((Building)target).items.total() / (((Building)target).block.itemCapacity * 1f)); + strings.set(2, bundle.format("shar-stat.itemCapacity", format(b.items.total()), format(b.block.itemCapacity))); + numbers.set(2, b.items.total() / (((Building)target).block.itemCapacity * 1f)); } colors.set(2, Pal.items); } - else if(target instanceof Unit && ((Unit)target).type() != null) { - strings.set(2, bundle.format("shar-stat.itemCapacity", format(((Unit)target).stack().amount), format(((Unit)target).type().itemCapacity))); - if(((Unit)target).stack().amount > 0 && ((Unit)target).stack().item != null) colors.set(2, ((Unit)target).stack().item.color.cpy().lerp(Color.white, 0.15f)); - numbers.set(2, ((Unit)target).stack().amount / (((Unit)target).type().itemCapacity * 1f)); + else if(target instanceof Unit unit && unit.type() != null) { + strings.set(2, bundle.format("shar-stat.itemCapacity", format(unit.stack().amount), format(unit.type().itemCapacity))); + if(unit.stack().amount > 0 && unit.stack().item != null) colors.set(2, unit.stack().item.color.cpy().lerp(Color.white, 0.15f)); + numbers.set(2, unit.stack().amount / (unit.type().itemCapacity * 1f)); } - if(target instanceof Turret.TurretBuild){ - Turret turret = (Turret)((Turret.TurretBuild)target).block; + if(target instanceof Turret.TurretBuild t){ + Turret turret = (Turret)t.block; if(turret.chargeTime > 0f) { strings.set(3, Core.bundle.format("shar-stat.charge", format((SVars.hud.charge / turret.chargeTime) * 100))); colors.set(3, Pal.surge.cpy().lerp(Pal.accent, SVars.hud.charge / turret.chargeTime)); numbers.set(3, SVars.hud.charge / turret.chargeTime); } } - else if(target instanceof Unit && ((Unit) target).type != null) { - strings.set(3, Core.bundle.format("shar-stat.commandUnits", format(Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == target)), format(((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)); + else if(target instanceof Unit unit && unit.type != null) { + strings.set(3, Core.bundle.format("shar-stat.commandUnits", format(Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == target)), format(unit.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.type().commandLimit * 1f))), 1f))); + numbers.set(3, Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == target) / (unit.type().commandLimit * 1f)); } - else if(target instanceof UnitFactory.UnitFactoryBuild){ - UnitFactory.UnitFactoryBuild factory = (UnitFactory.UnitFactoryBuild) target; + else if(target instanceof UnitFactory.UnitFactoryBuild factory){ strings.set(3, factory.unit() == null ? "[lightgray]" + Iconc.cancel : Core.bundle.format("bar.unitcap", Fonts.getUnicodeStr(factory.unit().name), format(factory.team.data().countType(factory.unit())), format(Units.getCap(factory.team)))); colors.set(3, Pal.power); numbers.set(3, factory.unit() == null ? 0f : (float)factory.team.data().countType(factory.unit()) / Units.getCap(factory.team)); } - if(target instanceof Unit && target instanceof Payloadc && ((Unit) target).type != null){ - strings.set(4, Core.bundle.format("shar-stat.payloadCapacity", format(Mathf.round(Mathf.sqrt(((Payloadc)target).payloadUsed()))), format(Mathf.round(Mathf.sqrt(((Unit)target).type().payloadCapacity))))); + if(target instanceof Unit unit && target instanceof Payloadc pay && unit.type != null){ + strings.set(4, Core.bundle.format("shar-stat.payloadCapacity", format(Mathf.round(Mathf.sqrt(pay.payloadUsed()))), format(Mathf.round(Mathf.sqrt(unit.type().payloadCapacity))))); colors.set(4, Pal.items); - numbers.set(4, ((Payloadc)target).payloadUsed() / ((Unit)target).type().payloadCapacity); + numbers.set(4, pay.payloadUsed() / unit.type().payloadCapacity); } - else if(target instanceof Building && ((Building) target).block.hasLiquids){ - Building build = (Building) target; + else if(target instanceof Building build && build.block.hasLiquids){ strings.set(4, Core.bundle.format("shar-stat.liquidCapacity", format(build.liquids.currentAmount()), format(build.block.liquidCapacity))); 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){ - strings.set(5, Core.bundle.format("shar-stat.ammos", format(((Unit)target).ammo()), format(((Unit)target).type().ammoCapacity))); - colors.set(5, ((Unit)target).type().ammoType.color); - numbers.set(5, ((Unit)target).ammof()); + if(target instanceof Unit unit && state.rules.unitAmmo && unit.type != null){ + strings.set(5, Core.bundle.format("shar-stat.ammos", format(unit.ammo()), format(unit.type().ammoCapacity))); + colors.set(5, unit.type().ammoType.color); + numbers.set(5, unit.ammof()); } - else if(target instanceof Building && ((Building) target).block.hasPower && ((Building) target).block.consumes.hasPower()){ - Building build = (Building) target; + else if(target instanceof Building build && build.block.hasPower && build.block.consumes.hasPower()){ ConsumePower cons = build.block.consumes.getPower(); if(cons.buffered) strings.set(5, Core.bundle.format("shar-stat.powerCapacity", format(build.power.status * cons.capacity * 60f), format(cons.capacity * 60f))); else strings.set(5, Core.bundle.format("shar-stat.powerUsage", format(build.power.status * cons.usage * 60f), format(cons.usage * 60f)));