Merge pull request #176 from theSimpleCloud/fix/blank-space-in-name

Fix/blank space in name
theSimpleCloud · Feb 12, 2024 · 8ba1516 · 8ba1516
2 parents ae63f1b + f542d08
commit 8ba1516
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 6 deletions.
diff --git a/simplecloud-base/src/main/kotlin/eu/thesimplecloud/base/manager/commands/CreateCommand.kt b/simplecloud-base/src/main/kotlin/eu/thesimplecloud/base/manager/commands/CreateCommand.kt
@@ -83,7 +83,9 @@ class CreateCommand : ICommandHandler {
             Launcher.instance.consoleSender.sendProperty("manager.command.create.template.already-exist", name)
             return
         }
-        val template = DefaultTemplate(name)
+        val split = name.split(" ")
+        val templateName = split.joinToString("-")
+        val template = DefaultTemplate(templateName)
         templateManager.update(template)
         Launcher.instance.consoleSender.sendProperty("manager.command.create.template.success", name)
 

diff --git a/simplecloud-base/src/main/kotlin/eu/thesimplecloud/base/manager/setup/ServiceVersionSetup.kt b/simplecloud-base/src/main/kotlin/eu/thesimplecloud/base/manager/setup/ServiceVersionSetup.kt
@@ -50,7 +50,9 @@ class ServiceVersionSetup : ISetup {
 
     @SetupQuestion(0, "manager.setup.service-versions.question.name")
     fun nameSetup(name: String): Boolean {
-        this.name = name
+        val split = name.split(" ")
+        this.name = split.joinToString("-")
+
         Launcher.instance.consoleSender.sendPropertyInSetup("manager.setup.service-versions.question.name.success")
         return true
     }

diff --git a/simplecloud-base/src/main/kotlin/eu/thesimplecloud/base/manager/setup/WrapperSetup.kt b/simplecloud-base/src/main/kotlin/eu/thesimplecloud/base/manager/setup/WrapperSetup.kt
@@ -43,7 +43,12 @@ class WrapperSetup : ISetup {
             Launcher.instance.consoleSender.sendPropertyInSetup("manager.setup.wrapper.question.name.too-long")
             return false
         }
-        this.name = name
+        if (name.isEmpty()) {
+            Launcher.instance.consoleSender.sendPropertyInSetup("manager.setup.wrapper.question.name.empty")
+            return false
+        }
+        val split = name.split(" ")
+        this.name = split.joinToString("-")
         Launcher.instance.consoleSender.sendPropertyInSetup("manager.setup.wrapper.question.name.success")
         return true
     }

diff --git a/...cloud-base/src/main/kotlin/eu/thesimplecloud/base/manager/setup/groups/LobbyGroupSetup.kt b/...cloud-base/src/main/kotlin/eu/thesimplecloud/base/manager/setup/groups/LobbyGroupSetup.kt
@@ -53,7 +53,8 @@ open class LobbyGroupSetup : DefaultGroupSetup(), ISetup {
 
     @SetupQuestion(0, "manager.setup.service-group.question.name")
     fun nameQuestion(name: String): Boolean {
-        this.name = name
+        val split = name.split(" ")
+        this.name = split.joinToString("-")
         if (name.length > 32) {
             Launcher.instance.consoleSender.sendPropertyInSetup("manager.setup.service-group.question.name.too-long")
             return false

diff --git a/...cloud-base/src/main/kotlin/eu/thesimplecloud/base/manager/setup/groups/ProxyGroupSetup.kt b/...cloud-base/src/main/kotlin/eu/thesimplecloud/base/manager/setup/groups/ProxyGroupSetup.kt
@@ -52,7 +52,8 @@ class ProxyGroupSetup : DefaultGroupSetup(), ISetup {
 
     @SetupQuestion(0, "manager.setup.service-group.question.name")
     fun nameQuestion(name: String): Boolean {
-        this.name = name
+        val split = name.split(" ")
+        this.name = split.joinToString("-")
         if (name.length > 32) {
             Launcher.instance.consoleSender.sendPropertyInSetup("manager.setup.service-group.question.name.too-long")
             return false

diff --git a/...loud-base/src/main/kotlin/eu/thesimplecloud/base/manager/setup/groups/ServerGroupSetup.kt b/...loud-base/src/main/kotlin/eu/thesimplecloud/base/manager/setup/groups/ServerGroupSetup.kt
@@ -52,7 +52,8 @@ open class ServerGroupSetup : DefaultGroupSetup(), ISetup {
 
     @SetupQuestion(0, "manager.setup.service-group.question.name")
     fun nameQuestion(name: String): Boolean {
-        this.name = name
+        val split = name.split(" ")
+        this.name = split.joinToString("-")
         if (name.length > 32) {
             Launcher.instance.consoleSender.sendPropertyInSetup("manager.setup.service-group.question.name.too-long")
             return false

diff --git a/simplecloud-launcher/src/main/resources/language/de.json b/simplecloud-launcher/src/main/resources/language/de.json
@@ -177,6 +177,8 @@
   "manager.setup.wrapper.question.memory": "Wie viel Arbeitsspeicher soll dem Wrapper zugewiesen werden? (Angaben in Megabyte [Base 2])",
   "manager.setup.wrapper.question.memory.success": "Die Arbeitsspeicherangabe wurde gesetzt",
   "manager.setup.wrapper.question.name": "Welchen Namen soll der Wrapper haben?",
+  "manager.setup.wrapper.question.name.success": "Der Name wurde gesetzt",
+  "manager.setup.wrapper.question.name.too-long": "Der angegebene Name ist zu lang",
   "manager.setup.wrapper.question.start-services": "Wie viele Server soll der Wrapper gleichzeitig starten?",
   "manager.setup.wrapper.question.start-services.success": "Die Anzahl der gleichzeitig zu startenden Server wurde gesetzt",
   "manager.setup.wrapper.question.start-services.too-low": "Die angegebene Zahl ist zu gering",

diff --git a/simplecloud-launcher/src/main/resources/language/en.json b/simplecloud-launcher/src/main/resources/language/en.json
@@ -177,6 +177,8 @@
   "manager.setup.wrapper.question.memory": "How much memory does the wrapper have? (value as megabyte [base 2])",
   "manager.setup.wrapper.question.memory.success": "Memory set",
   "manager.setup.wrapper.question.name": "Which name shall the wrapper have?",
+  "manager.setup.wrapper.question.name.success": "Name set",
+  "manager.setup.wrapper.question.name.too-long": "The specified name is too long",
   "manager.setup.wrapper.question.start-services": "How much services shall the wrapper can start simultaneously?",
   "manager.setup.wrapper.question.start-services.success": "Max simultaneously starting services set",
   "manager.setup.wrapper.question.start-services.too-low": "The specified amount is too low",