diff --git a/core/assets/sprites/fallback/sprites5.png b/core/assets/sprites/fallback/sprites5.png index ffc65a7f9d..c9946bf655 100644 Binary files a/core/assets/sprites/fallback/sprites5.png and b/core/assets/sprites/fallback/sprites5.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index dd7bbf01c6..efc457f2e4 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/src/mindustry/ai/Astar.java b/core/src/mindustry/ai/Astar.java index c6f33e70f6..df50547d22 100644 --- a/core/src/mindustry/ai/Astar.java +++ b/core/src/mindustry/ai/Astar.java @@ -6,7 +6,7 @@ import arc.struct.*; import arc.util.*; import mindustry.world.*; -import static mindustry.Vars.world; +import static mindustry.Vars.*; public class Astar{ public static final DistanceHeuristic manhattan = (x1, y1, x2, y2) -> Math.abs(x1 - x2) + Math.abs(y1 - y2); diff --git a/core/src/mindustry/ai/BaseRegistry.java b/core/src/mindustry/ai/BaseRegistry.java index cb34095a3c..d751272ebe 100644 --- a/core/src/mindustry/ai/BaseRegistry.java +++ b/core/src/mindustry/ai/BaseRegistry.java @@ -17,7 +17,7 @@ import mindustry.world.meta.*; import java.io.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class BaseRegistry{ public Seq cores = new Seq<>(); diff --git a/core/src/mindustry/async/AsyncCore.java b/core/src/mindustry/async/AsyncCore.java index a023afafcc..764cd3dc4b 100644 --- a/core/src/mindustry/async/AsyncCore.java +++ b/core/src/mindustry/async/AsyncCore.java @@ -7,7 +7,7 @@ import mindustry.game.EventType.*; import java.util.concurrent.*; -import static mindustry.Vars.state; +import static mindustry.Vars.*; public class AsyncCore{ //all processes to be executed each frame diff --git a/core/src/mindustry/async/PhysicsProcess.java b/core/src/mindustry/async/PhysicsProcess.java index 9a075f8f40..07d44d4717 100644 --- a/core/src/mindustry/async/PhysicsProcess.java +++ b/core/src/mindustry/async/PhysicsProcess.java @@ -5,8 +5,8 @@ import arc.math.geom.*; import arc.math.geom.QuadTree.*; import arc.struct.*; import mindustry.*; -import mindustry.entities.*; import mindustry.async.PhysicsProcess.PhysicsWorld.*; +import mindustry.entities.*; import mindustry.gen.*; public class PhysicsProcess implements AsyncProcess{ diff --git a/core/src/mindustry/audio/LoopControl.java b/core/src/mindustry/audio/LoopControl.java index 1b102ab0a4..65e3789463 100644 --- a/core/src/mindustry/audio/LoopControl.java +++ b/core/src/mindustry/audio/LoopControl.java @@ -2,9 +2,9 @@ package mindustry.audio; import arc.*; import arc.audio.*; -import arc.struct.*; import arc.math.*; import arc.math.geom.*; +import arc.struct.*; import mindustry.*; public class LoopControl{ diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 97d54ece50..6ca6ccb24d 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -18,7 +18,7 @@ import static arc.graphics.g2d.Draw.rect; import static arc.graphics.g2d.Draw.*; import static arc.graphics.g2d.Lines.*; import static arc.math.Angles.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class Fx{ public static final Effect diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java index aaced53394..91b7186f6b 100644 --- a/core/src/mindustry/content/Liquids.java +++ b/core/src/mindustry/content/Liquids.java @@ -1,8 +1,8 @@ package mindustry.content; -import arc.graphics.Color; -import mindustry.ctype.ContentList; -import mindustry.type.Liquid; +import arc.graphics.*; +import mindustry.ctype.*; +import mindustry.type.*; public class Liquids implements ContentList{ public static Liquid water, slag, oil, cryofluid; diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java index 7dc957a344..6752cf68e6 100644 --- a/core/src/mindustry/content/StatusEffects.java +++ b/core/src/mindustry/content/StatusEffects.java @@ -2,10 +2,11 @@ package mindustry.content; import arc.*; import arc.graphics.*; -import arc.math.Mathf; -import mindustry.ctype.ContentList; +import arc.math.*; +import mindustry.ctype.*; import mindustry.game.EventType.*; -import mindustry.type.StatusEffect; +import mindustry.type.*; + import static mindustry.Vars.*; public class StatusEffects implements ContentList{ diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java index 56e46d8be2..a63bba770d 100644 --- a/core/src/mindustry/core/ContentLoader.java +++ b/core/src/mindustry/core/ContentLoader.java @@ -1,9 +1,9 @@ package mindustry.core; import arc.files.*; -import arc.struct.*; import arc.func.*; import arc.graphics.*; +import arc.struct.*; import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.content.*; @@ -13,8 +13,8 @@ import mindustry.mod.Mods.*; import mindustry.type.*; import mindustry.world.*; -import static arc.Core.files; -import static mindustry.Vars.mods; +import static arc.Core.*; +import static mindustry.Vars.*; /** * Loads all game content. diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 82cb6e3ad0..b60e5f4c66 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -8,8 +8,8 @@ import arc.input.*; import arc.math.*; import arc.scene.ui.*; import arc.struct.*; -import arc.util.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.*; import mindustry.audio.*; import mindustry.content.*; diff --git a/core/src/mindustry/core/FileTree.java b/core/src/mindustry/core/FileTree.java index f94c75eeb7..d9ca5694c1 100644 --- a/core/src/mindustry/core/FileTree.java +++ b/core/src/mindustry/core/FileTree.java @@ -2,8 +2,8 @@ package mindustry.core; import arc.*; import arc.assets.loaders.*; -import arc.struct.*; import arc.files.*; +import arc.struct.*; /** Handles files in a modded context. */ public class FileTree implements FileHandleResolver{ diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 9b298f9924..c0d6255e79 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -6,8 +6,8 @@ import arc.graphics.*; import arc.math.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import arc.util.CommandHandler.*; import arc.util.io.*; import arc.util.serialization.*; diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java index 536e89a9b2..f0a4757966 100644 --- a/core/src/mindustry/core/UI.java +++ b/core/src/mindustry/core/UI.java @@ -24,7 +24,7 @@ import mindustry.editor.*; import mindustry.game.EventType.*; import mindustry.gen.*; import mindustry.graphics.*; -import mindustry.logic.LogicDialog; +import mindustry.logic.*; import mindustry.ui.*; import mindustry.ui.dialogs.*; import mindustry.ui.fragments.*; diff --git a/core/src/mindustry/core/Version.java b/core/src/mindustry/core/Version.java index bef40c5e87..c2744700a4 100644 --- a/core/src/mindustry/core/Version.java +++ b/core/src/mindustry/core/Version.java @@ -2,8 +2,8 @@ package mindustry.core; import arc.*; import arc.Files.*; -import arc.struct.*; import arc.files.*; +import arc.struct.*; import arc.util.*; import arc.util.io.*; diff --git a/core/src/mindustry/ctype/Content.java b/core/src/mindustry/ctype/Content.java index ad6c3401ee..804815152b 100644 --- a/core/src/mindustry/ctype/Content.java +++ b/core/src/mindustry/ctype/Content.java @@ -1,8 +1,8 @@ package mindustry.ctype; import arc.files.*; -import arc.util.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.*; import mindustry.mod.Mods.*; diff --git a/core/src/mindustry/editor/DrawOperation.java b/core/src/mindustry/editor/DrawOperation.java index e63c2f3a6b..7910de4892 100755 --- a/core/src/mindustry/editor/DrawOperation.java +++ b/core/src/mindustry/editor/DrawOperation.java @@ -1,14 +1,13 @@ package mindustry.editor; +import arc.struct.*; import mindustry.annotations.Annotations.*; -import arc.struct.LongSeq; -import mindustry.game.Team; -import mindustry.gen.TileOp; -import mindustry.world.Block; -import mindustry.world.Tile; -import mindustry.world.blocks.environment.Floor; +import mindustry.game.*; +import mindustry.gen.*; +import mindustry.world.*; +import mindustry.world.blocks.environment.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class DrawOperation{ private MapEditor editor; diff --git a/core/src/mindustry/editor/EditorTile.java b/core/src/mindustry/editor/EditorTile.java index bc09f3c110..3731cf3d99 100644 --- a/core/src/mindustry/editor/EditorTile.java +++ b/core/src/mindustry/editor/EditorTile.java @@ -1,7 +1,6 @@ package mindustry.editor; import arc.func.*; -import arc.util.ArcAnnotate.*; import mindustry.content.*; import mindustry.editor.DrawOperation.*; import mindustry.game.*; diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java index 25733da92e..a39b768567 100644 --- a/core/src/mindustry/editor/MapEditorDialog.java +++ b/core/src/mindustry/editor/MapEditorDialog.java @@ -1,7 +1,6 @@ package mindustry.editor; import arc.*; -import arc.struct.*; import arc.files.*; import arc.func.*; import arc.graphics.*; @@ -14,6 +13,7 @@ import arc.scene.event.*; import arc.scene.style.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; +import arc.struct.*; import arc.util.*; import arc.util.ArcAnnotate.*; import mindustry.*; diff --git a/core/src/mindustry/editor/MapInfoDialog.java b/core/src/mindustry/editor/MapInfoDialog.java index c46e06f36d..dd9959b199 100644 --- a/core/src/mindustry/editor/MapInfoDialog.java +++ b/core/src/mindustry/editor/MapInfoDialog.java @@ -1,8 +1,8 @@ package mindustry.editor; import arc.*; -import arc.struct.*; import arc.scene.ui.*; +import arc.struct.*; import mindustry.*; import mindustry.game.*; import mindustry.io.*; diff --git a/core/src/mindustry/editor/MapLoadDialog.java b/core/src/mindustry/editor/MapLoadDialog.java index 53673ae9d2..4ed63a1a7f 100644 --- a/core/src/mindustry/editor/MapLoadDialog.java +++ b/core/src/mindustry/editor/MapLoadDialog.java @@ -8,7 +8,7 @@ import mindustry.maps.*; import mindustry.ui.*; import mindustry.ui.dialogs.*; -import static mindustry.Vars.maps; +import static mindustry.Vars.*; public class MapLoadDialog extends BaseDialog{ private Map selected = null; diff --git a/core/src/mindustry/editor/MapView.java b/core/src/mindustry/editor/MapView.java index 21e659ae1b..7ee088eec5 100644 --- a/core/src/mindustry/editor/MapView.java +++ b/core/src/mindustry/editor/MapView.java @@ -1,24 +1,22 @@ package mindustry.editor; -import arc.Core; -import arc.graphics.Color; +import arc.*; +import arc.graphics.*; import arc.graphics.g2d.*; -import arc.input.GestureDetector; -import arc.input.GestureDetector.GestureListener; -import arc.input.KeyCode; -import arc.math.Mathf; +import arc.input.*; +import arc.input.GestureDetector.*; +import arc.math.*; import arc.math.geom.*; -import arc.scene.Element; +import arc.scene.*; import arc.scene.event.*; -import arc.scene.ui.TextField; -import arc.scene.ui.layout.Scl; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; import arc.util.*; -import mindustry.graphics.Pal; -import mindustry.input.Binding; -import mindustry.ui.GridImage; +import mindustry.graphics.*; +import mindustry.input.*; +import mindustry.ui.*; -import static mindustry.Vars.mobile; -import static mindustry.Vars.ui; +import static mindustry.Vars.*; public class MapView extends Element implements GestureListener{ private MapEditor editor; diff --git a/core/src/mindustry/editor/OperationStack.java b/core/src/mindustry/editor/OperationStack.java index 0558de14bc..91bb183457 100755 --- a/core/src/mindustry/editor/OperationStack.java +++ b/core/src/mindustry/editor/OperationStack.java @@ -1,6 +1,6 @@ package mindustry.editor; -import arc.struct.Seq; +import arc.struct.*; public class OperationStack{ private static final int maxSize = 10; diff --git a/core/src/mindustry/entities/Effect.java b/core/src/mindustry/entities/Effect.java index fd82f109e9..190d842a07 100644 --- a/core/src/mindustry/entities/Effect.java +++ b/core/src/mindustry/entities/Effect.java @@ -7,8 +7,8 @@ import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.*; import mindustry.content.*; import mindustry.gen.*; diff --git a/core/src/mindustry/entities/EntityGroup.java b/core/src/mindustry/entities/EntityGroup.java index 1157b83ff9..bec27847c4 100644 --- a/core/src/mindustry/entities/EntityGroup.java +++ b/core/src/mindustry/entities/EntityGroup.java @@ -8,7 +8,7 @@ import mindustry.gen.*; import java.util.*; -import static mindustry.Vars.collisions; +import static mindustry.Vars.*; /** Represents a group of a certain type of entity.*/ @SuppressWarnings("unchecked") diff --git a/core/src/mindustry/entities/abilities/StatusFieldAbility.java b/core/src/mindustry/entities/abilities/StatusFieldAbility.java index cb72ad353d..857cfde5cf 100644 --- a/core/src/mindustry/entities/abilities/StatusFieldAbility.java +++ b/core/src/mindustry/entities/abilities/StatusFieldAbility.java @@ -1,6 +1,5 @@ package mindustry.entities.abilities; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.content.*; import mindustry.entities.*; diff --git a/core/src/mindustry/entities/bullet/MassDriverBolt.java b/core/src/mindustry/entities/bullet/MassDriverBolt.java index 70d3c6de9b..42135a2db4 100644 --- a/core/src/mindustry/entities/bullet/MassDriverBolt.java +++ b/core/src/mindustry/entities/bullet/MassDriverBolt.java @@ -1,15 +1,14 @@ package mindustry.entities.bullet; -import arc.graphics.Color; -import arc.graphics.g2d.Draw; -import arc.math.Angles; -import arc.math.Mathf; -import mindustry.content.Fx; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import mindustry.content.*; import mindustry.gen.*; -import mindustry.graphics.Pal; -import mindustry.world.blocks.distribution.MassDriver.DriverBulletData; +import mindustry.graphics.*; +import mindustry.world.blocks.distribution.MassDriver.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class MassDriverBolt extends BulletType{ diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index bf4236ce53..932e52dce6 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -1238,6 +1238,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, case powerNetOut -> power == null ? 0 : power.graph.getLastScaledPowerOut() * 60; case powerNetStored -> power == null ? 0 : power.graph.getLastPowerStored(); case powerNetCapacity -> power == null ? 0 : power.graph.getLastCapacity(); + case enabled -> enabled ? 1 : 0; default -> 0; }; } diff --git a/core/src/mindustry/entities/comp/EntityComp.java b/core/src/mindustry/entities/comp/EntityComp.java index 2b20e908b2..a97a2e0cc3 100644 --- a/core/src/mindustry/entities/comp/EntityComp.java +++ b/core/src/mindustry/entities/comp/EntityComp.java @@ -6,7 +6,7 @@ import mindustry.annotations.Annotations.*; import mindustry.entities.*; import mindustry.gen.*; -import static mindustry.Vars.player; +import static mindustry.Vars.*; @Component @BaseComponent diff --git a/core/src/mindustry/entities/comp/FlyingComp.java b/core/src/mindustry/entities/comp/FlyingComp.java index 83c16d3525..0c8c2f0277 100644 --- a/core/src/mindustry/entities/comp/FlyingComp.java +++ b/core/src/mindustry/entities/comp/FlyingComp.java @@ -10,7 +10,7 @@ import mindustry.game.EventType.*; import mindustry.gen.*; import mindustry.world.blocks.environment.*; -import static mindustry.Vars.net; +import static mindustry.Vars.*; @Component abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{ diff --git a/core/src/mindustry/entities/comp/HitboxComp.java b/core/src/mindustry/entities/comp/HitboxComp.java index 9473dfbca3..f44270ebed 100644 --- a/core/src/mindustry/entities/comp/HitboxComp.java +++ b/core/src/mindustry/entities/comp/HitboxComp.java @@ -2,8 +2,8 @@ package mindustry.entities.comp; import arc.func.*; import arc.math.*; -import arc.math.geom.QuadTree.*; import arc.math.geom.*; +import arc.math.geom.QuadTree.*; import mindustry.annotations.Annotations.*; import mindustry.gen.*; diff --git a/core/src/mindustry/entities/comp/MinerComp.java b/core/src/mindustry/entities/comp/MinerComp.java index 7049617b73..ee2d535160 100644 --- a/core/src/mindustry/entities/comp/MinerComp.java +++ b/core/src/mindustry/entities/comp/MinerComp.java @@ -4,8 +4,8 @@ import arc.*; import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; -import arc.util.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.gen.*; diff --git a/core/src/mindustry/entities/comp/PosComp.java b/core/src/mindustry/entities/comp/PosComp.java index d43d097bac..d184df599a 100644 --- a/core/src/mindustry/entities/comp/PosComp.java +++ b/core/src/mindustry/entities/comp/PosComp.java @@ -8,7 +8,7 @@ import mindustry.content.*; import mindustry.world.*; import mindustry.world.blocks.environment.*; -import static mindustry.Vars.world; +import static mindustry.Vars.*; @Component abstract class PosComp implements Position{ diff --git a/core/src/mindustry/entities/comp/ShieldComp.java b/core/src/mindustry/entities/comp/ShieldComp.java index c0fb68d78a..359637414e 100644 --- a/core/src/mindustry/entities/comp/ShieldComp.java +++ b/core/src/mindustry/entities/comp/ShieldComp.java @@ -5,7 +5,7 @@ import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.gen.*; -import static mindustry.Vars.minArmorDamage; +import static mindustry.Vars.*; @Component abstract class ShieldComp implements Healthc, Posc{ diff --git a/core/src/mindustry/entities/comp/TeamComp.java b/core/src/mindustry/entities/comp/TeamComp.java index ed03caca5c..45f18dd0ee 100644 --- a/core/src/mindustry/entities/comp/TeamComp.java +++ b/core/src/mindustry/entities/comp/TeamComp.java @@ -5,7 +5,7 @@ import mindustry.annotations.Annotations.*; import mindustry.game.*; import mindustry.gen.*; -import static mindustry.Vars.state; +import static mindustry.Vars.*; @Component abstract class TeamComp implements Posc{ diff --git a/core/src/mindustry/entities/comp/VelComp.java b/core/src/mindustry/entities/comp/VelComp.java index deec6756d1..37e7d89ee0 100644 --- a/core/src/mindustry/entities/comp/VelComp.java +++ b/core/src/mindustry/entities/comp/VelComp.java @@ -2,8 +2,8 @@ package mindustry.entities.comp; import arc.math.*; import arc.math.geom.*; -import arc.util.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.entities.EntityCollisions.*; import mindustry.gen.*; diff --git a/core/src/mindustry/game/Saves.java b/core/src/mindustry/game/Saves.java index 0f7908aa63..65aa2048b9 100644 --- a/core/src/mindustry/game/Saves.java +++ b/core/src/mindustry/game/Saves.java @@ -2,11 +2,11 @@ package mindustry.game; import arc.*; import arc.assets.*; -import arc.struct.*; import arc.files.*; import arc.graphics.*; -import arc.util.*; +import arc.struct.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import arc.util.async.*; import mindustry.*; import mindustry.core.GameState.*; diff --git a/core/src/mindustry/game/SpawnGroup.java b/core/src/mindustry/game/SpawnGroup.java index 15f7c98fff..fda8514d48 100644 --- a/core/src/mindustry/game/SpawnGroup.java +++ b/core/src/mindustry/game/SpawnGroup.java @@ -8,7 +8,7 @@ import mindustry.gen.*; import mindustry.io.legacy.*; 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 diff --git a/core/src/mindustry/game/Tutorial.java b/core/src/mindustry/game/Tutorial.java index e0f73248ed..d3e5bae56c 100644 --- a/core/src/mindustry/game/Tutorial.java +++ b/core/src/mindustry/game/Tutorial.java @@ -1,17 +1,17 @@ package mindustry.game; import arc.*; -import arc.struct.*; import arc.func.*; import arc.graphics.g2d.*; import arc.math.*; import arc.scene.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; +import arc.struct.*; import arc.util.*; import mindustry.content.*; -import mindustry.gen.*; import mindustry.game.EventType.*; +import mindustry.gen.*; import mindustry.graphics.*; import mindustry.type.*; import mindustry.world.*; diff --git a/core/src/mindustry/graphics/BlockRenderer.java b/core/src/mindustry/graphics/BlockRenderer.java index c65b3cae7c..a36230f0aa 100644 --- a/core/src/mindustry/graphics/BlockRenderer.java +++ b/core/src/mindustry/graphics/BlockRenderer.java @@ -16,7 +16,7 @@ import mindustry.ui.*; import mindustry.world.*; import mindustry.world.blocks.power.*; -import static arc.Core.camera; +import static arc.Core.*; import static mindustry.Vars.*; public class BlockRenderer implements Disposable{ diff --git a/core/src/mindustry/graphics/CacheLayer.java b/core/src/mindustry/graphics/CacheLayer.java index c3eed64feb..3174c5d2a4 100644 --- a/core/src/mindustry/graphics/CacheLayer.java +++ b/core/src/mindustry/graphics/CacheLayer.java @@ -4,7 +4,7 @@ import arc.*; import arc.graphics.*; import arc.graphics.gl.*; -import static mindustry.Vars.renderer; +import static mindustry.Vars.*; public enum CacheLayer{ water{ diff --git a/core/src/mindustry/graphics/LightRenderer.java b/core/src/mindustry/graphics/LightRenderer.java index fbe154a6b9..10ffa727b6 100644 --- a/core/src/mindustry/graphics/LightRenderer.java +++ b/core/src/mindustry/graphics/LightRenderer.java @@ -10,7 +10,7 @@ import arc.struct.*; import arc.util.*; import mindustry.*; -import static mindustry.Vars.state; +import static mindustry.Vars.*; /** Renders overlay lights. Client only. */ public class LightRenderer{ diff --git a/core/src/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java index a61b363557..753bbbbbed 100644 --- a/core/src/mindustry/graphics/Pal.java +++ b/core/src/mindustry/graphics/Pal.java @@ -1,6 +1,6 @@ package mindustry.graphics; -import arc.graphics.Color; +import arc.graphics.*; public class Pal{ public static Color diff --git a/core/src/mindustry/graphics/Pixelator.java b/core/src/mindustry/graphics/Pixelator.java index 4d77af56a7..5bce6721e3 100644 --- a/core/src/mindustry/graphics/Pixelator.java +++ b/core/src/mindustry/graphics/Pixelator.java @@ -8,7 +8,7 @@ import arc.graphics.gl.*; import arc.util.*; import static arc.Core.*; -import static mindustry.Vars.renderer; +import static mindustry.Vars.*; public class Pixelator implements Disposable{ private FrameBuffer buffer = new FrameBuffer(); diff --git a/core/src/mindustry/io/SaveMeta.java b/core/src/mindustry/io/SaveMeta.java index 4aeb7d2f99..f2e039f634 100644 --- a/core/src/mindustry/io/SaveMeta.java +++ b/core/src/mindustry/io/SaveMeta.java @@ -4,7 +4,7 @@ import arc.struct.*; import mindustry.game.*; import mindustry.maps.*; -import static mindustry.Vars.maps; +import static mindustry.Vars.*; public class SaveMeta{ public int version; diff --git a/core/src/mindustry/io/legacy/LegacySaveVersion.java b/core/src/mindustry/io/legacy/LegacySaveVersion.java index 7e84526bec..a511868356 100644 --- a/core/src/mindustry/io/legacy/LegacySaveVersion.java +++ b/core/src/mindustry/io/legacy/LegacySaveVersion.java @@ -9,7 +9,7 @@ import mindustry.world.*; import java.io.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public abstract class LegacySaveVersion extends SaveVersion{ diff --git a/core/src/mindustry/io/legacy/Save3.java b/core/src/mindustry/io/legacy/Save3.java index 64e7683ff2..7306b2bf29 100644 --- a/core/src/mindustry/io/legacy/Save3.java +++ b/core/src/mindustry/io/legacy/Save3.java @@ -5,7 +5,7 @@ import mindustry.game.Teams.*; import java.io.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class Save3 extends LegacySaveVersion{ diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java index 30eacf2402..2b7f0b1908 100644 --- a/core/src/mindustry/logic/LAccess.java +++ b/core/src/mindustry/logic/LAccess.java @@ -29,13 +29,16 @@ public enum LAccess{ //values with parameters are considered controllable enabled("to"), //"to" is standard for single parameter access - shoot("x", "y", "shoot"),; + shoot("x", "y", "shoot"), + + ; public final String[] parameters; - public static final LAccess[] all = values(); - public static final LAccess[] senseable = Seq.select(all, t -> t.parameters.length <= 1).toArray(LAccess.class); - public static final LAccess[] controls = Seq.select(all, t -> t.parameters.length > 0).toArray(LAccess.class); + public static final LAccess[] + all = values(), + 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){ this.parameters = parameters; diff --git a/core/src/mindustry/logic/LCanvas.java b/core/src/mindustry/logic/LCanvas.java index 1c8d61b91a..ed98bee8ff 100644 --- a/core/src/mindustry/logic/LCanvas.java +++ b/core/src/mindustry/logic/LCanvas.java @@ -13,7 +13,6 @@ import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.ui.*; diff --git a/core/src/mindustry/maps/Map.java b/core/src/mindustry/maps/Map.java index ebf2896e0e..75c257e5e6 100644 --- a/core/src/mindustry/maps/Map.java +++ b/core/src/mindustry/maps/Map.java @@ -1,11 +1,11 @@ package mindustry.maps; import arc.*; -import arc.struct.*; import arc.files.*; import arc.graphics.*; -import arc.util.*; +import arc.struct.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.*; import mindustry.game.EventType.*; import mindustry.game.*; diff --git a/core/src/mindustry/maps/MapPreviewLoader.java b/core/src/mindustry/maps/MapPreviewLoader.java index ebc69eeae4..6453c6f0b1 100644 --- a/core/src/mindustry/maps/MapPreviewLoader.java +++ b/core/src/mindustry/maps/MapPreviewLoader.java @@ -3,12 +3,12 @@ package mindustry.maps; import arc.assets.*; import arc.assets.loaders.*; import arc.assets.loaders.resolvers.*; -import arc.struct.*; import arc.files.*; import arc.graphics.*; +import arc.struct.*; import arc.util.*; import mindustry.*; -import mindustry.ctype.Content; +import mindustry.ctype.*; public class MapPreviewLoader extends TextureLoader{ diff --git a/core/src/mindustry/maps/filters/CoreSpawnFilter.java b/core/src/mindustry/maps/filters/CoreSpawnFilter.java index fa3b270d4d..6aa2db744b 100644 --- a/core/src/mindustry/maps/filters/CoreSpawnFilter.java +++ b/core/src/mindustry/maps/filters/CoreSpawnFilter.java @@ -5,7 +5,7 @@ import arc.util.*; import mindustry.world.*; import mindustry.world.blocks.storage.*; -import static mindustry.Vars.state; +import static mindustry.Vars.*; /** Selects X spawns from the core spawn pool.*/ public class CoreSpawnFilter extends GenerateFilter{ diff --git a/core/src/mindustry/maps/filters/MedianFilter.java b/core/src/mindustry/maps/filters/MedianFilter.java index c70bf6d71b..78a4df65d4 100644 --- a/core/src/mindustry/maps/filters/MedianFilter.java +++ b/core/src/mindustry/maps/filters/MedianFilter.java @@ -1,12 +1,12 @@ package mindustry.maps.filters; -import arc.struct.*; import arc.math.*; +import arc.struct.*; import arc.util.*; import mindustry.maps.filters.FilterOption.*; import mindustry.world.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class MedianFilter extends GenerateFilter{ float radius = 2; diff --git a/core/src/mindustry/maps/filters/NoiseFilter.java b/core/src/mindustry/maps/filters/NoiseFilter.java index 1feba11ad1..857be64369 100644 --- a/core/src/mindustry/maps/filters/NoiseFilter.java +++ b/core/src/mindustry/maps/filters/NoiseFilter.java @@ -1,13 +1,11 @@ package mindustry.maps.filters; import arc.util.*; -import mindustry.content.Blocks; -import mindustry.maps.filters.FilterOption.BlockOption; -import mindustry.maps.filters.FilterOption.SliderOption; -import mindustry.world.Block; +import mindustry.content.*; +import mindustry.maps.filters.FilterOption.*; +import mindustry.world.*; -import static mindustry.maps.filters.FilterOption.floorsOnly; -import static mindustry.maps.filters.FilterOption.wallsOnly; +import static mindustry.maps.filters.FilterOption.*; public class NoiseFilter extends GenerateFilter{ float scl = 40, threshold = 0.5f, octaves = 3f, falloff = 0.5f; diff --git a/core/src/mindustry/maps/filters/OreFilter.java b/core/src/mindustry/maps/filters/OreFilter.java index 91c989e151..491bbf0123 100644 --- a/core/src/mindustry/maps/filters/OreFilter.java +++ b/core/src/mindustry/maps/filters/OreFilter.java @@ -1,12 +1,11 @@ package mindustry.maps.filters; import arc.util.*; -import mindustry.content.Blocks; -import mindustry.maps.filters.FilterOption.SliderOption; -import mindustry.world.Block; +import mindustry.content.*; +import mindustry.maps.filters.FilterOption.*; +import mindustry.world.*; -import static mindustry.maps.filters.FilterOption.BlockOption; -import static mindustry.maps.filters.FilterOption.oresOnly; +import static mindustry.maps.filters.FilterOption.*; public class OreFilter extends GenerateFilter{ public float scl = 23, threshold = 0.81f, octaves = 2f, falloff = 0.3f; diff --git a/core/src/mindustry/maps/filters/OreMedianFilter.java b/core/src/mindustry/maps/filters/OreMedianFilter.java index 43c589d586..c9fd8d91c6 100644 --- a/core/src/mindustry/maps/filters/OreMedianFilter.java +++ b/core/src/mindustry/maps/filters/OreMedianFilter.java @@ -1,7 +1,7 @@ package mindustry.maps.filters; -import arc.struct.*; import arc.math.*; +import arc.struct.*; import arc.util.*; import mindustry.*; import mindustry.content.*; diff --git a/core/src/mindustry/maps/filters/RiverNoiseFilter.java b/core/src/mindustry/maps/filters/RiverNoiseFilter.java index 0a462548cc..28ffd1a714 100644 --- a/core/src/mindustry/maps/filters/RiverNoiseFilter.java +++ b/core/src/mindustry/maps/filters/RiverNoiseFilter.java @@ -1,13 +1,11 @@ package mindustry.maps.filters; import arc.util.*; -import mindustry.content.Blocks; -import mindustry.maps.filters.FilterOption.BlockOption; -import mindustry.maps.filters.FilterOption.SliderOption; -import mindustry.world.Block; +import mindustry.content.*; +import mindustry.maps.filters.FilterOption.*; +import mindustry.world.*; -import static mindustry.maps.filters.FilterOption.floorsOnly; -import static mindustry.maps.filters.FilterOption.wallsOnly; +import static mindustry.maps.filters.FilterOption.*; public class RiverNoiseFilter extends GenerateFilter{ float scl = 40, threshold = 0f, threshold2 = 0.1f; diff --git a/core/src/mindustry/maps/filters/ScatterFilter.java b/core/src/mindustry/maps/filters/ScatterFilter.java index 8866130baa..4b90275b1f 100644 --- a/core/src/mindustry/maps/filters/ScatterFilter.java +++ b/core/src/mindustry/maps/filters/ScatterFilter.java @@ -1,8 +1,8 @@ package mindustry.maps.filters; import arc.util.*; -import mindustry.content.Blocks; -import mindustry.world.Block; +import mindustry.content.*; +import mindustry.world.*; import static mindustry.maps.filters.FilterOption.*; diff --git a/core/src/mindustry/maps/filters/TerrainFilter.java b/core/src/mindustry/maps/filters/TerrainFilter.java index f6dcaeaf27..cc0ba82b54 100644 --- a/core/src/mindustry/maps/filters/TerrainFilter.java +++ b/core/src/mindustry/maps/filters/TerrainFilter.java @@ -1,14 +1,12 @@ package mindustry.maps.filters; -import arc.math.Mathf; +import arc.math.*; import arc.util.*; -import mindustry.content.Blocks; -import mindustry.maps.filters.FilterOption.BlockOption; -import mindustry.maps.filters.FilterOption.SliderOption; -import mindustry.world.Block; +import mindustry.content.*; +import mindustry.maps.filters.FilterOption.*; +import mindustry.world.*; -import static mindustry.maps.filters.FilterOption.floorsOnly; -import static mindustry.maps.filters.FilterOption.wallsOnly; +import static mindustry.maps.filters.FilterOption.*; public class TerrainFilter extends GenerateFilter{ float scl = 40, threshold = 0.9f, octaves = 3f, falloff = 0.5f, magnitude = 1f, circleScl = 2.1f; diff --git a/core/src/mindustry/mod/ModLoadingMusic.java b/core/src/mindustry/mod/ModLoadingMusic.java index 15cfb047ad..9b51031783 100644 --- a/core/src/mindustry/mod/ModLoadingMusic.java +++ b/core/src/mindustry/mod/ModLoadingMusic.java @@ -2,7 +2,6 @@ package mindustry.mod; import arc.audio.*; import arc.mock.*; -import arc.util.ArcAnnotate.*; public class ModLoadingMusic implements Music{ public Music music = new MockMusic(); diff --git a/core/src/mindustry/mod/ModLoadingSound.java b/core/src/mindustry/mod/ModLoadingSound.java index 8440bf6a33..543b75c154 100644 --- a/core/src/mindustry/mod/ModLoadingSound.java +++ b/core/src/mindustry/mod/ModLoadingSound.java @@ -3,7 +3,6 @@ package mindustry.mod; import arc.audio.*; import arc.math.geom.*; import arc.mock.*; -import arc.util.ArcAnnotate.*; public class ModLoadingSound implements Sound{ public Sound sound = new MockSound(); diff --git a/core/src/mindustry/net/CrashSender.java b/core/src/mindustry/net/CrashSender.java index 9a98d87555..fb37796d9c 100644 --- a/core/src/mindustry/net/CrashSender.java +++ b/core/src/mindustry/net/CrashSender.java @@ -2,9 +2,9 @@ package mindustry.net; import arc.*; import arc.Net.*; -import arc.struct.*; import arc.files.*; import arc.func.*; +import arc.struct.*; import arc.util.*; import arc.util.io.*; import arc.util.serialization.*; @@ -19,8 +19,8 @@ import java.text.*; import java.util.*; import static arc.Core.*; -import static mindustry.Vars.mods; import static mindustry.Vars.net; +import static mindustry.Vars.*; public class CrashSender{ diff --git a/core/src/mindustry/net/NetworkIO.java b/core/src/mindustry/net/NetworkIO.java index 05bd69fe32..3a32d5cb6b 100644 --- a/core/src/mindustry/net/NetworkIO.java +++ b/core/src/mindustry/net/NetworkIO.java @@ -1,6 +1,6 @@ package mindustry.net; -import arc.Core; +import arc.*; import arc.util.*; import arc.util.io.*; import mindustry.core.*; diff --git a/core/src/mindustry/net/Packet.java b/core/src/mindustry/net/Packet.java index 9058637a66..2aaa2a05c0 100644 --- a/core/src/mindustry/net/Packet.java +++ b/core/src/mindustry/net/Packet.java @@ -1,8 +1,8 @@ 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{ default void read(ByteBuffer buffer){} diff --git a/core/src/mindustry/net/Registrator.java b/core/src/mindustry/net/Registrator.java index c0368497f5..2280d016e0 100644 --- a/core/src/mindustry/net/Registrator.java +++ b/core/src/mindustry/net/Registrator.java @@ -1,7 +1,7 @@ package mindustry.net; -import arc.struct.ObjectIntMap; -import arc.func.Prov; +import arc.func.*; +import arc.struct.*; import mindustry.net.Packets.*; public class Registrator{ diff --git a/core/src/mindustry/net/Streamable.java b/core/src/mindustry/net/Streamable.java index 18171b6cbf..52ce5d36d8 100644 --- a/core/src/mindustry/net/Streamable.java +++ b/core/src/mindustry/net/Streamable.java @@ -1,6 +1,6 @@ package mindustry.net; -import mindustry.net.Packets.StreamBegin; +import mindustry.net.Packets.*; import java.io.*; diff --git a/core/src/mindustry/type/AmmoTypes.java b/core/src/mindustry/type/AmmoTypes.java index b1d021ba87..6b3769b361 100644 --- a/core/src/mindustry/type/AmmoTypes.java +++ b/core/src/mindustry/type/AmmoTypes.java @@ -1,6 +1,5 @@ package mindustry.type; -import arc.util.ArcAnnotate.*; import mindustry.*; import mindustry.content.*; import mindustry.ctype.*; diff --git a/core/src/mindustry/type/Item.java b/core/src/mindustry/type/Item.java index 6558636343..9329efb47e 100644 --- a/core/src/mindustry/type/Item.java +++ b/core/src/mindustry/type/Item.java @@ -1,13 +1,13 @@ package mindustry.type; -import arc.struct.*; import arc.graphics.*; import arc.scene.ui.layout.*; +import arc.struct.*; import mindustry.ctype.*; import mindustry.ui.*; import mindustry.world.blocks.environment.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class Item extends UnlockableContent{ public final Color color; diff --git a/core/src/mindustry/type/ItemStack.java b/core/src/mindustry/type/ItemStack.java index a8a765c4df..d5f4097b58 100644 --- a/core/src/mindustry/type/ItemStack.java +++ b/core/src/mindustry/type/ItemStack.java @@ -1,7 +1,7 @@ package mindustry.type; -import arc.struct.Seq; -import mindustry.content.Items; +import arc.struct.*; +import mindustry.content.*; public class ItemStack implements Comparable{ public static final ItemStack[] empty = {}; diff --git a/core/src/mindustry/type/Publishable.java b/core/src/mindustry/type/Publishable.java index 8c8b32edde..bf7ddcd89f 100644 --- a/core/src/mindustry/type/Publishable.java +++ b/core/src/mindustry/type/Publishable.java @@ -1,7 +1,7 @@ package mindustry.type; -import arc.struct.*; import arc.files.*; +import arc.struct.*; import arc.util.ArcAnnotate.*; import mindustry.*; diff --git a/core/src/mindustry/ui/BorderImage.java b/core/src/mindustry/ui/BorderImage.java index fc1c94f044..262a02a197 100644 --- a/core/src/mindustry/ui/BorderImage.java +++ b/core/src/mindustry/ui/BorderImage.java @@ -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; diff --git a/core/src/mindustry/ui/ContentDisplay.java b/core/src/mindustry/ui/ContentDisplay.java index 3e82412f0e..6eefedcd53 100644 --- a/core/src/mindustry/ui/ContentDisplay.java +++ b/core/src/mindustry/ui/ContentDisplay.java @@ -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.*; diff --git a/core/src/mindustry/ui/GridImage.java b/core/src/mindustry/ui/GridImage.java index 13d786a5be..f80262d5ac 100644 --- a/core/src/mindustry/ui/GridImage.java +++ b/core/src/mindustry/ui/GridImage.java @@ -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; diff --git a/core/src/mindustry/ui/IntFormat.java b/core/src/mindustry/ui/IntFormat.java index 187e21993f..2ca0e9de1f 100644 --- a/core/src/mindustry/ui/IntFormat.java +++ b/core/src/mindustry/ui/IntFormat.java @@ -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. diff --git a/core/src/mindustry/ui/ItemDisplay.java b/core/src/mindustry/ui/ItemDisplay.java index 721fbc8b33..d0cedc5ba1 100644 --- a/core/src/mindustry/ui/ItemDisplay.java +++ b/core/src/mindustry/ui/ItemDisplay.java @@ -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{ diff --git a/core/src/mindustry/ui/Links.java b/core/src/mindustry/ui/Links.java index 4f14c746d5..dd12c675d5 100644 --- a/core/src/mindustry/ui/Links.java +++ b/core/src/mindustry/ui/Links.java @@ -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; diff --git a/core/src/mindustry/ui/LiquidDisplay.java b/core/src/mindustry/ui/LiquidDisplay.java index 6c645e6218..c2d71fee25 100644 --- a/core/src/mindustry/ui/LiquidDisplay.java +++ b/core/src/mindustry/ui/LiquidDisplay.java @@ -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{ diff --git a/core/src/mindustry/ui/Minimap.java b/core/src/mindustry/ui/Minimap.java index dfec82c9fd..53736910f1 100644 --- a/core/src/mindustry/ui/Minimap.java +++ b/core/src/mindustry/ui/Minimap.java @@ -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.*; diff --git a/core/src/mindustry/ui/MobileButton.java b/core/src/mindustry/ui/MobileButton.java index 736247d45b..5174613b88 100644 --- a/core/src/mindustry/ui/MobileButton.java +++ b/core/src/mindustry/ui/MobileButton.java @@ -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{ diff --git a/core/src/mindustry/ui/MultiReqImage.java b/core/src/mindustry/ui/MultiReqImage.java index ebbb4fc359..a887a85299 100644 --- a/core/src/mindustry/ui/MultiReqImage.java +++ b/core/src/mindustry/ui/MultiReqImage.java @@ -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 displays = new Seq<>(); diff --git a/core/src/mindustry/ui/ReqImage.java b/core/src/mindustry/ui/ReqImage.java index eef8591f63..a02ad7e5d0 100644 --- a/core/src/mindustry/ui/ReqImage.java +++ b/core/src/mindustry/ui/ReqImage.java @@ -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; diff --git a/core/src/mindustry/ui/Styles.java b/core/src/mindustry/ui/Styles.java index ea7babb459..13e97202e5 100644 --- a/core/src/mindustry/ui/Styles.java +++ b/core/src/mindustry/ui/Styles.java @@ -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.*; diff --git a/core/src/mindustry/ui/dialogs/AboutDialog.java b/core/src/mindustry/ui/dialogs/AboutDialog.java index 3ba3b5d7e2..0e86d0ee64 100644 --- a/core/src/mindustry/ui/dialogs/AboutDialog.java +++ b/core/src/mindustry/ui/dialogs/AboutDialog.java @@ -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.*; diff --git a/core/src/mindustry/ui/dialogs/ContentInfoDialog.java b/core/src/mindustry/ui/dialogs/ContentInfoDialog.java index 947afa0141..0ee1960f9f 100644 --- a/core/src/mindustry/ui/dialogs/ContentInfoDialog.java +++ b/core/src/mindustry/ui/dialogs/ContentInfoDialog.java @@ -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{ diff --git a/core/src/mindustry/ui/dialogs/DiscordDialog.java b/core/src/mindustry/ui/dialogs/DiscordDialog.java index 3413a4a67b..600fe39e16 100644 --- a/core/src/mindustry/ui/dialogs/DiscordDialog.java +++ b/core/src/mindustry/ui/dialogs/DiscordDialog.java @@ -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.*; diff --git a/core/src/mindustry/ui/dialogs/LanguageDialog.java b/core/src/mindustry/ui/dialogs/LanguageDialog.java index 979f35a7a9..41519c32fd 100644 --- a/core/src/mindustry/ui/dialogs/LanguageDialog.java +++ b/core/src/mindustry/ui/dialogs/LanguageDialog.java @@ -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; diff --git a/core/src/mindustry/ui/dialogs/MapPlayDialog.java b/core/src/mindustry/ui/dialogs/MapPlayDialog.java index 942983a401..8655e07208 100644 --- a/core/src/mindustry/ui/dialogs/MapPlayDialog.java +++ b/core/src/mindustry/ui/dialogs/MapPlayDialog.java @@ -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.*; diff --git a/core/src/mindustry/ui/dialogs/MinimapDialog.java b/core/src/mindustry/ui/dialogs/MinimapDialog.java index d19dd5a1dd..703d896bfa 100644 --- a/core/src/mindustry/ui/dialogs/MinimapDialog.java +++ b/core/src/mindustry/ui/dialogs/MinimapDialog.java @@ -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{ diff --git a/core/src/mindustry/ui/dialogs/SaveDialog.java b/core/src/mindustry/ui/dialogs/SaveDialog.java index 909dd113d1..a29a2069f7 100644 --- a/core/src/mindustry/ui/dialogs/SaveDialog.java +++ b/core/src/mindustry/ui/dialogs/SaveDialog.java @@ -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.*; diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java index 7a2afbbd1e..99a087d39f 100644 --- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java +++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java @@ -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.*; diff --git a/core/src/mindustry/ui/dialogs/TraceDialog.java b/core/src/mindustry/ui/dialogs/TraceDialog.java index 4bc0945020..c6582aa005 100644 --- a/core/src/mindustry/ui/dialogs/TraceDialog.java +++ b/core/src/mindustry/ui/dialogs/TraceDialog.java @@ -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{ diff --git a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java index 515a7ef05c..3b60918356 100644 --- a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java @@ -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.*; diff --git a/core/src/mindustry/ui/fragments/ChatFragment.java b/core/src/mindustry/ui/fragments/ChatFragment.java index f0f83b8be2..93654f048c 100644 --- a/core/src/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/mindustry/ui/fragments/ChatFragment.java @@ -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.*; diff --git a/core/src/mindustry/ui/fragments/Fragment.java b/core/src/mindustry/ui/fragments/Fragment.java index 2e66da0652..367b6f0cfa 100644 --- a/core/src/mindustry/ui/fragments/Fragment.java +++ b/core/src/mindustry/ui/fragments/Fragment.java @@ -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); diff --git a/core/src/mindustry/ui/layout/BranchTreeLayout.java b/core/src/mindustry/ui/layout/BranchTreeLayout.java index c2739fbada..9c598086cd 100644 --- a/core/src/mindustry/ui/layout/BranchTreeLayout.java +++ b/core/src/mindustry/ui/layout/BranchTreeLayout.java @@ -1,7 +1,7 @@ package mindustry.ui.layout; -import arc.struct.*; import arc.math.geom.*; +import arc.struct.*; /** * Algorithm taken from TreeLayout. diff --git a/core/src/mindustry/ui/layout/RadialTreeLayout.java b/core/src/mindustry/ui/layout/RadialTreeLayout.java index 88b13a5efa..2b1360ff53 100644 --- a/core/src/mindustry/ui/layout/RadialTreeLayout.java +++ b/core/src/mindustry/ui/layout/RadialTreeLayout.java @@ -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 visited = new ObjectSet<>(); diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 7fe708ce7d..d01d291584 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -467,8 +467,7 @@ public class Block extends UnlockableContent{ /** Never use outside of the editor! */ public TextureRegion editorIcon(){ - if(editorIcon == null) editorIcon = Core.atlas.find(name + "-icon-editor"); - return editorIcon; + return editorIcon == null ? (editorIcon = Core.atlas.find(name + "-icon-editor")) : editorIcon; } /** Never use outside of the editor! */ @@ -485,21 +484,16 @@ public class Block extends UnlockableContent{ } 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(){ - if(generatedIcons == null){ - generatedIcons = icons(); - } - return generatedIcons; + return generatedIcons == null ? (generatedIcons = icons()) : generatedIcons; } public TextureRegion[] variantRegions(){ - if(variantRegions == null){ - variantRegions = new TextureRegion[]{icon(Cicon.full)}; - } - return variantRegions; + return variantRegions == null ? (variantRegions = new TextureRegion[]{icon(Cicon.full)}) : variantRegions; } public boolean hasBuilding(){ diff --git a/core/src/mindustry/world/DirectionalItemBuffer.java b/core/src/mindustry/world/DirectionalItemBuffer.java index 433a016ec7..4b7a7bca2f 100644 --- a/core/src/mindustry/world/DirectionalItemBuffer.java +++ b/core/src/mindustry/world/DirectionalItemBuffer.java @@ -6,7 +6,7 @@ import mindustry.annotations.Annotations.*; import mindustry.gen.*; import mindustry.type.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class DirectionalItemBuffer{ public final long[][] buffers; diff --git a/core/src/mindustry/world/Edges.java b/core/src/mindustry/world/Edges.java index 097c016541..c08b71cdce 100644 --- a/core/src/mindustry/world/Edges.java +++ b/core/src/mindustry/world/Edges.java @@ -6,7 +6,7 @@ import mindustry.gen.*; import java.util.*; -import static mindustry.Vars.world; +import static mindustry.Vars.*; public class Edges{ private static final int maxSize = 14; diff --git a/core/src/mindustry/world/ItemBuffer.java b/core/src/mindustry/world/ItemBuffer.java index a52495a1b7..6ab014bd2f 100644 --- a/core/src/mindustry/world/ItemBuffer.java +++ b/core/src/mindustry/world/ItemBuffer.java @@ -4,7 +4,7 @@ import arc.util.*; import arc.util.io.*; import mindustry.type.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class ItemBuffer{ private long[] buffer; diff --git a/core/src/mindustry/world/blocks/Attributes.java b/core/src/mindustry/world/blocks/Attributes.java index 50c907e218..ff96a2bb63 100644 --- a/core/src/mindustry/world/blocks/Attributes.java +++ b/core/src/mindustry/world/blocks/Attributes.java @@ -2,7 +2,7 @@ package mindustry.world.blocks; import arc.util.serialization.*; import arc.util.serialization.Json.*; -import mindustry.world.meta.Attribute; +import mindustry.world.meta.*; import java.util.*; diff --git a/core/src/mindustry/world/blocks/defense/Door.java b/core/src/mindustry/world/blocks/defense/Door.java index c745f3a63f..3546831ac8 100644 --- a/core/src/mindustry/world/blocks/defense/Door.java +++ b/core/src/mindustry/world/blocks/defense/Door.java @@ -1,8 +1,8 @@ package mindustry.world.blocks.defense; -import arc.audio.*; import arc.Graphics.*; import arc.Graphics.Cursor.*; +import arc.audio.*; import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; diff --git a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java index a63cd15ac1..3680cce446 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java @@ -6,7 +6,7 @@ import mindustry.content.*; import mindustry.entities.*; import mindustry.entities.bullet.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class ChargeTurret extends PowerTurret{ public float chargeTime = 30f; diff --git a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java index 7ac517c51a..c47a279414 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java @@ -9,7 +9,7 @@ import mindustry.world.consumers.*; import mindustry.world.meta.*; import mindustry.world.meta.values.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class LaserTurret extends PowerTurret{ public float firingMoveFract = 0.25f; diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java index 7b3736cc81..2710d0248b 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -6,8 +6,8 @@ import mindustry.annotations.Annotations.*; import mindustry.entities.*; import mindustry.entities.bullet.*; import mindustry.gen.*; -import mindustry.type.*; import mindustry.graphics.*; +import mindustry.type.*; import mindustry.world.consumers.*; import mindustry.world.meta.*; import mindustry.world.meta.values.*; diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 447d490722..642df85358 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -178,12 +178,13 @@ public abstract class Turret extends Block{ @Override public double sense(LAccess sensor){ - if(sensor == LAccess.rotation) return rotation; - if(sensor == LAccess.shootX) return targetPos.x; - if(sensor == LAccess.shootY) return targetPos.y; - if(sensor == LAccess.shooting) return (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : validateTarget()) ? 1 : 0; - - return super.sense(sensor); + return switch(sensor){ + case rotation -> rotation; + case shootX -> targetPos.x; + case shootY -> targetPos.y; + case shooting -> (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : validateTarget()) ? 1 : 0; + default -> super.sense(sensor); + }; } @Override diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index f6f347aba3..0954063fda 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -162,7 +162,7 @@ public class Conveyor extends Block implements Autotiler{ @Override public boolean shouldIdleSound(){ - return clogHeat <= 0.5f ; + return clogHeat <= 0.5f; } @Override diff --git a/core/src/mindustry/world/blocks/distribution/Junction.java b/core/src/mindustry/world/blocks/distribution/Junction.java index 26801e86c2..8f6fe81b10 100644 --- a/core/src/mindustry/world/blocks/distribution/Junction.java +++ b/core/src/mindustry/world/blocks/distribution/Junction.java @@ -7,7 +7,7 @@ import mindustry.type.*; import mindustry.world.*; import mindustry.world.meta.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class Junction extends Block{ public float speed = 26; //frames taken to go through this junction diff --git a/core/src/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/mindustry/world/blocks/distribution/OverflowGate.java index 981080a95d..0da4d92713 100644 --- a/core/src/mindustry/world/blocks/distribution/OverflowGate.java +++ b/core/src/mindustry/world/blocks/distribution/OverflowGate.java @@ -1,15 +1,15 @@ package mindustry.world.blocks.distribution; import arc.math.*; -import arc.util.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import arc.util.io.*; import mindustry.gen.*; import mindustry.type.*; import mindustry.world.*; import mindustry.world.meta.*; -import static mindustry.Vars.world; +import static mindustry.Vars.*; public class OverflowGate extends Block{ public float speed = 1f; diff --git a/core/src/mindustry/world/blocks/environment/Boulder.java b/core/src/mindustry/world/blocks/environment/Boulder.java index 4c90d8204f..28893d22d4 100644 --- a/core/src/mindustry/world/blocks/environment/Boulder.java +++ b/core/src/mindustry/world/blocks/environment/Boulder.java @@ -1,11 +1,9 @@ package mindustry.world.blocks.environment; -import arc.Core; -import arc.graphics.g2d.Draw; -import arc.graphics.g2d.TextureRegion; -import arc.math.Mathf; -import mindustry.world.Block; -import mindustry.world.Tile; +import arc.*; +import arc.graphics.g2d.*; +import arc.math.*; +import mindustry.world.*; public class Boulder extends Block{ protected int variants; diff --git a/core/src/mindustry/world/blocks/environment/OreBlock.java b/core/src/mindustry/world/blocks/environment/OreBlock.java index a5514e06ea..943d91076d 100644 --- a/core/src/mindustry/world/blocks/environment/OreBlock.java +++ b/core/src/mindustry/world/blocks/environment/OreBlock.java @@ -1,15 +1,15 @@ package mindustry.world.blocks.environment; import arc.*; -import mindustry.annotations.Annotations.*; import arc.graphics.*; import arc.graphics.g2d.*; +import mindustry.annotations.Annotations.*; import mindustry.graphics.*; import mindustry.graphics.MultiPacker.*; import mindustry.type.*; import mindustry.world.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; /**An overlay ore for a specific item type.*/ public class OreBlock extends OverlayFloor{ diff --git a/core/src/mindustry/world/blocks/environment/OverlayFloor.java b/core/src/mindustry/world/blocks/environment/OverlayFloor.java index 4f2d6acfd9..f7a92ceeb3 100644 --- a/core/src/mindustry/world/blocks/environment/OverlayFloor.java +++ b/core/src/mindustry/world/blocks/environment/OverlayFloor.java @@ -1,8 +1,8 @@ package mindustry.world.blocks.environment; -import arc.graphics.g2d.Draw; -import arc.math.Mathf; -import mindustry.world.Tile; +import arc.graphics.g2d.*; +import arc.math.*; +import mindustry.world.*; /**A type of floor that is overlaid on top of over floors.*/ public class OverlayFloor extends Floor{ diff --git a/core/src/mindustry/world/blocks/environment/StaticTree.java b/core/src/mindustry/world/blocks/environment/StaticTree.java index 5e923f6f5f..78c6133d2f 100644 --- a/core/src/mindustry/world/blocks/environment/StaticTree.java +++ b/core/src/mindustry/world/blocks/environment/StaticTree.java @@ -4,7 +4,7 @@ import arc.graphics.g2d.*; import arc.util.*; import mindustry.world.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class StaticTree extends StaticWall{ diff --git a/core/src/mindustry/world/blocks/environment/StaticWall.java b/core/src/mindustry/world/blocks/environment/StaticWall.java index 2b9e41a41e..a364db4ab2 100644 --- a/core/src/mindustry/world/blocks/environment/StaticWall.java +++ b/core/src/mindustry/world/blocks/environment/StaticWall.java @@ -8,7 +8,7 @@ import mindustry.annotations.Annotations.*; import mindustry.graphics.*; import mindustry.world.*; -import static mindustry.Vars.world; +import static mindustry.Vars.*; public class StaticWall extends Boulder{ public @Load("@-large") TextureRegion large; diff --git a/core/src/mindustry/world/blocks/environment/TreeBlock.java b/core/src/mindustry/world/blocks/environment/TreeBlock.java index b6170b8b85..cd199d8d25 100644 --- a/core/src/mindustry/world/blocks/environment/TreeBlock.java +++ b/core/src/mindustry/world/blocks/environment/TreeBlock.java @@ -1,13 +1,12 @@ package mindustry.world.blocks.environment; import arc.graphics.g2d.*; -import arc.math.Mathf; +import arc.math.*; import arc.math.geom.*; import arc.util.*; import mindustry.annotations.Annotations.*; -import mindustry.graphics.Layer; -import mindustry.world.Block; -import mindustry.world.Tile; +import mindustry.graphics.*; +import mindustry.world.*; public class TreeBlock extends Block{ public @Load("@-shadow") TextureRegion shadow; diff --git a/core/src/mindustry/world/blocks/experimental/BlockLoader.java b/core/src/mindustry/world/blocks/experimental/BlockLoader.java index 0afbeafb78..886ca54421 100644 --- a/core/src/mindustry/world/blocks/experimental/BlockLoader.java +++ b/core/src/mindustry/world/blocks/experimental/BlockLoader.java @@ -10,7 +10,7 @@ import mindustry.ui.*; import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.production.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class BlockLoader extends PayloadAcceptor{ public final int timerLoad = timers++; diff --git a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java index 072d64ecea..a3ce1a60f5 100644 --- a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java +++ b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java @@ -3,7 +3,7 @@ package mindustry.world.blocks.experimental; import mindustry.gen.*; import mindustry.type.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class BlockUnloader extends BlockLoader{ diff --git a/core/src/mindustry/world/blocks/liquid/LiquidBridge.java b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java index c658cde66c..59205c3c92 100644 --- a/core/src/mindustry/world/blocks/liquid/LiquidBridge.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java @@ -6,7 +6,7 @@ import mindustry.type.*; import mindustry.world.blocks.distribution.*; import mindustry.world.meta.*; -import static mindustry.Vars.world; +import static mindustry.Vars.*; public class LiquidBridge extends ItemBridge{ diff --git a/core/src/mindustry/world/blocks/logic/SwitchBlock.java b/core/src/mindustry/world/blocks/logic/SwitchBlock.java index 5bb9dbf621..bca47a306a 100644 --- a/core/src/mindustry/world/blocks/logic/SwitchBlock.java +++ b/core/src/mindustry/world/blocks/logic/SwitchBlock.java @@ -4,7 +4,6 @@ import arc.graphics.g2d.*; import arc.util.io.*; import mindustry.annotations.Annotations.*; import mindustry.gen.*; -import mindustry.logic.*; import mindustry.world.*; public class SwitchBlock extends Block{ @@ -22,12 +21,6 @@ public class SwitchBlock extends Block{ public class SwitchBuild extends Building{ - @Override - public double sense(LAccess sensor){ - if(sensor == LAccess.enabled) return enabled ? 1 : 0; - return super.sense(sensor); - } - @Override public boolean configTapped(){ configure(!enabled); diff --git a/core/src/mindustry/world/blocks/payloads/BlockPayload.java b/core/src/mindustry/world/blocks/payloads/BlockPayload.java index 3fc87dbe6b..cf22587d98 100644 --- a/core/src/mindustry/world/blocks/payloads/BlockPayload.java +++ b/core/src/mindustry/world/blocks/payloads/BlockPayload.java @@ -8,7 +8,7 @@ import mindustry.graphics.*; import mindustry.ui.*; import mindustry.world.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class BlockPayload implements Payload{ public Building entity; diff --git a/core/src/mindustry/world/blocks/payloads/UnitPayload.java b/core/src/mindustry/world/blocks/payloads/UnitPayload.java index 751152fb1f..724df792fa 100644 --- a/core/src/mindustry/world/blocks/payloads/UnitPayload.java +++ b/core/src/mindustry/world/blocks/payloads/UnitPayload.java @@ -7,8 +7,8 @@ import arc.math.geom.*; import arc.util.*; import arc.util.io.*; import mindustry.*; -import mindustry.entities.*; import mindustry.entities.EntityCollisions.*; +import mindustry.entities.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.ui.*; diff --git a/core/src/mindustry/world/blocks/power/Battery.java b/core/src/mindustry/world/blocks/power/Battery.java index fb70751c18..03e7d66193 100644 --- a/core/src/mindustry/world/blocks/power/Battery.java +++ b/core/src/mindustry/world/blocks/power/Battery.java @@ -8,7 +8,7 @@ import mindustry.annotations.Annotations.*; import mindustry.gen.*; import mindustry.world.meta.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class Battery extends PowerDistributor{ public @Load("@-top") TextureRegion topRegion; diff --git a/core/src/mindustry/world/blocks/power/BurnerGenerator.java b/core/src/mindustry/world/blocks/power/BurnerGenerator.java index 763b92ed20..9e70f9b86f 100644 --- a/core/src/mindustry/world/blocks/power/BurnerGenerator.java +++ b/core/src/mindustry/world/blocks/power/BurnerGenerator.java @@ -1,8 +1,8 @@ package mindustry.world.blocks.power; import arc.graphics.g2d.*; -import mindustry.graphics.*; import mindustry.annotations.Annotations.*; +import mindustry.graphics.*; import mindustry.type.*; public class BurnerGenerator extends ItemLiquidGenerator{ diff --git a/core/src/mindustry/world/blocks/power/ConditionalConsumePower.java b/core/src/mindustry/world/blocks/power/ConditionalConsumePower.java index 780474e3b5..61e1b4b059 100644 --- a/core/src/mindustry/world/blocks/power/ConditionalConsumePower.java +++ b/core/src/mindustry/world/blocks/power/ConditionalConsumePower.java @@ -1,8 +1,8 @@ package mindustry.world.blocks.power; -import arc.func.Boolf; +import arc.func.*; import mindustry.gen.*; -import mindustry.world.consumers.ConsumePower; +import mindustry.world.consumers.*; /** A power consumer that only activates sometimes. */ public class ConditionalConsumePower extends ConsumePower{ diff --git a/core/src/mindustry/world/blocks/power/DecayGenerator.java b/core/src/mindustry/world/blocks/power/DecayGenerator.java index e9fee90eee..becce39642 100644 --- a/core/src/mindustry/world/blocks/power/DecayGenerator.java +++ b/core/src/mindustry/world/blocks/power/DecayGenerator.java @@ -1,6 +1,6 @@ package mindustry.world.blocks.power; -import mindustry.type.Item; +import mindustry.type.*; public class DecayGenerator extends ItemLiquidGenerator{ diff --git a/core/src/mindustry/world/blocks/power/PowerBlock.java b/core/src/mindustry/world/blocks/power/PowerBlock.java index 5e29e99b75..e71c17aba7 100644 --- a/core/src/mindustry/world/blocks/power/PowerBlock.java +++ b/core/src/mindustry/world/blocks/power/PowerBlock.java @@ -1,7 +1,7 @@ package mindustry.world.blocks.power; -import mindustry.world.Block; -import mindustry.world.meta.BlockGroup; +import mindustry.world.*; +import mindustry.world.meta.*; public abstract class PowerBlock extends Block{ diff --git a/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java b/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java index 22a668160e..ff5da52aaa 100644 --- a/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java +++ b/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java @@ -1,7 +1,6 @@ package mindustry.world.blocks.power; -import mindustry.type.Item; -import mindustry.type.Liquid; +import mindustry.type.*; public class SingleTypeGenerator extends ItemLiquidGenerator{ diff --git a/core/src/mindustry/world/blocks/production/Fracker.java b/core/src/mindustry/world/blocks/production/Fracker.java index f1389f1cbe..d894cf05b5 100644 --- a/core/src/mindustry/world/blocks/production/Fracker.java +++ b/core/src/mindustry/world/blocks/production/Fracker.java @@ -1,8 +1,8 @@ package mindustry.world.blocks.production; import arc.graphics.g2d.*; -import mindustry.graphics.*; import mindustry.annotations.Annotations.*; +import mindustry.graphics.*; import mindustry.world.meta.*; public class Fracker extends SolidPump{ diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index e7456f0287..8ce89c5e0e 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -11,7 +11,7 @@ import mindustry.graphics.*; import mindustry.world.*; import mindustry.world.blocks.payloads.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class PayloadAcceptor extends Block{ public float payloadSpeed = 0.5f; diff --git a/core/src/mindustry/world/blocks/production/Pump.java b/core/src/mindustry/world/blocks/production/Pump.java index b94acd34fb..fa2f67999f 100644 --- a/core/src/mindustry/world/blocks/production/Pump.java +++ b/core/src/mindustry/world/blocks/production/Pump.java @@ -4,8 +4,8 @@ import arc.*; import arc.graphics.*; import arc.graphics.g2d.*; import mindustry.game.*; -import mindustry.type.*; import mindustry.graphics.*; +import mindustry.type.*; import mindustry.ui.*; import mindustry.world.*; import mindustry.world.blocks.liquid.*; diff --git a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java index f2e57156f6..95d16d62a5 100644 --- a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java +++ b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java @@ -11,7 +11,7 @@ import mindustry.type.*; import mindustry.world.*; import mindustry.world.blocks.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class LiquidSource extends Block{ diff --git a/core/src/mindustry/world/blocks/sandbox/PowerVoid.java b/core/src/mindustry/world/blocks/sandbox/PowerVoid.java index 067f6335e5..c423ba6caf 100644 --- a/core/src/mindustry/world/blocks/sandbox/PowerVoid.java +++ b/core/src/mindustry/world/blocks/sandbox/PowerVoid.java @@ -1,7 +1,7 @@ package mindustry.world.blocks.sandbox; -import mindustry.world.blocks.power.PowerBlock; -import mindustry.world.meta.BlockStat; +import mindustry.world.blocks.power.*; +import mindustry.world.meta.*; public class PowerVoid extends PowerBlock{ diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index 3f4aeddde8..ccd3da5a43 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -6,7 +6,6 @@ import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.core.*; diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java index 1e71caa8cb..67bd833a21 100644 --- a/core/src/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/mindustry/world/blocks/units/UnitFactory.java @@ -7,8 +7,8 @@ import arc.math.*; import arc.scene.style.*; import arc.scene.ui.layout.*; import arc.struct.*; -import arc.util.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import arc.util.io.*; import mindustry.*; import mindustry.entities.*; diff --git a/core/src/mindustry/world/consumers/Consume.java b/core/src/mindustry/world/consumers/Consume.java index 7e0f686018..410d041a03 100644 --- a/core/src/mindustry/world/consumers/Consume.java +++ b/core/src/mindustry/world/consumers/Consume.java @@ -1,9 +1,9 @@ package mindustry.world.consumers; +import arc.scene.ui.layout.*; import arc.struct.*; -import arc.scene.ui.layout.Table; import mindustry.gen.*; -import mindustry.world.meta.BlockStats; +import mindustry.world.meta.*; /** An abstract class that defines a type of resource that a block can consume. */ public abstract class Consume{ diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java b/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java index ca57bfa816..962023488b 100644 --- a/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java +++ b/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java @@ -1,18 +1,15 @@ package mindustry.world.consumers; +import arc.func.*; +import arc.scene.ui.layout.*; import arc.struct.*; -import arc.func.Boolf; -import arc.scene.ui.layout.Table; import mindustry.gen.*; -import mindustry.type.Liquid; -import mindustry.ui.Cicon; -import mindustry.ui.MultiReqImage; -import mindustry.ui.ReqImage; -import mindustry.world.meta.BlockStat; -import mindustry.world.meta.BlockStats; -import mindustry.world.meta.values.LiquidFilterValue; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.meta.*; +import mindustry.world.meta.values.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class ConsumeLiquidFilter extends ConsumeLiquidBase{ public final Boolf filter; diff --git a/core/src/mindustry/world/consumers/ConsumePower.java b/core/src/mindustry/world/consumers/ConsumePower.java index 557c88469c..2dc55dbb11 100644 --- a/core/src/mindustry/world/consumers/ConsumePower.java +++ b/core/src/mindustry/world/consumers/ConsumePower.java @@ -1,7 +1,7 @@ package mindustry.world.consumers; -import arc.math.Mathf; -import arc.scene.ui.layout.Table; +import arc.math.*; +import arc.scene.ui.layout.*; import mindustry.gen.*; import mindustry.world.meta.*; diff --git a/core/src/mindustry/world/consumers/Consumers.java b/core/src/mindustry/world/consumers/Consumers.java index 8683c6d158..4ce410aa04 100644 --- a/core/src/mindustry/world/consumers/Consumers.java +++ b/core/src/mindustry/world/consumers/Consumers.java @@ -1,13 +1,13 @@ package mindustry.world.consumers; +import arc.func.*; import arc.struct.*; -import arc.func.Boolf; -import arc.util.Structs; -import mindustry.Vars; +import arc.util.*; +import mindustry.*; import mindustry.gen.*; import mindustry.type.*; -import mindustry.world.blocks.power.ConditionalConsumePower; -import mindustry.world.meta.BlockStats; +import mindustry.world.blocks.power.*; +import mindustry.world.meta.*; public class Consumers{ private Consume[] map = new Consume[ConsumeType.values().length]; diff --git a/core/src/mindustry/world/meta/BlockBars.java b/core/src/mindustry/world/meta/BlockBars.java index d96202ad1d..acc6cbd100 100644 --- a/core/src/mindustry/world/meta/BlockBars.java +++ b/core/src/mindustry/world/meta/BlockBars.java @@ -1,9 +1,9 @@ package mindustry.world.meta; -import arc.struct.OrderedMap; -import arc.func.Func; +import arc.func.*; +import arc.struct.*; import mindustry.gen.*; -import mindustry.ui.Bar; +import mindustry.ui.*; public class BlockBars{ private OrderedMap> bars = new OrderedMap<>(); diff --git a/core/src/mindustry/world/meta/BlockStat.java b/core/src/mindustry/world/meta/BlockStat.java index 720f4c3d8e..05e45acbfe 100644 --- a/core/src/mindustry/world/meta/BlockStat.java +++ b/core/src/mindustry/world/meta/BlockStat.java @@ -1,8 +1,8 @@ package mindustry.world.meta; -import arc.Core; +import arc.*; -import java.util.Locale; +import java.util.*; /** Describes one type of stat for a block. */ public enum BlockStat{ diff --git a/core/src/mindustry/world/meta/BlockStats.java b/core/src/mindustry/world/meta/BlockStats.java index e119ff8a74..ff93a217a9 100644 --- a/core/src/mindustry/world/meta/BlockStats.java +++ b/core/src/mindustry/world/meta/BlockStats.java @@ -1,7 +1,7 @@ package mindustry.world.meta; -import arc.struct.*; import arc.struct.ObjectMap.*; +import arc.struct.*; import mindustry.*; import mindustry.type.*; import mindustry.world.*; diff --git a/core/src/mindustry/world/meta/StatCategory.java b/core/src/mindustry/world/meta/StatCategory.java index 5f244674a4..e6c91b04bb 100644 --- a/core/src/mindustry/world/meta/StatCategory.java +++ b/core/src/mindustry/world/meta/StatCategory.java @@ -1,6 +1,6 @@ package mindustry.world.meta; -import arc.Core; +import arc.*; /** A specific category for a stat. */ public enum StatCategory{ diff --git a/core/src/mindustry/world/meta/StatUnit.java b/core/src/mindustry/world/meta/StatUnit.java index 0466b4f139..42825f0379 100644 --- a/core/src/mindustry/world/meta/StatUnit.java +++ b/core/src/mindustry/world/meta/StatUnit.java @@ -1,8 +1,8 @@ package mindustry.world.meta; -import arc.Core; +import arc.*; -import java.util.Locale; +import java.util.*; /** * Defines a unit of measurement for block stats. diff --git a/core/src/mindustry/world/meta/StatValue.java b/core/src/mindustry/world/meta/StatValue.java index 1a978b71e9..db8efaacb6 100644 --- a/core/src/mindustry/world/meta/StatValue.java +++ b/core/src/mindustry/world/meta/StatValue.java @@ -1,6 +1,6 @@ package mindustry.world.meta; -import arc.scene.ui.layout.Table; +import arc.scene.ui.layout.*; /** * A base interface for a value of a stat that is displayed. diff --git a/core/src/mindustry/world/meta/values/AmmoListValue.java b/core/src/mindustry/world/meta/values/AmmoListValue.java index 1f16f36a08..d0d8624ea9 100644 --- a/core/src/mindustry/world/meta/values/AmmoListValue.java +++ b/core/src/mindustry/world/meta/values/AmmoListValue.java @@ -1,19 +1,19 @@ package mindustry.world.meta.values; import arc.*; -import arc.struct.*; import arc.graphics.g2d.*; import arc.math.*; import arc.scene.ui.layout.*; +import arc.struct.*; import arc.util.*; import mindustry.content.*; -import mindustry.ctype.UnlockableContent; +import mindustry.ctype.*; import mindustry.entities.bullet.*; import mindustry.gen.*; -import mindustry.ui.Cicon; +import mindustry.ui.*; import mindustry.world.meta.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class AmmoListValue implements StatValue{ private final ObjectMap map; diff --git a/core/src/mindustry/world/meta/values/BooleanValue.java b/core/src/mindustry/world/meta/values/BooleanValue.java index d0fe3518ce..c1da598008 100644 --- a/core/src/mindustry/world/meta/values/BooleanValue.java +++ b/core/src/mindustry/world/meta/values/BooleanValue.java @@ -1,7 +1,7 @@ package mindustry.world.meta.values; -import arc.scene.ui.layout.Table; -import mindustry.world.meta.StatValue; +import arc.scene.ui.layout.*; +import mindustry.world.meta.*; public class BooleanValue implements StatValue{ private final boolean value; diff --git a/core/src/mindustry/world/meta/values/BoosterListValue.java b/core/src/mindustry/world/meta/values/BoosterListValue.java index 54fac60f03..8d3315adaa 100644 --- a/core/src/mindustry/world/meta/values/BoosterListValue.java +++ b/core/src/mindustry/world/meta/values/BoosterListValue.java @@ -6,10 +6,10 @@ import arc.scene.ui.layout.*; import arc.util.*; import mindustry.gen.*; import mindustry.type.*; -import mindustry.ui.Cicon; +import mindustry.ui.*; import mindustry.world.meta.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class BoosterListValue implements StatValue{ protected float reload, maxUsed, multiplier; diff --git a/core/src/mindustry/world/meta/values/ItemFilterValue.java b/core/src/mindustry/world/meta/values/ItemFilterValue.java index 8f9420ff95..78db854658 100644 --- a/core/src/mindustry/world/meta/values/ItemFilterValue.java +++ b/core/src/mindustry/world/meta/values/ItemFilterValue.java @@ -1,13 +1,13 @@ package mindustry.world.meta.values; -import arc.struct.Seq; -import arc.func.Boolf; -import arc.scene.ui.layout.Table; -import mindustry.type.Item; -import mindustry.ui.ItemDisplay; -import mindustry.world.meta.StatValue; +import arc.func.*; +import arc.scene.ui.layout.*; +import arc.struct.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.meta.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class ItemFilterValue implements StatValue{ private final Boolf filter; diff --git a/core/src/mindustry/world/meta/values/ItemListValue.java b/core/src/mindustry/world/meta/values/ItemListValue.java index f6e1acc654..164b6a2a3c 100644 --- a/core/src/mindustry/world/meta/values/ItemListValue.java +++ b/core/src/mindustry/world/meta/values/ItemListValue.java @@ -1,9 +1,9 @@ package mindustry.world.meta.values; -import arc.scene.ui.layout.Table; -import mindustry.type.ItemStack; -import mindustry.ui.ItemDisplay; -import mindustry.world.meta.StatValue; +import arc.scene.ui.layout.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.meta.*; public class ItemListValue implements StatValue{ private final ItemStack[] stacks; diff --git a/core/src/mindustry/world/meta/values/LiquidFilterValue.java b/core/src/mindustry/world/meta/values/LiquidFilterValue.java index a88a912981..d5aef23376 100644 --- a/core/src/mindustry/world/meta/values/LiquidFilterValue.java +++ b/core/src/mindustry/world/meta/values/LiquidFilterValue.java @@ -1,13 +1,13 @@ package mindustry.world.meta.values; -import arc.struct.Seq; -import arc.func.Boolf; -import arc.scene.ui.layout.Table; -import mindustry.type.Liquid; -import mindustry.ui.LiquidDisplay; -import mindustry.world.meta.StatValue; +import arc.func.*; +import arc.scene.ui.layout.*; +import arc.struct.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.meta.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class LiquidFilterValue implements StatValue{ private final Boolf filter; diff --git a/core/src/mindustry/world/meta/values/LiquidValue.java b/core/src/mindustry/world/meta/values/LiquidValue.java index f6782da6ae..6139aed5ce 100644 --- a/core/src/mindustry/world/meta/values/LiquidValue.java +++ b/core/src/mindustry/world/meta/values/LiquidValue.java @@ -1,9 +1,9 @@ package mindustry.world.meta.values; -import arc.scene.ui.layout.Table; -import mindustry.type.Liquid; -import mindustry.ui.LiquidDisplay; -import mindustry.world.meta.StatValue; +import arc.scene.ui.layout.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.meta.*; public class LiquidValue implements StatValue{ private final Liquid liquid; diff --git a/core/src/mindustry/world/meta/values/NumberValue.java b/core/src/mindustry/world/meta/values/NumberValue.java index fd10d28f1d..fa815f4d49 100644 --- a/core/src/mindustry/world/meta/values/NumberValue.java +++ b/core/src/mindustry/world/meta/values/NumberValue.java @@ -1,9 +1,8 @@ package mindustry.world.meta.values; -import arc.scene.ui.layout.Table; -import arc.util.Strings; -import mindustry.world.meta.StatUnit; -import mindustry.world.meta.StatValue; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.world.meta.*; /** * A stat that is a number with a unit attacked. diff --git a/core/src/mindustry/world/meta/values/StringValue.java b/core/src/mindustry/world/meta/values/StringValue.java index 4bc102a8d4..b36a9d47e4 100644 --- a/core/src/mindustry/world/meta/values/StringValue.java +++ b/core/src/mindustry/world/meta/values/StringValue.java @@ -1,8 +1,8 @@ package mindustry.world.meta.values; -import arc.scene.ui.layout.Table; -import arc.util.Strings; -import mindustry.world.meta.StatValue; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.world.meta.*; public class StringValue implements StatValue{ private final String value; diff --git a/core/src/mindustry/world/modules/ItemModule.java b/core/src/mindustry/world/modules/ItemModule.java index a293942592..0d6e9ce047 100644 --- a/core/src/mindustry/world/modules/ItemModule.java +++ b/core/src/mindustry/world/modules/ItemModule.java @@ -9,7 +9,7 @@ import mindustry.type.*; import java.util.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class ItemModule extends BlockModule{ public static final ItemModule empty = new ItemModule(); diff --git a/core/src/mindustry/world/modules/LiquidModule.java b/core/src/mindustry/world/modules/LiquidModule.java index 95dfc2f621..95f82952bb 100644 --- a/core/src/mindustry/world/modules/LiquidModule.java +++ b/core/src/mindustry/world/modules/LiquidModule.java @@ -1,14 +1,14 @@ package mindustry.world.modules; import arc.math.*; -import arc.util.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import arc.util.io.*; import mindustry.type.*; import java.util.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class LiquidModule extends BlockModule{ private static final int windowSize = 3, updateInterval = 60; diff --git a/core/src/mindustry/world/modules/PowerModule.java b/core/src/mindustry/world/modules/PowerModule.java index 6f05f94304..c93a7d845f 100644 --- a/core/src/mindustry/world/modules/PowerModule.java +++ b/core/src/mindustry/world/modules/PowerModule.java @@ -1,8 +1,8 @@ package mindustry.world.modules; -import arc.struct.IntSeq; +import arc.struct.*; import arc.util.io.*; -import mindustry.world.blocks.power.PowerGraph; +import mindustry.world.blocks.power.*; public class PowerModule extends BlockModule{ /** diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index 2bc7fd4eac..401feb9ec5 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -214,7 +214,7 @@ public class Generators{ } //draw shard (default team top) on top of first sprite - if(i == 1 && shardTeamTop != null){ + if(region == block.teamRegions[Team.sharded.id] && shardTeamTop != null){ image.draw(shardTeamTop); } }