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
core/src/io/anuke/mindustry/ui/ItemsDisplay.java
+2 -2
View File
@@ -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{
core/src/io/anuke/mindustry/ui/Minimap.java
+1 -1
View File
@@ -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{
core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
+1 -1
View File
@@ -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<String> contributors = new Array<>();
core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java
+1 -1
View File
@@ -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{
core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java
+1 -1
View File
@@ -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{
core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java
+2 -2
View File
@@ -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<Color> cons;
core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java
+2 -2
View File
@@ -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);
core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
+2 -2
View File
@@ -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);
}
core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java
+1 -1
View File
@@ -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;
core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java
+6 -6
View File
@@ -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<Content>[] allContent = Min.content.getContentMap();
Array<Content>[] 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();
}
}
core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java
+1 -1
View File
@@ -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);
core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java
+1 -1
View File
@@ -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{
core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
+1 -1
View File
@@ -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());
core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java
+1 -1
View File
@@ -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;
core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java
+1 -1
View File
@@ -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;
core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
+4 -4
View File
@@ -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)));
core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
+5 -5
View File
@@ -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<Server> 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(){
core/src/io/anuke/mindustry/ui/dialogs/LanguageDialog.java
+2 -2
View File
@@ -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;
core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
+2 -2
View File
@@ -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){
core/src/io/anuke/mindustry/ui/dialogs/LoadoutDialog.java
+1 -1
View File
@@ -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;
core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java
+1 -1
View File
@@ -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();
core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java
+4 -4
View File
@@ -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){
core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java
+1 -1
View File
@@ -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{
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
+1 -1
View File
@@ -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();
core/src/io/anuke/mindustry/ui/dialogs/SaveDialog.java
+1 -1
View File
@@ -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{
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
+1 -1
View File
@@ -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;
core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java
+1 -1
View File
@@ -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);
core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java
+1 -1
View File
@@ -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();
core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java
+1 -1
View File
@@ -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();
core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
+1 -1
View File
@@ -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;
core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
+5 -5
View File
@@ -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);
}
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
+1 -1
View File
@@ -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();
core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
+1 -1
View File
@@ -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");
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
+1 -1
View File
@@ -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;
core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
+1 -1
View File
@@ -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;