Merge pull request #83 from theSimpleCloud/dev/2.0

Dev/2.0

simplecloud-base/src/main/kotlin/eu/thesimplecloud/base/manager/update/converter/Converter_2_3_To_2_4.kt

@@ -40,6 +40,22 @@ class Converter_2_3_To_2_4 : IVersionConverter {
 
     override fun convert() {
         convertGroupConfigs()
+        convertLanguageFile()
+    }
+
+    private fun convertLanguageFile() {
+        val languagesDir = File(DirectoryPaths.paths.languagesPath)
+        if (!languagesDir.exists())
+            return
+        languagesDir.listFiles()?.forEach {
+            replaceAndToParagraph(it)
+        }
+    }
+
+    private fun replaceAndToParagraph(file: File) {
+        val lines = file.readLines()
+        val newLines = lines.map { it.replace("&", "§") }
+        file.writeText(newLines.joinToString("\n"))
     }
 
     private fun convertGroupConfigs() {

simplecloud-launcher/src/main/resources/language/de.json

@@ -4,7 +4,7 @@
   "commandmanager.onlyconsole": "Dieser Befehl kann nur über die Konsole ausgeführt werden",
   "commands.help.header": "Hilfe | Alle Befehle (%SIZE%)",
   "commands.help.command": ">> %PATH% (%DESCRIPTION%)",
-  "commands.help.command.ingame": "&7>> %PATH%",
+  "commands.help.command.ingame": "§7>> %PATH%",
   "ingame.no-fallback-server-found": "§cEs wurde kein Ausweichserver gefunden",
   "ingame.no-permission": "§cDu hast nicht die benötigte Berechtigung, um diesen Server betreten zu können",
   "ingame.service-not-registered": "§cDieser Server ist nicht in der Cloud registriert",
@@ -63,9 +63,9 @@
   "manager.command.edit.service.state.success": "State gesetzt",
   "manager.command.edit.service.displayname.success": "Display Name gesetzt",
   "manager.command.edit.service.maxplayers.success": "Maximale Spieler gesetzt",
-  "manager.command.execute.service-not-found": "&cServer nicht gefunden",
-  "manager.command.execute.success": "&aBefehl ausgeführt",
-  "manager.command.execute.usage": "&cBenutzung: execute <Server> <Befehl>",
+  "manager.command.execute.service-not-found": "§cServer nicht gefunden",
+  "manager.command.execute.success": "§aBefehl ausgeführt",
+  "manager.command.execute.usage": "§cBenutzung: execute <Server> <Befehl>",
   "manager.command.info.group.not-exist": "Die angegebene Gruppe existiert nicht",
   "manager.command.info.onlinecount": "Spieleranzahl: %COUNT%",
   "manager.command.info.player.not-exist": "Der angegebene Spieler existiert nicht",
@@ -82,9 +82,9 @@
   "manager.command.shutdowngroup.failure": "Zurzeit sind keine Server der Gruppe %GROUP% online",
   "manager.command.shutdowngroup.success": "Stoppe alle Server der Gruppe %GROUP%",
   "manager.command.start.success": "Es werden %COUNT% neue Server der Gruppe %GROUP% gestartet",
-  "manager.command.startstatic.group-not-static": "&cDie angegebene Gruppe ist &cnicht &estatisch",
-  "manager.command.startstatic.service-already-online": "&cDer angegebene Server ist &cbereits &7online",
-  "manager.command.startstatic.service-invalid": "&cDer angegebene Server ist ungültig",
+  "manager.command.startstatic.group-not-static": "§cDie angegebene Gruppe ist §cnicht §estatisch",
+  "manager.command.startstatic.service-already-online": "§cDer angegebene Server ist §cbereits §7online",
+  "manager.command.startstatic.service-invalid": "§cDer angegebene Server ist ungültig",
   "manager.command.startstatic.success": "Starte Server...",
   "manager.connection.unknown-host": "Ein Client hat versucht, von einem unbekannten Host sich zu verbinden: %HOST%",
   "manager.converted": "Umgewandelt von %PREVIOUS% zu %CURRENT%",

simplecloud-launcher/src/main/resources/language/en.json

@@ -4,7 +4,7 @@
   "commandmanager.onlyconsole": "This command can only be executed via the console",
   "commands.help.header": "Help | All commands (%SIZE%)",
   "commands.help.command": ">> %PATH% (%DESCRIPTION%)",
-  "commands.help.command.ingame": "&7>> %PATH%",
+  "commands.help.command.ingame": "§7>> %PATH%",
   "ingame.no-fallback-server-found": "§cNo fallback server found",
   "ingame.no-permission": "§cYou don't have the permission to join this service",
   "ingame.service-not-registered": "§cServer is not registered on the cloud",
@@ -64,9 +64,9 @@
   "manager.command.edit.service.state.success": "State set",
   "manager.command.edit.service.displayname.success": "Display Name set",
   "manager.command.edit.service.maxplayers.success": "Max players set",
-  "manager.command.execute.service-not-found": "&cService not found",
-  "manager.command.execute.success": "&aExecuted command",
-  "manager.command.execute.usage": "&cUsage: execute <service> <command>",
+  "manager.command.execute.service-not-found": "§cService not found",
+  "manager.command.execute.success": "§aExecuted command",
+  "manager.command.execute.usage": "§cUsage: execute <service> <command>",
   "manager.command.info.group.not-exist": "The specified group does not exist",
   "manager.command.info.onlinecount": "Online count: %COUNT%",
   "manager.command.info.player.not-exist": "The specified player does not exist",
@@ -83,9 +83,9 @@
   "manager.command.shutdowngroup.failure": "There are no running services of group %GROUP%",
   "manager.command.shutdowngroup.success": "Stopping all services of group %GROUP%",
   "manager.command.start.success": "Trying to start %COUNT% new services of group %GROUP%",
-  "manager.command.startstatic.group-not-static": "&cThe specified service group must be static",
-  "manager.command.startstatic.service-already-online": "&cThe specified service is already running",
-  "manager.command.startstatic.service-invalid": "&cThe specified service is invalid",
+  "manager.command.startstatic.group-not-static": "§cThe specified service group must be static",
+  "manager.command.startstatic.service-already-online": "§cThe specified service is already running",
+  "manager.command.startstatic.service-invalid": "§cThe specified service is invalid",
   "manager.command.startstatic.success": "Starting service..",
   "manager.connection.unknown-host": "A client connected from an unknown host: %HOST%",
   "manager.converted": "Converted from %PREVIOUS% to %CURRENT%",