diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/CeremonyState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/CeremonyState.java index ae64890b..eda27c79 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/CeremonyState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/CeremonyState.java @@ -1,9 +1,8 @@ package pp.mdga.client; -import pp.mdga.client.ceremonyState.CeremonyStates; -import pp.mdga.client.ceremonyState.PodiumState; -import pp.mdga.client.ceremonyState.StatisticsState; -import pp.mdga.notification.CeremonyNotification; +import pp.mdga.client.ceremonystate.CeremonyStates; +import pp.mdga.client.ceremonystate.PodiumState; +import pp.mdga.client.ceremonystate.StatisticsState; public class CeremonyState extends ClientState { diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/DialogsState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/DialogsState.java index 044be708..fc81beed 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/DialogsState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/DialogsState.java @@ -1,9 +1,9 @@ package pp.mdga.client; -import pp.mdga.client.dialogState.DialogStates; -import pp.mdga.client.dialogState.LobbyState; -import pp.mdga.client.dialogState.NetworkDialogState; -import pp.mdga.client.dialogState.StartDialogState; +import pp.mdga.client.dialogstate.DialogStates; +import pp.mdga.client.dialogstate.LobbyState; +import pp.mdga.client.dialogstate.NetworkDialogState; +import pp.mdga.client.dialogstate.StartDialogState; import pp.mdga.game.Color; import pp.mdga.message.server.*; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java index 34ad5d44..fbfc0e57 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java @@ -1,6 +1,6 @@ package pp.mdga.client; -import pp.mdga.client.gameState.*; +import pp.mdga.client.gamestate.*; import pp.mdga.game.BonusCard; import pp.mdga.game.Piece; import pp.mdga.message.client.LeaveGameMessage; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/SettingsState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/SettingsState.java index 343d974b..6d0d5855 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/SettingsState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/SettingsState.java @@ -1,9 +1,9 @@ package pp.mdga.client; -import pp.mdga.client.settingsState.AudioSettingsState; -import pp.mdga.client.settingsState.MainSettingsState; -import pp.mdga.client.settingsState.SettingStates; -import pp.mdga.client.settingsState.VideoSettingsState; +import pp.mdga.client.settingsstate.AudioSettingsState; +import pp.mdga.client.settingsstate.MainSettingsState; +import pp.mdga.client.settingsstate.SettingStates; +import pp.mdga.client.settingsstate.VideoSettingsState; public class SettingsState extends ClientState { diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonyState/CeremonyStates.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonystate/CeremonyStates.java similarity index 86% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonyState/CeremonyStates.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonystate/CeremonyStates.java index 8bd888c7..b60ed5e9 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonyState/CeremonyStates.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonystate/CeremonyStates.java @@ -1,4 +1,4 @@ -package pp.mdga.client.ceremonyState; +package pp.mdga.client.ceremonystate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonyState/PodiumState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonystate/PodiumState.java similarity index 93% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonyState/PodiumState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonystate/PodiumState.java index 4410d8c0..374cf996 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonyState/PodiumState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonystate/PodiumState.java @@ -1,4 +1,4 @@ -package pp.mdga.client.ceremonyState; +package pp.mdga.client.ceremonystate; import pp.mdga.client.CeremonyState; import pp.mdga.client.ClientGameLogic; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonyState/StatisticsState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonystate/StatisticsState.java similarity index 91% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonyState/StatisticsState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonystate/StatisticsState.java index 89c5e8a1..3466831a 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonyState/StatisticsState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonystate/StatisticsState.java @@ -1,4 +1,4 @@ -package pp.mdga.client.ceremonyState; +package pp.mdga.client.ceremonystate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/DialogStates.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/DialogStates.java similarity index 86% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/DialogStates.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/DialogStates.java index f4c549d2..26f0ff26 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/DialogStates.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/DialogStates.java @@ -1,4 +1,4 @@ -package pp.mdga.client.dialogState; +package pp.mdga.client.dialogstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/LobbyState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/LobbyState.java similarity index 99% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/LobbyState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/LobbyState.java index 9aa15c8b..bada315a 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/LobbyState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/LobbyState.java @@ -1,4 +1,4 @@ -package pp.mdga.client.dialogState; +package pp.mdga.client.dialogstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/NetworkDialogState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/NetworkDialogState.java similarity index 98% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/NetworkDialogState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/NetworkDialogState.java index a6a206d6..5f6236c8 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/NetworkDialogState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/NetworkDialogState.java @@ -1,4 +1,4 @@ -package pp.mdga.client.dialogState; +package pp.mdga.client.dialogstate; import pp.mdga.Resources; import pp.mdga.client.ClientGameLogic; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/StartDialogState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/StartDialogState.java similarity index 96% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/StartDialogState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/StartDialogState.java index 6c49408b..2c0f879e 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/StartDialogState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/StartDialogState.java @@ -1,4 +1,4 @@ -package pp.mdga.client.dialogState; +package pp.mdga.client.dialogstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/AnimationState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/AnimationState.java similarity index 94% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/AnimationState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/AnimationState.java index a7aaf745..cc4f4c0b 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/AnimationState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/AnimationState.java @@ -1,4 +1,4 @@ -package pp.mdga.client.gameState; +package pp.mdga.client.gamestate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/DetermineStartPlayerState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/DetermineStartPlayerState.java similarity index 89% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/DetermineStartPlayerState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/DetermineStartPlayerState.java index 4794785a..abf9d648 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/DetermineStartPlayerState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/DetermineStartPlayerState.java @@ -1,11 +1,11 @@ -package pp.mdga.client.gameState; +package pp.mdga.client.gamestate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; import pp.mdga.client.GameState; -import pp.mdga.client.gameState.determineStartPlayerState.DetermineStartPlayerStates; -import pp.mdga.client.gameState.determineStartPlayerState.RollRankingDiceState; -import pp.mdga.client.gameState.determineStartPlayerState.WaitRankingState; +import pp.mdga.client.gamestate.determinestartplayerstate.DetermineStartPlayerStates; +import pp.mdga.client.gamestate.determinestartplayerstate.RollRankingDiceState; +import pp.mdga.client.gamestate.determinestartplayerstate.WaitRankingState; import pp.mdga.message.server.DieMessage; import pp.mdga.message.server.RankingResponseMessage; import pp.mdga.message.server.RankingRollAgainMessage; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/GameStates.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java similarity index 98% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/GameStates.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java index 9bb07624..141bddae 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/GameStates.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java @@ -1,4 +1,4 @@ -package pp.mdga.client.gameState; +package pp.mdga.client.gamestate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/SpectatorState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/SpectatorState.java similarity index 99% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/SpectatorState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/SpectatorState.java index a9c84d5c..e1f8bfb9 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/SpectatorState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/SpectatorState.java @@ -1,4 +1,4 @@ -package pp.mdga.client.gameState; +package pp.mdga.client.gamestate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/TurnState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java similarity index 89% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/TurnState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java index 5f075eff..9c27854d 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/TurnState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java @@ -1,14 +1,14 @@ -package pp.mdga.client.gameState; +package pp.mdga.client.gamestate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; import pp.mdga.client.GameState; -import pp.mdga.client.gameState.turnState.ChoosePieceState; -import pp.mdga.client.gameState.turnState.MovePieceState; -import pp.mdga.client.gameState.turnState.PlayPowerCardState; -import pp.mdga.client.gameState.turnState.PowerCardState; -import pp.mdga.client.gameState.turnState.RollDiceState; -import pp.mdga.client.gameState.turnState.TurnStates; +import pp.mdga.client.gamestate.turnstate.ChoosePieceState; +import pp.mdga.client.gamestate.turnstate.MovePieceState; +import pp.mdga.client.gamestate.turnstate.PlayPowerCardState; +import pp.mdga.client.gamestate.turnstate.PowerCardState; +import pp.mdga.client.gamestate.turnstate.RollDiceState; +import pp.mdga.client.gamestate.turnstate.TurnStates; import pp.mdga.game.BonusCard; import pp.mdga.game.Piece; import pp.mdga.message.server.*; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/WaitingState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java similarity index 99% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/WaitingState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java index 365e4acf..42bdb48c 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/WaitingState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java @@ -1,4 +1,4 @@ -package pp.mdga.client.gameState; +package pp.mdga.client.gamestate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/DetermineStartPlayerStates.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/DetermineStartPlayerStates.java similarity index 72% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/DetermineStartPlayerStates.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/DetermineStartPlayerStates.java index 6be7ece5..1ec1ac4d 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/DetermineStartPlayerStates.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/DetermineStartPlayerStates.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.determineStartPlayerState; +package pp.mdga.client.gamestate.determinestartplayerstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.GameStates; +import pp.mdga.client.gamestate.GameStates; public abstract class DetermineStartPlayerStates extends GameStates { public DetermineStartPlayerStates(ClientState parent, ClientGameLogic logic) { diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/Intro.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/Intro.java new file mode 100644 index 00000000..3b41d5fc --- /dev/null +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/Intro.java @@ -0,0 +1,29 @@ +package pp.mdga.client.gamestate.determinestartplayerstate; + +import pp.mdga.client.ClientGameLogic; +import pp.mdga.client.ClientState; +import pp.mdga.client.gamestate.DetermineStartPlayerState; + +public class Intro extends DetermineStartPlayerStates{ + + private final DetermineStartPlayerState parent; + + public Intro(ClientState parent, ClientGameLogic logic) { + super(parent, logic); + this.parent = (DetermineStartPlayerState) parent; + } + + @Override + public void enter() { + + } + + @Override + public void exit() { + + } + + public DetermineStartPlayerState getParent(){ + return parent; + } +} diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/RollRankingDiceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/RollRankingDiceState.java similarity index 90% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/RollRankingDiceState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/RollRankingDiceState.java index 59cba3ec..72cc63da 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/RollRankingDiceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/RollRankingDiceState.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.determineStartPlayerState; +package pp.mdga.client.gamestate.determinestartplayerstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.DetermineStartPlayerState; +import pp.mdga.client.gamestate.DetermineStartPlayerState; import pp.mdga.message.client.RequestDieMessage; import pp.mdga.message.server.DieMessage; import pp.mdga.notification.DiceNowNotification; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/WaitRankingState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/WaitRankingState.java similarity index 90% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/WaitRankingState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/WaitRankingState.java index 6e2a96b3..e919d878 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/determineStartPlayerState/WaitRankingState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/WaitRankingState.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.determineStartPlayerState; +package pp.mdga.client.gamestate.determinestartplayerstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.DetermineStartPlayerState; +import pp.mdga.client.gamestate.DetermineStartPlayerState; import pp.mdga.message.server.RankingResponseMessage; import pp.mdga.message.server.RankingRollAgainMessage; import pp.mdga.notification.ActivePlayerNotification; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/ChoosePieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/ChoosePieceState.java similarity index 93% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/ChoosePieceState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/ChoosePieceState.java index 47dce439..71fce397 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/ChoosePieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/ChoosePieceState.java @@ -1,9 +1,9 @@ -package pp.mdga.client.gameState.turnState; +package pp.mdga.client.gamestate.turnstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.TurnState; -import pp.mdga.client.gameState.turnState.choosePieceState.*; +import pp.mdga.client.gamestate.TurnState; +import pp.mdga.client.gamestate.turnstate.choosepiecestate.*; import pp.mdga.game.Piece; import pp.mdga.message.server.*; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/MovePieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/MovePieceState.java similarity index 93% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/MovePieceState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/MovePieceState.java index a04d7e56..8a098dbb 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/MovePieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/MovePieceState.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.turnState; +package pp.mdga.client.gamestate.turnstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.TurnState; +import pp.mdga.client.gamestate.TurnState; import pp.mdga.message.client.AnimationEndMessage; import pp.mdga.message.server.*; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/PlayPowerCardState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PlayPowerCardState.java similarity index 92% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/PlayPowerCardState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PlayPowerCardState.java index b3f66cbd..3e9b0d47 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/PlayPowerCardState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PlayPowerCardState.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.turnState; +package pp.mdga.client.gamestate.turnstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.TurnState; +import pp.mdga.client.gamestate.TurnState; import pp.mdga.message.client.AnimationEndMessage; import pp.mdga.message.server.PlayCardMessage; import pp.mdga.notification.PlayCardNotification; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/PowerCardState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PowerCardState.java similarity index 86% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/PowerCardState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PowerCardState.java index 5a5fd5c3..85a977d5 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/PowerCardState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PowerCardState.java @@ -1,12 +1,12 @@ -package pp.mdga.client.gameState.turnState; +package pp.mdga.client.gamestate.turnstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.TurnState; -import pp.mdga.client.gameState.turnState.powerCardState.ChoosePowerCardState; -import pp.mdga.client.gameState.turnState.powerCardState.PowerCardStates; -import pp.mdga.client.gameState.turnState.powerCardState.ShieldState; -import pp.mdga.client.gameState.turnState.powerCardState.SwapState; +import pp.mdga.client.gamestate.TurnState; +import pp.mdga.client.gamestate.turnstate.powercardstate.ChoosePowerCardState; +import pp.mdga.client.gamestate.turnstate.powercardstate.PowerCardStates; +import pp.mdga.client.gamestate.turnstate.powercardstate.ShieldState; +import pp.mdga.client.gamestate.turnstate.powercardstate.SwapState; import pp.mdga.game.BonusCard; import pp.mdga.game.Piece; import pp.mdga.message.server.DiceNowMessage; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/RollDiceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java similarity index 91% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/RollDiceState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java index dbdecae3..50bfc2a1 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/RollDiceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.turnState; +package pp.mdga.client.gamestate.turnstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.TurnState; +import pp.mdga.client.gamestate.TurnState; import pp.mdga.message.server.DieMessage; import pp.mdga.message.server.NoTurnMessage; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/TurnStates.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/TurnStates.java similarity index 72% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/TurnStates.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/TurnStates.java index 6ca2cd4d..e7909fb8 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/TurnStates.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/TurnStates.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.turnState; +package pp.mdga.client.gamestate.turnstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.GameStates; +import pp.mdga.client.gamestate.GameStates; public abstract class TurnStates extends GameStates { public TurnStates(ClientState parent, ClientGameLogic logic) { diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/ChoosePieceStates.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/ChoosePieceStates.java similarity index 68% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/ChoosePieceStates.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/ChoosePieceStates.java index 231b2d37..0311ea35 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/ChoosePieceStates.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/ChoosePieceStates.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.turnState.choosePieceState; +package pp.mdga.client.gamestate.turnstate.choosepiecestate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.turnState.TurnStates; +import pp.mdga.client.gamestate.turnstate.TurnStates; public abstract class ChoosePieceStates extends TurnStates { public ChoosePieceStates(ClientState parent, ClientGameLogic logic) { diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/NoPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java similarity index 92% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/NoPieceState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java index 60b41e44..bed4a04a 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/NoPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java @@ -1,12 +1,11 @@ -package pp.mdga.client.gameState.turnState.choosePieceState; +package pp.mdga.client.gamestate.turnstate.choosepiecestate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.turnState.ChoosePieceState; +import pp.mdga.client.gamestate.turnstate.ChoosePieceState; import pp.mdga.game.Piece; import pp.mdga.message.server.*; import pp.mdga.message.server.StartPieceMessage; -import pp.mdga.notification.MovePieceNotification; import pp.mdga.notification.SelectableMoveNotification; import pp.mdga.notification.WaitMoveNotification; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/SelectPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java similarity index 94% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/SelectPieceState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java index bb88412e..884c546d 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/SelectPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.turnState.choosePieceState; +package pp.mdga.client.gamestate.turnstate.choosepiecestate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.turnState.ChoosePieceState; +import pp.mdga.client.gamestate.turnstate.ChoosePieceState; import pp.mdga.game.Piece; import pp.mdga.message.client.SelectedPiecesMessage; import pp.mdga.message.server.MoveMessage; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/StartPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java similarity index 88% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/StartPieceState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java index 5e5ac4a0..2f8b1d14 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/StartPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.turnState.choosePieceState; +package pp.mdga.client.gamestate.turnstate.choosepiecestate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.turnState.ChoosePieceState; +import pp.mdga.client.gamestate.turnstate.ChoosePieceState; import pp.mdga.game.Piece; import pp.mdga.message.client.SelectedPiecesMessage; import pp.mdga.message.server.MoveMessage; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/WaitingPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java similarity index 90% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/WaitingPieceState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java index a22197f1..6bcbc8a5 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/WaitingPieceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.turnState.choosePieceState; +package pp.mdga.client.gamestate.turnstate.choosepiecestate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.turnState.ChoosePieceState; +import pp.mdga.client.gamestate.turnstate.ChoosePieceState; import pp.mdga.game.Piece; import pp.mdga.game.PieceState; import pp.mdga.message.client.SelectedPiecesMessage; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/ChoosePowerCardState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ChoosePowerCardState.java similarity index 96% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/ChoosePowerCardState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ChoosePowerCardState.java index 54754e44..c679d198 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/ChoosePowerCardState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ChoosePowerCardState.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.turnState.powerCardState; +package pp.mdga.client.gamestate.turnstate.powercardstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.turnState.PowerCardState; +import pp.mdga.client.gamestate.turnstate.PowerCardState; import pp.mdga.game.BonusCard; import pp.mdga.message.client.NoPowerCardMessage; import pp.mdga.message.client.SelectCardMessage; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/PowerCardStates.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/PowerCardStates.java similarity index 68% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/PowerCardStates.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/PowerCardStates.java index 753e5aa8..53482531 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/PowerCardStates.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/PowerCardStates.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.turnState.powerCardState; +package pp.mdga.client.gamestate.turnstate.powercardstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.turnState.TurnStates; +import pp.mdga.client.gamestate.turnstate.TurnStates; public abstract class PowerCardStates extends TurnStates { public PowerCardStates(ClientState parent, ClientGameLogic logic) { diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/ShieldState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ShieldState.java similarity index 92% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/ShieldState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ShieldState.java index 26143674..87d64a44 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/ShieldState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ShieldState.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.turnState.powerCardState; +package pp.mdga.client.gamestate.turnstate.powercardstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.turnState.PowerCardState; +import pp.mdga.client.gamestate.turnstate.PowerCardState; import pp.mdga.game.Piece; import pp.mdga.message.client.RequestPlayCardMessage; import pp.mdga.message.server.PlayCardMessage; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/SwapState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java similarity index 95% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/SwapState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java index c907f66a..c499cb84 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/powerCardState/SwapState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/SwapState.java @@ -1,8 +1,8 @@ -package pp.mdga.client.gameState.turnState.powerCardState; +package pp.mdga.client.gamestate.turnstate.powercardstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; -import pp.mdga.client.gameState.turnState.PowerCardState; +import pp.mdga.client.gamestate.turnstate.PowerCardState; import pp.mdga.game.Piece; import pp.mdga.message.client.RequestPlayCardMessage; import pp.mdga.message.server.PlayCardMessage; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsState/AudioSettingsState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsstate/AudioSettingsState.java similarity index 89% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/settingsState/AudioSettingsState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/settingsstate/AudioSettingsState.java index 63fa3fff..ed3065ca 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsState/AudioSettingsState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsstate/AudioSettingsState.java @@ -1,4 +1,4 @@ -package pp.mdga.client.settingsState; +package pp.mdga.client.settingsstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsState/MainSettingsState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsstate/MainSettingsState.java similarity index 89% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/settingsState/MainSettingsState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/settingsstate/MainSettingsState.java index 5b1bde44..604757f6 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsState/MainSettingsState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsstate/MainSettingsState.java @@ -1,4 +1,4 @@ -package pp.mdga.client.settingsState; +package pp.mdga.client.settingsstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsState/SettingStates.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsstate/SettingStates.java similarity index 86% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/settingsState/SettingStates.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/settingsstate/SettingStates.java index 2b9fb2ff..e82d37f5 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsState/SettingStates.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsstate/SettingStates.java @@ -1,4 +1,4 @@ -package pp.mdga.client.settingsState; +package pp.mdga.client.settingsstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsState/VideoSettingsState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsstate/VideoSettingsState.java similarity index 89% rename from Projekte/mdga/model/src/main/java/pp/mdga/client/settingsState/VideoSettingsState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/settingsstate/VideoSettingsState.java index 78b72f48..fe8c2946 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsState/VideoSettingsState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/settingsstate/VideoSettingsState.java @@ -1,4 +1,4 @@ -package pp.mdga.client.settingsState; +package pp.mdga.client.settingsstate; import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientState; diff --git a/Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java b/Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java index c5c84b68..3b7c87db 100644 --- a/Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java +++ b/Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java @@ -4,22 +4,22 @@ import org.junit.Test; import pp.mdga.client.*; import pp.mdga.client.CeremonyState; -import pp.mdga.client.ceremonyState.PodiumState; -import pp.mdga.client.ceremonyState.StatisticsState; -import pp.mdga.client.dialogState.LobbyState; -import pp.mdga.client.dialogState.NetworkDialogState; -import pp.mdga.client.dialogState.StartDialogState; -import pp.mdga.client.gameState.*; -import pp.mdga.client.gameState.turnState.choosePieceState.*; -import pp.mdga.client.gameState.determineStartPlayer.DetermineStartPlayerStateMachine; -import pp.mdga.client.gameState.turnState.*; -import pp.mdga.client.gameState.turnState.powerCardState.ChoosePowerCardState; -import pp.mdga.client.gameState.turnState.powerCardState.ShieldState; -import pp.mdga.client.gameState.turnState.powerCardState.SwapState; +import pp.mdga.client.ceremonystate.PodiumState; +import pp.mdga.client.ceremonystate.StatisticsState; +import pp.mdga.client.dialogstate.LobbyState; +import pp.mdga.client.dialogstate.NetworkDialogState; +import pp.mdga.client.dialogstate.StartDialogState; +import pp.mdga.client.gamestate.*; +import pp.mdga.client.gamestate.turnstate.choosepiecestate.*; +import pp.mdga.client.gamestate.determineStartPlayer.DetermineStartPlayerStateMachine; +import pp.mdga.client.gamestate.turnstate.*; +import pp.mdga.client.gamestate.turnstate.powercardstate.ChoosePowerCardState; +import pp.mdga.client.gamestate.turnstate.powercardstate.ShieldState; +import pp.mdga.client.gamestate.turnstate.powercardstate.SwapState; import pp.mdga.client.SettingsState; -import pp.mdga.client.settingsState.AudioSettingsState; -import pp.mdga.client.settingsState.MainSettingsState; -import pp.mdga.client.settingsState.VideoSettingsState; +import pp.mdga.client.settingsstate.AudioSettingsState; +import pp.mdga.client.settingsstate.MainSettingsState; +import pp.mdga.client.settingsstate.VideoSettingsState; import pp.mdga.game.BonusCard; import pp.mdga.game.Color; import pp.mdga.message.client.ClientMessage;