mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-30 14:39:10 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source
This commit is contained in:
Anuken
2022-01-10 23:43:18 -05:00
parent 125994482e cd88400154
commit d09039f6e6
8 changed files with 138 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
server/src/mindustry/server/ServerControl.java
View File

@ -45,6 +45,14 @@ public class ServerControl implements ApplicationListener{
public final CommandHandler handler = new CommandHandler("");
public final Fi logFolder = Core.settings.getDataDirectory().child("logs/");
public Runnable serverInput = () -> {
Scanner scan = new Scanner(System.in);
while(scan.hasNext()){
String line = scan.nextLine();
Core.app.post(() -> handleCommandString(line));
}
};
private Fi currentLogFile;
private boolean inExtraRound;
private Task lastTask;
@ -147,10 +155,6 @@ public class ServerControl implements ApplicationListener{
customMapDirectory.mkdirs();
Thread thread = new Thread(this::readCommands, "Server Controls");
thread.setDaemon(true);
thread.start();
if(Version.build == -1){
warn("&lyYour server is running a custom build, which means that client checking is disabled.");
warn("&lyIt is highly advised to specify which version you're using by building with gradle args &lb&fb-Pbuildversion=&lr<build>");
@ -258,7 +262,13 @@ public class ServerControl implements ApplicationListener{
toggleSocket(Config.socketInput.bool());
info("Server loaded. Type @ for help.", "'help'");
Events.on(ServerLoadEvent.class, e -> {
Thread thread = new Thread(serverInput, "Server Controls");
thread.setDaemon(true);
thread.start();
info("Server loaded. Type @ for help.", "'help'");
});
}
protected void registerCommands(){
@ -397,10 +407,9 @@ public class ServerControl implements ApplicationListener{
info(" Playing on map &fi@ / Wave @", Strings.capitalize(Strings.stripColors(state.map.name())), state.wave);
if(state.rules.waves){
info(" @ enemies.", state.enemies);
}else{
info(" @ seconds until next wave.", (int)(state.wavetime / 60));
}
info(" @ units / @ enemies", Groups.unit.size(), state.enemies);
info(" @ FPS, @ MB used.", Core.graphics.getFramesPerSecond(), Core.app.getJavaHeap() / 1024 / 1024);
@ -456,7 +465,6 @@ public class ServerControl implements ApplicationListener{
info("&fi&lcServer: &fr@", "&lw" + arg[0]);
});
handler.register("pause", "<on/off>", "Pause or unpause the game.", arg -> {
boolean pause = arg[0].equals("on");
state.serverPaused = pause;
@ -963,15 +971,7 @@ public class ServerControl implements ApplicationListener{
mods.eachClass(p -> p.registerServerCommands(handler));
}
private void readCommands(){
Scanner scan = new Scanner(System.in);
while(scan.hasNext()){
String line = scan.nextLine();
Core.app.post(() -> handleCommandString(line));
}
}
private void handleCommandString(String line){
public void handleCommandString(String line){
CommandResponse response = handler.handleMessage(line);
if(response.type == ResponseType.unknownCommand){