diff --git a/src/UnitInfo/SVars.java b/src/UnitInfo/SVars.java index f4791de..39c6c29 100644 --- a/src/UnitInfo/SVars.java +++ b/src/UnitInfo/SVars.java @@ -10,7 +10,7 @@ public class SVars { public static Fi modRoot = modDirectory.child("UnitInfo"); public static Seq playerInfos = new Seq<>(); - public static Setting settingAdder = new Setting(); + public static SettingS settingAdder = new SettingS(); public static HudUi hud = new HudUi(); public static PlayerParser playerinfo = new PlayerParser(); } diff --git a/src/UnitInfo/core/Setting.java b/src/UnitInfo/core/SettingS.java similarity index 94% rename from src/UnitInfo/core/Setting.java rename to src/UnitInfo/core/SettingS.java index 4f14dee..001f474 100644 --- a/src/UnitInfo/core/Setting.java +++ b/src/UnitInfo/core/SettingS.java @@ -18,7 +18,7 @@ import java.util.*; import static arc.Core.*; import static mindustry.Vars.*; -public class Setting { +public class SettingS { public static SettingsMenuDialog.SettingsTable waveTable = new SettingsMenuDialog.SettingsTable(); public static SettingsMenuDialog.SettingsTable opacityTable = new SettingsMenuDialog.SettingsTable(); public static SettingsMenuDialog.SettingsTable scanTable = new SettingsMenuDialog.SettingsTable(); @@ -30,8 +30,8 @@ public class Setting { ui.settings.graphics.sliderPref(key, def, min, max, step, s); } /* - public void addGraphicSlideSetting(String key, int def, int min, int max, int step, SettingsMenuDialog.StringProcessor s, Seq list){ - list.add(new SettingsMenuDialog.SettingsTable.Setting(key) { + public void addGraphicSlideSetting(String key, int def, int min, int max, int step, SettingsMenuDialog.StringProcessor s, Seq list){ + list.add(new SettingsMenuDialog.SettingsTable.SettingS(key) { { Core.settings.defaults(name, def); } @@ -62,8 +62,8 @@ public class Setting { } }); } - public void addGraphicCheckSetting(String key, boolean def, Seq list){ - list.add(new SettingsMenuDialog.SettingsTable.Setting() { + public void addGraphicCheckSetting(String key, boolean def, Seq list){ + list.add(new SettingsMenuDialog.SettingsTable.SettingS() { { name = key; title = bundle.get("setting." + key + ".name"); @@ -87,8 +87,8 @@ public class Setting { }); } - public void addGraphicTypeSetting(String key, int defs, String dialogs, String invalid, int warnMax, Seq list){ - list.add(new SettingsMenuDialog.SettingsTable.Setting() { + public void addGraphicTypeSetting(String key, int defs, String dialogs, String invalid, int warnMax, Seq list){ + list.add(new SettingsMenuDialog.SettingsTable.SettingS() { public final int def; { def = defs; @@ -218,8 +218,8 @@ public class Setting { }); } - public void addGraphicDialogSetting(String key, Seq list, SettingsMenuDialog.SettingsTable table){ - ui.settings.graphics.pref(new SettingsMenuDialog.SettingsTable.Setting() { + public void addGraphicDialogSetting(String key, Seq list, SettingsMenuDialog.SettingsTable table){ + ui.settings.graphics.pref(new SettingsMenuDialog.SettingsTable.SettingS() { { name = key; title = Core.bundle.get("setting." + key + ".name"); @@ -230,17 +230,17 @@ public class Setting { public Table rebuild() { table.clearChildren(); - Iterator var1 = list.iterator(); + Iterator var1 = list.iterator(); while(var1.hasNext()) { - SettingsMenuDialog.SettingsTable.Setting setting = var1.next(); + SettingsMenuDialog.SettingsTable.SettingS setting = var1.next(); setting.add(table); } table.button(Core.bundle.get("settings.reset", "Reset to Defaults"), () -> { - Iterator var2 = list.iterator(); + Iterator var2 = list.iterator(); while(var2.hasNext()) { - SettingsMenuDialog.SettingsTable.Setting setting = var1.next(); + SettingsMenuDialog.SettingsTable.SettingS setting = var1.next(); if (setting.name != null && setting.title != null) { Core.settings.put(setting.name, Core.settings.getDefault(setting.name)); } @@ -264,13 +264,13 @@ public class Setting { */ public void init(){ /* - Seq waveSeq = new Seq<>(); + Seq waveSeq = new Seq<>(); addGraphicCheckSetting("pastwave", false, waveSeq); addGraphicCheckSetting("emptywave", true, waveSeq); addGraphicTypeSetting("wavemax", 100, "@editmaxwave","@invalid", 200, waveSeq); addGraphicDialogSetting("wavesetting", waveSeq, waveTable); - Seq scanSeq = new Seq<>(); + Seq scanSeq = new Seq<>(); addGraphicCheckSetting("scan", false, scanSeq); addGraphicTypeSetting("rangemax", 10, "@editrange","@invalid", 100, scanSeq); addGraphicCheckSetting("rangeNearby", true, scanSeq); @@ -282,7 +282,7 @@ public class Setting { addGraphicSlideSetting("rangeRadius", 5, 0, 20, 1, s -> s + "tiles", scanSeq); addGraphicDialogSetting("wavesetting", scanSeq, scanTable); - Seq opacitySeq = new Seq<>(); + Seq opacitySeq = new Seq<>(); addGraphicSlideSetting("selectopacity", 50, 0, 100, 5, s -> s + "%", opacitySeq); addGraphicSlideSetting("baropacity", 50, 0, 100, 5, s -> s + "%", opacitySeq); addGraphicSlideSetting("uiopacity", 50, 0, 100, 5, s -> s + "%", opacitySeq);