jonah/wizard
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Client- und Server-Nachrichten verbessert(#9)

Browse Source
This commit is contained in:
Johannes-coderer
2021-11-05 12:43:58 +01:00
parent 7f84889a02
commit ceb4c49e01
61 changed files with 202 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wizard-core/src/main/java/eu/jonahbauer/wizard/core/CLI.java
View File

@@ -3,10 +3,10 @@ package eu.jonahbauer.wizard.core;
import eu.jonahbauer.wizard.common.messages.player.PickTrumpMessage;
import eu.jonahbauer.wizard.common.messages.player.PlayCardMessage;
import eu.jonahbauer.wizard.common.messages.player.PredictMessage;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.machine.Game;
import eu.jonahbauer.wizard.core.messages.Observer;
import eu.jonahbauer.wizard.core.model.Configuration;
import eu.jonahbauer.wizard.core.model.GameConfiguration;
import eu.jonahbauer.wizard.core.model.Configurations;
import java.util.List;
@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
public class CLI {
public static void main(String[] args) {
Configuration config = Configurations.DEFAULT.withTimeout(0);
GameConfiguration config = Configurations.DEFAULT.withTimeout(0);
Observer observer = (player, msg) -> System.out.println(msg);
Game game = new Game(config, observer);
var players = List.of(

8
wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/Game.java
View File

@@ -7,7 +7,7 @@ import eu.jonahbauer.wizard.core.messages.Observer;
import eu.jonahbauer.wizard.common.messages.observer.ObserverMessage;
import eu.jonahbauer.wizard.common.messages.observer.StateMessage;
import eu.jonahbauer.wizard.common.messages.player.PlayerMessage;
import eu.jonahbauer.wizard.core.model.Configuration;
import eu.jonahbauer.wizard.core.model.GameConfiguration;
import eu.jonahbauer.wizard.core.util.Util;
import lombok.Getter;
@@ -22,16 +22,16 @@ public final class Game extends Context<GameState, Game> {
@Getter
private final Random random;
@Getter
private final Configuration config;
private final GameConfiguration config;
private final Observer observer;
public Game(Configuration config, Observer observer) {
public Game(GameConfiguration config, Observer observer) {
this.random = new Random();
this.config = config;
this.observer = observer;
}
public Game(long seed, Configuration config, Observer observer) {
public Game(long seed, GameConfiguration config, Observer observer) {
this.random = new Random(seed);
this.config = config;
this.observer = observer;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/GameData.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.machine.states;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.util.Pair;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/round/Dealing.java
View File

@@ -1,7 +1,7 @@
package eu.jonahbauer.wizard.core.machine.states.round;
import eu.jonahbauer.wizard.common.messages.observer.HandMessage;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.machine.Game;
import eu.jonahbauer.wizard.core.machine.states.GameData;
import eu.jonahbauer.wizard.core.model.deck.Deck;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/round/DeterminingTrump.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.machine.states.round;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.machine.states.GameData;
import eu.jonahbauer.wizard.core.machine.Game;
import eu.jonahbauer.wizard.common.messages.observer.HandMessage;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/trick/FinishingTrick.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.machine.states.trick;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.machine.states.GameData;
import eu.jonahbauer.wizard.core.machine.Game;
import eu.jonahbauer.wizard.core.machine.states.InvalidDataException;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/trick/Juggling.java
View File

@@ -4,7 +4,7 @@ import eu.jonahbauer.wizard.common.messages.observer.HandMessage;
import eu.jonahbauer.wizard.common.messages.observer.UserInputMessage;
import eu.jonahbauer.wizard.common.messages.player.JuggleMessage;
import eu.jonahbauer.wizard.common.messages.player.PlayerMessage;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.machine.Game;
import eu.jonahbauer.wizard.core.machine.states.GameData;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/trick/PlayingCard.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.machine.states.trick;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.machine.states.GameData;
import eu.jonahbauer.wizard.core.machine.Game;
import eu.jonahbauer.wizard.core.machine.states.InvalidDataException;

23
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/Configurations.java
View File

@@ -1,5 +1,6 @@
package eu.jonahbauer.wizard.core.model;
import eu.jonahbauer.wizard.common.model.Configuration;
import eu.jonahbauer.wizard.core.model.deck.Decks;
import lombok.experimental.UtilityClass;
import org.jetbrains.annotations.Contract;
@@ -12,55 +13,55 @@ import java.util.NoSuchElementException;
@UtilityClass
public class Configurations {
private static final Map<String, Configuration> CONFIGURATIONS = new HashMap<>();
private static final Map<Configuration, GameConfiguration> CONFIGURATIONS = new HashMap<>();
public static final Configuration DEFAULT = register("DEFAULT", new Configuration(
public static final GameConfiguration DEFAULT = register(Configuration.DEFAULT, new GameConfiguration(
Decks.DEFAULT,
true,
10 * 60 * 1000
));
public static final Configuration DEFAULT_PM1 = register("DEFAULT_PM1", new Configuration(
public static final GameConfiguration DEFAULT_PM1 = register(Configuration.DEFAULT_PM1, new GameConfiguration(
Decks.DEFAULT,
false,
10 * 60 * 1000
));
public static final Configuration ANNIVERSARY_2016 = register("ANNIVERSARY_2016", new Configuration(
public static final GameConfiguration ANNIVERSARY_2016 = register(Configuration.ANNIVERSARY_2016, new GameConfiguration(
Decks.ANNIVERSARY_2016,
true,
10 * 60 * 1000
));
public static final Configuration ANNIVERSARY_2016_PM1 = register("ANNIVERSARY_2016_PM1", new Configuration(
public static final GameConfiguration ANNIVERSARY_2016_PM1 = register(Configuration.ANNIVERSARY_2016_PM1, new GameConfiguration(
Decks.ANNIVERSARY_2016,
false,
10 * 60 * 1000
));
public static final Configuration ANNIVERSARY_2021 = register("ANNIVERSARY_2021", new Configuration(
public static final GameConfiguration ANNIVERSARY_2021 = register(Configuration.ANNIVERSARY_2021, new GameConfiguration(
Decks.ANNIVERSARY_2021,
true,
10 * 60 * 1000
));
public static final Configuration ANNIVERSARY_2021_PM1 = register("ANNIVERSARY_2021_PM1", new Configuration(
public static final GameConfiguration ANNIVERSARY_2021_PM1 = register(Configuration.ANNIVERSARY_2021_PM1, new GameConfiguration(
Decks.ANNIVERSARY_2021,
false,
10 * 60 * 1000
));
@Contract("_,_ -> param2")
private static Configuration register(@NotNull String name, @NotNull Configuration configuration) {
if (CONFIGURATIONS.putIfAbsent(name.toUpperCase(Locale.ROOT), configuration) != null) {
private static GameConfiguration register(@NotNull Configuration name, @NotNull GameConfiguration configuration) {
if (CONFIGURATIONS.putIfAbsent(name, configuration) != null) {
throw new IllegalArgumentException("Name already taken.");
}
return configuration;
}
@NotNull
public static Configuration get(@NotNull String name) {
var out = CONFIGURATIONS.get(name.toUpperCase(Locale.ROOT));
public static GameConfiguration get(@NotNull Configuration name) {
var out = CONFIGURATIONS.get(name);
if (out == null) throw new NoSuchElementException("Configuration with name '" + name + "' does not exist.");
return out;
}

4
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/Configuration.java → wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/GameConfiguration.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Value;
@@ -12,7 +12,7 @@ import java.util.Set;
@Value
@Accessors(fluent = true)
@AllArgsConstructor(access = AccessLevel.PACKAGE)
public class Configuration {
public class GameConfiguration {
Set<Card> cards;
boolean allowExactPredictions;
@With long timeout;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/card/CardUtils.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model.card;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.util.Pair;
import lombok.experimental.UtilityClass;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/card/ChangelingJesterCard.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model.card;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.util.Pair;
import java.util.List;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/card/ChangelingWizardCard.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model.card;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.util.Pair;
import java.util.List;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/card/ColoredCard.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model.card;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.util.Pair;
import lombok.Getter;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/card/ColoredSubcard.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model.card;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.util.Pair;
import lombok.Getter;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/card/GameCard.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model.card;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.util.Pair;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/card/GameCards.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model.card;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import lombok.experimental.UtilityClass;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/card/JesterCard.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model.card;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
public class JesterCard extends SimpleCard {
public JesterCard(Card card) {

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/card/NonPlayableCard.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model.card;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.util.Pair;
import lombok.Getter;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/card/SimpleCard.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model.card;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import lombok.Getter;
@Getter

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/card/WizardCard.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model.card;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
public class WizardCard extends SimpleCard {
public WizardCard(Card card) {

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/deck/Deck.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model.deck;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.Unmodifiable;

2
wizard-core/src/main/java/eu/jonahbauer/wizard/core/model/deck/Decks.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model.deck;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import lombok.experimental.UtilityClass;
import java.util.*;

2
wizard-core/src/test/java/eu/jonahbauer/wizard/core/machine/MessageQueue.java
View File

@@ -3,7 +3,7 @@ package eu.jonahbauer.wizard.core.machine;
import eu.jonahbauer.wizard.common.messages.observer.ObserverMessage;
import eu.jonahbauer.wizard.common.messages.observer.UserInputMessage;
import eu.jonahbauer.wizard.common.messages.player.*;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.messages.Observer;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

6
wizard-core/src/test/java/eu/jonahbauer/wizard/core/machine/states/round/DeterminingTrumpTest.java
View File

@@ -4,11 +4,11 @@ import eu.jonahbauer.wizard.common.messages.observer.HandMessage;
import eu.jonahbauer.wizard.common.messages.observer.StateMessage;
import eu.jonahbauer.wizard.common.messages.observer.TrumpMessage;
import eu.jonahbauer.wizard.common.messages.observer.UserInputMessage;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.machine.Game;
import eu.jonahbauer.wizard.core.machine.MessageQueue;
import eu.jonahbauer.wizard.core.machine.states.GameData;
import eu.jonahbauer.wizard.core.model.Configuration;
import eu.jonahbauer.wizard.core.model.GameConfiguration;
import eu.jonahbauer.wizard.core.model.Configurations;
import lombok.SneakyThrows;
import org.junit.jupiter.api.Test;
@@ -35,7 +35,7 @@ public class DeterminingTrumpTest {
@SneakyThrows
@SuppressWarnings("SameParameterValue")
private Game performTest(Configuration configuration, int round, Map<UUID, List<Card>> hands, Card trumpCard, MessageQueue queue) {
private Game performTest(GameConfiguration configuration, int round, Map<UUID, List<Card>> hands, Card trumpCard, MessageQueue queue) {
Game game = spy(new Game(configuration, queue));
doFinish().when(game).transition(any(), any(Predicting.class));
queue.setGame(game);

6
wizard-core/src/test/java/eu/jonahbauer/wizard/core/machine/states/round/PredictingTest.java
View File

@@ -3,13 +3,13 @@ package eu.jonahbauer.wizard.core.machine.states.round;
import eu.jonahbauer.wizard.common.messages.observer.PredictionMessage;
import eu.jonahbauer.wizard.common.messages.observer.StateMessage;
import eu.jonahbauer.wizard.common.messages.observer.UserInputMessage;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.machine.Game;
import eu.jonahbauer.wizard.core.machine.GameTestUtils;
import eu.jonahbauer.wizard.core.machine.MessageQueue;
import eu.jonahbauer.wizard.core.machine.states.GameData;
import eu.jonahbauer.wizard.core.machine.states.trick.StartingTrick;
import eu.jonahbauer.wizard.core.model.Configuration;
import eu.jonahbauer.wizard.core.model.GameConfiguration;
import eu.jonahbauer.wizard.core.model.Configurations;
import lombok.SneakyThrows;
import org.junit.jupiter.api.Test;
@@ -37,7 +37,7 @@ public class PredictingTest {
@SneakyThrows
@SuppressWarnings("SameParameterValue")
private Game performTest(Configuration configuration, int round, MessageQueue queue) {
private Game performTest(GameConfiguration configuration, int round, MessageQueue queue) {
Map<UUID, List<Card>> hands = Map.of(
players[0], Collections.nCopies(round + 1, Card.HIDDEN),
players[1], Collections.nCopies(round + 1, Card.HIDDEN),

6
wizard-core/src/test/java/eu/jonahbauer/wizard/core/machine/states/round/RoundTest.java
View File

@@ -1,11 +1,11 @@
package eu.jonahbauer.wizard.core.machine.states.round;
import eu.jonahbauer.wizard.common.messages.observer.*;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.machine.Game;
import eu.jonahbauer.wizard.core.machine.MessageQueue;
import eu.jonahbauer.wizard.core.machine.states.GameData;
import eu.jonahbauer.wizard.core.model.Configuration;
import eu.jonahbauer.wizard.core.model.GameConfiguration;
import eu.jonahbauer.wizard.core.model.Configurations;
import lombok.SneakyThrows;
import org.junit.jupiter.api.Test;
@@ -32,7 +32,7 @@ public class RoundTest {
};
@SneakyThrows
private Game performTest(long seed, Configuration configuration, int round, MessageQueue queue) {
private Game performTest(long seed, GameConfiguration configuration, int round, MessageQueue queue) {
Game game = spy(new Game(seed, configuration, queue));
doFinish().when(game).transition(any(), any(StartingRound.class));
queue.setGame(game);

6
wizard-core/src/test/java/eu/jonahbauer/wizard/core/machine/states/trick/TrickTest.java
View File

@@ -1,13 +1,13 @@
package eu.jonahbauer.wizard.core.machine.states.trick;
import eu.jonahbauer.wizard.common.messages.observer.*;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.machine.Game;
import eu.jonahbauer.wizard.core.machine.GameTestUtils;
import eu.jonahbauer.wizard.core.machine.MessageQueue;
import eu.jonahbauer.wizard.core.machine.states.GameData;
import eu.jonahbauer.wizard.core.machine.states.round.FinishingRound;
import eu.jonahbauer.wizard.core.model.Configuration;
import eu.jonahbauer.wizard.core.model.GameConfiguration;
import eu.jonahbauer.wizard.core.model.Configurations;
import lombok.SneakyThrows;
import org.junit.jupiter.api.Test;
@@ -34,7 +34,7 @@ public class TrickTest {
@SneakyThrows
@SuppressWarnings("SameParameterValue")
private Game performTest(Configuration configuration, int round, int trick, Map<UUID, List<Card>> hands, Card.Suit trump, MessageQueue queue) {
private Game performTest(GameConfiguration configuration, int round, int trick, Map<UUID, List<Card>> hands, Card.Suit trump, MessageQueue queue) {
Game game = spy(new Game(configuration, queue));
doFinish().when(game).transition(any(), any(StartingTrick.class));
doFinish().when(game).transition(any(), any(FinishingRound.class));

2
wizard-core/src/test/java/eu/jonahbauer/wizard/core/model/card/CardUtilsTest.java
View File

@@ -1,6 +1,6 @@
package eu.jonahbauer.wizard.core.model.card;
import eu.jonahbauer.wizard.common.model.card.Card;
import eu.jonahbauer.wizard.common.model.Card;
import eu.jonahbauer.wizard.core.util.Pair;
import org.junit.jupiter.api.Test;