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

non-functional loading screen

Browse Source
This commit is contained in:
Anuken
2019-08-26 22:53:11 -04:00
parent 1fc9c82aaf
commit 76cd7ba8d1
211 changed files with 722 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/io/anuke/mindustry/server/MindustryServer.java
View File

@@ -1,13 +1,10 @@
package io.anuke.mindustry.server;
import io.anuke.arc.ApplicationListener;
import io.anuke.arc.Core;
import io.anuke.mindustry.Vars;
import io.anuke.arc.*;
import io.anuke.mindustry.*;
import io.anuke.mindustry.core.*;
import io.anuke.mindustry.game.Content;
import io.anuke.mindustry.io.BundleLoader;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Min.*;
public class MindustryServer implements ApplicationListener{
private String[] args;
@@ -20,19 +17,17 @@ public class MindustryServer implements ApplicationListener{
public void init(){
Core.settings.setDataDirectory(Core.files.local("config"));
loadLocales = false;
Vars.init();
Min.init();
headless = true;
BundleLoader.load();
content.verbose(false);
content.load();
loadSettings();
Core.app.addListener(logic = new Logic());
Core.app.addListener(world = new World());
Core.app.addListener(netServer = new NetServer());
Core.app.addListener(new ServerControl(args));
content.initialize(Content::init);
content.init();
}
}

20
server/src/io/anuke/mindustry/server/ServerControl.java
View File

@@ -30,7 +30,7 @@ import java.time.format.DateTimeFormatter;
import java.util.Scanner;
import static io.anuke.arc.util.Log.*;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Min.*;
public class ServerControl implements ApplicationListener{
private static final int roundExtraTime = 12;
@@ -143,8 +143,8 @@ public class ServerControl implements ApplicationListener{
info("Game over!");
if(Core.settings.getBool("shuffle")){
if(world.maps.all().size > 0){
Array<Map> maps = world.maps.customMaps().size == 0 ? world.maps.defaultMaps() : world.maps.customMaps();
if(maps.all().size > 0){
Array<Map> maps = maps.customMaps().size == 0 ? maps.defaultMaps() : maps.customMaps();
Map previous = world.getMap();
Map map = maps.random(previous);
@@ -208,7 +208,7 @@ public class ServerControl implements ApplicationListener{
if(lastTask != null) lastTask.cancel();
Map result = world.maps.all().find(map -> map.name().equalsIgnoreCase(arg[0].replace('_', ' ')) || map.name().equalsIgnoreCase(arg[0]));
Map result = maps.all().find(map -> map.name().equalsIgnoreCase(arg[0].replace('_', ' ')) || map.name().equalsIgnoreCase(arg[0]));
if(result == null){
err("No map with name &y'{0}'&lr found.", arg[0]);
@@ -259,9 +259,9 @@ public class ServerControl implements ApplicationListener{
});
handler.register("maps", "Display all available maps.", arg -> {
if(!world.maps.all().isEmpty()){
if(!maps.all().isEmpty()){
info("Maps:");
for(Map map : world.maps.all()){
for(Map map : maps.all()){
info(" &ly{0}: &lb&fi{1} / {2}x{3}", map.name(), map.custom ? "Custom" : "Default", map.width, map.height);
}
}else{
@@ -271,10 +271,10 @@ public class ServerControl implements ApplicationListener{
});
handler.register("reloadmaps", "Reload all maps from disk.", arg -> {
int beforeMaps = world.maps.all().size;
world.maps.reload();
if(world.maps.all().size > beforeMaps){
info("&lc{0}&ly new map(s) found and reloaded.", world.maps.all().size - beforeMaps);
int beforeMaps = maps.all().size;
maps.reload();
if(maps.all().size > beforeMaps){
info("&lc{0}&ly new map(s) found and reloaded.", maps.all().size - beforeMaps);
}else{
info("&lyMaps reloaded.");
}