refactored the whole client package structure

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class Animation extends ClientState {
-    public Animation(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class AudioSettings extends ClientState {
-    public AudioSettings(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,5 +1,7 @@
 package pp.mdga.client;
 
+import pp.mdga.client.ceremonyState.CeremonyStateMachine;
+
 public class Ceremony extends ClientState {
     private final CeremonyStateMachine ceremonyStateMachine;
 

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

@@ -1,12 +0,0 @@
-package pp.mdga.client;
-
-public class ChoosePieceStateMachine extends ClientStateMachine{
-    public ChoosePieceStateMachine(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-
-    @Override
-    public NoPiece initialState() {
-        return new NoPiece(this, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class ChoosePowerCard extends ClientState {
-    public ChoosePowerCard(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -2,13 +2,23 @@
 
 public class ClientAutomaton extends ClientStateMachine {
 
+    private Dialogs dialogs;
+    private Ceremony ceremony;
+    private Game game;
+    private Interrupt interrupt;
+
     public ClientAutomaton(ClientGameLogic logic){
         super(null, logic);
+        dialogs = new Dialogs(this, logic);
+        ceremony = new Ceremony(this, logic);
+        game = new Game(this, logic);
         entry();
     }
 
+
+
     @Override
     public Dialogs initialState(){
-        return new Dialogs(this, logic);
+        return dialogs;
     }
 }

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

@@ -1,5 +1,6 @@
 package pp.mdga.client;
 
+import pp.mdga.client.gameState.turnState.choosePieceState.StartPiece;
 import pp.mdga.game.Game;
 import pp.mdga.message.client.ClientMessage;
 import pp.mdga.message.server.*;

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

@@ -1,8 +0,0 @@
-package pp.mdga.client;
-
-public abstract class DialogStates extends ClientState{
-
-    public DialogStates(ClientState parent, ClientGameLogic logic){
-        super(parent, logic);
-    }
-}

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

@@ -1,5 +1,7 @@
 package pp.mdga.client;
 
+import pp.mdga.client.dialogState.DialogsStateMachine;
+
 public class Dialogs extends ClientState {
     private final DialogsStateMachine dialogsStateMachine;
 

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

@@ -1,9 +1,11 @@
 package pp.mdga.client;
 
-public class GameState extends ClientState {
+import pp.mdga.client.gameState.GameStateMachine;
+
+public class Game extends ClientState {
     private final GameStateMachine gameStateMachine;
 
-    public GameState(ClientState parent, ClientGameLogic logic) {
+    public Game(ClientState parent, ClientGameLogic logic) {
         super(parent, logic);
         this.gameStateMachine = new GameStateMachine(parent, logic);
     }

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

@@ -2,9 +2,9 @@
 
 public class Interrupt extends ClientState {
 
-    private final GameState lastState;
+    private final Game lastState;
 
-    public Interrupt(ClientState parent, ClientGameLogic logic, GameState lastState) {
+    public Interrupt(ClientState parent, ClientGameLogic logic, Game lastState) {
         super(parent, logic);
         this.lastState = lastState;
     }

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class Lobby extends ClientState {
-    public Lobby(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class MovePiece extends ClientState {
-    public MovePiece(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class NetworkDialog extends ClientState {
-    public NetworkDialog(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class NoPiece extends ClientState {
-    public NoPiece(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class PlayPowerCard extends ClientState {
-    public PlayPowerCard(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class RollDice extends ClientState {
-    public RollDice(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class RollRankingDice extends ClientState {
-    public RollRankingDice(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class SelectPiece extends ClientState {
-    public SelectPiece(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,5 +1,7 @@
 package pp.mdga.client;
 
+import pp.mdga.client.settingsState.SettingsStateMachine;
+
 public class Settings extends ClientState {
     private final SettingsStateMachine settingsStateMachine;
 

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class Shield extends ClientState {
-    public Shield(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class Spectator extends ClientState {
-    public Spectator(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class StartPiece extends ClientState {
-    public StartPiece(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class Swap extends ClientState {
-    public Swap(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class VideoSettings extends ClientState {
-    public VideoSettings(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class WaitRanking extends ClientState {
-    public WaitRanking(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class Waiting extends ClientState {
-    public Waiting(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,7 +0,0 @@
-package pp.mdga.client;
-
-public class WaitingPiece extends ClientState {
-    public WaitingPiece(ClientState parent, ClientGameLogic logic) {
-        super(parent, logic);
-    }
-}

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

@@ -1,4 +1,8 @@
-package pp.mdga.client;
+package pp.mdga.client.ceremonyState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.ClientStateMachine;
 
 public class CeremonyStateMachine extends ClientStateMachine {
 

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

@@ -1,4 +1,7 @@
-package pp.mdga.client;
+package pp.mdga.client.ceremonyState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
 
 public class Podium extends ClientState {
     public Podium(ClientState parent, ClientGameLogic logic) {

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

@@ -1,4 +1,7 @@
-package pp.mdga.client;
+package pp.mdga.client.ceremonyState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
 
 public class Statistics extends ClientState {
     public Statistics(ClientState parent, ClientGameLogic logic) {

Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/DialogStates.java

@@ -0,0 +1,11 @@
+package pp.mdga.client.dialogState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public abstract class DialogStates extends ClientState {
+
+    public DialogStates(ClientState parent, ClientGameLogic logic){
+        super(parent, logic);
+    }
+}

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

@@ -1,4 +1,8 @@
-package pp.mdga.client;
+package pp.mdga.client.dialogState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.ClientStateMachine;
 
 public class DialogsStateMachine extends ClientStateMachine {
     public DialogsStateMachine(ClientState parent, ClientGameLogic logic) {

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

@@ -0,0 +1,10 @@
+package pp.mdga.client.dialogState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class Lobby extends DialogStates {
+    public Lobby(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

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

@@ -0,0 +1,10 @@
+package pp.mdga.client.dialogState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class NetworkDialog extends DialogStates {
+    public NetworkDialog(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/StartDialog.java

@@ -1,4 +1,7 @@
-package pp.mdga.client;
+package pp.mdga.client.dialogState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
 
 public class StartDialog extends DialogStates {
     public StartDialog(ClientState parent, ClientGameLogic logic) {

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

@@ -0,0 +1,10 @@
+package pp.mdga.client.gameState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class Animation extends GameStates {
+    public Animation(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

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

@@ -1,6 +1,10 @@
-package pp.mdga.client;
+package pp.mdga.client.gameState;
 
-public class DetermineStartPlayer extends ClientState {
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.gameState.determineStartPlayer.DetermineStartPlayerStateMachine;
+
+public class DetermineStartPlayer extends GameStates {
     private final DetermineStartPlayerStateMachine determineStartPlayerStateMachine;
 
     public DetermineStartPlayer(ClientState parent, ClientGameLogic logic) {

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

@@ -1,4 +1,8 @@
-package pp.mdga.client;
+package pp.mdga.client.gameState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.ClientStateMachine;
 
 public class GameStateMachine extends ClientStateMachine {
     public GameStateMachine(ClientState parent, ClientGameLogic logic) {

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/GameStates.java

@@ -0,0 +1,10 @@
+package pp.mdga.client.gameState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public abstract class GameStates extends ClientState {
+    public GameStates(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

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

@@ -0,0 +1,10 @@
+package pp.mdga.client.gameState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class Spectator extends GameStates {
+    public Spectator(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

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

@@ -1,6 +1,10 @@
-package pp.mdga.client;
+package pp.mdga.client.gameState;
 
-public class Turn extends ClientState {
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.gameState.turnState.TurnStateMachine;
+
+public class Turn extends GameStates {
     private final TurnStateMachine turnStateMachine;
 
     public Turn(ClientState parent, ClientGameLogic logic) {

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

@@ -0,0 +1,10 @@
+package pp.mdga.client.gameState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class Waiting extends GameStates {
+    public Waiting(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

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

@@ -1,6 +1,11 @@
-package pp.mdga.client;
+package pp.mdga.client.gameState.determineStartPlayer;
 
-public class DetermineStartPlayerStateMachine extends ClientStateMachine{
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.ClientStateMachine;
+import pp.mdga.client.RollRankingDice;
+
+public class DetermineStartPlayerStateMachine extends ClientStateMachine {
     public DetermineStartPlayerStateMachine(ClientState parent, ClientGameLogic logic) {
         super(parent, logic);
     }

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/DetermineStartPlayerStates.java

@@ -0,0 +1,11 @@
+package pp.mdga.client.gameState.determineStartPlayerState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.gameState.GameStates;
+
+public class DetermineStartPlayerStates extends GameStates {
+    public DetermineStartPlayerStates(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

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

@@ -0,0 +1,11 @@
+package pp.mdga.client.gameState.determineStartPlayerState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.gameState.determineStartPlayer.DetermineStartPlayerStates;
+
+public class RollRankingDice extends DetermineStartPlayerStates {
+    public RollRankingDice(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

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

@@ -0,0 +1,11 @@
+package pp.mdga.client.gameState.determineStartPlayerState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.gameState.GameStates;
+
+public class WaitRanking extends GameStates {
+    public WaitRanking(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

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

@@ -1,6 +1,10 @@
-package pp.mdga.client;
+package pp.mdga.client.gameState.turnState;
 
-public class ChoosePiece extends ClientState {
+import pp.mdga.client.gameState.turnState.choosePieceState.ChoosePieceStateMachine;
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class ChoosePiece extends TurnStates {
 
     private final ChoosePieceStateMachine choosePieceStateMachine;
 

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

@@ -0,0 +1,10 @@
+package pp.mdga.client.gameState.turnState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class MovePiece extends TurnStates {
+    public MovePiece(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

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

@@ -0,0 +1,10 @@
+package pp.mdga.client.gameState.turnState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class PlayPowerCard extends TurnStates {
+    public PlayPowerCard(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

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

@@ -1,6 +1,10 @@
-package pp.mdga.client;
+package pp.mdga.client.gameState.turnState;
 
-public class PowerCard extends ClientState {
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.gameState.turnState.powerCardState.PowerCardStateMachine;
+
+public class PowerCard extends TurnStates {
     private final PowerCardStateMachine powerCardStateMachine;
 
     public PowerCard(ClientState parent, ClientGameLogic logic) {

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

@@ -0,0 +1,10 @@
+package pp.mdga.client.gameState.turnState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class RollDice extends TurnStates {
+    public RollDice(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

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

@@ -1,4 +1,8 @@
-package pp.mdga.client;
+package pp.mdga.client.gameState.turnState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.ClientStateMachine;
 
 public class TurnStateMachine extends ClientStateMachine {
     public TurnStateMachine(ClientState parent, ClientGameLogic logic) {

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/TurnStates.java

@@ -0,0 +1,11 @@
+package pp.mdga.client.gameState.turnState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.gameState.GameStates;
+
+public  abstract class TurnStates extends GameStates {
+    public TurnStates(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/ChoosePieceStateMachine.java

@@ -0,0 +1,16 @@
+package pp.mdga.client.gameState.turnState.choosePieceState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.ClientStateMachine;
+
+public class ChoosePieceStateMachine extends ClientStateMachine {
+    public ChoosePieceStateMachine(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+
+    @Override
+    public NoPiece initialState() {
+        return new NoPiece(this, logic);
+    }
+}

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/ChoosePieceStates.java

@@ -0,0 +1,11 @@
+package pp.mdga.client.gameState.turnState.choosePieceState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.gameState.turnState.TurnStates;
+
+public abstract class ChoosePieceStates extends TurnStates {
+    public ChoosePieceStates(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/NoPiece.java

@@ -0,0 +1,10 @@
+package pp.mdga.client.gameState.turnState.choosePieceState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class NoPiece extends ChoosePieceStates {
+    public NoPiece(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/SelectPiece.java

@@ -0,0 +1,10 @@
+package pp.mdga.client.gameState.turnState.choosePieceState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class SelectPiece extends ChoosePieceStates {
+    public SelectPiece(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/StartPiece.java

@@ -0,0 +1,10 @@
+package pp.mdga.client.gameState.turnState.choosePieceState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class StartPiece extends ChoosePieceStates {
+    public StartPiece(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/WaitingPiece.java

@@ -0,0 +1,10 @@
+package pp.mdga.client.gameState.turnState.choosePieceState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class WaitingPiece extends ChoosePieceStates {
+    public WaitingPiece(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/ChoosePowerCard.java

@@ -0,0 +1,10 @@
+package pp.mdga.client.gameState.turnState.powerCardState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class ChoosePowerCard extends PowerCardStates {
+    public ChoosePowerCard(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/PowerCardStateMachine.java

@@ -1,4 +1,8 @@
-package pp.mdga.client;
+package pp.mdga.client.gameState.turnState.powerCardState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.ClientStateMachine;
 
 public class PowerCardStateMachine extends ClientStateMachine {
     public PowerCardStateMachine(ClientState parent, ClientGameLogic logic) {

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/PowerCardStates.java

@@ -0,0 +1,11 @@
+package pp.mdga.client.gameState.turnState.powerCardState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.gameState.turnState.TurnStates;
+
+public abstract class PowerCardStates extends TurnStates {
+    public PowerCardStates(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/Shield.java

@@ -0,0 +1,10 @@
+package pp.mdga.client.gameState.turnState.powerCardState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class Shield extends PowerCardStates {
+    public Shield(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/Swap.java

@@ -0,0 +1,10 @@
+package pp.mdga.client.gameState.turnState.powerCardState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class Swap extends PowerCardStates {
+    public Swap(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

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

@@ -0,0 +1,10 @@
+package pp.mdga.client.settingsState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class AudioSettings extends SettingStates {
+    public AudioSettings(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

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

@@ -1,4 +1,7 @@
-package pp.mdga.client;
+package pp.mdga.client.settingsState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
 
 public class MainSettings extends ClientState {
     public MainSettings(ClientState parent, ClientGameLogic logic) {

Projekte/mdga/model/src/main/java/pp/mdga/client/settingsState/SettingStates.java

@@ -0,0 +1,10 @@
+package pp.mdga.client.settingsState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public abstract class SettingStates extends ClientState {
+    public SettingStates(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}

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

@@ -1,4 +1,8 @@
-package pp.mdga.client;
+package pp.mdga.client.settingsState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+import pp.mdga.client.ClientStateMachine;
 
 public class SettingsStateMachine extends ClientStateMachine {
     public SettingsStateMachine(ClientState parent, ClientGameLogic logic) {

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

@@ -0,0 +1,10 @@
+package pp.mdga.client.settingsState;
+
+import pp.mdga.client.ClientGameLogic;
+import pp.mdga.client.ClientState;
+
+public class VideoSettings extends SettingStates {
+    public VideoSettings(ClientState parent, ClientGameLogic logic) {
+        super(parent, logic);
+    }
+}