diff --git a/Projekte/battleship/model/src/main/resources/battleship.properties b/Projekte/battleship/model/src/main/resources/battleship.properties index 30991df..7486120 100644 --- a/Projekte/battleship/model/src/main/resources/battleship.properties +++ b/Projekte/battleship/model/src/main/resources/battleship.properties @@ -25,10 +25,12 @@ button.cancel=Cancel server.dialog=Server host.name=Host port.number=Port +server.host= Self-Host Game wait.its.not.your.turn=Wait, it's not your turn!! menu.quit=Quit game menu.return-to-game=Return to game menu.sound-enabled=Sound switched on +menu.background-sound-enabled=Music switched on menu.map.load=Load map from file... menu.map.save=Save map in file... label.file=File: @@ -37,6 +39,3 @@ dialog.error=Error dialog.question=Question port.must.be.integer=Port must be an integer number 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 diff --git a/Projekte/battleship/model/src/main/resources/battleship_de.properties b/Projekte/battleship/model/src/main/resources/battleship_de.properties index 085058b..587f92d 100644 --- a/Projekte/battleship/model/src/main/resources/battleship_de.properties +++ b/Projekte/battleship/model/src/main/resources/battleship_de.properties @@ -25,10 +25,12 @@ button.cancel=Abbruch server.dialog=Server host.name=Host port.number=Port +server.host= Spiel selbst hosten wait.its.not.your.turn=Warte, Du bist nicht dran!! menu.quit=Spiel beenden menu.return-to-game=Zurück zum Spiel menu.sound-enabled=Sound eingeschaltet +menu.background-sound-enabled=Musik eingeschaltet menu.map.load=Karte von Datei laden... menu.map.save=Karte in Datei speichern... label.file=Datei: @@ -37,6 +39,4 @@ dialog.error=Fehler dialog.question=Frage port.must.be.integer=Der Port muss eine ganze Zahl sein 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 \ No newline at end of file + diff --git a/Projekte/battleship/server/src/main/java/pp/battleship/server/BattleshipServer.java b/Projekte/battleship/server/src/main/java/pp/battleship/server/BattleshipServer.java index 1ad0a2e..cbad331 100644 --- a/Projekte/battleship/server/src/main/java/pp/battleship/server/BattleshipServer.java +++ b/Projekte/battleship/server/src/main/java/pp/battleship/server/BattleshipServer.java @@ -7,6 +7,15 @@ 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.HostedConnection; import com.jme3.network.Message; @@ -14,6 +23,7 @@ import com.jme3.network.MessageListener; import com.jme3.network.Network; import com.jme3.network.Server; import com.jme3.network.serializing.Serializer; + import pp.battleship.BattleshipConfig; import pp.battleship.game.server.Player; import pp.battleship.game.server.ServerGameLogic; @@ -29,15 +39,6 @@ import pp.battleship.model.Battleship; import pp.battleship.model.IntPoint; 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 */