fixed bug when playing rocket audio to not produce an AudioRender error

also includes minor fixes

Projekte/battleship/client/build.gradle

@@ -9,6 +9,7 @@ implementation project(":jme-common")
     implementation project(":battleship:model")
 
     implementation libs.jme3.desktop
+    implementation libs.jme3.effects
 
     runtimeOnly libs.jme3.awt.dialogs
     runtimeOnly libs.jme3.plugins

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.
@@ -23,10 +23,10 @@ map.own=maps/map1.json
 #   2, 3
 #  defines four shots, namely at the coordinates
 #  (x=2, y=0), (x=2, y=1), (x=2, y=2), and (x=2, y=3)
-robot.targets=2, 0,\
-              2, 1,\
-              2, 2,\
-              2, 3
+robot.targets=2, 3,\
+              2, 4,\
+              2, 5,\
+              2, 8
 #
 # Delay in milliseconds between each shot fired by the RobotClient.
 robot.delay=500

Projekte/battleship/client/src/main/java/pp/battleship/client/BackgroundMusic.java

@@ -0,0 +1,242 @@
+package pp.battleship.client;
+
+import com.jme3.audio.AudioData.DataType;
+import com.jme3.audio.AudioNode;
+import com.jme3.audio.AudioSource.Status;
+import pp.battleship.notification.Music;
+import pp.battleship.notification.MusicEvent;
+import pp.battleship.notification.GameEventListener;
+
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+import java.util.prefs.Preferences;
+
+public class BackgroundMusic implements GameEventListener {
+    private static final String VOLUME_PREF = "volume";
+    private static final String MUSIC_ENABLED_PREF = "musicEnabled";
+    private static final Preferences PREFS = Preferences.userNodeForPackage(BackgroundMusic.class);
+
+    static final Logger LOGGER = System.getLogger(BackgroundMusic.class.getName());
+
+    private static final String MENU_MUSIC = "Music/MainMenu/Dark_Intro.ogg";
+    private static final String BATTLE_MUSIC = "Music/BattleTheme/boss_battle_#2_metal_loop.wav";
+    private static final String GAME_OVER_MUSIC_L = "Music/GameOver/Lose/Lose.ogg";
+    private static final String GAME_OVER_MUSIC_V = "Music/GameOver/Victory/Victory.wav";
+
+    private final AudioNode menuMusic;
+    private final AudioNode battleMusic;
+    private final AudioNode gameOverMusicL;
+    private final AudioNode gameOverMusicV;
+    private String lastNodePlayed;
+
+    private boolean musicEnabled;
+    private float volume;
+
+    private final BattleshipApp app;
+
+    /**
+     * Initializes and controls the BackgroundMusic
+     *
+     * @param app The main Application
+     */
+    public BackgroundMusic(BattleshipApp app) {
+        this.volume = PREFS.getFloat(VOLUME_PREF, 1.0f);
+        this.musicEnabled = PREFS.getBoolean(MUSIC_ENABLED_PREF, true);
+        this.app = app;
+
+        menuMusic = createAudioNode(MENU_MUSIC);
+        battleMusic = createAudioNode(BATTLE_MUSIC);
+        gameOverMusicL = createAudioNode(GAME_OVER_MUSIC_L);
+        gameOverMusicV = createAudioNode(GAME_OVER_MUSIC_V);
+        stop(battleMusic);
+        stop(gameOverMusicL);
+        stop(gameOverMusicV);
+
+        lastNodePlayed = menuMusic.getName();
+
+        if(musicEnabled) {
+            play(menuMusic);
+        }
+    }
+
+    /**
+     * This method will be used to create the audio node containing the music
+     *
+     * @param musicFilePath the file path to the music
+     * @return the created audio node
+     */
+    private AudioNode createAudioNode(String musicFilePath) {
+        AudioNode audioNode = new AudioNode(app.getAssetManager(), musicFilePath, DataType.Stream);
+        audioNode.setVolume(volume * app.getMainVolumeControl().getMainVolume());
+        audioNode.setPositional(false);
+        audioNode.setLooping(true);
+        audioNode.setName(musicFilePath);
+        return audioNode;
+    }
+
+    /**
+     * sets the give audio node to play
+     *
+     * @param audioNode the audio node which should start to play
+     */
+    public void play(AudioNode audioNode) {
+        if (musicEnabled && (audioNode.getStatus() == Status.Stopped || audioNode.getStatus() == Status.Paused)) {
+            audioNode.play();
+            lastNodePlayed = audioNode.getName();
+        }
+    }
+
+    /**
+     * stops the given audio node from playing
+     *
+     * @param audioNode the audio node to be stopped
+     */
+    public void stop(AudioNode audioNode) {
+        if (audioNode.getStatus() == Status.Playing) {
+            audioNode.stop();
+        }
+    }
+
+    /**
+     * pauses the given audi node
+     *
+     * @param audioNode the audio node to be paused
+     */
+    public void pause(AudioNode audioNode) {
+        if (audioNode.getStatus() == Status.Playing) {
+            audioNode.pause();
+        }
+    }
+
+    /**
+     * Toggle Method to control the music to switch it on or off
+     */
+    public void toggleMusic() {
+        this.musicEnabled = !this.musicEnabled;
+        if (musicEnabled) {
+            switch (lastNodePlayed){
+                case MENU_MUSIC:
+                    play(menuMusic);
+                    break;
+                case BATTLE_MUSIC:
+                    play(battleMusic);
+                    break;
+                case GAME_OVER_MUSIC_L:
+                    play(gameOverMusicL);
+                    break;
+                case GAME_OVER_MUSIC_V:
+                    play(gameOverMusicV);
+                    break;
+            }
+        } else {
+            pause(menuMusic);
+            pause(battleMusic);
+            pause(gameOverMusicL);
+            pause(gameOverMusicV);
+        }
+
+        PREFS.putBoolean(MUSIC_ENABLED_PREF, musicEnabled);
+    }
+
+    /**
+     * this method is used when the main volume changes
+     */
+    public void setVolume(){
+        setVolume(PREFS.getFloat(VOLUME_PREF, 1.0f));
+    }
+
+    /**
+     * Method to set the volume for the music
+     *
+     * @param volume float to transfer the new volume
+     */
+    public void setVolume(float volume) {
+        this.volume = volume;
+        float mainVolume = app.getMainVolumeControl().getMainVolume();
+        menuMusic.setVolume(volume * mainVolume);
+        battleMusic.setVolume(volume * mainVolume);
+        gameOverMusicL.setVolume(volume * mainVolume);
+        gameOverMusicV.setVolume(volume * mainVolume);
+
+        PREFS.putFloat(VOLUME_PREF, volume);
+    }
+
+    /**
+     * This method retuns the volume
+     *
+     * @return the current volume as a float
+     */
+    public float getVolume() {
+        return volume;
+    }
+
+    /**
+     * Returns if music should be played or not
+     *
+     * @return boolean value in music should be played
+     */
+    public boolean isMusicEnabled() {
+        return musicEnabled;
+    }
+
+    /**
+     * changes the music to the specified music if it isn't already playing
+     *
+     * @param music the music to play
+     */
+    public void changeMusic(Music music) {
+        if(music == Music.MENU_THEME && !lastNodePlayed.equals(MENU_MUSIC)) {
+            LOGGER.log(Level.INFO, "Received Music change Event {0}", music.toString());
+            stop(battleMusic);
+            stop(gameOverMusicL);
+            stop(gameOverMusicV);
+            play(menuMusic);
+            lastNodePlayed = menuMusic.getName();
+        } else if (music == Music.BATTLE_THEME && !lastNodePlayed.equals(BATTLE_MUSIC)) {
+            LOGGER.log(Level.INFO, "Received Music change Event {0}", music.toString());
+            stop(menuMusic);
+            stop(gameOverMusicL);
+            stop(gameOverMusicV);
+            play(battleMusic);
+            lastNodePlayed = battleMusic.getName();
+        } else if (music == Music.GAME_OVER_THEME_L && !lastNodePlayed.equals(GAME_OVER_MUSIC_L)) {
+            LOGGER.log(Level.INFO, "Received Music change Event {0}", music.toString());
+            stop(menuMusic);
+            stop(battleMusic);
+            stop(gameOverMusicV);
+            play(gameOverMusicL);
+            lastNodePlayed = gameOverMusicL.getName();
+        } else if (music == Music.GAME_OVER_THEME_V && !lastNodePlayed.equals(GAME_OVER_MUSIC_V)){
+            LOGGER.log(Level.INFO, "Received Music change Event {0}", music.toString());
+            stop(menuMusic);
+            stop(battleMusic);
+            stop(gameOverMusicL);
+            play(gameOverMusicV);
+            lastNodePlayed = gameOverMusicV.getName();
+        }
+    }
+
+    /**
+     * the method which receives the Event
+     *
+     * @param music the received Event
+     */
+    @Override
+    public void receivedEvent (MusicEvent music){
+        LOGGER.log(Level.INFO, "Received Music change Event {0}", music.toString());
+        switch (music.music()){
+            case MENU_THEME:
+                changeMusic(Music.MENU_THEME);
+                break;
+            case BATTLE_THEME:
+                changeMusic(Music.BATTLE_THEME);
+                break;
+            case GAME_OVER_THEME_L:
+                changeMusic(Music.GAME_OVER_THEME_L);
+                break;
+            case GAME_OVER_THEME_V:
+                changeMusic(Music.GAME_OVER_THEME_V);
+                break;
+        }
+    }
+}

Projekte/battleship/client/src/main/java/pp/battleship/client/BattleshipApp.java

@@ -122,6 +122,16 @@ public class BattleshipApp extends SimpleApplication implements BattleshipClient
      */
     private final ActionListener escapeListener = (name, isPressed, tpf) -> escape(isPressed);
 
+    /**
+     * The Object which handles the background music
+     */
+    private BackgroundMusic backgroundMusic;
+
+    /**
+     * The object that handles the main volume
+     */
+    private MainVolume mainVolume;
+
     static {
         // Configure logging
         LogManager manager = LogManager.getLogManager();
@@ -225,6 +235,10 @@ public void simpleInitApp() {
         setupStates();
         setupGui();
         serverConnection.connect();
+
+        mainVolume = new MainVolume(this);
+        backgroundMusic = new BackgroundMusic(this);
+        logic.addListener(backgroundMusic);
     }
 
     /**
@@ -426,4 +440,22 @@ void errorDialog(String errorMessage) {
                      .build()
                      .open();
     }
+
+    /**
+     * this method returns the object which handles the background music
+     *
+     * @return BackgroundMusic
+     */
+    public BackgroundMusic getBackgroundMusic(){
+        return backgroundMusic;
+    }
+
+    /**
+     * this method returns the object which handles the main volume
+     *
+     * @return an object of MainVolume
+     */
+    public MainVolume getMainVolumeControl(){
+        return mainVolume;
+    }
 }

Projekte/battleship/client/src/main/java/pp/battleship/client/GameSound.java

@@ -14,6 +14,7 @@
 import com.jme3.asset.AssetNotFoundException;
 import com.jme3.audio.AudioData;
 import com.jme3.audio.AudioNode;
+import com.jme3.audio.AudioSource;
 import pp.battleship.notification.GameEventListener;
 import pp.battleship.notification.SoundEvent;
 
@@ -27,13 +28,19 @@
  * An application state that plays sounds.
  */
 public class GameSound extends AbstractAppState implements GameEventListener {
-    private static final Logger LOGGER = System.getLogger(GameSound.class.getName());
+    static final Logger LOGGER = System.getLogger(GameSound.class.getName());
     private static final Preferences PREFERENCES = getPreferences(GameSound.class);
     private static final String ENABLED_PREF = "enabled"; //NON-NLS
+    private static final String SOUND_VOLUME_PREF = "volume";
+
+    private float volume;
 
     private AudioNode splashSound;
     private AudioNode shipDestroyedSound;
     private AudioNode explosionSound;
+    private AudioNode rocketSound;
+
+    private BattleshipApp app;
 
     /**
      * Checks if sound is enabled in the preferences.
@@ -75,9 +82,13 @@ public void setEnabled(boolean enabled) {
     @Override
     public void initialize(AppStateManager stateManager, Application app) {
         super.initialize(stateManager, app);
+        this.app = (BattleshipApp) app;
         shipDestroyedSound = loadSound(app, "Sound/Effects/sunken.wav"); //NON-NLS
         splashSound = loadSound(app, "Sound/Effects/splash.wav"); //NON-NLS
         explosionSound = loadSound(app, "Sound/Effects/explosion.wav"); //NON-NLS
+        rocketSound = loadSound(app, "Sound/Effects/rocket.wav");
+
+        volume = PREFERENCES.getFloat(SOUND_VOLUME_PREF, 1.0f);
     }
 
     /**
@@ -124,12 +135,65 @@ public void shipDestroyed() {
             shipDestroyedSound.playInstance();
     }
 
+    /**
+     * Plays sound effect when a rocket starts
+     */
+    public void rocket() {
+        if (isEnabled() && rocketSound != null)
+            rocketSound.playInstance();
+    }
+
+    /**
+     * this method sets the sound volume of the sounds
+     *
+     * @param volume the volume to be set to
+     */
+    public void setSoundVolume(float volume) {
+        float mainVolume = app.getMainVolumeControl().getMainVolume();
+        float calculatedVolume = volume * mainVolume;
+        shipDestroyedSound.setVolume(calculatedVolume);
+        splashSound.setVolume(calculatedVolume);
+        explosionSound.setVolume(calculatedVolume);
+        this.volume = volume;
+        PREFERENCES.putFloat(SOUND_VOLUME_PREF, volume);
+    }
+
+    /**
+     * this method will be used if the main volume changes
+     */
+    public void setSoundVolume() {
+        float mainVolume = app.getMainVolumeControl().getMainVolume();
+        shipDestroyedSound.setVolume(volume * mainVolume);
+        splashSound.setVolume(volume * mainVolume);
+        explosionSound.setVolume(volume * mainVolume);
+        rocketSound.setVolume(volume * mainVolume);
+        PREFERENCES.putFloat(SOUND_VOLUME_PREF, volume);
+    }
+
+    /**
+     * this method returns the sound
+     *
+     * @return
+     */
+    public float getVolume(){
+        return volume;
+    }
+
     @Override
     public void receivedEvent(SoundEvent event) {
         switch (event.sound()) {
-            case EXPLOSION -> explosion();
-            case SPLASH -> splash();
-            case DESTROYED_SHIP -> shipDestroyed();
+            case EXPLOSION :
+                explosion();
+                break;
+            case SPLASH :
+                splash();
+                break;
+            case DESTROYED_SHIP:
+                shipDestroyed();
+                break;
+            case ROCKET_FIRED:
+                rocket();
+                break;
         }
     }
 }

Projekte/battleship/client/src/main/java/pp/battleship/client/MainVolume.java

@@ -0,0 +1,32 @@
+package pp.battleship.client;
+
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+import java.util.prefs.Preferences;
+
+public class MainVolume {
+    private static final Preferences PREFS = Preferences.userNodeForPackage(MainVolume.class);
+    private static final String MAIN_VOLUME_PREFS = "MainVolume";
+    static final Logger LOGGER = System.getLogger(MainVolume.class.getName());
+
+    private float mainVolume;
+
+    private BattleshipApp app;
+
+    public MainVolume(BattleshipApp app) {
+        this.mainVolume = PREFS.getFloat(MAIN_VOLUME_PREFS, 1.0f);
+        this.app = app;
+    }
+
+    public void setMainVolume(float mainVolume) {
+        LOGGER.log(Level.DEBUG, "setMainVolume: mainVolume = {0}", mainVolume);
+        app.getBackgroundMusic().setVolume();
+        app.getStateManager().getState(GameSound.class).setSoundVolume();
+        this.mainVolume = mainVolume;
+        PREFS.putFloat(MAIN_VOLUME_PREFS, mainVolume);
+    }
+
+    public float getMainVolume() {
+        return mainVolume;
+    }
+}

Projekte/battleship/client/src/main/java/pp/battleship/client/Menu.java

@@ -9,7 +9,10 @@
 
 import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Checkbox;
+import com.simsilica.lemur.DefaultRangedValueModel;
 import com.simsilica.lemur.Label;
+import com.simsilica.lemur.Slider;
+import com.simsilica.lemur.core.VersionedReference;
 import com.simsilica.lemur.style.ElementId;
 import pp.dialog.Dialog;
 import pp.dialog.StateCheckboxModel;
@@ -34,6 +37,14 @@ class Menu extends Dialog {
     private final Button loadButton = new Button(lookup("menu.map.load"));
     private final Button saveButton = new Button(lookup("menu.map.save"));
 
+    private static final double SLIDER_DELTA = 0.1;
+    private static final double SLIDER_MIN_VALUE = 0.0;
+    private static final double SLIDER_MAX_VALUE = 2.0;
+
+    private final VersionedReference<Double> volumeRef;
+    private final VersionedReference<Double> soundVolumeRef;
+    private final VersionedReference<Double> mainVolumeRef;
+
     /**
      * Constructs the Menu dialog for the Battleship application.
      *
@@ -43,8 +54,28 @@ public Menu(BattleshipApp app) {
         super(app.getDialogManager());
         this.app = app;
         addChild(new Label(lookup("battleship.name"), new ElementId("header"))); //NON-NLS
+
+        addChild(new Label(lookup("menu.main.volume"), new ElementId("label")));
+        Slider mainVolumeSlider = createSlider(app.getMainVolumeControl().getMainVolume());
+        addChild(mainVolumeSlider);
+        mainVolumeRef = mainVolumeSlider.getModel().createReference();
+
+        addChild(new Label(lookup("menu.sound.volume"), new ElementId("label")));
         addChild(new Checkbox(lookup("menu.sound-enabled"),
                               new StateCheckboxModel(app, GameSound.class)));
+        Slider soundSlider = createSlider(app.getStateManager().getState(GameSound.class).getVolume());
+        addChild(soundSlider);
+        soundVolumeRef = soundSlider.getModel().createReference();
+
+        addChild(new Label(lookup("menu.volume"), new ElementId("label")));
+        Checkbox musicToggle = new Checkbox(lookup("menu.music.toggle"));
+        musicToggle.setChecked(app.getBackgroundMusic().isMusicEnabled());
+        musicToggle.addClickCommands(s -> toggleMusic());
+        addChild(musicToggle);
+        Slider volumeSlider = createSlider(app.getBackgroundMusic().getVolume());
+        addChild(volumeSlider);
+        volumeRef = volumeSlider.getModel().createReference();
+
         addChild(loadButton)
                 .addClickCommands(s -> ifTopDialog(this::loadDialog));
         addChild(saveButton)
@@ -56,6 +87,72 @@ public Menu(BattleshipApp app) {
         update();
     }
 
+    /**
+     * this method creates a slider to be used in the menu
+     *
+     * @param relativePosition the position of the regulator on the slider
+     * @return the creates slider
+     */
+    private Slider createSlider(double relativePosition){
+        Slider slider = new Slider();
+        slider.setModel(new DefaultRangedValueModel(SLIDER_MIN_VALUE, SLIDER_MAX_VALUE, relativePosition));
+        slider.setDelta(SLIDER_DELTA);
+        return slider;
+    }
+
+    /**
+     * this method is used update the volume when there is a change in the slider
+     * @param tpf time per frame
+     */
+    @Override
+    public void update(float tpf){
+        if(volumeRef.update()){
+            double newVolume = volumeRef.get();
+            adjustMusicVolume(newVolume);
+        }
+        else if (soundVolumeRef.update()) {
+            double newSoundVolume = soundVolumeRef.get();
+            adjustSoundVolume(newSoundVolume);
+        } else if (mainVolumeRef.update()) {
+            double newMainVolume = mainVolumeRef.get();
+            adjustMainVolume(newMainVolume);
+        }
+    }
+
+    /**
+     * this method adjusts the main volume
+     *
+     * @param newVolume the volume to be set as main volume
+     */
+    private void adjustMainVolume(double newVolume) {
+        app.getMainVolumeControl().setMainVolume((float) newVolume);
+    }
+
+    /**
+     * this method adjust the volume for the background music
+     *
+     * @param volume is the double value of the volume
+     */
+    private void adjustMusicVolume(double volume) {
+        app.getBackgroundMusic().setVolume((float) volume);
+    }
+
+    /**
+     * this method adjusts the volume for the sound
+     *
+     * @param volume is a double value of the sound volume
+     */
+    private void adjustSoundVolume(double volume) {
+        app.getStateManager().getState(GameSound.class).setSoundVolume((float) volume);
+    }
+
+    /**
+     * this method toggles the background music on and off
+     */
+    private void toggleMusic() {
+        app.getBackgroundMusic().toggleMusic();
+    }
+
     /**
      * Updates the state of the load and save buttons based on the game logic.
      */

Projekte/battleship/client/src/main/java/pp/battleship/client/NetworkDialog.java

@@ -7,10 +7,12 @@
 
 package pp.battleship.client;
 
+import com.simsilica.lemur.Checkbox;
 import com.simsilica.lemur.Container;
 import com.simsilica.lemur.Label;
 import com.simsilica.lemur.TextField;
 import com.simsilica.lemur.component.SpringGridLayout;
+import pp.battleship.client.server.BattleshipServer;
 import pp.dialog.Dialog;
 import pp.dialog.DialogBuilder;
 import pp.dialog.SimpleDialog;
@@ -37,6 +39,7 @@ class NetworkDialog extends SimpleDialog {
     private int portNumber;
     private Future<Object> connectionFuture;
     private Dialog progressDialog;
+    private boolean hostServer = false;
 
     /**
      * Constructs a new NetworkDialog.
@@ -50,12 +53,17 @@ class NetworkDialog extends SimpleDialog {
         host.setPreferredWidth(400f);
         port.setSingleLine(true);
 
+        Checkbox serverHost = new Checkbox(lookup("host.own.server"));
+        serverHost.setChecked(false);
+        serverHost.addClickCommands(s -> toggleServerHost());
+
         final BattleshipApp app = network.getApp();
         final Container input = new Container(new SpringGridLayout());
         input.addChild(new Label(lookup("host.name") + ":  "));
         input.addChild(host, 1);
         input.addChild(new Label(lookup("port.number") + ":  "));
         input.addChild(port, 1);
+        input.addChild(serverHost);
 
         DialogBuilder.simple(app.getDialogManager())
                      .setTitle(lookup("server.dialog"))
@@ -71,7 +79,7 @@ class NetworkDialog extends SimpleDialog {
      * Handles the action for the connect button in the connection dialog.
      * Tries to parse the port number and initiate connection to the server.
      */
-    private void connect() {
+    private void connectServer() {
         LOGGER.log(Level.INFO, "connect to host={0}, port={1}", host, port); //NON-NLS
         try {
             hostname = host.getText().trim().isEmpty() ? LOCALHOST : host.getText();
@@ -84,6 +92,41 @@ private void connect() {
         }
     }
 
+    /**
+     * This method will start a server or just connect to one based on the boolean hostServer
+     */
+    private void connect() {
+        if(hostServer){
+            startServer();
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                LOGGER.log(Level.WARNING, e.getMessage(), e);
+            }
+            connectServer();
+        } else {
+            connectServer();
+        }
+    }
+
+    /**
+     * This method starts a server in a new thread
+     */
+    private void startServer() {
+        new Thread(() -> {
+            try{
+                BattleshipServer battleshipServer = new BattleshipServer(Integer.parseInt(port.getText()));
+                battleshipServer.run();
+            } catch (Exception e) {
+                LOGGER.log(Level.ERROR, e.getMessage(), e);
+            }
+        }).start();
+    }
+
+    private void toggleServerHost(){
+        hostServer = !hostServer;
+    }
+
     /**
      * Creates a dialog indicating that the connection is in progress.
      */

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/EffectHandler.java

@@ -0,0 +1,179 @@
+package pp.battleship.client.gui;
+
+import com.jme3.app.Application;
+import com.jme3.asset.AssetManager;
+import com.jme3.effect.ParticleEmitter;
+import com.jme3.effect.ParticleMesh;
+import com.jme3.effect.ParticleMesh.Type;
+import com.jme3.material.Material;
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Node;
+import com.jme3.scene.control.AbstractControl;
+import pp.battleship.model.Shot;
+
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * This class is used to handle the effects for impacts
+ */
+public class EffectHandler {
+
+    private final AssetManager assetManager;
+    static final Logger LOGGER = System.getLogger(EffectHandler.class.getName());
+
+    private Material particleMat;
+
+    /**
+     * the constructor is used to get the asset manager from the app
+     *
+     * @param app the main application
+     */
+    public EffectHandler(Application app) {
+        assetManager = app.getAssetManager();
+        particleMat = new Material(assetManager, "Common/MatDefs/Misc/Particle.j3md");
+    }
+
+    /**
+     * creates a new HitEffect
+     *
+     * @param battleshipNode the node of the ship
+     * @param shot the shot which triggered the effect
+     */
+    public void createHitEffect(Node battleshipNode, Shot shot) {
+        createFieryEffect(battleshipNode,shot, "HitEffect", 30, 0.45f, 0.1f, -0.5f, 1f , 2f, false);
+    }
+
+    /**
+     * creates a new FireEffect
+     *
+     * @param battleshipNode the node of the ship
+     * @param shot the shot which triggered the effect
+     */
+    public void createFireEffect(Node battleshipNode, Shot shot) {
+        createFieryEffect(battleshipNode, shot, "FireEffect", 30, 0.1f, 0.05f, -0.9f, 1f , 2f, true);
+    }
+
+    /**
+     * creates a fiery type hit effect
+     *
+     * @param battleshipNode the ship to which the effect should be attached
+     * @param shot the shot that triggered the effect
+     * @param name the name of the particle emitter
+     * @param numOfParticle the overall numberOfParticles
+     * @param startSize the start size of the particles
+     * @param endSize the end size of the particles
+     * @param gravity the gravity of the particles
+     * @param lowLife the lowest lifetime of a particle
+     * @param highLife the maximum lifetime of a particle
+     * @param loop if the effect should be looped
+     */
+    public void createFieryEffect(Node battleshipNode, Shot shot, String name, int numOfParticle, float startSize, float endSize, float gravity,
+                                    float lowLife, float highLife, boolean loop) {
+        ParticleEmitter fieryEffect = new ParticleEmitter(name, Type.Triangle, numOfParticle);
+        fieryEffect.setMaterial(particleMat);
+        fieryEffect.setImagesX(2);
+        fieryEffect.setImagesY(2);
+        fieryEffect.setStartColor(ColorRGBA.Orange);
+        fieryEffect.setEndColor(ColorRGBA.Red);
+        fieryEffect.getParticleInfluencer().setInitialVelocity(new Vector3f(0,1,0));
+        fieryEffect.setStartSize(startSize);
+        fieryEffect.setEndSize(endSize);
+        fieryEffect.setGravity(0, gravity, 0);
+        fieryEffect.setLowLife(lowLife);
+        fieryEffect.setHighLife(highLife);
+
+        if(!loop) {
+            fieryEffect.setLocalTranslation(shot.getY() + 0.5f, 0 , shot.getX() + 0.5f);
+            fieryEffect.setParticlesPerSec(0);
+            fieryEffect.emitAllParticles();
+        } else {
+            fieryEffect.setLocalTranslation(shot.getY() + 0.5f, 0 , shot.getX() + 0.5f);
+            fieryEffect.getLocalTranslation().subtractLocal(battleshipNode.getLocalTranslation());
+            fieryEffect.setParticlesPerSec(10);
+        }
+
+        battleshipNode.attachChild(fieryEffect);
+        LOGGER.log(Level.DEBUG, "Created {0} at {1}", name ,fieryEffect.getLocalTranslation().toString());
+
+        fieryEffect.addControl(new EffectControl(fieryEffect, battleshipNode));
+    }
+
+    /**
+     * This method is used to create a miss effect at a certain location
+     */
+    public ParticleEmitter createMissEffect(Shot shot) {
+        ParticleEmitter missEffect = new ParticleEmitter("MissEffect", Type.Triangle, 15);
+        missEffect.setMaterial(particleMat);
+        missEffect.setImagesX(2);
+        missEffect.setImagesY(2);
+        missEffect.setStartColor(ColorRGBA.Blue);  // Water color
+        missEffect.setEndColor(ColorRGBA.Cyan);
+        missEffect.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 1, 0));
+        missEffect.setStartSize(0.3f);
+        missEffect.setEndSize(0.05f);
+        missEffect.setGravity(0, -0.1f, 0);
+        missEffect.setLowLife(0.5f);
+        missEffect.setHighLife(1.5f);
+        missEffect.setParticlesPerSec(0);
+        missEffect.setLocalTranslation(shot.getY() + 0.5f, 0 , shot.getX() + 0.5f);
+        missEffect.emitAllParticles();
+
+        missEffect.addControl(new EffectControl(missEffect));
+
+        return missEffect;
+    }
+
+    /**
+     * This inner class is used to control the effects
+     */
+    private static class EffectControl extends AbstractControl {
+        private final ParticleEmitter emitter;
+        private final Node parentNode;
+
+        /**
+         * this constructor is used to when the effect should be attached to a specific node
+         *
+         * @param emitter the Particle emitter to be controlled
+         * @param parentNode the node to be attached
+         */
+        public EffectControl(ParticleEmitter emitter, Node parentNode) {
+            this.emitter = emitter;
+            this.parentNode = parentNode;
+        }
+
+        /**
+         * This constructor is used when the effect shouldn't be attached to
+         * a specific node
+         *
+         * @param emitter the Particle emitter to be controlled
+         */
+        public EffectControl(ParticleEmitter emitter){
+            this.emitter = emitter;
+            this.parentNode = null;
+        }
+
+        /**
+         * The method which checks if the Effect is not rendered anymore so it can be removed
+         *
+         * @param tpf time per frame (in seconds)
+         */
+        @Override
+        protected void controlUpdate(float tpf) {
+            if (emitter.getParticlesPerSec() == 0 && emitter.getNumVisibleParticles() == 0) {
+                if (parentNode != null)
+                    parentNode.detachChild(emitter);
+            }
+        }
+
+        /**
+         * @param rm the RenderManager rendering the controlled Spatial (not null)
+         * @param vp the ViewPort being rendered (not null)
+         */
+        @Override
+        protected void controlRender(com.jme3.renderer.RenderManager rm, com.jme3.renderer.ViewPort vp) {}
+    }
+}

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/MapViewSynchronizer.java

@@ -12,8 +12,11 @@
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import pp.battleship.model.Battleship;
+import pp.battleship.model.IntPoint;
+import pp.battleship.model.Shell;
 import pp.battleship.model.Shot;
 import pp.util.Position;
+import java.lang.System.Logger;
 
 /**
  * Synchronizes the visual representation of the ship map with the game model.
@@ -26,6 +29,10 @@ class MapViewSynchronizer extends ShipMapSynchronizer {
     private static final float SHOT_DEPTH = -2f;
     private static final float SHIP_DEPTH = 0f;
     private static final float INDENT = 4f;
+    private static final float SHELL_DEPTH = 8f;
+
+    private static final float SHELL_SIZE = 0.75f;
+    private static final float SHELL_CENTERED_IN_MAP_GRID = 0.0625f;
 
     // Colors used for different visual elements
     private static final ColorRGBA HIT_COLOR = ColorRGBA.Red;
@@ -37,6 +44,8 @@ class MapViewSynchronizer extends ShipMapSynchronizer {
     // The MapView associated with this synchronizer
     private final MapView view;
 
+    static final Logger LOGGER = System.getLogger(MapViewSynchronizer.class.getName());
+
     /**
      * Constructs a new MapViewSynchronizer for the given MapView.
      * Initializes the synchronizer and adds existing elements from the model to the view.
@@ -58,6 +67,7 @@ public MapViewSynchronizer(MapView view) {
      */
     @Override
     public Spatial visit(Shot shot) {
+        LOGGER.log(Logger.Level.DEBUG, "Visiting " + shot);
         // Convert the shot's model coordinates to view coordinates
         final Position p1 = view.modelToView(shot.getX(), shot.getY());
         final Position p2 = view.modelToView(shot.getX() + 1, shot.getY() + 1);
@@ -109,6 +119,27 @@ public Spatial visit(Battleship ship) {
         return shipNode;
     }
 
+    /**
+     * this method will create a representation of a shell in the map
+     *
+     * @param shell the Shell element to visit
+     * @return the node the representation is attached to
+     */
+    @Override
+    public Spatial visit(Shell shell) {
+        LOGGER.log(Logger.Level.DEBUG, "Visiting {0}", shell);
+        final Node shellNode = new Node("shell");
+        final Position p1 = view.modelToView(shell.getX(), shell.getY());
+        final Position p2 = view.modelToView(shell.getX() + SHELL_SIZE, shell.getY() + SHELL_SIZE);
+
+        final Position startPosition = view.modelToView(SHELL_CENTERED_IN_MAP_GRID, SHELL_CENTERED_IN_MAP_GRID);
+
+        shellNode.attachChild(view.getApp().getDraw().makeRectangle(startPosition.getX(), startPosition.getY(), SHELL_DEPTH, p2.getX() - p1.getX(), p2.getY() - p1.getY(), ColorRGBA.Black));
+        shellNode.setLocalTranslation(startPosition.getX(), startPosition.getY(), SHELL_DEPTH);
+        shellNode.addControl(new ShellMapControl(p1, view.getApp(), new IntPoint(shell.getX(), shell.getY())));
+        return shellNode;
+    }
+
     /**
      * Creates a line geometry representing part of the ship's border.
      *
@@ -120,6 +151,7 @@ public Spatial visit(Battleship ship) {
      * @return a Geometry representing the line
      */
     private Geometry shipLine(float x1, float y1, float x2, float y2, ColorRGBA color) {
+        LOGGER.log(Logger.Level.DEBUG, "created ship line");
         return view.getApp().getDraw().makeFatLine(x1, y1, x2, y2, SHIP_DEPTH, color, SHIP_LINE_WIDTH);
     }
 }

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/SeaSynchronizer.java

@@ -8,19 +8,13 @@
 package pp.battleship.client.gui;
 
 import com.jme3.material.Material;
-import com.jme3.material.RenderState.BlendMode;
-import com.jme3.math.ColorRGBA;
+import com.jme3.material.RenderState;
+import com.jme3.renderer.queue.RenderQueue;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
-import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
-import com.jme3.scene.shape.Box;
-import com.jme3.scene.shape.Cylinder;
 import pp.battleship.client.BattleshipApp;
-import pp.battleship.model.Battleship;
-import pp.battleship.model.Rotation;
-import pp.battleship.model.ShipMap;
-import pp.battleship.model.Shot;
+import pp.battleship.model.*;
 
 import static java.util.Objects.requireNonNull;
 import static pp.util.FloatMath.HALF_PI;
@@ -34,13 +28,15 @@
  */
 class SeaSynchronizer extends ShipMapSynchronizer {
     private static final String UNSHADED = "Common/MatDefs/Misc/Unshaded.j3md"; //NON-NLS
-    private static final String KING_GEORGE_V_MODEL = "Models/KingGeorgeV/KingGeorgeV.j3o"; //NON-NLS
-    private static final String COLOR = "Color"; //NON-NLS
+    private static final String KING_GEORGE_V_MODEL = "Models/KingGeorgeV/KingGeorgeV.j3o";
+    private static final String UBOAT = "Models/UBoat/14084_WWII_Ship_German_Type_II_U-boat_v2_L1.obj"; //NON-NLS
+    private static final String BATTLE_SHIP_MODERN = "Models/BattleShipModern/Destroyer.j3o";
+    private static final String BATTLE_SHIP_MODERN_TEXTURE = "Models/BattleShipModern/BattleshipC.jpg";
+    private static final String PATROL_BOAT = "Models/PatrolBoat/12219_boat_v2_L2.obj";
+    private static final String SHELL_ROCKET = "Models/Rocket/Rocket.obj";
     private static final String SHIP = "ship"; //NON-NLS
-    private static final String SHOT = "shot"; //NON-NLS
-    private static final ColorRGBA BOX_COLOR = ColorRGBA.Gray;
-    private static final ColorRGBA SPLASH_COLOR = new ColorRGBA(0f, 0f, 1f, 0.4f);
-    private static final ColorRGBA HIT_COLOR = new ColorRGBA(1f, 0f, 0f, 0.4f);
+    private static final String SHELL = "shell";
+    private final EffectHandler effectHandler;
 
     private final ShipMap map;
     private final BattleshipApp app;
@@ -56,6 +52,7 @@ public SeaSynchronizer(BattleshipApp app, Node root, ShipMap map) {
         super(app.getGameLogic().getOwnMap(), root);
         this.app = app;
         this.map = map;
+        effectHandler = new EffectHandler(app);
         addExisting();
     }
 
@@ -69,7 +66,7 @@ public SeaSynchronizer(BattleshipApp app, Node root, ShipMap map) {
      */
     @Override
     public Spatial visit(Shot shot) {
-        return shot.isHit() ? handleHit(shot) : createCylinder(shot);
+        return shot.isHit() ? handleHit(shot) : effectHandler.createMissEffect(shot);
     }
 
     /**
@@ -84,35 +81,12 @@ private Spatial handleHit(Shot shot) {
         final Battleship ship = requireNonNull(map.findShipAt(shot), "Missing ship");
         final Node shipNode = requireNonNull((Node) getSpatial(ship), "Missing ship node");
 
-        final Geometry representation = createCylinder(shot);
-        representation.getLocalTranslation().subtractLocal(shipNode.getLocalTranslation());
-        shipNode.attachChild(representation);
+        effectHandler.createHitEffect(shipNode, shot);
+        effectHandler.createFireEffect(shipNode, shot);
 
         return null;
     }
 
-    /**
-     * Creates a cylinder geometry representing the specified shot.
-     * The appearance of the cylinder depends on whether the shot is a hit or a miss.
-     *
-     * @param shot the shot to be represented
-     * @return the geometry representing the shot
-     */
-    private Geometry createCylinder(Shot shot) {
-        final ColorRGBA color = shot.isHit() ? HIT_COLOR : SPLASH_COLOR;
-        final float height = shot.isHit() ? 1.2f : 0.1f;
-
-        final Cylinder cylinder = new Cylinder(2, 20, 0.45f, height, true);
-        final Geometry geometry = new Geometry(SHOT, cylinder);
-
-        geometry.setMaterial(createColoredMaterial(color));
-        geometry.rotate(HALF_PI, 0f, 0f);
-        // compute the center of the shot in world coordinates
-        geometry.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f);
-
-        return geometry;
-    }
-
     /**
      * Visits a {@link Battleship} and creates a graphical representation of it.
      * The representation is either a 3D model or a simple box depending on the
@@ -133,6 +107,42 @@ public Spatial visit(Battleship ship) {
         return node;
     }
 
+    /**
+     * Visits a shell and creates a graphical representation
+     *
+     * @param shell the Shell element to visit
+     * @return the node containing the graphical representation
+     */
+    @Override
+    public Spatial visit(Shell shell){
+        final Node node = new Node(SHELL);
+        node.attachChild(createRocket());
+
+        final float x = shell.getY();
+        final float z = shell.getX();
+
+        node.setLocalTranslation(x + 0.5f, 10f, z + 0.5f);
+        ShellControl shellControl = new ShellControl(shell, app);
+        node.addControl(shellControl);
+        return node;
+    }
+
+    /**
+     * creates the spatial representation of a rocket
+     *
+     * @return a spatial the rocket
+     */
+    private Spatial createRocket() {
+        final Spatial model = app.getAssetManager().loadModel(SHELL_ROCKET);
+
+        model.rotate(PI, 0f, 0f);
+        model.scale(0.002f);
+        model.setShadowMode(ShadowMode.CastAndReceive);
+        model.move(0, 0, 0);
+
+        return model;
+    }
+
     /**
      * Creates the appropriate graphical representation of the specified battleship.
      * The representation is either a detailed model or a simple box based on the length of the ship.
@@ -141,43 +151,13 @@ public Spatial visit(Battleship ship) {
      * @return the spatial representing the battleship
      */
     private Spatial createShip(Battleship ship) {
-        return ship.getLength() == 4 ? createBattleship(ship) : createBox(ship);
-    }
-
-    /**
-     * Creates a simple box to represent a battleship that is not of the "King George V" type.
-     *
-     * @param ship the battleship to be represented
-     * @return the geometry representing the battleship as a box
-     */
-    private Spatial createBox(Battleship ship) {
-        final Box box = new Box(0.5f * (ship.getMaxY() - ship.getMinY()) + 0.3f,
-                                0.3f,
-                                0.5f * (ship.getMaxX() - ship.getMinX()) + 0.3f);
-        final Geometry geometry = new Geometry(SHIP, box);
-        geometry.setMaterial(createColoredMaterial(BOX_COLOR));
-        geometry.setShadowMode(ShadowMode.CastAndReceive);
-
-        return geometry;
-    }
-
-    /**
-     * Creates a new {@link Material} with the specified color.
-     * If the color includes transparency (i.e., alpha value less than 1),
-     * the material's render state is set to use alpha blending, allowing for
-     * semi-transparent rendering.
-     *
-     * @param color the {@link ColorRGBA} to be applied to the material. If the alpha value
-     *              of the color is less than 1, the material will support transparency.
-     * @return a {@link Material} instance configured with the specified color and,
-     * if necessary, alpha blending enabled.
-     */
-    private Material createColoredMaterial(ColorRGBA color) {
-        final Material material = new Material(app.getAssetManager(), UNSHADED);
-        if (color.getAlpha() < 1f)
-            material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
-        material.setColor(COLOR, color);
-        return material;
+        return switch (ship.getLength()) {
+            case 1 -> createPatrolBoat(ship);
+            case 2 -> createModernBattleship(ship);
+            case 3 -> createUBoat(ship);
+            case 4 -> createBattleship(ship);
+            default -> throw new IllegalArgumentException("Ship length must be between 1 and 4 units long");
+        };
     }
 
     /**
@@ -196,6 +176,64 @@ private Spatial createBattleship(Battleship ship) {
         return model;
     }
 
+    /**
+     * creates a detailed 3D model to represent an UBoat
+     *
+     * @param ship the ship to be represented
+     * @return the spatial representing the Uboat
+     */
+    private Spatial createUBoat(Battleship ship) {
+        final Spatial model = app.getAssetManager().loadModel(UBOAT);
+
+        model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
+        model.scale(0.5f);
+        model.setShadowMode(ShadowMode.CastAndReceive);
+        model.move(0, -0.3f, 0);
+
+        return model;
+    }
+
+    /**
+     * creates a detailed 3D model to represent the modern battleship
+     *
+     * @param ship the ship to be represented
+     * @return the spatial representing the Modern Battleship
+     */
+    private Spatial createModernBattleship(Battleship ship) {
+        final Spatial model = app.getAssetManager().loadModel(BATTLE_SHIP_MODERN);
+
+        Material mat = new Material(app.getAssetManager(), UNSHADED);
+        mat.setTexture("ColorMap", app.getAssetManager().loadTexture(BATTLE_SHIP_MODERN_TEXTURE));
+        mat.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Off);
+        model.setMaterial(mat);
+
+        model.setQueueBucket(RenderQueue.Bucket.Opaque);
+
+        model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
+        model.scale(0.08f);
+        model.setLocalTranslation(0f, 0.2f, 0f);
+        model.setShadowMode(ShadowMode.CastAndReceive);
+
+        return model;
+
+    }
+
+    /**
+     * creates a detailed 3D model to represent the patrol boat
+     *
+     * @param ship the ship to be represented
+     * @return the spatial representing the patrol boat
+     */
+    private Spatial createPatrolBoat(Battleship ship) {
+        final Spatial model = app.getAssetManager().loadModel(PATROL_BOAT);
+
+        model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
+        model.scale(0.0005f);
+        model.setShadowMode(ShadowMode.CastAndReceive);
+
+        return model;
+    }
+
     /**
      * Calculates the rotation angle for the specified rotation.
      *

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/ShellControl.java

@@ -0,0 +1,65 @@
+package pp.battleship.client.gui;
+
+import com.jme3.math.Quaternion;
+import com.jme3.renderer.RenderManager;
+import com.jme3.renderer.ViewPort;
+import com.jme3.scene.control.AbstractControl;
+import pp.battleship.client.BattleshipApp;
+import pp.battleship.message.client.AnimationEndMessage;
+import pp.battleship.model.IntPoint;
+import pp.battleship.model.Shell;
+
+import java.lang.System.Logger;
+
+/**
+ * This class controls a 3D representation of a shell
+ */
+public class ShellControl extends AbstractControl {
+    private final Shell shell;
+    private final BattleshipApp app;
+
+    private static final float MOVE_SPEED = 8.0f;
+
+    static final Logger LOGGER = System.getLogger(ShellControl.class.getName());
+
+    /**
+     * Constructor to create a new ShellControl object
+     *
+     * @param shell the shell to be displayed
+     * @param app the main application
+     */
+    public ShellControl(Shell shell, BattleshipApp app) {
+        this.shell = shell;
+        this.app = app;
+    }
+
+    /**
+     * this method moves the representation towards it destination
+     * and deletes it if it reaches its target
+     *
+     * @param tpf time per frame (in seconds)
+     */
+    @Override
+    protected void controlUpdate(float tpf) {
+        spatial.move(0, -MOVE_SPEED * tpf, 0);
+        spatial.rotate(0f, 0.05f, 0f);
+        //LOGGER.log(System.Logger.Level.DEBUG, "moved rocket {0}", spatial.getLocalTranslation().getY());
+        if (spatial.getLocalTranslation().getY() <= 1.5){
+            spatial.getParent().detachChild(spatial);
+            app.getGameLogic().send(new AnimationEndMessage(new IntPoint(shell.getX(), shell.getY())));
+        }
+    }
+
+    /**
+     * This method is called during the rendering phase, but it does not perform any
+     * operations in this implementation as the control only influences the spatial's
+     * transformation, not its rendering process.
+     *
+     * @param rm the RenderManager rendering the controlled Spatial (not null)
+     * @param vp the ViewPort being rendered (not null)
+     */
+    @Override
+    protected void controlRender(RenderManager rm, ViewPort vp) {
+
+    }
+}

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/ShellMapControl.java

@@ -0,0 +1,63 @@
+package pp.battleship.client.gui;
+
+import com.jme3.math.Vector3f;
+import com.jme3.renderer.RenderManager;
+import com.jme3.renderer.ViewPort;
+import com.jme3.scene.control.AbstractControl;
+import pp.battleship.client.BattleshipApp;
+import pp.battleship.message.client.AnimationEndMessage;
+import pp.battleship.model.IntPoint;
+import pp.util.Position;
+
+/**
+ * This class controls a ShellMap element
+ */
+public class ShellMapControl extends AbstractControl {
+    private final Position position;
+    private final IntPoint pos;
+    private static final Vector3f VECTOR = new Vector3f();
+    private final BattleshipApp app;
+
+    /**
+     * constructs a new ShellMapControl object
+     *
+     * @param position the position where the shell should move to on the map
+     * @param app the main application
+     * @param pos the position the then to render shot goes to
+     */
+    public ShellMapControl(Position position, BattleshipApp app, IntPoint pos) {
+        super();
+        this.position = position;
+        this.pos = pos;
+        this.app = app;
+        VECTOR.set(new Vector3f(position.getX(), position.getY(), 0));
+    }
+
+    /**
+     * this method moves the shell representation to its correct spot and removes it after
+     * it arrived at its destination
+     *
+     * @param tpf time per frame (in seconds)
+     */
+    @Override
+    protected void controlUpdate(float tpf) {
+        spatial.move(VECTOR.mult(tpf));
+        if (spatial.getLocalTranslation().getX() >= position.getX() && spatial.getLocalTranslation().getY() >= position.getY()) {
+            spatial.getParent().detachChild(spatial);
+            app.getGameLogic().send(new AnimationEndMessage(pos));
+        }
+    }
+
+    /**
+     * This method is called during the rendering phase, but it does not perform any
+     * operations in this implementation as the control only influences the spatial's
+     * transformation, not its rendering process.
+     *
+     * @param rm the RenderManager rendering the controlled Spatial (not null)
+     * @param vp the ViewPort being rendered (not null)
+     */
+    @Override
+    protected void controlRender(RenderManager rm, ViewPort vp) {
+
+    }
+}

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/ShipControl.java

@@ -14,6 +14,9 @@
 import com.jme3.scene.control.AbstractControl;
 import pp.battleship.model.Battleship;
 
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+
 import static pp.util.FloatMath.DEG_TO_RAD;
 import static pp.util.FloatMath.TWO_PI;
 import static pp.util.FloatMath.sin;
@@ -43,11 +46,28 @@ class ShipControl extends AbstractControl {
      */
     private final Quaternion pitch = new Quaternion();
 
+    /**
+     * the speed at which ships sink
+     */
+    private static final float SINKING_SPEED = -0.05f;
+
+    /**
+     * the threshold when ships should be removed from the scene if they sink below the value
+     */
+    private static final float SHIP_SINKING_REMOVE_THRESHOLD = -0.6f;
+
     /**
      * The current time within the oscillation cycle, used to calculate the ship's pitch angle.
      */
     private float time;
 
+    /**
+     * The ship to be controlled
+     */
+    private  final Battleship battleship;
+
+    static final Logger LOGGER = System.getLogger(ShipControl.class.getName());
+
     /**
      * Constructs a new ShipControl instance for the specified Battleship.
      * The ship's orientation determines the axis of rotation, while its length influences
@@ -56,6 +76,8 @@ class ShipControl extends AbstractControl {
      * @param ship the Battleship object to control
      */
     public ShipControl(Battleship ship) {
+        battleship = ship;
+
         // Determine the axis of rotation based on the ship's orientation
         axis = switch (ship.getRot()) {
             case LEFT, RIGHT -> Vector3f.UNIT_X;
@@ -63,13 +85,14 @@ public ShipControl(Battleship ship) {
         };
 
         // Set the cycle duration and amplitude based on the ship's length
-        cycle = ship.getLength() * 2f;
+        cycle = battleship.getLength() * 2f;
         amplitude = 5f * DEG_TO_RAD / ship.getLength();
     }
 
     /**
      * Updates the ship's pitch oscillation each frame. The ship's pitch is adjusted
      * to create a continuous tilting motion, simulating the effect of waves.
+     * And lets the ship sink if it is destroyed and removes it from the scene when it has completely sunk
      *
      * @param tpf time per frame (in seconds), used to calculate the new pitch angle
      */
@@ -78,17 +101,25 @@ protected void controlUpdate(float tpf) {
         // If spatial is null, do nothing
         if (spatial == null) return;
 
-        // Update the time within the oscillation cycle
-        time = (time + tpf) % cycle;
+        if (battleship.isDestroyed() && spatial.getLocalTranslation().getY() <= SHIP_SINKING_REMOVE_THRESHOLD) {
+            LOGGER.log(Level.INFO, "Ship removed {0}", spatial.getName());
+            spatial.getParent().detachChild(spatial);
+        } else if (battleship.isDestroyed()) {
+            spatial.move(0, SINKING_SPEED * tpf, 0);
+        } else {
+            // Update the time within the oscillation cycle
+            time = (time + tpf) % cycle;
 
-        // Calculate the current angle of the oscillation
-        final float angle = amplitude * sin(time * TWO_PI / cycle);
+            // Calculate the current angle of the oscillation
+            final float angle = amplitude * sin(time * TWO_PI / cycle);
 
-        // Update the pitch Quaternion with the new angle
-        pitch.fromAngleAxis(angle, axis);
+            // Update the pitch Quaternion with the new angle
+            pitch.fromAngleAxis(angle, axis);
+
+            // Apply the pitch rotation to the spatial
+            spatial.setLocalRotation(pitch);
+        }
 
-        // Apply the pitch rotation to the spatial
-        spatial.setLocalRotation(pitch);
     }
 
     /**

Projekte/battleship/client/src/main/java/pp/battleship/client/server/BattleshipServer.java

@@ -0,0 +1,177 @@
+////////////////////////////////////////
+// Programming project code
+// UniBw M, 2022, 2023, 2024
+// www.unibw.de/inf2
+// (c) Mark Minas (mark.minas@unibw.de)
+////////////////////////////////////////
+
+package pp.battleship.client.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.AnimationEndMessage;
+import pp.battleship.message.client.ClientMessage;
+import pp.battleship.message.client.MapMessage;
+import pp.battleship.message.client.ShootMessage;
+import pp.battleship.message.server.*;
+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<HostedConnection>, ConnectionListener, ServerSender {
+    private static final Logger LOGGER = System.getLogger(BattleshipServer.class.getName());
+    private static final File CONFIG_FILE = new File("server.properties");
+
+    private static int port;
+
+    private final BattleshipConfig config = new BattleshipConfig();
+    private Server myServer;
+    private final ServerGameLogic logic;
+    private final BlockingQueue<ReceivedMessage> 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());
+        }
+    }
+
+    /**
+     * Creates the server.
+     */
+    public BattleshipServer(int port) {
+        config.readFromIfExists(CONFIG_FILE);
+        BattleshipServer.port = port;
+        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(port);
+            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);
+        Serializer.registerClass(AnimationEndMessage.class);
+        Serializer.registerClass(AnimationStartMessage.class);
+        Serializer.registerClass(SwitchBattleState.class);
+    }
+
+    private void registerListeners() {
+        myServer.addMessageListener(this, MapMessage.class);
+        myServer.addMessageListener(this, ShootMessage.class);
+        myServer.addMessageListener(this, AnimationEndMessage.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
+    }
+}

Projekte/battleship/client/src/main/java/pp/battleship/client/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 pp.battleship.client.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);
+    }
+}

Projekte/battleship/client/src/main/resources/Models/BattleShipModern/10619_Battleship.mtl

@@ -0,0 +1,73 @@
+newmtl Battleship
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd BattleshipC.jpg
+Ni 1.00
+Ks 0.00 0.00 0.00
+Ns 256.00
+newmtl blinn1SG
+illum 4
+Kd 0.50 0.50 0.50
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+Ks 0.00 0.00 0.00
+Ns 256.00
+newmtl blinn2SG
+illum 4
+Kd 0.50 0.50 0.50
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+Ks 0.00 0.00 0.00
+Ns 256.00
+newmtl blinn3SG
+illum 4
+Kd 0.50 0.50 0.50
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+Ks 0.50 0.50 0.50
+Ns 256.00
+newmtl blinn4SG
+illum 4
+Kd 0.50 0.50 0.50
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+Ks 0.50 0.50 0.50
+Ns 256.00
+newmtl blinn5SG
+illum 4
+Kd 0.50 0.50 0.50
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+Ks 0.50 0.50 0.50
+Ns 256.00
+newmtl blinn6SG
+illum 4
+Kd 0.50 0.50 0.50
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+Ks 0.50 0.50 0.50
+Ns 256.00
+newmtl blinn7SG
+illum 4
+Kd 0.50 0.50 0.50
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+Ks 0.50 0.50 0.50
+Ns 256.00
+newmtl blinn8SG
+illum 4
+Kd 0.50 0.50 0.50
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+Ks 0.50 0.50 0.50
+Ns 256.00

Projekte/battleship/client/src/main/resources/Models/BattleShipModern/README.txt

@@ -0,0 +1,3 @@
+based on:
+https://free3d.com/3d-model/battleship-v1--611736.html
+License: Free Personal Use Only

Projekte/battleship/client/src/main/resources/Models/PatrolBoat/12219_boat_v2_L2.mtl

@@ -0,0 +1,104 @@
+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# File Created: 16.12.2011 14:18:52
+
+newmtl white
+	Ns 53.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.6667 0.6667 0.6667
+	Kd 0.6667 0.6667 0.6667
+	Ks 0.1800 0.1800 0.1800
+	Ke 0.0000 0.0000 0.0000
+
+newmtl boat_elements_black
+	Ns 55.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.0000 0.0000 0.0000
+	Kd 0.0000 0.0000 0.0000
+	Ks 0.3600 0.3600 0.3600
+	Ke 0.0000 0.0000 0.0000
+
+newmtl boat_glass
+	Ns 60.0000
+	Ni 7.0000
+	d 0.4000
+	Tr 0.6000
+	Tf 0.4000 0.4000 0.4000 
+	illum 2
+	Ka 0.1059 0.1569 0.1451
+	Kd 0.1059 0.1569 0.1451
+	Ks 0.6750 0.6750 0.6750
+	Ke 0.0000 0.0000 0.0000
+
+newmtl boat_screw_hooks_bronze
+	Ns 80.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.2941 0.2157 0.0510
+	Kd 0.2941 0.2157 0.0510
+	Ks 0.7200 0.7200 0.7200
+	Ke 0.0000 0.0000 0.0000
+
+newmtl boat_silver
+	Ns 80.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.3333 0.3333 0.3333
+	Kd 0.3333 0.3333 0.3333
+	Ks 0.7200 0.7200 0.7200
+	Ke 0.0000 0.0000 0.0000
+
+newmtl boat_buffer
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 1.0000 1.0000 1.0000
+	Kd 1.0000 1.0000 1.0000
+	Ks 0.2700 0.2700 0.2700
+	Ke 0.0000 0.0000 0.0000
+	map_Ka boat_buffer_diffuse.jpg
+	map_Kd boat_buffer_diffuse.jpg
+
+newmtl boat_roof_accessory
+	Ns 15.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 1.0000 1.0000 1.0000
+	Kd 1.0000 1.0000 1.0000
+	Ks 0.3600 0.3600 0.3600
+	Ke 0.0000 0.0000 0.0000
+	map_Ka boat_roof_accessory_diffuse.jpg
+	map_Kd boat_roof_accessory_diffuse.jpg
+
+newmtl boat_body
+	Ns 55.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 1.0000 1.0000 1.0000
+	Kd 1.0000 1.0000 1.0000
+	Ks 0.3600 0.3600 0.3600
+	Ke 0.0000 0.0000 0.0000
+	map_Ka boat_body_diffuse.jpg
+	map_Kd boat_body_diffuse.jpg

Projekte/battleship/client/src/main/resources/Models/PatrolBoat/README.txt

@@ -0,0 +1,3 @@
+based on:
+https://free3d.com/3d-model/boat-v2--225787.html
+License: Free Personal Use Only

Projekte/battleship/client/src/main/resources/Models/Rocket/Missile_AIM-120_D_[AMRAAM].mtl

@@ -0,0 +1,250 @@
+# 
+# Generated by Sweet Home 3D - ven. janv. 02 20:37:08 CET 2015
+# http://www.sweethome3d.com/
+# 
+
+newmtl FrontColorNoCulling
+illum 1
+Ka 0.2 0.2 0.2
+Kd 0.2 0.2 0.2
+Ks 0.0 0.0 0.0
+Ns 0.0
+
+newmtl ForegroundColor
+illum 1
+Ka 0.2 0.2 0.2
+Kd 0.2 0.2 0.2
+Ks 0.0 0.0 0.0
+Ns 0.0
+
+newmtl white
+illum 1
+Ka 0.48235294 0.5019608 0.5803922
+Kd 0.48235294 0.5019608 0.5803922
+Ks 0.0 0.0 0.0
+Ns 0.0
+
+newmtl white_Cylinder_5
+illum 1
+Ka 0.47843137 0.49803922 0.5764706
+Kd 0.47843137 0.49803922 0.5764706
+Ks 0.0 0.0 0.0
+Ns 0.0
+
+newmtl white_Cylinder_10
+illum 1
+Ka 0.8784314 0.8745098 0.8901961
+Kd 0.8784314 0.8745098 0.8901961
+Ks 0.0 0.0 0.0
+Ns 0.0
+
+newmtl FrontColorNoCulling_11
+illum 1
+Ka 0.8784314 0.8745098 0.8901961
+Kd 0.8784314 0.8745098 0.8901961
+Ks 0.0 0.0 0.0
+Ns 0.0
+
+newmtl ForegroundColor_12
+illum 1
+Ka 0.8784314 0.8745098 0.8901961
+Kd 0.8784314 0.8745098 0.8901961
+Ks 0.0 0.0 0.0
+Ns 0.0
+
+newmtl white_Mesh_13
+illum 1
+Ka 0.6 0.6 0.6
+Kd 0.6 0.6 0.6
+Ks 0.0 0.0 0.0
+Ns 0.0
+
+newmtl Cube_1_1_1
+illum 1
+Ka 0.0 0.0 0.0
+Kd 0.0 0.0 0.0
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl Cylinder_7_7
+illum 1
+Ka 0.4 0.4 0.4
+Kd 0.4 0.4 0.4
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl Cylinder_10_10
+illum 1
+Ka 0.8 0.4 0.0
+Kd 0.8 0.4 0.0
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl Cylinder_11_11
+illum 2
+Ka 0.2 0.2 0.2
+Kd 0.2 0.2 0.2
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl 12_12
+illum 1
+Ka 0.2 0.2 0.2
+Kd 0.2 0.2 0.2
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl Cube_1_1_1_Cube_1_1_1_38
+illum 1
+Ka 0.6 0.6 0.6
+Kd 0.6 0.6 0.6
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl white_Cylinder_58
+illum 1
+Ka 0.1882353 0.27058825 0.58431375
+Kd 0.1882353 0.27058825 0.58431375
+Ks 0.0 0.0 0.0
+Ns 0.0
+
+newmtl white_Cylinder_59
+illum 1
+Ka 0.3137255 0.14901961 0.011764706
+Kd 0.3137255 0.14901961 0.011764706
+Ks 0.0 0.0 0.0
+Ns 0.0
+
+newmtl 1_1
+illum 2
+Ka 0.2 0.2 0.2
+Kd 1.0 1.0 1.0
+Ks 0.5 0.5 0.5
+Ns 64.0
+Ni 1.0
+d 0.48000002
+map_Kd Missile_AIM-120_D_[AMRAAM]_1_1.png
+
+newmtl Cube_1_2_2
+illum 1
+Ka 0.8 0.4 0.0
+Kd 0.8 0.4 0.0
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl Cylinder_4_4
+illum 2
+Ka 0.6 0.6 0.6
+Kd 0.6 0.6 0.6
+Ks 0.5 0.5 0.5
+Ns 64.0
+
+newmtl Cylinder_5_5
+illum 2
+Ka 0.8 0.8 0.0
+Kd 0.8 0.8 0.0
+Ks 0.5 0.5 0.5
+Ns 64.0
+
+newmtl Cylinder_6_6
+illum 2
+Ka 0.8784314 0.8745098 0.8901961
+Kd 0.8784314 0.8745098 0.8901961
+Ks 0.5 0.5 0.5
+Ns 64.0
+
+newmtl Cylinder_10_10_Cylinder_10_10_73
+illum 1
+Ka 0.2 0.2 0.2
+Kd 0.2 0.2 0.2
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl 11_11
+illum 1
+Ka 0.6 0.6 0.6
+Kd 0.6 0.6 0.6
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl Cube_1_1_1_Cube_1_1_1_76
+illum 1
+Ka 0.2 0.2 0.2
+Kd 1.0 1.0 1.0
+Ks 0.0 0.0 0.0
+Ns 1.0
+Ni 1.0
+map_Kd Missile_AIM-120_D_[AMRAAM]_Cube_1_1_1_Cube_1_1_1_76.png
+
+newmtl Cylinder_2_2
+illum 2
+Ka 0.6 0.6 0.6
+Kd 0.6 0.6 0.6
+Ks 0.5 0.5 0.5
+Ns 64.0
+
+newmtl Cylinder_3_3
+illum 1
+Ka 0.4 0.4 0.0
+Kd 0.4 0.4 0.0
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl Cylinder_4_4_Cylinder_4_4_79
+illum 1
+Ka 0.0 0.0 0.0
+Kd 0.0 0.0 0.0
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl Cube_1_5_5
+illum 1
+Ka 0.2 0.2 0.2
+Kd 1.0 1.0 1.0
+Ks 0.0 0.0 0.0
+Ns 1.0
+map_Kd Missile_AIM-120_D_[AMRAAM]_Cube_1_5_5.png
+
+newmtl Cube_1_6_6
+illum 1
+Ka 0.2 0.2 0.2
+Kd 1.0 1.0 1.0
+Ks 0.0 0.0 0.0
+Ns 1.0
+Ni 1.0
+map_Kd Missile_AIM-120_D_[AMRAAM]_Cube_1_6_6.png
+
+newmtl Cylinder_1_1
+illum 1
+Ka 0.4 0.4 0.4
+Kd 0.4 0.4 0.4
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl Cube_1_5_5_Cube_1_5_5_86
+illum 1
+Ka 0.2 0.2 0.2
+Kd 0.2 0.2 0.2
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl Cube_1_6_6_Cube_1_6_6_87
+illum 1
+Ka 0.8 0.0 0.0
+Kd 0.8 0.0 0.0
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl Cylinder_7_7_Cylinder_7_7_88
+illum 1
+Ka 0.8 0.4 0.0
+Kd 0.8 0.4 0.0
+Ks 0.0 0.0 0.0
+Ns 1.0
+
+newmtl Cylinder_8_8
+illum 1
+Ka 0.4 0.6 0.0
+Kd 0.4 0.6 0.0
+Ks 0.0 0.0 0.0
+Ns 1.0

Projekte/battleship/client/src/main/resources/Models/Rocket/README.txt

@@ -0,0 +1,3 @@
+based on:
+https://free3d.com/de/3d-model/aim-120d-missile-51025.html
+License: Free Personal Use Only

Projekte/battleship/client/src/main/resources/Models/UBoat/14084_WWII_Ship_German_Type_II_U-boat_v2_L1.mtl

@@ -0,0 +1,16 @@
+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# File Created: 29.03.2012 14:25:39
+
+newmtl default
+	Ns 35.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 1.0000 1.0000 1.0000
+	Kd 1.0000 1.0000 1.0000
+	Ks 0.5400 0.5400 0.5400
+	Ke 0.0000 0.0000 0.0000
+	map_Ka 14084_WWII_ship_German_Type_II_U-boat_diff.jpg
+	map_Kd 14084_WWII_ship_German_Type_II_U-boat_diff.jpg

Projekte/battleship/client/src/main/resources/Models/UBoat/README.txt

@@ -0,0 +1,3 @@
+based on:
+https://free3d.com/3d-model/wwii-ship-german-type-ii-uboat-v2--700733.html
+License: Free Personal Use Only

Projekte/battleship/client/src/main/resources/Music/BattleTheme/README.txt

@@ -0,0 +1,3 @@
+based on
+https://opengameart.org/content/boss-battle-2-symphonic-metal
+License: CC0 (public domain)

Projekte/battleship/client/src/main/resources/Music/GameOver/Lose/README.txt

@@ -0,0 +1,3 @@
+based on
+https://opengameart.org/content/game-over-instrumental
+License: CC0 (public domain)

Projekte/battleship/client/src/main/resources/Music/GameOver/Victory/README.txt

@@ -0,0 +1,3 @@
+based on
+https://opengameart.org/content/victory-fanfare-short
+License: CC0 (public domain)

Projekte/battleship/client/src/main/resources/Music/MainMenu/README.txt

@@ -0,0 +1,3 @@
+based on
+https://opengameart.org/content/dark-intro
+License: CC0 (public domain)

Projekte/battleship/model/src/main/java/pp/battleship/game/client/AnimationState.java

@@ -0,0 +1,108 @@
+package pp.battleship.game.client;
+
+import pp.battleship.message.server.EffectMessage;
+import pp.battleship.message.server.SwitchBattleState;
+import pp.battleship.model.IntPoint;
+import pp.battleship.model.Shell;
+import pp.battleship.model.ShipMap;
+import pp.battleship.notification.Music;
+import pp.battleship.notification.Sound;
+
+public class AnimationState extends ClientState {
+    private boolean myTurn;
+
+    /**
+     * creates an object of AnimationState
+     *
+     * @param logic the client logic
+     * @param myTurn a boolean containing if it is the clients turn
+     * @param position the position a shell should be created
+     */
+    public AnimationState(ClientGameLogic logic, boolean myTurn, IntPoint position) {
+        super(logic);
+        logic.playMusic(Music.BATTLE_THEME);
+        this.myTurn = myTurn;
+        if(myTurn) {
+            logic.getOpponentMap().add(new Shell(position));
+        }else {
+            logic.getOwnMap().add(new Shell(position));
+            logic.playSound(Sound.ROCKET_FIRED);
+        }
+    }
+
+    /**
+     * This method makes sure the client renders the correct view
+     *
+     * @return true
+     */
+    @Override
+    boolean showBattle() {
+        return true;
+    }
+
+    /**
+     * Reports the effect of a shot based on the server message.
+     *
+     * @param msg the message containing the effect of the shot
+     */
+    @Override
+    public void receivedEffect(EffectMessage msg) {
+        ClientGameLogic.LOGGER.log(System.Logger.Level.INFO, "report effect: {0}", msg); //NON-NLS
+        playSound(msg);
+        myTurn = msg.isMyTurn();
+        logic.setInfoText(msg.getInfoTextKey());
+        affectedMap(msg).add(msg.getShot());
+        if (destroyedOpponentShip(msg)) {
+            logic.getOpponentMap().add(msg.getDestroyedShip());
+        }
+        if (msg.isGameOver()) {
+            msg.getRemainingOpponentShips().forEach(logic.getOpponentMap()::add);
+            logic.setState(new GameOverState(logic, msg.isGameLost()));
+        }
+    }
+
+    /**
+     * this method is used to change the client to the battle state again
+     *
+     * @param msg the message to process
+     */
+    @Override
+    public void receivedSwitchBattleState(SwitchBattleState msg) {
+        logic.setState(new BattleState(logic, msg.isTurn()));
+    }
+
+    /**
+     * Determines which map (own or opponent's) should be affected by the shot based on the message.
+     *
+     * @param msg the effect message received from the server
+     * @return the map (either the opponent's or player's own map) that is affected by the shot
+     */
+    private ShipMap affectedMap(EffectMessage msg) {
+        return msg.isOwnShot() ? logic.getOpponentMap() : logic.getOwnMap();
+    }
+
+    /**
+     * Checks if the opponent's ship was destroyed by the player's shot.
+     *
+     * @param msg the effect message received from the server
+     * @return true if the shot destroyed an opponent's ship, false otherwise
+     */
+    private boolean destroyedOpponentShip(EffectMessage msg) {
+        return msg.getDestroyedShip() != null && msg.isOwnShot();
+    }
+
+    /**
+     * Plays a sound based on the outcome of the shot. Different sounds are played for a miss, hit,
+     * or destruction of a ship.
+     *
+     * @param msg the effect message containing the result of the shot
+     */
+    private void playSound(EffectMessage msg) {
+        if (!msg.getShot().isHit())
+            logic.playSound(Sound.SPLASH);
+        else if (msg.getDestroyedShip() == null)
+            logic.playSound(Sound.EXPLOSION);
+        else
+            logic.playSound(Sound.DESTROYED_SHIP);
+    }
+}

Projekte/battleship/model/src/main/java/pp/battleship/game/client/BattleState.java

@@ -8,12 +8,9 @@
 package pp.battleship.game.client;
 
 import pp.battleship.message.client.ShootMessage;
-import pp.battleship.message.server.EffectMessage;
+import pp.battleship.message.server.AnimationStartMessage;
 import pp.battleship.model.IntPoint;
-import pp.battleship.model.ShipMap;
-import pp.battleship.notification.Sound;
-
-import java.lang.System.Logger.Level;
+import pp.battleship.notification.Music;
 
 /**
  * Represents the state of the client where players take turns to attack each other's ships.
@@ -29,9 +26,15 @@ class BattleState extends ClientState {
      */
     public BattleState(ClientGameLogic logic, boolean myTurn) {
         super(logic);
+        logic.playMusic(Music.BATTLE_THEME);
         this.myTurn = myTurn;
     }
 
+    /**
+     * This method makes sure the client renders the correct view
+     *
+     * @return true
+     */
     @Override
     public boolean showBattle() {
         return true;
@@ -45,58 +48,8 @@ else if (logic.getOpponentMap().isValid(pos))
             logic.send(new ShootMessage(pos));
     }
 
-    /**
-     * Reports the effect of a shot based on the server message.
-     *
-     * @param msg the message containing the effect of the shot
-     */
     @Override
-    public void receivedEffect(EffectMessage msg) {
-        ClientGameLogic.LOGGER.log(Level.INFO, "report effect: {0}", msg); //NON-NLS
-        playSound(msg);
-        myTurn = msg.isMyTurn();
-        logic.setInfoText(msg.getInfoTextKey());
-        affectedMap(msg).add(msg.getShot());
-        if (destroyedOpponentShip(msg))
-            logic.getOpponentMap().add(msg.getDestroyedShip());
-        if (msg.isGameOver()) {
-            msg.getRemainingOpponentShips().forEach(logic.getOwnMap()::add);
-            logic.setState(new GameOverState(logic));
-        }
-    }
-
-    /**
-     * Determines which map (own or opponent's) should be affected by the shot based on the message.
-     *
-     * @param msg the effect message received from the server
-     * @return the map (either the opponent's or player's own map) that is affected by the shot
-     */
-    private ShipMap affectedMap(EffectMessage msg) {
-        return msg.isOwnShot() ? logic.getOpponentMap() : logic.getOwnMap();
-    }
-
-    /**
-     * Checks if the opponent's ship was destroyed by the player's shot.
-     *
-     * @param msg the effect message received from the server
-     * @return true if the shot destroyed an opponent's ship, false otherwise
-     */
-    private boolean destroyedOpponentShip(EffectMessage msg) {
-        return msg.getDestroyedShip() != null && msg.isOwnShot();
-    }
-
-    /**
-     * Plays a sound based on the outcome of the shot. Different sounds are played for a miss, hit,
-     * or destruction of a ship.
-     *
-     * @param msg the effect message containing the result of the shot
-     */
-    private void playSound(EffectMessage msg) {
-        if (!msg.getShot().isHit())
-            logic.playSound(Sound.SPLASH);
-        else if (msg.getDestroyedShip() == null)
-            logic.playSound(Sound.EXPLOSION);
-        else
-            logic.playSound(Sound.DESTROYED_SHIP);
+    public void receivedAnimationStart(AnimationStartMessage msg){
+        logic.setState(new AnimationState(logic, msg.isMyTurn(), msg.getPosition()));
     }
 }

Projekte/battleship/model/src/main/java/pp/battleship/game/client/ClientGameLogic.java

@@ -8,10 +8,7 @@
 package pp.battleship.game.client;
 
 import pp.battleship.message.client.ClientMessage;
-import pp.battleship.message.server.EffectMessage;
-import pp.battleship.message.server.GameDetails;
-import pp.battleship.message.server.ServerInterpreter;
-import pp.battleship.message.server.StartBattleMessage;
+import pp.battleship.message.server.*;
 import pp.battleship.model.IntPoint;
 import pp.battleship.model.ShipMap;
 import pp.battleship.model.dto.ShipMapDTO;
@@ -20,6 +17,8 @@
 import pp.battleship.notification.GameEventBroker;
 import pp.battleship.notification.GameEventListener;
 import pp.battleship.notification.InfoTextEvent;
+import pp.battleship.notification.Music;
+import pp.battleship.notification.MusicEvent;
 import pp.battleship.notification.Sound;
 import pp.battleship.notification.SoundEvent;
 
@@ -226,6 +225,26 @@ public void received(EffectMessage msg) {
         state.receivedEffect(msg);
     }
 
+    /**
+     * Reports that the client should start an animation
+     *
+     * @param msg the AnimationStartMessage received
+     */
+    @Override
+    public void received(AnimationStartMessage msg) {
+        state.receivedAnimationStart(msg);
+    }
+
+    /**
+     * Reports that the client should move to the battle state
+     *
+     * @param msg the SwitchBattleState received
+     */
+    @Override
+    public void received(SwitchBattleState msg) {
+        state.receivedSwitchBattleState(msg);
+    }
+
     /**
      * Initializes the player's own map, opponent's map, and harbor based on the game details.
      *
@@ -258,6 +277,15 @@ public void playSound(Sound sound) {
         notifyListeners(new SoundEvent(sound));
     }
 
+    /**
+     * Emits an event to play the specified music
+     *
+     * @param music the music to be played
+     */
+    public void playMusic(Music music) {
+        notifyListeners(new MusicEvent(music));
+    }
+
     /**
      * Loads a map from the specified file.
      *
@@ -304,7 +332,7 @@ public void saveMap(File file) throws IOException {
      *
      * @param msg the message to be sent
      */
-    void send(ClientMessage msg) {
+     public void send(ClientMessage msg) {
         if (clientSender == null)
             LOGGER.log(Level.ERROR, "trying to send {0} with sender==null", msg); //NON-NLS
         else

Projekte/battleship/model/src/main/java/pp/battleship/game/client/ClientState.java

@@ -7,9 +7,7 @@
 
 package pp.battleship.game.client;
 
-import pp.battleship.message.server.EffectMessage;
-import pp.battleship.message.server.GameDetails;
-import pp.battleship.message.server.StartBattleMessage;
+import pp.battleship.message.server.*;
 import pp.battleship.model.IntPoint;
 
 import java.io.File;
@@ -165,6 +163,24 @@ void receivedEffect(EffectMessage msg) {
         ClientGameLogic.LOGGER.log(Level.ERROR, "receivedEffect not allowed in {0}", getName()); //NON-NLS
     }
 
+    /**
+     * Reports that the client should start an animation
+     *
+     * @param msg the AnimationStartMessage received
+     */
+    void receivedAnimationStart(AnimationStartMessage msg){
+        ClientGameLogic.LOGGER.log(Level.ERROR, "receivedEffect not allowed in {0}", getName());
+    }
+
+    /**
+     * Reports that the client should move to the battle state
+     *
+     * @param msg the SwitchBattleState received
+     */
+    void receivedSwitchBattleState(SwitchBattleState msg){
+        ClientGameLogic.LOGGER.log(Level.ERROR, "receivedSwitchBattleState not allowed in {0}", getName());
+    }
+
     /**
      * Loads a map from the specified file.
      *

Projekte/battleship/model/src/main/java/pp/battleship/game/client/EditorState.java

@@ -16,8 +16,11 @@
 import java.io.File;
 import java.io.IOException;
 import java.lang.System.Logger.Level;
+import java.util.Arrays;
+import java.util.List;
 
 import static pp.battleship.Resources.lookup;
+import static pp.battleship.game.client.ClientGameLogic.LOGGER;
 import static pp.battleship.model.Battleship.Status.INVALID_PREVIEW;
 import static pp.battleship.model.Battleship.Status.NORMAL;
 import static pp.battleship.model.Battleship.Status.VALID_PREVIEW;
@@ -56,7 +59,7 @@ public boolean showEditor() {
      */
     @Override
     public void movePreview(IntPoint pos) {
-        ClientGameLogic.LOGGER.log(Level.DEBUG, "move preview to {0}", pos); //NON-NLS
+        LOGGER.log(Level.DEBUG, "move preview to {0}", pos); //NON-NLS
         if (preview == null || !ownMap().isValid(pos)) return;
         preview.moveTo(pos);
         setPreviewStatus(preview);
@@ -71,7 +74,7 @@ public void movePreview(IntPoint pos) {
      */
     @Override
     public void clickOwnMap(IntPoint pos) {
-        ClientGameLogic.LOGGER.log(Level.DEBUG, "click at {0} in own map", pos); //NON-NLS
+        LOGGER.log(Level.DEBUG, "click at {0} in own map", pos); //NON-NLS
         if (!ownMap().isValid(pos)) return;
         if (preview == null)
             modifyShip(pos);
@@ -125,7 +128,7 @@ private void placeShip(IntPoint cursor) {
      */
     @Override
     public void clickHarbor(IntPoint pos) {
-        ClientGameLogic.LOGGER.log(Level.DEBUG, "click at {0} in harbor", pos); //NON-NLS
+        LOGGER.log(Level.DEBUG, "click at {0} in harbor", pos); //NON-NLS
         if (!harbor().isValid(pos)) return;
         final Battleship shipAtCursor = harbor().findShipAt(pos);
         if (preview != null) {
@@ -152,7 +155,7 @@ else if (shipAtCursor != null) {
      */
     @Override
     public void rotateShip() {
-        ClientGameLogic.LOGGER.log(Level.DEBUG, "pushed rotate"); //NON-NLS
+        LOGGER.log(Level.DEBUG, "pushed rotate"); //NON-NLS
         if (preview == null) return;
         preview.rotated();
         ownMap().remove(preview);
@@ -238,6 +241,9 @@ public void loadMap(File file) throws IOException {
         final ShipMapDTO dto = ShipMapDTO.loadFrom(file);
         if (!dto.fits(logic.getDetails()))
             throw new IOException(lookup("map.doesnt.fit"));
+        else if (!checkMapToLoad(dto)) {
+            throw new IOException(lookup("ships.dont.fit.the.map"));
+        }
         ownMap().clear();
         dto.getShips().forEach(ownMap()::add);
         harbor().clear();
@@ -245,6 +251,40 @@ public void loadMap(File file) throws IOException {
         selectedInHarbor = null;
     }
 
+    /**
+     * This method is used to check if the loaded map is correct
+     *
+     * @param dto the data transfer object to check
+     * @return boolean if map is correct or not
+     */
+    private boolean checkMapToLoad(ShipMapDTO dto) {
+        int mapWidth = dto.getWidth();
+        int mapHeight = dto.getHeight();
+
+        // check if ship is out of bounds
+        for (int i = 0; i < dto.getShips().size(); i++) {
+            Battleship battleship = dto.getShips().get(i);
+            if (battleship.getMaxX() >= mapWidth || battleship.getMinX() < 0 || battleship.getMaxY() >= mapHeight || battleship.getMinY() < 0) {
+                LOGGER.log(Level.ERROR, "Ship is out of bounds ({0})", battleship.toString());
+                return false;
+            }
+        }
+
+        // check if ships overlap
+        List<Battleship> ships = dto.getShips();
+        for(Battleship ship:ships){
+            for(Battleship compareShip:ships){
+                if(!(ship==compareShip)){
+                    if(ship.collidesWith(compareShip)){
+                        return false;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Checks if the player's own map may be loaded from a file.
      *

Projekte/battleship/model/src/main/java/pp/battleship/game/client/GameOverState.java

@@ -7,6 +7,8 @@
 
 package pp.battleship.game.client;
 
+import pp.battleship.notification.Music;
+
 /**
  * Represents the state of the client when the game is over.
  */
@@ -16,8 +18,13 @@ class GameOverState extends ClientState {
      *
      * @param logic the client game logic
      */
-    GameOverState(ClientGameLogic logic) {
+    GameOverState(ClientGameLogic logic, boolean lost) {
         super(logic);
+        if (lost){
+            logic.playMusic(Music.GAME_OVER_THEME_L);
+        } else {
+            logic.playMusic(Music.GAME_OVER_THEME_V);
+        }
     }
 
     /**

Projekte/battleship/model/src/main/java/pp/battleship/game/client/WaitState.java

@@ -7,6 +7,7 @@
 
 package pp.battleship.game.client;
 
+import pp.battleship.message.server.GameDetails;
 import pp.battleship.message.server.StartBattleMessage;
 
 import java.lang.System.Logger.Level;
@@ -38,4 +39,16 @@ public void receivedStartBattle(StartBattleMessage msg) {
         logic.setInfoText(msg.getInfoTextKey());
         logic.setState(new BattleState(logic, msg.isMyTurn()));
     }
+
+    /**
+     * This method will revert the client from wait state to editor state
+     * in case a wrong map was submitted
+     *
+     * @param details the game details including map size and ships
+     */
+    @Override
+    public void receivedGameDetails(GameDetails details){
+        logic.setInfoText("invalid.map");
+        logic.setState(new EditorState(logic));
+    }
 }

Projekte/battleship/model/src/main/java/pp/battleship/game/server/ServerGameLogic.java

@@ -8,19 +8,21 @@
 package pp.battleship.game.server;
 
 import pp.battleship.BattleshipConfig;
+import pp.battleship.message.client.AnimationEndMessage;
 import pp.battleship.message.client.ClientInterpreter;
 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.message.server.*;
 import pp.battleship.model.Battleship;
 import pp.battleship.model.IntPoint;
+import pp.battleship.model.Rotation;
+import pp.util.Position;
 
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.lang.reflect.Array;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -39,6 +41,9 @@ public class ServerGameLogic implements ClientInterpreter {
     private Player activePlayer;
     private ServerState state = ServerState.WAIT;
 
+    private boolean player1AnimationReady = false;
+    private boolean player2AnimationReady = false;
+
     /**
      * Constructs a ServerGameLogic with the specified sender and configuration.
      *
@@ -142,10 +147,47 @@ public Player addPlayer(int id) {
     public void received(MapMessage msg, int from) {
         if (state != ServerState.SET_UP)
             LOGGER.log(Level.ERROR, "playerReady not allowed in {0}", state); //NON-NLS
+        else if (!checkMap(msg, from)) {
+            LOGGER.log(Level.ERROR, "player submitted not allowed Map");
+            send(getPlayerById(from), new GameDetails(config));
+        }
         else
             playerReady(getPlayerById(from), msg.getShips());
     }
 
+    /**
+     * Returns true if the map contains correct ship placement and is of the correct size
+     *
+     * @param msg the received MapMessage of the player
+     * @param from the ID of the Player
+     * @return a boolean based on if the transmitted map ist correct
+     */
+    private boolean checkMap(MapMessage msg, int from) {
+        int mapWidth = getPlayerById(from).getMap().getWidth();
+        int mapHeight = getPlayerById(from).getMap().getHeight();
+
+        // check if ship is out of bounds
+        for (Battleship battleship : msg.getShips()){
+            if (battleship.getMaxX() >= mapWidth || battleship.getMinX() < 0 || battleship.getMaxY() >= mapHeight || battleship.getMinY() < 0) {
+                LOGGER.log(Level.ERROR, "Ship is out of bounds ({0})", battleship.toString());
+                return false;
+            }
+        }
+
+        // check if ships overlap
+        List<Battleship> ships = msg.getShips();
+        for(Battleship ship:ships){
+            for(Battleship compareShip:ships){
+                if(!(ship==compareShip)){
+                    if(ship.collidesWith(compareShip)){
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
     /**
      * Handles the reception of a ShootMessage.
      *
@@ -157,7 +199,40 @@ public void received(ShootMessage msg, int from) {
         if (state != ServerState.BATTLE)
             LOGGER.log(Level.ERROR, "shoot not allowed in {0}", state); //NON-NLS
         else
+            for (Player player : players){
+                send(player, new AnimationStartMessage(msg.getPosition(), player == activePlayer));
+                setState(ServerState.ANIMATION_WAIT);
+            }
+    }
+
+    /**
+     * Handles a clients message that it is done with the animation
+     *
+     * @param msg the AnimationEndMessage to be processed
+     * @param from the connection ID from which the message was received
+     */
+    @Override
+    public void received(AnimationEndMessage msg, int from){
+        if(state != ServerState.ANIMATION_WAIT) {
+            LOGGER.log(Level.ERROR, "animation not allowed in {0}", state);
+            return;
+        }
+        if(getPlayerById(from) == players.get(0)){
+            LOGGER.log(Level.DEBUG, "{0} set to true", getPlayerById(from));
+            player1AnimationReady = true;
             shoot(getPlayerById(from), msg.getPosition());
+        } else if (getPlayerById(from) == players.get(1)){
+            LOGGER.log(Level.DEBUG, "{0} set to true {1}", getPlayerById(from), getPlayerById(from).toString());
+            player2AnimationReady = true;
+            shoot(getPlayerById(from), msg.getPosition());
+        }
+        if(player1AnimationReady && player2AnimationReady){
+            setState(ServerState.BATTLE);
+            for (Player player : players)
+                send(player, new SwitchBattleState(player == activePlayer));
+            player1AnimationReady = false;
+            player2AnimationReady = false;
+        }
     }
 
     /**
@@ -181,39 +256,56 @@ void playerReady(Player player, List<Battleship> ships) {
     }
 
     /**
-     * Handles the shooting action by the player.
+     * This method decides what effectMessage the client should get based on the shot made
+     * and switches the active player if a shot was missed
      *
-     * @param p   the player who shot
-     * @param pos the position of the shot
+     * @param p the player to be sent the message
+     * @param position the position where the shot would hit in the 2d map model
      */
-    void shoot(Player p, IntPoint pos) {
-        if (p != activePlayer) return;
-        final Player otherPlayer = getOpponent(activePlayer);
-        final Battleship selectedShip = otherPlayer.getMap().findShipAt(pos);
-        if (selectedShip == null) {
-            // shot missed
-            send(activePlayer, EffectMessage.miss(true, pos));
-            send(otherPlayer, EffectMessage.miss(false, pos));
-            activePlayer = otherPlayer;
+    void shoot(Player p, IntPoint position) {
+        final Battleship selectedShip;
+        if(p != activePlayer){
+            selectedShip = p.getMap().findShipAt(position);
+        } else {
+            selectedShip = getOpponent(p).getMap().findShipAt(position);
         }
-        else {
-            // shot hit a ship
-            selectedShip.hit(pos);
-            if (otherPlayer.getMap().getRemainingShips().isEmpty()) {
-                // game is over
-                send(activePlayer, EffectMessage.won(pos, selectedShip));
-                send(otherPlayer, EffectMessage.lost(pos, selectedShip, activePlayer.getMap().getRemainingShips()));
-                setState(ServerState.GAME_OVER);
+        if (selectedShip == null) {
+            if (p != activePlayer) {
+                send(p, EffectMessage.miss(false, position));
+            } else {
+                send(activePlayer, EffectMessage.miss(true, position));
             }
-            else if (selectedShip.isDestroyed()) {
-                // ship has been destroyed, but game is not yet over
-                send(activePlayer, EffectMessage.shipDestroyed(true, pos, selectedShip));
-                send(otherPlayer, EffectMessage.shipDestroyed(false, pos, selectedShip));
+            if(player1AnimationReady && player2AnimationReady){
+                LOGGER.log(Level.DEBUG, "switched active player");
+                if(p != activePlayer){
+                    activePlayer = p;
+                } else {
+                    activePlayer = getOpponent(p);
+                }
             }
-            else {
-                // ship has been hit, but it hasn't been destroyed
-                send(activePlayer, EffectMessage.hit(true, pos));
-                send(otherPlayer, EffectMessage.hit(false, pos));
+        } else {
+            selectedShip.hit(position);
+            if(getOpponent(activePlayer).getMap().getRemainingShips().isEmpty()){
+                if(p != activePlayer){
+                    send(p, EffectMessage.lost(position, selectedShip, activePlayer.getMap().getRemainingShips()));
+                } else {
+                    send(activePlayer, EffectMessage.won(position, selectedShip));
+                }
+                if(player1AnimationReady && player2AnimationReady){
+                    setState(ServerState.GAME_OVER);
+                }
+            } else if (selectedShip.isDestroyed()){
+                if(p != activePlayer){
+                    send(p, EffectMessage.shipDestroyed(false, position, selectedShip));
+                } else {
+                    send(activePlayer, EffectMessage.shipDestroyed(true, position, selectedShip));
+                }
+            } else {
+                if(p != activePlayer){
+                    send(p, EffectMessage.hit(false, position));
+                } else {
+                    send(activePlayer, EffectMessage.hit(true, position));
+                }
             }
         }
     }

Projekte/battleship/model/src/main/java/pp/battleship/game/server/ServerState.java

@@ -29,5 +29,10 @@ enum ServerState {
     /**
      * The game has ended because all the ships of one player have been destroyed.
      */
-    GAME_OVER
+    GAME_OVER,
+
+    /**
+     * The server waits for all players to finish the animation
+     */
+    ANIMATION_WAIT
 }

Projekte/battleship/model/src/main/java/pp/battleship/game/singlemode/Copycat.java

@@ -7,10 +7,7 @@
 
 package pp.battleship.game.singlemode;
 
-import pp.battleship.message.client.ClientInterpreter;
-import pp.battleship.message.client.ClientMessage;
-import pp.battleship.message.client.MapMessage;
-import pp.battleship.message.client.ShootMessage;
+import pp.battleship.message.client.*;
 import pp.battleship.model.Battleship;
 
 /**
@@ -63,6 +60,18 @@ public void received(MapMessage msg, int from) {
         copiedMessage = new MapMessage(msg.getShips().stream().map(Copycat::copy).toList());
     }
 
+    /**
+     * Handles the reception of a AnimationEndMessage
+     * Creates a copy of the AnimationEndMessage
+     *
+     * @param msg the AnimationEndMessage to be processed
+     * @param from the connection ID from which the message was received
+     */
+    @Override
+    public void received(AnimationEndMessage msg, int from) {
+        copiedMessage = new AnimationEndMessage(msg.getPosition());
+    }
+
     /**
      * Creates a copy of the provided {@link Battleship}.
      *

Projekte/battleship/model/src/main/java/pp/battleship/game/singlemode/InterpreterProxy.java

@@ -9,11 +9,7 @@
 
 import pp.battleship.game.client.BattleshipClient;
 import pp.battleship.game.client.ClientGameLogic;
-import pp.battleship.message.server.EffectMessage;
-import pp.battleship.message.server.GameDetails;
-import pp.battleship.message.server.ServerInterpreter;
-import pp.battleship.message.server.ServerMessage;
-import pp.battleship.message.server.StartBattleMessage;
+import pp.battleship.message.server.*;
 
 import java.io.IOException;
 
@@ -24,11 +20,13 @@
 class InterpreterProxy implements ServerInterpreter {
     private final BattleshipClient playerClient;
 
+    static final System.Logger LOGGER = System.getLogger(InterpreterProxy.class.getName());
     /**
      * Constructs an InterpreterProxy with the specified BattleshipClient.
      *
      * @param playerClient the client to which the server messages are forwarded
      */
+
     InterpreterProxy(BattleshipClient playerClient) {
         this.playerClient = playerClient;
     }
@@ -82,6 +80,27 @@ public void received(EffectMessage msg) {
         forward(msg);
     }
 
+    /**
+     * Forwards the received AnimationStartMessage to the client's game logic.
+     *
+     * @param msg the AnimationStartMessage received from the server
+     */
+    @Override
+    public void received(AnimationStartMessage msg) {
+        forward(msg);
+    }
+
+    /**
+     * Forwards the received SwitchBattleState to the client's game logic.
+     *
+     * @param msg the SwitchBattleState received from the server
+     */
+    @Override
+    public void received(SwitchBattleState msg){
+        LOGGER.log(System.Logger.Level.INFO, "Received SwitchBattleState");
+        forward(msg);
+    }
+
     /**
      * Forwards the specified ServerMessage to the client's game logic by enqueuing the message acceptance.
      *

Projekte/battleship/model/src/main/java/pp/battleship/game/singlemode/RobotClient.java

@@ -1,12 +1,10 @@
 package pp.battleship.game.singlemode;
 
 import pp.battleship.game.client.BattleshipClient;
+import pp.battleship.message.client.AnimationEndMessage;
 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.ServerInterpreter;
-import pp.battleship.message.server.StartBattleMessage;
+import pp.battleship.message.server.*;
 import pp.battleship.model.IntPoint;
 import pp.battleship.model.dto.ShipMapDTO;
 import pp.util.RandomPositionIterator;
@@ -113,15 +111,35 @@ public void received(StartBattleMessage msg) {
     }
 
     /**
-     * Receives an effect message, logs it, and updates the turn status.
-     * If it is RobotClient's turn to shoot, schedules a shot using shoot();
+     * Receives an effect message, logs it.
      *
      * @param msg The effect message
      */
     @Override
     public void received(EffectMessage msg) {
         LOGGER.log(Level.INFO, "Received EffectMessage: {0}", msg); //NON-NLS
-        if (msg.isMyTurn())
+    }
+
+    /**
+     * Receives an AnimationStartMessage, and responds instantly with an AnimationEndMessage
+     *
+     * @param msg the AnimationStartMessage received
+     */
+    @Override
+    public void received(AnimationStartMessage msg) {
+        LOGGER.log(Level.INFO, "Received AnimationStartMessage: {0}", msg);
+        connection.sendRobotMessage(new AnimationEndMessage(msg.getPosition()));
+    }
+
+    /**
+     * Receives a SwitchBattleState, and shots if it is the robots turn
+     *
+     * @param msg the SwitchBattleState received
+     */
+    @Override
+    public void received(SwitchBattleState msg){
+        LOGGER.log(Level.INFO, "Received SwitchBattleStateMessage: {0}", msg);
+        if (msg.isTurn())
             shoot();
     }
 }

Projekte/battleship/model/src/main/java/pp/battleship/message/client/AnimationEndMessage.java

@@ -0,0 +1,44 @@
+package pp.battleship.message.client;
+
+import com.jme3.network.serializing.Serializable;
+import pp.battleship.model.IntPoint;
+
+@Serializable
+public class AnimationEndMessage extends ClientMessage {
+
+    private IntPoint position;
+
+    /**
+     * used for serialization
+     */
+    private AnimationEndMessage(){ /* nothing */}
+
+    /**
+     * constructs a new AnimationEndMessage
+     *
+     * @param position the position to be effected by the server
+     */
+    public AnimationEndMessage(IntPoint position) {
+        this.position = position;
+    }
+
+    /**
+     * getter for the position
+     *
+     * @return IntPoint position
+     */
+    public IntPoint getPosition() {
+        return position;
+    }
+
+    /**
+     * Accepts Visitors to process this message
+     *
+     * @param interpreter the visitor to be used for processing
+     * @param from        the connection ID of the sender
+     */
+    @Override
+    public void accept(ClientInterpreter interpreter, int from) {
+        interpreter.received(this, from);
+    }
+}

Projekte/battleship/model/src/main/java/pp/battleship/message/client/ClientInterpreter.java

@@ -26,4 +26,12 @@ public interface ClientInterpreter {
      * @param from the connection ID from which the message was received
      */
     void received(MapMessage msg, int from);
+
+    /**
+     * Processes a received AnimationendMessage
+     *
+     * @param msg the AnimationEndMessage to be processed
+     * @param from the connection ID from which the message was received
+     */
+    void received(AnimationEndMessage msg, int from);
 }

Projekte/battleship/model/src/main/java/pp/battleship/message/server/AnimationStartMessage.java

@@ -0,0 +1,64 @@
+package pp.battleship.message.server;
+
+import com.jme3.network.serializing.Serializable;
+import pp.battleship.model.IntPoint;
+
+@Serializable
+public class AnimationStartMessage extends ServerMessage {
+    private IntPoint position;
+    private boolean myTurn;
+
+    /**
+     * used for serialization
+     */
+    private AnimationStartMessage(){ /* nothing */}
+
+    /**
+     * constructs a new AnimationStartMessage
+     *
+     * @param position the Position a shell should affect
+     * @param isTurn boolean containing if it is the clients turn or not
+     */
+    public AnimationStartMessage(IntPoint position, boolean isTurn) {
+        this.position = position;
+        this.myTurn = isTurn;
+    }
+
+    /**
+     * getter for the position
+     *
+     * @return IntPoint position
+     */
+    public IntPoint getPosition() {
+        return position;
+    }
+
+    /**
+     * getter for myTurn
+     *
+     * @return boolean myTurn
+     */
+    public boolean isMyTurn() {
+        return myTurn;
+    }
+
+    /**
+     * Accepts visitors to process this message
+     *
+     * @param interpreter the visitor to be used for processing
+     */
+    @Override
+    public void accept(ServerInterpreter interpreter) {
+        interpreter.received(this);
+    }
+
+    /**
+     * returns a string that gives context to the message
+     *
+     * @return String teh context
+     */
+    @Override
+    public String getInfoTextKey() {
+        return (position + " to be animated");
+    }
+}

Projekte/battleship/model/src/main/java/pp/battleship/message/server/ServerInterpreter.java

@@ -33,4 +33,18 @@ public interface ServerInterpreter {
      * @param msg the EffectMessage received
      */
     void received(EffectMessage msg);
+
+    /**
+     * Handles an AnimationStartMessage received from the server
+     *
+     * @param msg the AnimationStartMessage received
+     */
+    void received(AnimationStartMessage msg);
+
+    /**
+     * handles an SwitchBattleState received from the server
+     *
+     * @param msg the SwitchBattleState received
+     */
+    void received(SwitchBattleState msg);
 }

Projekte/battleship/model/src/main/java/pp/battleship/message/server/SwitchBattleState.java

@@ -0,0 +1,51 @@
+package pp.battleship.message.server;
+
+import com.jme3.network.serializing.Serializable;
+
+@Serializable
+public class SwitchBattleState extends ServerMessage {
+    private boolean isTurn;
+
+    /**
+     * used for serialization
+     */
+    private SwitchBattleState(){ /* nothing */}
+
+    /**
+     * constructs a new SwitchBattleState message
+     *
+     * @param isTurn boolean containing if it is the clients turn
+     */
+    public SwitchBattleState(boolean isTurn) {
+        this.isTurn = isTurn;
+    }
+
+    /**
+     * getter for isTurn
+     *
+     * @return boolean isTurn
+     */
+    public boolean isTurn() {
+        return isTurn;
+    }
+
+    /**
+     * accept visitors the process this message
+     *
+     * @param interpreter the visitor to be used for processing
+     */
+    @Override
+    public void accept(ServerInterpreter interpreter) {
+        interpreter.received(this);
+    }
+
+    /**
+     * returns a string containing context for this method
+     *
+     * @return String containing context
+     */
+    @Override
+    public String getInfoTextKey() {
+        return "";
+    }
+}

Projekte/battleship/model/src/main/java/pp/battleship/model/Shell.java

@@ -0,0 +1,77 @@
+package pp.battleship.model;
+
+/**
+ * This class represents a shell
+ */
+public class Shell implements Item {
+    private int x;
+    private int y;
+
+    /**
+     * constructs a new shell object
+     *
+     * @param position the end position of the shell
+     */
+    public Shell(IntPoint position) {
+        x = position.getX();
+        y = position.getY();
+    }
+
+    /**
+     * getter for the x coordinate
+     *
+     * @return int x coordinate
+     */
+    public int getX() {
+        return x;
+    }
+
+    /**
+     * getter for the y coordinate
+     *
+     * @return int y coordinate
+     */
+    public int getY() {
+        return y;
+    }
+
+    /**
+     * setter for x coordinate
+     *
+     * @param x the new value of x coordinate
+     */
+    public void setX(int x) {
+        this.x = x;
+    }
+
+    /**
+     * setter for y coordinate
+     *
+     * @param y the new value of y coordinate
+     */
+    public void setY(int y) {
+        this.y = y;
+    }
+
+    /**
+     * Accepts a visitor with a return value.
+     *
+     * @param visitor the visitor to accept
+     * @param <T>     the type of the return value
+     * @return the result of the visitor's visit method
+     */
+    @Override
+    public <T> T accept(Visitor<T> visitor) {
+        return visitor.visit(this);
+    }
+
+    /**
+     * Accepts a visitor without a return value.
+     *
+     * @param visitor the visitor to accept
+     */
+    @Override
+    public void accept(VoidVisitor visitor) {
+        visitor.visit(this);
+    }
+}

Projekte/battleship/model/src/main/java/pp/battleship/model/ShipMap.java

@@ -10,6 +10,7 @@
 import pp.battleship.notification.GameEvent;
 import pp.battleship.notification.GameEventBroker;
 import pp.battleship.notification.ItemAddedEvent;
+import pp.battleship.notification.ItemRemovedEvent;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -90,6 +91,15 @@ public void add(Shot shot) {
         addItem(shot);
     }
 
+    /**
+     * Registers a shell in the map and updates an item added event
+     *
+     * @param shell the shell to be registered
+     */
+    public void add(Shell shell){
+        addItem(shell);
+    }
+
     /**
      * Removes an item from the map and triggers an item removal event.
      *
@@ -97,7 +107,7 @@ public void add(Shot shot) {
      */
     public void remove(Item item) {
         items.remove(item);
-        notifyListeners(new ItemAddedEvent(item, this));
+        notifyListeners(new ItemRemovedEvent(item, this));
     }
 
     /**

Projekte/battleship/model/src/main/java/pp/battleship/model/Visitor.java

@@ -28,4 +28,12 @@ public interface Visitor<T> {
      * @return the result of visiting the Battleship element
      */
     T visit(Battleship ship);
+
+    /**
+     * Visits a Shell element
+     *
+     * @param shell the Shell element to visit
+     * @return the result of visiting the Shell element
+     */
+    T visit(Shell shell);
 }

Projekte/battleship/model/src/main/java/pp/battleship/model/VoidVisitor.java

@@ -25,4 +25,11 @@ public interface VoidVisitor {
      * @param ship the Battleship element to visit
      */
     void visit(Battleship ship);
+
+    /**
+     * Visits a Shell element
+     *
+     * @param shell the Shell element to visit
+     */
+    void visit(Shell shell);
 }

Projekte/battleship/model/src/main/java/pp/battleship/model/dto/ShipMapDTO.java

@@ -82,6 +82,20 @@ public List<Battleship> getShips() {
         return ships.stream().map(BattleshipDTO::toBattleship).toList();
     }
 
+    /**
+     * This method returns the width of the DTO.
+     *
+     * @return the width of the DTO
+     */
+    public int getWidth() {return width;}
+
+    /**
+     * Returns the height of the DTO.
+     *
+     * @return the height of the DTO.
+     */
+    public int getHeight() {return height;}
+
     /**
      * Saves the current ShipMapDTO to a file in JSON format.
      *

Projekte/battleship/model/src/main/java/pp/battleship/notification/GameEventListener.java

@@ -45,4 +45,11 @@ default void receivedEvent(SoundEvent event) { /* do nothing */ }
      * @param event the received event
      */
     default void receivedEvent(ClientStateEvent event) { /* do nothing */ }
+
+    /**
+     * Indicates that the music should be changed
+     *
+     * @param event the received Event
+     */
+    default void receivedEvent(MusicEvent event) { /* do nothing */ }
 }

Projekte/battleship/model/src/main/java/pp/battleship/notification/Music.java

@@ -0,0 +1,23 @@
+package pp.battleship.notification;
+
+/**
+ * Enumeration representing different types of sounds used in the game.
+ */
+public enum Music {
+    /**
+     * Menu music
+     */
+    MENU_THEME,
+    /**
+     * Battle music
+     */
+    BATTLE_THEME,
+    /**
+     * Game over music for a loss
+     */
+    GAME_OVER_THEME_L,
+    /**
+     * Game over music for a victory
+     */
+    GAME_OVER_THEME_V,
+}

Projekte/battleship/model/src/main/java/pp/battleship/notification/MusicEvent.java

@@ -0,0 +1,19 @@
+package pp.battleship.notification;
+
+/**
+ * Event when the background music is to be changed
+ *
+ * @param music the music to be played
+ */
+public record MusicEvent(Music music) implements GameEvent {
+
+    /**
+     * Notifies the game event listener of this event.
+     *
+     * @param listener the game event listener
+     */
+    @Override
+    public void notifyListener(GameEventListener listener) {
+        listener.receivedEvent(this);
+    }
+}

Projekte/battleship/model/src/main/java/pp/battleship/notification/Sound.java

@@ -22,5 +22,9 @@ public enum Sound {
     /**
      * Sound of a ship being destroyed.
      */
-    DESTROYED_SHIP
+    DESTROYED_SHIP,
+    /**
+     * Sound of a rocket
+     */
+    ROCKET_FIRED
 }

Projekte/battleship/model/src/main/resources/battleship.properties

@@ -22,18 +22,25 @@ button.no=No
 button.ok=Ok
 button.connect=Connect
 button.cancel=Cancel
+host.own.server=Host server
 server.dialog=Server
 host.name=Host
 port.number=Port
 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.sound-enabled=Toggle the sound
+menu.main.volume= Main volume
 menu.map.load=Load map from file...
 menu.map.save=Save map in file...
+menu.music.toggle=Toggle the music
+invalid.map=Your submitted map was invalid
+menu.volume=Music volume
+menu.sound.volume=Sound volume
 label.file=File:
 label.connecting=Connecting...
 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
+ships.dont.fit.the.map=Ships are out of the Area

Projekte/battleship/model/src/main/resources/battleship_de.properties

@@ -23,17 +23,24 @@ button.ok=Ok
 button.connect=Verbinde
 button.cancel=Abbruch
 server.dialog=Server
+host.own.server=Server starten
 host.name=Host
 port.number=Port
 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.sound-enabled=An/Ausschalten des Sounds
+menu.main.volume=Gesamt Lautst<73>rke
 menu.map.load=Karte von Datei laden...
 menu.map.save=Karte in Datei speichern...
+menu.music.toggle=An/Ausschalten der Musik
+invalid.map=Die angegebene Karte war ung<6E>ltig
+menu.volume=Lautst<EFBFBD>rke der Musik
+menu.sound.volume=Lautst<EFBFBD>rke des Sounds
 label.file=Datei:
 label.connecting=Verbindung wird aufgebaut...
 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
+ships.dont.fit.the.map=Ein Schiff ist au<61>erhalb des Spielfelds plaziert

Projekte/battleship/model/src/test/java/pp/battleship/game/client/ClientGame1Player1Test.java

@@ -222,6 +222,7 @@ public void testClient() {
         assertEquals(p(1, 5), shootMsg.getPosition());
         clientLogic.received(EffectMessage.shipDestroyed(true, p(1, 5), new Battleship(2, 1, 5, DOWN)));
         assertEquals("its.your.turn", infoTexts.poll());
+
         ships = clientLogic.getOpponentMap().getShips().toList();
         assertEquals(1, ships.size());
         checkShip(ships.get(0), 2, 1, 5, DOWN, NORMAL);
@@ -234,6 +235,7 @@ public void testClient() {
         assertEquals("you.lost.the.game", infoTexts.poll());
         ships = clientLogic.getOpponentMap().getShips().toList();
         assertEquals(2, ships.size());
+
         checkShip(ships.get(0), 2, 1, 5, DOWN, NORMAL);
         checkShip(ships.get(1), 1, 1, 2, RIGHT, NORMAL);
 

Projekte/battleship/server/src/main/java/pp/battleship/server/BattleshipServer.java

@@ -18,15 +18,14 @@
 import pp.battleship.game.server.Player;
 import pp.battleship.game.server.ServerGameLogic;
 import pp.battleship.game.server.ServerSender;
+import pp.battleship.message.client.AnimationEndMessage;
 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.message.server.*;
 import pp.battleship.model.Battleship;
 import pp.battleship.model.IntPoint;
+import pp.battleship.model.Shell;
 import pp.battleship.model.Shot;
 
 import java.io.File;
@@ -118,11 +117,15 @@ private void initializeSerializables() {
         Serializer.registerClass(Battleship.class);
         Serializer.registerClass(IntPoint.class);
         Serializer.registerClass(Shot.class);
+        Serializer.registerClass(AnimationEndMessage.class);
+        Serializer.registerClass(AnimationStartMessage.class);
+        Serializer.registerClass(SwitchBattleState.class);
     }
 
     private void registerListeners() {
         myServer.addMessageListener(this, MapMessage.class);
         myServer.addMessageListener(this, ShootMessage.class);
+        myServer.addMessageListener(this, AnimationEndMessage.class);
         myServer.addConnectionListener(this);
     }
 

Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy

@@ -36,6 +36,7 @@
 selector("label", "pp") {
     insets = new Insets3f(2, 2, 2, 2)
     color = buttonEnabledColor
+    textHAlignment = HAlignment.Center
 }
 
 selector("header", "pp") {

Projekte/settings.gradle

@@ -19,6 +19,7 @@
             library('jme3-testdata', 'org.jmonkeyengine', 'jme3-testdata').versionRef('jme')
             library('jme3-lwjgl', 'org.jmonkeyengine', 'jme3-lwjgl').versionRef('jme')
             library('jme3-lwjgl3', 'org.jmonkeyengine', 'jme3-lwjgl3').versionRef('jme')
+            library('jme3-effects', 'org.jmonkeyengine', 'jme3-effects').versionRef('jme')
 
             library('lemur', 'com.simsilica:lemur:1.16.0')
             library('lemur-proto', 'com.simsilica:lemur-proto:1.13.0')