diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java index c8de289d80..8bfba00495 100644 --- a/android/src/io/anuke/mindustry/AndroidLauncher.java +++ b/android/src/io/anuke/mindustry/AndroidLauncher.java @@ -28,7 +28,7 @@ import io.anuke.mindustry.ui.dialogs.FileChooser; import java.io.*; import java.util.ArrayList; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class AndroidLauncher extends AndroidApplication{ public static final int PERMISSION_REQUEST_CODE = 1; diff --git a/annotations/src/main/java/io/anuke/annotations/RemoteWriteGenerator.java b/annotations/src/main/java/io/anuke/annotations/RemoteWriteGenerator.java index 2b62ad8eeb..411f8ead86 100644 --- a/annotations/src/main/java/io/anuke/annotations/RemoteWriteGenerator.java +++ b/annotations/src/main/java/io/anuke/annotations/RemoteWriteGenerator.java @@ -106,7 +106,7 @@ public class RemoteWriteGenerator{ for(VariableElement var : elem.getParameters()){ //special case: calling local-only methods uses the local player if(index == 0 && methodEntry.where == Loc.client){ - results.append("io.anuke.mindustry.Min.player"); + results.append("io.anuke.mindustry.Vars.player"); }else{ results.append(var.getSimpleName()); } diff --git a/core/src/io/anuke/mindustry/ClientLauncher.java b/core/src/io/anuke/mindustry/ClientLauncher.java index fc66020502..0a47e4907a 100644 --- a/core/src/io/anuke/mindustry/ClientLauncher.java +++ b/core/src/io/anuke/mindustry/ClientLauncher.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.gen.*; import io.anuke.mindustry.graphics.*; import static io.anuke.arc.Core.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class ClientLauncher extends ApplicationCore{ private long lastTime; @@ -32,7 +32,7 @@ public class ClientLauncher extends ApplicationCore{ assets = new AssetManager(); atlas = TextureAtlas.blankAtlas(); - assets.load(new Min()); + assets.load(new Vars()); assets.load(new AssetDescriptor<>("sprites/sprites.atlas", TextureAtlas.class)).loaded = t -> atlas = (TextureAtlas)t; UI.loadSystemCursors(); diff --git a/core/src/io/anuke/mindustry/Min.java b/core/src/io/anuke/mindustry/Vars.java similarity index 99% rename from core/src/io/anuke/mindustry/Min.java rename to core/src/io/anuke/mindustry/Vars.java index ea75d958ba..74a8a78b85 100644 --- a/core/src/io/anuke/mindustry/Min.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -25,7 +25,7 @@ import java.nio.charset.*; import java.util.*; @SuppressWarnings("unchecked") -public class Min implements Loadable{ +public class Vars implements Loadable{ /** Whether to load locales.*/ public static boolean loadLocales = true; /** IO buffer size. */ diff --git a/core/src/io/anuke/mindustry/ai/BlockIndexer.java b/core/src/io/anuke/mindustry/ai/BlockIndexer.java index 83edec057c..a31b2bbf8a 100644 --- a/core/src/io/anuke/mindustry/ai/BlockIndexer.java +++ b/core/src/io/anuke/mindustry/ai/BlockIndexer.java @@ -15,7 +15,7 @@ import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.meta.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; /** Class used for indexing special target blocks for AI. */ @SuppressWarnings("unchecked") diff --git a/core/src/io/anuke/mindustry/ai/Pathfinder.java b/core/src/io/anuke/mindustry/ai/Pathfinder.java index a00485ca44..27e74e11be 100644 --- a/core/src/io/anuke/mindustry/ai/Pathfinder.java +++ b/core/src/io/anuke/mindustry/ai/Pathfinder.java @@ -16,7 +16,7 @@ import io.anuke.mindustry.world.Pos; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockFlag; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Pathfinder{ private static final long maxUpdate = Time.millisToNanos(4); diff --git a/core/src/io/anuke/mindustry/ai/WaveSpawner.java b/core/src/io/anuke/mindustry/ai/WaveSpawner.java index d2c6b3710a..5863594f4f 100644 --- a/core/src/io/anuke/mindustry/ai/WaveSpawner.java +++ b/core/src/io/anuke/mindustry/ai/WaveSpawner.java @@ -17,7 +17,7 @@ import io.anuke.mindustry.game.SpawnGroup; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class WaveSpawner{ private static final float margin = 40f, coreMargin = tilesize * 3; //how far away from the edge flying units spawn diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index b4187be3c4..c5784aeeab 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -26,7 +26,7 @@ import io.anuke.mindustry.world.consumers.*; import io.anuke.mindustry.world.meta.*; import io.anuke.mindustry.world.modules.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Blocks implements ContentList{ public static Block @@ -515,10 +515,10 @@ public class Blocks implements ContentList{ Draw.alpha(entity.warmup); Lines.lineAngleCenter( - tile.drawx() + Mathf.sin(entity.totalProgress, 6f, Min.tilesize / 3f * size), + tile.drawx() + Mathf.sin(entity.totalProgress, 6f, Vars.tilesize / 3f * size), tile.drawy(), 90, - size * Min.tilesize / 2f); + size * Vars.tilesize / 2f); Draw.reset(); diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java index e970e1c3a0..c0b2ad732c 100644 --- a/core/src/io/anuke/mindustry/content/Bullets.java +++ b/core/src/io/anuke/mindustry/content/Bullets.java @@ -12,7 +12,7 @@ import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.*; -import static io.anuke.mindustry.Min.world; +import static io.anuke.mindustry.Vars.world; public class Bullets implements ContentList{ public static BulletType diff --git a/core/src/io/anuke/mindustry/content/Fx.java b/core/src/io/anuke/mindustry/content/Fx.java index 18947df28e..e6cd3b6236 100644 --- a/core/src/io/anuke/mindustry/content/Fx.java +++ b/core/src/io/anuke/mindustry/content/Fx.java @@ -15,7 +15,7 @@ import io.anuke.mindustry.graphics.Drawf; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item.Icon; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class Fx implements ContentList{ public static Effect diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java index 59157e034b..171ec88db8 100644 --- a/core/src/io/anuke/mindustry/core/ContentLoader.java +++ b/core/src/io/anuke/mindustry/core/ContentLoader.java @@ -44,7 +44,7 @@ public class ContentLoader{ public ContentLoader(){ //hack; allows content to initialize itself by referring to Mins.content, even though it hasn't been fully constructed yet - Min.content = this; + Vars.content = this; createContent(); } diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index a64994dc3e..0809b6b252 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -28,7 +28,7 @@ import io.anuke.mindustry.world.blocks.storage.*; import java.io.*; import static io.anuke.arc.Core.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; /** * Control module. diff --git a/core/src/io/anuke/mindustry/core/GameState.java b/core/src/io/anuke/mindustry/core/GameState.java index 15bbae9dbc..1e755de6c6 100644 --- a/core/src/io/anuke/mindustry/core/GameState.java +++ b/core/src/io/anuke/mindustry/core/GameState.java @@ -7,8 +7,8 @@ import io.anuke.mindustry.game.EventType.StateChangeEvent; import io.anuke.mindustry.game.*; import io.anuke.mindustry.net.Net; -import static io.anuke.mindustry.Min.unitGroups; -import static io.anuke.mindustry.Min.waveTeam; +import static io.anuke.mindustry.Vars.unitGroups; +import static io.anuke.mindustry.Vars.waveTeam; public class GameState{ /** Current wave number, can be anything in non-wave modes. */ diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java index 62a7284c12..32eee1a526 100644 --- a/core/src/io/anuke/mindustry/core/Logic.java +++ b/core/src/io/anuke/mindustry/core/Logic.java @@ -24,7 +24,7 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.BuildBlock; import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; /** * Logic module. diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java index 4b2571713f..81c002966b 100644 --- a/core/src/io/anuke/mindustry/core/NetClient.java +++ b/core/src/io/anuke/mindustry/core/NetClient.java @@ -9,7 +9,7 @@ import io.anuke.arc.math.RandomXS128; import io.anuke.arc.util.*; import io.anuke.arc.util.io.ReusableByteInStream; import io.anuke.arc.util.serialization.Base64Coder; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.Entities; import io.anuke.mindustry.entities.EntityGroup; @@ -33,7 +33,7 @@ import java.io.DataInputStream; import java.io.IOException; import java.util.zip.InflaterInputStream; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class NetClient implements ApplicationListener{ private final static float dataTimeout = 60 * 18; @@ -126,8 +126,8 @@ public class NetClient implements ApplicationListener{ //called on all clients @Remote(called = Loc.server, targets = Loc.server, variants = Variant.both) public static void sendMessage(String message, String sender, Player playersender){ - if(Min.ui != null){ - Min.ui.chatfrag.addMessage(message, sender); + if(Vars.ui != null){ + Vars.ui.chatfrag.addMessage(message, sender); } if(playersender != null){ @@ -139,8 +139,8 @@ public class NetClient implements ApplicationListener{ //equivalent to above method but there's no sender and no console log @Remote(called = Loc.server, targets = Loc.server) public static void sendMessage(String message){ - if(Min.ui != null){ - Min.ui.chatfrag.addMessage(message, null); + if(Vars.ui != null){ + Vars.ui.chatfrag.addMessage(message, null); } } diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index 535166f00c..8d210cb930 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -36,7 +36,7 @@ import java.io.*; import java.nio.ByteBuffer; import java.util.zip.DeflaterOutputStream; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class NetServer implements ApplicationListener{ public final static int maxSnapshotSize = 430; diff --git a/core/src/io/anuke/mindustry/core/Platform.java b/core/src/io/anuke/mindustry/core/Platform.java index d0bb0639d3..d66697c25e 100644 --- a/core/src/io/anuke/mindustry/core/Platform.java +++ b/core/src/io/anuke/mindustry/core/Platform.java @@ -9,7 +9,7 @@ import io.anuke.arc.math.RandomXS128; import io.anuke.arc.scene.ui.TextField; import io.anuke.arc.util.serialization.Base64Coder; -import static io.anuke.mindustry.Min.mobile; +import static io.anuke.mindustry.Vars.mobile; public abstract class Platform{ /** Each separate game platform should set this instance to their own implementation. */ diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 2b9884b9a8..c3005cbe79 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -25,7 +25,7 @@ import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.world.blocks.defense.ForceProjector.*; import static io.anuke.arc.Core.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Renderer implements ApplicationListener{ public final BlockRenderer blocks = new BlockRenderer(); diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index 1cb83530f7..340189b2ec 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -34,7 +34,7 @@ import io.anuke.mindustry.ui.dialogs.*; import io.anuke.mindustry.ui.fragments.*; import static io.anuke.arc.scene.actions.Actions.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class UI implements ApplicationListener, Loadable{ private Skin skin; diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java index 1d9a4543a4..67e4fd3069 100644 --- a/core/src/io/anuke/mindustry/core/World.java +++ b/core/src/io/anuke/mindustry/core/World.java @@ -20,7 +20,7 @@ import io.anuke.mindustry.type.*; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class World{ public final Context context = new Context(); diff --git a/core/src/io/anuke/mindustry/editor/DrawOperation.java b/core/src/io/anuke/mindustry/editor/DrawOperation.java index c142922b4b..b5a81a759f 100755 --- a/core/src/io/anuke/mindustry/editor/DrawOperation.java +++ b/core/src/io/anuke/mindustry/editor/DrawOperation.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.Floor; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class DrawOperation{ private MapEditor editor; diff --git a/core/src/io/anuke/mindustry/editor/EditorTile.java b/core/src/io/anuke/mindustry/editor/EditorTile.java index fc573adc37..6d627399df 100644 --- a/core/src/io/anuke/mindustry/editor/EditorTile.java +++ b/core/src/io/anuke/mindustry/editor/EditorTile.java @@ -10,8 +10,8 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.modules.*; -import static io.anuke.mindustry.Min.state; -import static io.anuke.mindustry.Min.ui; +import static io.anuke.mindustry.Vars.state; +import static io.anuke.mindustry.Vars.ui; //TODO somehow remove or replace this class with a more flexible solution public class EditorTile extends Tile{ diff --git a/core/src/io/anuke/mindustry/editor/EditorTool.java b/core/src/io/anuke/mindustry/editor/EditorTool.java index 6e1d4c8dff..9da41ad7f2 100644 --- a/core/src/io/anuke/mindustry/editor/EditorTool.java +++ b/core/src/io/anuke/mindustry/editor/EditorTool.java @@ -5,7 +5,7 @@ import io.anuke.arc.function.*; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Bresenham2; import io.anuke.arc.util.Structs; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.world.*; @@ -80,7 +80,7 @@ public enum EditorTool{ editor.drawCircle(x, y, tile -> { if(mode == -1){ //erase block - Min.world.removeBlock(tile); + Vars.world.removeBlock(tile); }else if(mode == 0){ //erase ore tile.clearOverlay(); diff --git a/core/src/io/anuke/mindustry/editor/MapEditor.java b/core/src/io/anuke/mindustry/editor/MapEditor.java index d40a0dbebd..bf557eb640 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditor.java +++ b/core/src/io/anuke/mindustry/editor/MapEditor.java @@ -16,7 +16,7 @@ import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.BlockPart; -import static io.anuke.mindustry.Min.world; +import static io.anuke.mindustry.Vars.world; public class MapEditor{ public static final int[] brushSizes = {1, 2, 3, 4, 5, 9, 15, 20}; diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index 53b99ed0c9..92fb76e808 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -30,7 +30,7 @@ import io.anuke.mindustry.world.Block.*; import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.blocks.storage.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class MapEditorDialog extends Dialog implements Disposable{ public final MapEditor editor; @@ -670,7 +670,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ int i = 0; blocksOut.clear(); - blocksOut.addAll(Min.content.blocks()); + blocksOut.addAll(Vars.content.blocks()); blocksOut.sort((b1, b2) -> { int core = -Boolean.compare(b1 instanceof CoreBlock, b2 instanceof CoreBlock); if(core != 0) return core; diff --git a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java index 647e760b3c..1538318170 100644 --- a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java @@ -21,7 +21,7 @@ import io.anuke.mindustry.ui.dialogs.*; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; @SuppressWarnings("unchecked") public class MapGenerateDialog extends FloatingDialog{ diff --git a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java index 39ac20669f..65d57f6175 100644 --- a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java @@ -59,7 +59,7 @@ public class MapInfoDialog extends FloatingDialog{ t.row(); t.add("$editor.rules").padRight(8).left(); - t.addButton("$edit", () -> ruleInfo.show(Min.state.rules, () -> Min.state.rules = new Rules())).left().width(200f); + t.addButton("$edit", () -> ruleInfo.show(Vars.state.rules, () -> Vars.state.rules = new Rules())).left().width(200f); t.row(); t.add("$editor.waves").padRight(8).left(); @@ -68,7 +68,7 @@ public class MapInfoDialog extends FloatingDialog{ t.row(); t.add("$editor.generation").padRight(8).left(); t.addButton("$edit", - () -> generate.show(Min.maps.readFilters(editor.getTags().get("genfilters", "")), + () -> generate.show(Vars.maps.readFilters(editor.getTags().get("genfilters", "")), filters -> editor.getTags().put("genfilters", JsonIO.write(filters))) ).left().width(200f); diff --git a/core/src/io/anuke/mindustry/editor/MapLoadDialog.java b/core/src/io/anuke/mindustry/editor/MapLoadDialog.java index 31e339fa05..27453cb187 100644 --- a/core/src/io/anuke/mindustry/editor/MapLoadDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapLoadDialog.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.maps.*; import io.anuke.mindustry.ui.*; import io.anuke.mindustry.ui.dialogs.*; -import static io.anuke.mindustry.Min.maps; +import static io.anuke.mindustry.Vars.maps; public class MapLoadDialog extends FloatingDialog{ private Map selected = null; diff --git a/core/src/io/anuke/mindustry/editor/MapRenderer.java b/core/src/io/anuke/mindustry/editor/MapRenderer.java index fb53b09732..c6ec218735 100644 --- a/core/src/io/anuke/mindustry/editor/MapRenderer.java +++ b/core/src/io/anuke/mindustry/editor/MapRenderer.java @@ -16,7 +16,7 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.BlockPart; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class MapRenderer implements Disposable{ private static final int chunkSize = 64; diff --git a/core/src/io/anuke/mindustry/editor/MapSaveDialog.java b/core/src/io/anuke/mindustry/editor/MapSaveDialog.java index 40ae2553ab..44cb9490fd 100644 --- a/core/src/io/anuke/mindustry/editor/MapSaveDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapSaveDialog.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.core.*; import io.anuke.mindustry.maps.*; import io.anuke.mindustry.ui.dialogs.*; -import static io.anuke.mindustry.Min.ui; +import static io.anuke.mindustry.Vars.ui; public class MapSaveDialog extends FloatingDialog{ private TextField field; @@ -23,7 +23,7 @@ public class MapSaveDialog extends FloatingDialog{ shown(() -> { cont.clear(); cont.label(() -> { - Map map = Min.maps.byName(field.getText()); + Map map = Vars.maps.byName(field.getText()); if(map != null){ if(map.custom){ return "$editor.overwrite"; @@ -68,7 +68,7 @@ public class MapSaveDialog extends FloatingDialog{ if(field.getText().isEmpty()){ return true; } - Map map = Min.maps.byName(field.getText()); + Map map = Vars.maps.byName(field.getText()); return map != null && !map.custom; } } diff --git a/core/src/io/anuke/mindustry/editor/MapView.java b/core/src/io/anuke/mindustry/editor/MapView.java index 82f035ed6a..0481d4a3f4 100644 --- a/core/src/io/anuke/mindustry/editor/MapView.java +++ b/core/src/io/anuke/mindustry/editor/MapView.java @@ -17,8 +17,8 @@ import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.input.Binding; import io.anuke.mindustry.ui.GridImage; -import static io.anuke.mindustry.Min.mobile; -import static io.anuke.mindustry.Min.ui; +import static io.anuke.mindustry.Vars.mobile; +import static io.anuke.mindustry.Vars.ui; public class MapView extends Element implements GestureListener{ private MapEditor editor; diff --git a/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java b/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java index 060648e873..ad5dccb5d8 100644 --- a/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java +++ b/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java @@ -10,7 +10,7 @@ import io.anuke.arc.scene.ui.Label; import io.anuke.arc.scene.ui.TextField.TextFieldFilter; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.util.*; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.*; import io.anuke.mindustry.game.*; import io.anuke.mindustry.graphics.Pal; @@ -18,7 +18,7 @@ import io.anuke.mindustry.io.JsonIO; import io.anuke.mindustry.type.*; import io.anuke.mindustry.ui.dialogs.FloatingDialog; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.game.SpawnGroup.never; public class WaveInfoDialog extends FloatingDialog{ @@ -242,7 +242,7 @@ public class WaveInfoDialog extends FloatingDialog{ table.add((wave + 1) + "").color(Pal.accent).center().colspan(2).get().setAlignment(Align.center, Align.center); table.row(); - int[] spawned = new int[Min.content.getBy(ContentType.unit).size]; + int[] spawned = new int[Vars.content.getBy(ContentType.unit).size]; for(SpawnGroup spawn : groups){ spawned[spawn.type.id] += spawn.getUnitsSpawned(wave); diff --git a/core/src/io/anuke/mindustry/entities/Damage.java b/core/src/io/anuke/mindustry/entities/Damage.java index 77d74b93f7..9b75085b0f 100644 --- a/core/src/io/anuke/mindustry/entities/Damage.java +++ b/core/src/io/anuke/mindustry/entities/Damage.java @@ -21,7 +21,7 @@ import io.anuke.mindustry.gen.PropCell; import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; /** Utility class for damaging in an area. */ public class Damage{ diff --git a/core/src/io/anuke/mindustry/entities/Entities.java b/core/src/io/anuke/mindustry/entities/Entities.java index 92693a9609..2a6f388ff5 100755 --- a/core/src/io/anuke/mindustry/entities/Entities.java +++ b/core/src/io/anuke/mindustry/entities/Entities.java @@ -10,7 +10,7 @@ import io.anuke.arc.math.geom.Rectangle; import io.anuke.mindustry.entities.traits.DrawTrait; import io.anuke.mindustry.entities.traits.Entity; -import static io.anuke.mindustry.Min.collisions; +import static io.anuke.mindustry.Vars.collisions; public class Entities{ private static final Array> groupArray = new Array<>(); diff --git a/core/src/io/anuke/mindustry/entities/EntityCollisions.java b/core/src/io/anuke/mindustry/entities/EntityCollisions.java index 2534691bb9..808f8e4fc8 100644 --- a/core/src/io/anuke/mindustry/entities/EntityCollisions.java +++ b/core/src/io/anuke/mindustry/entities/EntityCollisions.java @@ -7,8 +7,8 @@ import io.anuke.mindustry.entities.traits.Entity; import io.anuke.mindustry.entities.traits.SolidTrait; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.tilesize; -import static io.anuke.mindustry.Min.world; +import static io.anuke.mindustry.Vars.tilesize; +import static io.anuke.mindustry.Vars.world; public class EntityCollisions{ //range for tile collision scanning diff --git a/core/src/io/anuke/mindustry/entities/Units.java b/core/src/io/anuke/mindustry/entities/Units.java index 2d24672644..0b412a8c98 100644 --- a/core/src/io/anuke/mindustry/entities/Units.java +++ b/core/src/io/anuke/mindustry/entities/Units.java @@ -11,7 +11,7 @@ import io.anuke.mindustry.entities.type.*; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; /** Utility class for unit and team interactions.*/ public class Units{ diff --git a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java index 068e2e5ac4..afe97b5399 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java +++ b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java @@ -16,8 +16,8 @@ import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.bulletGroup; -import static io.anuke.mindustry.Min.world; +import static io.anuke.mindustry.Vars.bulletGroup; +import static io.anuke.mindustry.Vars.world; public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Poolable, DrawTrait, VelocityTrait, TimeTrait, TeamTrait, AbsorbTrait{ public Interval timer = new Interval(3); diff --git a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java index bae4a02294..e9edaef777 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.entities.effect.*; import io.anuke.mindustry.type.*; import io.anuke.mindustry.world.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class LiquidBulletType extends BulletType{ Liquid liquid; diff --git a/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java b/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java index 03afcb1486..a3bd379542 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java +++ b/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.entities.Effects; import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class MassDriverBolt extends BulletType{ diff --git a/core/src/io/anuke/mindustry/entities/effect/Decal.java b/core/src/io/anuke/mindustry/entities/effect/Decal.java index 269fae6b97..dd8a499f50 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Decal.java +++ b/core/src/io/anuke/mindustry/entities/effect/Decal.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.entities.traits.BelowLiquidTrait; import io.anuke.mindustry.entities.traits.DrawTrait; import io.anuke.mindustry.graphics.Pal; -import static io.anuke.mindustry.Min.groundEffectGroup; +import static io.anuke.mindustry.Vars.groundEffectGroup; /** * Class for creating block rubble on the ground. diff --git a/core/src/io/anuke/mindustry/entities/effect/Fire.java b/core/src/io/anuke/mindustry/entities/effect/Fire.java index 581405b58b..8ee58d742a 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Fire.java +++ b/core/src/io/anuke/mindustry/entities/effect/Fire.java @@ -17,7 +17,7 @@ import io.anuke.mindustry.world.*; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Fire extends TimedEntity implements SaveTrait, SyncTrait{ private static final IntMap map = new IntMap<>(); diff --git a/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java b/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java index 74c45c2d20..54094c4a87 100644 --- a/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java +++ b/core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.entities.effect; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.Effects; import io.anuke.mindustry.entities.Effects.Effect; import io.anuke.mindustry.entities.Effects.EffectRenderer; @@ -27,7 +27,7 @@ public class GroundEffectEntity extends EffectEntity{ if(!once && time >= lifetime()){ once = true; time = 0f; - Tile tile = Min.world.tileWorld(x, y); + Tile tile = Vars.world.tileWorld(x, y); if(tile != null && tile.floor().isLiquid){ remove(); } diff --git a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java index 7fd44b83c3..2cb7f567e1 100644 --- a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java +++ b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java @@ -17,7 +17,7 @@ import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.effectGroup; +import static io.anuke.mindustry.Vars.effectGroup; public class ItemTransfer extends TimedEntity implements DrawTrait{ private Vector2 from = new Vector2(); diff --git a/core/src/io/anuke/mindustry/entities/effect/Lightning.java b/core/src/io/anuke/mindustry/entities/effect/Lightning.java index 192eeb0a0f..bc842d7d95 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Lightning.java +++ b/core/src/io/anuke/mindustry/entities/effect/Lightning.java @@ -21,7 +21,7 @@ import io.anuke.mindustry.game.Team; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.graphics.Pal; -import static io.anuke.mindustry.Min.bulletGroup; +import static io.anuke.mindustry.Vars.bulletGroup; public class Lightning extends TimedEntity implements DrawTrait, TimeTrait{ public static final float lifetime = 10f; diff --git a/core/src/io/anuke/mindustry/entities/effect/Puddle.java b/core/src/io/anuke/mindustry/entities/effect/Puddle.java index f8efd5d9df..b9885f5a20 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Puddle.java +++ b/core/src/io/anuke/mindustry/entities/effect/Puddle.java @@ -24,7 +24,7 @@ import io.anuke.mindustry.world.Tile; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrait, SyncTrait{ private static final IntMap map = new IntMap<>(); diff --git a/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java b/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java index 8391f0eeb6..222d1355e4 100644 --- a/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java +++ b/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java @@ -5,7 +5,7 @@ import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; -import static io.anuke.mindustry.Min.headless; +import static io.anuke.mindustry.Vars.headless; public class RubbleDecal extends Decal{ private TextureRegion region; diff --git a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java b/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java index e62b78a716..89f4eacf6f 100644 --- a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java +++ b/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java @@ -7,8 +7,8 @@ import io.anuke.arc.math.Angles; import io.anuke.arc.math.Mathf; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.headless; -import static io.anuke.mindustry.Min.world; +import static io.anuke.mindustry.Vars.headless; +import static io.anuke.mindustry.Vars.world; public class ScorchDecal extends Decal{ private static final int scorches = 5; diff --git a/core/src/io/anuke/mindustry/entities/impl/EffectEntity.java b/core/src/io/anuke/mindustry/entities/impl/EffectEntity.java index 82915e8c9f..789ce78dfa 100644 --- a/core/src/io/anuke/mindustry/entities/impl/EffectEntity.java +++ b/core/src/io/anuke/mindustry/entities/impl/EffectEntity.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.entities.EntityGroup; import io.anuke.mindustry.entities.traits.DrawTrait; import io.anuke.mindustry.entities.traits.Entity; -import static io.anuke.mindustry.Min.effectGroup; +import static io.anuke.mindustry.Vars.effectGroup; public class EffectEntity extends TimedEntity implements Poolable, DrawTrait{ public Effect effect; diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index 991fc2b1af..1b601d3d7f 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -21,7 +21,7 @@ import io.anuke.mindustry.world.blocks.BuildBlock.*; import java.io.*; import java.util.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.entities.traits.BuilderTrait.BuildDataStatic.*; /** Interface for units that build things.*/ @@ -228,7 +228,7 @@ public interface BuilderTrait extends Entity, TeamTrait{ float px = unit.x + Angles.trnsx(unit.rotation, focusLen); float py = unit.y + Angles.trnsy(unit.rotation, focusLen); - float sz = Min.tilesize * tile.block().size / 2f; + float sz = Vars.tilesize * tile.block().size / 2f; float ang = unit.angleTo(tile); tmptr[0].set(tile.drawx() - sz, tile.drawy() - sz); diff --git a/core/src/io/anuke/mindustry/entities/traits/MinerTrait.java b/core/src/io/anuke/mindustry/entities/traits/MinerTrait.java index 98e6f333ab..76a66396e1 100644 --- a/core/src/io/anuke/mindustry/entities/traits/MinerTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/MinerTrait.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public interface MinerTrait extends Entity{ diff --git a/core/src/io/anuke/mindustry/entities/traits/SolidTrait.java b/core/src/io/anuke/mindustry/entities/traits/SolidTrait.java index fd43aba206..5ebf8105f3 100644 --- a/core/src/io/anuke/mindustry/entities/traits/SolidTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/SolidTrait.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.entities.traits; import io.anuke.arc.math.geom.*; import io.anuke.arc.math.geom.QuadTree.QuadTreeObject; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; public interface SolidTrait extends QuadTreeObject, MoveTrait, VelocityTrait, Entity, Position{ @@ -33,6 +33,6 @@ public interface SolidTrait extends QuadTreeObject, MoveTrait, VelocityTrait, En } default void move(float x, float y){ - Min.collisions.move(this, x, y); + Vars.collisions.move(this, x, y); } } diff --git a/core/src/io/anuke/mindustry/entities/type/BaseUnit.java b/core/src/io/anuke/mindustry/entities/type/BaseUnit.java index dad0cead6b..82615e8a01 100644 --- a/core/src/io/anuke/mindustry/entities/type/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/type/BaseUnit.java @@ -22,7 +22,7 @@ import io.anuke.mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; /** Base class for AI units. */ public abstract class BaseUnit extends Unit implements ShooterTrait{ @@ -163,8 +163,8 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ public TileEntity getClosestEnemyCore(){ - for(Team enemy : Min.state.teams.enemiesOf(team)){ - Tile tile = Geometry.findClosest(x, y, Min.state.teams.get(enemy).cores); + for(Team enemy : Vars.state.teams.enemiesOf(team)){ + Tile tile = Geometry.findClosest(x, y, Vars.state.teams.get(enemy).cores); if(tile != null){ return tile.entity; } @@ -183,7 +183,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ @Override public float getDamageMultipler(){ - return status.getDamageMultiplier() * Min.state.rules.unitDamageMultiplier; + return status.getDamageMultiplier() * Vars.state.rules.unitDamageMultiplier; } @Override @@ -232,7 +232,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ @Override public float maxHealth(){ - return type.health * Min.state.rules.unitHealthMultiplier; + return type.health * Vars.state.rules.unitHealthMultiplier; } @Override diff --git a/core/src/io/anuke/mindustry/entities/type/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/type/FlyingUnit.java index cb507285ee..d02ad55ec1 100644 --- a/core/src/io/anuke/mindustry/entities/type/FlyingUnit.java +++ b/core/src/io/anuke/mindustry/entities/type/FlyingUnit.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.net.*; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.meta.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public abstract class FlyingUnit extends BaseUnit{ protected float[] weaponAngles = {0, 0}; diff --git a/core/src/io/anuke/mindustry/entities/type/GroundUnit.java b/core/src/io/anuke/mindustry/entities/type/GroundUnit.java index 0f01cfbee6..d538d05c10 100644 --- a/core/src/io/anuke/mindustry/entities/type/GroundUnit.java +++ b/core/src/io/anuke/mindustry/entities/type/GroundUnit.java @@ -14,7 +14,7 @@ import io.anuke.mindustry.type.*; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public abstract class GroundUnit extends BaseUnit{ protected static Vector2 vec = new Vector2(); @@ -235,8 +235,8 @@ public abstract class GroundUnit extends BaseUnit{ protected void moveAwayFromCore(){ Team enemy = null; - for(Team team : Min.state.teams.enemiesOf(team)){ - if(Min.state.teams.isActive(team)){ + for(Team team : Vars.state.teams.enemiesOf(team)){ + if(Vars.state.teams.isActive(team)){ enemy = team; break; } diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index 368c5e4b7f..6e497b30dd 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -12,7 +12,7 @@ import io.anuke.arc.math.geom.*; import io.anuke.arc.scene.ui.layout.*; import io.anuke.arc.util.*; import io.anuke.arc.util.pooling.Pools; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.*; import io.anuke.mindustry.entities.*; import io.anuke.mindustry.entities.traits.*; @@ -31,7 +31,7 @@ import io.anuke.mindustry.world.blocks.*; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ public static final int timerSync = 2; @@ -859,7 +859,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ byte mechid = stream.readByte(); int spawner = stream.readInt(); Tile stile = world.tile(spawner); - Player player = headless ? this : Min.player; + Player player = headless ? this : Vars.player; player.readSaveSuper(stream, version); player.mech = content.getByID(ContentType.mech, mechid); player.dead = false; diff --git a/core/src/io/anuke/mindustry/entities/type/TileEntity.java b/core/src/io/anuke/mindustry/entities/type/TileEntity.java index 1d3eca6f4e..3205eee53a 100644 --- a/core/src/io/anuke/mindustry/entities/type/TileEntity.java +++ b/core/src/io/anuke/mindustry/entities/type/TileEntity.java @@ -20,7 +20,7 @@ import io.anuke.mindustry.world.modules.*; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ public static final float timeToSleep = 60f * 4; //4 seconds to fall asleep diff --git a/core/src/io/anuke/mindustry/entities/type/Unit.java b/core/src/io/anuke/mindustry/entities/type/Unit.java index dd16422162..2bf5f63b17 100644 --- a/core/src/io/anuke/mindustry/entities/type/Unit.java +++ b/core/src/io/anuke/mindustry/entities/type/Unit.java @@ -27,7 +27,7 @@ import io.anuke.mindustry.world.blocks.*; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public abstract class Unit extends DestructibleEntity implements SaveTrait, TargetTrait, SyncTrait, DrawTrait, TeamTrait{ /** Total duration of hit flash effect */ diff --git a/core/src/io/anuke/mindustry/entities/type/base/BaseDrone.java b/core/src/io/anuke/mindustry/entities/type/base/BaseDrone.java index c771744c05..2821a00832 100644 --- a/core/src/io/anuke/mindustry/entities/type/base/BaseDrone.java +++ b/core/src/io/anuke/mindustry/entities/type/base/BaseDrone.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.entities.units.*; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockFlag; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public abstract class BaseDrone extends FlyingUnit{ public final UnitState retreat = new UnitState(){ diff --git a/core/src/io/anuke/mindustry/entities/type/base/BuilderDrone.java b/core/src/io/anuke/mindustry/entities/type/base/BuilderDrone.java index 51981a112c..21649dbf07 100644 --- a/core/src/io/anuke/mindustry/entities/type/base/BuilderDrone.java +++ b/core/src/io/anuke/mindustry/entities/type/base/BuilderDrone.java @@ -6,7 +6,7 @@ import io.anuke.arc.collection.IntIntMap; import io.anuke.arc.collection.Queue; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.*; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.EntityGroup; import io.anuke.mindustry.entities.traits.BuilderTrait; import io.anuke.mindustry.entities.traits.TargetTrait; @@ -21,7 +21,7 @@ import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class BuilderDrone extends BaseDrone implements BuilderTrait{ private static final StaticReset reset = new StaticReset(); @@ -189,7 +189,7 @@ public class BuilderDrone extends BaseDrone implements BuilderTrait{ } if(isRebuild() && !isBuilding()){ - TeamData data = Min.state.teams.get(team); + TeamData data = Vars.state.teams.get(team); if(!data.brokenBlocks.isEmpty()){ long block = data.brokenBlocks.removeLast(); diff --git a/core/src/io/anuke/mindustry/entities/type/base/MinerDrone.java b/core/src/io/anuke/mindustry/entities/type/base/MinerDrone.java index b456ef2693..2d90b8a604 100644 --- a/core/src/io/anuke/mindustry/entities/type/base/MinerDrone.java +++ b/core/src/io/anuke/mindustry/entities/type/base/MinerDrone.java @@ -14,7 +14,7 @@ import io.anuke.mindustry.world.Tile; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; /** A drone that only mines.*/ public class MinerDrone extends BaseDrone implements MinerTrait{ diff --git a/core/src/io/anuke/mindustry/entities/type/base/RepairDrone.java b/core/src/io/anuke/mindustry/entities/type/base/RepairDrone.java index 5af88e2c6a..be16cd1724 100644 --- a/core/src/io/anuke/mindustry/entities/type/base/RepairDrone.java +++ b/core/src/io/anuke/mindustry/entities/type/base/RepairDrone.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.world.blocks.*; import java.io.*; -import static io.anuke.mindustry.Min.world; +import static io.anuke.mindustry.Vars.world; public class RepairDrone extends BaseDrone{ public final UnitState repair = new UnitState(){ diff --git a/core/src/io/anuke/mindustry/entities/units/Statuses.java b/core/src/io/anuke/mindustry/entities/units/Statuses.java index 6bc022270e..75551f692b 100644 --- a/core/src/io/anuke/mindustry/entities/units/Statuses.java +++ b/core/src/io/anuke/mindustry/entities/units/Statuses.java @@ -14,7 +14,7 @@ import io.anuke.mindustry.type.StatusEffect; import java.io.*; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; /** Class for controlling status effects on an entity. */ public class Statuses implements Saveable{ diff --git a/core/src/io/anuke/mindustry/entities/units/UnitDrops.java b/core/src/io/anuke/mindustry/entities/units/UnitDrops.java index 79ade052b1..142f2f3d65 100644 --- a/core/src/io/anuke/mindustry/entities/units/UnitDrops.java +++ b/core/src/io/anuke/mindustry/entities/units/UnitDrops.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.entities.units; import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.entities.type.BaseUnit; import io.anuke.mindustry.entities.type.TileEntity; @@ -13,13 +13,13 @@ public class UnitDrops{ public static void dropItems(BaseUnit unit){ //items only dropped in waves for enemy team - if(unit.getTeam() != Min.waveTeam || !Min.state.rules.unitDrops){ + if(unit.getTeam() != Vars.waveTeam || !Vars.state.rules.unitDrops){ return; } TileEntity core = unit.getClosestEnemyCore(); - if(core == null || core.dst(unit) > Min.mineTransferRange){ + if(core == null || core.dst(unit) > Vars.mineTransferRange){ return; } @@ -30,7 +30,7 @@ public class UnitDrops{ for(int i = 0; i < 3; i++){ for(Item item : dropTable){ //only drop unlocked items - if(!Min.headless && !Min.data.isUnlocked(item)){ + if(!Vars.headless && !Vars.data.isUnlocked(item)){ continue; } diff --git a/core/src/io/anuke/mindustry/game/Content.java b/core/src/io/anuke/mindustry/game/Content.java index 1c3f0b4943..f75a4495fb 100644 --- a/core/src/io/anuke/mindustry/game/Content.java +++ b/core/src/io/anuke/mindustry/game/Content.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.game; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.type.ContentType; @@ -9,8 +9,8 @@ public abstract class Content{ public final short id; public Content(){ - this.id = (short)Min.content.getBy(getContentType()).size; - Min.content.handleContent(this); + this.id = (short)Vars.content.getBy(getContentType()).size; + Vars.content.handleContent(this); } /** diff --git a/core/src/io/anuke/mindustry/game/Gamemode.java b/core/src/io/anuke/mindustry/game/Gamemode.java index b9a0e93ba3..4c8e42e1f1 100644 --- a/core/src/io/anuke/mindustry/game/Gamemode.java +++ b/core/src/io/anuke/mindustry/game/Gamemode.java @@ -4,7 +4,7 @@ import io.anuke.arc.*; import io.anuke.arc.function.*; import io.anuke.mindustry.maps.*; -import static io.anuke.mindustry.Min.waveTeam; +import static io.anuke.mindustry.Vars.waveTeam; /** Defines preset rule sets. */ public enum Gamemode{ diff --git a/core/src/io/anuke/mindustry/game/GlobalData.java b/core/src/io/anuke/mindustry/game/GlobalData.java index 2a242f35fc..a905f09d39 100644 --- a/core/src/io/anuke/mindustry/game/GlobalData.java +++ b/core/src/io/anuke/mindustry/game/GlobalData.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.content.*; import io.anuke.mindustry.game.EventType.*; import io.anuke.mindustry.type.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; /** Stores player unlocks. Clientside only. */ public class GlobalData{ @@ -106,7 +106,7 @@ public class GlobalData{ @SuppressWarnings("unchecked") public void load(){ unlocked = Core.settings.getObject("unlocks", ObjectMap.class, ObjectMap::new); - for(Item item : Min.content.items()){ + for(Item item : Vars.content.items()){ items.put(item, Core.settings.getInt("item-" + item.name, 0)); } @@ -118,7 +118,7 @@ public class GlobalData{ public void save(){ Core.settings.putObject("unlocks", unlocked); - for(Item item : Min.content.items()){ + for(Item item : Vars.content.items()){ Core.settings.put("item-" + item.name, items.get(item, 0)); } Core.settings.save(); diff --git a/core/src/io/anuke/mindustry/game/LoopControl.java b/core/src/io/anuke/mindustry/game/LoopControl.java index 39eafa75e7..3924a1c28c 100644 --- a/core/src/io/anuke/mindustry/game/LoopControl.java +++ b/core/src/io/anuke/mindustry/game/LoopControl.java @@ -11,7 +11,7 @@ public class LoopControl{ private ObjectMap sounds = new ObjectMap<>(); public void play(Sound sound, Position pos, float volume){ - if(Min.headless) return; + if(Vars.headless) return; float baseVol = sound.calcFalloff(pos.getX(), pos.getY()); float vol = baseVol * volume; diff --git a/core/src/io/anuke/mindustry/game/MusicControl.java b/core/src/io/anuke/mindustry/game/MusicControl.java index 54ed2a6786..643626c318 100644 --- a/core/src/io/anuke/mindustry/game/MusicControl.java +++ b/core/src/io/anuke/mindustry/game/MusicControl.java @@ -10,7 +10,7 @@ import io.anuke.mindustry.core.GameState.*; import io.anuke.mindustry.game.EventType.*; import io.anuke.mindustry.gen.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; /** Controls playback of multiple music tracks.*/ public class MusicControl{ diff --git a/core/src/io/anuke/mindustry/game/Saves.java b/core/src/io/anuke/mindustry/game/Saves.java index f6f282caf3..86873d0a3b 100644 --- a/core/src/io/anuke/mindustry/game/Saves.java +++ b/core/src/io/anuke/mindustry/game/Saves.java @@ -17,8 +17,8 @@ import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; -import static io.anuke.mindustry.Min.saveExtension; -import static io.anuke.mindustry.Min.state; +import static io.anuke.mindustry.Vars.saveExtension; +import static io.anuke.mindustry.Vars.state; public class Saves{ private int nextSlot; diff --git a/core/src/io/anuke/mindustry/game/SpawnGroup.java b/core/src/io/anuke/mindustry/game/SpawnGroup.java index a68d9660c9..4637ba4bfd 100644 --- a/core/src/io/anuke/mindustry/game/SpawnGroup.java +++ b/core/src/io/anuke/mindustry/game/SpawnGroup.java @@ -6,7 +6,7 @@ import io.anuke.arc.util.serialization.JsonValue; import io.anuke.mindustry.entities.type.BaseUnit; import io.anuke.mindustry.type.*; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; /** * A spawn group defines spawn information for a specific type of unit, with optional extra information like diff --git a/core/src/io/anuke/mindustry/game/Teams.java b/core/src/io/anuke/mindustry/game/Teams.java index 404f2a08b1..be4d1a7e2c 100644 --- a/core/src/io/anuke/mindustry/game/Teams.java +++ b/core/src/io/anuke/mindustry/game/Teams.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.game; import io.anuke.annotations.Annotations.Struct; import io.anuke.arc.collection.*; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.world.Tile; /** Class for various team-based utilities. */ @@ -29,7 +29,7 @@ public class Teams{ /** Returns whether a team is active, e.g. whether it has any cores remaining. */ public boolean isActive(Team team){ //the enemy wave team is always active - return team == Min.waveTeam || get(team).cores.size > 0; + return team == Vars.waveTeam || get(team).cores.size > 0; } /** Returns a set of all teams that are enemies of this team. */ diff --git a/core/src/io/anuke/mindustry/game/Tutorial.java b/core/src/io/anuke/mindustry/game/Tutorial.java index ce1d9a5fe5..4989d07c73 100644 --- a/core/src/io/anuke/mindustry/game/Tutorial.java +++ b/core/src/io/anuke/mindustry/game/Tutorial.java @@ -15,7 +15,7 @@ import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.type.*; import io.anuke.mindustry.world.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; /** Handles tutorial state. */ public class Tutorial{ diff --git a/core/src/io/anuke/mindustry/game/UnlockableContent.java b/core/src/io/anuke/mindustry/game/UnlockableContent.java index cbbf9fabb9..24edd13949 100644 --- a/core/src/io/anuke/mindustry/game/UnlockableContent.java +++ b/core/src/io/anuke/mindustry/game/UnlockableContent.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.game; import io.anuke.arc.Core; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; /** Base interface for an unlockable content type. */ public abstract class UnlockableContent extends MappableContent{ @@ -42,7 +42,7 @@ public abstract class UnlockableContent extends MappableContent{ } public final boolean unlocked(){ - return Min.data.isUnlocked(this); + return Vars.data.isUnlocked(this); } public final boolean locked(){ diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java index ead7607f46..292052479c 100644 --- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.game.Team; import io.anuke.mindustry.world.*; import static io.anuke.arc.Core.camera; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class BlockRenderer implements Disposable{ private final static int initialRequests = 32 * 32; diff --git a/core/src/io/anuke/mindustry/graphics/CacheLayer.java b/core/src/io/anuke/mindustry/graphics/CacheLayer.java index 5d37c7d13f..9c96f4d3c5 100644 --- a/core/src/io/anuke/mindustry/graphics/CacheLayer.java +++ b/core/src/io/anuke/mindustry/graphics/CacheLayer.java @@ -6,7 +6,7 @@ import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.glutils.Shader; import static io.anuke.arc.Core.camera; -import static io.anuke.mindustry.Min.renderer; +import static io.anuke.mindustry.Vars.renderer; public enum CacheLayer{ water{ diff --git a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java index 25a8717c9b..58d022f579 100644 --- a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java @@ -15,8 +15,8 @@ import io.anuke.mindustry.world.blocks.Floor; import java.util.Arrays; -import static io.anuke.mindustry.Min.tilesize; -import static io.anuke.mindustry.Min.world; +import static io.anuke.mindustry.Vars.tilesize; +import static io.anuke.mindustry.Vars.world; public class FloorRenderer implements Disposable{ private final static int chunksize = 64; diff --git a/core/src/io/anuke/mindustry/graphics/MenuRenderer.java b/core/src/io/anuke/mindustry/graphics/MenuRenderer.java index a7c7f2b8d9..240f7e584f 100644 --- a/core/src/io/anuke/mindustry/graphics/MenuRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/MenuRenderer.java @@ -19,7 +19,7 @@ import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.Floor; import io.anuke.mindustry.world.blocks.OreBlock; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class MenuRenderer implements Disposable{ private static final float darkness = 0.3f; diff --git a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java index d9e28ba767..754743318e 100644 --- a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java @@ -15,7 +15,7 @@ import io.anuke.mindustry.game.EventType.*; import io.anuke.mindustry.io.*; import io.anuke.mindustry.world.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class MinimapRenderer implements Disposable{ private static final float baseSize = 16f; diff --git a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java index ce26a0c189..4ca26d2317 100644 --- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java @@ -9,7 +9,7 @@ import io.anuke.arc.math.geom.Rectangle; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Time; import io.anuke.arc.util.Tmp; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.type.Player; @@ -18,7 +18,7 @@ import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class OverlayRenderer{ private static final float indicatorLength = 14f; @@ -38,7 +38,7 @@ public class OverlayRenderer{ if(Core.settings.getBool("indicators")){ for(Player player : playerGroup.all()){ - if(Min.player != player && Min.player.getTeam() == player.getTeam()){ + if(Vars.player != player && Vars.player.getTeam() == player.getTeam()){ if(!rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f) .setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x, player.y)){ diff --git a/core/src/io/anuke/mindustry/graphics/Pixelator.java b/core/src/io/anuke/mindustry/graphics/Pixelator.java index aa3c7d8b0a..8cc252eebd 100644 --- a/core/src/io/anuke/mindustry/graphics/Pixelator.java +++ b/core/src/io/anuke/mindustry/graphics/Pixelator.java @@ -10,8 +10,8 @@ import io.anuke.mindustry.entities.type.Player; import static io.anuke.arc.Core.camera; import static io.anuke.arc.Core.graphics; -import static io.anuke.mindustry.Min.playerGroup; -import static io.anuke.mindustry.Min.renderer; +import static io.anuke.mindustry.Vars.playerGroup; +import static io.anuke.mindustry.Vars.renderer; public class Pixelator implements Disposable{ private FrameBuffer buffer = new FrameBuffer(2, 2); diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index 70f309c08e..caf01eeb25 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -17,7 +17,7 @@ import io.anuke.mindustry.net.Net; import io.anuke.mindustry.world.*; import static io.anuke.arc.Core.scene; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.input.PlaceMode.*; public class DesktopInput extends InputHandler{ diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java index 33e5938988..6ed371a7ec 100644 --- a/core/src/io/anuke/mindustry/input/InputHandler.java +++ b/core/src/io/anuke/mindustry/input/InputHandler.java @@ -25,7 +25,7 @@ import io.anuke.mindustry.type.*; import io.anuke.mindustry.ui.fragments.*; import io.anuke.mindustry.world.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public abstract class InputHandler implements InputProcessor{ /** Used for dropping items. */ diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index df0fb7c5af..138a7120eb 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -21,7 +21,7 @@ import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.input.PlaceUtils.*; import io.anuke.mindustry.world.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.input.PlaceMode.*; public class MobileInput extends InputHandler implements GestureListener{ diff --git a/core/src/io/anuke/mindustry/input/PlaceUtils.java b/core/src/io/anuke/mindustry/input/PlaceUtils.java index 0e8a2baf9c..52e06e518b 100644 --- a/core/src/io/anuke/mindustry/input/PlaceUtils.java +++ b/core/src/io/anuke/mindustry/input/PlaceUtils.java @@ -7,7 +7,7 @@ import io.anuke.arc.math.geom.Point2; import io.anuke.arc.util.pooling.Pools; import io.anuke.mindustry.world.Block; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class PlaceUtils{ private static final NormalizeResult result = new NormalizeResult(); diff --git a/core/src/io/anuke/mindustry/io/JsonIO.java b/core/src/io/anuke/mindustry/io/JsonIO.java index ee6ffd7269..15f1e18476 100644 --- a/core/src/io/anuke/mindustry/io/JsonIO.java +++ b/core/src/io/anuke/mindustry/io/JsonIO.java @@ -50,7 +50,7 @@ public class JsonIO{ @Override public Zone read(Json json, JsonValue jsonData, Class type){ - return Min.content.getByName(ContentType.zone, jsonData.asString()); + return Vars.content.getByName(ContentType.zone, jsonData.asString()); } }); @@ -63,13 +63,13 @@ public class JsonIO{ @Override public Item read(Json json, JsonValue jsonData, Class type){ if(jsonData.asString() == null) return Items.copper; - Item i = Min.content.getByName(ContentType.item, jsonData.asString()); + Item i = Vars.content.getByName(ContentType.item, jsonData.asString()); return i == null ? Items.copper : i; } }); //TODO extremely hacky and disgusting - for(Block block : Min.content.blocks()){ + for(Block block : Vars.content.blocks()){ Class type = block.getClass(); if(type.isAnonymousClass()) type = type.getSuperclass(); @@ -81,7 +81,7 @@ public class JsonIO{ @Override public Block read(Json json, JsonValue jsonData, Class type){ - return Min.content.getByName(ContentType.block, jsonData.asString()); + return Vars.content.getByName(ContentType.block, jsonData.asString()); } }); } @@ -94,7 +94,7 @@ public class JsonIO{ @Override public Block read(Json json, JsonValue jsonData, Class type){ - return Min.content.getByName(ContentType.block, jsonData.asString()); + return Vars.content.getByName(ContentType.block, jsonData.asString()); } }); diff --git a/core/src/io/anuke/mindustry/io/LegacyMapIO.java b/core/src/io/anuke/mindustry/io/LegacyMapIO.java index 95df3eaaa6..d948fbee19 100644 --- a/core/src/io/anuke/mindustry/io/LegacyMapIO.java +++ b/core/src/io/anuke/mindustry/io/LegacyMapIO.java @@ -21,7 +21,7 @@ import io.anuke.mindustry.world.blocks.Floor; import java.io.*; import java.util.zip.InflaterInputStream; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; /** Map IO for the "old" .mmap format. * Differentiate between legacy maps and new maps by checking the extension (or the header).*/ diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java index 7f21e14c3f..722dcaae8b 100644 --- a/core/src/io/anuke/mindustry/io/MapIO.java +++ b/core/src/io/anuke/mindustry/io/MapIO.java @@ -14,7 +14,7 @@ import io.anuke.mindustry.world.blocks.storage.*; import java.io.*; import java.util.zip.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; /** Reads and writes map files. */ //TODO does this class even need to exist??? move to Maps? diff --git a/core/src/io/anuke/mindustry/io/SaveIO.java b/core/src/io/anuke/mindustry/io/SaveIO.java index d022dca685..cb79c0222d 100644 --- a/core/src/io/anuke/mindustry/io/SaveIO.java +++ b/core/src/io/anuke/mindustry/io/SaveIO.java @@ -4,7 +4,7 @@ import io.anuke.arc.collection.*; import io.anuke.arc.files.FileHandle; import io.anuke.arc.util.io.CounterInputStream; import io.anuke.arc.util.io.FastDeflaterOutputStream; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.io.versions.Save1; import io.anuke.mindustry.io.versions.Save2; import io.anuke.mindustry.world.WorldContext; @@ -13,7 +13,7 @@ import java.io.*; import java.util.Arrays; import java.util.zip.InflaterInputStream; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class SaveIO{ /** Format header. This is the string 'MSAV' in ASCII. */ @@ -108,7 +108,7 @@ public class SaveIO{ } public static FileHandle fileFor(int slot){ - return saveDirectory.child(slot + "." + Min.saveExtension); + return saveDirectory.child(slot + "." + Vars.saveExtension); } public static FileHandle backupFileFor(FileHandle file){ diff --git a/core/src/io/anuke/mindustry/io/SaveMeta.java b/core/src/io/anuke/mindustry/io/SaveMeta.java index 7780f4cbae..429c82561d 100644 --- a/core/src/io/anuke/mindustry/io/SaveMeta.java +++ b/core/src/io/anuke/mindustry/io/SaveMeta.java @@ -4,7 +4,7 @@ import io.anuke.arc.collection.*; import io.anuke.mindustry.game.*; import io.anuke.mindustry.maps.*; -import static io.anuke.mindustry.Min.maps; +import static io.anuke.mindustry.Vars.maps; public class SaveMeta{ public int version; diff --git a/core/src/io/anuke/mindustry/io/SaveVersion.java b/core/src/io/anuke/mindustry/io/SaveVersion.java index 2a08ea91f2..eab2846b3b 100644 --- a/core/src/io/anuke/mindustry/io/SaveVersion.java +++ b/core/src/io/anuke/mindustry/io/SaveVersion.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.world.*; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public abstract class SaveVersion extends SaveFileReader{ public final int version; diff --git a/core/src/io/anuke/mindustry/io/TypeIO.java b/core/src/io/anuke/mindustry/io/TypeIO.java index e36247b4a2..ebd1ef3d45 100644 --- a/core/src/io/anuke/mindustry/io/TypeIO.java +++ b/core/src/io/anuke/mindustry/io/TypeIO.java @@ -22,7 +22,7 @@ import io.anuke.mindustry.world.*; import java.io.*; import java.nio.ByteBuffer; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; /** Class for specifying read/write methods for code generation. */ @SuppressWarnings("unused") diff --git a/core/src/io/anuke/mindustry/maps/Map.java b/core/src/io/anuke/mindustry/maps/Map.java index a1b1bd09c8..5df1bf056d 100644 --- a/core/src/io/anuke/mindustry/maps/Map.java +++ b/core/src/io/anuke/mindustry/maps/Map.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.game.*; import io.anuke.mindustry.io.*; import io.anuke.mindustry.maps.filters.*; -import static io.anuke.mindustry.Min.maps; +import static io.anuke.mindustry.Vars.maps; public class Map implements Comparable{ /** Whether this is a custom map. */ @@ -50,7 +50,7 @@ public class Map implements Comparable{ } public Map(StringMap tags){ - this(Min.customMapDirectory.child(tags.get("name", "unknown")), 0, 0, tags, true); + this(Vars.customMapDirectory.child(tags.get("name", "unknown")), 0, 0, tags, true); } public int getHightScore(){ @@ -58,12 +58,12 @@ public class Map implements Comparable{ } public FileHandle previewFile(){ - return Min.mapPreviewDirectory.child(file.nameWithoutExtension() + ".png"); + return Vars.mapPreviewDirectory.child(file.nameWithoutExtension() + ".png"); } public void setHighScore(int score){ Core.settings.put("hiscore" + file.nameWithoutExtension(), score); - Min.data.modified(); + Vars.data.modified(); } /** Returns the result of applying this map's rules to the specified gamemode.*/ @@ -84,7 +84,7 @@ public class Map implements Comparable{ public Rules rules(Rules base){ try{ Rules result = JsonIO.read(Rules.class, base, tags.get("rules", "{}")); - if(result.spawns.isEmpty()) result.spawns = Min.defaultWaves.get(); + if(result.spawns.isEmpty()) result.spawns = Vars.defaultWaves.get(); return result; }catch(Exception e){ //error reading rules. ignore? diff --git a/core/src/io/anuke/mindustry/maps/MapPreviewLoader.java b/core/src/io/anuke/mindustry/maps/MapPreviewLoader.java new file mode 100644 index 0000000000..b4116c0038 --- /dev/null +++ b/core/src/io/anuke/mindustry/maps/MapPreviewLoader.java @@ -0,0 +1,33 @@ +package io.anuke.mindustry.maps; + +import io.anuke.arc.assets.*; +import io.anuke.arc.assets.loaders.*; +import io.anuke.arc.assets.loaders.resolvers.*; +import io.anuke.arc.files.*; +import io.anuke.mindustry.*; + +public class MapPreviewLoader extends TextureLoader{ + + public MapPreviewLoader(){ + super(new AbsoluteFileHandleResolver()); + } + + @Override + public void loadAsync(AssetManager manager, String fileName, FileHandle file, TextureParameter parameter){ + try{ + super.loadAsync(manager, fileName, file.sibling(file.nameWithoutExtension()), parameter); + }catch(Exception e){ + e.printStackTrace(); + MapPreviewParameter param = (MapPreviewParameter)parameter; + Vars.maps.createNewPreview(param.map); + } + } + + public static class MapPreviewParameter extends TextureParameter{ + public Map map; + + public MapPreviewParameter(Map map){ + this.map = map; + } + } +} diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index 80a543136b..b57602e63a 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -12,13 +12,14 @@ import io.anuke.arc.util.serialization.*; import io.anuke.mindustry.content.*; import io.anuke.mindustry.game.*; import io.anuke.mindustry.io.*; +import io.anuke.mindustry.maps.MapPreviewLoader.*; import io.anuke.mindustry.maps.filters.*; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.storage.*; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Maps{ /** List of all built-in maps. Filenames only. */ @@ -298,30 +299,32 @@ public class Maps{ } public void loadPreviews(){ + Core.assets.setLoader(Texture.class, "." + mapExtension, new MapPreviewLoader()); for(Map map : maps){ - try{ - //try to load preview - if(map.previewFile().exists()){ - try{ - Core.assets.load(new AssetDescriptor<>(map.previewFile(), Texture.class)).loaded = t -> map.texture = (Texture)t; - //if it works, keep going - continue; - }catch(Exception e){ - Log.err("Found cached preview, but failed to load it!"); - e.printStackTrace(); - } - } - //if it's here, then the preview failed to load or doesn't exist, make it - //this has to be done synchronously! - Pixmap pix = MapIO.generatePreview(map); - Core.app.post(() -> map.texture = new Texture(pix)); - executor.submit(() -> map.previewFile().writePNG(pix)); - }catch(IOException e){ - e.printStackTrace(); + //try to load preview + if(map.previewFile().exists()){ + //this may fail, but calls createNewPreview + Core.assets.load(new AssetDescriptor<>(map.previewFile().path() + "." + mapExtension, Texture.class, new MapPreviewParameter(map))).loaded = t -> map.texture = (Texture)t; + }else{ + createNewPreview(map); } } } + public void createNewPreview(Map map){ + try{ + //if it's here, then the preview failed to load or doesn't exist, make it + //this has to be done synchronously! + Pixmap pix = MapIO.generatePreview(map); + Core.app.post(() -> map.texture = new Texture(pix)); + executor.submit(() -> map.previewFile().writePNG(pix)); + }catch(IOException e){ + Log.err("Failed to generate preview!", e); + //TODO create error texture instead? + map.texture = new Texture("zones/nomap.png"); + } + } + /** Find a new filename to put a map to. */ private FileHandle findFile(){ //find a map name that isn't used. diff --git a/core/src/io/anuke/mindustry/maps/filters/FilterOption.java b/core/src/io/anuke/mindustry/maps/filters/FilterOption.java index af7b41fc80..7874f85c5b 100644 --- a/core/src/io/anuke/mindustry/maps/filters/FilterOption.java +++ b/core/src/io/anuke/mindustry/maps/filters/FilterOption.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.Block.*; import io.anuke.mindustry.world.blocks.*; -import static io.anuke.mindustry.Min.updateEditorOnChange; +import static io.anuke.mindustry.Vars.updateEditorOnChange; public abstract class FilterOption{ public static final Predicate floorsOnly = b -> (b instanceof Floor && !(b instanceof OverlayFloor)) && Core.atlas.isFound(b.icon(Icon.full)); @@ -81,7 +81,7 @@ public abstract class FilterOption{ FloatingDialog dialog = new FloatingDialog(""); dialog.setFillParent(false); int i = 0; - for(Block block : Min.content.blocks()){ + for(Block block : Vars.content.blocks()){ if(!filter.test(block)) continue; dialog.cont.addImage(block == Blocks.air ? Core.atlas.find("icon-none-small") : block.icon(Icon.medium)).size(8 * 4).pad(3).get().clicked(() -> { diff --git a/core/src/io/anuke/mindustry/maps/filters/MedianFilter.java b/core/src/io/anuke/mindustry/maps/filters/MedianFilter.java index 7053d0fa3f..9cc4606d20 100644 --- a/core/src/io/anuke/mindustry/maps/filters/MedianFilter.java +++ b/core/src/io/anuke/mindustry/maps/filters/MedianFilter.java @@ -5,7 +5,7 @@ import io.anuke.arc.math.*; import io.anuke.mindustry.maps.filters.FilterOption.*; import io.anuke.mindustry.world.*; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class MedianFilter extends GenerateFilter{ float radius = 2; diff --git a/core/src/io/anuke/mindustry/maps/filters/OreMedianFilter.java b/core/src/io/anuke/mindustry/maps/filters/OreMedianFilter.java index b12cc2e47d..8080b49699 100644 --- a/core/src/io/anuke/mindustry/maps/filters/OreMedianFilter.java +++ b/core/src/io/anuke/mindustry/maps/filters/OreMedianFilter.java @@ -52,6 +52,6 @@ public class OreMedianFilter extends GenerateFilter{ int index = Math.min((int)(blocks.size * percentile), blocks.size - 1); int overlay = blocks.get(index); - in.ore = Min.content.block(overlay); + in.ore = Vars.content.block(overlay); } } diff --git a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java index 950cea480e..08092e7fdb 100644 --- a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java @@ -12,7 +12,7 @@ import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.blocks.storage.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class MapGenerator extends Generator{ private Map map; diff --git a/core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java b/core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java index 6a24dcd7bb..23591e86df 100644 --- a/core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java @@ -6,7 +6,7 @@ import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.world; +import static io.anuke.mindustry.Vars.world; public abstract class RandomGenerator extends Generator{ protected Block floor; diff --git a/core/src/io/anuke/mindustry/net/Administration.java b/core/src/io/anuke/mindustry/net/Administration.java index c003a6a28b..c1edec3ecb 100644 --- a/core/src/io/anuke/mindustry/net/Administration.java +++ b/core/src/io/anuke/mindustry/net/Administration.java @@ -4,7 +4,7 @@ import io.anuke.annotations.Annotations.Serialize; import io.anuke.arc.Core; import io.anuke.arc.collection.*; -import static io.anuke.mindustry.Min.headless; +import static io.anuke.mindustry.Vars.headless; public class Administration{ diff --git a/core/src/io/anuke/mindustry/net/CrashSender.java b/core/src/io/anuke/mindustry/net/CrashSender.java index 1144a9302e..cea92225a2 100644 --- a/core/src/io/anuke/mindustry/net/CrashSender.java +++ b/core/src/io/anuke/mindustry/net/CrashSender.java @@ -50,8 +50,8 @@ public class CrashSender{ } try{ - File file = new File(OS.getAppDataDirectoryString(Min.appName), "crashes/crash-report-" + DateTimeFormatter.ofPattern("MM_dd_yyyy_HH_mm_ss").format(LocalDateTime.now()) + ".txt"); - Files.createDirectories(Paths.get(OS.getAppDataDirectoryString(Min.appName), "crashes")); + File file = new File(OS.getAppDataDirectoryString(Vars.appName), "crashes/crash-report-" + DateTimeFormatter.ofPattern("MM_dd_yyyy_HH_mm_ss").format(LocalDateTime.now()) + ".txt"); + Files.createDirectories(Paths.get(OS.getAppDataDirectoryString(Vars.appName), "crashes")); Files.write(file.toPath(), parseException(exception).getBytes()); writeListener.accept(file); @@ -95,8 +95,8 @@ public class CrashSender{ ex(() -> value.addChild("build", new JsonValue(Version.build))); ex(() -> value.addChild("net", new JsonValue(fn))); ex(() -> value.addChild("server", new JsonValue(fs))); - ex(() -> value.addChild("players", new JsonValue(Min.playerGroup.size()))); - ex(() -> value.addChild("state", new JsonValue(Min.state.getState().name()))); + ex(() -> value.addChild("players", new JsonValue(Vars.playerGroup.size()))); + ex(() -> value.addChild("state", new JsonValue(Vars.state.getState().name()))); ex(() -> value.addChild("os", new JsonValue(System.getProperty("os.name") + "x" + (OS.is64Bit ? "64" : "32")))); ex(() -> value.addChild("trace", new JsonValue(parseException(exception)))); @@ -104,7 +104,7 @@ public class CrashSender{ Log.info("Sending crash report."); //post to crash report URL - httpPost(Min.crashReportURL, value.toJson(OutputType.json), r -> { + httpPost(Vars.crashReportURL, value.toJson(OutputType.json), r -> { Log.info("Crash sent successfully."); sent[0] = true; System.exit(1); diff --git a/core/src/io/anuke/mindustry/net/Net.java b/core/src/io/anuke/mindustry/net/Net.java index 4f9a57e4f3..006def1fcf 100644 --- a/core/src/io/anuke/mindustry/net/Net.java +++ b/core/src/io/anuke/mindustry/net/Net.java @@ -14,7 +14,7 @@ import net.jpountz.lz4.*; import java.io.*; import java.nio.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; @SuppressWarnings("unchecked") public class Net{ diff --git a/core/src/io/anuke/mindustry/net/NetworkIO.java b/core/src/io/anuke/mindustry/net/NetworkIO.java index 80e2ccec65..1729f3d4e4 100644 --- a/core/src/io/anuke/mindustry/net/NetworkIO.java +++ b/core/src/io/anuke/mindustry/net/NetworkIO.java @@ -13,7 +13,7 @@ import java.io.*; import java.nio.ByteBuffer; import java.util.Arrays; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class NetworkIO{ diff --git a/core/src/io/anuke/mindustry/type/Item.java b/core/src/io/anuke/mindustry/type/Item.java index 268e1e564e..19ca42e7b4 100644 --- a/core/src/io/anuke/mindustry/type/Item.java +++ b/core/src/io/anuke/mindustry/type/Item.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.game.*; import io.anuke.mindustry.ui.*; import io.anuke.mindustry.world.blocks.*; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class Item extends UnlockableContent implements Comparable{ public final Color color; diff --git a/core/src/io/anuke/mindustry/type/Loadout.java b/core/src/io/anuke/mindustry/type/Loadout.java index 215a668cdb..05339c3d1b 100644 --- a/core/src/io/anuke/mindustry/type/Loadout.java +++ b/core/src/io/anuke/mindustry/type/Loadout.java @@ -6,7 +6,7 @@ import io.anuke.mindustry.game.*; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.storage.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Loadout extends Content{ private final Array outArray = new Array<>(); diff --git a/core/src/io/anuke/mindustry/type/Weapon.java b/core/src/io/anuke/mindustry/type/Weapon.java index cf0913e311..4e77b2bc4a 100644 --- a/core/src/io/anuke/mindustry/type/Weapon.java +++ b/core/src/io/anuke/mindustry/type/Weapon.java @@ -73,7 +73,7 @@ public class Weapon{ if(player == null) return; //clients do not see their own shoot events: they are simulated completely clientside to prevent laggy visuals //messing with the firerate or any other stats does not affect the server (take that, script kiddies!) - if(Net.client() && player == Min.player){ + if(Net.client() && player == Vars.player){ return; } diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/io/anuke/mindustry/type/Zone.java index df78c770aa..e395af1295 100644 --- a/core/src/io/anuke/mindustry/type/Zone.java +++ b/core/src/io/anuke/mindustry/type/Zone.java @@ -17,7 +17,7 @@ import io.anuke.mindustry.world.*; import java.util.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Zone extends UnlockableContent{ public final Generator generator; diff --git a/core/src/io/anuke/mindustry/ui/ItemsDisplay.java b/core/src/io/anuke/mindustry/ui/ItemsDisplay.java index 7b5c481cb6..97208b54ab 100644 --- a/core/src/io/anuke/mindustry/ui/ItemsDisplay.java +++ b/core/src/io/anuke/mindustry/ui/ItemsDisplay.java @@ -10,8 +10,8 @@ import io.anuke.mindustry.type.ItemType; import java.text.NumberFormat; import java.util.Locale; -import static io.anuke.mindustry.Min.content; -import static io.anuke.mindustry.Min.data; +import static io.anuke.mindustry.Vars.content; +import static io.anuke.mindustry.Vars.data; /** Displays a list of items, e.g. launched items.*/ public class ItemsDisplay extends Table{ diff --git a/core/src/io/anuke/mindustry/ui/Minimap.java b/core/src/io/anuke/mindustry/ui/Minimap.java index 4c63098ad5..4dfc419a70 100644 --- a/core/src/io/anuke/mindustry/ui/Minimap.java +++ b/core/src/io/anuke/mindustry/ui/Minimap.java @@ -7,7 +7,7 @@ import io.anuke.arc.scene.Element; import io.anuke.arc.scene.event.*; import io.anuke.arc.scene.ui.layout.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Minimap extends Table{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java index 415f0b16cf..bac51b97bf 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java @@ -10,7 +10,7 @@ import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.ui.Links; import io.anuke.mindustry.ui.Links.LinkEntry; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class AboutDialog extends FloatingDialog{ private Array contributors = new Array<>(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java index 85898e007a..2462ec9fe4 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java @@ -4,7 +4,7 @@ import io.anuke.arc.scene.ui.ScrollPane; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.mindustry.net.Administration.PlayerInfo; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class AdminsDialog extends FloatingDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java index 8252a987bc..9caad501c1 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java @@ -4,7 +4,7 @@ import io.anuke.arc.scene.ui.ScrollPane; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.mindustry.net.Administration.PlayerInfo; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class BansDialog extends FloatingDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java index 64e34fab26..3ea7f3d3d4 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java @@ -7,8 +7,8 @@ import io.anuke.arc.scene.ui.Dialog; import io.anuke.arc.scene.ui.ImageButton; import io.anuke.arc.scene.ui.layout.Table; -import static io.anuke.mindustry.Min.player; -import static io.anuke.mindustry.Min.playerColors; +import static io.anuke.mindustry.Vars.player; +import static io.anuke.mindustry.Vars.playerColors; public class ColorPickDialog extends Dialog{ private Consumer cons; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java index 657a42767d..c63c845248 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java @@ -4,7 +4,7 @@ import io.anuke.arc.Core; import io.anuke.arc.input.KeyCode; import io.anuke.arc.scene.ui.*; import io.anuke.arc.util.Align; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.graphics.Pal; public class ControlsDialog extends KeybindDialog{ @@ -17,7 +17,7 @@ public class ControlsDialog extends KeybindDialog{ titleTable.row(); titleTable.add(new Image("whiteui")) .growX().height(3f).pad(4f).get().setColor(Pal.accent); - if(Min.mobile){ + if(Vars.mobile){ cont.row(); cont.add("$keybinds.mobile") .center().growX().wrap().get().setAlignment(Align.center); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java index 617eb2f792..9fd1f6f847 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java @@ -41,7 +41,7 @@ public class CustomGameDialog extends FloatingDialog{ int i = 0; maps.defaults().width(170).fillY().top().pad(4f); - for(Map map : Min.maps.all()){ + for(Map map : Vars.maps.all()){ if(i % maxwidth == 0){ maps.row(); @@ -82,7 +82,7 @@ public class CustomGameDialog extends FloatingDialog{ i++; } - if(Min.maps.all().size == 0){ + if(Vars.maps.all().size == 0){ maps.add("$maps.none").pad(50); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java index 2efa61890a..e306ecdea3 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java @@ -12,7 +12,7 @@ import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.ItemType; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class CustomRulesDialog extends FloatingDialog{ private Table main; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java index bc8327661f..1f5dfc8679 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java @@ -8,7 +8,7 @@ import io.anuke.arc.scene.event.HandCursorListener; import io.anuke.arc.scene.ui.*; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.util.Time; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.Content; import io.anuke.mindustry.game.UnlockableContent; @@ -33,7 +33,7 @@ public class DatabaseDialog extends FloatingDialog{ table.margin(20); ScrollPane pane = new ScrollPane(table); - Array[] allContent = Min.content.getContentMap(); + Array[] allContent = Vars.content.getContentMap(); for(int j = 0; j < allContent.length; j++){ ContentType type = ContentType.values()[j]; @@ -56,16 +56,16 @@ public class DatabaseDialog extends FloatingDialog{ UnlockableContent unlock = (UnlockableContent)array.get(i); Image image = unlocked(unlock) ? new Image(unlock.getContentIcon()) : new Image("icon-locked", Pal.gray); - list.add(image).size(unlocked(unlock) ? 8*4 : Min.iconsize).pad(3); + list.add(image).size(unlocked(unlock) ? 8*4 : Vars.iconsize).pad(3); ClickListener listener = new ClickListener(); image.addListener(listener); - if(!Min.mobile && unlocked(unlock)){ + if(!Vars.mobile && unlocked(unlock)){ image.addListener(new HandCursorListener()); image.update(() -> image.getColor().lerp(!listener.isOver() ? Color.LIGHT_GRAY : Color.WHITE, 0.4f * Time.delta())); } if(unlocked(unlock)){ - image.clicked(() -> Min.ui.content.show(unlock)); + image.clicked(() -> Vars.ui.content.show(unlock)); image.addListener(new Tooltip(t -> t.background("button").add(unlock.localizedName()))); } @@ -81,6 +81,6 @@ public class DatabaseDialog extends FloatingDialog{ } boolean unlocked(UnlockableContent content){ - return (!Min.world.isZone() && !Min.state.is(State.menu)) || content.unlocked(); + return (!Vars.world.isZone() && !Vars.state.is(State.menu)) || content.unlocked(); } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java index 0f881aef75..166697e4ff 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java @@ -26,7 +26,7 @@ import io.anuke.mindustry.type.Zone.*; import io.anuke.mindustry.ui.*; import io.anuke.mindustry.ui.TreeLayout.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class DeployDialog extends FloatingDialog{ private final float nodeSize = UnitScl.dp.scl(230f); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java index fe0ef1ec63..c7c343c6c6 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java @@ -5,7 +5,7 @@ import io.anuke.arc.graphics.Color; import io.anuke.arc.scene.ui.Dialog; import io.anuke.mindustry.graphics.Pal; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class DiscordDialog extends Dialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java index 197233b1f7..e81c312347 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java @@ -16,7 +16,7 @@ import io.anuke.mindustry.core.Platform; import java.util.Arrays; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class FileChooser extends FloatingDialog{ private static final FileHandle homeDirectory = Core.files.absolute(OS.isMac ? OS.getProperty("user.home") + "/Downloads/" : Core.files.getExternalStoragePath()); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java index 8546fcee21..54a502627e 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java @@ -10,7 +10,7 @@ import io.anuke.mindustry.gen.*; import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.net.Net; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class FloatingDialog extends Dialog{ private boolean wasPaused; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java index 4ce2befb90..3078c01d56 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.game.*; import io.anuke.mindustry.type.*; import io.anuke.mindustry.type.Item.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class GameOverDialog extends FloatingDialog{ private Team winner; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java index ae2c49bc80..82ddf20e6b 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java @@ -5,13 +5,13 @@ import io.anuke.arc.graphics.Color; import io.anuke.arc.scene.ui.ImageButton; import io.anuke.arc.util.Strings; import io.anuke.arc.util.Time; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.net.Net; import java.io.IOException; -import static io.anuke.mindustry.Min.player; -import static io.anuke.mindustry.Min.ui; +import static io.anuke.mindustry.Vars.player; +import static io.anuke.mindustry.Vars.ui; public class HostDialog extends FloatingDialog{ float w = 300; @@ -53,7 +53,7 @@ public class HostDialog extends FloatingDialog{ ui.loadfrag.show("$hosting"); Time.runTask(5f, () -> { try{ - Net.host(Min.port); + Net.host(Vars.port); player.isAdmin = true; }catch(IOException e){ ui.showError(Core.bundle.format("server.error", Strings.parseException(e, true))); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java index 67269ee48e..7b1486c270 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java @@ -16,7 +16,7 @@ import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.*; import io.anuke.mindustry.net.Packets.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class JoinDialog extends FloatingDialog{ Array servers = new Array<>(); @@ -317,7 +317,7 @@ public class JoinDialog extends FloatingDialog{ Time.runTask(2f, () -> { logic.reset(); Net.reset(); - Min.netClient.beginConnecting(); + Vars.netClient.beginConnecting(); Net.connect(ip, port, () -> { hide(); add.hide(); @@ -357,16 +357,16 @@ public class JoinDialog extends FloatingDialog{ this.port = Integer.parseInt(ip.substring(idx + 1)); }catch(Exception e){ this.ip = ip; - this.port = Min.port; + this.port = Vars.port; } }else{ this.ip = ip; - this.port = Min.port; + this.port = Vars.port; } } String displayIP(){ - return ip + (port != Min.port ? ":" + port : ""); + return ip + (port != Vars.port ? ":" + port : ""); } public Server(){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java index 808e0d2072..f1a1a15ac2 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java @@ -8,8 +8,8 @@ import io.anuke.arc.util.Strings; import java.util.Locale; -import static io.anuke.mindustry.Min.locales; -import static io.anuke.mindustry.Min.ui; +import static io.anuke.mindustry.Vars.locales; +import static io.anuke.mindustry.Vars.ui; public class LanguageDialog extends FloatingDialog{ private Locale lastLocale; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java index 7be80c9138..043bc7585a 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java @@ -16,7 +16,7 @@ import io.anuke.mindustry.net.Net; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class LoadDialog extends FloatingDialog{ ScrollPane pane; @@ -95,7 +95,7 @@ public class LoadDialog extends FloatingDialog{ }, false, FileChooser.saveFiles); }else{ try{ - FileHandle file = Core.files.local("save-" + slot.getName() + "." + Min.saveExtension); + FileHandle file = Core.files.local("save-" + slot.getName() + "." + Vars.saveExtension); slot.exportFile(file); Platform.instance.shareFile(file); }catch(Exception e){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LoadoutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LoadoutDialog.java index d7385c3359..eb05a7502f 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LoadoutDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LoadoutDialog.java @@ -8,7 +8,7 @@ import io.anuke.arc.scene.ui.*; import io.anuke.arc.scene.ui.layout.*; import io.anuke.mindustry.type.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class LoadoutDialog extends FloatingDialog{ private Runnable hider; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java index 2fbf192eff..26ed6bf1c9 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.game.*; import io.anuke.mindustry.maps.*; import io.anuke.mindustry.ui.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class MapPlayDialog extends FloatingDialog{ CustomRulesDialog dialog = new CustomRulesDialog(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java index 9468b83a38..2cf501c17d 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java @@ -15,7 +15,7 @@ import io.anuke.mindustry.io.*; import io.anuke.mindustry.maps.*; import io.anuke.mindustry.ui.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class MapsDialog extends FloatingDialog{ private FloatingDialog dialog; @@ -123,7 +123,7 @@ public class MapsDialog extends FloatingDialog{ float mapsize = 200f; int i = 0; - for(Map map : Min.maps.all()){ + for(Map map : Vars.maps.all()){ if(i % maxwidth == 0){ maps.row(); @@ -143,7 +143,7 @@ public class MapsDialog extends FloatingDialog{ i++; } - if(Min.maps.all().size == 0){ + if(Vars.maps.all().size == 0){ maps.add("$maps.none"); } @@ -189,7 +189,7 @@ public class MapsDialog extends FloatingDialog{ table.addImageTextButton("$editor.openin", "icon-load-map-small", iconsizesmall, () -> { try{ - Min.ui.editor.beginEditMap(map.file); + Vars.ui.editor.beginEditMap(map.file); dialog.hide(); hide(); }catch(Exception e){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java index 6b9306df18..41790548a8 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java @@ -8,7 +8,7 @@ import io.anuke.arc.scene.event.InputEvent; import io.anuke.arc.scene.event.InputListener; import io.anuke.arc.scene.ui.layout.UnitScl; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class MinimapDialog extends FloatingDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java index 9973cc56c3..62b4f24a79 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java @@ -5,7 +5,7 @@ import io.anuke.arc.input.KeyCode; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.net.Net; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class PausedDialog extends FloatingDialog{ private SaveDialog save = new SaveDialog(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java index 13fa5bf96a..1a3966b4d1 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java @@ -6,7 +6,7 @@ import io.anuke.arc.util.Time; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.Saves.SaveSlot; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class SaveDialog extends LoadDialog{ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 4cdba77b96..c3ddaeb1fa 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -19,7 +19,7 @@ import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.net.Net; import static io.anuke.arc.Core.bundle; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class SettingsMenuDialog extends SettingsDialog{ public SettingsTable graphics; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java index 76c985549b..4af3810a1f 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java @@ -22,7 +22,7 @@ import io.anuke.mindustry.ui.*; import io.anuke.mindustry.ui.TreeLayout.*; import io.anuke.mindustry.world.Block.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class TechTreeDialog extends FloatingDialog{ private final float nodeSize = UnitScl.dp.scl(60f); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java index 5c8de837d8..55de763cc2 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java @@ -12,7 +12,7 @@ import io.anuke.mindustry.type.Zone.*; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.Block.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class ZoneInfoDialog extends FloatingDialog{ private LoadoutDialog loadout = new LoadoutDialog(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java index 52ef3a4b28..b41dd8ea40 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class BlockConfigFragment extends Fragment{ private Table table = new Table(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java index 6872115f29..4a8b96707e 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java @@ -27,7 +27,7 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item.Icon; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class BlockInventoryFragment extends Fragment{ private final static float holdWithdraw = 20f; diff --git a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java index 45c119691e..ca8aab453a 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java @@ -14,15 +14,15 @@ import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.scene.ui.layout.UnitScl; import io.anuke.arc.util.Align; import io.anuke.arc.util.Time; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.input.Binding; import io.anuke.mindustry.net.Net; import static io.anuke.arc.Core.input; import static io.anuke.arc.Core.scene; -import static io.anuke.mindustry.Min.maxTextLength; -import static io.anuke.mindustry.Min.mobile; +import static io.anuke.mindustry.Vars.maxTextLength; +import static io.anuke.mindustry.Vars.mobile; public class ChatFragment extends Table{ private final static int messagesShown = 10; @@ -104,7 +104,7 @@ public class ChatFragment extends Table{ fieldlabel.setStyle(fieldlabel.getStyle()); chatfield = new TextField("", new TextField.TextFieldStyle(scene.skin.get(TextField.TextFieldStyle.class))); - chatfield.setFilter((field, c) -> field.getText().length() < Min.maxTextLength); + chatfield.setFilter((field, c) -> field.getText().length() < Vars.maxTextLength); chatfield.getStyle().background = null; chatfield.getStyle().font = scene.skin.getFont("chat"); chatfield.getStyle().fontColor = Color.WHITE; @@ -114,7 +114,7 @@ public class ChatFragment extends Table{ add(chatfield).padBottom(offsety).padLeft(offsetx).growX().padRight(offsetx).height(28); - if(Min.mobile){ + if(Vars.mobile){ marginBottom(105f); marginRight(240f); } diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 91b467a29e..d3cc688ebb 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -29,7 +29,7 @@ import io.anuke.mindustry.type.*; import io.anuke.mindustry.ui.*; import io.anuke.mindustry.ui.dialogs.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class HudFragment extends Fragment{ public final PlacementFragment blockfrag = new PlacementFragment(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index bba9187fd5..6f6dd9ec8f 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -19,7 +19,7 @@ import io.anuke.mindustry.game.Version; import io.anuke.mindustry.graphics.MenuRenderer; import io.anuke.mindustry.ui.MobileButton; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class MenuFragment extends Fragment{ private Texture logo = new Texture("sprites/logo.png"); diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index 7954838c61..0652803f82 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -18,7 +18,7 @@ import io.anuke.mindustry.type.*; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.Block.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class PlacementFragment extends Fragment{ final int rowWidth = 4; diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java index 18477838be..2d617d7f34 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java @@ -17,7 +17,7 @@ import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.NetConnection; import io.anuke.mindustry.net.Packets.AdminAction; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class PlayerListFragment extends Fragment{ private boolean visible = false; diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 108c92f0c0..189911c66f 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -35,7 +35,7 @@ import io.anuke.mindustry.world.meta.*; import java.util.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Block extends BlockStorage{ public static final int crackRegions = 8, maxCrackSize = 5; diff --git a/core/src/io/anuke/mindustry/world/BlockStorage.java b/core/src/io/anuke/mindustry/world/BlockStorage.java index 32d03f0fab..358e2d6ddc 100644 --- a/core/src/io/anuke/mindustry/world/BlockStorage.java +++ b/core/src/io/anuke/mindustry/world/BlockStorage.java @@ -4,7 +4,7 @@ import io.anuke.arc.collection.Array; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Time; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Effects; import io.anuke.mindustry.entities.effect.Puddle; @@ -222,8 +222,8 @@ public abstract class BlockStorage extends UnlockableContent{ if(todump == null){ - for(int ii = 0; ii < Min.content.items().size; ii++){ - Item item = Min.content.item(ii); + for(int ii = 0; ii < Vars.content.items().size; ii++){ + Item item = Vars.content.item(ii); if(other.getTeam() == tile.getTeam() && entity.items.has(item) && other.block().acceptItem(item, other, in) && canDump(tile, other, item)){ other.block().handleItem(item, other, in); diff --git a/core/src/io/anuke/mindustry/world/Build.java b/core/src/io/anuke/mindustry/world/Build.java index 8340de4f90..a97a310922 100644 --- a/core/src/io/anuke/mindustry/world/Build.java +++ b/core/src/io/anuke/mindustry/world/Build.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.game.Team; import io.anuke.mindustry.world.blocks.BuildBlock; import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Build{ private static final Rectangle rect = new Rectangle(); diff --git a/core/src/io/anuke/mindustry/world/DirectionalItemBuffer.java b/core/src/io/anuke/mindustry/world/DirectionalItemBuffer.java index 10b185ff1d..2f5d7538b6 100644 --- a/core/src/io/anuke/mindustry/world/DirectionalItemBuffer.java +++ b/core/src/io/anuke/mindustry/world/DirectionalItemBuffer.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.type.Item; import java.io.*; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class DirectionalItemBuffer{ public final long[][] buffers; diff --git a/core/src/io/anuke/mindustry/world/Edges.java b/core/src/io/anuke/mindustry/world/Edges.java index 381bec2696..dc9586aca0 100644 --- a/core/src/io/anuke/mindustry/world/Edges.java +++ b/core/src/io/anuke/mindustry/world/Edges.java @@ -5,7 +5,7 @@ import io.anuke.arc.math.geom.*; import java.util.Arrays; -import static io.anuke.mindustry.Min.world; +import static io.anuke.mindustry.Vars.world; public class Edges{ private static final int maxSize = 11; diff --git a/core/src/io/anuke/mindustry/world/ItemBuffer.java b/core/src/io/anuke/mindustry/world/ItemBuffer.java index fa0bbd1818..3c80a87f54 100644 --- a/core/src/io/anuke/mindustry/world/ItemBuffer.java +++ b/core/src/io/anuke/mindustry/world/ItemBuffer.java @@ -6,7 +6,7 @@ import io.anuke.mindustry.type.Item; import java.io.*; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class ItemBuffer{ private final float speed; diff --git a/core/src/io/anuke/mindustry/world/StaticTree.java b/core/src/io/anuke/mindustry/world/StaticTree.java index b970c44e2b..be6b6c4c76 100644 --- a/core/src/io/anuke/mindustry/world/StaticTree.java +++ b/core/src/io/anuke/mindustry/world/StaticTree.java @@ -5,7 +5,7 @@ import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.util.Tmp; import io.anuke.mindustry.world.blocks.StaticWall; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class StaticTree extends StaticWall{ diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index f4e2ede637..e67be3d812 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -12,7 +12,7 @@ import io.anuke.mindustry.type.*; import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.modules.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Tile implements Position, TargetTrait{ /** Tile traversal cost. */ diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java index 09add5f423..a1a7f153c8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java @@ -24,7 +24,7 @@ import io.anuke.mindustry.world.modules.ItemModule; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class BuildBlock extends Block{ public static final int maxSize = 9; diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java index e612fd7f20..dbd0218a4f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Floor.java +++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java @@ -15,7 +15,7 @@ import io.anuke.mindustry.type.*; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class Floor extends Block{ /** number of different variant regions to use */ diff --git a/core/src/io/anuke/mindustry/world/blocks/ItemSelection.java b/core/src/io/anuke/mindustry/world/blocks/ItemSelection.java index f8480046d3..2f42b7ab68 100644 --- a/core/src/io/anuke/mindustry/world/blocks/ItemSelection.java +++ b/core/src/io/anuke/mindustry/world/blocks/ItemSelection.java @@ -10,7 +10,7 @@ import io.anuke.arc.scene.ui.layout.Table; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item.Icon; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class ItemSelection{ diff --git a/core/src/io/anuke/mindustry/world/blocks/StaticWall.java b/core/src/io/anuke/mindustry/world/blocks/StaticWall.java index 69f9d0f692..0797fee02a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/StaticWall.java +++ b/core/src/io/anuke/mindustry/world/blocks/StaticWall.java @@ -6,7 +6,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.mindustry.graphics.CacheLayer; import io.anuke.mindustry.world.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class StaticWall extends Rock{ TextureRegion large; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java b/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java index fb85ec7047..2b6125fb10 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java @@ -11,7 +11,7 @@ import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class DeflectorWall extends Wall{ public static final float hitTime = 10f; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java index 5de3b1f397..db08a2bdf4 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java @@ -15,7 +15,7 @@ import io.anuke.mindustry.world.*; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Door extends Wall{ protected final Rectangle rect = new Rectangle(); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java index 5f29feb61d..c0a857f625 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java @@ -21,7 +21,7 @@ import io.anuke.mindustry.world.meta.StatUnit; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class ForceProjector extends Block{ protected int timerUse = timers++; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java index 8f0341d129..7721d95510 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java @@ -15,7 +15,7 @@ import io.anuke.mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class MendProjector extends Block{ private static Color color = Color.valueOf("84f491"); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java index fab9cbabb3..5ff8c2ba94 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class OverdriveProjector extends Block{ private static Color color = Color.valueOf("feb380"); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java index 2415e6c561..62b2770407 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; /** * Artillery turrets have special shooting calculations done to hit targets. diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java index 5f188ce389..d746227559 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java @@ -5,7 +5,7 @@ import io.anuke.arc.util.Time; import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class BurstTurret extends ItemTurret{ protected float burstSpacing = 5; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java index c0603a2b0e..aa7151df98 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class ChargeTurret extends PowerTurret{ diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java index 849c2f73ef..b425dd689d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java @@ -11,7 +11,7 @@ import io.anuke.mindustry.world.consumers.*; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class CooledTurret extends Turret{ /** How much reload is lowered by for each unit of liquid of heat capacity. */ diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java index dc8d2f45b6..2067bd285a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java @@ -6,7 +6,7 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class DoubleTurret extends ItemTurret{ protected float shotWidth = 2f; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java index e4d14b5a05..f0d3737d8d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java @@ -17,7 +17,7 @@ import io.anuke.mindustry.world.meta.values.*; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class ItemTurret extends CooledTurret{ protected int maxAmmo = 30; @@ -164,7 +164,7 @@ public class ItemTurret extends CooledTurret{ super.read(stream, revision); byte amount = stream.readByte(); for(int i = 0; i < amount; i++){ - Item item = Min.content.item(stream.readByte()); + Item item = Vars.content.item(stream.readByte()); short a = stream.readShort(); totalAmmo += a; ammo.add(new ItemEntry(item, a)); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java index b4efc2db3b..3c283e877b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.world.consumers.*; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class LaserTurret extends PowerTurret{ protected float firingMoveFract = 0.25f; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java index b0a4886d43..4cbcb4a680 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -12,7 +12,7 @@ import io.anuke.mindustry.world.consumers.*; import io.anuke.mindustry.world.meta.*; import io.anuke.mindustry.world.meta.values.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public abstract class LiquidTurret extends Turret{ protected ObjectMap ammo = new ObjectMap<>(); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java index 27eb735589..3873f2177d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java @@ -25,7 +25,7 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.*; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public abstract class Turret extends Block{ protected static final int targetInterval = 20; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java index 6916652535..de6c98d3e3 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java @@ -16,7 +16,7 @@ import io.anuke.mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Conveyor extends Block{ private static final float itemSpace = 0.4f; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java index 0a77a11046..3889a8078a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ExtendingItemBridge.java @@ -5,7 +5,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Geometry; import io.anuke.mindustry.world.Tile; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class ExtendingItemBridge extends ItemBridge{ diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java index 2102077370..f5a86d0d1d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java @@ -22,8 +22,8 @@ import io.anuke.mindustry.world.meta.BlockGroup; import java.io.*; -import static io.anuke.mindustry.Min.tilesize; -import static io.anuke.mindustry.Min.world; +import static io.anuke.mindustry.Vars.tilesize; +import static io.anuke.mindustry.Vars.world; public class ItemBridge extends Block{ protected int timerTransport = timers++; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java index 33842cdaba..febd11f5d7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java @@ -14,7 +14,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class Junction extends Block{ protected float speed = 26; //frames taken to go through this junction diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidBridge.java index 84a7d0dd25..cf3c96cdab 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidBridge.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.meta.BlockGroup; -import static io.anuke.mindustry.Min.world; +import static io.anuke.mindustry.Vars.world; public class LiquidBridge extends ItemBridge{ diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidExtendingBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidExtendingBridge.java index a85a859358..9d75b6f849 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidExtendingBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidExtendingBridge.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.world.Pos; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockGroup; -import static io.anuke.mindustry.Min.world; +import static io.anuke.mindustry.Vars.world; public class LiquidExtendingBridge extends ExtendingItemBridge{ diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java index 76fd301cb0..461f294c8f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java @@ -20,7 +20,7 @@ import io.anuke.mindustry.world.*; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class MassDriver extends Block{ protected float range; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java index 63c8a2a056..a7497079f4 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java @@ -14,7 +14,7 @@ import io.anuke.mindustry.world.meta.BlockGroup; import java.io.*; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class Sorter extends Block{ private static Item lastItem; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java index 2bf8026448..a910a20920 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java @@ -16,7 +16,7 @@ import io.anuke.mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class ImpactReactor extends PowerGenerator{ protected int timerUse = timers++; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java index f63b014e42..a57f165907 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java @@ -17,8 +17,8 @@ import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import static io.anuke.mindustry.Min.content; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.content; +import static io.anuke.mindustry.Vars.tilesize; /** * Power generation block which can use items, liquids or both as input sources for power production. diff --git a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java index 961ac3bfdc..0fd084f9b9 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java @@ -22,7 +22,7 @@ import io.anuke.mindustry.world.meta.StatUnit; import java.io.*; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class NuclearReactor extends PowerGenerator{ protected final int timerFuel = timers++; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java index 4bbc8e4dc6..358fb27a43 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java @@ -18,7 +18,7 @@ import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.meta.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class PowerNode extends PowerBlock{ protected ObjectSet graphs = new ObjectSet<>(); diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java index 18f35d10b9..a4f5216322 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java @@ -17,7 +17,7 @@ import io.anuke.mindustry.ui.*; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.meta.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class Drill extends Block{ protected final static float hardnessDrillMultiplier = 50f; diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java index 2b4ff73d0d..3a6cc3cabe 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java +++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java @@ -16,7 +16,7 @@ import io.anuke.mindustry.world.meta.BlockGroup; import java.io.*; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class ItemSource extends Block{ private static Item lastItem; diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java index 2191ceb037..cc6c7b1a98 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java +++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java @@ -18,8 +18,8 @@ import io.anuke.mindustry.world.Tile; import java.io.*; -import static io.anuke.mindustry.Min.content; -import static io.anuke.mindustry.Min.control; +import static io.anuke.mindustry.Vars.content; +import static io.anuke.mindustry.Vars.control; public class LiquidSource extends Block{ private static Liquid lastLiquid; diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java index e41b443cd1..b4f02e1fc0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java @@ -18,7 +18,7 @@ import io.anuke.mindustry.type.*; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.meta.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class CoreBlock extends StorageBlock{ protected Mech mech = Mechs.starter; @@ -113,10 +113,10 @@ public class CoreBlock extends StorageBlock{ Draw.color(Pal.accent); Lines.lineAngleCenter( - tile.drawx() + Mathf.sin(entity.time, 6f, Min.tilesize / 3f * size), + tile.drawx() + Mathf.sin(entity.time, 6f, Vars.tilesize / 3f * size), tile.drawy(), 90, - size * Min.tilesize / 2f); + size * Vars.tilesize / 2f); Draw.reset(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java b/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java index 170d5100cb..71c16f5393 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java @@ -4,7 +4,7 @@ import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Effects; import io.anuke.mindustry.entities.type.TileEntity; @@ -15,8 +15,8 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import static io.anuke.mindustry.Min.data; -import static io.anuke.mindustry.Min.world; +import static io.anuke.mindustry.Vars.data; +import static io.anuke.mindustry.Vars.world; public class LaunchPad extends StorageBlock{ protected final int timerLaunch = timers++; @@ -72,7 +72,7 @@ public class LaunchPad extends StorageBlock{ TileEntity entity = tile.entity; if(entity.cons.valid() && world.isZone() && entity.items.total() >= itemCapacity && entity.timer.get(timerLaunch, launchTime / entity.timeScale)){ - for(Item item : Min.content.items()){ + for(Item item : Vars.content.items()){ Effects.effect(Fx.padlaunch, tile); data.addItem(item, entity.items.get(item)); entity.items.set(item, 0); diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java b/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java index 3d67325f8b..2d237a3f39 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.world.blocks.ItemSelection; import java.io.*; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class Unloader extends Block{ protected float speed = 1f; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java index b11e44c5cc..9b93edaec3 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java @@ -21,7 +21,7 @@ import io.anuke.mindustry.world.meta.*; import java.io.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class CommandCenter extends Block{ protected TextureRegion[] commandRegions = new TextureRegion[UnitCommand.all.length]; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java index a36895b894..dbb67e8d7f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java @@ -7,7 +7,7 @@ import io.anuke.arc.graphics.g2d.*; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.util.Time; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.content.Mechs; import io.anuke.mindustry.entities.Effects; @@ -25,8 +25,8 @@ import io.anuke.mindustry.world.meta.StatUnit; import java.io.*; -import static io.anuke.mindustry.Min.mobile; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.mobile; +import static io.anuke.mindustry.Vars.tilesize; public class MechPad extends Block{ protected Mech mech; @@ -130,10 +130,10 @@ public class MechPad extends Block{ Draw.color(Pal.accent); Lines.lineAngleCenter( - tile.drawx() + Mathf.sin(entity.time, 6f, Min.tilesize / 3f * size), + tile.drawx() + Mathf.sin(entity.time, 6f, Vars.tilesize / 3f * size), tile.drawy(), 90, - size * Min.tilesize / 2f + 1f); + size * Vars.tilesize / 2f + 1f); Draw.reset(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java index 23ceaf7df7..39e7fbae19 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java @@ -6,7 +6,7 @@ import io.anuke.arc.Core; import io.anuke.arc.collection.EnumSet; import io.anuke.arc.graphics.g2d.*; import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Effects; import io.anuke.mindustry.entities.type.*; @@ -67,7 +67,7 @@ public class UnitFactory extends Block{ public void init(){ super.init(); - capacities = new int[Min.content.items().size]; + capacities = new int[Vars.content.items().size]; if(consumes.has(ConsumeType.item)){ ConsumeItems cons = consumes.get(ConsumeType.item); for(ItemStack stack : cons.items){ @@ -137,10 +137,10 @@ public class UnitFactory extends Block{ Draw.alpha(entity.speedScl); Lines.lineAngleCenter( - tile.drawx() + Mathf.sin(entity.time, 20f, Min.tilesize / 2f * size - 2f), + tile.drawx() + Mathf.sin(entity.time, 20f, Vars.tilesize / 2f * size - 2f), tile.drawy(), 90, - size * Min.tilesize - 4f); + size * Vars.tilesize - 4f); Draw.reset(); @@ -156,8 +156,8 @@ public class UnitFactory extends Block{ } if(entity.cons.valid() || tile.isEnemyCheat()){ - entity.time += entity.delta() * entity.speedScl * Min.state.rules.unitBuildSpeedMultiplier * entity.power.satisfaction; - entity.buildTime += entity.delta() * entity.power.satisfaction * Min.state.rules.unitBuildSpeedMultiplier; + entity.time += entity.delta() * entity.speedScl * Vars.state.rules.unitBuildSpeedMultiplier * entity.power.satisfaction; + entity.buildTime += entity.delta() * entity.power.satisfaction * Vars.state.rules.unitBuildSpeedMultiplier; entity.speedScl = Mathf.lerpDelta(entity.speedScl, 1f, 0.05f); }else{ entity.speedScl = Mathf.lerpDelta(entity.speedScl, 0f, 0.05f); diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java index a2874d5567..81503037f0 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java @@ -11,7 +11,7 @@ import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.values.ItemFilterValue; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class ConsumeItemFilter extends Consume{ public final Predicate filter; diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java index 5f82964879..04c2efd3ae 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java @@ -12,7 +12,7 @@ import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.values.LiquidFilterValue; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class ConsumeLiquidFilter extends ConsumeLiquidBase{ public final Predicate filter; diff --git a/core/src/io/anuke/mindustry/world/consumers/Consumers.java b/core/src/io/anuke/mindustry/world/consumers/Consumers.java index b574b9798a..6839237d2b 100644 --- a/core/src/io/anuke/mindustry/world/consumers/Consumers.java +++ b/core/src/io/anuke/mindustry/world/consumers/Consumers.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.world.consumers; import io.anuke.arc.function.Predicate; import io.anuke.arc.util.Structs; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.type.*; import io.anuke.mindustry.world.blocks.power.ConditionalConsumePower; @@ -12,8 +12,8 @@ public class Consumers{ private Consume[] map = new Consume[ConsumeType.values().length]; private Consume[] results, optionalResults; - public final boolean[] itemFilters = new boolean[Min.content.items().size]; - public final boolean[] liquidfilters = new boolean[Min.content.liquids().size]; + public final boolean[] itemFilters = new boolean[Vars.content.items().size]; + public final boolean[] liquidfilters = new boolean[Vars.content.liquids().size]; public void init(){ results = Structs.filter(Consume.class, map, m -> m != null); diff --git a/core/src/io/anuke/mindustry/world/meta/values/AmmoListValue.java b/core/src/io/anuke/mindustry/world/meta/values/AmmoListValue.java index 7d76bce08e..5b05b47881 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/AmmoListValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/AmmoListValue.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item.Icon; import io.anuke.mindustry.world.meta.StatValue; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.tilesize; public class AmmoListValue implements StatValue{ private final ObjectMap map; diff --git a/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java b/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java index cc79d74fd1..8bb1ecb6a0 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/ItemFilterValue.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.ui.ItemDisplay; import io.anuke.mindustry.world.meta.StatValue; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class ItemFilterValue implements StatValue{ private final Predicate filter; diff --git a/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java b/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java index c4a567bf27..e30c2b0ba5 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.ui.LiquidDisplay; import io.anuke.mindustry.world.meta.StatValue; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class LiquidFilterValue implements StatValue{ private final Predicate filter; diff --git a/core/src/io/anuke/mindustry/world/modules/ItemModule.java b/core/src/io/anuke/mindustry/world/modules/ItemModule.java index 05f52fd803..7e146d8ab0 100644 --- a/core/src/io/anuke/mindustry/world/modules/ItemModule.java +++ b/core/src/io/anuke/mindustry/world/modules/ItemModule.java @@ -6,7 +6,7 @@ import io.anuke.mindustry.type.ItemStack; import java.io.*; import java.util.Arrays; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class ItemModule extends BlockModule{ private int[] items = new int[content.items().size]; diff --git a/core/src/io/anuke/mindustry/world/modules/LiquidModule.java b/core/src/io/anuke/mindustry/world/modules/LiquidModule.java index c35eddca12..3eb50fc8e4 100644 --- a/core/src/io/anuke/mindustry/world/modules/LiquidModule.java +++ b/core/src/io/anuke/mindustry/world/modules/LiquidModule.java @@ -5,7 +5,7 @@ import io.anuke.mindustry.type.Liquid; import java.io.*; import java.util.Arrays; -import static io.anuke.mindustry.Min.content; +import static io.anuke.mindustry.Vars.content; public class LiquidModule extends BlockModule{ private float[] liquids = new float[content.liquids().size]; diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java index 3ece41b972..6ae3809a12 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java @@ -15,7 +15,7 @@ import io.anuke.mindustry.ui.dialogs.*; import java.net.*; import java.util.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class DesktopPlatform extends Platform{ diff --git a/ios/src/io/anuke/mindustry/IOSLauncher.java b/ios/src/io/anuke/mindustry/IOSLauncher.java index 0bd22cd946..575e7f7e47 100644 --- a/ios/src/io/anuke/mindustry/IOSLauncher.java +++ b/ios/src/io/anuke/mindustry/IOSLauncher.java @@ -18,7 +18,7 @@ import java.io.*; import java.util.*; import java.util.zip.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; import static org.robovm.apple.foundation.NSPathUtilities.getDocumentsDirectory; public class IOSLauncher extends IOSApplication.Delegate{ diff --git a/net/src/io/anuke/mindustry/net/ArcNetClient.java b/net/src/io/anuke/mindustry/net/ArcNetClient.java index 601bb413fc..ffb40bb38f 100644 --- a/net/src/io/anuke/mindustry/net/ArcNetClient.java +++ b/net/src/io/anuke/mindustry/net/ArcNetClient.java @@ -14,7 +14,7 @@ import java.net.*; import java.nio.*; import java.nio.channels.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class ArcNetClient implements ClientProvider{ final Client client; diff --git a/net/src/io/anuke/mindustry/net/ArcNetServer.java b/net/src/io/anuke/mindustry/net/ArcNetServer.java index aef0aa356c..73002c51b2 100644 --- a/net/src/io/anuke/mindustry/net/ArcNetServer.java +++ b/net/src/io/anuke/mindustry/net/ArcNetServer.java @@ -12,7 +12,7 @@ import java.nio.*; import java.nio.channels.*; import java.util.concurrent.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class ArcNetServer implements ServerProvider{ final Server server; diff --git a/server/src/io/anuke/mindustry/server/MindustryServer.java b/server/src/io/anuke/mindustry/server/MindustryServer.java index 15c1e2f67b..735072de5e 100644 --- a/server/src/io/anuke/mindustry/server/MindustryServer.java +++ b/server/src/io/anuke/mindustry/server/MindustryServer.java @@ -4,7 +4,7 @@ import io.anuke.arc.*; import io.anuke.mindustry.*; import io.anuke.mindustry.core.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class MindustryServer implements ApplicationListener{ private String[] args; @@ -17,7 +17,7 @@ public class MindustryServer implements ApplicationListener{ public void init(){ Core.settings.setDataDirectory(Core.files.local("config")); loadLocales = false; - Min.init(); + Vars.init(); headless = true; diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index 1c49899306..647103df7e 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -30,7 +30,7 @@ import java.time.format.DateTimeFormatter; import java.util.Scanner; import static io.anuke.arc.util.Log.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; public class ServerControl implements ApplicationListener{ private static final int roundExtraTime = 12; diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java index 4cd19a369b..131eb45bb4 100644 --- a/tests/src/test/java/ApplicationTests.java +++ b/tests/src/test/java/ApplicationTests.java @@ -4,7 +4,7 @@ import io.anuke.arc.backends.headless.HeadlessApplication; import io.anuke.arc.math.geom.Point2; import io.anuke.arc.util.Log; import io.anuke.arc.util.Time; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.*; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.*; @@ -20,7 +20,7 @@ import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.BlockPart; import org.junit.jupiter.api.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; import static org.junit.jupiter.api.Assertions.*; public class ApplicationTests{ @@ -41,7 +41,7 @@ public class ApplicationTests{ ApplicationCore core = new ApplicationCore(){ @Override public void setup(){ - Min.init(); + Vars.init(); headless = true; diff --git a/tests/src/test/java/ZoneTests.java b/tests/src/test/java/ZoneTests.java index c32d65767a..f86cf714a2 100644 --- a/tests/src/test/java/ZoneTests.java +++ b/tests/src/test/java/ZoneTests.java @@ -10,7 +10,7 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.storage.CoreBlock; import org.junit.jupiter.api.*; -import static io.anuke.mindustry.Min.*; +import static io.anuke.mindustry.Vars.*; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.DynamicTest.dynamicTest; diff --git a/tests/src/test/java/power/PowerTestFixture.java b/tests/src/test/java/power/PowerTestFixture.java index e986705126..86fac4ce9f 100644 --- a/tests/src/test/java/power/PowerTestFixture.java +++ b/tests/src/test/java/power/PowerTestFixture.java @@ -4,7 +4,7 @@ import io.anuke.arc.Core; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Log; import io.anuke.arc.util.Time; -import io.anuke.mindustry.Min; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.core.ContentLoader; import io.anuke.mindustry.world.Block; @@ -31,8 +31,8 @@ public class PowerTestFixture{ @BeforeAll static void initializeDependencies(){ Core.graphics = new FakeGraphics(); - Min.content = new ContentLoader(); - Min.content.createContent(); + Vars.content = new ContentLoader(); + Vars.content.createContent(); Log.setUseColors(false); Time.setDeltaProvider(() -> 0.5f); } diff --git a/tools/src/io/anuke/mindustry/Generators.java b/tools/src/io/anuke/mindustry/Generators.java index 538ca11779..4012013965 100644 --- a/tools/src/io/anuke/mindustry/Generators.java +++ b/tools/src/io/anuke/mindustry/Generators.java @@ -16,8 +16,8 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import static io.anuke.mindustry.Min.content; -import static io.anuke.mindustry.Min.tilesize; +import static io.anuke.mindustry.Vars.content; +import static io.anuke.mindustry.Vars.tilesize; public class Generators{ diff --git a/tools/src/io/anuke/mindustry/ImagePacker.java b/tools/src/io/anuke/mindustry/ImagePacker.java index 05e068eb38..200da5c602 100644 --- a/tools/src/io/anuke/mindustry/ImagePacker.java +++ b/tools/src/io/anuke/mindustry/ImagePacker.java @@ -19,11 +19,11 @@ public class ImagePacker{ static ObjectMap imageCache = new ObjectMap<>(); public static void main(String[] args) throws IOException{ - Min.headless = true; + Vars.headless = true; Log.setLogger(new NoopLogHandler()); - Min.content = new ContentLoader(); - Min.content.createContent(); + Vars.content = new ContentLoader(); + Vars.content.createContent(); Log.setLogger(new LogHandler()); Files.walk(Paths.get("../../../assets-raw/sprites_out")).forEach(path -> { diff --git a/tools/src/io/anuke/mindustry/Upscaler.java b/tools/src/io/anuke/mindustry/Upscaler.java index c515191911..c2fcdb608a 100644 --- a/tools/src/io/anuke/mindustry/Upscaler.java +++ b/tools/src/io/anuke/mindustry/Upscaler.java @@ -9,9 +9,9 @@ import io.anuke.arc.util.*; public class Upscaler{ static Res[] resolutions = { - new Res(Min.iconsizesmall, "-small"), - new Res(Min.iconsizemed, "-med"), - new Res(Min.iconsize, ""), + new Res(Vars.iconsizesmall, "-small"), + new Res(Vars.iconsizemed, "-med"), + new Res(Vars.iconsize, ""), }; public static void main(String[] args){