✨ SettingsV2统一设置界面

way-zer · way-zer · commit 3cc94f84e745 · 2025-03-08T14:15:55.000+08:00
diff --git a/assets/bundles/bundle-mdtx.properties b/assets/bundles/bundle-mdtx.properties
@@ -118,15 +118,19 @@ setting.limitupdate.name = 限制更新
 setting.limitdst.name = 限制更新-额外范围
 #end Settings
 #SettingsV2
+settings.category.settingV2 = [gold]MindustryX V2
 settingV2.reset = [red]恢复默认设置
+settingV2.autoFill.category = 快速装填
 settingV2.autoFill.cooldown.name = 操作冷却(ms)
 settingV2.autoFill.cooldown.description = 过小的值可能导致被服务器踢出
 settingV2.autoFill.minFill.name = 最小装填个数
 settingV2.autoFill.fillStorageBlock.name = 允许往容器/仓库内填充
 settingV2.autoFill.fillDistribution.name = 允许往塑钢/桥中填充
-settingV2.radarMode.name = [acid]雷达模式
-settingV2.radarSize.name = [acid]雷达大小
-settingV2.coreItems.name = 资源显示总开关
+settingV2.radar.category = ARC雷达扫描
+settingV2.radar.mode.name = 扫描速度
+settingV2.radar.size.name = 雷达大小
+settingV2.coreItems.category = 队伍资源显示
+settingV2.coreItems.enable.name = 总开关
 settingV2.coreItems.columns.name = 显示列数
 settingV2.coreItems.showItem.name = 显示核心物品
 settingV2.coreItems.showUnit.name = 显示单位数量
diff --git a/src/mindustryX/features/ArcRadar.java b/src/mindustryX/features/ArcRadar.java
@@ -52,13 +52,18 @@ public class ArcRadar{
         case 0 -> "关闭";
         case 30 -> "瞬间完成";
         default -> "[lightgray]x[white]" + Strings.autoFixed(s * 0.2f, 1) + "倍搜索速度";
-    }).create("radarMode", 1),
+    }).create("radar.mode", 1),
     size = new SliderPref(0, 50, 1, s -> {
         if(s == 0) return "固定大小";
         return "[lightgray]x[white]" + Strings.autoFixed(s * 0.1f, 1) + "倍";
-    }).create("radarSize", 0);
+    }).create("radar.size", 0);
     public static List<SettingsV2.Data<?>> settings = CollectionsKt.listOf(mode, size);
 
+    {
+        mode.addFallbackName("radarMode");
+        size.addFallbackName("radarSize");
+    }
+
     static{
         Events.on(EventType.WorldLoadEvent.class, event -> scanTime = Math.max(Mathf.dst(world.width(), world.height()) / 20f, 7.5f));
     }
diff --git a/src/mindustryX/features/Settings.java b/src/mindustryX/features/Settings.java
@@ -3,6 +3,7 @@
 import arc.*;
 import arc.func.*;
 import arc.scene.style.*;
+import arc.scene.ui.layout.*;
 import arc.struct.*;
 import mindustry.*;
 import mindustry.game.EventType.*;
@@ -104,6 +105,22 @@ public static void addSettings(){
             });
             c.sliderPref("limitdst", 10, 0, 100, 1, s -> s + "格");
         }));
+        categories.add(new LazySettingsCategory("@settings.category.settingV2", () -> Icon.box, (c) -> {
+        }){
+            @Override
+            public void init(){
+                super.init();
+                //noinspection deprecation
+                table = new SettingsTable(){
+                    @Override
+                    public Table rebuild2(){
+                        SettingsV2.buildSettingsTable(this);
+                        add().width(500).row();
+                        return this;
+                    }
+                };
+            }
+        });
         ArcOld.init(categories);
         Events.on(ClientLoadEvent.class, e -> {
             categories.each(LazySettingsCategory::init);
diff --git a/src/mindustryX/features/SettingsV2.kt b/src/mindustryX/features/SettingsV2.kt
@@ -13,6 +13,7 @@ import arc.util.Reflect
 import arc.util.Time
 import mindustry.Vars
 import mindustry.gen.Icon
+import mindustry.graphics.Pal
 import mindustry.ui.Styles
 import mindustry.ui.dialogs.BaseDialog
 
@@ -23,22 +24,22 @@ import mindustry.ui.dialogs.BaseDialog
  */
 
 object SettingsV2 {
-    data class Data<T>(val name: String, val def: T, val ext: SettingExt<T>, var persistentProvider: PersistentProvider? = PersistentProvider.Arc) {
+    data class Data<T>(val name: String, val def: T, val ext: SettingExt<T>, var persistentProvider: PersistentProvider = PersistentProvider.Arc) {
         private val changedSet = mutableSetOf<String>()
         var value: T = def
             set(value) {
                 val v = ext.transformValue(value)
                 if (v == field) return
                 field = value
-                persistentProvider?.set(name, value)
+                persistentProvider.set(name, value)
                 changedSet.clear()
             }
 
         init {
             if (name in ALL)
                 Log.warn("Settings initialized!: $name")
             ALL[name] = this
-            persistentProvider?.run {
+            persistentProvider.run {
                 value = get(name, def)
             }
         }
@@ -49,31 +50,42 @@ object SettingsV2 {
         }
 
         //util
+        val category: String get() = name.substringBefore('.', "")
         val title: String get() = Core.bundle.get("settingV2.${name}.name", name)
         fun resetDefault() {
-            persistentProvider?.reset(name)
+            persistentProvider.reset(name)
             value = def
         }
 
         fun buildUI(table: Table) {
-            Table().apply {
+            Table().left().apply {
                 button(Icon.undo, Styles.clearNonei) { resetDefault() }.tooltip("@settings.reset")
                     .fillY().disabled { value == def }
                 ext.build(this@Data, this)
 
                 Core.bundle.getOrNull("settingV2.${name}.description")?.let {
                     Vars.ui.addDescTooltip(this, it)
                 }
-                table.add(this).left().row()
+                table.add(this).fillX().row()
             }
         }
+
+        fun addFallbackName(name: String) {
+            persistentProvider = PersistentProvider.WithFallback(name, persistentProvider)
+        }
     }
 
     sealed interface PersistentProvider {
         fun <T> get(name: String, def: T): T
         fun <T> set(name: String, value: T)
         fun reset(name: String)
 
+        data object Noop : PersistentProvider {
+            override fun <T> get(name: String, def: T): T = def
+            override fun <T> set(name: String, value: T) {}
+            override fun reset(name: String) {}
+        }
+
         data object Arc : PersistentProvider {
             override fun <T> get(name: String, def: T): T {
                 @Suppress("UNCHECKED_CAST")
@@ -88,6 +100,21 @@ object SettingsV2 {
                 Core.settings.remove(name)
             }
         }
+
+        class WithFallback(private val fallback: String, private val impl: PersistentProvider) : PersistentProvider {
+            override fun <T> get(name: String, def: T): T {
+                return impl.get(name, impl.get(fallback, def))
+            }
+
+            override fun <T> set(name: String, value: T) {
+                impl.set(name, value)
+            }
+
+            override fun reset(name: String) {
+                impl.reset(name)
+                impl.reset(fallback)
+            }
+        }
     }
 
     sealed interface SettingExt<T> {
@@ -96,7 +123,7 @@ object SettingsV2 {
 
         //util
         fun create(name: String, def: T) = Data(name, def, this)
-        fun create(name: String, def: T, persistentProvider: PersistentProvider?) = Data(name, def, this, persistentProvider)
+        fun create(name: String, def: T, persistentProvider: PersistentProvider) = Data(name, def, this, persistentProvider)
     }
 
     data object CheckPref : SettingExt<Boolean> {
@@ -185,6 +212,42 @@ object SettingsV2 {
         }
     }
 
+    private var settingSearch: String = ""
+
+    @JvmStatic
+    fun buildSettingsTable(table: Table) {
+        table.clearChildren()
+        val searchTable = table.table().fillX().get()
+        table.row()
+        val contentTable = table.table().fillX().get()
+        table.row()
+
+        fun rebuildContent() {
+            contentTable.clearChildren()
+            ALL.values.groupBy { it.category }.toSortedMap().forEach { (c, settings0) ->
+                val category = Core.bundle.get("settingV2.$c.category")
+                val categoryMatch = c.contains(settingSearch, ignoreCase = true) || category.contains(settingSearch, ignoreCase = true)
+                val settings = if (categoryMatch) settings0 else settings0.filter {
+                    if ("@modified" in settingSearch) return@filter it.changed()
+                    it.name.contains(settingSearch, true) || it.title.contains(settingSearch, true)
+                }
+                if (c.isNotEmpty() && settings.isNotEmpty()) {
+                    contentTable.add(category).color(Pal.accent).padTop(10f).padBottom(5f).center().row()
+                    contentTable.image().color(Pal.accent).fillX().height(3f).padBottom(10f).row()
+                }
+                settings.forEach { it.buildUI(contentTable) }
+            }
+        }
+        searchTable.apply {
+            image(Icon.zoom)
+            field(settingSearch, {
+                settingSearch = it
+                rebuildContent()
+            }).growX()
+        }
+        rebuildContent()
+    }
+
     @JvmStatic
     fun bindQuickSettings(button: Button, settings: Iterable<Data<*>>) {
         button.removeListener(button.clickListener)
diff --git a/src/mindustryX/features/ui/NewCoreItemsDisplay.java b/src/mindustryX/features/ui/NewCoreItemsDisplay.java
@@ -23,8 +23,8 @@
 import mindustryX.features.*;
 import mindustryX.features.SettingsV2.*;
 
-import java.util.List;
 import java.util.*;
+import java.util.List;
 
 import static mindustry.Vars.*;
 
@@ -44,14 +44,18 @@ public class NewCoreItemsDisplay extends Table{
     private final ItemSeq planItems = new ItemSeq();
     private final ObjectIntMap<Block> planCounter = new ObjectIntMap<>();
 
-    private final SettingsV2.Data<Boolean> enable = CheckPref.INSTANCE.create("coreitems");//Origin Setting
+    private final SettingsV2.Data<Boolean> enable = CheckPref.INSTANCE.create("coreItems.enable", true);//Origin Setting
     private final SettingsV2.Data<Integer> columns = new SettingsV2.SliderPref(4, 15).create("coreItems.columns", 5);
     private final SettingsV2.Data<Boolean> showItem = CheckPref.INSTANCE.create("coreItems.showItem", true);
     private final SettingsV2.Data<Boolean> showUnit = CheckPref.INSTANCE.create("coreItems.showUnit", true);
     private final SettingsV2.Data<Boolean> showPlan = CheckPref.INSTANCE.create("coreItems.showPlan", true);
     private final SettingsV2.Data<Boolean> showPower = CheckPref.INSTANCE.create("coreItems.showPower", true);
     final List<Data<?>> settings = CollectionsKt.listOf(enable, columns, showItem, showUnit, showPlan, showPower);
 
+    {
+        enable.addFallbackName("coreitems");
+    }
+
     public NewCoreItemsDisplay(){
         itemDelta = new int[content.items().size];
         lastItemAmount = new int[content.items().size];
