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

Server qol (#5534)

Browse Source
This commit is contained in:
TranquillyUnpleasant
2021-07-04 21:18:41 -04:00
committed by GitHub
parent 4fdb817d4a
commit 789e354400
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/contributors
+1
View File
@@ -126,3 +126,4 @@ Skat
WilloIzCitron WilloIzCitron
SAMBUYYA SAMBUYYA
genNAowl genNAowl
TranquillyUnpleasant
server/src/mindustry/server/ServerControl.java
+28 -16
View File
@@ -163,9 +163,9 @@ public class ServerControl implements ApplicationListener{
Events.on(GameOverEvent.class, event -> { Events.on(GameOverEvent.class, event -> {
if(inExtraRound) return; if(inExtraRound) return;
if(state.rules.waves){ if(state.rules.waves){
info("Game over! Reached wave @ with @ players online on map @.", state.wave, Groups.player.size(), Strings.capitalize(state.map.name())); info("Game over! Reached wave @ with @ players online on map @.", state.wave, Groups.player.size(), Strings.capitalize(Strings.stripColors(state.map.name())));
}else{ }else{
info("Game over! Team @ is victorious with @ players online on map @.", event.winner.name, Groups.player.size(), Strings.capitalize(state.map.name())); info("Game over! Team @ is victorious with @ players online on map @.", event.winner.name, Groups.player.size(), Strings.capitalize(Strings.stripColors(state.map.name())));
} }
//set next map to be played //set next map to be played
@@ -174,14 +174,14 @@ public class ServerControl implements ApplicationListener{
if(map != null){ if(map != null){
Call.infoMessage((state.rules.pvp Call.infoMessage((state.rules.pvp
? "[accent]The " + event.winner.name + " team is victorious![]\n" : "[scarlet]Game over![]\n") ? "[accent]The " + event.winner.name + " team is victorious![]\n" : "[scarlet]Game over![]\n")
+ "\nNext selected map:[accent] " + map.name() + "[]" + "\nNext selected map:[accent] " + Strings.stripColors(map.name()) + "[]"
+ (map.tags.containsKey("author") && !map.tags.get("author").trim().isEmpty() ? " by[accent] " + map.author() + "[white]" : "") + "." + + (map.tags.containsKey("author") && !map.tags.get("author").trim().isEmpty() ? " by[accent] " + map.author() + "[white]" : "") + "." +
"\nNew game begins in " + roundExtraTime + " seconds."); "\nNew game begins in " + roundExtraTime + " seconds.");
state.gameOver = true; state.gameOver = true;
Call.updateGameOver(event.winner); Call.updateGameOver(event.winner);
info("Selected next map to be @.", map.name()); info("Selected next map to be @.", Strings.stripColors(map.name()));
play(true, () -> world.loadMap(map, map.applyRules(lastMode))); play(true, () -> world.loadMap(map, map.applyRules(lastMode)));
}else{ }else{
@@ -259,10 +259,20 @@ public class ServerControl implements ApplicationListener{
} }
protected void registerCommands(){ protected void registerCommands(){
handler.register("help", "Displays this command list.", arg -> { handler.register("help", "[command]", "Display the command list, or get help for a specific command.", arg -> {
info("Commands:"); if(arg.length > 0){
for(Command command : handler.getCommandList()){ Command command = handler.getCommandList().find(c -> c.text.equalsIgnoreCase(arg[0]));
info(" &b&lb " + command.text + (command.paramText.isEmpty() ? "" : " &lc&fi") + command.paramText + "&fr - &lw" + command.description); if(command == null){
err("Command " + arg[0] + " not found!");
}else{
info(command.text + ":");
info(" &b&lb " + command.text + (command.paramText.isEmpty() ? "" : " &lc&fi") + command.paramText + "&fr - &lw" + command.description);
}
}else{
info("Commands:");
for(Command command : handler.getCommandList()){
info(" &b&lb " + command.text + (command.paramText.isEmpty() ? "" : " &lc&fi") + command.paramText + "&fr - &lw" + command.description);
}
} }
}); });
@@ -306,7 +316,7 @@ public class ServerControl implements ApplicationListener{
Map result; Map result;
if(arg.length > 0){ if(arg.length > 0){
result = maps.all().find(map -> map.name().equalsIgnoreCase(arg[0].replace('_', ' ')) || map.name().equalsIgnoreCase(arg[0])); result = maps.all().find(map -> Strings.stripColors(map.name().replace('_', ' ')).equalsIgnoreCase(Strings.stripColors(arg[0]).replace('_', ' ')));
if(result == null){ if(result == null){
err("No map with name '@' found.", arg[0]); err("No map with name '@' found.", arg[0]);
@@ -335,14 +345,16 @@ public class ServerControl implements ApplicationListener{
} }
}); });
handler.register("maps", "Display all available maps.", arg -> { handler.register("maps", "[all]", "Display available maps. 'all' to include default maps.", arg -> {
boolean all = arg.length > 0 && arg[0].equalsIgnoreCase("all");
if(!maps.all().isEmpty()){ if(!maps.all().isEmpty()){
info("Maps:"); info("Maps:");
for(Map map : maps.all()){ for(Map map : all ? maps.all() : maps.customMaps()){
String mapName = Strings.stripColors(map.name()).replace(' ', '_');
if(map.custom){ if(map.custom){
info(" @ (@): &fiCustom / @x@", map.name().replace(' ', '_'), map.file.name(), map.width, map.height); info(" @ (@): &fiCustom / @x@", mapName, map.file.name(), map.width, map.height);
}else{ }else{
info(" @: &fiDefault / @x@", map.name().replace(' ', '_'), map.width, map.height); info(" @: &fiDefault / @x@", mapName, map.width, map.height);
} }
} }
}else{ }else{
@@ -366,7 +378,7 @@ public class ServerControl implements ApplicationListener{
info("Status: &rserver closed"); info("Status: &rserver closed");
}else{ }else{
info("Status:"); info("Status:");
info(" Playing on map &fi@ / Wave @", Strings.capitalize(state.map.name()), state.wave); info(" Playing on map &fi@ / Wave @", Strings.capitalize(Strings.stripColors(state.map.name())), state.wave);
if(state.rules.waves){ if(state.rules.waves){
info(" @ enemies.", state.enemies); info(" @ enemies.", state.enemies);
@@ -650,10 +662,10 @@ public class ServerControl implements ApplicationListener{
}); });
handler.register("nextmap", "<mapname...>", "Set the next map to be played after a game-over. Overrides shuffling.", arg -> { handler.register("nextmap", "<mapname...>", "Set the next map to be played after a game-over. Overrides shuffling.", arg -> {
Map res = maps.all().find(map -> map.name().equalsIgnoreCase(arg[0].replace('_', ' ')) || map.name().equalsIgnoreCase(arg[0])); Map res = maps.all().find(map -> Strings.stripColors(map.name().replace('_', ' ')).equalsIgnoreCase(Strings.stripColors(arg[0]).replace('_', ' ')));
if(res != null){ if(res != null){
nextMapOverride = res; nextMapOverride = res;
info("Next map set to '@'.", res.name()); info("Next map set to '@'.", Strings.stripColors(res.name()));
}else{ }else{
err("No map '@' found.", arg[0]); err("No map '@' found.", arg[0]);
} }