diff --git a/src/de/bricked/game/Config.java b/src/de/bricked/game/Config.java
new file mode 100644
index 0000000000000000000000000000000000000000..138f2d65ef3956f88e8cacd20eac02082db5ee84
--- /dev/null
+++ b/src/de/bricked/game/Config.java
@@ -0,0 +1,14 @@
+package de.bricked.game;
+
+import tools.PathUtils;
+
+public class Config
+{
+ public final static String FILESYSTEM_ROOT_DIR = PathUtils.getOSindependentPath()+"/deadspaghetti/bricked/";
+ public final static String FILESYSTEM_LEVELPACK_SAVEDIR = FILESYSTEM_ROOT_DIR+"levelpacks/";
+
+ public final static String JAR_ROOT_DIR = "/de/bricked/resources/";
+ public final static String JAR_LEVELPACK_SAVEDIR = JAR_ROOT_DIR+"levelpacks/";
+ public final static String JAR_SOUND_SAVEDIR = JAR_ROOT_DIR + "sounds/";
+
+}
diff --git a/src/de/bricked/game/levels/LevelPackHandler.java b/src/de/bricked/game/levels/LevelPackHandler.java
index 216f162564bda1f268e2d28a0b8156855a3a84a8..dc27b337254d535d5fd5372069c2883a10862c71 100644
--- a/src/de/bricked/game/levels/LevelPackHandler.java
+++ b/src/de/bricked/game/levels/LevelPackHandler.java
@@ -1,5 +1,6 @@
package de.bricked.game.levels;
+import de.bricked.game.Config;
import de.bricked.utils.FileUtils;
import tools.PathUtils;
@@ -12,7 +13,6 @@ import java.util.Comparator;
public class LevelPackHandler
{
- private static final String directory = "/de/bricked/resources/levelpacks/";
private static final String DEFAULT_PACKAGE_NAME = "default";
private static ArrayList<LevelPack> sort(ArrayList<LevelPack> levelPackArrayList)
@@ -60,11 +60,11 @@ public class LevelPackHandler
ArrayList<String> stringArrayList = new ArrayList<>();
try
{
- String text = FileUtils.getFileContentFromJar(directory+"files.txt");
+ String text = FileUtils.getFileContentFromJar(Config.JAR_LEVELPACK_SAVEDIR+"files.txt");
String[] filenamesArray = text.split(" ");
for(String filename : filenamesArray)
{
- stringArrayList.add(FileUtils.getFileContentFromJar(directory + filename));
+ stringArrayList.add(FileUtils.getFileContentFromJar(Config.JAR_LEVELPACK_SAVEDIR + filename));
}
}
@@ -77,9 +77,9 @@ public class LevelPackHandler
private static ArrayList<String> getFileContentFromUserDir()
{
- PathUtils.checkFolder(PathUtils.getOSindependentPath().toFile());
+ File folder = new File(Config.FILESYSTEM_LEVELPACK_SAVEDIR);
+ PathUtils.checkFolder(folder);
ArrayList<String> stringContent = new ArrayList<>();
- File folder = new File(PathUtils.getOSindependentPath().toFile(), "deadspaghetti/bricked/levelpacks/");
File[] files = folder.listFiles();
if(files == null)
{
diff --git a/src/de/bricked/game/settings/Settings.java b/src/de/bricked/game/settings/Settings.java
index 40e07b1aa0a6f2a6a0e5ff8ed09b31243fe4bc8f..3c571c5bae5f37fd99157deab1c84ae50d2ea312 100644
--- a/src/de/bricked/game/settings/Settings.java
+++ b/src/de/bricked/game/settings/Settings.java
@@ -1,5 +1,6 @@
package de.bricked.game.settings;
import com.google.gson.Gson;
+import de.bricked.game.Config;
import logger.LogLevel;
import logger.Logger;
import tools.PathUtils;
@@ -15,7 +16,6 @@ public class Settings
private String language; //TODO change this to lanugage class maybe?
private double volume;
private boolean muted;
- private transient final String directory = "/deadspaghetti/bricked/";
private transient final String filename = "settings.json";
private transient Gson gson;
private transient File file;
@@ -23,8 +23,8 @@ public class Settings
public Settings()
{
gson = new Gson();
- PathUtils.checkFolder(new File(PathUtils.getOSindependentPath() + directory));
- file = new File(PathUtils.getOSindependentPath() + directory + filename);
+ PathUtils.checkFolder(new File(Config.FILESYSTEM_ROOT_DIR));
+ file = new File(Config.FILESYSTEM_ROOT_DIR + filename);
initDefaultSettings();
}
@@ -56,7 +56,7 @@ public class Settings
{
try
{
- String jsonContent = new String(Files.readAllBytes(FileSystems.getDefault().getPath(PathUtils.getOSindependentPath().toAbsolutePath() + directory + filename)));
+ String jsonContent = new String(Files.readAllBytes(FileSystems.getDefault().getPath(Config.FILESYSTEM_ROOT_DIR + filename)));
System.out.println(jsonContent);
Settings loadedSettings = gson.fromJson(jsonContent, Settings.class);
this.gameSize = loadedSettings.gameSize;
diff --git a/src/de/bricked/game/sound/SoundHandler.java b/src/de/bricked/game/sound/SoundHandler.java
index f6661147e5afdeec4bfc1dad0dddc1504017ea64..9e8f4df9b0f808b3fd24b2b4b6f7dc4cccc14ec8 100644
--- a/src/de/bricked/game/sound/SoundHandler.java
+++ b/src/de/bricked/game/sound/SoundHandler.java
@@ -3,6 +3,7 @@ package de.bricked.game.sound;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
+import de.bricked.game.Config;
import javafx.scene.media.Media;
import javafx.scene.media.MediaPlayer;
import logger.LogLevel;
@@ -25,7 +26,7 @@ public class SoundHandler
{
try
{
- String path = SoundHandler.class.getResource("/de/bricked/resources/sounds/" + soundID + ".mp3").toURI().toURL().toString();
+ String path = SoundHandler.class.getResource(Config.JAR_SOUND_SAVEDIR + soundID + ".mp3").toURI().toURL().toString();
Media sound = new Media(path);
MediaPlayer mediaPlayer = new MediaPlayer(sound);
mediaPlayer.setVolume(volume);
diff --git a/src/de/bricked/utils/Downloader.java b/src/de/bricked/utils/Downloader.java
index 0c6f65c8cc87f2c0219b765d31147ae73c24310f..bd0a60842780effc467c7258c7768cd5ef120a65 100644
--- a/src/de/bricked/utils/Downloader.java
+++ b/src/de/bricked/utils/Downloader.java
@@ -1,27 +1,16 @@
package de.bricked.utils;
+import de.bricked.game.Config;
import de.bricked.game.levels.LevelPack;
import de.bricked.game.levels.LevelPackParser;
-import tools.PathUtils;
-
-import java.io.File;
import java.io.FileWriter;
-import java.nio.file.Paths;
public class Downloader
{
private LevelPack levelPack;
private LevelPackParser levelPackParser;
private String downloadedString = "";
- private String outDir;
- private String dirname = "/deadspaghetti/bricked/levelpacks/";
-
- public Downloader()
- {
- outDir = PathUtils.getOSindependentPath()+dirname;
- PathUtils.checkFolder(new File(outDir));
- }
public void download(String url)
{
@@ -35,7 +24,7 @@ public class Downloader
{
try
{
- FileWriter fileWriter = new FileWriter(outDir+getPackName()+".json");
+ FileWriter fileWriter = new FileWriter(Config.FILESYSTEM_LEVELPACK_SAVEDIR +getPackName()+".json");
fileWriter.write(downloadedString);
fileWriter.flush();
fileWriter.close();
diff --git a/src/de/bricked/utils/FileUtils.java b/src/de/bricked/utils/FileUtils.java
index accdf3c1ba7054690f7da80a9f408e59c54ec252..e748c31f8f6478584dfaae1358aecf0af1232553 100644
--- a/src/de/bricked/utils/FileUtils.java
+++ b/src/de/bricked/utils/FileUtils.java
@@ -4,6 +4,7 @@ package de.bricked.utils;
import de.bricked.game.levels.LevelPackHandler;
import logger.LogLevel;
import logger.Logger;
+import tools.PathUtils;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
@@ -13,7 +14,6 @@ import java.net.URL;
public class FileUtils
{
-
private static String getContentsFromInputStream(InputStream inputStream) throws Exception
{
BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream);