mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 02:44:50 +00:00
Merge remote-tracking branch 'origin/UI' into UI
# Conflicts: # app/src/main/java/org/toop/app/App.java # app/src/main/java/org/toop/app/menu/MainMenu.java # app/src/main/java/org/toop/app/menu/Menu.java # app/src/main/java/org/toop/app/menu/QuitMenu.java # app/src/main/resources/assets/image/background.jpg # app/src/main/resources/assets/image/battleship.png # app/src/main/resources/assets/image/icon.png # app/src/main/resources/assets/image/lowpoly.png # app/src/main/resources/assets/image/other.png # app/src/main/resources/assets/image/reversi.png # app/src/main/resources/assets/image/sudoku.png # app/src/main/resources/assets/image/tictactoe.png # app/src/main/resources/assets/style/app.css # app/src/main/resources/assets/style/main.css # app/src/main/resources/assets/style/quit.css # app/src/main/resources/assets/style/style.css
This commit is contained in:
42
app/pom.xml
42
app/pom.xml
@@ -6,6 +6,7 @@
|
||||
<version>0.1</version>
|
||||
|
||||
<properties>
|
||||
<main-class>org.toop.Main</main-class>
|
||||
<maven.compiler.source>25</maven.compiler.source>
|
||||
<maven.compiler.target>25</maven.compiler.target>
|
||||
|
||||
@@ -13,6 +14,12 @@
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.diffplug.spotless</groupId>
|
||||
<artifactId>spotless-maven-plugin</artifactId>
|
||||
<version>2.46.1</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.toop</groupId>
|
||||
<artifactId>pism_framework</artifactId>
|
||||
@@ -46,6 +53,41 @@
|
||||
<encoding>UTF-8</encoding>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.diffplug.spotless</groupId>
|
||||
<artifactId>spotless-maven-plugin</artifactId>
|
||||
<version>2.46.1</version>
|
||||
<configuration>
|
||||
<!-- optional: limit format enforcement to just the files changed by this feature branch -->
|
||||
<ratchetFrom>origin/main</ratchetFrom>
|
||||
<formats>
|
||||
<!-- you can define as many formats as you want, each is independent -->
|
||||
<format>
|
||||
<!-- define the files to apply to -->
|
||||
<includes>
|
||||
<include>.gitattributes</include>
|
||||
<include>.gitignore</include>
|
||||
</includes>
|
||||
<!-- define the steps to apply to those files -->
|
||||
<trimTrailingWhitespace/>
|
||||
<endWithNewline/>
|
||||
<indent>
|
||||
<tabs>true</tabs>
|
||||
<spacesPerTab>4</spacesPerTab>
|
||||
</indent>
|
||||
</format>
|
||||
</formats>
|
||||
<!-- define a language-specific format -->
|
||||
<java>
|
||||
<googleJavaFormat>
|
||||
<version>1.28.0</version>
|
||||
<style>AOSP</style> <!-- GOOGLE (2 indents), AOSP (4 indents) -->
|
||||
<reflowLongStrings>true</reflowLongStrings>
|
||||
<formatJavadoc>true</formatJavadoc>
|
||||
</googleJavaFormat>
|
||||
</java>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@@ -1,6 +1,9 @@
|
||||
package org.toop;
|
||||
|
||||
import org.toop.app.App;
|
||||
import org.toop.framework.asset.AssetLoader;
|
||||
import org.toop.framework.asset.AssetManager;
|
||||
import org.toop.framework.audio.SoundManager;
|
||||
import org.toop.framework.networking.NetworkingClientManager;
|
||||
import org.toop.framework.networking.NetworkingInitializationException;
|
||||
|
||||
@@ -11,6 +14,8 @@ public final class Main {
|
||||
}
|
||||
|
||||
private static void initSystems() throws NetworkingInitializationException {
|
||||
new NetworkingClientManager();
|
||||
AssetManager.loadAssets(new AssetLoader("app/src/main/resources/assets"));
|
||||
new Thread(NetworkingClientManager::new).start();
|
||||
new Thread(SoundManager::new).start();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,15 @@
|
||||
package org.toop.app.menu;
|
||||
|
||||
import org.toop.framework.asset.AssetManager;
|
||||
import org.toop.framework.asset.resources.LocalizationAsset;
|
||||
import org.toop.local.AppContext;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.ResourceBundle;
|
||||
|
||||
public final class CreditsMenu extends Menu {
|
||||
public CreditsMenu() {
|
||||
private Locale currentLocale = AppContext.getLocale();
|
||||
private LocalizationAsset loc = AssetManager.get("localization.properties");
|
||||
public CreditsMenu() {
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,15 @@
|
||||
package org.toop.app.menu;
|
||||
|
||||
import org.toop.framework.asset.AssetManager;
|
||||
import org.toop.framework.asset.resources.LocalizationAsset;
|
||||
import org.toop.local.AppContext;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.ResourceBundle;
|
||||
|
||||
public final class OptionsMenu extends Menu {
|
||||
public OptionsMenu() {
|
||||
private Locale currentLocale = AppContext.getLocale();
|
||||
private LocalizationAsset loc = AssetManager.get("localization.properties");
|
||||
public OptionsMenu() {
|
||||
}
|
||||
}
|
||||
14
app/src/main/java/org/toop/local/AppContext.java
Normal file
14
app/src/main/java/org/toop/local/AppContext.java
Normal file
@@ -0,0 +1,14 @@
|
||||
package org.toop.local;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
public class AppContext {
|
||||
private static Locale currentLocale = Locale.getDefault();
|
||||
|
||||
public static void setCurrentLocale(Locale locale) {
|
||||
currentLocale = locale;
|
||||
}
|
||||
public static Locale getLocale() {
|
||||
return currentLocale;
|
||||
}
|
||||
}
|
||||
BIN
app/src/main/resources/assets/audio/fx/dramatic.wav
Normal file
BIN
app/src/main/resources/assets/audio/fx/dramatic.wav
Normal file
Binary file not shown.
BIN
app/src/main/resources/assets/audio/fx/hitsound0.wav
Normal file
BIN
app/src/main/resources/assets/audio/fx/hitsound0.wav
Normal file
Binary file not shown.
BIN
app/src/main/resources/assets/audio/fx/hitsound1.wav
Normal file
BIN
app/src/main/resources/assets/audio/fx/hitsound1.wav
Normal file
Binary file not shown.
BIN
app/src/main/resources/assets/audio/fx/mainmenu.wav
Normal file
BIN
app/src/main/resources/assets/audio/fx/mainmenu.wav
Normal file
Binary file not shown.
BIN
app/src/main/resources/assets/audio/fx/sadtrombone.wav
Normal file
BIN
app/src/main/resources/assets/audio/fx/sadtrombone.wav
Normal file
Binary file not shown.
BIN
app/src/main/resources/assets/audio/fx/scawymusic.wav
Normal file
BIN
app/src/main/resources/assets/audio/fx/scawymusic.wav
Normal file
Binary file not shown.
BIN
app/src/main/resources/assets/audio/fx/suspensful.wav
Normal file
BIN
app/src/main/resources/assets/audio/fx/suspensful.wav
Normal file
Binary file not shown.
BIN
app/src/main/resources/assets/audio/fx/testsound.wav
Normal file
BIN
app/src/main/resources/assets/audio/fx/testsound.wav
Normal file
Binary file not shown.
BIN
app/src/main/resources/assets/audio/fx/winsound.wav
Normal file
BIN
app/src/main/resources/assets/audio/fx/winsound.wav
Normal file
Binary file not shown.
BIN
app/src/main/resources/assets/audio/music/damned.mp3
Normal file
BIN
app/src/main/resources/assets/audio/music/damned.mp3
Normal file
Binary file not shown.
BIN
app/src/main/resources/assets/audio/music/extraction-point.mp3
Normal file
BIN
app/src/main/resources/assets/audio/music/extraction-point.mp3
Normal file
Binary file not shown.
BIN
app/src/main/resources/assets/audio/music/godfrey.mp3
Normal file
BIN
app/src/main/resources/assets/audio/music/godfrey.mp3
Normal file
Binary file not shown.
BIN
app/src/main/resources/assets/audio/music/mw2-main-menu.mp3
Normal file
BIN
app/src/main/resources/assets/audio/music/mw2-main-menu.mp3
Normal file
Binary file not shown.
BIN
app/src/main/resources/assets/fonts/GroovyManiac.ttf
Normal file
BIN
app/src/main/resources/assets/fonts/GroovyManiac.ttf
Normal file
Binary file not shown.
BIN
app/src/main/resources/assets/fonts/Roboto-Regular.ttf
Normal file
BIN
app/src/main/resources/assets/fonts/Roboto-Regular.ttf
Normal file
Binary file not shown.
|
Before Width: | Height: | Size: 357 KiB After Width: | Height: | Size: 357 KiB |
@@ -0,0 +1,17 @@
|
||||
# Window title
|
||||
windowTitle=ISY Games Selector
|
||||
|
||||
# Main Menu buttons
|
||||
mainMenuSelectTicTacToe=Tic Tac Toe\u5426
|
||||
mainMenuSelectReversi=Reversi\u5426
|
||||
mainMenuSelectSudoku=Sudoku
|
||||
mainMenuSelectBattleship=Battleship
|
||||
mainMenuSelectOther=Other
|
||||
mainMenuSelectCredits=Credits
|
||||
mainMenuSelectOptions=Options
|
||||
mainMenuSelectQuit=Quit
|
||||
|
||||
# Quit Menu text and buttons
|
||||
quitMenuTextSure=Are you sure?
|
||||
quitMenuButtonYes=Yes
|
||||
quitMenuButtonNo=No
|
||||
@@ -0,0 +1,17 @@
|
||||
# Window title
|
||||
windowTitle=ISY Spiele-Auswahl
|
||||
|
||||
# Main Menu buttons
|
||||
mainMenuSelectTicTacToe=Tic Tac Toe
|
||||
mainMenuSelectReversi=Reversi
|
||||
mainMenuSelectSudoku=Sudoku
|
||||
mainMenuSelectBattleship=Flottenman\u00F6ver
|
||||
mainMenuSelectOther=Andere
|
||||
mainMenuSelectCredits=Credits
|
||||
mainMenuSelectOptions=Optionen
|
||||
mainMenuSelectQuit=Beenden
|
||||
|
||||
# Quit Menu text and buttons
|
||||
quitMenuTextSure=Bist du sicher?
|
||||
quitMenuButtonYes=Ja
|
||||
quitMenuButtonNo=Nein
|
||||
@@ -0,0 +1,17 @@
|
||||
# Window title
|
||||
windowTitle=Selector de juegos ISY
|
||||
|
||||
# Main Menu buttons
|
||||
mainMenuSelectTicTacToe=Tres en raya
|
||||
mainMenuSelectReversi=Reversi
|
||||
mainMenuSelectSudoku=Sudoku
|
||||
mainMenuSelectBattleship=Batalla naval
|
||||
mainMenuSelectOther=Otros
|
||||
mainMenuSelectCredits=Cr\u00E9ditos
|
||||
mainMenuSelectOptions=Opciones
|
||||
mainMenuSelectQuit=Salir
|
||||
|
||||
# Quit Menu text and buttons
|
||||
quitMenuTextSure=\u00BFEst\u00E1s seguro?
|
||||
quitMenuButtonYes=S\u00ED
|
||||
quitMenuButtonNo=No
|
||||
@@ -0,0 +1,17 @@
|
||||
# Window title
|
||||
windowTitle=S\u00E9lecteur de jeux ISY
|
||||
|
||||
# Main Menu buttons
|
||||
mainMenuSelectTicTacToe=Morpion
|
||||
mainMenuSelectReversi=Reversi
|
||||
mainMenuSelectSudoku=Sudoku
|
||||
mainMenuSelectBattleship=Bataille navale
|
||||
mainMenuSelectOther=Autres
|
||||
mainMenuSelectCredits=Cr\u00E9dits
|
||||
mainMenuSelectOptions=Options
|
||||
mainMenuSelectQuit=Quitter
|
||||
|
||||
# Quit Menu text and buttons
|
||||
quitMenuTextSure=\u00CAtes-vous s\u00FBr?
|
||||
quitMenuButtonYes=Oui
|
||||
quitMenuButtonNo=Non
|
||||
@@ -0,0 +1,17 @@
|
||||
# Window title
|
||||
windowTitle=Selettore giochi ISY
|
||||
|
||||
# Main Menu buttons
|
||||
mainMenuSelectTicTacToe=Tris
|
||||
mainMenuSelectReversi=Reversi
|
||||
mainMenuSelectSudoku=Sudoku
|
||||
mainMenuSelectBattleship=Battaglia navale
|
||||
mainMenuSelectOther=Altro
|
||||
mainMenuSelectCredits=Crediti
|
||||
mainMenuSelectOptions=Opzioni
|
||||
mainMenuSelectQuit=Esci
|
||||
|
||||
# Quit Menu text and buttons
|
||||
quitMenuTextSure=Sei sicuro?
|
||||
quitMenuButtonYes=S\u00EC
|
||||
quitMenuButtonNo=No
|
||||
@@ -0,0 +1,17 @@
|
||||
# Window title
|
||||
windowTitle=ISY Spellen Kiezer
|
||||
|
||||
# Main Menu buttons
|
||||
mainMenuSelectTicTacToe=Boter Kaas En Eieren
|
||||
mainMenuSelectReversi=Reversi
|
||||
mainMenuSelectSudoku=Sudoku
|
||||
mainMenuSelectBattleship=Zeeslag
|
||||
mainMenuSelectOther=Anders
|
||||
mainMenuSelectCredits=Credits
|
||||
mainMenuSelectOptions=Opties
|
||||
mainMenuSelectQuit=Afsluiten
|
||||
|
||||
# Quit Menu text and buttons
|
||||
quitMenuTextSure=Weet je het zeker?
|
||||
quitMenuButtonYes=Ja
|
||||
quitMenuButtonNo=Nee
|
||||
@@ -0,0 +1,30 @@
|
||||
# suppress inspection "LossyEncoding" for whole file
|
||||
# Window title
|
||||
windowTitle=ISY \u6E38\u620F\u9009\u62E9\u5668
|
||||
# ?????
|
||||
|
||||
# Main Menu buttons
|
||||
mainMenuSelectTicTacToe=\u4E95\u5B57\u68CB
|
||||
# ???
|
||||
mainMenuSelectReversi=\u9ED1\u767D\u68CB
|
||||
# ???
|
||||
mainMenuSelectSudoku=\u6570\u72EC
|
||||
# ??
|
||||
mainMenuSelectBattleship=\u6D77\u6218\u68CB
|
||||
# ???
|
||||
mainMenuSelectOther=\u5176\u4ED6
|
||||
# ??
|
||||
mainMenuSelectCredits=\u5236\u4F5C\u4EBA\u5458
|
||||
# ????
|
||||
mainMenuSelectOptions=\u9009\u9879
|
||||
# ??
|
||||
mainMenuSelectQuit=\u9000\u51FA
|
||||
# ??
|
||||
|
||||
# Quit Menu text and buttons
|
||||
quitMenuTextSure=\u4F60\u786E\u5B9A\u5417\uFF1F
|
||||
# ?????
|
||||
quitMenuButtonYes=\u662F
|
||||
# ?
|
||||
quitMenuButtonNo=\u5426
|
||||
# ?
|
||||
1
app/src/main/resources/assets/text/test.txt
Normal file
1
app/src/main/resources/assets/text/test.txt
Normal file
@@ -0,0 +1 @@
|
||||
Super gaaf!
|
||||
Reference in New Issue
Block a user