Merge branch 'development' into 'dev/test'

TestMerge 3

See merge request progproj/gruppen-ht24/Gruppe-01!6

Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/MdgaAnimation.java

@@ -1,4 +0,0 @@
-package pp.mdga.client.Animation;
-
-public enum MdgaAnimation {
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/Board/PileControl.java

@@ -1,5 +0,0 @@
-package pp.mdga.client.Board;
-
-class PileControl {
-
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/Dialog.java

@@ -1,5 +0,0 @@
-package pp.mdga.client.Dialog;
-
-public class Dialog {
-
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/MenuDialog.java

@@ -1,5 +0,0 @@
-package pp.mdga.client.Dialog;
-
-public class MenuDialog {
-
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/Gui/GuiView.java

@@ -1,5 +0,0 @@
-package pp.mdga.client.Gui;
-
-public class GuiView {
-
-}

Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java

@@ -2,12 +2,12 @@
 
 import com.jme3.app.SimpleApplication;
 import com.jme3.system.NanoTimer;
-import pp.mdga.client.Acoustic.AcousticHandler;
-import pp.mdga.client.Acoustic.MdgaSound;
-import pp.mdga.client.Animation.AnimationHandler;
+import pp.mdga.client.acoustic.AcousticHandler;
+import pp.mdga.client.acoustic.MdgaSound;
+import pp.mdga.client.animation.AnimationHandler;
 import com.jme3.system.AppSettings;
-import pp.mdga.client.Board.BoardView;
-import pp.mdga.client.Dialog.DialogView;
+import pp.mdga.client.board.BoardView;
+import pp.mdga.client.dialog.DialogView;
 
 public class MdgaApp extends SimpleApplication {
     private AnimationHandler animationHandler;

Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/AcousticHandler.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Acoustic;
+package pp.mdga.client.acoustic;
 
 import com.jme3.system.NanoTimer;
 import pp.mdga.client.MdgaApp;

Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/GameMusic.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Acoustic;
+package pp.mdga.client.acoustic;
 
 import com.jme3.audio.AudioData;
 import com.jme3.audio.AudioNode;

Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/GameSound.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Acoustic;
+package pp.mdga.client.acoustic;
 
 import com.jme3.audio.AudioData;
 import com.jme3.audio.AudioNode;

Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/MdgaSound.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Acoustic;
+package pp.mdga.client.acoustic;
 
 /**
  * Enum representing the various sound effects used in the game.

Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/MusicAsset.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Acoustic;
+package pp.mdga.client.acoustic;
 
 /**
  * Enum representing various music assets used in the game.

Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Acoustic;
+package pp.mdga.client.acoustic;
 
 /**
  * Enum representing various sound assets used in the game.

Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAssetDelayVolume.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Acoustic;
+package pp.mdga.client.acoustic;
 
 /**
  * A record that encapsulates a sound asset along with its playback settings:

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/Animation.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Animation;
+package pp.mdga.client.animation;
 
 abstract class Animation {
 

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/AnimationHandler.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Animation;
+package pp.mdga.client.animation;
 
 import pp.mdga.client.MdgaApp;
 

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/EmptyAnimation.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Animation;
+package pp.mdga.client.animation;
 
 class EmptyAnimation extends Animation {
     @Override

Projekte/mdga/client/src/main/java/pp/mdga/client/animation/MdgaAnimation.java

@@ -0,0 +1,4 @@
+package pp.mdga.client.animation;
+
+public enum MdgaAnimation {
+}

Projekte/mdga/client/src/main/java/pp/mdga/client/board/AssetOnMap.java

@@ -1,3 +1,3 @@
-package pp.mdga.client.Board;
+package pp.mdga.client.board;
 
 record AssetOnMap(BoardAsset asset, int x, int y, float rot) {}

Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardAsset.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Board;
+package pp.mdga.client.board;
 
 enum BoardAsset {
     bigTent,

Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardView.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Board;
+package pp.mdga.client.board;
 
 import com.jme3.light.AmbientLight;
 import com.jme3.light.DirectionalLight;
@@ -60,7 +60,7 @@ private void initMap() {
                 case cir -> addFigureToPlayerMap(assetToColor(BoardAsset.cir), assetOnMap);
                 case marine -> addFigureToPlayerMap(assetToColor(BoardAsset.marine), assetOnMap);
                 case node_normal, node_bonus, node_start ->
-                    infield.addLast(displayAndControl(assetOnMap, new NodeControl()));
+                    infield.add(displayAndControl(assetOnMap, new NodeControl()));
                 default -> displayAsset(assetOnMap);
             }
         }

Projekte/mdga/client/src/main/java/pp/mdga/client/board/MapLoader.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Board;
+package pp.mdga.client.board;
 
 import java.io.BufferedReader;
 import java.io.IOException;

Projekte/mdga/client/src/main/java/pp/mdga/client/board/NodeControl.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Board;
+package pp.mdga.client.board;
 
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;

Projekte/mdga/client/src/main/java/pp/mdga/client/board/PieceControl.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Board;
+package pp.mdga.client.board;
 
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;

Projekte/mdga/client/src/main/java/pp/mdga/client/board/PileControl.java

@@ -0,0 +1,5 @@
+package pp.mdga.client.board;
+
+class PileControl {
+
+}

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/Dialog.java

@@ -0,0 +1,5 @@
+package pp.mdga.client.dialog;
+
+public class Dialog {
+
+}

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/DialogView.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Dialog;
+package pp.mdga.client.dialog;
 
 import pp.dialog.DialogManager;
 import pp.mdga.client.MdgaApp;

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/InterruptDialog.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Dialog;
+package pp.mdga.client.dialog;
 
 public class InterruptDialog {
 }

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/MenuDialog.java

@@ -0,0 +1,5 @@
+package pp.mdga.client.dialog;
+
+public class MenuDialog {
+
+}

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/NetworkDialog.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Dialog;
+package pp.mdga.client.dialog;
 
 public class NetworkDialog {
 

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/SoundDialog.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Dialog;
+package pp.mdga.client.dialog;
 
 public class SoundDialog {
 

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/StartDialog.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Dialog;
+package pp.mdga.client.dialog;
 
 import com.simsilica.lemur.Checkbox;
 import com.simsilica.lemur.Container;

Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/VideoDialog.java

@@ -1,4 +1,4 @@
-package pp.mdga.client.Dialog;
+package pp.mdga.client.dialog;
 
 public class VideoDialog {
 

Projekte/mdga/client/src/main/java/pp/mdga/client/gui/GuiView.java

@@ -0,0 +1,5 @@
+package pp.mdga.client.gui;
+
+public class GuiView {
+
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/Animation.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class Animation extends ClientState {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/AudioSettings.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class AudioSettings extends Settings {
+public class AudioSettings extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/Ceremony.java

@@ -1,4 +1,5 @@
 package pp.mdga.client;
 
 public class Ceremony extends ClientState {
+    private final CeremonyStateMachine ceremonyStateMachine = new CeremonyStateMachine();
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/CeremonyStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class CeremonyStateMachine extends ClientStateMachine {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePiece.java

@@ -1,4 +1,5 @@
 package pp.mdga.client;
 
-public class ChoosePiece extends Turn {
+public class ChoosePiece extends ClientState {
+    private final ChoosePieceStateMachine choosePieceStateMachine = new ChoosePieceStateMachine();
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePieceStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class ChoosePieceStateMachine extends ClientStateMachine{
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePowerCard.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class ChoosePowerCard extends PowerCard {
+public class ChoosePowerCard extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/ClientAutomaton.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class ClientAutomaton extends ClientStateMachine {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/ClientState.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class ClientState {
+public abstract class ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/ClientStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public abstract class ClientStateMachine extends ClientState {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayer.java

@@ -1,4 +1,5 @@
 package pp.mdga.client;
 
-public class DetermineStartPlayer extends Game {
+public class DetermineStartPlayer extends ClientState {
+    private final DetermineStartPlayerStateMachine determineStartPlayerStateMachine = new DetermineStartPlayerStateMachine();
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayerStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class DetermineStartPlayerStateMachine extends ClientStateMachine{
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/Dialogs.java

@@ -1,4 +1,5 @@
 package pp.mdga.client;
 
 public class Dialogs extends ClientState {
+    private final DialogsStateMachine dialogsStateMachine = new DialogsStateMachine();
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/DialogsStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class DialogsStateMachine extends ClientStateMachine {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/Game.java

@@ -1,4 +0,0 @@
-package pp.mdga.client;
-
-public class Game extends ClientState {
-}

Projekte/mdga/model/src/main/java/pp.mdga/client/GameState.java

@@ -0,0 +1,5 @@
+package pp.mdga.client;
+
+public class GameState extends ClientState {
+    private final GameStateMachine gameStateMachine = new GameStateMachine();
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/GameStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class GameStateMachine extends ClientStateMachine {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/Lobby.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class Lobby extends Dialogs {
+public class Lobby extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/MainSettings.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class MainSettings extends Settings {
+public class MainSettings extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/MovePiece.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class MovePiece extends Turn {
+public class MovePiece extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/NetworkDialog.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class NetworkDialog extends Dialogs {
+public class NetworkDialog extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/NoPiece.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class NoPiece extends ChoosePiece {
+public class NoPiece extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/PlayPowerCard.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class PlayPowerCard extends PowerCard {
+public class PlayPowerCard extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/Podium.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class Podium extends ClientState {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCard.java

@@ -1,4 +1,5 @@
 package pp.mdga.client;
 
-public class PowerCard extends Turn {
+public class PowerCard extends ClientState {
+    private final PowerCardStateMachine powerCardStateMachine = new PowerCardStateMachine();
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCardStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class PowerCardStateMachine extends ClientStateMachine {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/RollDice.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class RollDice extends Turn {
+public class RollDice extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/RollRankingDice.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class RollRankingDice extends DetermineStartPlayer {
+public class RollRankingDice extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/SelectPiece.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class SelectPiece extends ChoosePiece {
+public class SelectPiece extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/Settings.java

@@ -1,4 +1,5 @@
 package pp.mdga.client;
 
-public class Settings {
+public class Settings extends ClientState {
+    private final SettingsStateMachine settingsStateMachine = new SettingsStateMachine();
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/SettingsStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class SettingsStateMachine extends ClientStateMachine {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/Shield.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class Shield extends PowerCard {
+public class Shield extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/Spectator.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class Spectator extends Game {
+public class Spectator extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/StartPiece.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class StartPiece extends ChoosePiece {
+public class StartPiece extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/Statistics.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class Statistics extends ClientState {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/Swap.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class Swap extends ClientState {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/SwitchEnemy.java

@@ -1,4 +0,0 @@
-package pp.mdga.client;
-
-public class SwitchEnemy extends PowerCard {
-}

Projekte/mdga/model/src/main/java/pp.mdga/client/SwitchOwn.java

@@ -1,4 +0,0 @@
-package pp.mdga.client;
-
-public class SwitchOwn extends PowerCard {
-}

Projekte/mdga/model/src/main/java/pp.mdga/client/Turn.java

@@ -1,4 +1,5 @@
 package pp.mdga.client;
 
-public class Turn extends Game {
+public class Turn extends ClientState {
+    private final TurnStateMachine turnStateMachine = new TurnStateMachine();
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/TurnStateMachine.java

@@ -0,0 +1,4 @@
+package pp.mdga.client;
+
+public class TurnStateMachine extends ClientStateMachine {
+}

Projekte/mdga/model/src/main/java/pp.mdga/client/VideoSettings.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class VideoSettings extends Settings {
+public class VideoSettings extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/WaitRanking.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class WaitRanking extends DetermineStartPlayer {
+public class WaitRanking extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/Waiting.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class Waiting extends Game {
+public class Waiting extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/client/WaitingPiece.java

@@ -1,4 +1,4 @@
 package pp.mdga.client;
 
-public class WaitingPiece extends ChoosePiece {
+public class WaitingPiece extends ClientState {
 }

Projekte/mdga/model/src/main/java/pp.mdga/game/Board.java

@@ -57,4 +57,13 @@ public Node[] getInfield() {
     public void setPieceOnBoard(int index, Piece piece) {
         infield[index].setOccupant(piece);
     }
+
+    public int getInfieldIndexOfPiece(Piece piece) {
+        for (int i = 0; i < infield.length; i++) {
+            if (infield[i].getOccupant() == piece) {
+                return i;
+            }
+        }
+        return -1;
+    }
 }

Projekte/mdga/model/src/main/java/pp.mdga/game/Game.java

@@ -1,8 +1,8 @@
 package pp.mdga.game;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.Map;
+import java.util.*;
+
+import pp.mdga.server.Observer;
 
 /**
  * The Game class represents the game state of the Ludo game.
@@ -12,7 +12,7 @@
 public class Game {
     private int diceModifier = 1;
     private int diceEyes;
-    private Map <Color, Player> players;
+    private Map<Color, Player> players = new HashMap<Color, Player>();
     private Statistic gameStatistics;
     private ArrayList<BonusCard> drawPile;
     private ArrayList<BonusCard> discardPile = new ArrayList<>();
@@ -21,13 +21,17 @@ public class Game {
     private LinkedList<Color> order;
     private Map<Color, Integer> playerConnectionID;
 
+    private ArrayList<Observer> observers = new ArrayList<>();
+    private Boolean gameHasStarted = false;
+    private Boolean playerHasDisconnected = false;
+
     private static final int AMOUNT_OF_TURBO_CARDS = 16;
     private static final int AMOUNT_OF_SHIELD_AND_SWAP_CARDS = 12;
 
     /**
      * This constructor creates a new Game object.
      */
-    public Game(){
+    public Game() {
         gameStatistics = new Statistic();
         drawPile = new ArrayList<>();
         for (int i = 0; i < AMOUNT_OF_TURBO_CARDS; i++) {
@@ -223,7 +227,7 @@ public void setPlayerConnectionID(Map<Color, Integer> playerConnectionID) {
     /**
      * This method sets the player connection ID.
      *
-     * @param color the color of the player
+     * @param color        the color of the player
      * @param connectionID the new connection ID
      */
     public void setPlayerConnectionID(Color color, int connectionID) {
@@ -243,7 +247,7 @@ public int getPlayerConnectionID(Color color) {
     /**
      * This method adds a player to the game.
      *
-     * @param color the color of the player
+     * @param color  the color of the player
      * @param player the player to be added
      */
     public void addPlayer(Color color, Player player) {
@@ -258,4 +262,71 @@ public void addPlayer(Color color, Player player) {
     public void removePlayer(Color color) {
         players.remove(color);
     }
+
+    /**
+     * This method adds an observer to the game.
+     *
+     * @param observer the observer to be added
+     */
+    public void addObserver(Observer observer) {
+        observers.add(observer);
+    }
+
+    /**
+     * This method removes an observer from the game.
+     *
+     * @param observer the observer to be removed
+     */
+    public void removeObserver(Observer observer) {
+        observers.remove(observer);
+    }
+
+    /**
+     * This method returns the game has started.
+     *
+     * @return the game has started
+     */
+    public Boolean getGameHasStarted() {
+        return gameHasStarted;
+    }
+
+    /**
+     * This method sets the game has started.
+     *
+     * @param gameHasStarted the new game has started
+     */
+    public void setGameHasStarted(Boolean gameHasStarted) {
+        this.gameHasStarted = gameHasStarted;
+        if (gameHasStarted) notifyObservers();
+    }
+
+    /**
+     * This method returns the player has disconnected.
+     *
+     * @return the player has disconnected
+     */
+    public Boolean playerHasDisconnected() {
+        return playerHasDisconnected;
+    }
+
+    /**
+     * This method sets the player has disconnected.
+     *
+     * @param playerHasDisconnected the new player has disconnected
+     */
+    public void setPlayerHasDisconnected(Boolean playerHasDisconnected) {
+        this.playerHasDisconnected = playerHasDisconnected;
+        if (playerHasDisconnected) {
+            notifyObservers();
+        }
+    }
+
+    /**
+     * This method notifies the observers.
+     */
+    public void notifyObservers() {
+        for (Observer observer : new ArrayList<>(observers)) {
+            observer.update();
+        }
+    }
 }

Projekte/mdga/model/src/main/java/pp.mdga/game/Piece.java

@@ -6,7 +6,7 @@
 public class Piece {
     private ShieldState shield;
     private PieceState state;
-    private Color color;
+    private final Color color;
 
     /**
      * This constructor is used to create a new Piece
@@ -73,4 +73,13 @@ public boolean isShielded() {
     public boolean isSuppressed() {
         return shield == ShieldState.SUPPRESSED;
     }
+
+    /**
+     * This method is used to get the color of the piece
+     *
+     * @return the color of the piece
+     */
+    public Color getColor() {
+        return color;
+    }
 }

Projekte/mdga/model/src/main/java/pp.mdga/game/Player.java

@@ -79,4 +79,13 @@ public BonusCard removeHandCard(BonusCard card) {
         }
         return cardToRemove;
     }
+
+    /**
+     * Returns the id of the connection to the client represented by this player.
+     *
+     * @return the id
+     */
+    public int getId() {
+        return id;
+    }
 }

Projekte/mdga/model/src/main/java/pp.mdga/game/PlayerData.java

@@ -108,4 +108,46 @@ public Piece removePieceFromWaitingArea() {
     public void setPieceInHome(int index, Piece piece) {
         homeNodes[index].setOccupant(piece);
     }
+
+    /**
+     * This method returns the homeNodes
+     *
+     * @return the homeNodes
+     */
+    public boolean homeIncludes(Piece piece) {
+        for (int i = 0; i < 4; i++) {
+            if (homeNodes[i].getOccupant() == piece) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * This method returns the homeNodes
+     *
+     * @return the homeNodes
+     */
+    public int getIndexInHome(Piece piece) {
+        for (int i = 0; i < 4; i++) {
+            if (homeNodes[i].getOccupant() == piece) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * This method returns the homeNodes
+     *
+     * @return the homeNodes
+     */
+    public boolean hasPieceInWaitingArea() {
+        for (Piece piece : waitingArea) {
+            if (piece != null) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

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

@@ -28,4 +28,10 @@ public interface ClientInterpreter {
     void received(SelectTSK selectTSK , int from);
 
     void received(ForceContinueGame forceContinueGame, int from);
+
+    void received(ClientStartGame clientStartGame, int from);
+
+    void received(NoPowerCard noPowerCard, int from);
+
+    void received(SelectedPieces selectedPieces, int from);
 }

Projekte/mdga/model/src/main/java/pp.mdga/message/client/ClientMessage.java

@@ -3,7 +3,6 @@
 import com.jme3.network.AbstractMessage;
 
 public abstract class ClientMessage extends AbstractMessage {
-
     protected ClientMessage() {
         super(true);
     }

Projekte/mdga/model/src/main/java/pp.mdga/message/client/ClientStartGame.java

@@ -0,0 +1,13 @@
+package pp.mdga.message.client;
+
+public class ClientStartGame extends ClientMessage {
+    @Override
+    public String toString() {
+        return "null";
+    }
+
+    @Override
+    public void accept(ClientInterpreter interpreter, int from) {
+        interpreter.received(this, from);
+    }
+}

Projekte/mdga/model/src/main/java/pp.mdga/message/client/NoPowerCard.java

@@ -0,0 +1,13 @@
+package pp.mdga.message.client;
+
+public class NoPowerCard extends ClientMessage {
+    @Override
+    public String toString() {
+        return "null";
+    }
+
+    @Override
+    public void accept(ClientInterpreter interpreter, int from) {
+        interpreter.received(this, from);
+    }
+}

Projekte/mdga/model/src/main/java/pp.mdga/message/client/SelectedPieces.java

@@ -0,0 +1,13 @@
+package pp.mdga.message.client;
+
+public class SelectedPieces extends ClientMessage {
+    @Override
+    public String toString() {
+        return "null";
+    }
+
+    @Override
+    public void accept(ClientInterpreter interpreter, int from) {
+        interpreter.received(this, from);
+    }
+}

Projekte/mdga/model/src/main/java/pp.mdga/message/server/ServerStartGame.java

@@ -1,6 +1,6 @@
 package pp.mdga.message.server;
 
-public class StartGame extends ServerMessage {
+public class ServerStartGame extends ServerMessage {
     @Override
     public void accept(ServerInterpreter interpreter) {
 

Projekte/mdga/model/src/main/java/pp.mdga/server/Ceremony.java

@@ -1,4 +1,7 @@
 package pp.mdga.server;
 
 public class Ceremony extends ServerState {
+    public Ceremony(ServerState parent, ServerGameLogic logic) {
+        super(parent, logic);
+    }
 }

Projekte/mdga/model/src/main/java/pp.mdga/server/ChoosePiece.java

@@ -1,4 +1,9 @@
 package pp.mdga.server;
 
-public class ChoosePiece extends Turn {
+public class ChoosePiece extends ServerState {
+    private final ChoosePieceStateMachine choosePieceStateMachine = new ChoosePieceStateMachine(this, logic);
+
+    public ChoosePiece(ServerState parent, ServerGameLogic logic) {
+        super(parent, logic);
+    }
 }

Projekte/mdga/model/src/main/java/pp.mdga/server/ChoosePieceStateMachine.java

@@ -0,0 +1,12 @@
+package pp.mdga.server;
+
+public class ChoosePieceStateMachine extends ServerStateMachine{
+    public ChoosePieceStateMachine(ServerState parent, ServerGameLogic logic) {
+        super(parent, logic);
+    }
+
+    @Override
+    public ServerState initialState() {
+        return null;
+    }
+}

Projekte/mdga/model/src/main/java/pp.mdga/server/DetermineStartPlayer.java

@@ -1,4 +1,7 @@
 package pp.mdga.server;
 
-public class DetermineStartPlayer extends Game {
+public class DetermineStartPlayer extends ServerState {
+    public DetermineStartPlayer(ServerState parent, ServerGameLogic logic) {
+        super(parent, logic);
+    }
 }

Projekte/mdga/model/src/main/java/pp.mdga/server/Dialogs.java

@@ -1,4 +0,0 @@
-package pp.mdga.server;
-
-public class Dialogs extends ServerState {
-}

Projekte/mdga/model/src/main/java/pp.mdga/server/FirstRoll.java

@@ -1,4 +1,7 @@
 package pp.mdga.server;
 
-public class FirstRoll extends RollDice {
+public class FirstRoll extends ServerState {
+    public FirstRoll(ServerState parent, ServerGameLogic logic) {
+        super(parent, logic);
+    }
 }

Projekte/mdga/model/src/main/java/pp.mdga/server/Game.java

@@ -1,4 +0,0 @@
-package pp.mdga.server;
-
-public class Game extends ServerState {
-}

Projekte/mdga/model/src/main/java/pp.mdga/server/GameState.java

@@ -0,0 +1,75 @@
+package pp.mdga.server;
+
+import pp.mdga.game.Piece;
+import pp.mdga.message.client.*;
+import pp.mdga.message.server.PossibleCard;
+
+public class GameState extends ServerState {
+    private final GameStateMachine gameStateMachine = new GameStateMachine(this, logic);
+
+    public GameState(ServerState parent, ServerGameLogic logic) {
+        super(parent, logic);
+        logic.getGame().addObserver(this);
+    }
+
+    @Override
+    public void entry() {
+        gameStateMachine.entry();
+    }
+
+    @Override
+    public void receivedAnimationEnd(AnimationEnd msg) {
+        gameStateMachine.receivedAnimationEnd(msg);
+    }
+
+    // todo piece?
+    @Override
+    public void receivedConfirmPiece(Piece piece) {
+        gameStateMachine.receivedConfirmPiece(piece);
+    }
+
+    @Override
+    public void receivedNoPowerCard(NoPowerCard msg) {
+        gameStateMachine.receivedNoPowerCard(msg);
+    }
+
+    @Override
+    public void receivedPowerCardChoice(SelectCard msg) {
+        gameStateMachine.receivedPowerCardChoice(msg);
+    }
+
+    @Override
+    public void receivedRequestDice(RequestDice msg) {
+        gameStateMachine.receivedRequestDice(msg);
+    }
+
+    // todo msg?
+    @Override
+    public void receivedRollRankingDice() {
+        gameStateMachine.receivedRollRankingDice();
+    }
+
+    @Override
+    public void receivedSelectedPieces(SelectedPieces msg) {
+        gameStateMachine.receivedSelectedPieces(msg);
+    }
+
+    @Override
+    public void sentPossibleCard(PossibleCard msg) {
+        gameStateMachine.sentPossibleCard(msg);
+    }
+
+    // todo msg?, sent to everyone?
+    @Override
+    public void sentRankingResponse() {
+        gameStateMachine.sentRankingResponse();
+    }
+
+    @Override
+    public void update() {
+        if (logic.getGame().playerHasDisconnected()) {
+            parent.gotoState(new Ceremony(parent, logic));
+            logic.getGame().removeObserver(this);
+        }
+    }
+}

Projekte/mdga/model/src/main/java/pp.mdga/server/GameStateMachine.java

@@ -0,0 +1,12 @@
+package pp.mdga.server;
+
+public class GameStateMachine extends ServerStateMachine{
+    public GameStateMachine(ServerState parent, ServerGameLogic logic) {
+        super(parent, logic);
+    }
+
+    @Override
+    public DetermineStartPlayer initialState() {
+        return new DetermineStartPlayer(this, logic);
+    }
+}

Projekte/mdga/model/src/main/java/pp.mdga/server/Interrupt.java

@@ -1,4 +1,7 @@
 package pp.mdga.server;
 
 public class Interrupt extends ServerState {
+    public Interrupt(ServerState parent, ServerGameLogic logic) {
+        super(parent, logic);
+    }
 }

Projekte/mdga/model/src/main/java/pp.mdga/server/Lobby.java

@@ -0,0 +1,52 @@
+package pp.mdga.server;
+
+import pp.mdga.message.client.*;
+import pp.mdga.message.server.ServerMessage;
+import pp.mdga.message.server.UpdateReady;
+import pp.mdga.message.server.UpdateTSK;
+
+public class Lobby extends ServerState {
+    public Lobby(ServerState parent, ServerGameLogic logic) {
+        super(parent, logic);
+        logic.getGame().addObserver(this);
+    }
+
+    @Override
+    public void receivedDeselectTSK(DeselectTSK msg) {
+        broadcastUpdate(new UpdateTSK());
+    }
+
+    @Override
+    public void receivedNotReady(LobbyNotReady msg) {
+        broadcastUpdate(new UpdateReady());
+    }
+
+    @Override
+    public void receivedReady(LobbyReady msg) {
+        broadcastUpdate(new UpdateReady());
+    }
+
+    @Override
+    public void receivedSelectTSK(SelectTSK msg) {
+        broadcastUpdate(new UpdateTSK());
+    }
+
+    private void broadcastUpdate(ServerMessage updateMessage) {
+        for (var entry : logic.getGame().getPlayers().entrySet()) {
+            logic.send(entry.getValue(), updateMessage);
+        }
+    }
+
+    @Override
+    public void receivedStartGame(ClientStartGame msg) {
+        // todo: implement??
+    }
+
+    @Override
+    public void update() {
+        if (logic.getGame().getGameHasStarted()) {
+            parent.gotoState(new GameState(parent, logic));
+            logic.getGame().removeObserver(this);
+        }
+    }
+}

Projekte/mdga/model/src/main/java/pp.mdga/server/MovePiece.java

@@ -1,4 +1,7 @@
 package pp.mdga.server;
 
-public class MovePiece extends Turn {
+public class MovePiece extends ServerState {
+    public MovePiece(ServerState parent, ServerGameLogic logic) {
+        super(parent, logic);
+    }
 }