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

Optional custom displayed gamemode

Browse Source
This commit is contained in:
Anuken
2020-08-13 14:59:27 -04:00
parent e1f0564d0b
commit f361ac27e0
7 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/net/Host.java
View File

@@ -1,5 +1,6 @@
package mindustry.net;
import arc.util.ArcAnnotate.*;
import mindustry.*;
import mindustry.game.*;
@@ -12,9 +13,10 @@ public class Host{
public final int version;
public final String versionType;
public final Gamemode mode;
public final @Nullable String modeName;
public int ping, port = Vars.port;
public Host(String name, String address, String mapname, int wave, int players, int version, String versionType, Gamemode mode, int playerLimit, String description){
public Host(String name, String address, String mapname, int wave, int players, int version, String versionType, Gamemode mode, int playerLimit, String description, String modeName){
this.name = name;
this.address = address;
this.players = players;
@@ -25,5 +27,6 @@ public class Host{
this.playerLimit = playerLimit;
this.mode = mode;
this.description = description;
this.modeName = modeName;
}
}

10
core/src/mindustry/net/NetworkIO.java
View File

@@ -68,10 +68,10 @@ public class NetworkIO{
String description = headless && !Config.desc.string().equals("off") ? Config.desc.string() : "";
String map = state.map.name();
ByteBuffer buffer = ByteBuffer.allocate(512);
ByteBuffer buffer = ByteBuffer.allocate(500);
writeString(buffer, name, 100);
writeString(buffer, map);
writeString(buffer, map, 64);
buffer.putInt(Core.settings.getInt("totalPlayers", Groups.player.size()));
buffer.putInt(state.wave);
@@ -82,6 +82,9 @@ public class NetworkIO{
buffer.putInt(netServer.admins.getPlayerLimit());
writeString(buffer, description, 100);
if(state.rules.modeName != null){
writeString(buffer, state.rules.modeName, 50);
}
return buffer;
}
@@ -95,8 +98,9 @@ public class NetworkIO{
Gamemode gamemode = Gamemode.all[buffer.get()];
int limit = buffer.getInt();
String description = readString(buffer);
String modeName = readString(buffer);
return new Host(host, hostAddress, map, wave, players, version, vertype, gamemode, limit, description);
return new Host(host, hostAddress, map, wave, players, version, vertype, gamemode, limit, description, modeName.isEmpty() ? null : modeName);
}
private static void writeString(ByteBuffer buffer, String string, int maxlen){