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

BIN
core/assets/sprites/fallback/sprites5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 191 KiB

After

Width:  |  Height:  |  Size: 185 KiB

BIN
core/assets/sprites/sprites2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 192 KiB

After

Width:  |  Height:  |  Size: 186 KiB

2
core/src/mindustry/ai/Astar.java
View File

@@ -6,7 +6,7 @@ import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.world.*; import mindustry.world.*;
import static mindustry.Vars.world; import static mindustry.Vars.*;
public class Astar{ public class Astar{
public static final DistanceHeuristic manhattan = (x1, y1, x2, y2) -> Math.abs(x1 - x2) + Math.abs(y1 - y2); public static final DistanceHeuristic manhattan = (x1, y1, x2, y2) -> Math.abs(x1 - x2) + Math.abs(y1 - y2);

2
core/src/mindustry/ai/BaseRegistry.java
View File

@@ -17,7 +17,7 @@ import mindustry.world.meta.*;
import java.io.*; import java.io.*;
import static mindustry.Vars.tilesize; import static mindustry.Vars.*;
public class BaseRegistry{ public class BaseRegistry{
public Seq<BasePart> cores = new Seq<>(); public Seq<BasePart> cores = new Seq<>();

2
core/src/mindustry/async/AsyncCore.java
View File

@@ -7,7 +7,7 @@ import mindustry.game.EventType.*;
import java.util.concurrent.*; import java.util.concurrent.*;
import static mindustry.Vars.state; import static mindustry.Vars.*;
public class AsyncCore{ public class AsyncCore{
//all processes to be executed each frame //all processes to be executed each frame

2
core/src/mindustry/async/PhysicsProcess.java
View File

@@ -5,8 +5,8 @@ import arc.math.geom.*;
import arc.math.geom.QuadTree.*; import arc.math.geom.QuadTree.*;
import arc.struct.*; import arc.struct.*;
import mindustry.*; import mindustry.*;
import mindustry.entities.*;
import mindustry.async.PhysicsProcess.PhysicsWorld.*; import mindustry.async.PhysicsProcess.PhysicsWorld.*;
import mindustry.entities.*;
import mindustry.gen.*; import mindustry.gen.*;
public class PhysicsProcess implements AsyncProcess{ public class PhysicsProcess implements AsyncProcess{

2
core/src/mindustry/audio/LoopControl.java
View File

@@ -2,9 +2,9 @@ package mindustry.audio;
import arc.*; import arc.*;
import arc.audio.*; import arc.audio.*;
import arc.struct.*;
import arc.math.*; import arc.math.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.struct.*;
import mindustry.*; import mindustry.*;
public class LoopControl{ public class LoopControl{

2
core/src/mindustry/content/Fx.java
View File

@@ -18,7 +18,7 @@ import static arc.graphics.g2d.Draw.rect;
import static arc.graphics.g2d.Draw.*; import static arc.graphics.g2d.Draw.*;
import static arc.graphics.g2d.Lines.*; import static arc.graphics.g2d.Lines.*;
import static arc.math.Angles.*; import static arc.math.Angles.*;
import static mindustry.Vars.tilesize; import static mindustry.Vars.*;
public class Fx{ public class Fx{
public static final Effect public static final Effect

6
core/src/mindustry/content/Liquids.java
View File

@@ -1,8 +1,8 @@
package mindustry.content; package mindustry.content;
import arc.graphics.Color; import arc.graphics.*;
import mindustry.ctype.ContentList; import mindustry.ctype.*;
import mindustry.type.Liquid; import mindustry.type.*;
public class Liquids implements ContentList{ public class Liquids implements ContentList{
public static Liquid water, slag, oil, cryofluid; public static Liquid water, slag, oil, cryofluid;

7
core/src/mindustry/content/StatusEffects.java
View File

@@ -2,10 +2,11 @@ package mindustry.content;
import arc.*; import arc.*;
import arc.graphics.*; import arc.graphics.*;
import arc.math.Mathf; import arc.math.*;
import mindustry.ctype.ContentList; import mindustry.ctype.*;
import mindustry.game.EventType.*; import mindustry.game.EventType.*;
import mindustry.type.StatusEffect; import mindustry.type.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class StatusEffects implements ContentList{ public class StatusEffects implements ContentList{

6
core/src/mindustry/core/ContentLoader.java
View File

@@ -1,9 +1,9 @@
package mindustry.core; package mindustry.core;
import arc.files.*; import arc.files.*;
import arc.struct.*;
import arc.func.*; import arc.func.*;
import arc.graphics.*; import arc.graphics.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*; import arc.util.ArcAnnotate.*;
import arc.util.*; import arc.util.*;
import mindustry.content.*; import mindustry.content.*;
@@ -13,8 +13,8 @@ import mindustry.mod.Mods.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.world.*; import mindustry.world.*;
import static arc.Core.files; import static arc.Core.*;
import static mindustry.Vars.mods; import static mindustry.Vars.*;
/** /**
* Loads all game content. * Loads all game content.

2
core/src/mindustry/core/Control.java
View File

@@ -8,8 +8,8 @@ import arc.input.*;
import arc.math.*; import arc.math.*;
import arc.scene.ui.*; import arc.scene.ui.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*;
import arc.util.ArcAnnotate.*; import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.*; import mindustry.*;
import mindustry.audio.*; import mindustry.audio.*;
import mindustry.content.*; import mindustry.content.*;

2
core/src/mindustry/core/FileTree.java
View File

@@ -2,8 +2,8 @@ package mindustry.core;
import arc.*; import arc.*;
import arc.assets.loaders.*; import arc.assets.loaders.*;
import arc.struct.*;
import arc.files.*; import arc.files.*;
import arc.struct.*;
/** Handles files in a modded context. */ /** Handles files in a modded context. */
public class FileTree implements FileHandleResolver{ public class FileTree implements FileHandleResolver{

2
core/src/mindustry/core/NetServer.java
View File

@@ -6,8 +6,8 @@ import arc.graphics.*;
import arc.math.*; import arc.math.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*;
import arc.util.ArcAnnotate.*; import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.CommandHandler.*; import arc.util.CommandHandler.*;
import arc.util.io.*; import arc.util.io.*;
import arc.util.serialization.*; import arc.util.serialization.*;

2
core/src/mindustry/core/UI.java
View File

@@ -24,7 +24,7 @@ import mindustry.editor.*;
import mindustry.game.EventType.*; import mindustry.game.EventType.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.logic.LogicDialog; import mindustry.logic.*;
import mindustry.ui.*; import mindustry.ui.*;
import mindustry.ui.dialogs.*; import mindustry.ui.dialogs.*;
import mindustry.ui.fragments.*; import mindustry.ui.fragments.*;

2
core/src/mindustry/core/Version.java
View File

@@ -2,8 +2,8 @@ package mindustry.core;
import arc.*; import arc.*;
import arc.Files.*; import arc.Files.*;
import arc.struct.*;
import arc.files.*; import arc.files.*;
import arc.struct.*;
import arc.util.*; import arc.util.*;
import arc.util.io.*; import arc.util.io.*;

2
core/src/mindustry/ctype/Content.java
View File

@@ -1,8 +1,8 @@
package mindustry.ctype; package mindustry.ctype;
import arc.files.*; import arc.files.*;
import arc.util.*;
import arc.util.ArcAnnotate.*; import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.*; import mindustry.*;
import mindustry.mod.Mods.*; import mindustry.mod.Mods.*;

13
core/src/mindustry/editor/DrawOperation.java
View File

@@ -1,14 +1,13 @@
package mindustry.editor; package mindustry.editor;
import arc.struct.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import arc.struct.LongSeq; import mindustry.game.*;
import mindustry.game.Team; import mindustry.gen.*;
import mindustry.gen.TileOp; import mindustry.world.*;
import mindustry.world.Block; import mindustry.world.blocks.environment.*;
import mindustry.world.Tile;
import mindustry.world.blocks.environment.Floor;
import static mindustry.Vars.content; import static mindustry.Vars.*;
public class DrawOperation{ public class DrawOperation{
private MapEditor editor; private MapEditor editor;

1
core/src/mindustry/editor/EditorTile.java
View File

@@ -1,7 +1,6 @@
package mindustry.editor; package mindustry.editor;
import arc.func.*; import arc.func.*;
import arc.util.ArcAnnotate.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.editor.DrawOperation.*; import mindustry.editor.DrawOperation.*;
import mindustry.game.*; import mindustry.game.*;

2
core/src/mindustry/editor/MapEditorDialog.java
View File

@@ -1,7 +1,6 @@
package mindustry.editor; package mindustry.editor;
import arc.*; import arc.*;
import arc.struct.*;
import arc.files.*; import arc.files.*;
import arc.func.*; import arc.func.*;
import arc.graphics.*; import arc.graphics.*;
@@ -14,6 +13,7 @@ import arc.scene.event.*;
import arc.scene.style.*; import arc.scene.style.*;
import arc.scene.ui.*; import arc.scene.ui.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*; import arc.util.*;
import arc.util.ArcAnnotate.*; import arc.util.ArcAnnotate.*;
import mindustry.*; import mindustry.*;

2
core/src/mindustry/editor/MapInfoDialog.java
View File

@@ -1,8 +1,8 @@
package mindustry.editor; package mindustry.editor;
import arc.*; import arc.*;
import arc.struct.*;
import arc.scene.ui.*; import arc.scene.ui.*;
import arc.struct.*;
import mindustry.*; import mindustry.*;
import mindustry.game.*; import mindustry.game.*;
import mindustry.io.*; import mindustry.io.*;

2
core/src/mindustry/editor/MapLoadDialog.java
View File

@@ -8,7 +8,7 @@ import mindustry.maps.*;
import mindustry.ui.*; import mindustry.ui.*;
import mindustry.ui.dialogs.*; import mindustry.ui.dialogs.*;
import static mindustry.Vars.maps; import static mindustry.Vars.*;
public class MapLoadDialog extends BaseDialog{ public class MapLoadDialog extends BaseDialog{
private Map selected = null; private Map selected = null;

26
core/src/mindustry/editor/MapView.java
View File

@@ -1,24 +1,22 @@
package mindustry.editor; package mindustry.editor;
import arc.Core; import arc.*;
import arc.graphics.Color; import arc.graphics.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.input.GestureDetector; import arc.input.*;
import arc.input.GestureDetector.GestureListener; import arc.input.GestureDetector.*;
import arc.input.KeyCode; import arc.math.*;
import arc.math.Mathf;
import arc.math.geom.*; import arc.math.geom.*;
import arc.scene.Element; import arc.scene.*;
import arc.scene.event.*; import arc.scene.event.*;
import arc.scene.ui.TextField; import arc.scene.ui.*;
import arc.scene.ui.layout.Scl; import arc.scene.ui.layout.*;
import arc.util.*; import arc.util.*;
import mindustry.graphics.Pal; import mindustry.graphics.*;
import mindustry.input.Binding; import mindustry.input.*;
import mindustry.ui.GridImage; import mindustry.ui.*;
import static mindustry.Vars.mobile; import static mindustry.Vars.*;
import static mindustry.Vars.ui;
public class MapView extends Element implements GestureListener{ public class MapView extends Element implements GestureListener{
private MapEditor editor; private MapEditor editor;

2
core/src/mindustry/editor/OperationStack.java
View File

@@ -1,6 +1,6 @@
package mindustry.editor; package mindustry.editor;
import arc.struct.Seq; import arc.struct.*;
public class OperationStack{ public class OperationStack{
private static final int maxSize = 10; private static final int maxSize = 10;

2
core/src/mindustry/entities/Effect.java
View File

@@ -7,8 +7,8 @@ import arc.graphics.g2d.*;
import arc.math.*; import arc.math.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*;
import arc.util.ArcAnnotate.*; import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.*; import mindustry.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.gen.*; import mindustry.gen.*;

2
core/src/mindustry/entities/EntityGroup.java
View File

@@ -8,7 +8,7 @@ import mindustry.gen.*;
import java.util.*; import java.util.*;
import static mindustry.Vars.collisions; import static mindustry.Vars.*;
/** Represents a group of a certain type of entity.*/ /** Represents a group of a certain type of entity.*/
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")

1
core/src/mindustry/entities/abilities/StatusFieldAbility.java
View File

@@ -1,6 +1,5 @@
package mindustry.entities.abilities; package mindustry.entities.abilities;
import arc.util.ArcAnnotate.*;
import arc.util.*; import arc.util.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.entities.*; import mindustry.entities.*;

15
core/src/mindustry/entities/bullet/MassDriverBolt.java
View File

@@ -1,15 +1,14 @@
package mindustry.entities.bullet; package mindustry.entities.bullet;
import arc.graphics.Color; import arc.graphics.*;
import arc.graphics.g2d.Draw; import arc.graphics.g2d.*;
import arc.math.Angles; import arc.math.*;
import arc.math.Mathf; import mindustry.content.*;
import mindustry.content.Fx;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.Pal; import mindustry.graphics.*;
import mindustry.world.blocks.distribution.MassDriver.DriverBulletData; import mindustry.world.blocks.distribution.MassDriver.*;
import static mindustry.Vars.content; import static mindustry.Vars.*;
public class MassDriverBolt extends BulletType{ public class MassDriverBolt extends BulletType{

1
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -1238,6 +1238,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
case powerNetOut -> power == null ? 0 : power.graph.getLastScaledPowerOut() * 60; case powerNetOut -> power == null ? 0 : power.graph.getLastScaledPowerOut() * 60;
case powerNetStored -> power == null ? 0 : power.graph.getLastPowerStored(); case powerNetStored -> power == null ? 0 : power.graph.getLastPowerStored();
case powerNetCapacity -> power == null ? 0 : power.graph.getLastCapacity(); case powerNetCapacity -> power == null ? 0 : power.graph.getLastCapacity();
case enabled -> enabled ? 1 : 0;
default -> 0; default -> 0;
}; };
} }

2
core/src/mindustry/entities/comp/EntityComp.java
View File

@@ -6,7 +6,7 @@ import mindustry.annotations.Annotations.*;
import mindustry.entities.*; import mindustry.entities.*;
import mindustry.gen.*; import mindustry.gen.*;
import static mindustry.Vars.player; import static mindustry.Vars.*;
@Component @Component
@BaseComponent @BaseComponent

2
core/src/mindustry/entities/comp/FlyingComp.java
View File

@@ -10,7 +10,7 @@ import mindustry.game.EventType.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.world.blocks.environment.*; import mindustry.world.blocks.environment.*;
import static mindustry.Vars.net; import static mindustry.Vars.*;
@Component @Component
abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{

2
core/src/mindustry/entities/comp/HitboxComp.java
View File

@@ -2,8 +2,8 @@ package mindustry.entities.comp;
import arc.func.*; import arc.func.*;
import arc.math.*; import arc.math.*;
import arc.math.geom.QuadTree.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.math.geom.QuadTree.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import mindustry.gen.*; import mindustry.gen.*;

2
core/src/mindustry/entities/comp/MinerComp.java
View File

@@ -4,8 +4,8 @@ import arc.*;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.math.*; import arc.math.*;
import arc.util.*;
import arc.util.ArcAnnotate.*; import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.gen.*; import mindustry.gen.*;

2
core/src/mindustry/entities/comp/PosComp.java
View File

@@ -8,7 +8,7 @@ import mindustry.content.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.environment.*; import mindustry.world.blocks.environment.*;
import static mindustry.Vars.world; import static mindustry.Vars.*;
@Component @Component
abstract class PosComp implements Position{ abstract class PosComp implements Position{

2
core/src/mindustry/entities/comp/ShieldComp.java
View File

@@ -5,7 +5,7 @@ import mindustry.annotations.Annotations.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.gen.*; import mindustry.gen.*;
import static mindustry.Vars.minArmorDamage; import static mindustry.Vars.*;
@Component @Component
abstract class ShieldComp implements Healthc, Posc{ abstract class ShieldComp implements Healthc, Posc{

2
core/src/mindustry/entities/comp/TeamComp.java
View File

@@ -5,7 +5,7 @@ import mindustry.annotations.Annotations.*;
import mindustry.game.*; import mindustry.game.*;
import mindustry.gen.*; import mindustry.gen.*;
import static mindustry.Vars.state; import static mindustry.Vars.*;
@Component @Component
abstract class TeamComp implements Posc{ abstract class TeamComp implements Posc{

2
core/src/mindustry/entities/comp/VelComp.java
View File

@@ -2,8 +2,8 @@ package mindustry.entities.comp;
import arc.math.*; import arc.math.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.util.*;
import arc.util.ArcAnnotate.*; import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import mindustry.entities.EntityCollisions.*; import mindustry.entities.EntityCollisions.*;
import mindustry.gen.*; import mindustry.gen.*;

4
core/src/mindustry/game/Saves.java
View File

@@ -2,11 +2,11 @@ package mindustry.game;
import arc.*; import arc.*;
import arc.assets.*; import arc.assets.*;
import arc.struct.*;
import arc.files.*; import arc.files.*;
import arc.graphics.*; import arc.graphics.*;
import arc.util.*; import arc.struct.*;
import arc.util.ArcAnnotate.*; import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.async.*; import arc.util.async.*;
import mindustry.*; import mindustry.*;
import mindustry.core.GameState.*; import mindustry.core.GameState.*;

2
core/src/mindustry/game/SpawnGroup.java
View File

@@ -8,7 +8,7 @@ import mindustry.gen.*;
import mindustry.io.legacy.*; import mindustry.io.legacy.*;
import mindustry.type.*; import mindustry.type.*;
import static mindustry.Vars.content; import static mindustry.Vars.*;
/** /**
* A spawn group defines spawn information for a specific type of unit, with optional extra information like * A spawn group defines spawn information for a specific type of unit, with optional extra information like

4
core/src/mindustry/game/Tutorial.java
View File

@@ -1,17 +1,17 @@
package mindustry.game; package mindustry.game;
import arc.*; import arc.*;
import arc.struct.*;
import arc.func.*; import arc.func.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.math.*; import arc.math.*;
import arc.scene.*; import arc.scene.*;
import arc.scene.ui.*; import arc.scene.ui.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.gen.*;
import mindustry.game.EventType.*; import mindustry.game.EventType.*;
import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.world.*; import mindustry.world.*;

2
core/src/mindustry/graphics/BlockRenderer.java
View File

@@ -16,7 +16,7 @@ import mindustry.ui.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.power.*; import mindustry.world.blocks.power.*;
import static arc.Core.camera; import static arc.Core.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class BlockRenderer implements Disposable{ public class BlockRenderer implements Disposable{

2
core/src/mindustry/graphics/CacheLayer.java
View File

@@ -4,7 +4,7 @@ import arc.*;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.gl.*; import arc.graphics.gl.*;
import static mindustry.Vars.renderer; import static mindustry.Vars.*;
public enum CacheLayer{ public enum CacheLayer{
water{ water{

2
core/src/mindustry/graphics/LightRenderer.java
View File

@@ -10,7 +10,7 @@ import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.*; import mindustry.*;
import static mindustry.Vars.state; import static mindustry.Vars.*;
/** Renders overlay lights. Client only. */ /** Renders overlay lights. Client only. */
public class LightRenderer{ public class LightRenderer{

2
core/src/mindustry/graphics/Pal.java
View File

@@ -1,6 +1,6 @@
package mindustry.graphics; package mindustry.graphics;
import arc.graphics.Color; import arc.graphics.*;
public class Pal{ public class Pal{
public static Color public static Color

2
core/src/mindustry/graphics/Pixelator.java
View File

@@ -8,7 +8,7 @@ import arc.graphics.gl.*;
import arc.util.*; import arc.util.*;
import static arc.Core.*; import static arc.Core.*;
import static mindustry.Vars.renderer; import static mindustry.Vars.*;
public class Pixelator implements Disposable{ public class Pixelator implements Disposable{
private FrameBuffer buffer = new FrameBuffer(); private FrameBuffer buffer = new FrameBuffer();

2
core/src/mindustry/io/SaveMeta.java
View File

@@ -4,7 +4,7 @@ import arc.struct.*;
import mindustry.game.*; import mindustry.game.*;
import mindustry.maps.*; import mindustry.maps.*;
import static mindustry.Vars.maps; import static mindustry.Vars.*;
public class SaveMeta{ public class SaveMeta{
public int version; public int version;

2
core/src/mindustry/io/legacy/LegacySaveVersion.java
View File

@@ -9,7 +9,7 @@ import mindustry.world.*;
import java.io.*; import java.io.*;
import static mindustry.Vars.content; import static mindustry.Vars.*;
public abstract class LegacySaveVersion extends SaveVersion{ public abstract class LegacySaveVersion extends SaveVersion{

2
core/src/mindustry/io/legacy/Save3.java
View File

@@ -5,7 +5,7 @@ import mindustry.game.Teams.*;
import java.io.*; import java.io.*;
import static mindustry.Vars.content; import static mindustry.Vars.*;
public class Save3 extends LegacySaveVersion{ public class Save3 extends LegacySaveVersion{

11
core/src/mindustry/logic/LAccess.java
View File

@@ -29,13 +29,16 @@ public enum LAccess{
//values with parameters are considered controllable //values with parameters are considered controllable
enabled("to"), //"to" is standard for single parameter access enabled("to"), //"to" is standard for single parameter access
shoot("x", "y", "shoot"),; shoot("x", "y", "shoot"),
;
public final String[] parameters; public final String[] parameters;
public static final LAccess[] all = values(); public static final LAccess[]
public static final LAccess[] senseable = Seq.select(all, t -> t.parameters.length <= 1).toArray(LAccess.class); all = values(),
public static final LAccess[] controls = Seq.select(all, t -> t.parameters.length > 0).toArray(LAccess.class); senseable = Seq.select(all, t -> t.parameters.length <= 1).toArray(LAccess.class),
controls = Seq.select(all, t -> t.parameters.length > 0).toArray(LAccess.class);
LAccess(String... parameters){ LAccess(String... parameters){
this.parameters = parameters; this.parameters = parameters;

1
core/src/mindustry/logic/LCanvas.java
View File

@@ -13,7 +13,6 @@ import arc.scene.ui.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
import arc.util.ArcAnnotate.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.ui.*; import mindustry.ui.*;

4
core/src/mindustry/maps/Map.java
View File

@@ -1,11 +1,11 @@
package mindustry.maps; package mindustry.maps;
import arc.*; import arc.*;
import arc.struct.*;
import arc.files.*; import arc.files.*;
import arc.graphics.*; import arc.graphics.*;
import arc.util.*; import arc.struct.*;
import arc.util.ArcAnnotate.*; import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.*; import mindustry.*;
import mindustry.game.EventType.*; import mindustry.game.EventType.*;
import mindustry.game.*; import mindustry.game.*;

4
core/src/mindustry/maps/MapPreviewLoader.java
View File

@@ -3,12 +3,12 @@ package mindustry.maps;
import arc.assets.*; import arc.assets.*;
import arc.assets.loaders.*; import arc.assets.loaders.*;
import arc.assets.loaders.resolvers.*; import arc.assets.loaders.resolvers.*;
import arc.struct.*;
import arc.files.*; import arc.files.*;
import arc.graphics.*; import arc.graphics.*;
import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.*; import mindustry.*;
import mindustry.ctype.Content; import mindustry.ctype.*;
public class MapPreviewLoader extends TextureLoader{ public class MapPreviewLoader extends TextureLoader{

2
core/src/mindustry/maps/filters/CoreSpawnFilter.java
View File

@@ -5,7 +5,7 @@ import arc.util.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.storage.*; import mindustry.world.blocks.storage.*;
import static mindustry.Vars.state; import static mindustry.Vars.*;
/** Selects X spawns from the core spawn pool.*/ /** Selects X spawns from the core spawn pool.*/
public class CoreSpawnFilter extends GenerateFilter{ public class CoreSpawnFilter extends GenerateFilter{

4
core/src/mindustry/maps/filters/MedianFilter.java
View File

@@ -1,12 +1,12 @@
package mindustry.maps.filters; package mindustry.maps.filters;
import arc.struct.*;
import arc.math.*; import arc.math.*;
import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.maps.filters.FilterOption.*; import mindustry.maps.filters.FilterOption.*;
import mindustry.world.*; import mindustry.world.*;
import static mindustry.Vars.content; import static mindustry.Vars.*;
public class MedianFilter extends GenerateFilter{ public class MedianFilter extends GenerateFilter{
float radius = 2; float radius = 2;

10
core/src/mindustry/maps/filters/NoiseFilter.java
View File

@@ -1,13 +1,11 @@
package mindustry.maps.filters; package mindustry.maps.filters;
import arc.util.*; import arc.util.*;
import mindustry.content.Blocks; import mindustry.content.*;
import mindustry.maps.filters.FilterOption.BlockOption; import mindustry.maps.filters.FilterOption.*;
import mindustry.maps.filters.FilterOption.SliderOption; import mindustry.world.*;
import mindustry.world.Block;
import static mindustry.maps.filters.FilterOption.floorsOnly; import static mindustry.maps.filters.FilterOption.*;
import static mindustry.maps.filters.FilterOption.wallsOnly;
public class NoiseFilter extends GenerateFilter{ public class NoiseFilter extends GenerateFilter{
float scl = 40, threshold = 0.5f, octaves = 3f, falloff = 0.5f; float scl = 40, threshold = 0.5f, octaves = 3f, falloff = 0.5f;

9
core/src/mindustry/maps/filters/OreFilter.java
View File

@@ -1,12 +1,11 @@
package mindustry.maps.filters; package mindustry.maps.filters;
import arc.util.*; import arc.util.*;
import mindustry.content.Blocks; import mindustry.content.*;
import mindustry.maps.filters.FilterOption.SliderOption; import mindustry.maps.filters.FilterOption.*;
import mindustry.world.Block; import mindustry.world.*;
import static mindustry.maps.filters.FilterOption.BlockOption; import static mindustry.maps.filters.FilterOption.*;
import static mindustry.maps.filters.FilterOption.oresOnly;
public class OreFilter extends GenerateFilter{ public class OreFilter extends GenerateFilter{
public float scl = 23, threshold = 0.81f, octaves = 2f, falloff = 0.3f; public float scl = 23, threshold = 0.81f, octaves = 2f, falloff = 0.3f;

2
core/src/mindustry/maps/filters/OreMedianFilter.java
View File

@@ -1,7 +1,7 @@
package mindustry.maps.filters; package mindustry.maps.filters;
import arc.struct.*;
import arc.math.*; import arc.math.*;
import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.*; import mindustry.*;
import mindustry.content.*; import mindustry.content.*;

10
core/src/mindustry/maps/filters/RiverNoiseFilter.java
View File

@@ -1,13 +1,11 @@
package mindustry.maps.filters; package mindustry.maps.filters;
import arc.util.*; import arc.util.*;
import mindustry.content.Blocks; import mindustry.content.*;
import mindustry.maps.filters.FilterOption.BlockOption; import mindustry.maps.filters.FilterOption.*;
import mindustry.maps.filters.FilterOption.SliderOption; import mindustry.world.*;
import mindustry.world.Block;
import static mindustry.maps.filters.FilterOption.floorsOnly; import static mindustry.maps.filters.FilterOption.*;
import static mindustry.maps.filters.FilterOption.wallsOnly;
public class RiverNoiseFilter extends GenerateFilter{ public class RiverNoiseFilter extends GenerateFilter{
float scl = 40, threshold = 0f, threshold2 = 0.1f; float scl = 40, threshold = 0f, threshold2 = 0.1f;

4
core/src/mindustry/maps/filters/ScatterFilter.java
View File

@@ -1,8 +1,8 @@
package mindustry.maps.filters; package mindustry.maps.filters;
import arc.util.*; import arc.util.*;
import mindustry.content.Blocks; import mindustry.content.*;
import mindustry.world.Block; import mindustry.world.*;
import static mindustry.maps.filters.FilterOption.*; import static mindustry.maps.filters.FilterOption.*;

12
core/src/mindustry/maps/filters/TerrainFilter.java
View File

@@ -1,14 +1,12 @@
package mindustry.maps.filters; package mindustry.maps.filters;
import arc.math.Mathf; import arc.math.*;
import arc.util.*; import arc.util.*;
import mindustry.content.Blocks; import mindustry.content.*;
import mindustry.maps.filters.FilterOption.BlockOption; import mindustry.maps.filters.FilterOption.*;
import mindustry.maps.filters.FilterOption.SliderOption; import mindustry.world.*;
import mindustry.world.Block;
import static mindustry.maps.filters.FilterOption.floorsOnly; import static mindustry.maps.filters.FilterOption.*;
import static mindustry.maps.filters.FilterOption.wallsOnly;
public class TerrainFilter extends GenerateFilter{ public class TerrainFilter extends GenerateFilter{
float scl = 40, threshold = 0.9f, octaves = 3f, falloff = 0.5f, magnitude = 1f, circleScl = 2.1f; float scl = 40, threshold = 0.9f, octaves = 3f, falloff = 0.5f, magnitude = 1f, circleScl = 2.1f;

1
core/src/mindustry/mod/ModLoadingMusic.java
View File

@@ -2,7 +2,6 @@ package mindustry.mod;
import arc.audio.*; import arc.audio.*;
import arc.mock.*; import arc.mock.*;
import arc.util.ArcAnnotate.*;
public class ModLoadingMusic implements Music{ public class ModLoadingMusic implements Music{
public Music music = new MockMusic(); public Music music = new MockMusic();

1
core/src/mindustry/mod/ModLoadingSound.java
View File

@@ -3,7 +3,6 @@ package mindustry.mod;
import arc.audio.*; import arc.audio.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.mock.*; import arc.mock.*;
import arc.util.ArcAnnotate.*;
public class ModLoadingSound implements Sound{ public class ModLoadingSound implements Sound{
public Sound sound = new MockSound(); public Sound sound = new MockSound();

4
core/src/mindustry/net/CrashSender.java
View File

@@ -2,9 +2,9 @@ package mindustry.net;
import arc.*; import arc.*;
import arc.Net.*; import arc.Net.*;
import arc.struct.*;
import arc.files.*; import arc.files.*;
import arc.func.*; import arc.func.*;
import arc.struct.*;
import arc.util.*; import arc.util.*;
import arc.util.io.*; import arc.util.io.*;
import arc.util.serialization.*; import arc.util.serialization.*;
@@ -19,8 +19,8 @@ import java.text.*;
import java.util.*; import java.util.*;
import static arc.Core.*; import static arc.Core.*;
import static mindustry.Vars.mods;
import static mindustry.Vars.net; import static mindustry.Vars.net;
import static mindustry.Vars.*;
public class CrashSender{ public class CrashSender{

2
core/src/mindustry/net/NetworkIO.java
View File

@@ -1,6 +1,6 @@
package mindustry.net; package mindustry.net;
import arc.Core; import arc.*;
import arc.util.*; import arc.util.*;
import arc.util.io.*; import arc.util.io.*;
import mindustry.core.*; import mindustry.core.*;

4
core/src/mindustry/net/Packet.java
View File

@@ -1,8 +1,8 @@
package mindustry.net; package mindustry.net;
import arc.util.pooling.Pool.Poolable; import arc.util.pooling.Pool.*;
import java.nio.ByteBuffer; import java.nio.*;
public interface Packet extends Poolable{ public interface Packet extends Poolable{
default void read(ByteBuffer buffer){} default void read(ByteBuffer buffer){}

4
core/src/mindustry/net/Registrator.java
View File

@@ -1,7 +1,7 @@
package mindustry.net; package mindustry.net;
import arc.struct.ObjectIntMap; import arc.func.*;
import arc.func.Prov; import arc.struct.*;
import mindustry.net.Packets.*; import mindustry.net.Packets.*;
public class Registrator{ public class Registrator{

2
core/src/mindustry/net/Streamable.java
View File

@@ -1,6 +1,6 @@
package mindustry.net; package mindustry.net;
import mindustry.net.Packets.StreamBegin; import mindustry.net.Packets.*;
import java.io.*; import java.io.*;

1
core/src/mindustry/type/AmmoTypes.java
View File

@@ -1,6 +1,5 @@
package mindustry.type; package mindustry.type;
import arc.util.ArcAnnotate.*;
import mindustry.*; import mindustry.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.ctype.*; import mindustry.ctype.*;

4
core/src/mindustry/type/Item.java
View File

@@ -1,13 +1,13 @@
package mindustry.type; package mindustry.type;
import arc.struct.*;
import arc.graphics.*; import arc.graphics.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.*;
import mindustry.ctype.*; import mindustry.ctype.*;
import mindustry.ui.*; import mindustry.ui.*;
import mindustry.world.blocks.environment.*; import mindustry.world.blocks.environment.*;
import static mindustry.Vars.content; import static mindustry.Vars.*;
public class Item extends UnlockableContent{ public class Item extends UnlockableContent{
public final Color color; public final Color color;

4
core/src/mindustry/type/ItemStack.java
View File

@@ -1,7 +1,7 @@
package mindustry.type; package mindustry.type;
import arc.struct.Seq; import arc.struct.*;
import mindustry.content.Items; import mindustry.content.*;
public class ItemStack implements Comparable<ItemStack>{ public class ItemStack implements Comparable<ItemStack>{
public static final ItemStack[] empty = {}; public static final ItemStack[] empty = {};

2
core/src/mindustry/type/Publishable.java
View File

@@ -1,7 +1,7 @@
package mindustry.type; package mindustry.type;
import arc.struct.*;
import arc.files.*; import arc.files.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*; import arc.util.ArcAnnotate.*;
import mindustry.*; import mindustry.*;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,17 +1,15 @@
package mindustry.ui.dialogs; package mindustry.ui.dialogs;
import arc.Core; import arc.*;
import arc.struct.*;
import arc.scene.ui.*; import arc.scene.ui.*;
import arc.scene.ui.layout.Table; import arc.scene.ui.layout.*;
import arc.util.Log; import arc.struct.*;
import arc.util.Strings; import arc.util.*;
import mindustry.ui.*; import mindustry.ui.*;
import java.util.Locale; import java.util.*;
import static mindustry.Vars.locales; import static mindustry.Vars.*;
import static mindustry.Vars.ui;
public class LanguageDialog extends BaseDialog{ public class LanguageDialog extends BaseDialog{
private Locale lastLocale; 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.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.util.*; import arc.util.*;
import arc.util.ArcAnnotate.*;
import mindustry.game.*; import mindustry.game.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.maps.*; 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 arc.scene.ui.layout.*;
import mindustry.gen.*; import mindustry.gen.*;
import static mindustry.Vars.renderer; import static mindustry.Vars.*;
public class MinimapDialog extends BaseDialog{ public class MinimapDialog extends BaseDialog{

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

@@ -1,9 +1,9 @@
package mindustry.ui.dialogs; package mindustry.ui.dialogs;
import arc.Core; import arc.*;
import arc.scene.ui.TextButton; import arc.scene.ui.*;
import arc.util.Time; import arc.util.*;
import mindustry.game.Saves.SaveSlot; import mindustry.game.Saves.*;
import mindustry.gen.*; import mindustry.gen.*;
import static mindustry.Vars.*; 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.TextButton.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.util.*; import arc.util.*;
import mindustry.Vars; import mindustry.*;
import mindustry.game.*; import mindustry.game.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;

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

@@ -1,9 +1,9 @@
package mindustry.ui.dialogs; package mindustry.ui.dialogs;
import arc.Core; import arc.*;
import arc.scene.ui.layout.Table; import arc.scene.ui.layout.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.net.Administration.TraceInfo; import mindustry.net.Administration.*;
public class TraceDialog extends BaseDialog{ 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.actions.*;
import arc.scene.event.*; import arc.scene.event.*;
import arc.scene.ui.*; import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.scene.ui.layout.Stack; import arc.scene.ui.layout.Stack;
import arc.scene.ui.layout.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.annotations.Annotations.*; 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.*;
import arc.Input.*; import arc.Input.*;
import arc.struct.*;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.math.*; import arc.math.*;
@@ -10,6 +9,7 @@ import arc.scene.*;
import arc.scene.ui.*; import arc.scene.ui.*;
import arc.scene.ui.Label.*; import arc.scene.ui.Label.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.*; import mindustry.*;
import mindustry.gen.*; import mindustry.gen.*;

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

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

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

@@ -1,7 +1,7 @@
package mindustry.ui.layout; package mindustry.ui.layout;
import arc.struct.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.struct.*;
/** /**
* Algorithm taken from <a href="https://github.com/abego/treelayout">TreeLayout</a>. * 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; package mindustry.ui.layout;
import arc.struct.*;
import arc.math.*; import arc.math.*;
import arc.struct.*;
public class RadialTreeLayout implements TreeLayout{ public class RadialTreeLayout implements TreeLayout{
private static ObjectSet<TreeNode> visited = new ObjectSet<>(); private static ObjectSet<TreeNode> visited = new ObjectSet<>();

16
core/src/mindustry/world/Block.java
View File

@@ -467,8 +467,7 @@ public class Block extends UnlockableContent{
/** Never use outside of the editor! */ /** Never use outside of the editor! */
public TextureRegion editorIcon(){ public TextureRegion editorIcon(){
if(editorIcon == null) editorIcon = Core.atlas.find(name + "-icon-editor"); return editorIcon == null ? (editorIcon = Core.atlas.find(name + "-icon-editor")) : editorIcon;
return editorIcon;
} }
/** Never use outside of the editor! */ /** Never use outside of the editor! */
@@ -485,21 +484,16 @@ public class Block extends UnlockableContent{
} }
protected TextureRegion[] icons(){ protected TextureRegion[] icons(){
return new TextureRegion[]{region}; //use team region in vanilla team blocks
return teamRegion.found() && minfo.mod == null ? new TextureRegion[]{region, teamRegions[Team.sharded.id]} : new TextureRegion[]{region};
} }
public TextureRegion[] getGeneratedIcons(){ public TextureRegion[] getGeneratedIcons(){
if(generatedIcons == null){ return generatedIcons == null ? (generatedIcons = icons()) : generatedIcons;
generatedIcons = icons();
}
return generatedIcons;
} }
public TextureRegion[] variantRegions(){ public TextureRegion[] variantRegions(){
if(variantRegions == null){ return variantRegions == null ? (variantRegions = new TextureRegion[]{icon(Cicon.full)}) : variantRegions;
variantRegions = new TextureRegion[]{icon(Cicon.full)};
}
return variantRegions;
} }
public boolean hasBuilding(){ public boolean hasBuilding(){

2
core/src/mindustry/world/DirectionalItemBuffer.java
View File

@@ -6,7 +6,7 @@ import mindustry.annotations.Annotations.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.type.*; import mindustry.type.*;
import static mindustry.Vars.content; import static mindustry.Vars.*;
public class DirectionalItemBuffer{ public class DirectionalItemBuffer{
public final long[][] buffers; public final long[][] buffers;

2
core/src/mindustry/world/Edges.java
View File

@@ -6,7 +6,7 @@ import mindustry.gen.*;
import java.util.*; import java.util.*;
import static mindustry.Vars.world; import static mindustry.Vars.*;
public class Edges{ public class Edges{
private static final int maxSize = 14; private static final int maxSize = 14;

Some files were not shown because too many files have changed in this diff Show More