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

Functional loading

Browse Source
This commit is contained in:
Anuken
2019-08-27 09:27:09 -04:00
parent 76cd7ba8d1
commit 1e80bdf19f
209 changed files with 383 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/io/anuke/mindustry/AndroidLauncher.java
View File

@@ -28,7 +28,7 @@ import io.anuke.mindustry.ui.dialogs.FileChooser;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class AndroidLauncher extends AndroidApplication{ public class AndroidLauncher extends AndroidApplication{
public static final int PERMISSION_REQUEST_CODE = 1; public static final int PERMISSION_REQUEST_CODE = 1;

2
annotations/src/main/java/io/anuke/annotations/RemoteWriteGenerator.java
View File

@@ -106,7 +106,7 @@ public class RemoteWriteGenerator{
for(VariableElement var : elem.getParameters()){ for(VariableElement var : elem.getParameters()){
//special case: calling local-only methods uses the local player //special case: calling local-only methods uses the local player
if(index == 0 && methodEntry.where == Loc.client){ if(index == 0 && methodEntry.where == Loc.client){
results.append("io.anuke.mindustry.Min.player"); results.append("io.anuke.mindustry.Vars.player");
}else{ }else{
results.append(var.getSimpleName()); results.append(var.getSimpleName());
} }

4
core/src/io/anuke/mindustry/ClientLauncher.java
View File

@@ -13,7 +13,7 @@ import io.anuke.mindustry.gen.*;
import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.graphics.*;
import static io.anuke.arc.Core.*; import static io.anuke.arc.Core.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class ClientLauncher extends ApplicationCore{ public class ClientLauncher extends ApplicationCore{
private long lastTime; private long lastTime;
@@ -32,7 +32,7 @@ public class ClientLauncher extends ApplicationCore{
assets = new AssetManager(); assets = new AssetManager();
atlas = TextureAtlas.blankAtlas(); 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; assets.load(new AssetDescriptor<>("sprites/sprites.atlas", TextureAtlas.class)).loaded = t -> atlas = (TextureAtlas)t;
UI.loadSystemCursors(); UI.loadSystemCursors();

2
core/src/io/anuke/mindustry/Min.java → core/src/io/anuke/mindustry/Vars.java
View File

@@ -25,7 +25,7 @@ import java.nio.charset.*;
import java.util.*; import java.util.*;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public class Min implements Loadable{ public class Vars implements Loadable{
/** Whether to load locales.*/ /** Whether to load locales.*/
public static boolean loadLocales = true; public static boolean loadLocales = true;
/** IO buffer size. */ /** IO buffer size. */

2
core/src/io/anuke/mindustry/ai/BlockIndexer.java
View File

@@ -15,7 +15,7 @@ import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.blocks.*;
import io.anuke.mindustry.world.meta.*; 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. */ /** Class used for indexing special target blocks for AI. */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")

2
core/src/io/anuke/mindustry/ai/Pathfinder.java
View File

@@ -16,7 +16,7 @@ import io.anuke.mindustry.world.Pos;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.meta.BlockFlag; import io.anuke.mindustry.world.meta.BlockFlag;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class Pathfinder{ public class Pathfinder{
private static final long maxUpdate = Time.millisToNanos(4); private static final long maxUpdate = Time.millisToNanos(4);

2
core/src/io/anuke/mindustry/ai/WaveSpawner.java
View File

@@ -17,7 +17,7 @@ import io.anuke.mindustry.game.SpawnGroup;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class WaveSpawner{ public class WaveSpawner{
private static final float margin = 40f, coreMargin = tilesize * 3; //how far away from the edge flying units spawn private static final float margin = 40f, coreMargin = tilesize * 3; //how far away from the edge flying units spawn

6
core/src/io/anuke/mindustry/content/Blocks.java
View File

@@ -26,7 +26,7 @@ import io.anuke.mindustry.world.consumers.*;
import io.anuke.mindustry.world.meta.*; import io.anuke.mindustry.world.meta.*;
import io.anuke.mindustry.world.modules.*; import io.anuke.mindustry.world.modules.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class Blocks implements ContentList{ public class Blocks implements ContentList{
public static Block public static Block
@@ -515,10 +515,10 @@ public class Blocks implements ContentList{
Draw.alpha(entity.warmup); Draw.alpha(entity.warmup);
Lines.lineAngleCenter( 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(), tile.drawy(),
90, 90,
size * Min.tilesize / 2f); size * Vars.tilesize / 2f);
Draw.reset(); Draw.reset();

2
core/src/io/anuke/mindustry/content/Bullets.java
View File

@@ -12,7 +12,7 @@ import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.*; 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 class Bullets implements ContentList{
public static BulletType public static BulletType

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

@@ -15,7 +15,7 @@ import io.anuke.mindustry.graphics.Drawf;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.Item.Icon; 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 class Fx implements ContentList{
public static Effect public static Effect

2
core/src/io/anuke/mindustry/core/ContentLoader.java
View File

@@ -44,7 +44,7 @@ public class ContentLoader{
public ContentLoader(){ public ContentLoader(){
//hack; allows content to initialize itself by referring to Mins.content, even though it hasn't been fully constructed yet //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(); createContent();
} }

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

@@ -28,7 +28,7 @@ import io.anuke.mindustry.world.blocks.storage.*;
import java.io.*; import java.io.*;
import static io.anuke.arc.Core.*; import static io.anuke.arc.Core.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
/** /**
* Control module. * Control module.

4
core/src/io/anuke/mindustry/core/GameState.java
View File

@@ -7,8 +7,8 @@ import io.anuke.mindustry.game.EventType.StateChangeEvent;
import io.anuke.mindustry.game.*; import io.anuke.mindustry.game.*;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import static io.anuke.mindustry.Min.unitGroups; import static io.anuke.mindustry.Vars.unitGroups;
import static io.anuke.mindustry.Min.waveTeam; import static io.anuke.mindustry.Vars.waveTeam;
public class GameState{ public class GameState{
/** Current wave number, can be anything in non-wave modes. */ /** Current wave number, can be anything in non-wave modes. */

2
core/src/io/anuke/mindustry/core/Logic.java
View File

@@ -24,7 +24,7 @@ import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.BuildBlock; import io.anuke.mindustry.world.blocks.BuildBlock;
import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity; import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
/** /**
* Logic module. * Logic module.

12
core/src/io/anuke/mindustry/core/NetClient.java
View File

@@ -9,7 +9,7 @@ import io.anuke.arc.math.RandomXS128;
import io.anuke.arc.util.*; import io.anuke.arc.util.*;
import io.anuke.arc.util.io.ReusableByteInStream; import io.anuke.arc.util.io.ReusableByteInStream;
import io.anuke.arc.util.serialization.Base64Coder; 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.core.GameState.State;
import io.anuke.mindustry.entities.Entities; import io.anuke.mindustry.entities.Entities;
import io.anuke.mindustry.entities.EntityGroup; import io.anuke.mindustry.entities.EntityGroup;
@@ -33,7 +33,7 @@ import java.io.DataInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.zip.InflaterInputStream; import java.util.zip.InflaterInputStream;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class NetClient implements ApplicationListener{ public class NetClient implements ApplicationListener{
private final static float dataTimeout = 60 * 18; private final static float dataTimeout = 60 * 18;
@@ -126,8 +126,8 @@ public class NetClient implements ApplicationListener{
//called on all clients //called on all clients
@Remote(called = Loc.server, targets = Loc.server, variants = Variant.both) @Remote(called = Loc.server, targets = Loc.server, variants = Variant.both)
public static void sendMessage(String message, String sender, Player playersender){ public static void sendMessage(String message, String sender, Player playersender){
if(Min.ui != null){ if(Vars.ui != null){
Min.ui.chatfrag.addMessage(message, sender); Vars.ui.chatfrag.addMessage(message, sender);
} }
if(playersender != null){ 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 //equivalent to above method but there's no sender and no console log
@Remote(called = Loc.server, targets = Loc.server) @Remote(called = Loc.server, targets = Loc.server)
public static void sendMessage(String message){ public static void sendMessage(String message){
if(Min.ui != null){ if(Vars.ui != null){
Min.ui.chatfrag.addMessage(message, null); Vars.ui.chatfrag.addMessage(message, null);
} }
} }

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

@@ -36,7 +36,7 @@ import java.io.*;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.zip.DeflaterOutputStream; import java.util.zip.DeflaterOutputStream;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class NetServer implements ApplicationListener{ public class NetServer implements ApplicationListener{
public final static int maxSnapshotSize = 430; public final static int maxSnapshotSize = 430;

2
core/src/io/anuke/mindustry/core/Platform.java
View File

@@ -9,7 +9,7 @@ import io.anuke.arc.math.RandomXS128;
import io.anuke.arc.scene.ui.TextField; import io.anuke.arc.scene.ui.TextField;
import io.anuke.arc.util.serialization.Base64Coder; 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{ public abstract class Platform{
/** Each separate game platform should set this instance to their own implementation. */ /** Each separate game platform should set this instance to their own implementation. */

2
core/src/io/anuke/mindustry/core/Renderer.java
View File

@@ -25,7 +25,7 @@ import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.world.blocks.defense.ForceProjector.*; import io.anuke.mindustry.world.blocks.defense.ForceProjector.*;
import static io.anuke.arc.Core.*; import static io.anuke.arc.Core.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class Renderer implements ApplicationListener{ public class Renderer implements ApplicationListener{
public final BlockRenderer blocks = new BlockRenderer(); public final BlockRenderer blocks = new BlockRenderer();

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

@@ -34,7 +34,7 @@ import io.anuke.mindustry.ui.dialogs.*;
import io.anuke.mindustry.ui.fragments.*; import io.anuke.mindustry.ui.fragments.*;
import static io.anuke.arc.scene.actions.Actions.*; 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{ public class UI implements ApplicationListener, Loadable{
private Skin skin; private Skin skin;

2
core/src/io/anuke/mindustry/core/World.java
View File

@@ -20,7 +20,7 @@ import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.blocks.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class World{ public class World{
public final Context context = new Context(); public final Context context = new Context();

2
core/src/io/anuke/mindustry/editor/DrawOperation.java
View File

@@ -8,7 +8,7 @@ import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Floor; import io.anuke.mindustry.world.blocks.Floor;
import static io.anuke.mindustry.Min.content; import static io.anuke.mindustry.Vars.content;
public class DrawOperation{ public class DrawOperation{
private MapEditor editor; private MapEditor editor;

4
core/src/io/anuke/mindustry/editor/EditorTile.java
View File

@@ -10,8 +10,8 @@ import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.blocks.*;
import io.anuke.mindustry.world.modules.*; import io.anuke.mindustry.world.modules.*;
import static io.anuke.mindustry.Min.state; import static io.anuke.mindustry.Vars.state;
import static io.anuke.mindustry.Min.ui; import static io.anuke.mindustry.Vars.ui;
//TODO somehow remove or replace this class with a more flexible solution //TODO somehow remove or replace this class with a more flexible solution
public class EditorTile extends Tile{ public class EditorTile extends Tile{

4
core/src/io/anuke/mindustry/editor/EditorTool.java
View File

@@ -5,7 +5,7 @@ import io.anuke.arc.function.*;
import io.anuke.arc.math.Mathf; import io.anuke.arc.math.Mathf;
import io.anuke.arc.math.geom.Bresenham2; import io.anuke.arc.math.geom.Bresenham2;
import io.anuke.arc.util.Structs; 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.content.Blocks;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
@@ -80,7 +80,7 @@ public enum EditorTool{
editor.drawCircle(x, y, tile -> { editor.drawCircle(x, y, tile -> {
if(mode == -1){ if(mode == -1){
//erase block //erase block
Min.world.removeBlock(tile); Vars.world.removeBlock(tile);
}else if(mode == 0){ }else if(mode == 0){
//erase ore //erase ore
tile.clearOverlay(); tile.clearOverlay();

2
core/src/io/anuke/mindustry/editor/MapEditor.java
View File

@@ -16,7 +16,7 @@ import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.BlockPart; 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 class MapEditor{
public static final int[] brushSizes = {1, 2, 3, 4, 5, 9, 15, 20}; public static final int[] brushSizes = {1, 2, 3, 4, 5, 9, 15, 20};

4
core/src/io/anuke/mindustry/editor/MapEditorDialog.java
View File

@@ -30,7 +30,7 @@ import io.anuke.mindustry.world.Block.*;
import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.blocks.*;
import io.anuke.mindustry.world.blocks.storage.*; 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 class MapEditorDialog extends Dialog implements Disposable{
public final MapEditor editor; public final MapEditor editor;
@@ -670,7 +670,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
int i = 0; int i = 0;
blocksOut.clear(); blocksOut.clear();
blocksOut.addAll(Min.content.blocks()); blocksOut.addAll(Vars.content.blocks());
blocksOut.sort((b1, b2) -> { blocksOut.sort((b1, b2) -> {
int core = -Boolean.compare(b1 instanceof CoreBlock, b2 instanceof CoreBlock); int core = -Boolean.compare(b1 instanceof CoreBlock, b2 instanceof CoreBlock);
if(core != 0) return core; if(core != 0) return core;

2
core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
View File

@@ -21,7 +21,7 @@ import io.anuke.mindustry.ui.dialogs.*;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.blocks.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public class MapGenerateDialog extends FloatingDialog{ public class MapGenerateDialog extends FloatingDialog{

4
core/src/io/anuke/mindustry/editor/MapInfoDialog.java
View File

@@ -59,7 +59,7 @@ public class MapInfoDialog extends FloatingDialog{
t.row(); t.row();
t.add("$editor.rules").padRight(8).left(); 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.row();
t.add("$editor.waves").padRight(8).left(); t.add("$editor.waves").padRight(8).left();
@@ -68,7 +68,7 @@ public class MapInfoDialog extends FloatingDialog{
t.row(); t.row();
t.add("$editor.generation").padRight(8).left(); t.add("$editor.generation").padRight(8).left();
t.addButton("$edit", 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))) filters -> editor.getTags().put("genfilters", JsonIO.write(filters)))
).left().width(200f); ).left().width(200f);

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

@@ -8,7 +8,7 @@ import io.anuke.mindustry.maps.*;
import io.anuke.mindustry.ui.*; import io.anuke.mindustry.ui.*;
import io.anuke.mindustry.ui.dialogs.*; 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{ public class MapLoadDialog extends FloatingDialog{
private Map selected = null; private Map selected = null;

2
core/src/io/anuke/mindustry/editor/MapRenderer.java
View File

@@ -16,7 +16,7 @@ import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.BlockPart; 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{ public class MapRenderer implements Disposable{
private static final int chunkSize = 64; private static final int chunkSize = 64;

6
core/src/io/anuke/mindustry/editor/MapSaveDialog.java
View File

@@ -7,7 +7,7 @@ import io.anuke.mindustry.core.*;
import io.anuke.mindustry.maps.*; import io.anuke.mindustry.maps.*;
import io.anuke.mindustry.ui.dialogs.*; 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{ public class MapSaveDialog extends FloatingDialog{
private TextField field; private TextField field;
@@ -23,7 +23,7 @@ public class MapSaveDialog extends FloatingDialog{
shown(() -> { shown(() -> {
cont.clear(); cont.clear();
cont.label(() -> { cont.label(() -> {
Map map = Min.maps.byName(field.getText()); Map map = Vars.maps.byName(field.getText());
if(map != null){ if(map != null){
if(map.custom){ if(map.custom){
return "$editor.overwrite"; return "$editor.overwrite";
@@ -68,7 +68,7 @@ public class MapSaveDialog extends FloatingDialog{
if(field.getText().isEmpty()){ if(field.getText().isEmpty()){
return true; return true;
} }
Map map = Min.maps.byName(field.getText()); Map map = Vars.maps.byName(field.getText());
return map != null && !map.custom; return map != null && !map.custom;
} }
} }

4
core/src/io/anuke/mindustry/editor/MapView.java
View File

@@ -17,8 +17,8 @@ import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.input.Binding; import io.anuke.mindustry.input.Binding;
import io.anuke.mindustry.ui.GridImage; import io.anuke.mindustry.ui.GridImage;
import static io.anuke.mindustry.Min.mobile; import static io.anuke.mindustry.Vars.mobile;
import static io.anuke.mindustry.Min.ui; import static io.anuke.mindustry.Vars.ui;
public class MapView extends Element implements GestureListener{ public class MapView extends Element implements GestureListener{
private MapEditor editor; private MapEditor editor;

6
core/src/io/anuke/mindustry/editor/WaveInfoDialog.java
View File

@@ -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.TextField.TextFieldFilter;
import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.*; import io.anuke.arc.util.*;
import io.anuke.mindustry.Min; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.content.*; import io.anuke.mindustry.content.*;
import io.anuke.mindustry.game.*; import io.anuke.mindustry.game.*;
import io.anuke.mindustry.graphics.Pal; 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.type.*;
import io.anuke.mindustry.ui.dialogs.FloatingDialog; 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; import static io.anuke.mindustry.game.SpawnGroup.never;
public class WaveInfoDialog extends FloatingDialog{ 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.add((wave + 1) + "").color(Pal.accent).center().colspan(2).get().setAlignment(Align.center, Align.center);
table.row(); 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){ for(SpawnGroup spawn : groups){
spawned[spawn.type.id] += spawn.getUnitsSpawned(wave); spawned[spawn.type.id] += spawn.getUnitsSpawned(wave);

2
core/src/io/anuke/mindustry/entities/Damage.java
View File

@@ -21,7 +21,7 @@ import io.anuke.mindustry.gen.PropCell;
import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.world.Tile; 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. */ /** Utility class for damaging in an area. */
public class Damage{ public class Damage{

2
core/src/io/anuke/mindustry/entities/Entities.java
View File

@@ -10,7 +10,7 @@ import io.anuke.arc.math.geom.Rectangle;
import io.anuke.mindustry.entities.traits.DrawTrait; import io.anuke.mindustry.entities.traits.DrawTrait;
import io.anuke.mindustry.entities.traits.Entity; import io.anuke.mindustry.entities.traits.Entity;
import static io.anuke.mindustry.Min.collisions; import static io.anuke.mindustry.Vars.collisions;
public class Entities{ public class Entities{
private static final Array<EntityGroup<?>> groupArray = new Array<>(); private static final Array<EntityGroup<?>> groupArray = new Array<>();

4
core/src/io/anuke/mindustry/entities/EntityCollisions.java
View File

@@ -7,8 +7,8 @@ import io.anuke.mindustry.entities.traits.Entity;
import io.anuke.mindustry.entities.traits.SolidTrait; import io.anuke.mindustry.entities.traits.SolidTrait;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Min.tilesize; import static io.anuke.mindustry.Vars.tilesize;
import static io.anuke.mindustry.Min.world; import static io.anuke.mindustry.Vars.world;
public class EntityCollisions{ public class EntityCollisions{
//range for tile collision scanning //range for tile collision scanning

2
core/src/io/anuke/mindustry/entities/Units.java
View File

@@ -11,7 +11,7 @@ import io.anuke.mindustry.entities.type.*;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.world.Tile; 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.*/ /** Utility class for unit and team interactions.*/
public class Units{ public class Units{

4
core/src/io/anuke/mindustry/entities/bullet/Bullet.java
View File

@@ -16,8 +16,8 @@ import io.anuke.mindustry.entities.type.Unit;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Min.bulletGroup; import static io.anuke.mindustry.Vars.bulletGroup;
import static io.anuke.mindustry.Min.world; import static io.anuke.mindustry.Vars.world;
public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Poolable, DrawTrait, VelocityTrait, TimeTrait, TeamTrait, AbsorbTrait{ public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Poolable, DrawTrait, VelocityTrait, TimeTrait, TeamTrait, AbsorbTrait{
public Interval timer = new Interval(3); public Interval timer = new Interval(3);

2
core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java
View File

@@ -9,7 +9,7 @@ import io.anuke.mindustry.entities.effect.*;
import io.anuke.mindustry.type.*; import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class LiquidBulletType extends BulletType{ public class LiquidBulletType extends BulletType{
Liquid liquid; Liquid liquid;

2
core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java
View File

@@ -9,7 +9,7 @@ import io.anuke.mindustry.entities.Effects;
import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData; 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{ public class MassDriverBolt extends BulletType{

2
core/src/io/anuke/mindustry/entities/effect/Decal.java
View File

@@ -8,7 +8,7 @@ import io.anuke.mindustry.entities.traits.BelowLiquidTrait;
import io.anuke.mindustry.entities.traits.DrawTrait; import io.anuke.mindustry.entities.traits.DrawTrait;
import io.anuke.mindustry.graphics.Pal; 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. * Class for creating block rubble on the ground.

2
core/src/io/anuke/mindustry/entities/effect/Fire.java
View File

@@ -17,7 +17,7 @@ import io.anuke.mindustry.world.*;
import java.io.*; import java.io.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class Fire extends TimedEntity implements SaveTrait, SyncTrait{ public class Fire extends TimedEntity implements SaveTrait, SyncTrait{
private static final IntMap<Fire> map = new IntMap<>(); private static final IntMap<Fire> map = new IntMap<>();

4
core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java
View File

@@ -2,7 +2,7 @@ package io.anuke.mindustry.entities.effect;
import io.anuke.arc.math.Mathf; import io.anuke.arc.math.Mathf;
import io.anuke.arc.util.Time; 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;
import io.anuke.mindustry.entities.Effects.Effect; import io.anuke.mindustry.entities.Effects.Effect;
import io.anuke.mindustry.entities.Effects.EffectRenderer; import io.anuke.mindustry.entities.Effects.EffectRenderer;
@@ -27,7 +27,7 @@ public class GroundEffectEntity extends EffectEntity{
if(!once && time >= lifetime()){ if(!once && time >= lifetime()){
once = true; once = true;
time = 0f; time = 0f;
Tile tile = Min.world.tileWorld(x, y); Tile tile = Vars.world.tileWorld(x, y);
if(tile != null && tile.floor().isLiquid){ if(tile != null && tile.floor().isLiquid){
remove(); remove();
} }

2
core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java
View File

@@ -17,7 +17,7 @@ import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.Tile; 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{ public class ItemTransfer extends TimedEntity implements DrawTrait{
private Vector2 from = new Vector2(); private Vector2 from = new Vector2();

2
core/src/io/anuke/mindustry/entities/effect/Lightning.java
View File

@@ -21,7 +21,7 @@ import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.graphics.Pal; 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 class Lightning extends TimedEntity implements DrawTrait, TimeTrait{
public static final float lifetime = 10f; public static final float lifetime = 10f;

2
core/src/io/anuke/mindustry/entities/effect/Puddle.java
View File

@@ -24,7 +24,7 @@ import io.anuke.mindustry.world.Tile;
import java.io.*; 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{ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrait, SyncTrait{
private static final IntMap<Puddle> map = new IntMap<>(); private static final IntMap<Puddle> map = new IntMap<>();

2
core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java
View File

@@ -5,7 +5,7 @@ import io.anuke.arc.graphics.g2d.Draw;
import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.math.Mathf; 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{ public class RubbleDecal extends Decal{
private TextureRegion region; private TextureRegion region;

4
core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java
View File

@@ -7,8 +7,8 @@ import io.anuke.arc.math.Angles;
import io.anuke.arc.math.Mathf; import io.anuke.arc.math.Mathf;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Min.headless; import static io.anuke.mindustry.Vars.headless;
import static io.anuke.mindustry.Min.world; import static io.anuke.mindustry.Vars.world;
public class ScorchDecal extends Decal{ public class ScorchDecal extends Decal{
private static final int scorches = 5; private static final int scorches = 5;

2
core/src/io/anuke/mindustry/entities/impl/EffectEntity.java
View File

@@ -9,7 +9,7 @@ import io.anuke.mindustry.entities.EntityGroup;
import io.anuke.mindustry.entities.traits.DrawTrait; import io.anuke.mindustry.entities.traits.DrawTrait;
import io.anuke.mindustry.entities.traits.Entity; 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 class EffectEntity extends TimedEntity implements Poolable, DrawTrait{
public Effect effect; public Effect effect;

4
core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
View File

@@ -21,7 +21,7 @@ import io.anuke.mindustry.world.blocks.BuildBlock.*;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.entities.traits.BuilderTrait.BuildDataStatic.*; import static io.anuke.mindustry.entities.traits.BuilderTrait.BuildDataStatic.*;
/** Interface for units that build things.*/ /** 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 px = unit.x + Angles.trnsx(unit.rotation, focusLen);
float py = unit.y + Angles.trnsy(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); float ang = unit.angleTo(tile);
tmptr[0].set(tile.drawx() - sz, tile.drawy() - sz); tmptr[0].set(tile.drawx() - sz, tile.drawy() - sz);

2
core/src/io/anuke/mindustry/entities/traits/MinerTrait.java
View File

@@ -13,7 +13,7 @@ import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public interface MinerTrait extends Entity{ public interface MinerTrait extends Entity{

4
core/src/io/anuke/mindustry/entities/traits/SolidTrait.java
View File

@@ -3,7 +3,7 @@ package io.anuke.mindustry.entities.traits;
import io.anuke.arc.math.geom.*; import io.anuke.arc.math.geom.*;
import io.anuke.arc.math.geom.QuadTree.QuadTreeObject; 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{ 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){ default void move(float x, float y){
Min.collisions.move(this, x, y); Vars.collisions.move(this, x, y);
} }
} }

10
core/src/io/anuke/mindustry/entities/type/BaseUnit.java
View File

@@ -22,7 +22,7 @@ import io.anuke.mindustry.world.meta.*;
import java.io.*; import java.io.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
/** Base class for AI units. */ /** Base class for AI units. */
public abstract class BaseUnit extends Unit implements ShooterTrait{ public abstract class BaseUnit extends Unit implements ShooterTrait{
@@ -163,8 +163,8 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
public TileEntity getClosestEnemyCore(){ public TileEntity getClosestEnemyCore(){
for(Team enemy : Min.state.teams.enemiesOf(team)){ for(Team enemy : Vars.state.teams.enemiesOf(team)){
Tile tile = Geometry.findClosest(x, y, Min.state.teams.get(enemy).cores); Tile tile = Geometry.findClosest(x, y, Vars.state.teams.get(enemy).cores);
if(tile != null){ if(tile != null){
return tile.entity; return tile.entity;
} }
@@ -183,7 +183,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
@Override @Override
public float getDamageMultipler(){ public float getDamageMultipler(){
return status.getDamageMultiplier() * Min.state.rules.unitDamageMultiplier; return status.getDamageMultiplier() * Vars.state.rules.unitDamageMultiplier;
} }
@Override @Override
@@ -232,7 +232,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
@Override @Override
public float maxHealth(){ public float maxHealth(){
return type.health * Min.state.rules.unitHealthMultiplier; return type.health * Vars.state.rules.unitHealthMultiplier;
} }
@Override @Override

2
core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
View File

@@ -13,7 +13,7 @@ import io.anuke.mindustry.net.*;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.meta.*; import io.anuke.mindustry.world.meta.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public abstract class FlyingUnit extends BaseUnit{ public abstract class FlyingUnit extends BaseUnit{
protected float[] weaponAngles = {0, 0}; protected float[] weaponAngles = {0, 0};

6
core/src/io/anuke/mindustry/entities/type/GroundUnit.java
View File

@@ -14,7 +14,7 @@ import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.blocks.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public abstract class GroundUnit extends BaseUnit{ public abstract class GroundUnit extends BaseUnit{
protected static Vector2 vec = new Vector2(); protected static Vector2 vec = new Vector2();
@@ -235,8 +235,8 @@ public abstract class GroundUnit extends BaseUnit{
protected void moveAwayFromCore(){ protected void moveAwayFromCore(){
Team enemy = null; Team enemy = null;
for(Team team : Min.state.teams.enemiesOf(team)){ for(Team team : Vars.state.teams.enemiesOf(team)){
if(Min.state.teams.isActive(team)){ if(Vars.state.teams.isActive(team)){
enemy = team; enemy = team;
break; break;
} }

6
core/src/io/anuke/mindustry/entities/type/Player.java
View File

@@ -12,7 +12,7 @@ import io.anuke.arc.math.geom.*;
import io.anuke.arc.scene.ui.layout.*; import io.anuke.arc.scene.ui.layout.*;
import io.anuke.arc.util.*; import io.anuke.arc.util.*;
import io.anuke.arc.util.pooling.Pools; 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.content.*;
import io.anuke.mindustry.entities.*; import io.anuke.mindustry.entities.*;
import io.anuke.mindustry.entities.traits.*; import io.anuke.mindustry.entities.traits.*;
@@ -31,7 +31,7 @@ import io.anuke.mindustry.world.blocks.*;
import java.io.*; import java.io.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
public static final int timerSync = 2; public static final int timerSync = 2;
@@ -859,7 +859,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
byte mechid = stream.readByte(); byte mechid = stream.readByte();
int spawner = stream.readInt(); int spawner = stream.readInt();
Tile stile = world.tile(spawner); Tile stile = world.tile(spawner);
Player player = headless ? this : Min.player; Player player = headless ? this : Vars.player;
player.readSaveSuper(stream, version); player.readSaveSuper(stream, version);
player.mech = content.getByID(ContentType.mech, mechid); player.mech = content.getByID(ContentType.mech, mechid);
player.dead = false; player.dead = false;

2
core/src/io/anuke/mindustry/entities/type/TileEntity.java
View File

@@ -20,7 +20,7 @@ import io.anuke.mindustry.world.modules.*;
import java.io.*; import java.io.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
public static final float timeToSleep = 60f * 4; //4 seconds to fall asleep public static final float timeToSleep = 60f * 4; //4 seconds to fall asleep

2
core/src/io/anuke/mindustry/entities/type/Unit.java
View File

@@ -27,7 +27,7 @@ import io.anuke.mindustry.world.blocks.*;
import java.io.*; 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{ public abstract class Unit extends DestructibleEntity implements SaveTrait, TargetTrait, SyncTrait, DrawTrait, TeamTrait{
/** Total duration of hit flash effect */ /** Total duration of hit flash effect */

2
core/src/io/anuke/mindustry/entities/type/base/BaseDrone.java
View File

@@ -7,7 +7,7 @@ import io.anuke.mindustry.entities.units.*;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.meta.BlockFlag; 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 abstract class BaseDrone extends FlyingUnit{
public final UnitState retreat = new UnitState(){ public final UnitState retreat = new UnitState(){

6
core/src/io/anuke/mindustry/entities/type/base/BuilderDrone.java
View File

@@ -6,7 +6,7 @@ import io.anuke.arc.collection.IntIntMap;
import io.anuke.arc.collection.Queue; import io.anuke.arc.collection.Queue;
import io.anuke.arc.math.Mathf; import io.anuke.arc.math.Mathf;
import io.anuke.arc.util.*; 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.EntityGroup;
import io.anuke.mindustry.entities.traits.BuilderTrait; import io.anuke.mindustry.entities.traits.BuilderTrait;
import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.entities.traits.TargetTrait;
@@ -21,7 +21,7 @@ import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity;
import java.io.*; import java.io.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class BuilderDrone extends BaseDrone implements BuilderTrait{ public class BuilderDrone extends BaseDrone implements BuilderTrait{
private static final StaticReset reset = new StaticReset(); private static final StaticReset reset = new StaticReset();
@@ -189,7 +189,7 @@ public class BuilderDrone extends BaseDrone implements BuilderTrait{
} }
if(isRebuild() && !isBuilding()){ if(isRebuild() && !isBuilding()){
TeamData data = Min.state.teams.get(team); TeamData data = Vars.state.teams.get(team);
if(!data.brokenBlocks.isEmpty()){ if(!data.brokenBlocks.isEmpty()){
long block = data.brokenBlocks.removeLast(); long block = data.brokenBlocks.removeLast();

2
core/src/io/anuke/mindustry/entities/type/base/MinerDrone.java
View File

@@ -14,7 +14,7 @@ import io.anuke.mindustry.world.Tile;
import java.io.*; import java.io.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
/** A drone that only mines.*/ /** A drone that only mines.*/
public class MinerDrone extends BaseDrone implements MinerTrait{ public class MinerDrone extends BaseDrone implements MinerTrait{

2
core/src/io/anuke/mindustry/entities/type/base/RepairDrone.java
View File

@@ -9,7 +9,7 @@ import io.anuke.mindustry.world.blocks.*;
import java.io.*; import java.io.*;
import static io.anuke.mindustry.Min.world; import static io.anuke.mindustry.Vars.world;
public class RepairDrone extends BaseDrone{ public class RepairDrone extends BaseDrone{
public final UnitState repair = new UnitState(){ public final UnitState repair = new UnitState(){

2
core/src/io/anuke/mindustry/entities/units/Statuses.java
View File

@@ -14,7 +14,7 @@ import io.anuke.mindustry.type.StatusEffect;
import java.io.*; 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. */ /** Class for controlling status effects on an entity. */
public class Statuses implements Saveable{ public class Statuses implements Saveable{

8
core/src/io/anuke/mindustry/entities/units/UnitDrops.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.entities.units; package io.anuke.mindustry.entities.units;
import io.anuke.arc.math.Mathf; 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.content.Items;
import io.anuke.mindustry.entities.type.BaseUnit; import io.anuke.mindustry.entities.type.BaseUnit;
import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.TileEntity;
@@ -13,13 +13,13 @@ public class UnitDrops{
public static void dropItems(BaseUnit unit){ public static void dropItems(BaseUnit unit){
//items only dropped in waves for enemy team //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; return;
} }
TileEntity core = unit.getClosestEnemyCore(); TileEntity core = unit.getClosestEnemyCore();
if(core == null || core.dst(unit) > Min.mineTransferRange){ if(core == null || core.dst(unit) > Vars.mineTransferRange){
return; return;
} }
@@ -30,7 +30,7 @@ public class UnitDrops{
for(int i = 0; i < 3; i++){ for(int i = 0; i < 3; i++){
for(Item item : dropTable){ for(Item item : dropTable){
//only drop unlocked items //only drop unlocked items
if(!Min.headless && !Min.data.isUnlocked(item)){ if(!Vars.headless && !Vars.data.isUnlocked(item)){
continue; continue;
} }

6
core/src/io/anuke/mindustry/game/Content.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.game; package io.anuke.mindustry.game;
import io.anuke.mindustry.Min; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.ContentType;
@@ -9,8 +9,8 @@ public abstract class Content{
public final short id; public final short id;
public Content(){ public Content(){
this.id = (short)Min.content.getBy(getContentType()).size; this.id = (short)Vars.content.getBy(getContentType()).size;
Min.content.handleContent(this); Vars.content.handleContent(this);
} }
/** /**

2
core/src/io/anuke/mindustry/game/Gamemode.java
View File

@@ -4,7 +4,7 @@ import io.anuke.arc.*;
import io.anuke.arc.function.*; import io.anuke.arc.function.*;
import io.anuke.mindustry.maps.*; import io.anuke.mindustry.maps.*;
import static io.anuke.mindustry.Min.waveTeam; import static io.anuke.mindustry.Vars.waveTeam;
/** Defines preset rule sets. */ /** Defines preset rule sets. */
public enum Gamemode{ public enum Gamemode{

6
core/src/io/anuke/mindustry/game/GlobalData.java
View File

@@ -7,7 +7,7 @@ import io.anuke.mindustry.content.*;
import io.anuke.mindustry.game.EventType.*; import io.anuke.mindustry.game.EventType.*;
import io.anuke.mindustry.type.*; import io.anuke.mindustry.type.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
/** Stores player unlocks. Clientside only. */ /** Stores player unlocks. Clientside only. */
public class GlobalData{ public class GlobalData{
@@ -106,7 +106,7 @@ public class GlobalData{
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void load(){ public void load(){
unlocked = Core.settings.getObject("unlocks", ObjectMap.class, ObjectMap::new); 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)); items.put(item, Core.settings.getInt("item-" + item.name, 0));
} }
@@ -118,7 +118,7 @@ public class GlobalData{
public void save(){ public void save(){
Core.settings.putObject("unlocks", unlocked); 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.put("item-" + item.name, items.get(item, 0));
} }
Core.settings.save(); Core.settings.save();

2
core/src/io/anuke/mindustry/game/LoopControl.java
View File

@@ -11,7 +11,7 @@ public class LoopControl{
private ObjectMap<Sound, SoundData> sounds = new ObjectMap<>(); private ObjectMap<Sound, SoundData> sounds = new ObjectMap<>();
public void play(Sound sound, Position pos, float volume){ 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 baseVol = sound.calcFalloff(pos.getX(), pos.getY());
float vol = baseVol * volume; float vol = baseVol * volume;

2
core/src/io/anuke/mindustry/game/MusicControl.java
View File

@@ -10,7 +10,7 @@ import io.anuke.mindustry.core.GameState.*;
import io.anuke.mindustry.game.EventType.*; import io.anuke.mindustry.game.EventType.*;
import io.anuke.mindustry.gen.*; import io.anuke.mindustry.gen.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
/** Controls playback of multiple music tracks.*/ /** Controls playback of multiple music tracks.*/
public class MusicControl{ public class MusicControl{

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

@@ -17,8 +17,8 @@ import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import static io.anuke.mindustry.Min.saveExtension; import static io.anuke.mindustry.Vars.saveExtension;
import static io.anuke.mindustry.Min.state; import static io.anuke.mindustry.Vars.state;
public class Saves{ public class Saves{
private int nextSlot; private int nextSlot;

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

@@ -6,7 +6,7 @@ import io.anuke.arc.util.serialization.JsonValue;
import io.anuke.mindustry.entities.type.BaseUnit; import io.anuke.mindustry.entities.type.BaseUnit;
import io.anuke.mindustry.type.*; 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 * A spawn group defines spawn information for a specific type of unit, with optional extra information like

4
core/src/io/anuke/mindustry/game/Teams.java
View File

@@ -2,7 +2,7 @@ package io.anuke.mindustry.game;
import io.anuke.annotations.Annotations.Struct; import io.anuke.annotations.Annotations.Struct;
import io.anuke.arc.collection.*; import io.anuke.arc.collection.*;
import io.anuke.mindustry.Min; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
/** Class for various team-based utilities. */ /** 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. */ /** Returns whether a team is active, e.g. whether it has any cores remaining. */
public boolean isActive(Team team){ public boolean isActive(Team team){
//the enemy wave team is always active //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. */ /** Returns a set of all teams that are enemies of this team. */

2
core/src/io/anuke/mindustry/game/Tutorial.java
View File

@@ -15,7 +15,7 @@ import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.type.*; import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
/** Handles tutorial state. */ /** Handles tutorial state. */
public class Tutorial{ public class Tutorial{

4
core/src/io/anuke/mindustry/game/UnlockableContent.java
View File

@@ -3,7 +3,7 @@ package io.anuke.mindustry.game;
import io.anuke.arc.Core; import io.anuke.arc.Core;
import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.scene.ui.layout.Table; 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. */ /** Base interface for an unlockable content type. */
public abstract class UnlockableContent extends MappableContent{ public abstract class UnlockableContent extends MappableContent{
@@ -42,7 +42,7 @@ public abstract class UnlockableContent extends MappableContent{
} }
public final boolean unlocked(){ public final boolean unlocked(){
return Min.data.isUnlocked(this); return Vars.data.isUnlocked(this);
} }
public final boolean locked(){ public final boolean locked(){

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

@@ -13,7 +13,7 @@ import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import static io.anuke.arc.Core.camera; import static io.anuke.arc.Core.camera;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class BlockRenderer implements Disposable{ public class BlockRenderer implements Disposable{
private final static int initialRequests = 32 * 32; private final static int initialRequests = 32 * 32;

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

@@ -6,7 +6,7 @@ import io.anuke.arc.graphics.g2d.Draw;
import io.anuke.arc.graphics.glutils.Shader; import io.anuke.arc.graphics.glutils.Shader;
import static io.anuke.arc.Core.camera; import static io.anuke.arc.Core.camera;
import static io.anuke.mindustry.Min.renderer; import static io.anuke.mindustry.Vars.renderer;
public enum CacheLayer{ public enum CacheLayer{
water{ water{

4
core/src/io/anuke/mindustry/graphics/FloorRenderer.java
View File

@@ -15,8 +15,8 @@ import io.anuke.mindustry.world.blocks.Floor;
import java.util.Arrays; import java.util.Arrays;
import static io.anuke.mindustry.Min.tilesize; import static io.anuke.mindustry.Vars.tilesize;
import static io.anuke.mindustry.Min.world; import static io.anuke.mindustry.Vars.world;
public class FloorRenderer implements Disposable{ public class FloorRenderer implements Disposable{
private final static int chunksize = 64; private final static int chunksize = 64;

2
core/src/io/anuke/mindustry/graphics/MenuRenderer.java
View File

@@ -19,7 +19,7 @@ import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.Floor; import io.anuke.mindustry.world.blocks.Floor;
import io.anuke.mindustry.world.blocks.OreBlock; import io.anuke.mindustry.world.blocks.OreBlock;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class MenuRenderer implements Disposable{ public class MenuRenderer implements Disposable{
private static final float darkness = 0.3f; private static final float darkness = 0.3f;

2
core/src/io/anuke/mindustry/graphics/MinimapRenderer.java
View File

@@ -15,7 +15,7 @@ import io.anuke.mindustry.game.EventType.*;
import io.anuke.mindustry.io.*; import io.anuke.mindustry.io.*;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class MinimapRenderer implements Disposable{ public class MinimapRenderer implements Disposable{
private static final float baseSize = 16f; private static final float baseSize = 16f;

6
core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
View File

@@ -9,7 +9,7 @@ import io.anuke.arc.math.geom.Rectangle;
import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.math.geom.Vector2;
import io.anuke.arc.util.Time; import io.anuke.arc.util.Time;
import io.anuke.arc.util.Tmp; 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.content.Blocks;
import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.Units;
import io.anuke.mindustry.entities.type.Player; 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.type.Item;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class OverlayRenderer{ public class OverlayRenderer{
private static final float indicatorLength = 14f; private static final float indicatorLength = 14f;
@@ -38,7 +38,7 @@ public class OverlayRenderer{
if(Core.settings.getBool("indicators")){ if(Core.settings.getBool("indicators")){
for(Player player : playerGroup.all()){ 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) 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)){ .setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x, player.y)){

4
core/src/io/anuke/mindustry/graphics/Pixelator.java
View File

@@ -10,8 +10,8 @@ import io.anuke.mindustry.entities.type.Player;
import static io.anuke.arc.Core.camera; import static io.anuke.arc.Core.camera;
import static io.anuke.arc.Core.graphics; import static io.anuke.arc.Core.graphics;
import static io.anuke.mindustry.Min.playerGroup; import static io.anuke.mindustry.Vars.playerGroup;
import static io.anuke.mindustry.Min.renderer; import static io.anuke.mindustry.Vars.renderer;
public class Pixelator implements Disposable{ public class Pixelator implements Disposable{
private FrameBuffer buffer = new FrameBuffer(2, 2); private FrameBuffer buffer = new FrameBuffer(2, 2);

2
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -17,7 +17,7 @@ import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import static io.anuke.arc.Core.scene; 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.*; import static io.anuke.mindustry.input.PlaceMode.*;
public class DesktopInput extends InputHandler{ public class DesktopInput extends InputHandler{

2
core/src/io/anuke/mindustry/input/InputHandler.java
View File

@@ -25,7 +25,7 @@ import io.anuke.mindustry.type.*;
import io.anuke.mindustry.ui.fragments.*; import io.anuke.mindustry.ui.fragments.*;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public abstract class InputHandler implements InputProcessor{ public abstract class InputHandler implements InputProcessor{
/** Used for dropping items. */ /** Used for dropping items. */

2
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@@ -21,7 +21,7 @@ import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.input.PlaceUtils.*; import io.anuke.mindustry.input.PlaceUtils.*;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.input.PlaceMode.*; import static io.anuke.mindustry.input.PlaceMode.*;
public class MobileInput extends InputHandler implements GestureListener{ public class MobileInput extends InputHandler implements GestureListener{

2
core/src/io/anuke/mindustry/input/PlaceUtils.java
View File

@@ -7,7 +7,7 @@ import io.anuke.arc.math.geom.Point2;
import io.anuke.arc.util.pooling.Pools; import io.anuke.arc.util.pooling.Pools;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import static io.anuke.mindustry.Min.tilesize; import static io.anuke.mindustry.Vars.tilesize;
public class PlaceUtils{ public class PlaceUtils{
private static final NormalizeResult result = new NormalizeResult(); private static final NormalizeResult result = new NormalizeResult();

10
core/src/io/anuke/mindustry/io/JsonIO.java
View File

@@ -50,7 +50,7 @@ public class JsonIO{
@Override @Override
public Zone read(Json json, JsonValue jsonData, Class type){ 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 @Override
public Item read(Json json, JsonValue jsonData, Class type){ public Item read(Json json, JsonValue jsonData, Class type){
if(jsonData.asString() == null) return Items.copper; 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; return i == null ? Items.copper : i;
} }
}); });
//TODO extremely hacky and disgusting //TODO extremely hacky and disgusting
for(Block block : Min.content.blocks()){ for(Block block : Vars.content.blocks()){
Class type = block.getClass(); Class type = block.getClass();
if(type.isAnonymousClass()) type = type.getSuperclass(); if(type.isAnonymousClass()) type = type.getSuperclass();
@@ -81,7 +81,7 @@ public class JsonIO{
@Override @Override
public Block read(Json json, JsonValue jsonData, Class type){ 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 @Override
public Block read(Json json, JsonValue jsonData, Class type){ 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());
} }
}); });

2
core/src/io/anuke/mindustry/io/LegacyMapIO.java
View File

@@ -21,7 +21,7 @@ import io.anuke.mindustry.world.blocks.Floor;
import java.io.*; import java.io.*;
import java.util.zip.InflaterInputStream; import java.util.zip.InflaterInputStream;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
/** Map IO for the "old" .mmap format. /** Map IO for the "old" .mmap format.
* Differentiate between legacy maps and new maps by checking the extension (or the header).*/ * Differentiate between legacy maps and new maps by checking the extension (or the header).*/

2
core/src/io/anuke/mindustry/io/MapIO.java
View File

@@ -14,7 +14,7 @@ import io.anuke.mindustry.world.blocks.storage.*;
import java.io.*; import java.io.*;
import java.util.zip.*; import java.util.zip.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
/** Reads and writes map files. */ /** Reads and writes map files. */
//TODO does this class even need to exist??? move to Maps? //TODO does this class even need to exist??? move to Maps?

6
core/src/io/anuke/mindustry/io/SaveIO.java
View File

@@ -4,7 +4,7 @@ import io.anuke.arc.collection.*;
import io.anuke.arc.files.FileHandle; import io.anuke.arc.files.FileHandle;
import io.anuke.arc.util.io.CounterInputStream; import io.anuke.arc.util.io.CounterInputStream;
import io.anuke.arc.util.io.FastDeflaterOutputStream; 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.Save1;
import io.anuke.mindustry.io.versions.Save2; import io.anuke.mindustry.io.versions.Save2;
import io.anuke.mindustry.world.WorldContext; import io.anuke.mindustry.world.WorldContext;
@@ -13,7 +13,7 @@ import java.io.*;
import java.util.Arrays; import java.util.Arrays;
import java.util.zip.InflaterInputStream; import java.util.zip.InflaterInputStream;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class SaveIO{ public class SaveIO{
/** Format header. This is the string 'MSAV' in ASCII. */ /** Format header. This is the string 'MSAV' in ASCII. */
@@ -108,7 +108,7 @@ public class SaveIO{
} }
public static FileHandle fileFor(int slot){ public static FileHandle fileFor(int slot){
return saveDirectory.child(slot + "." + Min.saveExtension); return saveDirectory.child(slot + "." + Vars.saveExtension);
} }
public static FileHandle backupFileFor(FileHandle file){ public static FileHandle backupFileFor(FileHandle file){

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

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

2
core/src/io/anuke/mindustry/io/SaveVersion.java
View File

@@ -13,7 +13,7 @@ import io.anuke.mindustry.world.*;
import java.io.*; import java.io.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public abstract class SaveVersion extends SaveFileReader{ public abstract class SaveVersion extends SaveFileReader{
public final int version; public final int version;

2
core/src/io/anuke/mindustry/io/TypeIO.java
View File

@@ -22,7 +22,7 @@ import io.anuke.mindustry.world.*;
import java.io.*; import java.io.*;
import java.nio.ByteBuffer; 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. */ /** Class for specifying read/write methods for code generation. */
@SuppressWarnings("unused") @SuppressWarnings("unused")

10
core/src/io/anuke/mindustry/maps/Map.java
View File

@@ -9,7 +9,7 @@ import io.anuke.mindustry.game.*;
import io.anuke.mindustry.io.*; import io.anuke.mindustry.io.*;
import io.anuke.mindustry.maps.filters.*; 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<Map>{ public class Map implements Comparable<Map>{
/** Whether this is a custom map. */ /** Whether this is a custom map. */
@@ -50,7 +50,7 @@ public class Map implements Comparable<Map>{
} }
public Map(StringMap tags){ 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(){ public int getHightScore(){
@@ -58,12 +58,12 @@ public class Map implements Comparable<Map>{
} }
public FileHandle previewFile(){ public FileHandle previewFile(){
return Min.mapPreviewDirectory.child(file.nameWithoutExtension() + ".png"); return Vars.mapPreviewDirectory.child(file.nameWithoutExtension() + ".png");
} }
public void setHighScore(int score){ public void setHighScore(int score){
Core.settings.put("hiscore" + file.nameWithoutExtension(), 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.*/ /** Returns the result of applying this map's rules to the specified gamemode.*/
@@ -84,7 +84,7 @@ public class Map implements Comparable<Map>{
public Rules rules(Rules base){ public Rules rules(Rules base){
try{ try{
Rules result = JsonIO.read(Rules.class, base, tags.get("rules", "{}")); 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; return result;
}catch(Exception e){ }catch(Exception e){
//error reading rules. ignore? //error reading rules. ignore?

33
core/src/io/anuke/mindustry/maps/MapPreviewLoader.java Normal file
View File

@@ -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;
}
}
}

43
core/src/io/anuke/mindustry/maps/Maps.java
View File

@@ -12,13 +12,14 @@ import io.anuke.arc.util.serialization.*;
import io.anuke.mindustry.content.*; import io.anuke.mindustry.content.*;
import io.anuke.mindustry.game.*; import io.anuke.mindustry.game.*;
import io.anuke.mindustry.io.*; import io.anuke.mindustry.io.*;
import io.anuke.mindustry.maps.MapPreviewLoader.*;
import io.anuke.mindustry.maps.filters.*; import io.anuke.mindustry.maps.filters.*;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.storage.*; import io.anuke.mindustry.world.blocks.storage.*;
import java.io.*; import java.io.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class Maps{ public class Maps{
/** List of all built-in maps. Filenames only. */ /** List of all built-in maps. Filenames only. */
@@ -298,30 +299,32 @@ public class Maps{
} }
public void loadPreviews(){ public void loadPreviews(){
Core.assets.setLoader(Texture.class, "." + mapExtension, new MapPreviewLoader());
for(Map map : maps){ for(Map map : maps){
try{ //try to load preview
//try to load preview if(map.previewFile().exists()){
if(map.previewFile().exists()){ //this may fail, but calls createNewPreview
try{ Core.assets.load(new AssetDescriptor<>(map.previewFile().path() + "." + mapExtension, Texture.class, new MapPreviewParameter(map))).loaded = t -> map.texture = (Texture)t;
Core.assets.load(new AssetDescriptor<>(map.previewFile(), Texture.class)).loaded = t -> map.texture = (Texture)t; }else{
//if it works, keep going createNewPreview(map);
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();
} }
} }
} }
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. */ /** Find a new filename to put a map to. */
private FileHandle findFile(){ private FileHandle findFile(){
//find a map name that isn't used. //find a map name that isn't used.

4
core/src/io/anuke/mindustry/maps/filters/FilterOption.java
View File

@@ -13,7 +13,7 @@ import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.Block.*; import io.anuke.mindustry.world.Block.*;
import io.anuke.mindustry.world.blocks.*; 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 abstract class FilterOption{
public static final Predicate<Block> floorsOnly = b -> (b instanceof Floor && !(b instanceof OverlayFloor)) && Core.atlas.isFound(b.icon(Icon.full)); public static final Predicate<Block> 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(""); FloatingDialog dialog = new FloatingDialog("");
dialog.setFillParent(false); dialog.setFillParent(false);
int i = 0; int i = 0;
for(Block block : Min.content.blocks()){ for(Block block : Vars.content.blocks()){
if(!filter.test(block)) continue; 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(() -> { dialog.cont.addImage(block == Blocks.air ? Core.atlas.find("icon-none-small") : block.icon(Icon.medium)).size(8 * 4).pad(3).get().clicked(() -> {

2
core/src/io/anuke/mindustry/maps/filters/MedianFilter.java
View File

@@ -5,7 +5,7 @@ import io.anuke.arc.math.*;
import io.anuke.mindustry.maps.filters.FilterOption.*; import io.anuke.mindustry.maps.filters.FilterOption.*;
import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.*;
import static io.anuke.mindustry.Min.content; import static io.anuke.mindustry.Vars.content;
public class MedianFilter extends GenerateFilter{ public class MedianFilter extends GenerateFilter{
float radius = 2; float radius = 2;

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

@@ -52,6 +52,6 @@ public class OreMedianFilter extends GenerateFilter{
int index = Math.min((int)(blocks.size * percentile), blocks.size - 1); int index = Math.min((int)(blocks.size * percentile), blocks.size - 1);
int overlay = blocks.get(index); int overlay = blocks.get(index);
in.ore = Min.content.block(overlay); in.ore = Vars.content.block(overlay);
} }
} }

2
core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
View File

@@ -12,7 +12,7 @@ import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.*; import io.anuke.mindustry.world.blocks.*;
import io.anuke.mindustry.world.blocks.storage.*; import io.anuke.mindustry.world.blocks.storage.*;
import static io.anuke.mindustry.Min.*; import static io.anuke.mindustry.Vars.*;
public class MapGenerator extends Generator{ public class MapGenerator extends Generator{
private Map map; private Map map;

2
core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java
View File

@@ -6,7 +6,7 @@ import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile; 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{ public abstract class RandomGenerator extends Generator{
protected Block floor; protected Block floor;

2
core/src/io/anuke/mindustry/net/Administration.java
View File

@@ -4,7 +4,7 @@ import io.anuke.annotations.Annotations.Serialize;
import io.anuke.arc.Core; import io.anuke.arc.Core;
import io.anuke.arc.collection.*; import io.anuke.arc.collection.*;
import static io.anuke.mindustry.Min.headless; import static io.anuke.mindustry.Vars.headless;
public class Administration{ public class Administration{

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