yawaflua/Informatis
1
0
Fork 0
mirror of https://github.com/yawaflua/Informatis.git synced 2025-12-10 12:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Large amounts of untested refactoring

Browse Source
This commit is contained in:
buthed010203
2021-07-26 14:07:19 -04:00
parent 12616f5419
commit a30856e242
2 changed files with 63 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/UnitInfo/SVars.java
View File

@@ -1,14 +1,13 @@
package UnitInfo; package UnitInfo;
import UnitInfo.core.HudUi; import UnitInfo.core.*;
import UnitInfo.core.PlayerParser; import arc.files.*;
import UnitInfo.core.Setting; import arc.struct.*;
import arc.Core;
import arc.files.Fi; import static mindustry.Vars.*;
import arc.struct.Seq;
public class SVars { public class SVars {
public static Fi modRoot = Core.settings.getDataDirectory().child("mods/UnitInfo"); public static Fi modRoot = modDirectory.child("UnitInfo");
public static Seq<PlayerParser.PlayerInfo> playerInfos = new Seq<>(); public static Seq<PlayerParser.PlayerInfo> playerInfos = new Seq<>();
public static Setting settingAdder = new Setting(); public static Setting settingAdder = new Setting();

123
src/UnitInfo/core/BarInfo.java
View File

@@ -30,9 +30,9 @@ import static mindustry.Vars.content;
import static mindustry.Vars.state; import static mindustry.Vars.state;
public class BarInfo { public class BarInfo {
static Seq<String> strings = new Seq<>(new String[]{"","","","","",""}); static Seq<String> strings = Seq.with("","","","","","");
static Seq<Float> numbers = new Seq<>(new Float[]{0f,0f,0f,0f,0f,0f}); static Seq<Float> numbers = Seq.with(0f,0f,0f,0f,0f,0f);
static Seq<Color> colors = new Seq<>(new Color[]{Color.clear,Color.clear,Color.clear,Color.clear,Color.clear,Color.clear}); static Seq<Color> colors = Seq.with(Color.clear,Color.clear,Color.clear,Color.clear,Color.clear,Color.clear);
public static String format(float number){ public static String format(float number){
if(number >= 10000) return UI.formatAmount((long)number); if(number >= 10000) return UI.formatAmount((long)number);
@@ -48,46 +48,44 @@ public class BarInfo {
} }
if(target instanceof Healthc) { if(target instanceof Healthc healthc){
strings.set(0, Core.bundle.format("shar-stat.health", Strings.fixed(((Healthc)target).health(), 1))); strings.set(0, Core.bundle.format("shar-stat.health", Strings.fixed(healthc.health(), 1)));
colors.set(0, Pal.health); colors.set(0, Pal.health);
numbers.set(0, ((Healthc) target).healthf()); numbers.set(0, healthc.healthf());
} }
if(target instanceof Turret.TurretBuild){ if(target instanceof Turret.TurretBuild turret){
strings.set(1, Core.bundle.format("shar-stat.reload", Strings.fixed((((Turret.TurretBuild)target).reload / ((Turret)((Turret.TurretBuild)target).block).reloadTime) * 100f, 1))); 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.TurretBuild)target).reload / ((Turret)((Turret.TurretBuild)target).block).reloadTime))); colors.set(1, Pal.accent.cpy().lerp(Color.orange, Mathf.clamp((turret.reload / ((Turret)turret.block).reloadTime))));
numbers.set(1, ((Turret.TurretBuild)target).reload / ((Turret)((Turret.TurretBuild)target).block).reloadTime); numbers.set(1, turret.reload / ((Turret)turret.block).reloadTime);
} }
else if(target instanceof Unit && ((Unit) target).type != null){ else if(target instanceof Unit unit && unit.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; 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; 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; ForceFieldAbility ffa;
strings.set(1, Core.bundle.format("shar-stat.shield", format(((Shieldc)target).shield()))); 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); 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){ else if(target instanceof ConstructBlock.ConstructBuild build){
ConstructBlock.ConstructBuild construct = (ConstructBlock.ConstructBuild) target; ConstructBlock.ConstructBuild construct = build;
strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed(construct.progress * 100, 1))); strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed(construct.progress * 100, 1)));
colors.set(1, Pal.darkerMetal); colors.set(1, Pal.darkerMetal);
numbers.set(1, construct.progress); numbers.set(1, construct.progress);
} }
else if(target instanceof UnitFactory.UnitFactoryBuild){ else if(target instanceof UnitFactory.UnitFactoryBuild build){
UnitFactory.UnitFactoryBuild factory = (UnitFactory.UnitFactoryBuild) target; strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed(build.fraction() * 100f, 1)));
strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed(factory.fraction() * 100f, 1)));
colors.set(1, Pal.darkerMetal); colors.set(1, Pal.darkerMetal);
numbers.set(1, factory.fraction()); numbers.set(1, build.fraction());
} }
else if(target instanceof Reconstructor.ReconstructorBuild){ else if(target instanceof Reconstructor.ReconstructorBuild reconstruct){
Reconstructor.ReconstructorBuild reconstruct = (Reconstructor.ReconstructorBuild) target;
strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed(reconstruct.fraction() * 100, 1))); strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed(reconstruct.fraction() * 100, 1)));
colors.set(1, Pal.darkerMetal); colors.set(1, Pal.darkerMetal);
numbers.set(1, reconstruct.fraction()); numbers.set(1, reconstruct.fraction());
} }
else if(target instanceof ForceProjector.ForceBuild){ else if(target instanceof ForceProjector.ForceBuild force){
ForceProjector.ForceBuild force = (ForceProjector.ForceBuild) target;
ForceProjector forceBlock = (ForceProjector) force.block; ForceProjector forceBlock = (ForceProjector) force.block;
float max = forceBlock.shieldHealth + forceBlock.phaseShieldBoost * force.phaseHeat; float max = forceBlock.shieldHealth + forceBlock.phaseShieldBoost * force.phaseHeat;
strings.set(1, Core.bundle.format("shar-stat.shield", format(max-force.buildup), max)); 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) { if(target instanceof ItemTurret.ItemTurretBuild turretBuild) {
ItemTurret.ItemTurretBuild turretBuild = (ItemTurret.ItemTurretBuild) target;
strings.set(2, bundle.format("shar-stat.itemAmmo", format(turretBuild.totalAmmo), format(((ItemTurret)turretBuild.block).maxAmmo))); 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); 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)); numbers.set(2, turretBuild.totalAmmo / (((ItemTurret)turretBuild.block).maxAmmo * 1f));
} }
else if(target instanceof LiquidTurret.LiquidTurretBuild){ else if(target instanceof LiquidTurret.LiquidTurretBuild turretBuild){
LiquidTurret.LiquidTurretBuild turretBuild = (LiquidTurret.LiquidTurretBuild)target;
strings.set(2, bundle.format("shar-stat.liquidAmmo", format(turretBuild.liquids.get(turretBuild.liquids.current())), format(turretBuild.block.liquidCapacity))); 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); colors.set(2, turretBuild.liquids.current().color);
numbers.set(2, turretBuild.liquids.get(turretBuild.liquids.current()) / turretBuild.block.liquidCapacity); numbers.set(2, turretBuild.liquids.get(turretBuild.liquids.current()) / turretBuild.block.liquidCapacity);
} }
else if(target instanceof PowerTurret.PowerTurretBuild){ else if(target instanceof PowerTurret.PowerTurretBuild entity){
PowerTurret.PowerTurretBuild entity = (PowerTurret.PowerTurretBuild)target;
float max = entity.block.consumes.getPower().usage; float max = entity.block.consumes.getPower().usage;
float v = entity.power.status * entity.power.graph.getLastScaledPowerIn(); 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))); strings.set(2, bundle.format("shar-stat.power", format(Math.min(v,max) * 60), format(max * 60)));
colors.set(2, Pal.powerBar); colors.set(2, Pal.powerBar);
numbers.set(2, v/max); numbers.set(2, v/max);
} }
else if(target instanceof Building && ((Building)target).block.hasItems) { else if(target instanceof Building b && b.block.hasItems) {
if(target instanceof CoreBlock.CoreBuild){ if(target instanceof CoreBlock.CoreBuild cb){
CoreBlock.CoreBuild core = (CoreBlock.CoreBuild)target; strings.set(2, bundle.format("shar-stat.itemCapacity", format(((Building) target).items.total()), format(cb.storageCapacity * content.items().count(UnlockableContent::unlockedNow))));
strings.set(2, bundle.format("shar-stat.itemCapacity", format(((Building) target).items.total()), format(core.storageCapacity * content.items().count(UnlockableContent::unlockedNow)))); numbers.set(2, cb.items.total() / (cb.storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f));
numbers.set(2, ((Building)target).items.total() / (core.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++) { for(int i = 0; i < 4; i++) {
Building build = ((Building) target).nearby(i); Building build = sb.nearby(i);
if(build instanceof CoreBlock.CoreBuild){ if(build instanceof CoreBlock.CoreBuild cb){
strings.set(2, bundle.format("shar-stat.itemCapacity", format(((Building) target).items.total()), format(((CoreBlock.CoreBuild) build).storageCapacity * content.items().count(UnlockableContent::unlockedNow)))); strings.set(2, bundle.format("shar-stat.itemCapacity", format(sb.items.total()), format(cb.storageCapacity * content.items().count(UnlockableContent::unlockedNow))));
numbers.set(2, ((Building)target).items.total() / (((CoreBlock.CoreBuild) build).storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f)); numbers.set(2, sb.items.total() / (cb.storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f));
break; break;
} }
} }
} }
else { else {
strings.set(2, bundle.format("shar-stat.itemCapacity", format(((Building)target).items.total()), format(((Building)target).block.itemCapacity))); strings.set(2, bundle.format("shar-stat.itemCapacity", format(b.items.total()), format(b.block.itemCapacity)));
numbers.set(2, ((Building)target).items.total() / (((Building)target).block.itemCapacity * 1f)); numbers.set(2, b.items.total() / (((Building)target).block.itemCapacity * 1f));
} }
colors.set(2, Pal.items); colors.set(2, Pal.items);
} }
else if(target instanceof Unit && ((Unit)target).type() != null) { else if(target instanceof Unit unit && unit.type() != null) {
strings.set(2, bundle.format("shar-stat.itemCapacity", format(((Unit)target).stack().amount), format(((Unit)target).type().itemCapacity))); strings.set(2, bundle.format("shar-stat.itemCapacity", format(unit.stack().amount), format(unit.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)); 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)target).stack().amount / (((Unit)target).type().itemCapacity * 1f)); numbers.set(2, unit.stack().amount / (unit.type().itemCapacity * 1f));
} }
if(target instanceof Turret.TurretBuild){ if(target instanceof Turret.TurretBuild t){
Turret turret = (Turret)((Turret.TurretBuild)target).block; Turret turret = (Turret)t.block;
if(turret.chargeTime > 0f) { if(turret.chargeTime > 0f) {
strings.set(3, Core.bundle.format("shar-stat.charge", format((SVars.hud.charge / turret.chargeTime) * 100))); 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)); colors.set(3, Pal.surge.cpy().lerp(Pal.accent, SVars.hud.charge / turret.chargeTime));
numbers.set(3, SVars.hud.charge / turret.chargeTime); numbers.set(3, SVars.hud.charge / turret.chargeTime);
} }
} }
else if(target instanceof Unit && ((Unit) target).type != null) { 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)target).type().commandLimit))); 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)target).type().commandLimit * 1f))), 1f))); 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)target).type().commandLimit * 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){ else if(target instanceof UnitFactory.UnitFactoryBuild factory){
UnitFactory.UnitFactoryBuild factory = (UnitFactory.UnitFactoryBuild) target;
strings.set(3, factory.unit() == null ? "[lightgray]" + Iconc.cancel : 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)))); 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); colors.set(3, Pal.power);
numbers.set(3, factory.unit() == null ? 0f : (float)factory.team.data().countType(factory.unit()) / Units.getCap(factory.team)); 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){ 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(((Payloadc)target).payloadUsed()))), format(Mathf.round(Mathf.sqrt(((Unit)target).type().payloadCapacity))))); 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); 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){ else if(target instanceof Building build && build.block.hasLiquids){
Building build = (Building) target;
strings.set(4, Core.bundle.format("shar-stat.liquidCapacity", format(build.liquids.currentAmount()), format(build.block.liquidCapacity))); strings.set(4, Core.bundle.format("shar-stat.liquidCapacity", format(build.liquids.currentAmount()), format(build.block.liquidCapacity)));
colors.set(4, build.liquids.current().color); colors.set(4, build.liquids.current().color);
numbers.set(4, build.liquids.currentAmount()/build.block.liquidCapacity); numbers.set(4, build.liquids.currentAmount()/build.block.liquidCapacity);
} }
if(target instanceof Unit && state.rules.unitAmmo && ((Unit) target).type != null){ if(target instanceof Unit unit && state.rules.unitAmmo && unit.type != null){
strings.set(5, Core.bundle.format("shar-stat.ammos", format(((Unit)target).ammo()), format(((Unit)target).type().ammoCapacity))); strings.set(5, Core.bundle.format("shar-stat.ammos", format(unit.ammo()), format(unit.type().ammoCapacity)));
colors.set(5, ((Unit)target).type().ammoType.color); colors.set(5, unit.type().ammoType.color);
numbers.set(5, ((Unit)target).ammof()); numbers.set(5, unit.ammof());
} }
else if(target instanceof Building && ((Building) target).block.hasPower && ((Building) target).block.consumes.hasPower()){ else if(target instanceof Building build && build.block.hasPower && build.block.consumes.hasPower()){
Building build = (Building) target;
ConsumePower cons = build.block.consumes.getPower(); 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))); 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))); else strings.set(5, Core.bundle.format("shar-stat.powerUsage", format(build.power.status * cons.usage * 60f), format(cons.usage * 60f)));