From b59d505725ebaa43288d9778567e6083c44bcb13 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 2 Apr 2024 07:17:31 -0500 Subject: [PATCH] Add IP only server folder mode --- .../api/enums/config/EServerFolderNameMode.java | 6 +++++- .../java/com/seibel/distanthorizons/core/config/Config.java | 1 + .../core/file/structure/ClientOnlySaveStructure.java | 3 +++ .../main/resources/assets/distanthorizons/lang/en_us.json | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EServerFolderNameMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EServerFolderNameMode.java index 944e61457..de7e9dcec 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EServerFolderNameMode.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EServerFolderNameMode.java @@ -22,6 +22,7 @@ package com.seibel.distanthorizons.api.enums.config; /** * NAME_ONLY,
+ * IP_ONLY,
* NAME_IP,
* NAME_IP_PORT,
* NAME_IP_PORT_MC_VERSION,

@@ -29,7 +30,7 @@ package com.seibel.distanthorizons.api.enums.config; * Determines how the multiplayer folders should be named. * * @author James Seibel - * @version 2022-7-1 + * @version 2024-4-2 * @since API 1.0.0 */ public enum EServerFolderNameMode @@ -42,6 +43,9 @@ public enum EServerFolderNameMode /** Only use the server name */ NAME_ONLY, + /** Only use the server IP */ + IP_ONLY, + /** * {SERVER_NAME} IP {IP}
* Example: Minecraft Server IP 192.168.1.40 diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java index 979b55c96..62ea54776 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java @@ -852,6 +852,7 @@ public class Config + "How should multiplayer save folders should be named? \n" + "\n" + EServerFolderNameMode.NAME_ONLY + ": Example: \"Minecraft Server\" \n" + + EServerFolderNameMode.IP_ONLY + ": Example: \"192.168.1.40\" \n" + EServerFolderNameMode.NAME_IP + ": Example: \"Minecraft Server IP 192.168.1.40\" \n" + EServerFolderNameMode.NAME_IP_PORT + ": Example: \"Minecraft Server IP 192.168.1.40:25565\"" + EServerFolderNameMode.NAME_IP_PORT_MC_VERSION + ": Example: \"Minecraft Server IP 192.168.1.40:25565 GameVersion 1.16.5\"") diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/structure/ClientOnlySaveStructure.java b/core/src/main/java/com/seibel/distanthorizons/core/file/structure/ClientOnlySaveStructure.java index 1060076fd..a0b900f8d 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/structure/ClientOnlySaveStructure.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/structure/ClientOnlySaveStructure.java @@ -277,6 +277,9 @@ public class ClientOnlySaveStructure extends AbstractSaveStructure case NAME_ONLY: folderName = serverName; break; + case IP_ONLY: + folderName = serverIpCleaned; + break; case NAME_IP: folderName = serverName + ", IP " + serverIpCleaned; diff --git a/core/src/main/resources/assets/distanthorizons/lang/en_us.json b/core/src/main/resources/assets/distanthorizons/lang/en_us.json index e8590d543..e72910bb7 100644 --- a/core/src/main/resources/assets/distanthorizons/lang/en_us.json +++ b/core/src/main/resources/assets/distanthorizons/lang/en_us.json @@ -813,6 +813,8 @@ "distanthorizons.config.enum.EServerFolderNameMode.NAME_ONLY": "Name Only", + "distanthorizons.config.enum.EServerFolderNameMode.IP_ONLY": + "IP Only", "distanthorizons.config.enum.EServerFolderNameMode.NAME_IP": "Name and IP", "distanthorizons.config.enum.EServerFolderNameMode.NAME_IP_PORT":