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

fixed merge conflicts

Browse Source
This commit is contained in:
ramollia
2025-10-15 00:26:27 +02:00
parent 0a6c2487bd
commit 1f64a2dfd0
6 changed files with 48 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,10 +3,10 @@ package org.toop.app;
import org.toop.app.view.ViewStack; import org.toop.app.view.ViewStack;
import org.toop.app.view.views.MainView; import org.toop.app.view.views.MainView;
import org.toop.app.view.views.QuitView; import org.toop.app.view.views.QuitView;
import org.toop.framework.asset.ResourceManager;
import org.toop.framework.asset.resources.CssAsset;
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.resources.CssAsset;
import org.toop.local.AppContext; import org.toop.local.AppContext;
import org.toop.local.AppSettings; import org.toop.local.AppSettings;

2
app/src/main/java/org/toop/app/view/views/ChallengeView.java
View File

@@ -4,13 +4,13 @@ import org.toop.app.GameInformation;
import org.toop.app.Server; import org.toop.app.Server;
import org.toop.app.view.View; import org.toop.app.view.View;
import org.toop.app.view.ViewStack; import org.toop.app.view.ViewStack;
import org.toop.local.AppContext;
import javafx.geometry.Pos; import javafx.geometry.Pos;
import javafx.scene.Node; import javafx.scene.Node;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.Slider; import javafx.scene.control.Slider;
import javafx.scene.text.Text; import javafx.scene.text.Text;
import org.toop.local.AppContext;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
app/src/main/java/org/toop/app/view/views/GameView.java
View File

@@ -2,11 +2,11 @@ package org.toop.app.view.views;
import org.toop.app.view.View; import org.toop.app.view.View;
import org.toop.app.view.ViewStack; import org.toop.app.view.ViewStack;
import org.toop.local.AppContext;
import javafx.geometry.Pos; import javafx.geometry.Pos;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.text.Text; import javafx.scene.text.Text;
import org.toop.local.AppContext;
public final class GameView extends View { public final class GameView extends View {
private static class GameOverView extends View { private static class GameOverView extends View {

2
app/src/main/java/org/toop/app/view/views/SendChallengeView.java
View File

@@ -4,6 +4,7 @@ import org.toop.app.GameInformation;
import org.toop.app.Server; import org.toop.app.Server;
import org.toop.app.view.View; import org.toop.app.view.View;
import org.toop.app.view.ViewStack; import org.toop.app.view.ViewStack;
import org.toop.local.AppContext;
import javafx.geometry.Pos; import javafx.geometry.Pos;
import javafx.scene.Node; import javafx.scene.Node;
@@ -11,7 +12,6 @@ import javafx.scene.control.Button;
import javafx.scene.control.ComboBox; import javafx.scene.control.ComboBox;
import javafx.scene.control.Slider; import javafx.scene.control.Slider;
import javafx.scene.text.Text; import javafx.scene.text.Text;
import org.toop.local.AppContext;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

4
app/src/main/java/org/toop/app/view/views/ServerView.java
View File

@@ -1,14 +1,14 @@
package org.toop.app.view.views; package org.toop.app.view.views;
import javafx.application.Platform;
import org.toop.app.view.View; import org.toop.app.view.View;
import org.toop.app.view.ViewStack; import org.toop.app.view.ViewStack;
import org.toop.local.AppContext;
import javafx.application.Platform;
import javafx.geometry.Pos; import javafx.geometry.Pos;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.ListView; import javafx.scene.control.ListView;
import javafx.scene.text.Text; import javafx.scene.text.Text;
import org.toop.local.AppContext;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;

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

@@ -1,9 +1,6 @@
package org.toop.local; package org.toop.local;
import java.io.File;
import java.util.Locale;
import org.toop.app.App; import org.toop.app.App;
import org.toop.framework.asset.resources.SettingsAsset;
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.ResourceManager;
@@ -17,19 +14,13 @@ import java.util.Locale;
public class AppSettings { public class AppSettings {
private static SettingsAsset settingsAsset; private static SettingsAsset settingsAsset;
private SettingsAsset settingsAsset;
public void applySettings() {
this.settingsAsset = getPath();
if (!this.settingsAsset.isLoaded()) {
this.settingsAsset.load();
public static void applySettings() { public static void applySettings() {
SettingsAsset settings = getPath(); settingsAsset = getPath();
if (!settings.isLoaded()) { if (!settingsAsset.isLoaded()) {
settings.load(); settingsAsset.load();
} }
Settings settingsData = this.settingsAsset.getContent(); Settings settingsData = settingsAsset.getContent();
AppContext.setLocale(Locale.of(settingsData.locale)); AppContext.setLocale(Locale.of(settingsData.locale));
App.setFullscreen(settingsData.fullScreen); App.setFullscreen(settingsData.fullScreen);
@@ -70,7 +61,6 @@ public class AppSettings {
} }
public static SettingsAsset getSettings() { public static SettingsAsset getSettings() {
assert settingsAsset != null;
return settingsAsset; return settingsAsset;
} }
} }