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

🔥🔥🔥🔥🔥🔥maximum breakage

Browse Source
This commit is contained in:
Anuken
2018-12-20 12:38:27 -05:00
parent cabcfc7136
commit 94908bc599
309 changed files with 1883 additions and 1951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,9 +6,9 @@ import com.badlogic.gdx.utils.JsonWriter.OutputType;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.game.Version;
import io.anuke.mindustry.net.Net;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.util.Log;
import io.anuke.ucore.util.OS;
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;
@@ -29,7 +29,7 @@ public class CrashHandler{
//if getting the crash report property failed, OR if it set to false... don't send it
try{
if(!Settings.getBool("crashreport")) return;
if(!Core.settings.getBool("crashreport")) return;
}catch(Throwable ignored){
return;
}

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

@@ -6,7 +6,7 @@ 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.ucore.modules.ModuleCore;
import io.anuke.arc.modules.ModuleCore;
import static io.anuke.mindustry.Vars.*;

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

@@ -23,14 +23,14 @@ 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.ucore.core.*;
import io.anuke.ucore.modules.Module;
import io.anuke.ucore.util.CommandHandler;
import io.anuke.ucore.util.CommandHandler.Command;
import io.anuke.ucore.util.CommandHandler.Response;
import io.anuke.ucore.util.CommandHandler.ResponseType;
import io.anuke.ucore.util.Log;
import io.anuke.ucore.util.Strings;
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;
@@ -38,7 +38,7 @@ import java.time.format.DateTimeFormatter;
import java.util.Scanner;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.ucore.util.Log.*;
import static io.anuke.arc.util.Log.*;
public class ServerControl extends Module{
private static final int roundExtraTime = 12;
@@ -55,7 +55,7 @@ public class ServerControl extends Module{
public ServerControl(String[] args){
Settings.defaultList(
Core.settings.defaultList(
"shufflemode", "normal",
"bans", "",
"admins", "",
@@ -90,13 +90,13 @@ public class ServerControl extends Module{
String result = "[" + dateTime.format(LocalDateTime.now()) + "] " + format(text + "&fr", args);
System.out.println(result);
if(Settings.getBool("logging")){
if(Core.settings.getBool("logging")){
logToFile("[" + dateTime.format(LocalDateTime.now()) + "] " + format(text + "&fr", false, args));
}
}
});
Timers.setDeltaProvider(() -> Gdx.graphics.getDeltaTime() * 60f);
Time.setDeltaProvider(() -> Gdx.graphics.getDeltaTime() * 60f);
Effects.setScreenShakeProvider((a, b) -> {});
Effects.setEffectProvider((a, b, c, d, e, f) -> {});
Sounds.setHeadless(true);
@@ -136,8 +136,8 @@ public class ServerControl extends Module{
world.sectors.save();
gameOvers = 0;
inExtraRound = true;
Settings.putInt("sector_x", world.getSector().x + 1);
Settings.save();
Core.settings.putInt("sector_x", world.getSector().x + 1);
Core.settings.save();
Call.onInfoMessage("[accent]Sector conquered![]\n" + roundExtraTime + " seconds until deployment in next sector.");
@@ -148,7 +148,7 @@ public class ServerControl extends Module{
if(inExtraRound) return;
info("Game over!");
if(Settings.getBool("shuffle")){
if(Core.settings.getBool("shuffle")){
if(world.getSector() == null){
if(world.maps.all().size > 0){
Array<Map> maps = world.maps.customMaps().size == 0 ? world.maps.defaultMaps() : world.maps.customMaps();
@@ -174,13 +174,13 @@ public class ServerControl extends Module{
}else{
Call.onInfoMessage("[SCARLET]Sector has been lost.[]\nRe-deploying in " + roundExtraTime + " seconds.");
if(gameOvers >= 2){
Settings.putInt("sector_y", Settings.getInt("sector_y") < 0 ? Settings.getInt("sector_y") + 1 : Settings.getInt("sector_y") - 1);
Settings.save();
Core.settings.putInt("sector_y", Core.settings.getInt("sector_y") < 0 ? Core.settings.getInt("sector_y") + 1 : Core.settings.getInt("sector_y") - 1);
Core.settings.save();
gameOvers = 0;
}
gameOvers ++;
playSectorMap();
info("Re-trying sector map: {0} {1}", Settings.getInt("sector_x"), Settings.getInt("sector_y"));
info("Re-trying sector map: {0} {1}", Core.settings.getInt("sector_x"), Core.settings.getInt("sector_y"));
}
}else{
netServer.kickAll(KickReason.gameover);
@@ -261,7 +261,7 @@ public class ServerControl extends Module{
logic.play();
}else{
info("&fiNo map specified. Loading sector {0}, {1}.", Settings.getInt("sector_x"), Settings.getInt("sector_y"));
info("&fiNo map specified. Loading sector {0}, {1}.", Core.settings.getInt("sector_x"), Core.settings.getInt("sector_y"));
playSectorMap(false);
}
@@ -272,7 +272,7 @@ public class ServerControl extends Module{
handler.register("port", "[port]", "Sets or displays the port for hosting the server.", arg -> {
if(arg.length == 0){
info("&lyPort: &lc{0}", Settings.getInt("port"));
info("&lyPort: &lc{0}", Core.settings.getInt("port"));
}else{
int port = Strings.parseInt(arg[0]);
if(port < 0 || port > 65535){
@@ -280,8 +280,8 @@ public class ServerControl extends Module{
return;
}
info("&lyPort set to {0}.", port);
Settings.putInt("port", port);
Settings.save();
Core.settings.putInt("port", port);
Core.settings.save();
}
});
@@ -305,7 +305,7 @@ public class ServerControl extends Module{
info("&ly {0} seconds until next wave.", (int) (state.wavetime / 60));
}
info(" &ly{0} FPS.", (int) (60f / Timers.delta()));
info(" &ly{0} FPS.", (int) (60f / Time.delta()));
info(" &ly{0} MB used.", Gdx.app.getJavaHeap() / 1024 / 1024);
if(playerGroup.size() > 0){
@@ -341,9 +341,9 @@ public class ServerControl extends Module{
handler.register("setsector", "<x> <y>", "Sets the next sector to be played. Does not affect current game.", arg -> {
try{
Settings.putInt("sector_x", Integer.parseInt(arg[0]));
Settings.putInt("sector_y", Integer.parseInt(arg[1]));
Settings.save();
Core.settings.putInt("sector_x", Integer.parseInt(arg[0]));
Core.settings.putInt("sector_y", Integer.parseInt(arg[1]));
Core.settings.save();
info("Sector position set.");
}catch(NumberFormatException e){
err("Invalid coordinates.");
@@ -378,15 +378,15 @@ public class ServerControl extends Module{
handler.register("crashreport", "<on/off>", "Disables or enables automatic crash reporting", arg -> {
boolean value = arg[0].equalsIgnoreCase("on");
Settings.putBool("crashreport", value);
Settings.save();
Core.settings.putBool("crashreport", value);
Core.settings.save();
info("Crash reporting is now {0}.", value ? "on" : "off");
});
handler.register("logging", "<on/off>", "Disables or enables server logs", arg -> {
boolean value = arg[0].equalsIgnoreCase("on");
Settings.putBool("logging", value);
Settings.save();
Core.settings.putBool("logging", value);
Core.settings.save();
info("Logging is now {0}.", value ? "on" : "off");
});
@@ -419,8 +419,8 @@ public class ServerControl extends Module{
err("Invalid shuffle mode.");
return;
}
Settings.putBool("shuffle", arg[0].equals("on"));
Settings.save();
Core.settings.putBool("shuffle", arg[0].equals("on"));
Core.settings.save();
info("Shuffle mode set to '{0}'.", arg[0]);
});
@@ -712,7 +712,7 @@ public class ServerControl extends Module{
}
private void playSectorMap(boolean wait){
int x = Settings.getInt("sector_x"), y = Settings.getInt("sector_y");
int x = Core.settings.getInt("sector_x"), y = Core.settings.getInt("sector_y");
if(world.sectors.get(x, y) == null){
world.sectors.createSector(x, y);
}
@@ -758,8 +758,8 @@ public class ServerControl extends Module{
private void host(){
try{
Net.host(Settings.getInt("port"));
info("&lcOpened a server on port {0}.", Settings.getInt("port"));
Net.host(Core.settings.getInt("port"));
info("&lcOpened a server on port {0}.", Core.settings.getInt("port"));
}catch(IOException e){
err(e);
state.set(State.menu);

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

@@ -7,8 +7,8 @@ import com.badlogic.gdx.backends.headless.HeadlessApplicationConfiguration;
import io.anuke.kryonet.KryoClient;
import io.anuke.kryonet.KryoServer;
import io.anuke.mindustry.net.Net;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.util.EmptyLogger;
import io.anuke.arc.core.Settings;
import io.anuke.arc.util.EmptyLogger;
public class ServerLauncher extends HeadlessApplication{
@@ -26,7 +26,7 @@ public class ServerLauncher extends HeadlessApplication{
Net.setServerProvider(new KryoServer());
HeadlessApplicationConfiguration config = new HeadlessApplicationConfiguration();
Settings.setPrefHandler((appName) -> Gdx.files.local("config"));
Core.settings.setPrefHandler((appName) -> Gdx.files.local("config"));
new ServerLauncher(new MindustryServer(args), config);
}catch(Throwable t){