refactoring

src/informatis/core/EditorTool.java

@@ -12,10 +12,10 @@ import mindustry.content.Blocks;
 import mindustry.game.Team;
 import mindustry.world.Block;
 import mindustry.world.Tile;
-import informatis.ui.window.*;
+import informatis.ui.windows.*;
 
-import static informatis.ui.window.MapEditorWindow.*;
-import static informatis.ui.window.Windows.editorTable;
+import static informatis.ui.windows.MapEditorWindow.*;
+import static informatis.ui.windows.Windows.editorTable;
 import static mindustry.Vars.world;
 
 public enum EditorTool{

src/informatis/core/Main.java

@@ -4,7 +4,7 @@ import arc.input.KeyCode;
 import informatis.ui.*;
 import informatis.ui.draws.OverDraws;
 import informatis.ui.fragments.FragmentManager;
-import informatis.ui.window.*;
+import informatis.ui.windows.*;
 import arc.*;
 import mindustry.*;
 import mindustry.game.EventType.*;

src/informatis/ui/WindowManager.java

@@ -1,13 +1,10 @@
 package informatis.ui;
 
 import arc.*;
-import arc.scene.ui.layout.*;
 import arc.struct.*;
 import mindustry.*;
 import mindustry.ui.*;
-import informatis.ui.window.*;
-
-import java.util.Objects;
+import informatis.ui.windows.*;
 
 public class WindowManager {
     public static Seq<Window> windows = new Seq<>();

src/informatis/ui/fragments/ServerSearchFragment.java

@@ -111,10 +111,11 @@ public class ServerSearchFragment extends Table {
                     address.contains(":") ? address.split(":")[0] : address,
                     address.contains(":") ? Strings.parseInt(address.split(":")[1]) : Vars.port,
                     res -> {
-                        if(loading &&
-                            !tmp.contains(address) &&
-                            (res.mode == null ? Objects.equals(res.modeName, mode)
-                                : !Objects.equals(mode, "custom") && res.mode.equals(Gamemode.valueOf(mode)))
+                        if(loading && !tmp.contains(address) &&
+                            (res.modeName != null
+                                ? Objects.equals(mode, "custom") || res.modeName.equals(mode)
+                                : !Objects.equals(mode, "custom") && res.mode.equals(Gamemode.valueOf(mode))
+                            )
                         ) tmp.add(address);
                         group.addresses = tmp.toArray(String.class);
                         Vars.defaultServers.set((j + Vars.defaultServers.size/2) % Vars.defaultServers.size, group);

src/informatis/ui/widgets/RectWidget.java

@@ -1,30 +0,0 @@
-package informatis.ui.widgets;
-
-import arc.graphics.g2d.Draw;
-import arc.graphics.g2d.Lines;
-import arc.scene.ui.Image;
-import arc.scene.ui.layout.Scl;
-import mindustry.graphics.Pal;
-
-import static informatis.SVars.locked;
-
-public class RectWidget {
-    public static Image build() {
-        return build(8);
-    }
-
-    public static Image build(float size) {
-        return new Image() {
-            @Override
-            public void draw() {
-                super.draw();
-
-                Draw.color(locked? Pal.accent:Pal.gray);
-                Draw.alpha(parentAlpha);
-                Lines.stroke(Scl.scl(3f));
-                Lines.rect(x-size/2f, y-size/2f, width+size, height+size);
-                Draw.reset();
-            }
-        };
-    }
-}

src/informatis/ui/windows/CoreWindow.java

@@ -1,4 +1,4 @@
-package informatis.ui.window;
+package informatis.ui.windows;
 
 import arc.*;
 import informatis.SUtils;
@@ -17,7 +17,6 @@ import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.input.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.blocks.storage.*;

src/informatis/ui/windows/MapEditorWindow.java

@@ -1,4 +1,4 @@
-package informatis.ui.window;
+package informatis.ui.windows;
 
 import arc.Events;
 import arc.graphics.g2d.*;

src/informatis/ui/windows/PlayerWindow.java

@@ -1,4 +1,4 @@
-package informatis.ui.window;
+package informatis.ui.windows;
 
 import informatis.ui.*;
 import arc.*;

src/informatis/ui/windows/ToolWindow.java

@@ -1,4 +1,4 @@
-package informatis.ui.window;
+package informatis.ui.windows;
 
 import informatis.ui.*;
 import informatis.ui.draws.*;

src/informatis/ui/windows/UnitWindow.java

@@ -1,4 +1,4 @@
-package informatis.ui.window;
+package informatis.ui.windows;
 
 import arc.*;
 import arc.math.*;
@@ -12,7 +12,6 @@ import arc.scene.ui.layout.*;
 import arc.struct.Bits;
 import arc.struct.*;
 import arc.util.*;
-import informatis.ui.widgets.*;
 import mindustry.*;
 import mindustry.core.*;
 import mindustry.entities.units.*;
@@ -42,7 +41,19 @@ public class UnitWindow extends Window {
 
     @Override
     protected void build(Table table) {
-        Image profileImage = RectWidget.build();
+        Image profileImage = new Image() {
+            final int size = 8;
+            @Override
+            public void draw() {
+                super.draw();
+
+                Draw.color(locked? Pal.accent:Pal.gray);
+                Draw.alpha(parentAlpha);
+                Lines.stroke(Scl.scl(3f));
+                Lines.rect(x-size/2f, y-size/2f, width+size, height+size);
+                Draw.reset();
+            }
+        };
         profileImage.update(() -> {
             TextureRegion region = clear;
             if (target instanceof Unit u && u.type != null) region = u.type.uiIcon;

src/informatis/ui/windows/WaveWindow.java

@@ -1,4 +1,4 @@
-package informatis.ui.window;
+package informatis.ui.windows;
 
 import mindustry.*;
 import mindustry.type.*;

src/informatis/ui/windows/Window.java

@@ -1,4 +1,4 @@
-package informatis.ui.window;
+package informatis.ui.windows;
 
 import arc.*;
 import arc.func.*;

src/informatis/ui/windows/Windows.java

@@ -1,4 +1,4 @@
-package informatis.ui.window;
+package informatis.ui.windows;
 
 public class Windows {
     public static MapEditorWindow editorTable;