diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java index e5e0335f212a22be8ae3c268c28e001ee7162501..821e550fa965efefc270d13d7c332146c6cfc208 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java +++ b/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); } diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/StartupThread.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/StartupThread.java new file mode 100644 index 0000000000000000000000000000000000000000..a7ad2fddfea2cc499a0de9994f1bfe2b193f87aa --- /dev/null +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/StartupThread.java @@ -0,0 +1,28 @@ +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); + } + } + +} diff --git a/src/main/resources/player/appSettings.json b/src/main/resources/player/appSettings.json index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ac6b7e58fa58ee25e2070c5cdfb9b8324bdddc6b 100644 --- a/src/main/resources/player/appSettings.json +++ b/src/main/resources/player/appSettings.json @@ -0,0 +1,4 @@ +{ + "sfxVolume": 50, + "musicVolume": 50 +} \ No newline at end of file