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

Renamed asset folder to resource, made resourceLoader more robust. Completed some TODO's, formatting

Browse Source
This commit is contained in:
Bas de Jong
2025-10-07 23:54:33 +02:00
parent 72e322675e
commit e9dfbbd150
32 changed files with 289 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/toop/Main.java
View File

@@ -1,11 +1,11 @@
package org.toop;
import org.toop.app.App;
import org.toop.framework.asset.ResourceLoader;
import org.toop.framework.asset.ResourceManager;
import org.toop.framework.audio.SoundManager;
import org.toop.framework.networking.NetworkingClientManager;
import org.toop.framework.networking.NetworkingInitializationException;
import org.toop.framework.resource.ResourceLoader;
import org.toop.framework.resource.ResourceManager;
public final class Main {
static void main(String[] args) {

6
app/src/main/java/org/toop/app/App.java
View File

@@ -9,10 +9,10 @@ import javafx.stage.Stage;
import org.toop.app.layer.Layer;
import org.toop.app.layer.layers.MainLayer;
import org.toop.app.layer.layers.QuitPopup;
import org.toop.framework.asset.ResourceManager;
import org.toop.framework.asset.resources.CssAsset;
import org.toop.framework.audio.events.AudioEvents;
import org.toop.framework.eventbus.EventFlow;
import org.toop.framework.resource.ResourceManager;
import org.toop.framework.resource.resources.CssAsset;
import org.toop.local.AppContext;
import org.toop.local.AppSettings;
@@ -107,7 +107,7 @@ public final class App extends Application {
try {
root.getChildren().removeLast();
} catch (Exception e) {
IO.println(e);
IO.println(e); // TODO: Use logger
}
}

2
app/src/main/java/org/toop/app/layer/layers/OptionsPopup.java
View File

@@ -10,9 +10,9 @@ import org.toop.app.layer.Container;
import org.toop.app.layer.NodeBuilder;
import org.toop.app.layer.Popup;
import org.toop.app.layer.containers.VerticalContainer;
import org.toop.framework.asset.resources.SettingsAsset;
import org.toop.framework.audio.events.AudioEvents;
import org.toop.framework.eventbus.EventFlow;
import org.toop.framework.resource.resources.SettingsAsset;
import org.toop.local.AppContext;
import org.toop.local.AppSettings;

4
app/src/main/java/org/toop/local/AppContext.java
View File

@@ -1,8 +1,8 @@
package org.toop.local;
import java.util.Locale;
import org.toop.framework.asset.ResourceManager;
import org.toop.framework.asset.resources.LocalizationAsset;
import org.toop.framework.resource.ResourceManager;
import org.toop.framework.resource.resources.LocalizationAsset;
public class AppContext {
private static final LocalizationAsset localization = ResourceManager.get("localization");

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

@@ -3,9 +3,9 @@ package org.toop.local;
import java.io.File;
import java.util.Locale;
import org.toop.app.App;
import org.toop.framework.asset.resources.SettingsAsset;
import org.toop.framework.audio.events.AudioEvents;
import org.toop.framework.eventbus.EventFlow;
import org.toop.framework.resource.resources.SettingsAsset;
import org.toop.framework.settings.Settings;
public class AppSettings {