Merge branch 'DataBase' into 'development'

Thread added

See merge request !15

src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java

@@ -433,8 +433,7 @@ public class Persistence {
     }
 
     public void resetSettings(){
-        settings.setSfxVolume(50);
-        settings.setMusicVolume(50);
+        settings = new AppSettings(50, 50);
         try {
             gsonHandler.saveSettings(settings);
         }

src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/StartupThread.java

+package de.hdm_stuttgart.battlearena.Model.DataStorage.Classes;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class StartupThread extends Thread{
+
+    private static final Logger log = LogManager.getLogger(StartupThread.class);
+
+    @Override
+    public void run() {
+
+        Persistence persistenceInst = Persistence.getInstance();
+
+        try {
+            persistenceInst.loadSettings();
+            persistenceInst.loadCoreMaps();
+            persistenceInst.loadCommunityMaps();
+            persistenceInst.verifyAppSettings();
+            persistenceInst.verifyCoreMaps();
+            persistenceInst.verifyCommunityMaps();
+            log.info("Startup routine part1 complete!");
+        } catch (Exception e) {
+            log.error(e);
+        }
+    }
+
+}

src/main/resources/player/appSettings.json

+{
+  "sfxVolume": 50,
+  "musicVolume": 50
+}
\ No newline at end of file