🔥 清理快捷设置，移除ShowInfoPopup设置

assets/bundles/bundle-mdtx.properties

@@ -234,7 +234,6 @@ rules.title.arcExperimental = 隐藏设置[red](实验性功能，可能影响
 rules.unitPayloadUpdate = [acid]单位携带的方块会工作
 rules.winWave = [acid]胜利波次  [gray](到达指定波次后自动停止)
 schematic.preview = 预览
-setting.ShowInfoPopup.name = [acid]服务器信息版
 setting.allUnlocked.name = [cyan]显示所有内容(含隐藏)
 setting.unitHideExcludePlayers.name = 隐藏单位，始终显示玩家
 setting.alwaysShowUnitRTSAi.name = [acid]单位[white]：执行的RTS命令

assets/bundles/bundle-mdtx_en.properties

@@ -216,7 +216,6 @@ rules.title.arcExperimental = Hidden Settings red
 rules.unitPayloadUpdate = [acid]Units Carrying Blocks Will Work
 rules.winWave = [acid]Victory Wave gray
 schematic.preview = Preview
-setting.ShowInfoPopup.name = [acid]Server Info Board
 setting.allUnlocked.name = [cyan]Show All Content (Including Hidden)
 setting.alwaysShowUnitRTSAi.name = [acid]Units [white]: Executing RTS Commands
 setting.alwaysshowdropzone.name = [cyan]Spawn Points

patches/client/0029-H-misc.patch

@@ -128,7 +128,7 @@ index 42a05c901e5917fdc8252e12d9211eac8f5247b4..1c7982889c554307c83d3d4cda33ec83
      }
 
 diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
-index 1eb38240d11937a92a6be0ce4dcae8847e56708f..1dd8e39f5c5de35b49ef7c31b63f066a314eb8c0 100644
+index 1eb38240d11937a92a6be0ce4dcae8847e56708f..39e55358714acfc59f87d956af227a9f14562baf 100644
 --- a/core/src/mindustry/core/UI.java
 +++ b/core/src/mindustry/core/UI.java
 @@ -593,7 +593,7 @@ public class UI implements ApplicationListener, Loadable{
@@ -161,7 +161,7 @@ index 1eb38240d11937a92a6be0ce4dcae8847e56708f..1dd8e39f5c5de35b49ef7c31b63f066a
 -        }else{
 -            return number + "";
 -        }
-+        return FormatDefault.format(number);
++        return mindustryX.features.ui.FormatDefault.format(number);
      }
 
      public static int roundAmount(int number){

patches/client/0054-OC-Fonts.patch

@@ -43,7 +43,7 @@ index 0d4dace1bb102560301be35a21d7d54a206623f4..beecf6fe85396641a7efa9bfe1fe3566
          add(netServer = new NetServer());
          add(netClient = new NetClient());
 diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
-index 1dd8e39f5c5de35b49ef7c31b63f066a314eb8c0..c9b650accafc2e93e362027688be3c26dd5007b5 100644
+index 39e55358714acfc59f87d956af227a9f14562baf..531f9c845698719a162b8772e2739ac515169b3c 100644
 --- a/core/src/mindustry/core/UI.java
 +++ b/core/src/mindustry/core/UI.java
 @@ -82,10 +82,6 @@ public class UI implements ApplicationListener, Loadable{

patches/client/0061-ARC-merged.patch

@@ -94,7 +94,6 @@ way-zer <himc.wicp@gmail.com> on 2024/7/28
 way-zer <himc.wicp@gmail.com> on 2024/9/8
 ---
  core/src/mindustry/ai/BlockIndexer.java       | 116 ++++++++
- core/src/mindustry/core/UI.java               |   2 +
  core/src/mindustry/editor/MapInfoDialog.java  | 135 ++++++++-
  .../mindustry/entities/comp/BuildingComp.java |  18 +-
  .../mindustry/entities/comp/ShieldComp.java   |   6 +
@@ -123,7 +122,7 @@ way-zer <himc.wicp@gmail.com> on 2024/9/8
  .../ui/fragments/PlacementFragment.java       | 169 ++++++++++--
  .../ui/fragments/PlayerListFragment.java      |  72 ++---
  core/src/mindustry/world/Block.java           |   7 +-
- 30 files changed, 1585 insertions(+), 177 deletions(-)
+ 29 files changed, 1583 insertions(+), 177 deletions(-)
 
 diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java
 index 7f944a3eb06180f9e2b760bbd5aa41709ddf6611..4972f424edd41b8a29d926a09bc55987066d33aa 100644
@@ -290,26 +289,6 @@ index 7f944a3eb06180f9e2b760bbd5aa41709ddf6611..4972f424edd41b8a29d926a09bc55987
      private void process(Tile tile){
          var team = tile.team();
          //only process entity changes with centered tiles
-diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
-index c9b650accafc2e93e362027688be3c26dd5007b5..9d6754fafcb75cb705be44a3ab577ec42b884889 100644
---- a/core/src/mindustry/core/UI.java
-+++ b/core/src/mindustry/core/UI.java
-@@ -28,6 +28,7 @@ import mindustry.logic.*;
- import mindustry.ui.*;
- import mindustry.ui.dialogs.*;
- import mindustry.ui.fragments.*;
-+import mindustryX.features.ui.*;
-
- import static arc.scene.actions.Actions.*;
- import static mindustry.Vars.*;
-@@ -384,6 +385,7 @@ public class UI implements ApplicationListener, Loadable{
-
-     /** Shows a label at some position on the screen. Does not fade. */
-     public void showInfoPopup(String info, float duration, int align, int top, int left, int bottom, int right){
-+        if (!Core.settings.getBool("ShowInfoPopup")) return;
-         Table table = new Table();
-         table.setFillParent(true);
-         table.touchable = Touchable.disabled;
 diff --git a/core/src/mindustry/editor/MapInfoDialog.java b/core/src/mindustry/editor/MapInfoDialog.java
 index ebc1f0b300d295e45333f1db38ea299c9658ec20..545ca919c9c6eb5bd6ba0c8b0d7d897ae49436ac 100644
 --- a/core/src/mindustry/editor/MapInfoDialog.java

src/mindustryX/features/ArcOld.java

@@ -126,7 +126,6 @@ public static void init(Seq<LazySettingsCategory> categories){
 
 
             c.addCategory("arcShareinfo");
-            c.checkPref("ShowInfoPopup", true);
             c.checkPref("arcAlwaysTeamColor", false);
 
             c.addCategory("arcWeakCheat");

src/mindustryX/features/ui/toolTable/HudSettingsTable.java

@@ -36,10 +36,8 @@ protected void rebuild(){
             t.button("[cyan]资", Styles.flatTogglet, () -> Settings.toggle("showOtherTeamResource")).tooltip("多队伍资源信息显示(左侧)").checked(a -> Core.settings.getBool("showOtherTeamResource"));
             t.button("[cyan]S", Styles.flatBordert, () -> Call.sendChatMessage("/sync")).tooltip("同步一波");
             t.button("[cyan]观", Styles.flatBordert, () -> Call.sendChatMessage("/ob")).tooltip("观察者模式");
-            t.button("[cyan]技", Styles.flatBordert, () -> Call.sendChatMessage("/skill")).tooltip("技能！");
             t.button("[cyan]版", Styles.flatBordert, () -> Call.sendChatMessage("/broad")).tooltip("服务器信息版");
             t.button("[cyan]雾", Styles.flatTogglet, () -> state.rules.fog ^= true).checked(a -> state.rules.fog).tooltip("战争迷雾").disabled((_t) -> state.rules.pvp && player.team().id != 255);
-            t.button("[red]版", Styles.flatTogglet, () -> Settings.toggle("ShowInfoPopup")).checked(a -> !Core.settings.getBool("ShowInfoPopup")).tooltip("关闭所有信息版");
             t.button("[white]法", Styles.flatBordert, () -> ui.showConfirm("受不了，直接投降？", () -> Call.sendChatMessage("/vote gameover"))).tooltip("法国军礼");
             t.row();
             t.button("[cyan]块", Styles.flatTogglet, () -> Settings.cycle("blockRenderLevel", 3))
@@ -48,18 +46,10 @@ protected void rebuild(){
             .checked(a -> !RenderExt.unitHide).tooltip("兵种显示");
             t.button("[cyan]弹", Styles.flatTogglet, () -> Settings.toggle("bulletShow"))
             .checked(a -> Core.settings.getBool("bulletShow")).tooltip("子弹显示");
-            t.button("[cyan]灯", Styles.flatTogglet, () -> Settings.toggle("drawlight"))
-            .checked(a -> renderer.drawLight).name("灯光").tooltip("[cyan]开灯啊！");
             t.button("[cyan]效", Styles.flatTogglet, () -> Settings.toggle("effects"))
             .checked(a -> Core.settings.getBool("effects")).tooltip("特效显示");
-            t.button("[cyan]光", Styles.flatTogglet, () -> {
-                Settings.toggle("bloom");
-                renderer.toggleBloom(settings.getBool("bloom"));
-            }).checked(a -> Core.settings.getBool("bloom")).tooltip("光效显示");
             t.button("[cyan]墙", Styles.flatTogglet, () -> enableDarkness ^= true)
             .checked(a -> enableDarkness).tooltip("墙体阴影显示");
-            t.button("[cyan]天", Styles.flatTogglet, () -> Settings.toggle("showweather"))
-            .checked(a -> Core.settings.getBool("showweather")).tooltip("天气显示");
             t.button("[cyan]" + Iconc.map, Styles.flatTogglet, () -> Settings.toggle("minimap"))
             .checked(a -> Core.settings.getBool("minimap")).tooltip("小地图显示");
             t.row();
@@ -103,7 +93,6 @@ protected void rebuild(){
             case 3 -> "全部";
             default -> s + "";
         });
-        checkPref("unitHealthBar");
         sliderPref("unitDrawMinHealth", 0, 2500, 50, i -> i + "[red]HP");
         sliderPref("unitWeaponRange", 0, 100, 1, i -> i > 0 ? i + "%" : "关闭");