Merge pull request #45 from buthed010203/patch-6

Improve foo's compatibility
This commit is contained in:
Sharlotte
2021-10-17 12:35:52 +09:00
committed by GitHub
3 changed files with 16 additions and 8 deletions

View File

@@ -3,7 +3,7 @@
"displayName": "Unit Information", "displayName": "Unit Information",
"author": "Sharlotte", "author": "Sharlotte",
"description": "The mod displays more information in-game, such as unit/building, wave, core, tile, item/unit total info etc", "description": "The mod displays more information in-game, such as unit/building, wave, core, tile, item/unit total info etc",
"version": "1.4.3", "version": "1.5.1",
"main": "UnitInfo.core.Main", "main": "UnitInfo.core.Main",
"minGameVersion": "131", "minGameVersion": "131",
"dependencies": [], "dependencies": [],

View File

@@ -56,6 +56,15 @@ task dexify(type: Jar) {
task buildDex dependsOn "build", "dexify" task buildDex dependsOn "build", "dexify"
task buildMove(dependsOn: build) {
doLast {
copy {
from "build/libs/UnitInfo.jar"
into System.getenv("destination")
}
}
}
tasks.withType(JavaCompile){ tasks.withType(JavaCompile){
targetCompatibility = 8 targetCompatibility = 8
sourceCompatibility = JavaVersion.VERSION_16 sourceCompatibility = JavaVersion.VERSION_16

View File

@@ -758,16 +758,15 @@ public class HudUi {
}); });
Table waveTable = (Table) scene.find("waves"); Table waveTable = (Table) scene.find("waves");
Table table = (Table)waveTable.getChildren().first(); //HudFragment#198, name: x Table infoTable = (Table) scene.find("infotable");
Table statusTable = Version.number >= 131 ? (Table)scene.find("statustable") : (Table)waveTable.getChildren().get(1); waveTable.removeChild(infoTable);
waveTable.removeChild(statusTable); waveTable.row();
table.row(); waveTable.stack(
table.stack( new Table(tt -> tt.collapser(t -> t.stack(waveInfoTable, infoTable, pathlineTable).growX(), true, () -> waveShown).growX()).top(),
new Table(tt -> tt.collapser(t -> t.stack(waveInfoTable, statusTable.top(), pathlineTable), true, () -> waveShown)).top(),
new Table(tt -> tt.button(Icon.downOpen, Styles.clearToggleTransi, () -> waveShown = !waveShown).size(4 * 8f).checked(b -> { new Table(tt -> tt.button(Icon.downOpen, Styles.clearToggleTransi, () -> waveShown = !waveShown).size(4 * 8f).checked(b -> {
b.getImage().setDrawable(waveShown ? Icon.upOpen : Icon.downOpen); b.getImage().setDrawable(waveShown ? Icon.upOpen : Icon.downOpen);
return waveShown; return waveShown;
})).left().top()).visible(() -> settings.getBool("waveui")); })).left().top()).fillX().visible(() -> settings.getBool("waveui"));
} }
public void reset(int index, Seq<Button> buttons, Label label, Table table, Table labelTable, String hud){ public void reset(int index, Seq<Button> buttons, Label label, Table table, Table labelTable, String hud){