mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-19 20:27:44 +07:00
Code Issues Packages Projects Releases Wiki Activity

Extensive network refactor

Browse Source
This commit is contained in:
Anuken
2019-09-07 14:11:50 -04:00
parent 38fe99f10e
commit e90c8c4d3e
48 changed files with 781 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,9 +19,8 @@ import io.anuke.mindustry.io.*;
import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.maps.*;
import io.anuke.mindustry.net.Administration.*;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.Packets.*;
import io.anuke.mindustry.plugin.Plugins;
import io.anuke.mindustry.plugin.*;
import io.anuke.mindustry.plugin.Plugins.*;
import io.anuke.mindustry.type.*;
@ -169,7 +168,7 @@ public class ServerControl implements ApplicationListener{
}else{
netServer.kickAll(KickReason.gameover);
state.set(State.menu);
Net.closeServer();
net.closeServer();
}
});
@ -203,12 +202,12 @@ public class ServerControl implements ApplicationListener{
handler.register("exit", "Exit the server application.", arg -> {
info("Shutting down server.");
Net.dispose();
net.dispose();
Core.app.exit();
});
handler.register("stop", "Stop hosting the server.", arg -> {
Net.closeServer();
net.closeServer();
if(lastTask != null) lastTask.cancel();
state.set(State.menu);
info("Stopped server.");
@ -534,7 +533,7 @@ public class ServerControl implements ApplicationListener{
if(target != null){
Call.sendMessage("[scarlet] " + target.name + " has been kicked by the server.");
netServer.kick(target.con.id, KickReason.kick);
target.con.kick(KickReason.kick);
info("It is done.");
}else{
info("Nobody with that name could be found...");
@ -563,7 +562,7 @@ public class ServerControl implements ApplicationListener{
for(Player player : playerGroup.all()){
if(netServer.admins.isIDBanned(player.uuid)){
Call.sendMessage("[scarlet] " + player.name + " has been banned.");
netServer.kick(player.con.id, KickReason.banned);
player.con.kick(KickReason.banned);
}
}
});
@ -830,7 +829,7 @@ public class ServerControl implements ApplicationListener{
r.run();
}catch(MapException e){
Log.err(e.map.name() + ": " + e.getMessage());
Net.closeServer();
net.closeServer();
}
}
};
@ -843,7 +842,7 @@ public class ServerControl implements ApplicationListener{
private void host(){
try{
Net.host(Core.settings.getInt("port"));
net.host(Core.settings.getInt("port"));
info("&lcOpened a server on port {0}.", Core.settings.getInt("port"));
}catch(BindException e){
Log.err("Unable to host: Port already in use! Make sure no other servers are running on the same port in your network.");

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

@ -1,18 +1,18 @@
package io.anuke.mindustry.server;
import io.anuke.arc.backends.headless.HeadlessApplication;
import io.anuke.arc.backends.headless.*;
import io.anuke.mindustry.*;
import io.anuke.mindustry.core.*;
import io.anuke.mindustry.net.*;
import static io.anuke.mindustry.Vars.platform;
public class ServerLauncher{
public static void main(String[] args){
try{
Net.setClientProvider(new ArcNetClient());
Net.setServerProvider(new ArcNetServer());
Vars.platform = new Platform(){};
Vars.platform = ArcNetImpl::new;
Vars.net = new Net(platform.getNet());
new HeadlessApplication(new MindustryServer(args), null, throwable -> CrashSender.send(throwable, f -> {}));
}catch(Throwable t){
CrashSender.send(t, f -> {});