From b4ffd65fbc1c6b645b5f4550fb73c9a0e67f7233 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sat, 25 Feb 2023 09:02:42 -0600
Subject: [PATCH] remove deprecated getServerFolderName()

---
 .../structure/ClientOnlySaveStructure.java    | 13 +----
 .../com/seibel/lod/core/util/LodUtil.java     | 49 -------------------
 2 files changed, 1 insertion(+), 61 deletions(-)

diff --git a/core/src/main/java/com/seibel/lod/core/file/structure/ClientOnlySaveStructure.java b/core/src/main/java/com/seibel/lod/core/file/structure/ClientOnlySaveStructure.java
index 159b81433..e855a6ba4 100644
--- a/core/src/main/java/com/seibel/lod/core/file/structure/ClientOnlySaveStructure.java
+++ b/core/src/main/java/com/seibel/lod/core/file/structure/ClientOnlySaveStructure.java
@@ -187,18 +187,7 @@ public class ClientOnlySaveStructure extends AbstractSaveStructure
 		EServerFolderNameMode folderNameMode = Config.Client.Multiplayer.serverFolderNameMode.get();
 		if (folderNameMode == EServerFolderNameMode.AUTO)
 		{
-			if (parsedIp.isLan())
-			{
-				// LAN
-				folderNameMode = EServerFolderNameMode.NAME_IP;
-			}
-			else
-			{
-				// normal multiplayer
-				folderNameMode = EServerFolderNameMode.NAME_IP_PORT;
-			}
-			// TODO can we determine if a server is a Mojang operated Realm based on the IP?
-			// If so we should also default to either NAME_IP or just NAME
+			folderNameMode = EServerFolderNameMode.NAME_ONLY;
 		}
 		String serverName = MC_CLIENT.getCurrentServerName().replaceAll(INVALID_FILE_CHARACTERS_REGEX, "");
 		String serverMcVersion = MC_CLIENT.getCurrentServerVersion().replaceAll(INVALID_FILE_CHARACTERS_REGEX, "");
diff --git a/core/src/main/java/com/seibel/lod/core/util/LodUtil.java b/core/src/main/java/com/seibel/lod/core/util/LodUtil.java
index b34872d30..9940e79f7 100644
--- a/core/src/main/java/com/seibel/lod/core/util/LodUtil.java
+++ b/core/src/main/java/com/seibel/lod/core/util/LodUtil.java
@@ -172,55 +172,6 @@ public class LodUtil
 	}
 
 
-	/** returns the server name, IP and game version. */
-	@Deprecated // FIXME: There are soooo many duplicated methods doing the same thing everywhere
-	// Cloned to a7 package's DHFileHandler
-	public static String getServerFolderName()
-	{
-		// parse the current server's IP
-		ParsedIp parsedIp = new ParsedIp(MC_CLIENT.getCurrentServerIp());
-		String serverIpCleaned = parsedIp.ip.replaceAll(INVALID_FILE_CHARACTERS_REGEX, "");
-		String serverPortCleaned = parsedIp.port != null ? parsedIp.port.replaceAll(INVALID_FILE_CHARACTERS_REGEX, "") : "";
-		
-		
-		// determine the format of the folder name
-		EServerFolderNameMode folderNameMode = Config.Client.Multiplayer.serverFolderNameMode.get();
-		if (folderNameMode == EServerFolderNameMode.AUTO)
-		{
-			folderNameMode = EServerFolderNameMode.NAME_ONLY;
-		}
-			
-		
-		String serverName = MC_CLIENT.getCurrentServerName().replaceAll(INVALID_FILE_CHARACTERS_REGEX, "");
-		String serverMcVersion = MC_CLIENT.getCurrentServerVersion().replaceAll(INVALID_FILE_CHARACTERS_REGEX, "");
-		
-		// generate the folder name
-		String folderName = "";
-		switch (folderNameMode)
-		{
-		// default and auto shouldn't be used 
-		// and are just here to make the compiler happy
-		default:
-		case AUTO:
-		case NAME_ONLY:
-			folderName = serverName;
-			break;
-		
-		case NAME_IP:
-			folderName = serverName + ", IP " + serverIpCleaned;
-			break;
-		case NAME_IP_PORT:
-			folderName = serverName + ", IP " + serverIpCleaned + (serverPortCleaned.length() != 0 ? ("-" + serverPortCleaned) : "");
-			break;
-		case NAME_IP_PORT_MC_VERSION:
-			folderName = serverName + ", IP " + serverIpCleaned + (serverPortCleaned.length() != 0 ? ("-" + serverPortCleaned) : "") + ", GameVersion " + serverMcVersion;
-			break;
-		}
-		// PercentEscaper makes the characters all part of the standard alphameric character set
-		// This fixes some issues when the server is named something in other languages
-		return new PercentEscaper("", true).escape(folderName);
-	}
-	
 	public static int computeOverdrawOffset() {
 		int chunkRenderDist = MC_RENDER.getRenderDistance() + 1;
 		EVanillaOverdraw overdraw = Config.Client.Graphics.AdvancedGraphics.vanillaOverdraw.get();