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

Updated server states.

Browse Source 
Updated server stats by adding the logger to all states. In Addition, new joined clients should be updated correctly.
This commit is contained in:
Daniel Grigencha
2024-12-01 23:06:02 +01:00
parent 9cb7a156bb
commit f484a4abc8
22 changed files with 337 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,6 @@ public void enter() {
*/
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited CeremonyState state.");
}
}

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

@@ -55,7 +55,7 @@ public void enter() {
*/
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited GameState state.");
}
/**

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

@@ -41,7 +41,7 @@ public void enter() {
*/
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited InterruptState state.");
}
/**

6
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java
View File

@@ -40,7 +40,7 @@ public void enter() {
*/
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited LobbyState state.");
}
/**
@@ -55,7 +55,9 @@ public void received(JoinedLobbyMessage msg, int from) {
Player player = new Player(msg.getName());
player.setColor(Color.getColorByIndex(this.logic.getGame().getPlayers().size()));
this.logic.getGame().addPlayer(from, player);
this.logic.getServerSender().broadcast(new LobbyPlayerJoinedMessage(from, player));
for (Map.Entry<Integer, Player> entry: this.logic.getGame().getPlayers().entrySet()) {
this.logic.getServerSender().broadcast(new LobbyPlayerJoinedMessage(entry.getKey(), entry.getValue()));
}
}
/**

9
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/AnimationState.java
View File

@@ -10,6 +10,11 @@
*
*/
public class AnimationState extends GameAutomatonState {
/**
* Create FirstRollState constants.
*/
private static final System.Logger LOGGER = System.getLogger(AnimationState.class.getName());
/**
* Constructs a server state of the specified game logic.
*
@@ -22,12 +27,12 @@ public AnimationState(GameState gameAutomaton, ServerGameLogic logic) {
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered AnimationState state.");
}
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited AnimationState state.");
}
/**

10
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/DetermineStartPlayerState.java
View File

@@ -5,6 +5,7 @@
import pp.mdga.message.server.DieMessage;
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.GameState;
import pp.mdga.server.automaton.game.turn.RollDiceState;
import java.util.HashMap;
import java.util.Map;
@@ -12,6 +13,11 @@
import java.util.stream.Collectors;
public class DetermineStartPlayerState extends GameAutomatonState {
/**
* Create FirstRollState constants.
*/
private static final System.Logger LOGGER = System.getLogger(DetermineStartPlayerState.class.getName());
/**
* Create DetermineStartPlayerState attributes.
*/
@@ -29,12 +35,12 @@ public DetermineStartPlayerState(GameState gameAutomaton, ServerGameLogic logic)
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered DetermineStartPlayerState state.");
}
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited DetermineStartPlayerState state.");
}
/**

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

@@ -9,6 +9,10 @@
* It will also be used as the turn automaton.
*/
public class TurnState extends GameAutomatonState {
/**
* Create FirstRollState constants.
*/
private static final System.Logger LOGGER = System.getLogger(TurnState.class.getName());
/**
* Create TurnState states.
*/
@@ -36,12 +40,12 @@ public TurnState(GameState gameAutomaton, ServerGameLogic logic) {
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered TurnState state.");
}
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited TurnState state.");
}
/**

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

@@ -4,6 +4,11 @@
import pp.mdga.server.automaton.game.TurnState;
public class ChoosePieceState extends TurnAutomatonState {
/**
* Create LobbyState constants.
*/
private static final System.Logger LOGGER = System.getLogger(ChoosePieceState.class.getName());
/**
* Constructs a server state of the specified game logic.
*
@@ -16,11 +21,11 @@ public ChoosePieceState(TurnState turnAutomaton, ServerGameLogic logic) {
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited ChoosePieceState state.");
}
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered ChoosePieceState state.");
}
}

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

@@ -4,6 +4,10 @@
import pp.mdga.server.automaton.game.TurnState;
public class MovePieceState extends TurnAutomatonState {
/**
* Create LobbyState constants.
*/
private static final System.Logger LOGGER = System.getLogger(MovePieceState.class.getName());
/**
* Constructs a server state of the specified game logic.
@@ -17,11 +21,11 @@ public MovePieceState(TurnState turnAutomaton, ServerGameLogic logic) {
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered MovePieceState state.");
}
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited MovePieceState state.");
}
}

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

@@ -1,9 +1,15 @@
package pp.mdga.server.automaton.game.turn;
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.AnimationState;
import pp.mdga.server.automaton.game.TurnState;
public class PlayPowerCardState extends TurnAutomatonState {
/**
* Create FirstRollState constants.
*/
private static final System.Logger LOGGER = System.getLogger(PlayPowerCardState.class.getName());
/**
* Constructs a server state of the specified game logic.
*
@@ -16,11 +22,11 @@ public PlayPowerCardState(TurnState turnAutomaton, ServerGameLogic logic) {
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered PlayPowerCardState state.");
}
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited PlayPowerCardState state.");
}
}

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

@@ -1,9 +1,15 @@
package pp.mdga.server.automaton.game.turn;
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.AnimationState;
import pp.mdga.server.automaton.game.TurnState;
public class PowerCardState extends TurnAutomatonState {
/**
* Create FirstRollState constants.
*/
private static final System.Logger LOGGER = System.getLogger(PowerCardState.class.getName());
/**
* Constructs a server state of the specified game logic.
*
@@ -16,11 +22,11 @@ public PowerCardState(TurnState turnAutomaton, ServerGameLogic logic) {
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited PowerCardState state.");
}
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered PowerCardState state.");
}
}

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

@@ -2,8 +2,25 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.TurnState;
import pp.mdga.server.automaton.game.turn.rolldice.FirstRollState;
import pp.mdga.server.automaton.game.turn.rolldice.RollDiceAutomatonState;
import pp.mdga.server.automaton.game.turn.rolldice.SecondRollState;
import pp.mdga.server.automaton.game.turn.rolldice.ThirdRollState;
public class RollDiceState extends TurnAutomatonState {
/**
* Create FirstRollState constants.
*/
private static final System.Logger LOGGER = System.getLogger(RollDiceState.class.getName());
/**
* Create RollDiceState attributes.
*/
private RollDiceAutomatonState currentState;
private final FirstRollState firstRollState;
private final SecondRollState secondRollState;
private final ThirdRollState thirdRollState;
/**
* Constructs a server state of the specified game logic.
*
@@ -12,15 +29,68 @@ public class RollDiceState extends TurnAutomatonState {
*/
public RollDiceState(TurnState turnAutomaton, ServerGameLogic logic) {
super(turnAutomaton, logic);
this.firstRollState = new FirstRollState(this, logic);
this.secondRollState = new SecondRollState(this, logic);
this.thirdRollState = new ThirdRollState(this, logic);
}
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered RollDiceState state.");
}
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited RollDiceState state.");
}
/**
* This method will be used to return currentState attribute of RollDiceState class.
*
* @return currentState as a RollDiceAutomatonState object.
*/
public RollDiceAutomatonState getCurrentState() {
return this.currentState;
}
/**
* This method will be used to return firstRollState attribute of RollDiceState class.
*
* @return firstRollState as a FirstRollState object.
*/
public FirstRollState getFirstRollStateState() {
return this.firstRollState;
}
/**
* This method will be used to return secondRollState attribute of RollDiceState class.
*
* @return secondRollState as a SecondRollState object.
*/
public SecondRollState getSecondRollState() {
return this.secondRollState;
}
/**
* This method will be used to return currentState attribute of RollDiceState class.
*
* @return thirdRollState as a ThirdRollState object.
*/
public ThirdRollState getThirdRollState() {
return this.thirdRollState;
}
/**
* This method will be used to set currentState attribute of RollDiceState 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 RollDiceAutomatonState object.
*/
public void setCurrentState(RollDiceAutomatonState state) {
if (this.currentState != null) {
this.currentState.exit();
}
this.currentState = state;
this.currentState.enter();
}
}

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

@@ -13,6 +13,7 @@ public abstract class ChoosePieceAutomatonState extends ServerState {
/**
* Constructs a server state of the specified game logic.
*
* @param choosePieceAutomaton as the automaton of the choose piece state as a ChoosePieceState object.
* @param logic the game logic
*/
public ChoosePieceAutomatonState(ChoosePieceState choosePieceAutomaton, ServerGameLogic logic) {

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

@@ -3,5 +3,35 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public class NoPieceState {
public class NoPieceState extends ChoosePieceAutomatonState {
/**
* Create FirstRollState constants.
*/
private static final System.Logger LOGGER = System.getLogger(NoPieceState.class.getName());
/**
* Constructs a server state of the specified game logic.
*
* @param choosePieceAutomaton as the automaton of the choose piece state as a ChoosePieceState object.
* @param logic the game logic
*/
public NoPieceState(ChoosePieceState choosePieceAutomaton, ServerGameLogic logic) {
super(choosePieceAutomaton, logic);
}
/**
* This method will be used whenever this state will be entered.
*/
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered NoPieceState state.");
}
/**
* This method will be used whenever this state will be exited.
*/
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited NoPieceState state.");
}
}

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

@@ -3,5 +3,35 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public class NoTurnState {
public class NoTurnState extends ChoosePieceAutomatonState {
/**
* Create FirstRollState constants.
*/
private static final System.Logger LOGGER = System.getLogger(NoTurnState.class.getName());
/**
* Constructs a server state of the specified game logic.
*
* @param choosePieceAutomaton as the automaton of the choose piece state as a ChoosePieceState object.
* @param logic the game logic
*/
public NoTurnState(ChoosePieceState choosePieceAutomaton, ServerGameLogic logic) {
super(choosePieceAutomaton, logic);
}
/**
* This method will be used whenever this state will be entered.
*/
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered NoTurnState state.");
}
/**
* This method will be used whenever this state will be exited.
*/
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited NoTurnState state.");
}
}

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

@@ -3,6 +3,35 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public class SelectPieceState {
public class SelectPieceState extends ChoosePieceAutomatonState {
/**
* Create FirstRollState constants.
*/
private static final System.Logger LOGGER = System.getLogger(SelectPieceState.class.getName());
/**
* Constructs a server state of the specified game logic.
*
* @param choosePieceAutomaton as the automaton of the choose piece state as a ChoosePieceState object.
* @param logic the game logic
*/
public SelectPieceState(ChoosePieceState choosePieceAutomaton, ServerGameLogic logic) {
super(choosePieceAutomaton, logic);
}
/**
* This method will be used whenever this state will be entered.
*/
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered SelectPieceState state.");
}
/**
* This method will be used whenever this state will be exited.
*/
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited SelectPieceState state.");
}
}

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

@@ -3,5 +3,35 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public class StartPieceState {
public class StartPieceState extends ChoosePieceAutomatonState {
/**
* Create FirstRollState constants.
*/
private static final System.Logger LOGGER = System.getLogger(StartPieceState.class.getName());
/**
* Constructs a server state of the specified game logic.
*
* @param choosePieceAutomaton as the automaton of the choose piece state as a ChoosePieceState object.
* @param logic the game logic
*/
public StartPieceState(ChoosePieceState choosePieceAutomaton, ServerGameLogic logic) {
super(choosePieceAutomaton, logic);
}
/**
* This method will be used whenever this state will be entered.
*/
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited StartPieceState state.");
}
/**
* This method will be used whenever this state will be exited.
*/
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered StartPieceState state.");
}
}

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

@@ -2,6 +2,37 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState;
import pp.mdga.server.automaton.game.turn.rolldice.FirstRollState;
public class WaitingPieceState {
public class WaitingPieceState extends ChoosePieceAutomatonState {
/**
* Create FirstRollState constants.
*/
private static final System.Logger LOGGER = System.getLogger(WaitingPieceState.class.getName());
/**
* Constructs a server state of the specified game logic.
*
* @param choosePieceAutomaton as the automaton of the choose piece state as a ChoosePieceState object.
* @param logic the game logic
*/
public WaitingPieceState(ChoosePieceState choosePieceAutomaton, ServerGameLogic logic) {
super(choosePieceAutomaton, logic);
}
/**
* This method will be used whenever this state will be entered.
*/
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered WaitingPieceState state.");
}
/**
* This method will be used whenever this state will be exited.
*/
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited WaitingPieceState state.");
}
}

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

@@ -26,6 +26,6 @@ public void enter() {
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited FirstRollStatte state.");
LOGGER.log(System.Logger.Level.DEBUG, "Exited FirstRollState state.");
}
}

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

@@ -13,7 +13,8 @@ public abstract class RollDiceAutomatonState extends ServerState {
/**
* Constructs a server state of the specified game logic.
*
* @param logic the game logic
* @param rollDiceAutomaton as the automaton of the roll dice state as a RollDiceState object.
* @param logic the game logic
*/
public RollDiceAutomatonState(RollDiceState rollDiceAutomaton, ServerGameLogic logic) {
super(logic);

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

@@ -3,5 +3,29 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.RollDiceState;
public class SecondRollState {
public class SecondRollState extends RollDiceAutomatonState {
/**
* Create FirstRollState constants.
*/
private static final System.Logger LOGGER = System.getLogger(SecondRollState.class.getName());
/**
* Constructs a server state of the specified game logic.
*
* @param rollDiceAutomaton as the automaton of the roll dice state as a RollDiceState object.
* @param logic the game logic
*/
public SecondRollState(RollDiceState rollDiceAutomaton, ServerGameLogic logic) {
super(rollDiceAutomaton, logic);
}
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered SecondRollState state.");
}
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited SecondRollState state.");
}
}

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

@@ -3,5 +3,29 @@
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.RollDiceState;
public class ThirdRollState {
public class ThirdRollState extends RollDiceAutomatonState {
/**
* Create FirstRollState constants.
*/
private static final System.Logger LOGGER = System.getLogger(ThirdRollState.class.getName());
/**
* Constructs a server state of the specified game logic.
*
* @param rollDiceAutomaton as the automaton of the roll dice state as a RollDiceState object.
* @param logic the game logic
*/
public ThirdRollState(RollDiceState rollDiceAutomaton, ServerGameLogic logic) {
super(rollDiceAutomaton, logic);
}
@Override
public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited ThirdRollState state.");
}
@Override
public void exit() {
LOGGER.log(System.Logger.Level.DEBUG, "Entered ThirdRollState state.");
}
}