Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-10-02 19:51:30 -04:00
parent 10dd2b4b33
commit 5861fe61b2
158 changed files with 311 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/ui/BorderImage.java
View File

@@ -2,9 +2,9 @@ package mindustry.ui;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.scene.ui.Image;
import arc.scene.ui.layout.Scl;
import mindustry.graphics.Pal;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import mindustry.graphics.*;
public class BorderImage extends Image{
public float thickness = 4f;

2
core/src/mindustry/ui/ContentDisplay.java
View File

@@ -1,9 +1,9 @@
package mindustry.ui;
import arc.*;
import arc.struct.*;
import arc.graphics.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import mindustry.gen.*;
import mindustry.graphics.*;

4
core/src/mindustry/ui/GridImage.java
View File

@@ -1,7 +1,7 @@
package mindustry.ui;
import arc.graphics.g2d.Fill;
import arc.scene.Element;
import arc.graphics.g2d.*;
import arc.scene.*;
public class GridImage extends Element{
private int imageWidth, imageHeight;

4
core/src/mindustry/ui/IntFormat.java
View File

@@ -1,8 +1,8 @@
package mindustry.ui;
import arc.Core;
import arc.func.Func;
import arc.*;
import arc.func.*;
/**
* A low-garbage way to format bundle strings.

5
core/src/mindustry/ui/ItemDisplay.java
View File

@@ -1,8 +1,7 @@
package mindustry.ui;
import arc.scene.ui.layout.Table;
import mindustry.type.Item;
import mindustry.type.ItemStack;
import arc.scene.ui.layout.*;
import mindustry.type.*;
/** An item image with text. */
public class ItemDisplay extends Table{

8
core/src/mindustry/ui/Links.java
View File

@@ -1,11 +1,11 @@
package mindustry.ui;
import arc.Core;
import arc.*;
import arc.graphics.*;
import arc.scene.style.*;
import arc.util.Strings;
import arc.graphics.Color;
import arc.util.*;
import mindustry.gen.*;
import mindustry.graphics.Pal;
import mindustry.graphics.*;
public class Links{
private static LinkEntry[] links;

13
core/src/mindustry/ui/LiquidDisplay.java
View File

@@ -1,12 +1,11 @@
package mindustry.ui;
import arc.graphics.Color;
import arc.scene.ui.Image;
import arc.scene.ui.layout.Stack;
import arc.scene.ui.layout.Table;
import arc.util.Strings;
import mindustry.type.Liquid;
import mindustry.world.meta.StatUnit;
import arc.graphics.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.util.*;
import mindustry.type.*;
import mindustry.world.meta.*;
/** An ItemDisplay, but for liquids. */
public class LiquidDisplay extends Table{

8
core/src/mindustry/ui/Minimap.java
View File

@@ -1,9 +1,9 @@
package mindustry.ui;
import arc.Core;
import arc.graphics.g2d.Draw;
import arc.input.KeyCode;
import arc.scene.Element;
import arc.*;
import arc.graphics.g2d.*;
import arc.input.*;
import arc.scene.*;
import arc.scene.event.*;
import arc.scene.ui.layout.*;
import mindustry.gen.*;

4
core/src/mindustry/ui/MobileButton.java
View File

@@ -1,8 +1,8 @@
package mindustry.ui;
import arc.scene.style.*;
import arc.scene.ui.ImageButton;
import arc.util.Align;
import arc.scene.ui.*;
import arc.util.*;
public class MobileButton extends ImageButton{

6
core/src/mindustry/ui/MultiReqImage.java
View File

@@ -1,8 +1,8 @@
package mindustry.ui;
import arc.struct.Seq;
import arc.scene.ui.layout.Stack;
import arc.util.Time;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
public class MultiReqImage extends Stack{
private Seq<ReqImage> displays = new Seq<>();

11
core/src/mindustry/ui/ReqImage.java
View File

@@ -1,12 +1,11 @@
package mindustry.ui;
import arc.func.Boolp;
import arc.func.*;
import arc.graphics.g2d.*;
import arc.scene.Element;
import arc.scene.ui.Image;
import arc.scene.ui.layout.Stack;
import arc.scene.ui.layout.Scl;
import mindustry.graphics.Pal;
import arc.scene.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import mindustry.graphics.*;
public class ReqImage extends Stack{
private final Boolp valid;

2
core/src/mindustry/ui/Styles.java
View File

@@ -1,7 +1,6 @@
package mindustry.ui;
import arc.*;
import mindustry.annotations.Annotations.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.graphics.g2d.TextureAtlas.*;
@@ -16,6 +15,7 @@ import arc.scene.ui.ScrollPane.*;
import arc.scene.ui.Slider.*;
import arc.scene.ui.TextButton.*;
import arc.scene.ui.TextField.*;
import mindustry.annotations.Annotations.*;
import mindustry.gen.*;
import mindustry.graphics.*;

2
core/src/mindustry/ui/dialogs/AboutDialog.java
View File

@@ -1,10 +1,10 @@
package mindustry.ui.dialogs;
import arc.*;
import arc.struct.*;
import arc.graphics.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import mindustry.game.EventType.*;
import mindustry.gen.*;

6
core/src/mindustry/ui/dialogs/ContentInfoDialog.java
View File

@@ -1,8 +1,8 @@
package mindustry.ui.dialogs;
import arc.scene.ui.ScrollPane;
import arc.scene.ui.layout.Table;
import mindustry.ctype.UnlockableContent;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import mindustry.ctype.*;
public class ContentInfoDialog extends BaseDialog{

8
core/src/mindustry/ui/dialogs/DiscordDialog.java
View File

@@ -1,10 +1,10 @@
package mindustry.ui.dialogs;
import arc.Core;
import arc.graphics.Color;
import arc.scene.ui.Dialog;
import arc.*;
import arc.graphics.*;
import arc.scene.ui.*;
import mindustry.gen.*;
import mindustry.graphics.Pal;
import mindustry.graphics.*;
import static mindustry.Vars.*;

14
core/src/mindustry/ui/dialogs/LanguageDialog.java
View File

@@ -1,17 +1,15 @@
package mindustry.ui.dialogs;
import arc.Core;
import arc.struct.*;
import arc.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.Table;
import arc.util.Log;
import arc.util.Strings;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import mindustry.ui.*;
import java.util.Locale;
import java.util.*;
import static mindustry.Vars.locales;
import static mindustry.Vars.ui;
import static mindustry.Vars.*;
public class LanguageDialog extends BaseDialog{
private Locale lastLocale;

1
core/src/mindustry/ui/dialogs/MapPlayDialog.java
View File

@@ -4,7 +4,6 @@ import arc.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.util.*;
import arc.util.ArcAnnotate.*;
import mindustry.game.*;
import mindustry.gen.*;
import mindustry.maps.*;

2
core/src/mindustry/ui/dialogs/MinimapDialog.java
View File

@@ -8,7 +8,7 @@ import arc.scene.event.*;
import arc.scene.ui.layout.*;
import mindustry.gen.*;
import static mindustry.Vars.renderer;
import static mindustry.Vars.*;
public class MinimapDialog extends BaseDialog{

8
core/src/mindustry/ui/dialogs/SaveDialog.java
View File

@@ -1,9 +1,9 @@
package mindustry.ui.dialogs;
import arc.Core;
import arc.scene.ui.TextButton;
import arc.util.Time;
import mindustry.game.Saves.SaveSlot;
import arc.*;
import arc.scene.ui.*;
import arc.util.*;
import mindustry.game.Saves.*;
import mindustry.gen.*;
import static mindustry.Vars.*;

2
core/src/mindustry/ui/dialogs/SchematicsDialog.java
View File

@@ -11,7 +11,7 @@ import arc.scene.ui.ImageButton.*;
import arc.scene.ui.TextButton.*;
import arc.scene.ui.layout.*;
import arc.util.*;
import mindustry.Vars;
import mindustry.*;
import mindustry.game.*;
import mindustry.gen.*;
import mindustry.graphics.*;

6
core/src/mindustry/ui/dialogs/TraceDialog.java
View File

@@ -1,9 +1,9 @@
package mindustry.ui.dialogs;
import arc.Core;
import arc.scene.ui.layout.Table;
import arc.*;
import arc.scene.ui.layout.*;
import mindustry.gen.*;
import mindustry.net.Administration.TraceInfo;
import mindustry.net.Administration.*;
public class TraceDialog extends BaseDialog{

2
core/src/mindustry/ui/fragments/BlockInventoryFragment.java
View File

@@ -10,8 +10,8 @@ import arc.scene.*;
import arc.scene.actions.*;
import arc.scene.event.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.scene.ui.layout.Stack;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import mindustry.annotations.Annotations.*;

2
core/src/mindustry/ui/fragments/ChatFragment.java
View File

@@ -2,7 +2,6 @@ package mindustry.ui.fragments;
import arc.*;
import arc.Input.*;
import arc.struct.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.*;
@@ -10,6 +9,7 @@ import arc.scene.*;
import arc.scene.ui.*;
import arc.scene.ui.Label.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import mindustry.*;
import mindustry.gen.*;

2
core/src/mindustry/ui/fragments/Fragment.java
View File

@@ -1,6 +1,6 @@
package mindustry.ui.fragments;
import arc.scene.Group;
import arc.scene.*;
public abstract class Fragment{
public abstract void build(Group parent);

2
core/src/mindustry/ui/layout/BranchTreeLayout.java
View File

@@ -1,7 +1,7 @@
package mindustry.ui.layout;
import arc.struct.*;
import arc.math.geom.*;
import arc.struct.*;
/**
* Algorithm taken from <a href="https://github.com/abego/treelayout">TreeLayout</a>.

2
core/src/mindustry/ui/layout/RadialTreeLayout.java
View File

@@ -1,7 +1,7 @@
package mindustry.ui.layout;
import arc.struct.*;
import arc.math.*;
import arc.struct.*;
public class RadialTreeLayout implements TreeLayout{
private static ObjectSet<TreeNode> visited = new ObjectSet<>();