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

clean code up

Browse Source
This commit is contained in:
sharlottes
2022-04-19 00:08:49 +09:00
parent 81b2215c9a
commit de799fffd7
17 changed files with 306 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/UnitInfo/ui/windows/PlayerDisplay.java
View File

@@ -25,6 +25,7 @@ public class PlayerDisplay extends WindowTable implements Updatable {
TextField search;
@Nullable Player target;
float heat;
ImageButton.ImageButtonStyle ustyle;
public PlayerDisplay() {
super("Player Display", Icon.players, t -> {});
@@ -36,6 +37,14 @@ public class PlayerDisplay extends WindowTable implements Updatable {
search = Elem.newField(null, f->{});
search.setMessageText(Core.bundle.get("players.search"));
ustyle = new ImageButton.ImageButtonStyle(){{
down = Styles.none;
up = Styles.none;
imageDownColor = Pal.accent;
imageUpColor = Color.white;
imageOverColor = Color.lightGray;
}};
top();
topBar();
@@ -66,13 +75,6 @@ public class PlayerDisplay extends WindowTable implements Updatable {
public Table rebuild(){
return new Table(table -> {
float h = 74f;
ImageButton.ImageButtonStyle ustyle = new ImageButton.ImageButtonStyle(){{
down = Styles.none;
up = Styles.none;
imageDownColor = Pal.accent;
imageUpColor = Color.white;
imageOverColor = Color.lightGray;
}};
Seq<Player> players = Groups.player.copy(new Seq<>());

18
src/UnitInfo/ui/windows/UnitDisplay.java
View File

@@ -38,8 +38,8 @@ import mindustry.world.blocks.distribution.MassDriver;
import mindustry.world.blocks.payloads.Payload;
import mindustry.world.blocks.power.*;
import static UnitInfo.SVars.clear;
import static UnitInfo.SVars.modUiScale;
import static UnitInfo.SVars.*;
import static UnitInfo.SUtils.*;
import static arc.Core.*;
import static mindustry.Vars.*;
@@ -87,7 +87,7 @@ public class UnitDisplay extends WindowTable implements Updatable {
else if (target instanceof Building b && b.block != null) ui.content.show(b.block);
});
ttt.add(imagebt).update((i) -> {
i.getStyle().imageUp = reg.get().tint(Tmp.c1.set(SVars.hud.locked ? Color.red.cpy().shiftHue(2 * Time.time) : Color.white));
i.getStyle().imageUp = reg.get().tint(Tmp.c1.set(locked ? Color.red.cpy().shiftHue(2 * Time.time) : Color.white));
i.getStyle().imageDown = reg.get().tint(Tmp.c1.mul(Color.darkGray));
i.layout();
}).size(4 * 8f).get().parent = null;
@@ -161,13 +161,9 @@ public class UnitDisplay extends WindowTable implements Updatable {
resizeButton();
}
public static Teamc getTarget() {
return SVars.hud == null ? null : SVars.hud.getTarget();
}
public void lockTarget() {
SVars.hud.locked = !SVars.hud.locked;
SVars.hud.lockedTarget = SVars.hud.locked ? getTarget() : null;
locked = !locked;
target = locked ? getTarget() : null;
}
public void showMoving() {
@@ -337,10 +333,10 @@ public class UnitDisplay extends WindowTable implements Updatable {
if(getDrawable() != null)
getDrawable().draw(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY);
}
}).size(Scl.scl(modUiScale) * iconLarge);
}).size(iconLarge);
}),
new Table(h -> {
h.defaults().growX().height(Scl.scl(modUiScale) * 9f).width(Scl.scl(modUiScale) * iconLarge).padTop(Scl.scl(modUiScale) * 18f);
h.defaults().growX().height(9f).width(iconLarge).padTop(18f);
h.add(new SBar(
() -> "",
() -> Pal.accent.cpy().lerp(Color.orange, mount.reload / weapon.reload),