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

code cleanup with refactoring

Browse Source
This commit is contained in:
sharlottes
2022-04-24 15:48:41 +09:00
parent 973f5e78d1
commit 0bc93735c0
3 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/unitinfo/core/Main.java
View File

@@ -36,11 +36,12 @@ public class Main extends Mod {
for (Window window : windows) { for (Window window : windows) {
if(window instanceof Updatable u) u.update(); if(window instanceof Updatable u) u.update();
} }
if((input.keyDown(KeyCode.shiftRight) || input.keyDown(KeyCode.shiftLeft))) { if((input.keyDown(KeyCode.shiftRight) || input.keyDown(KeyCode.shiftLeft))) {
if(input.keyTap(KeyCode.r)) { if(input.keyTap(KeyCode.r)) {
if(target==getTarget()) locked = !locked; if(target==getTarget()) locked = !locked;
target = getTarget(); target = getTarget();
}; }
} }
}); });

33
src/unitinfo/ui/display/WaveInfoDisplay.java
View File

@@ -5,6 +5,9 @@ import arc.util.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.Pal; import mindustry.graphics.Pal;
import mindustry.ui.*; import mindustry.ui.*;
import mindustry.world.Block;
import mindustry.world.Tile;
import mindustry.world.blocks.environment.Floor;
import static unitinfo.SUtils.*; import static unitinfo.SUtils.*;
import static unitinfo.SVars.*; import static unitinfo.SVars.*;
@@ -20,11 +23,33 @@ public class WaveInfoDisplay {
table.table(head -> { table.table(head -> {
head.table(image -> { head.table(image -> {
image.left(); image.left();
image.image(() -> getTile() == null || getTile().floor().uiIcon == error ? clear : getTile().floor().uiIcon).size(iconSmall); image.image(() -> {
image.image(() -> getTile() == null || getTile().overlay().uiIcon == error ? clear : getTile().overlay().uiIcon).size(iconSmall); Tile tile = getTile();
image.image(() -> getTile() == null || getTile().block().uiIcon == error ? clear : getTile().block().uiIcon).size(iconSmall); if(tile == null) return clear;
Floor floor = tile.floor();
if(floor.uiIcon == error) return clear;
return floor.uiIcon;
}).size(iconSmall);
image.image(() -> {
Tile tile = getTile();
if(tile == null) return clear;
Floor floor = tile.overlay();
if(floor.uiIcon == error) return clear;
return floor.uiIcon;
}).size(iconSmall);
image.image(() -> {
Tile tile = getTile();
if(tile == null) return clear;
Block floor = tile.block();
if(floor.uiIcon == error) return clear;
return floor.uiIcon;
}).size(iconSmall);
}); });
head.label(() -> Strings.format("(@, @)", getTile() == null ? "NaN" : getTile().x, getTile() == null ? "NaN" : getTile().y)).center(); head.label(() -> {
Tile tile = getTile();
if(tile == null) return "(NaN, NaN)";
return Strings.format("(@, @)", tile.x, tile.y);
}).center();
}); });
table.row(); table.row();
table.image().height(4f).color(Pal.gray).growX().row(); table.image().height(4f).color(Pal.gray).growX().row();

10
src/unitinfo/ui/windows/Windows.java
View File

@@ -1,8 +1,5 @@
package unitinfo.ui.windows; package unitinfo.ui.windows;
import arc.util.*;
import mindustry.gen.*;
public class Windows { public class Windows {
public static MapEditorWindow editorTable; public static MapEditorWindow editorTable;
@@ -13,12 +10,5 @@ public class Windows {
new PlayerWindow(); new PlayerWindow();
new ToolWindow(); new ToolWindow();
editorTable = new MapEditorWindow(); editorTable = new MapEditorWindow();
new Window(Icon.box, "test-window", t -> {
t.labelWrap(() -> t.parent.x + ", " + t.parent.y).top().right().growX();
t.row();
t.labelWrap(() -> t.parent.getWidth() + ", " + t.parent.getHeight()).top().right().growX();
t.row();
t.labelWrap(() -> "T: " + Time.time).top().right().growX();
});
} }
} }