diff --git a/Projekte/battleship/client/client.properties b/Projekte/battleship/client/client.properties index 89d59df4..4403fa3b 100644 --- a/Projekte/battleship/client/client.properties +++ b/Projekte/battleship/client/client.properties @@ -9,7 +9,7 @@ # # Specifies the map used by the opponent in single mode. # Single mode is activated if this property is set. -map.opponent=maps/map2.json +#map.opponent=maps/map2.json # # Specifies the map used by the player in single mode. # The player must define their own map if this property is not set. diff --git a/Projekte/battleship/client/src/main/java/pp/battleship/client/GameSound.java b/Projekte/battleship/client/src/main/java/pp/battleship/client/GameSound.java index 8518e3b8..72ccb285 100644 --- a/Projekte/battleship/client/src/main/java/pp/battleship/client/GameSound.java +++ b/Projekte/battleship/client/src/main/java/pp/battleship/client/GameSound.java @@ -101,7 +101,6 @@ private AudioNode loadSound(Application app, String name) { return null; } - /** * Plays the splash sound effect. */ diff --git a/Projekte/battleship/client/src/main/java/pp/battleship/client/Menu.java b/Projekte/battleship/client/src/main/java/pp/battleship/client/Menu.java index f38b3364..31d5fef0 100644 --- a/Projekte/battleship/client/src/main/java/pp/battleship/client/Menu.java +++ b/Projekte/battleship/client/src/main/java/pp/battleship/client/Menu.java @@ -72,7 +72,6 @@ public Menu(BattleshipApp app) { addChild(new Button(lookup("menu.quit"))) .addClickCommands(s -> ifTopDialog(app::closeApp)); - update(); } diff --git a/Projekte/battleship/client/src/main/java/pp/battleship/client/NetworkDialog.java b/Projekte/battleship/client/src/main/java/pp/battleship/client/NetworkDialog.java index 3f2f5a65..b505e4d2 100644 --- a/Projekte/battleship/client/src/main/java/pp/battleship/client/NetworkDialog.java +++ b/Projekte/battleship/client/src/main/java/pp/battleship/client/NetworkDialog.java @@ -7,6 +7,7 @@ package pp.battleship.client; +import com.simsilica.lemur.Checkbox; import com.simsilica.lemur.Container; import com.simsilica.lemur.Label; import com.simsilica.lemur.TextField; @@ -14,6 +15,7 @@ import pp.dialog.Dialog; import pp.dialog.DialogBuilder; import pp.dialog.SimpleDialog; +import server.BattleshipServer; import java.lang.System.Logger; import java.lang.System.Logger.Level; @@ -37,6 +39,7 @@ class NetworkDialog extends SimpleDialog { private int portNumber; private Future connectionFuture; private Dialog progressDialog; + private boolean hostServer = false; /** * Constructs a new NetworkDialog. @@ -52,10 +55,14 @@ class NetworkDialog extends SimpleDialog { final BattleshipApp app = network.getApp(); final Container input = new Container(new SpringGridLayout()); + Checkbox hostServer = new Checkbox(lookup("start.own.server")); + hostServer.setChecked(false); + hostServer.addClickCommands(s->toggleOwnServer()); input.addChild(new Label(lookup("host.name") + ": ")); input.addChild(host, 1); input.addChild(new Label(lookup("port.number") + ": ")); input.addChild(port, 1); + input.addChild(hostServer); DialogBuilder.simple(app.getDialogManager()) .setTitle(lookup("server.dialog")) @@ -68,10 +75,10 @@ class NetworkDialog extends SimpleDialog { } /** - * Handles the action for the connect button in the connection dialog. + * Handles the action for establishing the connection to a server. * Tries to parse the port number and initiate connection to the server. */ - private void connect() { + private void connectToServer() { LOGGER.log(Level.INFO, "connect to host={0}, port={1}", host, port); //NON-NLS try { hostname = host.getText().trim().isEmpty() ? LOCALHOST : host.getText(); @@ -150,4 +157,44 @@ private void failure(Throwable e) { network.getApp().errorDialog(lookup("server.connection.failed")); network.getApp().setInfoText(e.getLocalizedMessage()); } + + /** + * Handles the action for the connect-button. + * If hostServer-Checkbox is active, starts a new Server on the clients machine, else tries to connect to existing server + */ + private void connect() { + if(hostServer){ + startServer(); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + LOGGER.log(Level.WARNING, e.getMessage(), e); + } + connectToServer(); + } else { + connectToServer(); + } + } + + /** + * starts a server on the clients machine + */ + private void startServer() { + new Thread(() -> { + try{ + BattleshipServer battleshipServer = new BattleshipServer(); + battleshipServer.run(); + } catch (Exception e) { + LOGGER.log(Level.ERROR,e); + } + }).start(); + } + + /** + * handles the action for the hostServer-Checkbox + */ + private void toggleOwnServer(){ + hostServer = !hostServer; + } + } diff --git a/Projekte/battleship/client/src/main/java/server/BattleshipServer.java b/Projekte/battleship/client/src/main/java/server/BattleshipServer.java new file mode 100644 index 00000000..d384640e --- /dev/null +++ b/Projekte/battleship/client/src/main/java/server/BattleshipServer.java @@ -0,0 +1,179 @@ +//////////////////////////////////////// +// Programming project code +// UniBw M, 2022, 2023, 2024 +// www.unibw.de/inf2 +// (c) Mark Minas (mark.minas@unibw.de) +//////////////////////////////////////// + +package server; + +import com.jme3.network.ConnectionListener; +import com.jme3.network.HostedConnection; +import com.jme3.network.Message; +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; +import pp.battleship.game.server.ServerSender; +import pp.battleship.message.client.ClientMessage; +import pp.battleship.message.client.MapMessage; +import pp.battleship.message.client.ShootMessage; +import pp.battleship.message.server.EffectMessage; +import pp.battleship.message.server.GameDetails; +import pp.battleship.message.server.ServerMessage; +import pp.battleship.message.server.StartBattleMessage; +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 + */ +public class BattleshipServer implements MessageListener, ConnectionListener, ServerSender { + private static final Logger LOGGER = System.getLogger(BattleshipServer.class.getName()); + private static final File CONFIG_FILE = new File("server.properties"); + + private final BattleshipConfig config = new BattleshipConfig(); + private Server myServer; + private final ServerGameLogic logic; + private final BlockingQueue pendingMessages = new LinkedBlockingQueue<>(); + + static { + // Configure logging + LogManager manager = LogManager.getLogManager(); + try { + manager.readConfiguration(new FileInputStream("logging.properties")); + LOGGER.log(Level.INFO, "Successfully read logging properties"); //NON-NLS + } + catch (IOException e) { + LOGGER.log(Level.INFO, e.getMessage()); + } + } + + /** + * Starts the Battleships server. + */ + public static void main(String[] args) { + new BattleshipServer().run(); + } + + /** + * Creates the server. + */ + public BattleshipServer() { + config.readFromIfExists(CONFIG_FILE); + LOGGER.log(Level.INFO, "Configuration: {0}", config); //NON-NLS + logic = new ServerGameLogic(this, config); + } + + public void run() { + startServer(); + while (true) + processNextMessage(); + } + + private void startServer() { + try { + LOGGER.log(Level.INFO, "Starting server..."); //NON-NLS + myServer = Network.createServer(config.getPort()); + initializeSerializables(); + myServer.start(); + registerListeners(); + LOGGER.log(Level.INFO, "Server started: {0}", myServer.isRunning()); //NON-NLS + } + catch (IOException e) { + LOGGER.log(Level.ERROR, "Couldn't start server: {0}", e.getMessage()); //NON-NLS + exit(1); + } + } + + private void processNextMessage() { + try { + pendingMessages.take().process(logic); + } + catch (InterruptedException ex) { + LOGGER.log(Level.INFO, "Interrupted while waiting for messages"); //NON-NLS + Thread.currentThread().interrupt(); + } + } + + private void initializeSerializables() { + Serializer.registerClass(GameDetails.class); + Serializer.registerClass(StartBattleMessage.class); + Serializer.registerClass(MapMessage.class); + Serializer.registerClass(ShootMessage.class); + Serializer.registerClass(EffectMessage.class); + Serializer.registerClass(Battleship.class); + Serializer.registerClass(IntPoint.class); + Serializer.registerClass(Shot.class); + } + + private void registerListeners() { + myServer.addMessageListener(this, MapMessage.class); + myServer.addMessageListener(this, ShootMessage.class); + myServer.addConnectionListener(this); + } + + @Override + public void messageReceived(HostedConnection source, Message message) { + LOGGER.log(Level.INFO, "message received from {0}: {1}", source.getId(), message); //NON-NLS + if (message instanceof ClientMessage clientMessage) + pendingMessages.add(new ReceivedMessage(clientMessage, source.getId())); + } + + @Override + public void connectionAdded(Server server, HostedConnection hostedConnection) { + LOGGER.log(Level.INFO, "new connection {0}", hostedConnection); //NON-NLS + logic.addPlayer(hostedConnection.getId()); + } + + @Override + public void connectionRemoved(Server server, HostedConnection hostedConnection) { + LOGGER.log(Level.INFO, "connection closed: {0}", hostedConnection); //NON-NLS + final Player player = logic.getPlayerById(hostedConnection.getId()); + if (player == null) + LOGGER.log(Level.INFO, "closed connection does not belong to an active player"); //NON-NLS + else { //NON-NLS + LOGGER.log(Level.INFO, "closed connection belongs to {0}", player); //NON-NLS + exit(0); + } + } + + private void exit(int exitValue) { //NON-NLS + LOGGER.log(Level.INFO, "close request"); //NON-NLS + if (myServer != null) + for (HostedConnection client : myServer.getConnections()) //NON-NLS + if (client != null) client.close("Game over"); //NON-NLS + System.exit(exitValue); + } + + /** + * Send the specified message to the specified connection. + * + * @param id the connection id + * @param message the message + */ + public void send(int id, ServerMessage message) { + if (myServer == null || !myServer.isRunning()) { + LOGGER.log(Level.ERROR, "no server running when trying to send {0}", message); //NON-NLS + return; + } + final HostedConnection connection = myServer.getConnection(id); + if (connection != null) + connection.send(message); + else + LOGGER.log(Level.ERROR, "there is no connection with id={0}", id); //NON-NLS + } +} \ No newline at end of file diff --git a/Projekte/battleship/client/src/main/java/server/ReceivedMessage.java b/Projekte/battleship/client/src/main/java/server/ReceivedMessage.java new file mode 100644 index 00000000..f34c645b --- /dev/null +++ b/Projekte/battleship/client/src/main/java/server/ReceivedMessage.java @@ -0,0 +1,17 @@ +//////////////////////////////////////// +// Programming project code +// UniBw M, 2022, 2023, 2024 +// www.unibw.de/inf2 +// (c) Mark Minas (mark.minas@unibw.de) +//////////////////////////////////////// + +package server; + +import pp.battleship.message.client.ClientInterpreter; +import pp.battleship.message.client.ClientMessage; + +record ReceivedMessage(ClientMessage message, int from) { + void process(ClientInterpreter interpreter) { + message.accept(interpreter, from); + } +} diff --git a/Projekte/battleship/model/src/main/resources/battleship.properties b/Projekte/battleship/model/src/main/resources/battleship.properties index ef5303e6..e4fb9cb1 100644 --- a/Projekte/battleship/model/src/main/resources/battleship.properties +++ b/Projekte/battleship/model/src/main/resources/battleship.properties @@ -38,6 +38,7 @@ dialog.question=Question port.must.be.integer=Port must be an integer number map.doesnt.fit=The map doesn't fit to this game ships.dont.fit.the.map=Ships are out of bounds -menu.music.toggle= Music on/off -menu.music.volume= Volume +menu.music.toggle = Music on/off +menu.music.volume = Volume +start.own.server = start server diff --git a/Projekte/battleship/model/src/main/resources/battleship_de.properties b/Projekte/battleship/model/src/main/resources/battleship_de.properties index 45f9b4a6..7712d616 100644 --- a/Projekte/battleship/model/src/main/resources/battleship_de.properties +++ b/Projekte/battleship/model/src/main/resources/battleship_de.properties @@ -38,6 +38,7 @@ dialog.question=Frage port.must.be.integer=Der Port muss eine ganze Zahl sein map.doesnt.fit=Diese Karte passt nicht zu diesem Spiel ships.dont.fit.the.map=Schiffe sind außerhalb der Map -menu.music.toggle= Musik an/aus -menu.music.volume= Lautstärke +menu.music.toggle = Musik an/aus +menu.music.volume = Lautstärke +start.own.server = Server starten