From b24c5742eec3c1934eabacd397cf842eacd04467 Mon Sep 17 00:00:00 2001 From: sharlottes <60801210+sharlottes@users.noreply.github.com> Date: Wed, 5 May 2021 22:24:48 +0900 Subject: [PATCH] setting --- assets/bundles/bundle.properties | 7 ++++++- assets/bundles/bundle_ko.properties | 7 ++++++- src/UnitInfo/core/HudUi.java | 5 ++--- src/UnitInfo/core/Main.java | 2 ++ src/UnitInfo/core/Setting.java | 22 ++++++++++++++++++++++ 5 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 src/UnitInfo/core/Setting.java diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index f0b2779..427f5cc 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -1,7 +1,12 @@ +#UI shar-stat.health = Health: {0} shar-stat.shield = Shield: {0} shar-stat.payloadCapacity = Payloads: {0} / {1} shar-stat.itemCapacity = Items: {0} / {1} shar-stat.ammos = Ammos: {0} / {1} shar-stat.infinityAmmos = Ammos: Infinity -shar-stat.commandUnits = Commands: {0} / {1} \ No newline at end of file +shar-stat.commandUnits = Commands: {0} / {1} + +# Settings +setting.weaponui.name = Display weapon UI +setting.commandedunitui.name = Display commandUnits UI \ No newline at end of file diff --git a/assets/bundles/bundle_ko.properties b/assets/bundles/bundle_ko.properties index 5835b3f..a12c200 100644 --- a/assets/bundles/bundle_ko.properties +++ b/assets/bundles/bundle_ko.properties @@ -1,7 +1,12 @@ +#UI shar-stat.health = 체력: {0} shar-stat.shield = 방어막: {0} shar-stat.payloadCapacity = 화물: {0} / {1} shar-stat.itemCapacity = 아이템: {0} / {1} shar-stat.ammos = 탄약: {0} / {1} shar-stat.infinityAmmos = 탄약: 무한 -shar-stat.commandUnits = 지휘 유닛: {0} / {1} \ No newline at end of file +shar-stat.commandUnits = 지휘 유닛: {0} / {1} + +# Settings +setting.weaponui.name = 무기 UI 표시 +setting.commandedunitui.name = 지휘 유닛 UI 표시 \ No newline at end of file diff --git a/src/UnitInfo/core/HudUi.java b/src/UnitInfo/core/HudUi.java index c88417a..716a920 100644 --- a/src/UnitInfo/core/HudUi.java +++ b/src/UnitInfo/core/HudUi.java @@ -139,7 +139,7 @@ public class HudUi { weapon = new Table(tx -> { tx.defaults().minSize(12 * 8f); tx.left(); - tx.table(scene.getStyle(Button.ButtonStyle.class).up, tt -> { + if(Core.settings.getBool("weaponui")) tx.table(scene.getStyle(Button.ButtonStyle.class).up, tt -> { tt.defaults().minSize(4 * 8f); tt.left(); tt.top(); @@ -180,7 +180,7 @@ public class HudUi { } }).padRight(24 * 8f); tx.row(); - tx.table(scene.getStyle(Button.ButtonStyle.class).up, t1 -> t1.table(tt -> { + if(Core.settings.getBool("commandedunitui")) tx.table(scene.getStyle(Button.ButtonStyle.class).up, t1 -> t1.table(tt -> { tt.defaults().minSize(4 * 8f); tt.left(); tt.top(); @@ -242,7 +242,6 @@ public class HudUi { }); } public void addTable(){ - Vars.ui.hudGroup.addChild(new Table(table -> { table.left(); addBars(); diff --git a/src/UnitInfo/core/Main.java b/src/UnitInfo/core/Main.java index 9eb0266..5916261 100644 --- a/src/UnitInfo/core/Main.java +++ b/src/UnitInfo/core/Main.java @@ -5,8 +5,10 @@ import mindustry.game.EventType.*; import mindustry.mod.Mod; public class Main extends Mod { + public static Setting settingAdder = new Setting(); public Main(){ Events.on(ClientLoadEvent.class, e -> { + settingAdder.init(); new HudUi().addTable(); }); diff --git a/src/UnitInfo/core/Setting.java b/src/UnitInfo/core/Setting.java new file mode 100644 index 0000000..65470f9 --- /dev/null +++ b/src/UnitInfo/core/Setting.java @@ -0,0 +1,22 @@ +package UnitInfo.core; + +import arc.Core; +import mindustry.Vars; + +public class Setting { + public void addGraphicSetting(String key){ + Vars.ui.settings.graphics.checkPref(key, Core.settings.getBool(key)); + } + + public void init(){ + boolean tmp = Core.settings.getBool("uiscalechanged", false); + Core.settings.put("uiscalechanged", false); + + addGraphicSetting("weaponui"); + addGraphicSetting("commandedunitui"); + Core.settings.defaults("weaponui", true); + Core.settings.defaults("commandedunitui", true); + + Core.settings.put("uiscalechanged", tmp); + } +}