diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9bda8f9..79cea6f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,11 +21,11 @@ jobs: - name: Upload Artifact - Make Directory run: | mkdir -p finalApproach; - cp server/target/server-1.1.1.jar finalApproach/server.jar; - cp updater/target/updater-1.1.1-jar-with-dependencies.jar finalApproach/launcher.jar; - cp updater/target/updater-1.1.1-jar-with-dependencies.jar finalApproach/newlauncher.jar; + cp server/target/server-1.1.2.jar finalApproach/server.jar; + cp updater/target/updater-1.1.2-jar-with-dependencies.jar finalApproach/launcher.jar; + cp updater/target/updater-1.1.2-jar-with-dependencies.jar finalApproach/newlauncher.jar; cp scripts/start.bat finalApproach/; - uses: actions/upload-artifact@v3 with: - name: final-approach-1.1.1 + name: final-approach-1.1.2 path: finalApproach diff --git a/pom.xml b/pom.xml index 10e450f..2165a2a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ pom - 1.1.1 + 1.1.2 Removed NitriteDB as main database, instead using ObjectMapper and plain JSON (faster and stable) diff --git a/server/pom.xml b/server/pom.xml index b6667ab..760e43b 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -12,7 +12,7 @@ - 1.1.1 + 1.1.2 de.pietro.lusso server diff --git a/server/src/main/java/de/pietro/lusso/territory/services/DatabaseService.java b/server/src/main/java/de/pietro/lusso/territory/services/DatabaseService.java index b30602a..b26483c 100644 --- a/server/src/main/java/de/pietro/lusso/territory/services/DatabaseService.java +++ b/server/src/main/java/de/pietro/lusso/territory/services/DatabaseService.java @@ -20,6 +20,7 @@ import javax.annotation.PostConstruct; import java.io.*; +import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.attribute.FileTime; import java.text.ParseException; @@ -58,6 +59,8 @@ public class DatabaseService { @PostConstruct public void initService() throws Exception { + System.out.println(Charset.defaultCharset()); + objectMapper = new ObjectMapper(); objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); diff --git a/updater/src/main/java/de/pietro/lusso/updater/FinalApproachLauncher.java b/updater/src/main/java/de/pietro/lusso/updater/FinalApproachLauncher.java index 599008f..2552ded 100644 --- a/updater/src/main/java/de/pietro/lusso/updater/FinalApproachLauncher.java +++ b/updater/src/main/java/de/pietro/lusso/updater/FinalApproachLauncher.java @@ -30,10 +30,10 @@ public class FinalApproachLauncher extends JFrame { private ObjectMapper objectMapper; private Process proc; private boolean stop = false; - private static String jarStarterCommand = "java -jar server.jar";; + private static String jarStarterCommand = "java -Dfile.encoding=UTF-8 -jar server.jar";; public static void main(String [] args) throws IOException, InterruptedException { - System.out.println("FinalApproachLauncher ..."); + System.out.println("FinalApproachLauncher 1.1.1 ..."); if (args.length > 0) { jarStarterCommand = ""; for (String arg : args) { @@ -202,6 +202,7 @@ private boolean checkForUpdates() { downloadUpdate(remoteVersion); objectMapper.writeValue(versionInfoFile, remoteVersion); versionInfo = remoteVersion; + setTitle("Final-Approach Launcher - Version " + versionInfo); return true; } else { System.out.println("same old version");