Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/blank space in name #176

Merged
merged 4 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ plugins {
allprojects {

group 'eu.thesimplecloud.simplecloud'
version '2.7.1-SNAPSHOT'
version '2.7.1'

repositories {
mavenCentral()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions simplecloud-launcher/src/main/resources/language/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions simplecloud-launcher/src/main/resources/language/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down