Load/Save preferences support.

blade-engine/src/com/bladecoder/engine/BladeEngine.java

@@ -88,7 +88,7 @@ public void loadGame(String baseFolder) {
 
 		if (baseFolder != null) {
 			EngineAssetManager.setAssetFolder(baseFolder);
-			Config.load();
+			Config.getInstance().load();
 		}
 
 		try {
@@ -105,15 +105,15 @@ public void loadGame(String baseFolder) {
 	@Override
 	public void create() {
 		if (!debug)
-			debug = Config.getProperty(Config.DEBUG_PROP, debug);
+			debug = Config.getInstance().getProperty(Config.DEBUG_PROP, debug);
 
 		if (debug)
 			EngineLogger.setDebug();
 
 		EngineLogger.debug("GAME CREATE");
 
 		if (forceRes == null)
-			forceRes = Config.getProperty(Config.FORCE_RES_PROP, forceRes);
+			forceRes = Config.getInstance().getProperty(Config.FORCE_RES_PROP, forceRes);
 
 		if (forceRes != null) {
 			EngineAssetManager.getInstance().forceResolution(forceRes);
@@ -123,10 +123,10 @@ public void create() {
 
 		if (EngineLogger.debugMode()) {
 			if (chapter == null)
-				chapter = Config.getProperty(Config.CHAPTER_PROP, chapter);
+				chapter = Config.getInstance().getProperty(Config.CHAPTER_PROP, chapter);
 
 			if (testScene == null) {
-				testScene = Config.getProperty(Config.TEST_SCENE_PROP, testScene);
+				testScene = Config.getInstance().getProperty(Config.TEST_SCENE_PROP, testScene);
 			}
 
 			if (testScene != null || chapter != null) {
@@ -142,7 +142,7 @@ public void create() {
 			}
 
 			if (gameState == null)
-				gameState = Config.getProperty(Config.LOAD_GAMESTATE_PROP, gameState);
+				gameState = Config.getInstance().getProperty(Config.LOAD_GAMESTATE_PROP, gameState);
 
 			if (gameState != null) {
 				try {
@@ -165,7 +165,7 @@ public void create() {
 			}
 
 			if (recordName == null)
-				recordName = Config.getProperty(Config.PLAY_RECORD_PROP, recordName);
+				recordName = Config.getInstance().getProperty(Config.PLAY_RECORD_PROP, recordName);
 
 			if (recordName != null) {
 				ui.getRecorder().setFilename(recordName);

blade-engine/src/com/bladecoder/engine/actions/IfPropertyAction.java

@@ -42,7 +42,10 @@ public boolean run(VerbRunner cb) {
 		String valDest = w.getCustomProperty(name);
 
 		if (valDest == null)
-			valDest = Config.getProperty(name, null);
+			valDest = Config.getInstance().getProperty(name, null);
+
+		if (valDest == null)
+			valDest = Config.getInstance().getPref(name, null);
 
 		if (!ActionUtils.compareNullStr(value, valDest)) {
 			gotoElse(cb);

blade-engine/src/com/bladecoder/engine/assets/EngineAssetManager.java

@@ -134,11 +134,10 @@ public static EngineAssetManager getInstance() {
 	/**
 	 * Creates a EngineAssetManager instance for edition. That is:
 	 * 
-	 * - Puts a PathResolver to locate the assets through an absolute path -
-	 * Puts assets scale to "1"
+	 * - Puts a PathResolver to locate the assets through an absolute path - Puts
+	 * assets scale to "1"
 	 * 
-	 * @param base
-	 *            is the project base folder
+	 * @param base is the project base folder
 	 */
 	public static void createEditInstance(String base) {
 		if (instance != null)
@@ -152,8 +151,7 @@ public static void createEditInstance(String base) {
 	/**
 	 * All assets will be searched in the selected folder.
 	 * 
-	 * @param base
-	 *            The asset base folder
+	 * @param base The asset base folder
 	 */
 	public static void setAssetFolder(String base) {
 		if (instance != null)
@@ -194,8 +192,7 @@ public FileHandle getModelFile(String filename) {
 	}
 
 	/**
-	 * Returns a file in the asset directory SEARCHING in the resolution
-	 * directories
+	 * Returns a file in the asset directory SEARCHING in the resolution directories
 	 */
 	public FileHandle getResAsset(String filename) {
 		return resResolver.resolve(filename);
@@ -256,6 +253,7 @@ public Texture getTexture(String filename) {
 		return get(filename, Texture.class);
 	}
 
+	@Override
 	public void dispose() {
 		super.dispose();
 		instance = null;
@@ -356,20 +354,20 @@ public boolean assetExists(String filename) {
 	}
 
 	private Resolution[] getResolutions(FileHandleResolver resolver, int worldWidth, int worldHeight) {
-		ArrayList<Resolution> rl = new ArrayList<Resolution>();
+		ArrayList<Resolution> rl = new ArrayList<>();
 
 		String list[] = null;
-		
-		String configRes = Config.getProperty(Config.RESOLUTIONS, null);
-		
-		if(configRes != null) {
+
+		String configRes = Config.getInstance().getProperty(Config.RESOLUTIONS, null);
+
+		if (configRes != null) {
 			list = configRes.split(",");
 		} else {
 			list = listAssetFiles("ui");
 		}
-		
+
 		for (String name : list) {
-			
+
 			try {
 				float scale = Float.parseFloat(name);
 
@@ -384,6 +382,7 @@ private Resolution[] getResolutions(FileHandleResolver resolver, int worldWidth,
 		}
 
 		Collections.sort(rl, new Comparator<Resolution>() {
+			@Override
 			public int compare(Resolution a, Resolution b) {
 				return a.portraitWidth - b.portraitWidth;
 			}
@@ -443,8 +442,8 @@ public String[] listAssetFiles(String base) {
 	private String[] getFilesFromJar(String base) {
 		URL dirURL = EngineAssetManager.class.getResource(base);
 
-		Set<String> result = new HashSet<String>(); // avoid duplicates in case
-													// it is a subdirectory
+		Set<String> result = new HashSet<>(); // avoid duplicates in case
+												// it is a subdirectory
 
 		if (dirURL.getProtocol().equals("jar")) {
 			/* A JAR path */
@@ -488,15 +487,21 @@ private String[] getFilesFromJar(String base) {
 	}
 
 	public FileHandle getUserFile(String filename) {
+		String desktopFolder = Config.getInstance().getProperty(Config.TITLE_PROP, DESKTOP_PREFS_DIR);
+		return getUserFile(filename, desktopFolder);
+	}
+
+	public FileHandle getUserFile(String filename, String desktopFolder) {
 		FileHandle file = null;
 
-		if (Gdx.app.getType() == ApplicationType.Desktop || Gdx.app.getType() == ApplicationType.Applet) {
-			String dir = Config.getProperty(Config.TITLE_PROP, DESKTOP_PREFS_DIR);
+		if (Gdx.app.getType() == ApplicationType.Desktop) {
+			String dir = desktopFolder != null ? desktopFolder : DESKTOP_PREFS_DIR;
+
 			dir.replace(" ", "");
 
 			StringBuilder sb = new StringBuilder();
 			sb.append(".").append(dir).append("/").append(filename);
-			
+
 			if (System.getProperty("os.name").toLowerCase().contains("mac")
 					&& System.getenv("HOME").contains("Containers")) {
 
@@ -515,12 +520,12 @@ public FileHandle getUserFile(String filename) {
 	public FileHandle getUserFolder() {
 		FileHandle file = null;
 
-		if (Gdx.app.getType() == ApplicationType.Desktop || Gdx.app.getType() == ApplicationType.Applet) {
-			String dir = Config.getProperty(Config.TITLE_PROP, DESKTOP_PREFS_DIR);
+		if (Gdx.app.getType() == ApplicationType.Desktop) {
+			String dir = Config.getInstance().getProperty(Config.TITLE_PROP, DESKTOP_PREFS_DIR);
 			dir.replace(" ", "");
 
 			StringBuilder sb = new StringBuilder(".");
-			
+
 			if (System.getProperty("os.name").toLowerCase().contains("mac")
 					&& System.getenv("HOME").contains("Containers")) {
 
@@ -529,7 +534,7 @@ public FileHandle getUserFolder() {
 
 				file = Gdx.files.external(sb.append(dir).toString());
 			}
-			
+
 		} else {
 			file = Gdx.files.local(NOT_DESKTOP_PREFS_DIR);
 		}

blade-engine/src/com/bladecoder/engine/model/TextManager.java

@@ -46,7 +46,7 @@ public class TextManager implements Serializable {
 	public static final float RECT_MARGIN = 18f;
 	public static final float RECT_BORDER = 2f;
 
-	public static final boolean AUTO_HIDE_TEXTS = Config.getProperty(Config.AUTO_HIDE_TEXTS, true);
+	public static final boolean AUTO_HIDE_TEXTS = Config.getInstance().getProperty(Config.AUTO_HIDE_TEXTS, true);
 
 	private float inScreenTime;
 	private Text currentText = null;

blade-engine/src/com/bladecoder/engine/serialization/WorldSerialization.java

@@ -257,7 +257,7 @@ public void saveGameState(String filename, boolean screenshot) throws IOExceptio
 	public void write(Json json) {
 		BladeJson bjson = (BladeJson) json;
 
-		json.writeValue(Config.BLADE_ENGINE_VERSION_PROP, Config.getProperty(Config.BLADE_ENGINE_VERSION_PROP, null));
+		json.writeValue(Config.BLADE_ENGINE_VERSION_PROP, Config.getInstance().getProperty(Config.BLADE_ENGINE_VERSION_PROP, null));
 
 		if (bjson.getMode() == Mode.MODEL) {
 			SortedMap<String, SoundDesc> sortedSounds = new TreeMap<>();
@@ -271,7 +271,7 @@ public void write(Json json) {
 			json.writeValue("initScene", w.getInitScene());
 
 		} else {
-			json.writeValue(Config.VERSION_PROP, Config.getProperty(Config.VERSION_PROP, null));
+			json.writeValue(Config.VERSION_PROP, Config.getInstance().getProperty(Config.VERSION_PROP, null));
 
 			SortedMap<String, Scene> sortedScenes = new TreeMap<>();
 			sortedScenes.putAll(w.getScenes());
@@ -313,9 +313,9 @@ public void read(Json json, JsonValue jsonData) {
 		BladeJson bjson = (BladeJson) json;
 		if (bjson.getMode() == Mode.MODEL) {
 			if (bladeVersion != null
-					&& !bladeVersion.equals(Config.getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""))) {
+					&& !bladeVersion.equals(Config.getInstance().getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""))) {
 				EngineLogger.debug("Model Engine Version v" + bladeVersion + " differs from Current Engine Version v"
-						+ Config.getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""));
+						+ Config.getInstance().getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""));
 			}
 
 			// SOUNDS
@@ -360,10 +360,10 @@ public void read(Json json, JsonValue jsonData) {
 			cacheSounds();
 		} else {
 			if (bladeVersion != null
-					&& !bladeVersion.equals(Config.getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""))) {
+					&& !bladeVersion.equals(Config.getInstance().getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""))) {
 				EngineLogger
 						.debug("Saved Game Engine Version v" + bladeVersion + " differs from Current Engine Version v"
-								+ Config.getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""));
+								+ Config.getInstance().getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""));
 			}
 
 			String currentChapter = json.readValue("chapter", String.class, jsonData);

blade-engine/src/com/bladecoder/engine/ui/DebugScreen.java

@@ -407,11 +407,11 @@ public void clicked(InputEvent event, float x, float y) {
 		table.add(botGroup2);
 
 		// ------------- VERSION LABEL NOT IN TABLE
-		String versionString = Config.getProperty(Config.TITLE_PROP, "title unspecified") + " v"
-				+ Config.getProperty(Config.VERSION_PROP, "unspecified") + "\n" + "Blade Engine: v"
-				+ Config.getProperty(Config.BLADE_ENGINE_VERSION_PROP, "unspecified") + "\n" + "libGdx: v"
-				+ Config.getProperty("gdxVersion", "unspecified") + "\n" + "RoboVM: v"
-				+ Config.getProperty("roboVMVersion", "unspecified") + "\n";
+		String versionString = Config.getInstance().getProperty(Config.TITLE_PROP, "title unspecified") + " v"
+				+ Config.getInstance().getProperty(Config.VERSION_PROP, "unspecified") + "\n" + "Blade Engine: v"
+				+ Config.getInstance().getProperty(Config.BLADE_ENGINE_VERSION_PROP, "unspecified") + "\n" + "libGdx: v"
+				+ Config.getInstance().getProperty("gdxVersion", "unspecified") + "\n" + "RoboVM: v"
+				+ Config.getInstance().getProperty("roboVMVersion", "unspecified") + "\n";
 		// + "Gdx.app.getVersion: " + Gdx.app.getVersion();
 
 		Label version = new Label(versionString, ui.getSkin(), "debug");

blade-engine/src/com/bladecoder/engine/ui/HelpScreen.java

@@ -116,7 +116,7 @@ public void dispose() {
 	public void show() {
 		final Locale locale = ui.getWorld().getI18N().getCurrentLocale();
 		String filename = null;
-		UIModes uiMode = UIModes.valueOf(Config.getProperty(Config.UI_MODE, "TWO_BUTTONS").toUpperCase(Locale.ENGLISH));
+		UIModes uiMode = UIModes.valueOf(Config.getInstance().getProperty(Config.UI_MODE, "TWO_BUTTONS").toUpperCase(Locale.ENGLISH));
 
 		if (Gdx.input.isPeripheralAvailable(Peripheral.MultitouchScreen) && uiMode == UIModes.TWO_BUTTONS) {
 			uiMode = UIModes.PIE;

blade-engine/src/com/bladecoder/engine/ui/InventoryUI.java

@@ -64,17 +64,17 @@ public enum InventoryPos {
 
 	private final ScenePointer pointer;
 
-	private boolean singleAction = Config.getProperty(Config.SINGLE_ACTION_INVENTORY, false);
+	private boolean singleAction = Config.getInstance().getProperty(Config.SINGLE_ACTION_INVENTORY, false);
 
 	public InventoryUI(SceneScreen scr, ScenePointer pointer) {
 		style = scr.getUI().getSkin().get(InventoryUIStyle.class);
 		sceneScreen = scr;
 		this.pointer = pointer;
 
 		inventoryPos = InventoryPos
-				.valueOf(Config.getProperty(Config.INVENTORY_POS_PROP, "DOWN").toUpperCase(Locale.ENGLISH));
+				.valueOf(Config.getInstance().getProperty(Config.INVENTORY_POS_PROP, "DOWN").toUpperCase(Locale.ENGLISH));
 
-		autosize = Config.getProperty(Config.INVENTORY_AUTOSIZE_PROP, true);
+		autosize = Config.getInstance().getProperty(Config.INVENTORY_AUTOSIZE_PROP, true);
 
 		addListener(new InputListener() {
 			@Override

blade-engine/src/com/bladecoder/engine/ui/MenuScreen.java

@@ -168,7 +168,7 @@ public boolean keyUp(InputEvent event, int keycode) {
 
 		if (style.showTitle && style.titleStyle != null) {
 
-			Label title = new Label(Config.getProperty(Config.TITLE_PROP, "Adventure Blade Engine"), skin,
+			Label title = new Label(Config.getInstance().getProperty(Config.TITLE_PROP, "Adventure Blade Engine"), skin,
 					style.titleStyle);
 
 			title.setAlignment(getAlign());
@@ -338,7 +338,7 @@ public void clicked(InputEvent event, float x, float y) {
 		iconStackTable.pack();
 		stage.addActor(iconStackTable);
 
-		Label version = new Label("v" + Config.getProperty(Config.VERSION_PROP, " unspecified"), skin);
+		Label version = new Label("v" + Config.getInstance().getProperty(Config.VERSION_PROP, " unspecified"), skin);
 		version.setPosition(DPIUtils.getMarginSize(), DPIUtils.getMarginSize());
 		version.addListener(new ClickListener() {
 			int count = 0;

blade-engine/src/com/bladecoder/engine/ui/TesterBot.java

@@ -62,7 +62,7 @@ public class TesterBot {
 
 	public TesterBot(World w) {
 		this.w = w;
-		inventoryAction = !Config.getProperty(Config.SINGLE_ACTION_INVENTORY, false);
+		inventoryAction = !Config.getInstance().getProperty(Config.SINGLE_ACTION_INVENTORY, false);
 	}
 
 	public void update(float d) {

blade-engine/src/com/bladecoder/engine/ui/TextManagerUI.java

@@ -134,9 +134,9 @@ private void calcPos() {
 		}
 
 		// CHAR ICON CALCS
-		if (text.type == Text.Type.SUBTITLE && !Config.getProperty(Config.CHARACTER_ICON_ATLAS, "").equals("")
+		if (text.type == Text.Type.SUBTITLE && !Config.getInstance().getProperty(Config.CHARACTER_ICON_ATLAS, "").equals("")
 				&& text.actorId != null) {
-			charIcon = EngineAssetManager.getInstance().getRegion(Config.getProperty(Config.CHARACTER_ICON_ATLAS, null),
+			charIcon = EngineAssetManager.getInstance().getRegion(Config.getInstance().getProperty(Config.CHARACTER_ICON_ATLAS, null),
 					text.actorId);
 
 			if (charIcon != null) {

blade-engine/src/com/bladecoder/engine/ui/UI.java

@@ -104,7 +104,7 @@ public TesterBot getTesterBot() {
 	}
 
 	private BladeScreen getCustomScreenInstance(String prop, Class<?> defaultClass) {
-		String clsName = Config.getProperty(prop, null);
+		String clsName = Config.getInstance().getProperty(prop, null);
 		Class<?> instanceClass = defaultClass;
 
 		if (clsName != null && !clsName.isEmpty()) {
@@ -193,8 +193,8 @@ private void loadAssets() {
 
 		skin.load(skinFile);
 
-		if (!Config.getProperty(Config.CHARACTER_ICON_ATLAS, "").equals("")) {
-			EngineAssetManager.getInstance().loadAtlas(Config.getProperty(Config.CHARACTER_ICON_ATLAS, null));
+		if (!Config.getInstance().getProperty(Config.CHARACTER_ICON_ATLAS, "").equals("")) {
+			EngineAssetManager.getInstance().loadAtlas(Config.getInstance().getProperty(Config.CHARACTER_ICON_ATLAS, null));
 			EngineAssetManager.getInstance().finishLoading();
 		}
 	}
@@ -222,8 +222,8 @@ public void dispose() {
 		RectangleRenderer.dispose();
 		Utils3D.dispose();
 
-		if (!Config.getProperty(Config.CHARACTER_ICON_ATLAS, "").equals(""))
-			EngineAssetManager.getInstance().disposeAtlas(Config.getProperty(Config.CHARACTER_ICON_ATLAS, null));
+		if (!Config.getInstance().getProperty(Config.CHARACTER_ICON_ATLAS, "").equals(""))
+			EngineAssetManager.getInstance().disposeAtlas(Config.getInstance().getProperty(Config.CHARACTER_ICON_ATLAS, null));
 
 		// DISPOSE ALL SCREENS
 		for (BladeScreen s : screens)