peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2024-11-28 21:19:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

more fixing things

Browse Source
This commit is contained in:
Luca Puderbach 2024-10-14 04:38:01 +02:00
parent 96992c5b03
commit 33dba7f3b6
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Projekte/battleship/model/src/main/resources/battleship.properties
View File

@ -25,10 +25,12 @@ button.cancel=Cancel
server.dialog=Server server.dialog=Server
host.name=Host host.name=Host
port.number=Port port.number=Port
server.host= Self-Host Game
wait.its.not.your.turn=Wait, it's not your turn!! wait.its.not.your.turn=Wait, it's not your turn!!
menu.quit=Quit game menu.quit=Quit game
menu.return-to-game=Return to game menu.return-to-game=Return to game
menu.sound-enabled=Sound switched on menu.sound-enabled=Sound switched on
menu.background-sound-enabled=Music switched on
menu.map.load=Load map from file... menu.map.load=Load map from file...
menu.map.save=Save map in file... menu.map.save=Save map in file...
label.file=File: label.file=File:
@ -37,6 +39,3 @@ dialog.error=Error
dialog.question=Question dialog.question=Question
port.must.be.integer=Port must be an integer number port.must.be.integer=Port must be an integer number
map.doesnt.fit=The map doesn't fit to this game map.doesnt.fit=The map doesn't fit to this game
menu.background-sound-enabled=Background music switched on
client.server-start = Start server
server.host= Self-Host Game

6
Projekte/battleship/model/src/main/resources/battleship_de.properties
View File

@ -25,10 +25,12 @@ button.cancel=Abbruch
server.dialog=Server server.dialog=Server
host.name=Host host.name=Host
port.number=Port port.number=Port
server.host= Spiel selbst hosten
wait.its.not.your.turn=Warte, Du bist nicht dran!! wait.its.not.your.turn=Warte, Du bist nicht dran!!
menu.quit=Spiel beenden menu.quit=Spiel beenden
menu.return-to-game=Zurück zum Spiel menu.return-to-game=Zurück zum Spiel
menu.sound-enabled=Sound eingeschaltet menu.sound-enabled=Sound eingeschaltet
menu.background-sound-enabled=Musik eingeschaltet
menu.map.load=Karte von Datei laden... menu.map.load=Karte von Datei laden...
menu.map.save=Karte in Datei speichern... menu.map.save=Karte in Datei speichern...
label.file=Datei: label.file=Datei:
@ -37,6 +39,4 @@ dialog.error=Fehler
dialog.question=Frage dialog.question=Frage
port.must.be.integer=Der Port muss eine ganze Zahl sein port.must.be.integer=Der Port muss eine ganze Zahl sein
map.doesnt.fit=Diese Karte passt nicht zu diesem Spiel map.doesnt.fit=Diese Karte passt nicht zu diesem Spiel
menu.background-sound-enabled=Hintergrundmusik eingeschaltet
client.server-start = Starte Server
server.host= Spiel selbst hosten

19
Projekte/battleship/server/src/main/java/pp/battleship/server/BattleshipServer.java
View File

@ -7,6 +7,15 @@
package pp.battleship.server; package pp.battleship.server;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.lang.System.Logger;
import java.lang.System.Logger.Level;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.logging.LogManager;
import com.jme3.network.ConnectionListener; import com.jme3.network.ConnectionListener;
import com.jme3.network.HostedConnection; import com.jme3.network.HostedConnection;
import com.jme3.network.Message; import com.jme3.network.Message;
@ -14,6 +23,7 @@ import com.jme3.network.MessageListener;
import com.jme3.network.Network; import com.jme3.network.Network;
import com.jme3.network.Server; import com.jme3.network.Server;
import com.jme3.network.serializing.Serializer; import com.jme3.network.serializing.Serializer;
import pp.battleship.BattleshipConfig; import pp.battleship.BattleshipConfig;
import pp.battleship.game.server.Player; import pp.battleship.game.server.Player;
import pp.battleship.game.server.ServerGameLogic; import pp.battleship.game.server.ServerGameLogic;
@ -29,15 +39,6 @@ import pp.battleship.model.Battleship;
import pp.battleship.model.IntPoint; import pp.battleship.model.IntPoint;
import pp.battleship.model.Shot; import pp.battleship.model.Shot;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.lang.System.Logger;
import java.lang.System.Logger.Level;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.logging.LogManager;
/** /**
* Server implementing the visitor pattern as MessageReceiver for ClientMessages * Server implementing the visitor pattern as MessageReceiver for ClientMessages
*/ */