stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 19:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

AppSettings now also get loaded into the assetmanager

Browse Source
This commit is contained in:
Bas de Jong
2025-10-08 00:14:40 +02:00
parent e9dfbbd150
commit 7f3d858320
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/toop/local/AppSettings.java
View File

@@ -5,6 +5,8 @@ import java.util.Locale;
import org.toop.app.App; import org.toop.app.App;
import org.toop.framework.audio.events.AudioEvents; import org.toop.framework.audio.events.AudioEvents;
import org.toop.framework.eventbus.EventFlow; import org.toop.framework.eventbus.EventFlow;
import org.toop.framework.resource.ResourceManager;
import org.toop.framework.resource.ResourceMeta;
import org.toop.framework.resource.resources.SettingsAsset; import org.toop.framework.resource.resources.SettingsAsset;
import org.toop.framework.settings.Settings; import org.toop.framework.settings.Settings;
@@ -13,11 +15,12 @@ public class AppSettings {
private SettingsAsset settingsAsset; private SettingsAsset settingsAsset;
public void applySettings() { public void applySettings() {
SettingsAsset settings = getPath(); this.settingsAsset = getPath();
if (!settings.isLoaded()) { if (!this.settingsAsset.isLoaded()) {
settings.load(); this.settingsAsset.load();
} }
Settings settingsData = settings.getContent();
Settings settingsData = this.settingsAsset.getContent();
AppContext.setLocale(Locale.of(settingsData.locale)); AppContext.setLocale(Locale.of(settingsData.locale));
App.setFullscreen(settingsData.fullScreen); App.setFullscreen(settingsData.fullScreen);
@@ -51,8 +54,9 @@ public class AppSettings {
File settingsFile = File settingsFile =
new File(basePath + File.separator + "ISY1" + File.separator + "settings.json"); new File(basePath + File.separator + "ISY1" + File.separator + "settings.json");
this.settingsAsset = new SettingsAsset(settingsFile); // this.settingsAsset = new SettingsAsset(settingsFile);
ResourceManager.addAsset(new ResourceMeta<>("settings.json", new SettingsAsset(settingsFile)));
} }
return this.settingsAsset; return ResourceManager.get("settings.json");
} }
} }

6
framework/src/main/java/org/toop/framework/resource/ResourceManager.java
View File

@@ -2,6 +2,9 @@ package org.toop.framework.resource;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.toop.framework.resource.exceptions.ResourceNotFoundException; import org.toop.framework.resource.exceptions.ResourceNotFoundException;
import org.toop.framework.resource.resources.*; import org.toop.framework.resource.resources.*;
@@ -48,7 +51,7 @@ import org.toop.framework.resource.resources.*;
* </ul> * </ul>
*/ */
public class ResourceManager { public class ResourceManager {
// private static final Logger logger = LogManager.getLogger(ResourceManager.class); private static final Logger logger = LogManager.getLogger(ResourceManager.class);
private static final Map<String, ResourceMeta<? extends BaseResource>> assets = private static final Map<String, ResourceMeta<? extends BaseResource>> assets =
new ConcurrentHashMap<>(); new ConcurrentHashMap<>();
@@ -127,5 +130,6 @@ public class ResourceManager {
*/ */
public static void addAsset(ResourceMeta<? extends BaseResource> asset) { public static void addAsset(ResourceMeta<? extends BaseResource> asset) {
assets.put(asset.getName(), asset); assets.put(asset.getName(), asset);
logger.info("Successfully added asset: {}, to the asset list", asset.getName());
} }
} }