peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'development' into 'dev/test'

Browse Source 
merge Development into test

See merge request progproj/gruppen-ht24/Gruppe-01!27
This commit was merged in pull request #27.
This commit is contained in:
Benjamin Feyer
2024-12-01 20:56:49 +00:00
parent 6370ec15c2 5a68d3b146
commit 9718ad111f
73 changed files with 908 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java
View File

@@ -28,9 +28,10 @@ public class ClientGameLogic implements ServerInterpreter {
private final InterruptState interruptState = new InterruptState(null, this);
private final SettingsState settingsState = new SettingsState(null, this);
public ClientGameLogic(Game game, ClientSender clientSender) {
this.game = game;
public ClientGameLogic(ClientSender clientSender) {
this.game = new Game();
this.clientSender = clientSender;
dialogsState.enter();
state = dialogsState;
}
@@ -244,7 +245,11 @@ public void selectName(String name){
}
public void selectReady(boolean ready){
state.selectReady(ready);
if(ready){
state.selectReady();
} else {
state.selectUnready();
}
}
public void selectHost(String name){
@@ -304,7 +309,11 @@ public SettingsState getSettings(){
}
public Notification getNotification(){
return notifications.remove(0);
if(!notifications.isEmpty()){
return notifications.remove(0);
} else {
return null;
}
}
public void addNotification(Notification notification){

2
Projekte/mdga/model/src/main/java/pp/mdga/client/ClientState.java
View File

@@ -200,7 +200,7 @@ public void setName(String name) {
LOGGER.log(Level.DEBUG, "Setting name not allowed.");
}
public void selectReady(boolean ready) {
public void selectReady() {
LOGGER.log(Level.DEBUG, "Selecting ready not allowed.");
}

11
Projekte/mdga/model/src/main/java/pp/mdga/client/DialogsState.java
View File

@@ -37,7 +37,7 @@ public void enter(){
public void setState(DialogStates newState){
currentState.exit();
currentState.enter();
newState.enter();
currentState = newState;
}
@@ -75,6 +75,11 @@ public void selectLeave(){
currentState.selectLeave();
}
@Override
public void setName(String name){
currentState.setName(name);
}
@Override
public void selectTSK(Color color){
currentState.selectTSK(color);
@@ -86,8 +91,8 @@ public void deselectTSK(Color color){
}
@Override
public void selectReady(boolean ready){
currentState.selectReady(ready);
public void selectReady(){
currentState.selectReady();
}
@Override

9
Projekte/mdga/model/src/main/java/pp/mdga/client/InterruptState.java
View File

@@ -8,10 +8,19 @@ public class InterruptState extends ClientState {
private ClientState previousState;
/**
* Creates a new InterruptState
*
* @param parent the parent state
* @param logic the game logic
*/
public InterruptState(ClientState parent, ClientGameLogic logic) {
super(parent, logic);
}
/**
* Enters the new state machine
*/
@Override
public void enter() {
previousState = null;

9
Projekte/mdga/model/src/main/java/pp/mdga/client/ServerConnection.java Normal file
View File

@@ -0,0 +1,9 @@
package pp.mdga.client;
public interface ServerConnection extends ClientSender {
boolean isConnected();
void connect();
void disconnect();
}

18
Projekte/mdga/model/src/main/java/pp/mdga/client/SettingsState.java
View File

@@ -7,26 +7,44 @@
public class SettingsState extends ClientState {
/**
* The current state of the settings
*/
private SettingStates currentState;
private final MainSettingsState mainSettingsState = new MainSettingsState(this, logic);
private final AudioSettingsState audioSettingsState = new AudioSettingsState(this, logic);
private final VideoSettingsState videoSettingsState = new VideoSettingsState(this, logic);
/**
* Creates a new SettingsState
*
* @param parent the parent state
* @param logic the game logic
*/
public SettingsState(ClientState parent, ClientGameLogic logic) {
super(parent, logic);
}
/**
* Enters the current state
*/
@Override
public void enter() {
currentState = mainSettingsState;
}
/**
* Exits the current state
*/
@Override
public void exit() {
currentState.exit();
}
/**
* Changes the current state
*/
public SettingStates getState(){
return currentState;
}

6
Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/LobbyState.java
View File

@@ -11,6 +11,7 @@
import pp.mdga.message.server.ServerStartGameMessage;
import pp.mdga.message.server.UpdateReadyMessage;
import pp.mdga.message.server.UpdateTSKMessage;
import pp.mdga.notification.LobbyReadyNotification;
import pp.mdga.notification.TskSelectNotification;
import pp.mdga.notification.TskUnselectNotification;
@@ -35,6 +36,7 @@ public void exit() {
@Override
public void selectLeave() {
parent.setState(parent.getStartDialog());
logic.send(new LeaveGameMessage());
}
@Override
@@ -48,7 +50,7 @@ public void deselectTSK(Color color) {
}
@Override
public void selectReady(boolean ready) {
public void selectReady() {
logic.send(new LobbyReadyMessage());
}
@@ -75,6 +77,7 @@ public void received(ServerStartGameMessage msg){
@Override
public void received(LobbyPlayerJoinedMessage msg){
logic.addNotification(new TskSelectNotification(msg.getPlayer().getColor(), msg.getPlayer().getName(), parent.getOwnPlayerId()== msg.getId()));
logic.getGame().getPlayers().put(msg.getId(), msg.getPlayer());
}
@@ -93,6 +96,7 @@ public void received(LobbyPlayerLeaveMessage msg){
@Override
public void received(UpdateReadyMessage msg){
logic.addNotification(new LobbyReadyNotification(logic.getGame().getPlayers().get(msg.getPlayerId()).getColor(), msg.isReady()));
logic.getGame().getPlayers().get(msg.getPlayerId()).setReady(msg.isReady());
}
}

7
Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/NetworkDialogState.java
View File

@@ -3,6 +3,7 @@
import pp.mdga.client.ClientGameLogic;
import pp.mdga.client.ClientState;
import pp.mdga.client.DialogsState;
import pp.mdga.notification.LobbyDialogNotification;
public class NetworkDialogState extends DialogStates {
@@ -55,9 +56,7 @@ public void selectLeave() {
}
public void selectJoin(String IP) {
if(checkIP(IP)){
parent.setState(parent.getLobby());
}
parent.setState(parent.getLobby());
logic.addNotification(new LobbyDialogNotification());
}
}

6
Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/StartDialogState.java
View File

@@ -37,6 +37,12 @@ public void selectHost(String name) {
logic.setHost(true);
}
@Override
public void setName(String name) {
parent.setState(parent.getNetworkDialog());
parent.setOwnPlayerName(name);
}
@Override
public void selectLeave() {
parent.exit();

10
Projekte/mdga/model/src/main/java/pp/mdga/client/gameState/turnState/choosePieceState/NoPieceState.java
View File

@@ -11,6 +11,8 @@
import pp.mdga.notification.WaitMoveNotification;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
public class NoPieceState extends ChoosePieceStates {
@@ -49,7 +51,13 @@ public void received(WaitPieceMessage msg){
@Override
public void received(StartPieceMessage msg){
Piece piece = logic.getGame().getPieceThroughUUID(msg.getPieceIdentifier());
//TODO: logic.addNotification(null);
List<UUID> listPiece = new ArrayList<>();
List<Integer> listIndex = new ArrayList<>();
List<Boolean> homeMove = new ArrayList<>();
listPiece.add(piece.getUuid());
listIndex.add(msg.getTargetIndex());
homeMove.add(false);
logic.addNotification(new SelectableMoveNotification(listPiece, listIndex, homeMove));
parent.setState(parent.getStartPiece());
}

3
Projekte/mdga/model/src/main/java/pp/mdga/game/Player.java
View File

@@ -1,10 +1,13 @@
package pp.mdga.game;
import com.jme3.network.serializing.Serializable;
import java.util.ArrayList;
/**
* This class will be used to handle general PlayerData
*/
@Serializable
public class Player {
/**
* The name of the player.

3
Projekte/mdga/model/src/main/java/pp/mdga/game/Statistic.java
View File

@@ -1,8 +1,11 @@
package pp.mdga.game;
import com.jme3.network.serializing.Serializable;
/**
* This class will be used to store Statistics during the Game;
*/
@Serializable
public class Statistic {
/**
* The number of cards played.

2
Projekte/mdga/model/src/main/java/pp/mdga/message/client/StartGameMessage.java
View File

@@ -18,7 +18,7 @@ public StartGameMessage(boolean forceStartGame){
/**
* Constructs a new ForceStartGame message.
*/
public StartGameMessage() {
private StartGameMessage() {
super();
forceStartGame = false;
}

14
Projekte/mdga/model/src/main/java/pp/mdga/notification/AcquireCardNotification.java
View File

@@ -7,13 +7,20 @@
/**
* Notification that is sent when a card is acquired.
*/
public class AcquireCardNotification extends Notification{
public class AcquireCardNotification extends Notification {
/**
* The id of the card that was acquired.
*/
private final UUID cardId;
private UUID cardId;
private BonusCard bonusCard;
/**
* The bonus card that was acquired.
*/
private final BonusCard bonusCard;
/**
* Constructor.
*
* @param cardId The id of the card that was acquired.
*/
public AcquireCardNotification(BonusCard bonusCard, UUID cardId) {
@@ -23,6 +30,7 @@ public AcquireCardNotification(BonusCard bonusCard, UUID cardId) {
/**
* Get the id of the card that was acquired.
*
* @return The id of the card that was acquired.
*/
public UUID getCardId() {

8
Projekte/mdga/model/src/main/java/pp/mdga/notification/ActivePlayerNotification.java
View File

@@ -6,12 +6,16 @@
* Notification that the active player has changed
*/
public class ActivePlayerNotification extends Notification {
/**
* The color of the active player
*/
private Color color;
private final Color color;
/**
* Constructor.
*
* @param color the color of the active player
*/
public ActivePlayerNotification(Color color) {
this.color = color;
}

7
Projekte/mdga/model/src/main/java/pp/mdga/notification/CeremonyNotification.java
View File

@@ -7,7 +7,7 @@
/**
* Class CeremonyNotification
* Represents a notification for a ceremony in the game.
*
* <p>
* Index mapping:
* index = 0 ==> winner
* index = 1 ==> 2nd
@@ -16,6 +16,9 @@
* index = 4 ==> total
*/
public class CeremonyNotification extends Notification {
/**
* Attributes.
*/
private ArrayList<Color> colors;
private ArrayList<String> names;
private ArrayList<Integer> piecesThrown;
@@ -40,8 +43,6 @@ public CeremonyNotification() {
this.bonusNodes = new ArrayList<>();
}
// Getters and Setters
/**
* @return the list of colors
*/

1
Projekte/mdga/model/src/main/java/pp/mdga/notification/DiceNowNotification.java
View File

@@ -4,7 +4,6 @@
* Notification that the dice is now.
*/
public class DiceNowNotification extends Notification {
/**
* Constructor.
*/

10
Projekte/mdga/model/src/main/java/pp/mdga/notification/DicingNotification.java
View File

@@ -5,12 +5,15 @@
/**
* Notification that is sent when a player has diced.
*/
public class DicingNotification extends Notification{
private Color color;
public class DicingNotification extends Notification {
/**
* The color of the player that diced.
*/
private final Color color;
/**
* Constructor.
*
* @param color The color of the player that diced.
*/
public DicingNotification(Color color) {
@@ -19,6 +22,7 @@ public DicingNotification(Color color) {
/**
* Get the color of the player that diced.
*
* @return The color of the player that diced.
*/
public Color getColor() {

14
Projekte/mdga/model/src/main/java/pp/mdga/notification/DrawCardNotification.java
View File

@@ -6,14 +6,20 @@
/**
* Notification that a card has been drawn
*/
public class DrawCardNotification extends Notification {
public class DrawCardNotification extends Notification {
/**
* The color of the player who drew the card
*/
private final Color color;
private Color color;
private BonusCard card;
/**
* The card that was drawn
*/
private final BonusCard card;
/**
* @param color the color of the player who drew the card
* @param card the card that was drawn
* @param card the card that was drawn
*/
public DrawCardNotification(Color color, BonusCard card) {
this.color = color;

2
Projekte/mdga/model/src/main/java/pp/mdga/notification/GameNotification.java
View File

@@ -3,7 +3,7 @@
/**
* GameNotification class
*/
public class GameNotification extends Notification{
public class GameNotification extends Notification {
/**
* Constructor
*/

12
Projekte/mdga/model/src/main/java/pp/mdga/notification/HomeMoveNotification.java
View File

@@ -6,14 +6,20 @@
* Notification that a piece has moved to a home.
*/
public class HomeMoveNotification extends Notification {
/**
* The unique identifier of the piece.
*/
private final UUID pieceId;
private UUID pieceId;
private int homeIndex;
/**
* The index of the home position.
*/
private final int homeIndex;
/**
* Constructor.
*
* @param pieceId the piece id
* @param pieceId the piece id
* @param homeIndex the home index
*/
public HomeMoveNotification(UUID pieceId, int homeIndex) {

6
Projekte/mdga/model/src/main/java/pp/mdga/notification/InterruptNotification.java
View File

@@ -6,8 +6,10 @@
* Notification that a card has been drawn
*/
public class InterruptNotification extends Notification {
private Color color;
/**
* The color of the player who disconnected
*/
private final Color color;
/**
* @param color the color of the player who disconnected

7
Projekte/mdga/model/src/main/java/pp/mdga/notification/LobbyDialogNotification.java
View File

@@ -3,10 +3,5 @@
/**
* Notification that a dialog has been started
*/
public class LobbyDialogNotification extends Notification{
/**
* Constructor
*/
public LobbyDialogNotification() {
}
public class LobbyDialogNotification extends Notification {
}

43
Projekte/mdga/model/src/main/java/pp/mdga/notification/LobbyReadyNotification.java Normal file
View File

@@ -0,0 +1,43 @@
package pp.mdga.notification;
import pp.mdga.game.Color;
public class LobbyReadyNotification extends Notification{
/**
* The color of the player.
*/
private Color color;
/**
* Indicates if the player is ready.
*/
private boolean ready;
/**
* Constructor
*/
public LobbyReadyNotification(Color color, boolean ready) {
this.color = color;
this.ready = ready;
}
/**
* This method is used to get the color of the player
*
* @return the color of the player
*/
public Color getColor() {
return color;
}
/**
* This method is used to get the ready state of the player
*
* @return the ready state of the player
*/
public boolean isReady() {
return ready;
}
}

3
Projekte/mdga/model/src/main/java/pp/mdga/notification/MovePieceNotification.java
View File

@@ -1,14 +1,11 @@
package pp.mdga.notification;
import pp.mdga.game.Color;
import java.util.UUID;
/**
* Notification that a piece has been moved.
*/
public class MovePieceNotification extends Notification {
/**
* The unique identifier of the piece being moved.
*/

6
Projekte/mdga/model/src/main/java/pp/mdga/notification/NoShieldNotification.java
View File

@@ -6,8 +6,10 @@
* Notification that a piece has no shield.
*/
public class NoShieldNotification extends Notification{
private UUID pieceId;
/**
* The id of the piece that has no shield.
*/
private final UUID pieceId;
/**
* Constructor.

3
Projekte/mdga/model/src/main/java/pp/mdga/notification/Notification.java
View File

@@ -1,4 +1,7 @@
package pp.mdga.notification;
/**
* Represents a notification that can be sent to a player.
*/
public abstract class Notification {
}

15
Projekte/mdga/model/src/main/java/pp/mdga/notification/PlayCardNotification.java
View File

@@ -7,14 +7,21 @@
* Notification that a card has been played.
*/
public class PlayCardNotification extends Notification {
/**
* The color of the player that played the card.
*/
private final Color color;
private Color color;
private BonusCard card;
/**
* The card that was played.
*/
private final BonusCard card;
/**
* Constructor.
*
* @param color the color of the player that played the card.
* @param card the card that was played.
* @param card the card that was played.
*/
public PlayCardNotification(Color color, BonusCard card) {
this.color = color;
@@ -23,6 +30,7 @@ public PlayCardNotification(Color color, BonusCard card) {
/**
* Get the color of the player that played the card.
*
* @return the color of the player that played the card.
*/
public Color getColor() {
@@ -31,6 +39,7 @@ public Color getColor() {
/**
* Get the card that was played.
*
* @return the card that was played.
*/
public BonusCard getCard() {

28
Projekte/mdga/model/src/main/java/pp/mdga/notification/PlayerInGameNotification.java
View File

@@ -9,17 +9,28 @@
* Notification that a player is in the game.
*/
public class PlayerInGameNotification extends Notification {
/**
* The color of the player that is in the game.
*/
private final Color color;
private Color color;
private String name;
private List<UUID> piecesList;
/**
* The name of the player that is in the game.
*/
private final String name;
/**
* The list of piece IDs associated with the player.
*/
private final List<UUID> piecesList;
/**
* Constructor.
*
* @param color the color of the player that is in the game.
* @param name the name of the player that is in the game.
* @param name the name of the player that is in the game.
*/
public PlayerInGameNotification(Color color, List<UUID> piecesList, String name) {
public PlayerInGameNotification(Color color, List<UUID> piecesList, String name) {
this.color = color;
this.name = name;
this.piecesList = piecesList;
@@ -27,6 +38,7 @@ public PlayerInGameNotification(Color color, List<UUID> piecesList, String name
/**
* Get the color of the player that is in the game.
*
* @return the color of the player that is in the game.
*/
public Color getColor() {
@@ -35,12 +47,18 @@ public Color getColor() {
/**
* Get the name of the player that is in the game.
*
* @return the name of the player that is in the game.
*/
public String getName() {
return name;
}
/**
* Get the list of piece IDs associated with the player.
*
* @return the list of piece IDs associated with the player.
*/
public List<UUID> getPiecesList() {
return piecesList;
}

8
Projekte/mdga/model/src/main/java/pp/mdga/notification/ResumeNotification.java
View File

@@ -6,11 +6,14 @@
* Notification that a player is in the game.
*/
public class ResumeNotification extends Notification {
private Color color;
/**
* The color of the player that is in the game.
*/
private final Color color;
/**
* Constructor.
*
* @param color the color of the player that is in the game.
*/
public ResumeNotification(Color color) {
@@ -19,6 +22,7 @@ public ResumeNotification(Color color) {
/**
* Get the color of the player that is in the game.
*
* @return the color of the player that is in the game.
*/
public Color getColor() {

26
Projekte/mdga/model/src/main/java/pp/mdga/notification/RollDiceNotification.java
View File

@@ -5,16 +5,27 @@
/**
* Notification that a die has been rolled.
*/
public class RollDiceNotification extends Notification{
public class RollDiceNotification extends Notification {
/**
* The color of the player that rolled the die.
*/
private final Color color;
private Color color;
private int eyes;
private int moveNumber;
/**
* The number of eyes that were rolled.
*/
private final int eyes;
/**
* The number of the move that was made.
*/
private final int moveNumber;
/**
* Constructor.
* @param color the color of the player that rolled the die.
* @param eyes the number of eyes that were rolled.
*
* @param color the color of the player that rolled the die.
* @param eyes the number of eyes that were rolled.
* @param moveNumber the number of the move that was made.
*/
public RollDiceNotification(Color color, int eyes, int moveNumber) {
@@ -25,6 +36,7 @@ public RollDiceNotification(Color color, int eyes, int moveNumber) {
/**
* Get the color of the player that rolled the die.
*
* @return the color of the player that rolled the die.
*/
public Color getColor() {
@@ -33,6 +45,7 @@ public Color getColor() {
/**
* Get the number of eyes that were rolled.
*
* @return the number of eyes that were rolled.
*/
public int getEyes() {
@@ -41,6 +54,7 @@ public int getEyes() {
/**
* Get the number of the move that was made.
*
* @return the number of the move that was made.
*/
public int getMoveNumber() {

6
Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectableCardsNotification.java
View File

@@ -7,8 +7,10 @@
* Notification that contains a list of cards that the player can choose from.
*/
public class SelectableCardsNotification extends Notification {
private List<BonusCard> cards;
/**
* The list of cards that the player can choose from.
*/
private final List<BonusCard> cards;
/**
* Constructor.

15
Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectableMoveNotification.java
View File

@@ -6,8 +6,7 @@
/**
* Notification for selecting pieces and their possible moves.
*/
public class SelectableMoveNotification extends Notification{
public class SelectableMoveNotification extends Notification {
/**
* List of UUIDs representing the pieces that can be moved based on the dice roll.
*/
@@ -16,7 +15,7 @@ public class SelectableMoveNotification extends Notification{
/**
* List of integers representing the target nodes the pieces can move to.
*/
private final List<Integer> moveIndexe;
private final List<Integer> moveIndices;
/**
* List of booleans indicating whether the corresponding target nodes are in the home area.
@@ -28,12 +27,12 @@ public class SelectableMoveNotification extends Notification{
* Constructs a notification for selectable piece moves.
*
* @param pieces the list of pieces that can be moved
* @param moveIndexe the list of target nodes for the moves
* @param moveIndices the list of target nodes for the moves
* @param homeMoves the list indicating if the target nodes are in the home area
*/
public SelectableMoveNotification(List<UUID> pieces, List<Integer> moveIndexe, List<Boolean> homeMoves) {
public SelectableMoveNotification(List<UUID> pieces, List<Integer> moveIndices, List<Boolean> homeMoves) {
this.pieces = pieces;
this.moveIndexe = moveIndexe;
this.moveIndices = moveIndices;
this.homeMoves = homeMoves;
}
@@ -51,8 +50,8 @@ public List<UUID> getPieces() {
*
* @return a list of integers representing the target nodes
*/
public List<Integer> getMoveIndexe() {
return moveIndexe;
public List<Integer> getMoveIndices() {
return moveIndices;
}
/**

3
Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectableSwapNotification.java
View File

@@ -6,8 +6,7 @@
/**
* Notification for selecting pieces for swapcard.
*/
public class SelectableSwapNotification extends Notification{
public class SelectableSwapNotification extends Notification {
/**
* List of UUIDs representing the player's own pieces available for selection.
*/

8
Projekte/mdga/model/src/main/java/pp/mdga/notification/ShieldActiveNotification.java
View File

@@ -5,9 +5,11 @@
/**
* This class will be used to hold all ShieldActiveNotification relevant data.
*/
public class ShieldActiveNotification extends Notification{
private UUID pieceId;
public class ShieldActiveNotification extends Notification {
/**
* The pieceId
*/
private final UUID pieceId;
/**
* This constructor is used to create a new ShieldActiveNotification

6
Projekte/mdga/model/src/main/java/pp/mdga/notification/ShieldSuppressedNotification.java
View File

@@ -6,8 +6,10 @@
* This class will be used to hold all ShieldSuppressedNotification relevant data.
*/
public class ShieldSuppressedNotification extends Notification {
private UUID pieceId;
/**
* The pieceId
*/
private final UUID pieceId;
/**
* This constructor is used to create a new ShieldSuppressedNotification

7
Projekte/mdga/model/src/main/java/pp/mdga/notification/StartDialogNotification.java
View File

@@ -3,10 +3,5 @@
/**
* Notification that a dialog has been started
*/
public class StartDialogNotification extends Notification{
/**
* Constructor
*/
public StartDialogNotification() {
}
public class StartDialogNotification extends Notification {
}

17
Projekte/mdga/model/src/main/java/pp/mdga/notification/SwapPieceNotification.java
View File

@@ -6,23 +6,31 @@
* Notification that two pieces have been swapped.
*/
public class SwapPieceNotification extends Notification {
/**
* The UUID of the first piece that has been swapped.
*/
private final UUID firstPiece;
private UUID firstPiece;
private UUID secondPiece;
/**
* The UUID of the second piece that has been swapped.
*/
private final UUID secondPiece;
/**
* Constructor.
* @param firstPiece the UUID of the first piece that has been swapped.
*
* @param firstPiece the UUID of the first piece that has been swapped.
* @param secondPiece the UUID of the second piece that has been swapped.
*/
public SwapPieceNotification(UUID firstPiece, UUID secondPiece) {
assert(!firstPiece.equals(secondPiece));
assert (!firstPiece.equals(secondPiece));
this.firstPiece = firstPiece;
this.secondPiece = secondPiece;
}
/**
* Get the UUID of the first piece that has been swapped.
*
* @return the UUID of the first piece that has been swapped.
*/
public UUID getFirstPiece() {
@@ -31,6 +39,7 @@ public UUID getFirstPiece() {
/**
* Get the UUID of the second piece that has been swapped.
*
* @return the UUID of the second piece that has been swapped.
*/
public UUID getSecondPiece() {

18
Projekte/mdga/model/src/main/java/pp/mdga/notification/ThrowPieceNotification.java
View File

@@ -1,12 +1,15 @@
package pp.mdga.notification;
import pp.mdga.game.Color;
import java.util.UUID;
public class ThrowPieceNotification extends Notification{
private UUID pieceId;
/**
* Notification that is sent when a piece is thrown.
*/
public class ThrowPieceNotification extends Notification {
/**
* The id of the piece that was thrown.
*/
private final UUID pieceId;
/**
* This constructor is used to create a new ThrowPieceNotification
@@ -15,6 +18,11 @@ public ThrowPieceNotification(UUID pieceId) {
this.pieceId = pieceId;
}
/**
* Get the id of the piece that was thrown.
*
* @return The id of the piece that was thrown.
*/
public UUID getPieceId() {
return pieceId;
}

19
Projekte/mdga/model/src/main/java/pp/mdga/notification/TskSelectNotification.java
View File

@@ -5,16 +5,27 @@
/**
* Class TskSelectNotification
*/
public class TskSelectNotification extends Notification{
public class TskSelectNotification extends Notification {
/**
* The color of the player that is in the game.
*/
private final Color color;
/**
* The name of the player that is in the game.
*/
private final String name;
/**
* Indicates if the select notification affects the own user.
*/
private final boolean isSelf;
/**
* Constructor.
*
* @param color the color of the player that is in the game.
* @param name the name of the player that is in the game.
* @param name the name of the player that is in the game.
*/
public TskSelectNotification(Color color, String name, boolean isSelf) {
this.color = color;
@@ -24,6 +35,7 @@ public TskSelectNotification(Color color, String name, boolean isSelf) {
/**
* Get the color of the player that is in the game.
*
* @return the color of the player that is in the game.
*/
public Color getColor() {
@@ -32,6 +44,7 @@ public Color getColor() {
/**
* Get the name of the player that is in the game.
*
* @return the name of the player that is in the game.
*/
public String getName() {

17
Projekte/mdga/model/src/main/java/pp/mdga/notification/TskUnselectNotification.java
View File

@@ -2,20 +2,27 @@
import pp.mdga.game.Color;
public class TskUnselectNotification extends Notification{
private Color color;
/**
* Notification for unselecting a player
*/
public class TskUnselectNotification extends Notification {
/**
* The color of the player
*/
private final Color color;
/**
* Constructor
* @param color
*
* @param color the color of the player
*/
public TskUnselectNotification(Color color){
public TskUnselectNotification(Color color) {
this.color = color;
}
/**
* Get the color
*
* @return color
*/
public Color getColor() {

10
Projekte/mdga/model/src/main/java/pp/mdga/notification/WaitMoveNotification.java
View File

@@ -5,12 +5,15 @@
/**
* Notification to inform the player that he has to wait for the other player to move.
*/
public class WaitMoveNotification extends Notification{
private UUID pieceId;
public class WaitMoveNotification extends Notification {
/**
* The id of the piece that has to move.
*/
private final UUID pieceId;
/**
* Constructor.
*
* @param pieceId the id of the piece that has to move.
*/
public WaitMoveNotification(UUID pieceId) {
@@ -19,6 +22,7 @@ public WaitMoveNotification(UUID pieceId) {
/**
* Get the id of the piece that has to move.
*
* @return the id of the piece that has to move.
*/
public UUID getPieceId() {

24
Projekte/mdga/model/src/main/java/pp/mdga/server/ServerGameLogic.java
View File

@@ -25,10 +25,10 @@ public class ServerGameLogic implements ClientInterpreter {
* States
*/
private ServerState currentState;
private final ServerState lobbyState;
private final ServerState gameState;
private final ServerState interruptState;
private final ServerState ceremonyState;
private final LobbyState lobbyState;
private final GameState gameState;
private final InterruptState interruptState;
private final CeremonyState ceremonyState;
/**
* Constructor.
@@ -167,36 +167,36 @@ public ServerState getCurrentState() {
/**
* This method will be used to return lobbyState attribute of ServerGameLogic class.
*
* @return lobbyState as a ServerState object.
* @return lobbyState as a LobbyState object.
*/
public ServerState getLobbyState() {
public LobbyState getLobbyState() {
return this.lobbyState;
}
/**
* This method will be used to return gameState attribute of ServerGameLogic class.
*
* @return gameState as a ServerState object.
* @return gameState as a GameState object.
*/
public ServerState getGameState() {
public GameState getGameState() {
return this.gameState;
}
/**
* This method will be used to return interruptState attribute of ServerGameLogic class.
*
* @return interruptState as a ServerState object.
* @return interruptState as a InterruptState object.
*/
public ServerState getInterruptState() {
public InterruptState getInterruptState() {
return this.interruptState;
}
/**
* This method will be used to return ceremonyState attribute of ServerGameLogic class.
*
* @return ceremonyState as a ServerState object.
* @return ceremonyState as a CeremonyState object.
*/
public ServerState getCeremonyState() {
public CeremonyState getCeremonyState() {
return this.ceremonyState;
}

2
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/GameAutomatonState.java
View File

@@ -17,7 +17,7 @@ public abstract class GameAutomatonState extends ServerState {
* Constructs a server state of the specified game logic.
*
* @param gameAutomaton as the automaton of the game state as a GameState object.
* @param logic the game logic
* @param logic the game logic
*/
public GameAutomatonState(GameState gameAutomaton, ServerGameLogic logic) {
super(logic);

88
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/TurnState.java
View File

@@ -2,8 +2,23 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.GameState;
import pp.mdga.server.automaton.game.turn.*;
/**
* This class represents the turn state of the server state automaton.
* It will also be used as the turn automaton.
*/
public class TurnState extends GameAutomatonState {
/**
* Create TurnState states.
*/
private TurnAutomatonState currentState;
private final PowerCardState powerCardState;
private final PlayPowerCardState playPowerCardState;
private final RollDiceState rollDiceState;
private final ChoosePieceState choosePieceState;
private final MovePieceState movePieceState;
/**
* Constructs a server state of the specified game logic.
*
@@ -12,6 +27,11 @@ public class TurnState extends GameAutomatonState {
*/
public TurnState(GameState gameAutomaton, ServerGameLogic logic) {
super(gameAutomaton, logic);
this.powerCardState = new PowerCardState(this, logic);
this.playPowerCardState = new PlayPowerCardState(this, logic);
this.rollDiceState = new RollDiceState(this, logic);
this.choosePieceState = new ChoosePieceState(this, logic);
this.movePieceState = new MovePieceState(this, logic);
}
@Override
@@ -23,4 +43,72 @@ public void enter() {
public void exit() {
}
/**
* This method will be used to return currentState attribute of TurnState class.
*
* @return currentState as a TurnAutomatonState object.
*/
public TurnAutomatonState getCurrentState() {
return this.currentState;
}
/**
* This method will be used to return powerCardState attribute of TurnState class.
*
* @return powerCardState as a PowerCardState object.
*/
public PowerCardState getPowerCardState() {
return this.powerCardState;
}
/**
* This method will be used to return playPowerCardState attribute of TurnState class.
*
* @return playPowerState as a PlayPowerCardState object.
*/
public PlayPowerCardState getPlayPowerCardState() {
return this.playPowerCardState;
}
/**
* This method will be used to return rollDiceState attribute of TurnState class.
*
* @return rollDiceState as a RollDiceState object.
*/
public RollDiceState getRollDiceState() {
return this.rollDiceState;
}
/**
* This method will be used to return choosePieceState attribute of TurnState class.
*
* @return choosePieceState as a ChoosePieceState object.
*/
public ChoosePieceState getChoosePieceState() {
return this.choosePieceState;
}
/**
* This method will be used to return movePieceState attribute of TurnState class.
*
* @return movePieceState as a MovePieceState object.
*/
public MovePieceState getMovePieceState() {
return this.movePieceState;
}
/**
* This method will be used to set currentState attribute of TurnState class to the given state parameter.
* In Addition, the currentState will be exited, changed and entered.
*
* @param state as the new currentState attribute as a TurnAutomatonState object.
*/
public void setCurrentState(TurnAutomatonState state) {
if (this.currentState != null) {
this.currentState.exit();
}
this.currentState = state;
this.currentState.enter();
}
}

22
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/ChoosePieceState.java
View File

@@ -3,8 +3,24 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.TurnState;
public class ChoosePieceState extends TurnState {
public ChoosePieceState(ServerGameLogic logic) {
super(logic);
public class ChoosePieceState extends TurnAutomatonState {
/**
* Constructs a server state of the specified game logic.
*
* @param turnAutomaton as the automaton of the turn state as a GameState object.
* @param logic the game logic
*/
public ChoosePieceState(TurnState turnAutomaton, ServerGameLogic logic) {
super(turnAutomaton, logic);
}
@Override
public void enter() {
}
@Override
public void exit() {
}
}

23
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/MovePieceState.java
View File

@@ -3,8 +3,25 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.TurnState;
public class MovePieceState extends TurnState {
public MovePieceState(ServerGameLogic logic) {
super(logic);
public class MovePieceState extends TurnAutomatonState {
/**
* Constructs a server state of the specified game logic.
*
* @param turnAutomaton as the automaton of the turn state as a GameState object.
* @param logic the game logic
*/
public MovePieceState(TurnState turnAutomaton, ServerGameLogic logic) {
super(turnAutomaton, logic);
}
@Override
public void enter() {
}
@Override
public void exit() {
}
}

26
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/PlayPowerCardState.java Normal file
View File

@@ -0,0 +1,26 @@
package pp.mdga.server.automaton.game.turn;
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.TurnState;
public class PlayPowerCardState extends TurnAutomatonState {
/**
* Constructs a server state of the specified game logic.
*
* @param turnAutomaton as the automaton of the turn state as a GameState object.
* @param logic the game logic
*/
public PlayPowerCardState(TurnState turnAutomaton, ServerGameLogic logic) {
super(turnAutomaton, logic);
}
@Override
public void enter() {
}
@Override
public void exit() {
}
}

22
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/PowerCardState.java
View File

@@ -3,8 +3,24 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.TurnState;
public class PowerCardState extends TurnState {
public PowerCardState(ServerGameLogic logic) {
super(logic);
public class PowerCardState extends TurnAutomatonState {
/**
* Constructs a server state of the specified game logic.
*
* @param turnAutomaton as the automaton of the turn state as a GameState object.
* @param logic the game logic
*/
public PowerCardState(TurnState turnAutomaton, ServerGameLogic logic) {
super(turnAutomaton, logic);
}
@Override
public void enter() {
}
@Override
public void exit() {
}
}

22
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/RollDiceState.java
View File

@@ -3,8 +3,24 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.TurnState;
public class RollDiceState extends TurnState {
public RollDiceState(ServerGameLogic logic) {
super(logic);
public class RollDiceState extends TurnAutomatonState {
/**
* Constructs a server state of the specified game logic.
*
* @param turnAutomaton as the automaton of the turn state as a GameState object.
* @param logic the game logic
*/
public RollDiceState(TurnState turnAutomaton, ServerGameLogic logic) {
super(turnAutomaton, logic);
}
@Override
public void enter() {
}
@Override
public void exit() {
}
}

23
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/TurnAutomatonState.java Normal file
View File

@@ -0,0 +1,23 @@
package pp.mdga.server.automaton.game.turn;
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.ServerState;
import pp.mdga.server.automaton.game.TurnState;
public abstract class TurnAutomatonState extends ServerState {
/**
* Create TurnAutomatonState attributes.
*/
protected final TurnState turnAutomaton;
/**
* Constructs a server state of the specified game logic.
*
* @param turnAutomaton as the automaton of the turn state as a GameState object.
* @param logic the game logic
*/
public TurnAutomatonState(TurnState turnAutomaton, ServerGameLogic logic) {
super(logic);
this.turnAutomaton = turnAutomaton;
}
}

22
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/ChoosePieceAutomatonState.java Normal file
View File

@@ -0,0 +1,22 @@
package pp.mdga.server.automaton.game.turn.choosepiece;
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.ServerState;
import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public abstract class ChoosePieceAutomatonState extends ServerState {
/**
* Create ChoosePieceAutomatonState attributes.
*/
protected final ChoosePieceState choosePieceAutomaton;
/**
* Constructs a server state of the specified game logic.
*
* @param logic the game logic
*/
public ChoosePieceAutomatonState(ChoosePieceState choosePieceAutomaton, ServerGameLogic logic) {
super(logic);
this.choosePieceAutomaton = choosePieceAutomaton;
}
}

5
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/NoPieceState.java
View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public class NoPieceState extends ChoosePieceState {
public NoPieceState(ServerGameLogic logic) {
super(logic);
}
public class NoPieceState {
}

5
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/NoTurnState.java
View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public class NoTurnState extends ChoosePieceState {
public NoTurnState(ServerGameLogic logic) {
super(logic);
}
public class NoTurnState {
}

6
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/SelectPieceState.java
View File

@@ -3,8 +3,6 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public class SelectPieceState extends ChoosePieceState {
public SelectPieceState(ServerGameLogic logic) {
super(logic);
}
public class SelectPieceState {
}

5
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/StartPieceState.java
View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public class StartPieceState extends ChoosePieceState {
public StartPieceState(ServerGameLogic logic) {
super(logic);
}
public class StartPieceState {
}

5
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/WaitingPieceState.java
View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public class WaitingPieceState extends ChoosePieceState {
public WaitingPieceState(ServerGameLogic logic) {
super(logic);
}
public class WaitingPieceState {
}

5
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/rolldice/FirstRollStateState.java
View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.RollDiceState;
public class FirstRollStateState extends RollDiceState {
public FirstRollStateState(ServerGameLogic logic) {
super(logic);
}
public class FirstRollStateState {
}

22
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/rolldice/RollDiceAutomatonState.java Normal file
View File

@@ -0,0 +1,22 @@
package pp.mdga.server.automaton.game.turn.rolldice;
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.ServerState;
import pp.mdga.server.automaton.game.turn.RollDiceState;
public abstract class RollDiceAutomatonState extends ServerState {
/**
* Create RollDiceAutomatonState attributes.
*/
protected final RollDiceState rollDiceAutomaton;
/**
* Constructs a server state of the specified game logic.
*
* @param logic the game logic
*/
public RollDiceAutomatonState(RollDiceState rollDiceAutomaton, ServerGameLogic logic) {
super(logic);
this.rollDiceAutomaton = rollDiceAutomaton;
}
}

5
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/rolldice/SecondRollState.java
View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.RollDiceState;
public class SecondRollState extends RollDiceState {
public SecondRollState(ServerGameLogic logic) {
super(logic);
}
public class SecondRollState {
}

5
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/rolldice/ThirdRollState.java
View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.RollDiceState;
public class ThirdRollState extends RollDiceState {
public ThirdRollState(ServerGameLogic logic) {
super(logic);
}
public class ThirdRollState {
}