diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaState.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaState.java index 58414b23..74b4f91a 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaState.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaState.java @@ -1,9 +1,5 @@ package pp.mdga.client; -import pp.mdga.notification.Notification; -import pp.mdga.notification.PieceInGameNotification; -import pp.mdga.notification.PlayerInGameNotification; - public enum MdgaState { NONE, MAIN, diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java index 76767434..44a6c726 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java @@ -2,7 +2,6 @@ import pp.mdga.client.view.GameView; import pp.mdga.client.view.LobbyView; -import pp.mdga.notification.*; import java.util.ArrayList; diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/SelectObjectOutliner.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/SelectObjectOutliner.java index e54a97c8..993e71d8 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/SelectObjectOutliner.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/SelectObjectOutliner.java @@ -1,18 +1,12 @@ package pp.mdga.client.board.Outline; import com.jme3.asset.AssetManager; -import com.jme3.material.Material; -import com.jme3.material.RenderState; -import com.jme3.material.RenderState.BlendMode; import com.jme3.math.ColorRGBA; -import com.jme3.post.Filter; import com.jme3.post.FilterPostProcessor; import com.jme3.renderer.Camera; import com.jme3.renderer.RenderManager; import com.jme3.renderer.ViewPort; -import com.jme3.scene.Node; import com.jme3.scene.Spatial; -import pp.mdga.game.Color; public class SelectObjectOutliner { diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java index c7799d87..a128bb82 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java @@ -9,8 +9,8 @@ import com.jme3.network.serializing.Serializer; import pp.mdga.game.Game; import pp.mdga.game.Player; -import pp.mdga.message.client.*; -import pp.mdga.message.server.*; +import pp.mdga.server.ServerGameLogic; +import pp.mdga.server.ServerSender; import java.io.FileInputStream; import java.io.IOException; diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java index 2a3a04e7..e41c1614 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java @@ -8,11 +8,6 @@ import pp.mdga.client.MdgaApp; import pp.mdga.client.MdgaState; import pp.mdga.client.gui.GuiHandler; -import pp.mdga.game.Color; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; public class GameView extends MdgaView { private BoardHandler boardHandler; diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java index d15c7010..d594bb9e 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java @@ -5,7 +5,6 @@ import pp.mdga.client.dialog.SingleButtonLeftDialog; import pp.mdga.client.dialog.SingleButtonRightDialog; import pp.mdga.client.MdgaApp; -import pp.mdga.client.MdgaState; import pp.mdga.game.Color; import java.util.ArrayList; diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Animation.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/Animation.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/Animation.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/Animation.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/AudioSettings.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/AudioSettings.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/AudioSettings.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/AudioSettings.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Ceremony.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/Ceremony.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/Ceremony.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/Ceremony.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/CeremonyStateMachine.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/CeremonyStateMachine.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/CeremonyStateMachine.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/CeremonyStateMachine.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ChoosePiece.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/ChoosePiece.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePieceStateMachine.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ChoosePieceStateMachine.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePieceStateMachine.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/ChoosePieceStateMachine.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePowerCard.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ChoosePowerCard.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/ChoosePowerCard.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/ChoosePowerCard.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/ClientAutomaton.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientAutomaton.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/ClientAutomaton.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/ClientAutomaton.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/ClientGameLogic.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/ClientGameLogic.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/ClientSender.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientSender.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/ClientSender.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/ClientSender.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/ClientState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientState.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/ClientState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/ClientState.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/ClientStateMachine.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientStateMachine.java similarity index 97% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/ClientStateMachine.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/ClientStateMachine.java index 92620f35..9537ccb7 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/ClientStateMachine.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientStateMachine.java @@ -1,7 +1,5 @@ package pp.mdga.client; -import pp.mdga.message.server.*; - public abstract class ClientStateMachine extends ClientState { private ClientState state; diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayer.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/DetermineStartPlayer.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayer.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/DetermineStartPlayer.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayerStateMachine.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/DetermineStartPlayerStateMachine.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/DetermineStartPlayerStateMachine.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/DetermineStartPlayerStateMachine.java diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/DialogStates.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/DialogStates.java new file mode 100644 index 00000000..f5ad1568 --- /dev/null +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/DialogStates.java @@ -0,0 +1,8 @@ +package pp.mdga.client; + +public abstract class DialogStates extends ClientState{ + + public DialogStates(ClientState parent, ClientGameLogic logic){ + super(parent, logic); + } +} diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Dialogs.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/Dialogs.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/Dialogs.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/Dialogs.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/DialogsStateMachine.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/DialogsStateMachine.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/DialogsStateMachine.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/DialogsStateMachine.java 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 similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/GameState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/GameStateMachine.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/GameStateMachine.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/GameStateMachine.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/GameStateMachine.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Interrupt.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/Interrupt.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/Interrupt.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/Interrupt.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Lobby.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/Lobby.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/Lobby.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/Lobby.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/MainSettings.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/MainSettings.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/MainSettings.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/MainSettings.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/MovePiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/MovePiece.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/MovePiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/MovePiece.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/NetworkDialog.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/NetworkDialog.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/NetworkDialog.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/NetworkDialog.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/NoPiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/NoPiece.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/NoPiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/NoPiece.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Observer.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/Observer.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/Observer.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/Observer.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/PlayPowerCard.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/PlayPowerCard.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/PlayPowerCard.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/PlayPowerCard.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Podium.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/Podium.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/Podium.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/Podium.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCard.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/PowerCard.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCard.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/PowerCard.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCardStateMachine.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/PowerCardStateMachine.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/PowerCardStateMachine.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/PowerCardStateMachine.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/RollDice.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/RollDice.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/RollDice.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/RollDice.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/RollRankingDice.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/RollRankingDice.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/RollRankingDice.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/RollRankingDice.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/SelectPiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/SelectPiece.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/SelectPiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/SelectPiece.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Settings.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/Settings.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/Settings.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/Settings.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/SettingsStateMachine.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/SettingsStateMachine.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/SettingsStateMachine.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/SettingsStateMachine.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Shield.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/Shield.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/Shield.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/Shield.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Spectator.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/Spectator.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/Spectator.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/Spectator.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/StartDialog.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/StartDialog.java similarity index 73% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/StartDialog.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/StartDialog.java index ee529941..90bb1e2b 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/client/StartDialog.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/StartDialog.java @@ -1,6 +1,6 @@ package pp.mdga.client; -public class StartDialog extends ClientState { +public class StartDialog extends DialogStates { public StartDialog(ClientState parent, ClientGameLogic logic) { super(parent, logic); } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/StartPiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/StartPiece.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/StartPiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/StartPiece.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Statistics.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/Statistics.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/Statistics.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/Statistics.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Swap.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/Swap.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/Swap.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/Swap.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Turn.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/Turn.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/Turn.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/Turn.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/TurnStateMachine.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/TurnStateMachine.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/TurnStateMachine.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/TurnStateMachine.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/VideoSettings.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/VideoSettings.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/VideoSettings.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/VideoSettings.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/WaitRanking.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/WaitRanking.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/WaitRanking.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/WaitRanking.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/Waiting.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/Waiting.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/Waiting.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/Waiting.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/client/WaitingPiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/WaitingPiece.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/client/WaitingPiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/client/WaitingPiece.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/Board.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/game/Board.java rename to Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/BonusCard.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/BonusCard.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/game/BonusCard.java rename to Projekte/mdga/model/src/main/java/pp/mdga/game/BonusCard.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/BonusNode.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/BonusNode.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/game/BonusNode.java rename to Projekte/mdga/model/src/main/java/pp/mdga/game/BonusNode.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/Color.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Color.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/game/Color.java rename to Projekte/mdga/model/src/main/java/pp/mdga/game/Color.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/Game.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/game/Game.java rename to Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/HomeNode.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/HomeNode.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/game/HomeNode.java rename to Projekte/mdga/model/src/main/java/pp/mdga/game/HomeNode.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/Node.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Node.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/game/Node.java rename to Projekte/mdga/model/src/main/java/pp/mdga/game/Node.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/Piece.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Piece.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/game/Piece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/game/Piece.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/PieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/PieceState.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/game/PieceState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/game/PieceState.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/Player.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Player.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/game/Player.java rename to Projekte/mdga/model/src/main/java/pp/mdga/game/Player.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/PlayerData.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/PlayerData.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/game/PlayerData.java rename to Projekte/mdga/model/src/main/java/pp/mdga/game/PlayerData.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/ShieldState.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/ShieldState.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/game/ShieldState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/game/ShieldState.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/StartNode.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/StartNode.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/game/StartNode.java rename to Projekte/mdga/model/src/main/java/pp/mdga/game/StartNode.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/game/Statistic.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Statistic.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/game/Statistic.java rename to Projekte/mdga/model/src/main/java/pp/mdga/game/Statistic.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/AnimationEnd.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/AnimationEnd.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/AnimationEnd.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/AnimationEnd.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/ClientInterpreter.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ClientInterpreter.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/ClientInterpreter.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/ClientInterpreter.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/ClientMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ClientMessage.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/ClientMessage.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/ClientMessage.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/ClientStartGame.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ClientStartGame.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/ClientStartGame.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/ClientStartGame.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/DeselectTSK.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/DeselectTSK.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/DeselectTSK.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/DeselectTSK.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/ForceContinueGame.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ForceContinueGame.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/ForceContinueGame.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/ForceContinueGame.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/ForceStartGame.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/ForceStartGame.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/ForceStartGame.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/ForceStartGame.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/JoinServer.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/JoinServer.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/JoinServer.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/JoinServer.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/LeaveGame.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LeaveGame.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/LeaveGame.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/LeaveGame.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/LobbyNotReady.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LobbyNotReady.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/LobbyNotReady.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/LobbyNotReady.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/LobbyReady.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/LobbyReady.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/LobbyReady.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/LobbyReady.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/NoPowerCard.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/NoPowerCard.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/NoPowerCard.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/NoPowerCard.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/RequestBriefing.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestBriefing.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/RequestBriefing.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestBriefing.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/RequestDice.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestDice.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/RequestDice.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestDice.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/RequestMove.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestMove.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/RequestMove.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestMove.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/RequestPlayCard.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestPlayCard.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/RequestPlayCard.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/RequestPlayCard.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/SelectCard.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/SelectCard.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/SelectCard.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/SelectCard.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/SelectTSK.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/SelectTSK.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/SelectTSK.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/SelectTSK.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/client/SelectedPieces.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/client/SelectedPieces.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/client/SelectedPieces.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/client/SelectedPieces.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/ActivePlayer.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ActivePlayer.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/ActivePlayer.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/ActivePlayer.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/AnyPiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/AnyPiece.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/AnyPiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/AnyPiece.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/Briefing.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/Briefing.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/Briefing.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/Briefing.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/CeremonyMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/CeremonyMessage.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/CeremonyMessage.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/CeremonyMessage.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/Dice.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/Dice.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/Dice.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/Dice.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/DiceAgain.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/DiceAgain.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/DiceAgain.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/DiceAgain.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/DiceNow.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/DiceNow.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/DiceNow.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/DiceNow.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/EndOfTurn.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/EndOfTurn.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/EndOfTurn.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/EndOfTurn.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/LobbyAccept.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyAccept.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/LobbyAccept.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyAccept.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/LobbyDeny.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyDeny.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/LobbyDeny.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyDeny.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/LobbyPlayerJoin.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyPlayerJoin.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/LobbyPlayerJoin.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyPlayerJoin.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/LobbyPlayerLeave.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyPlayerLeave.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/LobbyPlayerLeave.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/LobbyPlayerLeave.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/MoveMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/MoveMessage.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/MoveMessage.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/MoveMessage.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/NoTurn.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/NoTurn.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/NoTurn.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/NoTurn.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/PauseGame.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PauseGame.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/PauseGame.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/PauseGame.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/PlayCard.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PlayCard.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/PlayCard.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/PlayCard.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/PossibleCard.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PossibleCard.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/PossibleCard.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/PossibleCard.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/PossiblePiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/PossiblePiece.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/PossiblePiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/PossiblePiece.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/RankingResponse.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/RankingResponse.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/RankingResponse.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/RankingResponse.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/RankingRollAgain.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/RankingRollAgain.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/RankingRollAgain.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/RankingRollAgain.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/ReconnectBriefing.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ReconnectBriefing.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/ReconnectBriefing.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/ReconnectBriefing.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/ResumeGame.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ResumeGame.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/ResumeGame.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/ResumeGame.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/ServerInterpreter.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerInterpreter.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/ServerInterpreter.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerInterpreter.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/ServerMessage.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerMessage.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/ServerMessage.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerMessage.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/ServerStartGame.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerStartGame.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/ServerStartGame.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/ServerStartGame.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/StartPiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/StartPiece.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/StartPiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/StartPiece.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/UpdateReady.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/UpdateReady.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/UpdateReady.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/UpdateReady.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/UpdateTSK.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/UpdateTSK.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/UpdateTSK.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/UpdateTSK.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/WaitPiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/message/server/WaitPiece.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/WaitPiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/message/server/WaitPiece.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/AcquireCardNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/AcquireCardNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/AcquireCardNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/AcquireCardNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/ActivePlayerNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/ActivePlayerNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/ActivePlayerNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/ActivePlayerNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/CeremonyNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/CeremonyNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/CeremonyNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/CeremonyNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/DiceNowNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/DiceNowNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/DiceNowNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/DiceNowNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/DicingNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/DicingNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/DicingNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/DicingNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/DrawCardNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/DrawCardNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/DrawCardNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/DrawCardNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/GameNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/GameNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/GameNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/GameNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/HomeMoveNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/HomeMoveNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/HomeMoveNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/HomeMoveNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/InterruptNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/InterruptNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/InterruptNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/InterruptNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/LobbyDialogNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/LobbyDialogNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/LobbyDialogNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/LobbyDialogNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/MovePieceNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/MovePieceNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/MovePieceNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/MovePieceNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/MoveThrowPieceNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/MoveThrowPieceNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/MoveThrowPieceNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/MoveThrowPieceNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/NoShieldNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/NoShieldNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/NoShieldNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/NoShieldNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/Notification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/Notification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/Notification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/Notification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/PieceInGameNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/PieceInGameNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/PieceInGameNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/PieceInGameNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/PlayCardNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/PlayCardNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/PlayCardNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/PlayCardNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/PlayerInGameNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/PlayerInGameNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/PlayerInGameNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/PlayerInGameNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/ResumeNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/ResumeNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/ResumeNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/ResumeNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/RollDiceNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/RollDiceNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/RollDiceNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/RollDiceNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/SelectableCardsNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectableCardsNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/SelectableCardsNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectableCardsNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/SelectablePiecesNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectablePiecesNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/SelectablePiecesNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectablePiecesNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/ShieldActiveNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/ShieldActiveNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/ShieldActiveNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/ShieldActiveNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/ShieldSuppressedNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/ShieldSuppressedNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/ShieldSuppressedNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/ShieldSuppressedNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/StartDialogNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/StartDialogNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/StartDialogNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/StartDialogNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/SwapPieceNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/SwapPieceNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/SwapPieceNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/SwapPieceNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/TskSelectNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/TskSelectNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/TskSelectNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/TskSelectNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/TskUnselectNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/TskUnselectNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/TskUnselectNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/TskUnselectNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/WaitMoveNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/WaitMoveNotification.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/notification/WaitMoveNotification.java rename to Projekte/mdga/model/src/main/java/pp/mdga/notification/WaitMoveNotification.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/Ceremony.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/Ceremony.java similarity index 61% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/Ceremony.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/Ceremony.java index 8e00391d..35c9b51c 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/Ceremony.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/Ceremony.java @@ -1,8 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; -import pp.mdga.message.server.ServerState; - public class Ceremony extends ServerState { public Ceremony(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/ChoosePiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/ChoosePiece.java similarity index 74% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/ChoosePiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/ChoosePiece.java index 21bee23d..a91abdea 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/ChoosePiece.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/ChoosePiece.java @@ -1,7 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; - public class ChoosePiece extends Turn { public ChoosePiece(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/DetermineStartPlayer.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/DetermineStartPlayer.java similarity index 77% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/DetermineStartPlayer.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/DetermineStartPlayer.java index df8bf459..3686ab3e 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/DetermineStartPlayer.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/DetermineStartPlayer.java @@ -1,7 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; - public class DetermineStartPlayer extends Game { public DetermineStartPlayer(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/FirstRoll.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/FirstRoll.java similarity index 74% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/FirstRoll.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/FirstRoll.java index b993534d..18ceb186 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/FirstRoll.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/FirstRoll.java @@ -1,7 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; - public class FirstRoll extends RollDice { public FirstRoll(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/Game.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/Game.java similarity index 59% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/Game.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/Game.java index 773570ed..ad3f5897 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/Game.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/Game.java @@ -1,8 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; -import pp.mdga.message.server.ServerState; - public class Game extends ServerState { public Game(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/Interrupt.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/Interrupt.java similarity index 61% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/Interrupt.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/Interrupt.java index 37ce2bde..1f9e0351 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/Interrupt.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/Interrupt.java @@ -1,8 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; -import pp.mdga.message.server.ServerState; - public class Interrupt extends ServerState { public Interrupt(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/Lobby.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/Lobby.java similarity index 74% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/Lobby.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/Lobby.java index d6b97b9a..02c32338 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/Lobby.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/Lobby.java @@ -1,8 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; -import pp.mdga.message.server.ServerState; - public class Lobby extends ServerState { diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/MovePiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/MovePiece.java similarity index 74% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/MovePiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/MovePiece.java index 14db9e6c..b536b228 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/MovePiece.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/MovePiece.java @@ -1,7 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; - public class MovePiece extends Turn { public MovePiece(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/NoPiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/NoPiece.java similarity index 74% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/NoPiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/NoPiece.java index 3953272e..ea3bdfd2 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/NoPiece.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/NoPiece.java @@ -1,7 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; - public class NoPiece extends ChoosePiece { public NoPiece(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/NoTurn.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/NoTurn.java similarity index 74% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/NoTurn.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/NoTurn.java index 8be6ffc4..79c77433 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/NoTurn.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/NoTurn.java @@ -1,7 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; - public class NoTurn extends ChoosePiece { public NoTurn(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/PowerCard.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/PowerCard.java similarity index 74% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/PowerCard.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/PowerCard.java index e8af5bb8..a00592b0 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/PowerCard.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/PowerCard.java @@ -1,7 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; - public class PowerCard extends Turn { public PowerCard(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/RollDice.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/RollDice.java similarity index 74% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/RollDice.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/RollDice.java index f38ee1fb..f93c7599 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/RollDice.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/RollDice.java @@ -1,7 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; - public class RollDice extends Turn { public RollDice(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/SecondRoll.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/SecondRoll.java similarity index 75% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/SecondRoll.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/SecondRoll.java index e4f69e46..140ac1b9 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/SecondRoll.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/SecondRoll.java @@ -1,7 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; - public class SecondRoll extends RollDice { public SecondRoll(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/SelectPiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/SelectPiece.java similarity index 75% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/SelectPiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/SelectPiece.java index e5ddb601..d022a16c 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/SelectPiece.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/SelectPiece.java @@ -1,7 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; - public class SelectPiece extends ChoosePiece { public SelectPiece(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/ServerGameLogic.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/ServerGameLogic.java similarity index 92% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/ServerGameLogic.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/ServerGameLogic.java index 4b1b3c92..bb754961 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/ServerGameLogic.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/ServerGameLogic.java @@ -1,15 +1,11 @@ -package pp.mdga.message.server; +package pp.mdga.server; -import com.jme3.network.Server; import pp.mdga.game.Game; import pp.mdga.message.client.*; -import pp.mdga.message.server.ServerSender; -import pp.mdga.message.server.ServerState; -import pp.mdga.server.Lobby; +import pp.mdga.message.server.NoTurn; +import pp.mdga.message.server.StartPiece; import java.lang.System.Logger; -import java.lang.System.Logger.Level; -import java.util.ArrayList; public class ServerGameLogic implements ClientInterpreter { private static final Logger LOGGER = System.getLogger(ServerGameLogic.class.getName()); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/ServerSender.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/ServerSender.java similarity index 91% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/ServerSender.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/ServerSender.java index 8e104226..63ce27b1 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/ServerSender.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/ServerSender.java @@ -1,4 +1,4 @@ -package pp.mdga.message.server; +package pp.mdga.server; import pp.mdga.message.server.ServerMessage; diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/ServerState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/ServerState.java similarity index 100% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/ServerState.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/ServerState.java diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/StartPiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/StartPiece.java similarity index 75% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/StartPiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/StartPiece.java index f6ad7a2a..b3d7a2d5 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/StartPiece.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/StartPiece.java @@ -1,7 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; - public class StartPiece extends ChoosePiece { public StartPiece(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/ThirdRoll.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/ThirdRoll.java similarity index 74% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/ThirdRoll.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/ThirdRoll.java index 80863ef7..cb588fb0 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/ThirdRoll.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/ThirdRoll.java @@ -1,7 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; - public class ThirdRoll extends RollDice { public ThirdRoll(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/Turn.java similarity index 72% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/Turn.java index ecbbde39..77c28708 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/Turn.java @@ -1,7 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; - public class Turn extends Game { public Turn(ServerGameLogic logic) { super(logic); diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/WaitingPiece.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/WaitingPiece.java similarity index 76% rename from Projekte/mdga/model/src/main/java/pp.mdga/server/WaitingPiece.java rename to Projekte/mdga/model/src/main/java/pp/mdga/server/WaitingPiece.java index a3d665d0..ed088e8f 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/WaitingPiece.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/WaitingPiece.java @@ -1,7 +1,5 @@ package pp.mdga.server; -import pp.mdga.message.server.ServerGameLogic; - public class WaitingPiece extends ChoosePiece { public WaitingPiece(ServerGameLogic logic) { super(logic); 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 468f87b7..d48890a0 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 @@ -9,7 +9,6 @@ import pp.mdga.game.Color; import pp.mdga.game.Game; import pp.mdga.message.client.ClientMessage; -import pp.mdga.message.server.*; import java.util.ArrayList; diff --git a/Projekte/mdga/model/src/test/java/pp/mdga/server/serverState/ServerStateTest.java b/Projekte/mdga/model/src/test/java/pp/mdga/server/serverState/ServerStateTest.java index 5d11bbce..bd3c78e2 100644 --- a/Projekte/mdga/model/src/test/java/pp/mdga/server/serverState/ServerStateTest.java +++ b/Projekte/mdga/model/src/test/java/pp/mdga/server/serverState/ServerStateTest.java @@ -3,9 +3,7 @@ import org.junit.Before; import org.junit.Test; import pp.mdga.game.Game; -import pp.mdga.message.client.*; import pp.mdga.message.server.ServerMessage; -import pp.mdga.message.server.WaitPiece; import pp.mdga.server.*; import static org.junit.Assert.*;