🐛 NewCoreItemsDisplay 不尊重原版设置

TinyLake · Feb 7, 2025 · 9374078 · 9374078
1 parent dfbdc1e
commit 9374078
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/mindustryX/features/ui/NewCoreItemsDisplay.java b/src/mindustryX/features/ui/NewCoreItemsDisplay.java
@@ -44,12 +44,13 @@ 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<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(columns, showItem, showUnit, showPlan, showPower);
+    final List<Data<?>> settings = CollectionsKt.listOf(enable, columns, showItem, showUnit, showPlan, showPower);
 
     public NewCoreItemsDisplay(){
         itemDelta = new int[content.items().size];

diff --git a/src/mindustryX/features/ui/WaveInfoDisplay.java b/src/mindustryX/features/ui/WaveInfoDisplay.java
@@ -84,7 +84,7 @@ public float getPrefWidth(){
 
     public Element wrapped(){
         var ret = new Table();
-        ret.add(UIExt.coreItems).touchable(Touchable.disabled).fillX().row();
+        ret.collapser(UIExt.coreItems, () -> Core.settings.getBool("coreitems")).touchable(Touchable.disabled).growX().row();
         ret.add().height(4).row();
         ret.collapser(this, () -> enable.getValue()).growX().row();
         ret.collapser(tt -> tt.button(Icon.downOpen, Styles.emptyi, () -> enable.setValue(true)), () -> !enable.getValue()).center().row();