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

Fixed most things besides drawing

Browse Source
This commit is contained in:
Anuken
2018-12-22 22:17:28 -05:00
parent 3abfaf1bca
commit 44e4ffbe62
175 changed files with 666 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/io/anuke/mindustry/server/CrashHandler.java
View File

@@ -3,12 +3,12 @@ package io.anuke.mindustry.server;
import com.badlogic.gdx.utils.JsonValue;
import com.badlogic.gdx.utils.JsonValue.ValueType;
import com.badlogic.gdx.utils.JsonWriter.OutputType;
import io.anuke.arc.Core;
import io.anuke.arc.util.Log;
import io.anuke.arc.util.OS;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.game.Version;
import io.anuke.mindustry.net.Net;
import io.anuke.arc.core.Settings;
import io.anuke.arc.util.Log;
import io.anuke.arc.util.OS;
import java.io.PrintWriter;
import java.io.StringWriter;

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

@@ -1,16 +1,17 @@
package io.anuke.mindustry.server;
import io.anuke.arc.ApplicationListener;
import io.anuke.arc.Core;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.Logic;
import io.anuke.mindustry.core.NetServer;
import io.anuke.mindustry.core.World;
import io.anuke.mindustry.game.Content;
import io.anuke.mindustry.io.BundleLoader;
import io.anuke.arc.modules.ModuleCore;
import static io.anuke.mindustry.Vars.*;
public class MindustryServer extends ModuleCore{
public class MindustryServer implements ApplicationListener{
private String[] args;
public MindustryServer(String[] args){
@@ -28,9 +29,9 @@ public class MindustryServer extends ModuleCore{
content.load();
content.initialize(Content::init);
module(logic = new Logic());
module(world = new World());
module(netServer = new NetServer());
module(new ServerControl(args));
Core.app.addListener(logic = new Logic());
Core.app.addListener(world = new World());
Core.app.addListener(netServer = new NetServer());
Core.app.addListener(new ServerControl(args));
}
}

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

@@ -6,6 +6,17 @@ import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.ObjectSet;
import com.badlogic.gdx.utils.Timer;
import com.badlogic.gdx.utils.Timer.Task;
import io.anuke.arc.ApplicationListener;
import io.anuke.arc.Core;
import io.anuke.arc.Events;
import io.anuke.arc.entities.Effects;
import io.anuke.arc.util.CommandHandler;
import io.anuke.arc.util.CommandHandler.Command;
import io.anuke.arc.util.CommandHandler.Response;
import io.anuke.arc.util.CommandHandler.ResponseType;
import io.anuke.arc.util.Log;
import io.anuke.arc.util.Strings;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.game.Difficulty;
@@ -23,24 +34,16 @@ import io.anuke.mindustry.net.Packets.KickReason;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.ItemType;
import io.anuke.mindustry.world.Tile;
import io.anuke.arc.core.*;
import io.anuke.arc.modules.Module;
import io.anuke.arc.util.CommandHandler;
import io.anuke.arc.util.CommandHandler.Command;
import io.anuke.arc.util.CommandHandler.Response;
import io.anuke.arc.util.CommandHandler.ResponseType;
import io.anuke.arc.util.Log;
import io.anuke.arc.util.Strings;
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Scanner;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.arc.util.Log.*;
import static io.anuke.mindustry.Vars.*;
public class ServerControl extends Module{
public class ServerControl implements ApplicationListener{
private static final int roundExtraTime = 12;
//in bytes: 512 kb is max
private static final int maxLogLength = 1024 * 512;
@@ -55,7 +58,7 @@ public class ServerControl extends Module{
public ServerControl(String[] args){
Core.settings.defaultList(
Core.settings.defaults(
"shufflemode", "normal",
"bans", "",
"admins", "",
@@ -99,7 +102,6 @@ public class ServerControl extends Module{
Time.setDeltaProvider(() -> Gdx.graphics.getDeltaTime() * 60f);
Effects.setScreenShakeProvider((a, b) -> {});
Effects.setEffectProvider((a, b, c, d, e, f) -> {});
Sounds.setHeadless(true);
registerCommands();
@@ -136,7 +138,7 @@ public class ServerControl extends Module{
world.sectors.save();
gameOvers = 0;
inExtraRound = true;
Core.settings.putInt("sector_x", world.getSector().x + 1);
Core.settings.put("sector_x", world.getSector().x + 1);
Core.settings.save();
Call.onInfoMessage("[accent]Sector conquered![]\n" + roundExtraTime + " seconds until deployment in next sector.");

13
server/src/io/anuke/mindustry/server/ServerLauncher.java
View File

@@ -4,11 +4,11 @@ import com.badlogic.gdx.ApplicationListener;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.backends.headless.HeadlessApplication;
import com.badlogic.gdx.backends.headless.HeadlessApplicationConfiguration;
import io.anuke.arc.Core;
import io.anuke.arc.util.EmptyLogger;
import io.anuke.kryonet.KryoClient;
import io.anuke.kryonet.KryoServer;
import io.anuke.mindustry.net.Net;
import io.anuke.arc.core.Settings;
import io.anuke.arc.util.EmptyLogger;
public class ServerLauncher extends HeadlessApplication{
@@ -37,8 +37,13 @@ public class ServerLauncher extends HeadlessApplication{
for(Thread thread : Thread.getAllStackTraces().keySet()){
if(thread.getName().equals("HeadlessApplication")){
thread.setUncaughtExceptionHandler((t, throwable) -> {
CrashHandler.handle(throwable);
System.exit(-1);
try{
CrashHandler.handle(throwable);
System.exit(-1);
}catch(Throwable crashCrash){
crashCrash.printStackTrace();
System.exit(-1);
}
});
break;
}