Switch to GameAddress type

This basically ensures that, by having an instance of this class, you have a valid stringified host and port pair, at least according to Google's HostAndPort class.

Author: Protonull

mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/DimensionChunkMeta.java

@@ -1,5 +1,6 @@
 package gjum.minecraft.mapsync.mod;
 
+import gjum.minecraft.mapsync.mod.data.GameAddress;
 import gjum.minecraft.mapsync.mod.data.RegionPos;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -10,7 +11,6 @@
 import java.nio.file.attribute.FileTime;
 import java.util.Arrays;
 import java.util.HashMap;
-import net.minecraft.client.Minecraft;
 import net.minecraft.world.level.ChunkPos;
 
 /**
@@ -19,17 +19,17 @@
  * Each region's LastModifiedTime is set to the oldest contained chunk (or 0 if any chunks are absent), to easily find regions to request from the sync server.
  */
 public class DimensionChunkMeta {
-	public final String mcServerName;
+	public final GameAddress gameAddress;
 	public final String dimensionName;
 	private final String dimensionDirPath;
 
 	private final HashMap<RegionPos, long[]> regionsTimestamps = new HashMap<>();
 
-	DimensionChunkMeta(String mcServerName, String dimensionName) {
-		this.mcServerName = mcServerName;
+	DimensionChunkMeta(GameAddress gameAddress, String dimensionName) {
+		this.gameAddress = gameAddress;
 		this.dimensionName = dimensionName;
 		var dir = Path.of(MapSyncMod.getConfigDirectory().getAbsolutePath(), "cache",
-				mcServerName.replaceAll(":", "~"), dimensionName.replaceAll(":", "~"));
+				gameAddress.asFsName(), dimensionName.replaceAll(":", "~"));
 		dir.toFile().mkdirs();
 		this.dimensionDirPath = dir.toAbsolutePath().toString();
 	}

mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/DimensionState.java

@@ -4,6 +4,7 @@
 
 import gjum.minecraft.mapsync.mod.data.CatchupChunk;
 import gjum.minecraft.mapsync.mod.data.ChunkTile;
+import gjum.minecraft.mapsync.mod.data.GameAddress;
 import gjum.minecraft.mapsync.mod.data.RegionPos;
 import java.util.List;
 import net.minecraft.client.Minecraft;
@@ -26,10 +27,10 @@ public class DimensionState {
 	private int numChunksReceived = 0;
 	private int numChunksRendered = 0;
 
-	DimensionState(String mcServerName, ResourceKey<Level> dimension) {
+	DimensionState(GameAddress gameAddress, ResourceKey<Level> dimension) {
 		this.dimension = dimension;
 		String dimensionName = dimension.identifier().toString();
-		chunkMeta = new DimensionChunkMeta(mcServerName, dimensionName);
+		chunkMeta = new DimensionChunkMeta(gameAddress, dimensionName);
 		renderQueue = new RenderQueue(this);
 		catchup = new CatchupLogic(this);
 	}

mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/MapSyncMod.java

@@ -7,6 +7,7 @@
 import gjum.minecraft.mapsync.mod.config.ServerConfig;
 import gjum.minecraft.mapsync.mod.data.CatchupChunk;
 import gjum.minecraft.mapsync.mod.data.ChunkTile;
+import gjum.minecraft.mapsync.mod.data.GameAddress;
 import gjum.minecraft.mapsync.mod.data.RegionPos;
 import gjum.minecraft.mapsync.mod.net.CloseContext;
 import gjum.minecraft.mapsync.mod.net.Packet;
@@ -165,9 +166,7 @@ public void handleRespawn(ClientboundRespawnPacket packet) {
 			serverConfig = null;
 			return null;
 		}
-		String gameAddress = currentServer.ip;
-		if (!gameAddress.contains(":")) gameAddress += ":25565";
-
+		GameAddress gameAddress = new GameAddress(currentServer.ip);
 		if (serverConfig == null) {
 			serverConfig = ServerConfig.load(gameAddress);
 		}

mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/config/ServerConfig.java

@@ -3,6 +3,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
+import gjum.minecraft.mapsync.mod.data.GameAddress;
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
@@ -16,7 +17,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class ServerConfig extends JsonConfig {
-	public String gameAddress;
+	public GameAddress gameAddress;
 
 	@Expose
 	private @NotNull List<String> syncServerAddresses = new ArrayList<>();
@@ -36,8 +37,8 @@ public void setSyncServerAddresses(@NotNull List<String> addresses) {
 		saveLater();
 	}
 
-	public static ServerConfig load(String gameAddress) {
-		var dir = Path.of(MapSyncMod.getConfigDirectory().getAbsolutePath(), gameAddress.replaceAll(":", "~")).toFile();
+	public static ServerConfig load(GameAddress gameAddress) {
+		var dir = Path.of(MapSyncMod.getConfigDirectory().getAbsolutePath(), gameAddress.asFsName()).toFile();
 		dir.mkdirs();
 		var conf = load(new File(dir, "server-config.json"), ServerConfig.class);
 		conf.gameAddress = gameAddress;
@@ -60,7 +61,8 @@ private static void loadDefaults(ServerConfig conf) {
 			String json = new String(input.readAllBytes(), StandardCharsets.UTF_8);
 			JsonObject root = new Gson().fromJson(json, JsonObject.class);
 			JsonObject servers = root.get("servers").getAsJsonObject();
-			JsonObject server = servers.get(conf.gameAddress).getAsJsonObject();
+			// TODO: Don't get, instead iterate through keys
+			JsonObject server = servers.get(conf.gameAddress.address()).getAsJsonObject();
 			defaults = GSON.fromJson(server, ServerConfig.class);
 		} catch (IllegalStateException | NullPointerException ignored) {
 			return;

mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/data/GameAddress.java

@@ -0,0 +1,31 @@
+package gjum.minecraft.mapsync.mod.data;
+
+import com.google.common.net.HostAndPort;
+import java.util.Objects;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public record GameAddress(
+	@NotNull String address
+) {
+	public GameAddress {
+		Objects.requireNonNull(address);
+		address = HostAndPort.fromString(address).withDefaultPort(25565).toString();
+	}
+
+	public static @Nullable GameAddress from(
+		final String address
+	) {
+		try {
+			return new GameAddress(address);
+		}
+		catch (final Exception e) {
+			return null;
+		}
+	}
+
+	/// Returns a version of this game address that's valid for file/folder names.
+	public @NotNull String asFsName() {
+		return this.address().replace(":", "~");
+	}
+}

mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/net/SyncClient.java

@@ -2,6 +2,7 @@
 
 import gjum.minecraft.mapsync.mod.MapSyncMod;
 import gjum.minecraft.mapsync.mod.data.ChunkTile;
+import gjum.minecraft.mapsync.mod.data.GameAddress;
 import gjum.minecraft.mapsync.mod.deps.websockets.client.WebSocketClient;
 import gjum.minecraft.mapsync.mod.deps.websockets.drafts.Draft;
 import gjum.minecraft.mapsync.mod.deps.websockets.drafts.Draft_6455;
@@ -63,7 +64,7 @@ public synchronized void setServerKnownChunkHash(ChunkPos chunkPos, byte[] hash)
 
 	public final long clientId;
 	public final String syncAddress;
-	public final String gameAddress;
+	public final GameAddress gameAddress;
 
 	/// false = don't auto-reconnect but maintain connection as long as it stays up.
 	/// can be set to true again later.
@@ -74,7 +75,7 @@ public synchronized void setServerKnownChunkHash(ChunkPos chunkPos, byte[] hash)
 
 	public SyncClient(
 		final @NotNull String syncAddress,
-		final @NotNull String gameAddress
+		final @NotNull GameAddress gameAddress
 	) {
 		this.clientId = LAST_CLIENT_ID.incrementAndGet();
 		this.syncAddress = Objects.requireNonNull(syncAddress);

mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/net/SyncClients.java

@@ -1,8 +1,8 @@
 package gjum.minecraft.mapsync.mod.net;
 
-import com.google.common.net.HostAndPort;
 import gjum.minecraft.mapsync.mod.MapSyncMod;
 import gjum.minecraft.mapsync.mod.config.ServerConfig;
+import gjum.minecraft.mapsync.mod.data.GameAddress;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.HashSet;
@@ -23,12 +23,12 @@
 public final class SyncClients implements Iterable<SyncClient> {
 	private static final Logger LOGGER = LoggerFactory.getLogger(SyncClients.class);
 
-	public final String gameAddress;
+	public final GameAddress gameAddress;
 	public final ServerConfig serverConfig;
 	private final Map<String, SyncClient> clients = new ConcurrentHashMap<>();
 
 	public SyncClients(
-		final @NotNull String gameAddress,
+		final @NotNull GameAddress gameAddress,
 		final @NotNull ServerConfig serverConfig
 	) {
 		this.gameAddress = Objects.requireNonNull(gameAddress);
@@ -135,16 +135,7 @@ public static void initEvents() {
 				LOGGER.error("Connection doesn't have server data yet... backing out");
 				return;
 			}
-			final String gameAddress; {
-				final String ip = serverData.ip;
-				try {
-					gameAddress = HostAndPort.fromString(ip).withDefaultPort(25565).toString();
-				}
-				catch (final Exception e) {
-					LOGGER.error("Weirdly could not pass {} as a game address... backing out", ip, e);
-					return;
-				}
-			}
+			final GameAddress gameAddress = new GameAddress(serverData.ip);
 			final ServerConfig serverConfig;
 			try {
 				serverConfig = ServerConfig.load(gameAddress);

mapsync-mod/src/main/java/gjum/minecraft/mapsync/mod/net/packet/ServerboundHandshakePacket.java

@@ -1,5 +1,6 @@
 package gjum.minecraft.mapsync.mod.net.packet;
 
+import gjum.minecraft.mapsync.mod.data.GameAddress;
 import gjum.minecraft.mapsync.mod.net.Packet;
 import gjum.minecraft.mapsync.mod.net.buffers.BufferWriter;
 import gjum.minecraft.mapsync.mod.utils.Assertions;
@@ -11,7 +12,7 @@
 /// - Next: [ClientboundIdentityRequestPacket]
 public record ServerboundHandshakePacket(
 	@NotNull String modVersion,
-	@NotNull String gameAddress,
+	@NotNull GameAddress gameAddress,
 	@NotNull String dimension
 ) implements Packet {
 	public static final int PACKET_ID = 1;
@@ -27,7 +28,7 @@ public void write(
 		final @NotNull BufferWriter writer
 	) throws Exception {
 		writer.writeString(this.modVersion());
-		writer.writeString(this.gameAddress());
+		writer.writeString(this.gameAddress().address());
 		writer.writeString(this.dimension());
 	}
 }