From 040303ece482ff1884b65c2e4af05d0ebce34138 Mon Sep 17 00:00:00 2001
From: sharlottes <seeseafood@naver.com>
Date: Wed, 13 Apr 2022 22:22:36 +0900
Subject: [PATCH] android doesn't have iterable

---
 src/UnitInfo/core/Main.java         | 18 ++++++++----------
 src/UnitInfo/core/SettingS.java     | 10 +++++-----
 src/UnitInfo/ui/ElementDisplay.java | 10 ++--------
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/UnitInfo/core/Main.java b/src/UnitInfo/core/Main.java
index 9a76a91..4590be0 100644
--- a/src/UnitInfo/core/Main.java
+++ b/src/UnitInfo/core/Main.java
@@ -39,9 +39,10 @@ public class Main extends Mod {
         });
 
         Events.on(ClientLoadEvent.class, e -> {
-            new SettingS().init();
+            SettingS.init();
             MindowsTex.init();
             WindowTables.init();
+
             new HUDFragment().build(Vars.ui.hudGroup);
             hud = new HudUi();
             hud.addWaveInfoTable();
@@ -51,16 +52,13 @@ public class Main extends Mod {
             if(jsonGen) ContentJSON.save();
 
             scene.add(new ElementDisplay());
-            /*
-            for(Dialog dialog : new Dialog[]{
-                    ui.picker, ui.editor, ui.controls, ui.restart, ui.join, ui.discord,
-                    ui.load, ui.custom, ui.language, ui.database, ui.settings, ui.host,
-                    ui.paused, ui.about, ui.bans, ui.admins, ui.traces, ui.maps, ui.content,
-                    ui.planet, ui.research, ui.mods, ui.schematics, ui.logic}) {
-                dialog.add(new ElementDisplay(dialog));
-            }
+            Seq.with(
+                ui.picker, ui.editor, ui.controls, ui.restart, ui.join, ui.discord,
+                ui.load, ui.custom, ui.language, ui.database, ui.settings, ui.host,
+                ui.paused, ui.about, ui.bans, ui.admins, ui.traces, ui.maps, ui.content,
+                ui.planet, ui.research, ui.mods, ui.schematics, ui.logic
+            ).each(dialog-> dialog.add(new ElementDisplay(dialog)));
 
-             */
 
         });
 
diff --git a/src/UnitInfo/core/SettingS.java b/src/UnitInfo/core/SettingS.java
index b98ebd0..37829d2 100644
--- a/src/UnitInfo/core/SettingS.java
+++ b/src/UnitInfo/core/SettingS.java
@@ -17,9 +17,9 @@ import static arc.Core.*;
 import static mindustry.Vars.*;
 
 public class SettingS {
-    public SettingsMenuDialog.SettingsTable sharset;
+    public static SettingsMenuDialog.SettingsTable sharset;
 
-    public void addGraphicCheckSetting(String key, boolean def, Seq<SharSetting> list){
+    public static void addGraphicCheckSetting(String key, boolean def, Seq<SharSetting> list){
         list.add(new SharSetting(key, def) {
 
             @Override
@@ -35,7 +35,7 @@ public class SettingS {
         });
     }
 
-    public void addGraphicSlideSetting(String key, int def, int min, int max, int step, SettingsMenuDialog.StringProcessor sp, Seq<SharSetting> list){
+    public static void addGraphicSlideSetting(String key, int def, int min, int max, int step, SettingsMenuDialog.StringProcessor sp, Seq<SharSetting> list){
         list.add(new SharSetting(key, def) {
 
             @Override
@@ -64,7 +64,7 @@ public class SettingS {
         });
     }
 
-    public void addGraphicTypeSetting(String key, float min, float max, int def, boolean integer, Boolp condition, Func<String, String> h, Seq<SharSetting> list){
+    public static void addGraphicTypeSetting(String key, float min, float max, int def, boolean integer, Boolp condition, Func<String, String> h, Seq<SharSetting> list){
         list.add(new SharSetting(key, def) {
 
             @Override
@@ -92,7 +92,7 @@ public class SettingS {
         });
     }
 
-    public void init(){
+    public static void init(){
         BaseDialog dialog = new BaseDialog(bundle.get("setting.shar-title"));
         dialog.addCloseButton();
         sharset = new SettingsMenuDialog.SettingsTable();
diff --git a/src/UnitInfo/ui/ElementDisplay.java b/src/UnitInfo/ui/ElementDisplay.java
index 4856d45..3df6afa 100644
--- a/src/UnitInfo/ui/ElementDisplay.java
+++ b/src/UnitInfo/ui/ElementDisplay.java
@@ -6,7 +6,6 @@ import arc.scene.Element;
 import arc.scene.Group;
 import arc.scene.event.Touchable;
 import arc.struct.SnapshotSeq;
-import arc.util.Log;
 import arc.util.Tmp;
 import mindustry.graphics.Layer;
 import mindustry.graphics.Pal;
@@ -32,16 +31,11 @@ public class ElementDisplay extends Element {
         if(!settings.getBool("elementdebug")) return;
         Draw.z(Layer.max);
         Lines.stroke(1);
-        Log.info("draw method called");
         addRect(root.getChildren());
     }
 
     void addRect(SnapshotSeq<Element> elements) {
-        Log.info("addRect method called");
-        Element[] items = elements.begin();
-        for (int i = 0, n = elements.size; i < n; i++) {
-            Log.info("addRect method called in forEach");
-            Element elem = items[i];
+        elements.each(elem-> {
             elem.updateVisibility();
             if(elem.visible || settings.getBool("hiddenElem")) {
                 elem.localToStageCoordinates(Tmp.v1.set(0, 0));
@@ -62,6 +56,6 @@ public class ElementDisplay extends Element {
                 Lines.stroke(1);
                 if(elem instanceof Group group) addRect(group.getChildren());
             }
-        };
+        });
     }
 }