fixed server build script

added menu

wizard-client/wizard-client-cli/src/main/java/eu/jonahbauer/wizard/client/cli/commands/ShowCommand.java

@@ -2,8 +2,8 @@ package eu.jonahbauer.wizard.client.cli.commands;
 
 import eu.jonahbauer.wizard.client.cli.Client;
 import eu.jonahbauer.wizard.client.cli.state.Game;
+import eu.jonahbauer.wizard.client.cli.util.Pair;
 import eu.jonahbauer.wizard.common.model.Card;
-import eu.jonahbauer.wizard.common.util.Pair;
 
 import java.util.List;
 import java.util.Map;

wizard-client/wizard-client-cli/src/main/java/eu/jonahbauer/wizard/client/cli/state/Game.java

@@ -2,6 +2,7 @@ package eu.jonahbauer.wizard.client.cli.state;
 
 import eu.jonahbauer.wizard.client.cli.Client;
 import eu.jonahbauer.wizard.client.cli.commands.GameCommand;
+import eu.jonahbauer.wizard.client.cli.util.Pair;
 import eu.jonahbauer.wizard.common.messages.client.InteractionMessage;
 import eu.jonahbauer.wizard.common.messages.data.PlayerData;
 import eu.jonahbauer.wizard.common.messages.observer.*;
@@ -11,7 +12,6 @@ import eu.jonahbauer.wizard.common.messages.server.GameMessage;
 import eu.jonahbauer.wizard.common.messages.server.NackMessage;
 import eu.jonahbauer.wizard.common.messages.server.ServerMessage;
 import eu.jonahbauer.wizard.common.model.Card;
-import eu.jonahbauer.wizard.common.util.Pair;
 import lombok.Getter;
 
 import java.time.Instant;

wizard-client/wizard-client-cli/src/main/java/eu/jonahbauer/wizard/client/cli/util/Pair.java

@@ -0,0 +1,24 @@
+package eu.jonahbauer.wizard.client.cli.util;
+
+import java.util.Map;
+
+public record Pair<F,S>(F first, S second) implements Map.Entry<F, S> {
+    public static <F,S> Pair<F,S> of(F first, S second) {
+        return new Pair<>(first, second);
+    }
+
+    @Override
+    public F getKey() {
+        return first();
+    }
+
+    @Override
+    public S getValue() {
+        return second();
+    }
+
+    @Override
+    public S setValue(S value) {
+        throw new UnsupportedOperationException();
+    }
+}

wizard-client/wizard-client-cli/src/main/java/eu/jonahbauer/wizard/client/cli/util/StateAwareFactory.java

@@ -1,5 +1,6 @@
 package eu.jonahbauer.wizard.client.cli.util;
 
+
 import eu.jonahbauer.wizard.client.cli.Client;
 import eu.jonahbauer.wizard.client.cli.state.ClientState;
 import picocli.CommandLine;

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/WizardGame.java

@@ -9,7 +9,6 @@ import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import eu.jonahbauer.wizard.client.libgdx.screens.MainMenuScreen;
 import eu.jonahbauer.wizard.client.libgdx.util.SavedData;
-import eu.jonahbauer.wizard.client.libgdx.util.SoundManager;
 import eu.jonahbauer.wizard.client.libgdx.util.WizardAssetManager;
 import lombok.Getter;
 
@@ -20,8 +19,6 @@ public class WizardGame extends Game {
 
 	public SpriteBatch batch;
 	public WizardAssetManager assets;
-	public SoundManager sounds;
-
 	public final SavedData storage = new SavedData();
 
 	private boolean fullscreenToggle;
@@ -38,8 +35,6 @@ public class WizardGame extends Game {
 		assets.loadShared();
 		assets.finishLoading();
 
-		sounds = new SoundManager(assets);
-
 		// background music
 		Music backgroundMusic = assets.get(WizardAssetManager.MUSIC_BACKGROUND, Music.class);
 		backgroundMusic.setLooping(true);
@@ -82,7 +77,6 @@ public class WizardGame extends Game {
 	@Override
 	public void dispose () {
 		batch.dispose();
-		sounds.dispose();
 		assets.dispose();
 		client.shutdownNow();
 		var socket = client.getSocket();

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/IconList.java

@@ -1,53 +0,0 @@
-package eu.jonahbauer.wizard.client.libgdx.actors;
-
-import com.badlogic.gdx.graphics.g2d.Batch;
-import com.badlogic.gdx.graphics.g2d.BitmapFont;
-import com.badlogic.gdx.graphics.g2d.GlyphLayout;
-import com.badlogic.gdx.scenes.scene2d.ui.List;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
-import com.badlogic.gdx.utils.Align;
-import lombok.Getter;
-import lombok.Setter;
-
-public abstract class IconList<T> extends List<T> {
-    @Getter
-    @Setter
-    private float iconWidth = -1;
-
-    @Getter
-    @Setter
-    private float iconPadding = 8;
-
-    @SuppressWarnings("unused")
-    public IconList(Skin skin) {
-        super(skin);
-    }
-
-    @SuppressWarnings("unused")
-    public IconList(Skin skin, String styleName) {
-        super(skin, styleName);
-    }
-
-    @SuppressWarnings("unused")
-    public IconList(ListStyle style) {
-        super(style);
-    }
-
-    public abstract Drawable getIcon(T item);
-
-    @Override
-    @Deprecated
-    public void setAlignment(int alignment) {}
-
-    @Override
-    protected GlyphLayout drawItem(Batch batch, BitmapFont font, int index, T item, float x, float y, float width) {
-        var text = toString(item);
-        var icon = getIcon(item);
-        var height = font.getCapHeight();
-        var iconWidth = this.iconWidth < 0 ? height : this.iconWidth;
-
-        icon.draw(batch, x, y - height, iconWidth, height);
-        return font.draw(batch, text, x + iconWidth + iconPadding, y, 0, text.length(), width - iconWidth - iconPadding, Align.left, false, "...");
-    }
-}

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/listeners/ButtonClickListener.java

@@ -1,21 +0,0 @@
-package eu.jonahbauer.wizard.client.libgdx.listeners;
-
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.Button;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import eu.jonahbauer.wizard.client.libgdx.util.SoundManager;
-
-public class ButtonClickListener extends ChangeListener {
-    private final SoundManager sounds;
-
-    public ButtonClickListener(SoundManager sounds) {
-        this.sounds = sounds;
-    }
-
-    @Override
-    public void changed(ChangeEvent event, Actor actor) {
-        if (actor instanceof Button) {
-            sounds.sfxClick();
-        }
-    }
-}

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/ConnectScreen.java

@@ -29,6 +29,7 @@ public class ConnectScreen extends MenuScreen {
         public void changed(ChangeEvent event, Actor actor) {
             if (actor == buttonBack) {
                 game.getClient().execute(Menu.class, Menu::showMenuScreen);
+                sfxClick();
             } else if (actor == buttonConnect) {
                 try {
                     var uriString = ConnectScreen.this.uriField.getText();
@@ -38,6 +39,8 @@ public class ConnectScreen extends MenuScreen {
                 } catch (URISyntaxException e) {
                     uriField.setStyle(getTextFieldErrorStyle());
                 }
+
+                sfxClick();
             }
         }
     };

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/CreateGameScreen.java

@@ -31,8 +31,10 @@ public class CreateGameScreen extends MenuScreen {
         public void changed(ChangeEvent event, Actor actor) {
             if (actor == buttonBack) {
                 game.getClient().execute(Lobby.class, Lobby::showListScreen);
+                sfxClick();
             } else if (actor == buttonContinue) {
                 create();
+                sfxClick();
             }
         }
     };

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/ErrorScreen.java

@@ -18,6 +18,7 @@ public class ErrorScreen extends MenuScreen {
         public void changed(ChangeEvent event, Actor actor) {
             if (actor == buttonBack) {
                 game.getClient().execute(BaseState.class, BaseState::dismissErrorScreen);
+                sfxClick();
             }
         }
     };

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/GameScreen.java

@@ -22,7 +22,10 @@ import eu.jonahbauer.wizard.client.libgdx.actors.CardsGroup;
 import eu.jonahbauer.wizard.client.libgdx.actors.PadOfTruth;
 import eu.jonahbauer.wizard.client.libgdx.state.Game;
 import eu.jonahbauer.wizard.client.libgdx.state.Session;
-import eu.jonahbauer.wizard.client.libgdx.util.*;
+import eu.jonahbauer.wizard.client.libgdx.util.AnimationTimings;
+import eu.jonahbauer.wizard.client.libgdx.util.CardUtil;
+import eu.jonahbauer.wizard.client.libgdx.util.Pair;
+import eu.jonahbauer.wizard.client.libgdx.util.WizardAssetManager;
 import eu.jonahbauer.wizard.common.messages.observer.UserInputMessage;
 import eu.jonahbauer.wizard.common.model.Card;
 import lombok.Getter;
@@ -418,13 +421,6 @@ public class GameScreen extends WizardScreen {
         execute(new StartRoundOverlay(this, round));
     }
 
-    public void deal() {
-        execute(parallel(
-                run(() -> game.sounds.sfxShuffle()),
-                delay(SoundManager.CARD_SHUFFLE_DURATION)
-        ));
-    }
-
     public void startTrick() {
         clearActivePlayer();
         execute(() -> cardStack.clearChildren());
@@ -535,8 +531,6 @@ public class GameScreen extends WizardScreen {
             cardStack.add(seat, actor);
             sequence.addAction(delay(actor));
             sequence.addAction(delay(AnimationTimings.STACK_HOLD));
-
-            game.sounds.sfxPlayCard();
         }));
         execute(sequence);
     }

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/InstructionScreen.java

@@ -16,7 +16,7 @@ import eu.jonahbauer.wizard.common.model.Card;
 public class InstructionScreen extends MenuScreen {
     private static final int MAX_PAGE = 3;
 
-    private TextButton buttonBack;
+    private TextButton buttonOK;
     private VerticalGroup content;
     private ScrollPane scrollPane;
     private TextButton nextPageButton;
@@ -29,14 +29,17 @@ public class InstructionScreen extends MenuScreen {
     private final ChangeListener listener = new ChangeListener() {
         @Override
         public void changed(ChangeEvent event, Actor actor) {
-            if (actor == buttonBack) {
+            if (actor == buttonOK) {
                 game.getClient().execute(Menu.class, Menu::showMenuScreen);
+                sfxClick();
             } else if (actor == nextPageButton) {
                 currentPage = MathUtils.clamp(currentPage + 1, 0, MAX_PAGE);
                 showPage(currentPage);
+                sfxClick();
             }  else if (actor == previousPageButton) {
                 currentPage = MathUtils.clamp(currentPage - 1, 0, MAX_PAGE);
                 showPage(currentPage);
+                sfxClick();
             }
         }
     };
@@ -67,9 +70,9 @@ public class InstructionScreen extends MenuScreen {
         previousPageButton.addListener(listener);
         getButtonGroup().addActor(previousPageButton);
 
-        buttonBack = new TextButton(messages.get("menu.instruction.back"), skin);
-        buttonBack.addListener(listener);
-        getButtonGroup().addActor(buttonBack);
+        buttonOK = new TextButton(messages.get("menu.instruction.back"), skin);
+        buttonOK.addListener(listener);
+        getButtonGroup().addActor(buttonOK);
 
         nextPageButton = new TextButton(messages.get("menu.instruction.nextPageButton"), skin);
         nextPageButton.addListener(listener);
@@ -80,7 +83,7 @@ public class InstructionScreen extends MenuScreen {
         scrollPane.setSize(0.65f * WizardGame.WIDTH, 400 + 0.1f * WizardGame.HEIGHT + 80);
         stage.addActor(scrollPane);
 
-        stage.addCaptureListener(new KeyboardFocusManager(scrollPane, previousPageButton, buttonBack, nextPageButton));
+        stage.addCaptureListener(new KeyboardFocusManager(scrollPane, previousPageButton, buttonOK, nextPageButton));
 
         showFirstPage();
     }
@@ -163,8 +166,9 @@ public class InstructionScreen extends MenuScreen {
         reset();
 
         startSection("menu.instruction.variant.title");
-        addParagraph("menu.instruction.variant.intro");
 
+        Label variantsIntro = new Label(messages.get("menu.instruction.variant.intro"), skin);
+        content.addActor(variantsIntro);
         Table table = new Table(skin).padTop(10);
         table.defaults().space(10.0f).left().top();
         table.columnDefaults(1).grow();

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/LoadingScreen.java

@@ -1,5 +1,6 @@
 package eu.jonahbauer.wizard.client.libgdx.screens;
 
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
 import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup;
 import eu.jonahbauer.wizard.client.libgdx.WizardGame;

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/LobbyScreen.java

@@ -3,10 +3,7 @@ package eu.jonahbauer.wizard.client.libgdx.screens;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.ui.*;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
-import eu.jonahbauer.wizard.client.libgdx.UiskinAtlas;
 import eu.jonahbauer.wizard.client.libgdx.WizardGame;
-import eu.jonahbauer.wizard.client.libgdx.actors.IconList;
 import eu.jonahbauer.wizard.client.libgdx.listeners.KeyboardFocusManager;
 import eu.jonahbauer.wizard.client.libgdx.listeners.ResetErrorListener;
 import eu.jonahbauer.wizard.client.libgdx.state.Lobby;
@@ -20,6 +17,7 @@ public class LobbyScreen extends MenuScreen {
     
     private TextButton buttonBack;
     private TextButton buttonJoin;
+    private TextButton buttonRejoin;
     private TextButton buttonCreate;
     
     private TextField playerName;
@@ -28,7 +26,6 @@ public class LobbyScreen extends MenuScreen {
     private Label labelSessionConfiguration;
 
     private UUID selectedSession;
-    private boolean rejoin = false;
     private List<SessionData> sessions;
     private ScrollPane sessionListContainer;
     
@@ -37,14 +34,16 @@ public class LobbyScreen extends MenuScreen {
         public void changed(ChangeEvent event, Actor actor) {
             if (actor == buttonBack) {
                 game.getClient().execute(Lobby.class, Lobby::disconnect);
+                sfxClick();
             } else if (actor == buttonJoin) {
-                if (rejoin) {
-                    game.getClient().execute(Lobby.class, Lobby::showRejoinScreen);
-                } else {
-                    join();
-                }
+                join();
+                sfxClick();
             } else if (actor == buttonCreate) {
                 game.getClient().execute(Lobby.class, Lobby::showCreateScreen);
+                sfxClick();
+            } else if (actor == buttonRejoin) {
+                game.getClient().execute(Lobby.class, Lobby::showRejoinScreen);
+                sfxClick();
             }
         }
     };
@@ -65,26 +64,21 @@ public class LobbyScreen extends MenuScreen {
         buttonCreate.addListener(listener);
         getButtonGroup().addActor(buttonCreate);
 
+        buttonRejoin = new TextButton(messages.get("menu.lobby.rejoin"), skin);
+        buttonRejoin.addListener(listener);
+        getButtonGroup().addActor(buttonRejoin);
+
         buttonJoin = new TextButton(messages.get("menu.lobby.join"), skin);
         buttonJoin.addListener(listener);
         getButtonGroup().addActor(buttonJoin);
 
         getButtonGroup().setWidth(0.55f * WizardGame.WIDTH);
         
-        sessions = new IconList<>(skin) {
-            // TODO better icons
-            private final Drawable running = skin.getDrawable(UiskinAtlas.NOT_READY);
-            private final Drawable notRunning = skin.getDrawable(UiskinAtlas.READY);
-
+        sessions = new List<>(skin) {
             @Override
             public String toString(SessionData session) {
                 return session.getName();
             }
-
-            @Override
-            public Drawable getIcon(SessionData item) {
-                return item.isRunning() ? running : notRunning;
-            }
         };
         sessions.addListener(new ChangeListener() {
             @Override
@@ -108,11 +102,12 @@ public class LobbyScreen extends MenuScreen {
 
         stage.addActor(content);
         stage.addCaptureListener(new KeyboardFocusManager(
-                sessions, playerName, buttonBack, buttonCreate, buttonJoin
+                sessions, playerName, buttonBack, buttonCreate, buttonRejoin, buttonJoin
         ));
 
         buttonBack.setName("button_back");
         buttonJoin.setName("button_join");
+        buttonJoin.setName("button_rejoin");
         buttonCreate.setName("button_create");
         sessions.setName("session_list");
         playerName.setName("player_name");
@@ -199,21 +194,14 @@ public class LobbyScreen extends MenuScreen {
             labelSessionPlayerCount.setText(Integer.toString(data.getPlayerCount()));
             labelSessionConfiguration.setText(data.getConfiguration().toString());
             selectedSession = data.getUuid();
-            updateRejoin(data.isRunning());
         } else {
             labelSessionName.setText("");
             labelSessionPlayerCount.setText("");
             labelSessionConfiguration.setText("");
             selectedSession = null;
-            updateRejoin(false);
         }
     }
 
-    private void updateRejoin(boolean rejoin) {
-        this.rejoin = rejoin;
-        buttonJoin.setText(messages.get("menu.lobby." + (rejoin ? "rejoin" : "join")));
-    }
-
     private void join() {
         boolean error = false;
 

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/MainMenuScreen.java

@@ -23,10 +23,13 @@ public class MainMenuScreen extends MenuScreen {
         public void changed(ChangeEvent event, Actor actor) {
             if (actor == buttonPlay) {
                 game.getClient().execute(Menu.class, Menu::showConnectScreen);
+                sfxClick();
             } else if (actor == buttonQuit) {
+                sfxClick();
                 Gdx.app.exit();
             } else if (actor == buttonInstruction) {
                 game.getClient().execute(Menu.class, Menu::showInstructionScreen);
+                sfxClick();
             }
         }
     };

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/RejoinScreen.java

@@ -26,8 +26,10 @@ public class RejoinScreen extends MenuScreen {
         public void changed(ChangeEvent event, Actor actor) {
             if (actor == buttonBack) {
                 game.getClient().execute(Lobby.class, Lobby::showListScreen);
+                sfxClick();
             } else if (actor == buttonContinue) {
                 rejoin();
+                sfxClick();
             }
         }
     };

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/WaitingScreen.java

@@ -1,12 +1,15 @@
 package eu.jonahbauer.wizard.client.libgdx.screens;
 
+import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.ui.*;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.utils.Align;
 import eu.jonahbauer.wizard.client.libgdx.UiskinAtlas;
 import eu.jonahbauer.wizard.client.libgdx.WizardGame;
-import eu.jonahbauer.wizard.client.libgdx.actors.IconList;
 import eu.jonahbauer.wizard.client.libgdx.listeners.KeyboardFocusManager;
 import eu.jonahbauer.wizard.client.libgdx.state.Session;
 import eu.jonahbauer.wizard.common.messages.data.PlayerData;
@@ -14,7 +17,7 @@ import eu.jonahbauer.wizard.common.model.Configuration;
 
 import java.util.UUID;
 
-public class SessionScreen extends MenuScreen {
+public class WaitingScreen extends MenuScreen {
     
     private TextButton buttonLeave;
     private TextButton buttonReady;
@@ -31,13 +34,15 @@ public class SessionScreen extends MenuScreen {
         public void changed(ChangeEvent event, Actor actor) {
             if (actor == buttonLeave) {
                 game.getClient().execute(Session.class, Session::leave);
+                sfxClick();
             } else if (actor == buttonReady) {
                 game.getClient().execute(Session.class, Session::toggleReady);
+                sfxClick();
             }
         }
     };
 
-    public SessionScreen(WizardGame game) {
+    public WaitingScreen(WizardGame game) {
         super(game);
     }
 
@@ -45,19 +50,19 @@ public class SessionScreen extends MenuScreen {
     public void show() {
         super.show();
 
-        buttonLeave = new TextButton(messages.get("menu.session.leave"), skin);
+        buttonLeave = new TextButton(messages.get("menu.waiting.leave"), skin);
         buttonLeave.addListener(listener);
         getButtonGroup().addActor(buttonLeave);
 
-        buttonReady = new TextButton(messages.get("menu.session.ready"), skin);
+        buttonReady = new TextButton(messages.get("menu.waiting.ready"), skin);
         buttonReady.addListener(listener);
         getButtonGroup().addActor(buttonReady);
 
         getButtonGroup().setWidth(0.55f * WizardGame.WIDTH);
 
-        players = new IconList<>(skin) {
-            private final Drawable ready = skin.getDrawable(UiskinAtlas.READY);
-            private final Drawable notReady = skin.getDrawable(UiskinAtlas.NOT_READY);
+        players = new List<>(skin) {
+            private final TextureRegion ready = skin.getRegion(UiskinAtlas.READY);
+            private final TextureRegion notReady = skin.getRegion(UiskinAtlas.NOT_READY);
 
             @Override
             public String toString(PlayerData player) {
@@ -65,8 +70,16 @@ public class SessionScreen extends MenuScreen {
             }
 
             @Override
-            public Drawable getIcon(PlayerData item) {
-                return item.isReady() ? ready : notReady;
+            @SuppressWarnings("SuspiciousNameCombination")
+            protected GlyphLayout drawItem(Batch batch, BitmapFont font, int index, PlayerData item, float x, float y, float width) {
+                String string = toString(item);
+                var height = font.getCapHeight();
+                if (item.isReady()) {
+                    batch.draw(ready, x, y - height, height, height);
+                } else {
+                    batch.draw(notReady, x, y - height, height, height);
+                }
+                return font.draw(batch, string, x + height + 8, y, 0, string.length(), width - height - 8, Align.left, false, "...");
             }
         };
 
@@ -108,13 +121,13 @@ public class SessionScreen extends MenuScreen {
         infoTable.columnDefaults(0).growX().width(infoTableWidth);
         infoTable.setSize(infoTableWidth, 400);
 
-        infoTable.add(messages.get("menu.session.session_name.label")).row();
+        infoTable.add(messages.get("menu.waiting.session_name.label")).row();
         infoTable.add(labelSessionName).row();
-        infoTable.add(messages.get("menu.session.session_uuid.label")).row();
+        infoTable.add(messages.get("menu.waiting.session_uuid.label")).row();
         infoTable.add(labelSessionUUID).row();
-        infoTable.add(messages.get("menu.session.session_configuration.label")).row();
+        infoTable.add(messages.get("menu.waiting.session_configuration.label")).row();
         infoTable.add(labelSessionConfiguration).row();
-        infoTable.add(messages.get("menu.session.player_name.label")).row();
+        infoTable.add(messages.get("menu.waiting.player_name.label")).row();
         infoTable.add(labelPlayerName).row();
 
         return infoTable;
@@ -125,7 +138,7 @@ public class SessionScreen extends MenuScreen {
     }
 
     public void setReady(boolean ready) {
-        buttonReady.setText(messages.get(ready ? "menu.session.not_ready" : "menu.session.ready"));
+        buttonReady.setText(messages.get(ready ? "menu.waiting.not_ready" : "menu.waiting.ready"));
     }
     
     public void addPlayer(PlayerData player) {

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/WizardScreen.java

@@ -2,6 +2,7 @@ package eu.jonahbauer.wizard.client.libgdx.screens;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Screen;
+import com.badlogic.gdx.audio.Sound;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
@@ -15,7 +16,6 @@ import com.badlogic.gdx.utils.viewport.Viewport;
 import eu.jonahbauer.wizard.client.libgdx.UiskinAtlas;
 import eu.jonahbauer.wizard.client.libgdx.WizardGame;
 import eu.jonahbauer.wizard.client.libgdx.listeners.AutoFocusListener;
-import eu.jonahbauer.wizard.client.libgdx.listeners.ButtonClickListener;
 import eu.jonahbauer.wizard.client.libgdx.listeners.ButtonKeyListener;
 import eu.jonahbauer.wizard.client.libgdx.util.WizardAssetManager;
 import org.jetbrains.annotations.MustBeInvokedByOverriders;
@@ -31,6 +31,7 @@ public abstract class WizardScreen implements Screen {
     protected Viewport viewport;
 
     private Image background;
+    private Sound sfxClick;
 
     protected float offsetX;
     protected float offsetY;
@@ -55,10 +56,11 @@ public abstract class WizardScreen implements Screen {
         stage = new Stage(viewport);
         stage.addListener(new ButtonKeyListener());
         stage.addListener(new AutoFocusListener());
-        stage.addListener(new ButtonClickListener(game.sounds));
         stage.setDebugAll(WizardGame.DEBUG);
 
         Gdx.input.setInputProcessor(stage);
+
+        sfxClick = assets.get(WizardAssetManager.SFX_CLICK);
     }
 
     @Override
@@ -108,4 +110,8 @@ public abstract class WizardScreen implements Screen {
     public void dispose() {
         stage.dispose();
     }
+
+    protected void sfxClick() {
+        sfxClick.play(0.6f);
+    }
 }

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/state/AwaitingJoinSession.java

@@ -68,7 +68,7 @@ public final class AwaitingJoinSession extends Awaiting {
                     ));
                 } else {
                     return Optional.of(new Session(
-                            session, sessionName, configuration,
+                            new SessionData(session, sessionName, -1, configuration),
                             players,
                             player
                     ));

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/state/Game.java

@@ -6,6 +6,7 @@ import eu.jonahbauer.wizard.client.libgdx.screens.GameScreen;
 import eu.jonahbauer.wizard.client.libgdx.util.Pair;
 import eu.jonahbauer.wizard.common.messages.client.InteractionMessage;
 import eu.jonahbauer.wizard.common.messages.data.PlayerData;
+import eu.jonahbauer.wizard.common.messages.data.SessionData;
 import eu.jonahbauer.wizard.common.messages.observer.*;
 import eu.jonahbauer.wizard.common.messages.player.*;
 import eu.jonahbauer.wizard.common.messages.server.AckMessage;
@@ -117,7 +118,6 @@ public final class Game extends BaseState {
                 case "starting_round" -> {
                     return onStartRound(client);
                 }
-                case "dealing" -> onDealing();
                 case "starting_trick" -> onStartTrick();
                 case "juggling" -> onJuggle();
                 case "finishing_round" -> onFinishingRound();
@@ -190,10 +190,6 @@ public final class Game extends BaseState {
         return Optional.empty();
     }
 
-    private void onDealing() {
-        if (gameScreen != null) gameScreen.deal();
-    }
-
     private void onStartTrick() {
         log.info("Trick {} is starting...", trick + 1);
         trick ++;
@@ -437,7 +433,7 @@ public final class Game extends BaseState {
 
     private Optional<ClientState> returnToSession() {
         return Optional.of(new Session(
-                session, sessionName, configuration,
+                new SessionData(session, sessionName, -1, configuration),
                 players.entrySet().stream()
                        .map(entry -> new PlayerData(entry.getKey(), entry.getValue(), false))
                        .toList(),

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/state/Session.java

@@ -1,10 +1,11 @@
 package eu.jonahbauer.wizard.client.libgdx.state;
 
 import eu.jonahbauer.wizard.client.libgdx.Client;
-import eu.jonahbauer.wizard.client.libgdx.screens.SessionScreen;
+import eu.jonahbauer.wizard.client.libgdx.screens.WaitingScreen;
 import eu.jonahbauer.wizard.common.messages.client.LeaveSessionMessage;
 import eu.jonahbauer.wizard.common.messages.client.ReadyMessage;
 import eu.jonahbauer.wizard.common.messages.data.PlayerData;
+import eu.jonahbauer.wizard.common.messages.data.SessionData;
 import eu.jonahbauer.wizard.common.messages.server.*;
 import eu.jonahbauer.wizard.common.model.Configuration;
 import lombok.Getter;
@@ -15,7 +16,7 @@ import java.util.*;
 @Log4j2
 @Getter
 public final class Session extends BaseState {
-    private SessionScreen sessionScreen;
+    private WaitingScreen sessionScreen;
     
     private final UUID self;
 
@@ -27,14 +28,14 @@ public final class Session extends BaseState {
 
     private boolean sending;
 
-    public Session(UUID session, String name, Configuration configuration, Collection<PlayerData> players, UUID self) {
-        this(session, name, configuration, players, self, false);
+    public Session(SessionData session, Collection<PlayerData> players, UUID self) {
+        this(session, players, self, false);
     }
 
-    public Session(UUID session, String name, Configuration configuration, Collection<PlayerData> players, UUID self, boolean dontSwitchScreen) {
-        this.session = session;
-        this.sessionName = name;
-        this.configuration = configuration;
+    public Session(SessionData session, Collection<PlayerData> players, UUID self, boolean dontSwitchScreen) {
+        this.session = session.getUuid();
+        this.sessionName = session.getName();
+        this.configuration = session.getConfiguration();
         players.forEach(p -> this.players.put(p.getUuid(), p));
         this.dontSwitchScreen = dontSwitchScreen;
 
@@ -121,7 +122,7 @@ public final class Session extends BaseState {
     }
 
     public Optional<ClientState> showInfoScreen(Client client) {
-        sessionScreen = new SessionScreen(client.getGame());
+        sessionScreen = new WaitingScreen(client.getGame());
         client.getGame().setScreen(sessionScreen);
         sessionScreen.setPlayers(players.values().toArray(new PlayerData[0]));
         sessionScreen.setReady(players.get(self).isReady());

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/util/CardUtil.java

@@ -70,6 +70,6 @@ public class CardUtil {
     );
 
     public Card.Suit getDefaultTrumpSuit(Card card) {
-        return card == null ? Card.Suit.NONE : DEFAULT_SUITES.get(card);
+        return DEFAULT_SUITES.get(card);
     }
 }

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/util/SoundManager.java

@@ -1,47 +0,0 @@
-package eu.jonahbauer.wizard.client.libgdx.util;
-
-import com.badlogic.gdx.audio.Sound;
-import lombok.Setter;
-
-public class SoundManager {
-    public static final float CARD_SHUFFLE_DURATION = 4.2f;
-
-    private final WizardAssetManager assets;
-
-    @Setter
-    private float sfxVolume = 1;
-
-    private final Sound click;
-    private final Sound cardPlayed;
-    private final Sound cardShuffle;
-
-    public SoundManager(WizardAssetManager assets) {
-        this.assets = assets;
-        assets.load(WizardAssetManager.SFX_CLICK, Sound.class);
-        assets.load(WizardAssetManager.SFX_CARD_PLAYED, Sound.class);
-        assets.load(WizardAssetManager.SFX_CARD_SHUFFLE, Sound.class);
-        assets.finishLoading();
-
-        this.click = assets.get(WizardAssetManager.SFX_CLICK);
-        this.cardPlayed = assets.get(WizardAssetManager.SFX_CARD_PLAYED);
-        this.cardShuffle = assets.get(WizardAssetManager.SFX_CARD_SHUFFLE);
-    }
-
-    public void sfxClick() {
-        this.click.play(sfxVolume);
-    }
-
-    public void sfxShuffle() {
-        this.cardShuffle.play(sfxVolume);
-    }
-
-    public void sfxPlayCard() {
-        this.cardPlayed.play(sfxVolume);
-    }
-
-    public void dispose() {
-        assets.unload(WizardAssetManager.SFX_CLICK);
-        assets.unload(WizardAssetManager.SFX_CARD_PLAYED);
-        assets.unload(WizardAssetManager.SFX_CARD_SHUFFLE);
-    }
-}

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/util/WizardAssetManager.java

@@ -4,6 +4,7 @@ import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.assets.loaders.I18NBundleLoader;
 import com.badlogic.gdx.assets.loaders.SkinLoader;
 import com.badlogic.gdx.audio.Music;
+import com.badlogic.gdx.audio.Sound;
 import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
@@ -19,9 +20,7 @@ public class WizardAssetManager {
     public static final String ATLAS_SKIN = UiskinAtlas.$PATH;
     public static final String ATLAS_GAME = GameAtlas.$PATH;
 
-    public static final String SFX_CLICK = "sound/button_click.mp3";
-    public static final String SFX_CARD_PLAYED = "sound/card_played.mp3";
-    public static final String SFX_CARD_SHUFFLE = "sound/card_shuffle.mp3";
+    public static final String SFX_CLICK = "button_click_s.mp3";
     public static final String MUSIC_BACKGROUND = "background.mp3";
 
     public static final String CURSOR = "cursor.png";
@@ -36,6 +35,7 @@ public class WizardAssetManager {
         manager.load(SKIN, Skin.class, new SkinLoader.SkinParameter(ATLAS_SKIN));
 
         manager.load(MUSIC_BACKGROUND, Music.class);
+        manager.load(SFX_CLICK, Sound.class);
     }
 
     public void loadGame() {

wizard-client/wizard-client-libgdx/core/src/main/resources/i18n/messages.properties

@@ -150,14 +150,14 @@ menu.loading.joining_session=Joining session...
 menu.loading.joining_lobby=Joining lobby...
 menu.loading.back=Return To Main Menu
 
-menu.session.ready=Ready
-menu.session.not_ready=Not Ready
-menu.session.leave=Leave
+menu.waiting.ready=Ready
+menu.waiting.not_ready=Not Ready
+menu.waiting.leave=Leave
 
-menu.session.player_name.label=Own Name
-menu.session.session_name.label=Session Name
-menu.session.session_uuid.label=Session UUID
-menu.session.session_configuration.label=Configuration
+menu.waiting.player_name.label=Own Name
+menu.waiting.session_name.label=Session Name
+menu.waiting.session_uuid.label=Session UUID
+menu.waiting.session_configuration.label=Configuration
 
 menu.error.malformed_message=Error: Malformed Message
 menu.error.unexpected_message=Error: Unexpected Message

wizard-client/wizard-client-libgdx/core/src/main/resources/i18n/messages_de.properties

@@ -143,14 +143,14 @@ menu.loading.joining_session=Trete Sitzung bei...
 menu.loading.joining_lobby=Trete Warteraum bei...
 menu.loading.back=Zurück zum Hauptmenü
 
-menu.session.ready=Bereit
-menu.session.not_ready=Nicht Bereit
-menu.session.leave=Verlassen
+menu.waiting.ready=Bereit
+menu.waiting.not_ready=Nicht Bereit
+menu.waiting.leave=Verlassen
 
-menu.session.player_name.label=Eigener Name
-menu.session.session_name.label=Sitzungsname
-menu.session.session_uuid.label=Sitzungs-ID
-menu.session.session_configuration.label=Spielvariante
+menu.waiting.player_name.label=Eigener Name
+menu.waiting.session_name.label=Sitzungsname
+menu.waiting.session_uuid.label=Sitzungs-ID
+menu.waiting.session_configuration.label=Spielvariante
 
 menu.error.malformed_message=Fehler: Missgebildete Nachricht
 menu.error.unexpected_message=Fehler: Unerwartete Nachricht

wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/client/ClientMessage.java

@@ -3,7 +3,7 @@ package eu.jonahbauer.wizard.common.messages.client;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.jonahbauer.wizard.common.messages.ParseException;
 import eu.jonahbauer.wizard.common.messages.player.PlayerMessage;
-import eu.jonahbauer.wizard.common.messages.util.SerializationUtil;
+import eu.jonahbauer.wizard.common.util.SerializationUtil;
 import lombok.EqualsAndHashCode;
 import lombok.SneakyThrows;
 

wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/data/SessionData.java

@@ -26,8 +26,4 @@ public class SessionData {
      * Configuration of the session
      */
     private final @NonNull Configuration configuration;
-    /**
-     * Whether the session is running.
-     */
-    private final boolean running;
 }

wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/observer/ObserverMessage.java

@@ -2,7 +2,7 @@ package eu.jonahbauer.wizard.common.messages.observer;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.jonahbauer.wizard.common.messages.ParseException;
-import eu.jonahbauer.wizard.common.messages.util.SerializationUtil;
+import eu.jonahbauer.wizard.common.util.SerializationUtil;
 import lombok.EqualsAndHashCode;
 import lombok.SneakyThrows;
 

wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/player/PlayerMessage.java

@@ -2,7 +2,7 @@ package eu.jonahbauer.wizard.common.messages.player;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.jonahbauer.wizard.common.messages.ParseException;
-import eu.jonahbauer.wizard.common.messages.util.SerializationUtil;
+import eu.jonahbauer.wizard.common.util.SerializationUtil;
 import lombok.EqualsAndHashCode;
 import lombok.SneakyThrows;
 

wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/server/KickVotedMessage.java

@@ -0,0 +1,26 @@
+package eu.jonahbauer.wizard.common.messages.server;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.util.UUID;
+
+@Getter
+@RequiredArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public final class KickVotedMessage extends ServerMessage {
+    /**
+     * UUID of the voting player
+     */
+    private final @NonNull UUID voter;
+    /**
+     * UUID of player who is supposed to be kicked
+     */
+    private final @NonNull UUID player;
+    /**
+     * Time until the vote ends in {@link System#currentTimeMillis() UNIX time}
+     */
+    private final long timeout;
+}

wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/server/KickedMessage.java

@@ -0,0 +1,18 @@
+package eu.jonahbauer.wizard.common.messages.server;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.util.UUID;
+
+@Getter
+@RequiredArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public final class KickedMessage extends ServerMessage {
+    /**
+     * UUID of player who was kicked
+     */
+    private final @NonNull UUID player;
+}

wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/server/ServerMessage.java

@@ -3,12 +3,12 @@ package eu.jonahbauer.wizard.common.messages.server;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.jonahbauer.wizard.common.messages.ParseException;
 import eu.jonahbauer.wizard.common.messages.observer.ObserverMessage;
-import eu.jonahbauer.wizard.common.messages.util.SerializationUtil;
+import eu.jonahbauer.wizard.common.util.SerializationUtil;
 import lombok.EqualsAndHashCode;
 import lombok.SneakyThrows;
 
 @EqualsAndHashCode
-public abstract sealed class ServerMessage permits AckMessage, GameMessage, NackMessage, PlayerLeftMessage, PlayerModifiedMessage, SessionJoinedMessage, SessionListMessage, SessionModifiedMessage, SessionRemovedMessage, StartingGameMessage {
+public abstract sealed class ServerMessage permits AckMessage, GameMessage, KickVotedMessage, KickedMessage, NackMessage, PlayerLeftMessage, PlayerModifiedMessage, SessionJoinedMessage, SessionListMessage, SessionModifiedMessage, SessionRemovedMessage, StartingGameMessage {
     private static final ObjectMapper MAPPER = SerializationUtil.newObjectMapper(ServerMessage.class, ObserverMessage.class);
 
     public static ServerMessage parse(String json) throws ParseException {

wizard-common/src/main/java/eu/jonahbauer/wizard/common/util/SerializationUtil.java

@@ -1,4 +1,4 @@
-package eu.jonahbauer.wizard.common.messages.util;
+package eu.jonahbauer.wizard.common.util;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -10,10 +10,10 @@ import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
 import eu.jonahbauer.wizard.common.messages.ParseException;
-import eu.jonahbauer.wizard.common.util.StringUtil;
 import lombok.experimental.UtilityClass;
 
 import java.lang.reflect.Modifier;
+import java.util.Locale;
 
 @UtilityClass
 public class SerializationUtil {
@@ -61,7 +61,7 @@ public class SerializationUtil {
             if (Modifier.isFinal(modifiers) || subclass.isSealed() && !Modifier.isAbstract(modifiers)) {
                 var name = subclass.getSimpleName();
                 if (name.endsWith(suffix)) name = name.substring(0, name.length() - suffix.length());
-                name = StringUtil.toSnakeCase(name);
+                name = name.replaceAll("([a-z])([A-Z]+)", "$1_$2").toLowerCase(Locale.ROOT);
 
                 objectMapper.registerSubtypes(new NamedType(subclass, name));
             }

wizard-common/src/main/java/module-info.java

@@ -1,23 +0,0 @@
-module eu.jonahbauer.wizard.common {
-    exports eu.jonahbauer.wizard.common.machine;
-    exports eu.jonahbauer.wizard.common.messages;
-    exports eu.jonahbauer.wizard.common.messages.client;
-    exports eu.jonahbauer.wizard.common.messages.data;
-    exports eu.jonahbauer.wizard.common.messages.observer;
-    exports eu.jonahbauer.wizard.common.messages.player;
-    exports eu.jonahbauer.wizard.common.messages.server;
-    exports eu.jonahbauer.wizard.common.model;
-    exports eu.jonahbauer.wizard.common.util;
-
-    opens eu.jonahbauer.wizard.common.messages.client to com.fasterxml.jackson.databind;
-    opens eu.jonahbauer.wizard.common.messages.data to com.fasterxml.jackson.databind;
-    opens eu.jonahbauer.wizard.common.messages.observer to com.fasterxml.jackson.databind;
-    opens eu.jonahbauer.wizard.common.messages.player to com.fasterxml.jackson.databind;
-    opens eu.jonahbauer.wizard.common.messages.server to com.fasterxml.jackson.databind;
-
-    requires com.fasterxml.jackson.databind;
-    requires com.fasterxml.jackson.module.paramnames;
-
-    requires static lombok;
-    requires static org.jetbrains.annotations;
-}

wizard-core/src/main/java/eu/jonahbauer/wizard/core/CLI.java

@@ -0,0 +1,72 @@
+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;
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.messages.Observer;
+import eu.jonahbauer.wizard.core.model.GameConfiguration;
+import eu.jonahbauer.wizard.core.model.Configurations;
+
+import java.util.List;
+import java.util.Scanner;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class CLI {
+    public static void main(String[] args) {
+        GameConfiguration config = Configurations.DEFAULT;
+        Observer observer = (player, msg) -> System.out.println(msg);
+        Game game = new Game(config, observer);
+        var players = List.of(
+                UUID.randomUUID(),
+                UUID.randomUUID(),
+                UUID.randomUUID(),
+                UUID.randomUUID()
+        );
+
+        game.start(players);
+
+        Scanner scanner = new Scanner(System.in);
+        Pattern pattern = Pattern.compile("(\\d) ([a-z]+) (.*)");
+        while (scanner.hasNextLine()) {
+            try {
+                Matcher matcher = pattern.matcher(scanner.nextLine());
+                if (!matcher.find()) {
+                    System.err.println("Format is \"(\\d) ([a-z]+) (.*)\"");
+                    continue;
+                }
+                String player = matcher.group(1);
+                String command = matcher.group(2);
+                String param = matcher.group(3);
+
+                int id = Integer.parseInt(player);
+
+                if (id > players.size()) {
+                    System.err.println("ID must be between 0 and " + (players.size() - 1));
+                    continue;
+                }
+
+                switch (command) {
+                    case "predict" -> {
+                        int prediction = Integer.parseInt(param);
+                        game.onMessage(players.get(id), new PredictMessage(prediction));
+                    }
+                    case "play" -> {
+                        Card card = Card.valueOf(param);
+                        game.onMessage(players.get(id), new PlayCardMessage(card));
+                    }
+                    case "trump" -> {
+                        Card.Suit suit = Card.Suit.valueOf(param);
+                        game.onMessage(players.get(id), new PickTrumpMessage(suit));
+                    }
+                    default -> System.err.println("Unknown command: " + command);
+                }
+            } catch (Exception e) {
+                System.err.println(e.getMessage());
+            }
+        }
+    }
+}

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

@@ -1,22 +1,18 @@
-package eu.jonahbauer.wizard.core;
+package eu.jonahbauer.wizard.core.machine;
 
 import eu.jonahbauer.wizard.common.machine.TimeoutContext;
 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.common.model.Configuration;
-import eu.jonahbauer.wizard.core.states.GameState;
-import eu.jonahbauer.wizard.core.states.TransientState;
-import eu.jonahbauer.wizard.core.states.game.Created;
-import eu.jonahbauer.wizard.core.states.game.Error;
-import eu.jonahbauer.wizard.core.model.Configurations;
+import eu.jonahbauer.wizard.core.machine.states.TransientState;
+import eu.jonahbauer.wizard.core.machine.states.game.Created;
+import eu.jonahbauer.wizard.core.machine.states.game.Error;
+import eu.jonahbauer.wizard.core.messages.Observer;
 import eu.jonahbauer.wizard.core.model.GameConfiguration;
-import eu.jonahbauer.wizard.common.util.StringUtil;
+import eu.jonahbauer.wizard.core.util.Util;
 import lombok.Getter;
 import org.jetbrains.annotations.Blocking;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.TestOnly;
-import org.jetbrains.annotations.VisibleForTesting;
 
 import java.util.List;
 import java.util.Random;
@@ -34,25 +30,20 @@ public final class Game extends TimeoutContext<GameState, Game> {
 
     private final CompletableFuture<Void> future = new CompletableFuture<>();
 
-    private Game(Random random, Configuration config, long timeout, long syncTimeout, Observer observer) {
+    public Game(GameConfiguration config, Observer observer) {
         super(new Created());
-        this.random = random;
-        this.config = Configurations.get(config).withTimeout(timeout).withSyncTimeout(syncTimeout);
+        this.random = new Random();
+        this.config = config;
         this.observer = observer;
     }
 
-    public Game(Configuration config, long timeout, long syncTimeout, Observer observer) {
-        this(new Random(), config, timeout, syncTimeout, observer);
+    public Game(long seed, GameConfiguration config, Observer observer) {
+        super(new Created());
+        this.random = new Random(seed);
+        this.config = config;
+        this.observer = observer;
     }
 
-    @TestOnly
-    public Game(long seed, Configuration config, long timeout, long syncTimeout, Observer observer) {
-        this(new Random(seed), config, timeout, syncTimeout, observer);
-    }
-
-    @TestOnly
-    @VisibleForTesting
-    @SuppressWarnings("ClassEscapesDefinedScope")
     public void resume(GameState state) {
         transition(new Created(), state);
     }
@@ -65,17 +56,10 @@ public final class Game extends TimeoutContext<GameState, Game> {
         execute(s -> s.onMessage(this, player, message));
     }
 
-    public void onMessage(UUID player, PlayerMessage message, Runnable preHandleMessage) {
-        execute(s -> {
-            preHandleMessage.run();
-            return s.onMessage(this, player, message);
-        });
-    }
-
     @Override
     protected void onTransition(GameState from, GameState to) {
         if (!(to instanceof TransientState)) {
-            notify(new StateMessage(to != null ? StringUtil.toSnakeCase(to.getClass().getSimpleName()) : "null"));
+            notify(new StateMessage(to != null ? Util.toSnakeCase(to.getClass().getSimpleName()) : "null"));
         }
     }
 

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/GameState.java

@@ -1,9 +1,10 @@
-package eu.jonahbauer.wizard.core.states;
+package eu.jonahbauer.wizard.core.machine;
 
 import eu.jonahbauer.wizard.common.machine.TimeoutState;
 import eu.jonahbauer.wizard.common.messages.player.ContinueMessage;
 import eu.jonahbauer.wizard.common.messages.player.PlayerMessage;
-import eu.jonahbauer.wizard.core.Game;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.machine.states.SyncState;
 import lombok.Getter;
 import org.jetbrains.annotations.Unmodifiable;
 
@@ -12,8 +13,8 @@ import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Function;
 
-import static eu.jonahbauer.wizard.core.states.GameData.CURRENT_PLAYER;
-import static eu.jonahbauer.wizard.core.states.GameData.PLAYERS;
+import static eu.jonahbauer.wizard.core.machine.states.GameData.CURRENT_PLAYER;
+import static eu.jonahbauer.wizard.core.machine.states.GameData.PLAYERS;
 
 @Unmodifiable
 public abstract class GameState implements TimeoutState<GameState, Game> {

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

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

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/InvalidDataException.java

@@ -1,4 +1,4 @@
-package eu.jonahbauer.wizard.core.states;
+package eu.jonahbauer.wizard.core.machine.states;
 
 public class InvalidDataException extends RuntimeException {
     public InvalidDataException(String message) {

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/SyncState.java

@@ -1,10 +1,11 @@
-package eu.jonahbauer.wizard.core.states;
+package eu.jonahbauer.wizard.core.machine.states;
 
 import eu.jonahbauer.wizard.common.messages.observer.TimeoutMessage;
 import eu.jonahbauer.wizard.common.messages.observer.UserInputMessage;
 import eu.jonahbauer.wizard.common.messages.player.ContinueMessage;
 import eu.jonahbauer.wizard.common.messages.player.PlayerMessage;
-import eu.jonahbauer.wizard.core.Game;
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.machine.GameState;
 
 import java.util.HashSet;
 import java.util.Optional;
@@ -13,7 +14,7 @@ import java.util.UUID;
 import java.util.function.Function;
 
 import static eu.jonahbauer.wizard.common.messages.observer.UserInputMessage.Action.SYNC;
-import static eu.jonahbauer.wizard.core.states.GameData.PLAYERS;
+import static eu.jonahbauer.wizard.core.machine.states.GameData.PLAYERS;
 
 public final class SyncState extends GameState implements TransientState {
     private final transient Set<UUID> ready = new HashSet<>();

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/TransientState.java

@@ -0,0 +1,4 @@
+package eu.jonahbauer.wizard.core.machine.states;
+
+public interface TransientState {
+}

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/game/Created.java

@@ -1,8 +1,8 @@
-package eu.jonahbauer.wizard.core.states.game;
+package eu.jonahbauer.wizard.core.machine.states.game;
 
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.states.GameState;
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.machine.GameState;
 
 import java.util.List;
 import java.util.Optional;

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/game/Error.java

@@ -1,7 +1,7 @@
-package eu.jonahbauer.wizard.core.states.game;
+package eu.jonahbauer.wizard.core.machine.states.game;
 
-import eu.jonahbauer.wizard.core.states.GameState;
-import eu.jonahbauer.wizard.core.states.GameData;
+import eu.jonahbauer.wizard.core.machine.GameState;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
 import lombok.Getter;
 
 @Getter

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/game/Finished.java

@@ -1,8 +1,8 @@
-package eu.jonahbauer.wizard.core.states.game;
+package eu.jonahbauer.wizard.core.machine.states.game;
 
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.states.GameState;
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.machine.GameState;
 
 import java.util.Optional;
 

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/game/Finishing.java

@@ -1,13 +1,13 @@
-package eu.jonahbauer.wizard.core.states.game;
+package eu.jonahbauer.wizard.core.machine.states.game;
 
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.core.states.GameState;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.machine.GameState;
 import eu.jonahbauer.wizard.common.messages.observer.ScoreMessage;
 
 import java.util.Optional;
 
-import static eu.jonahbauer.wizard.core.states.GameData.*;
+import static eu.jonahbauer.wizard.core.machine.states.GameData.*;
 
 public final class Finishing extends GameState {
 

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/game/Starting.java

@@ -0,0 +1,22 @@
+package eu.jonahbauer.wizard.core.machine.states.game;
+
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.machine.GameState;
+import eu.jonahbauer.wizard.core.machine.states.round.StartingRound;
+
+import java.util.Optional;
+
+import static eu.jonahbauer.wizard.core.machine.states.GameData.PLAYERS;
+
+public final class Starting extends GameState {
+
+    public Starting(GameData data) {
+        super(data.require(PLAYERS));
+    }
+
+    @Override
+    public Optional<GameState> onEnter(Game game) {
+        return transition(new StartingRound(getData()));
+    }
+}

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/round/ChangingPrediction.java

@@ -1,14 +1,14 @@
-package eu.jonahbauer.wizard.core.states.round;
+package eu.jonahbauer.wizard.core.machine.states.round;
 
 import eu.jonahbauer.wizard.common.messages.observer.PredictionMessage;
 import eu.jonahbauer.wizard.common.messages.observer.TimeoutMessage;
 import eu.jonahbauer.wizard.common.messages.observer.UserInputMessage;
 import eu.jonahbauer.wizard.common.messages.player.PlayerMessage;
 import eu.jonahbauer.wizard.common.messages.player.PredictMessage;
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.states.GameState;
-import eu.jonahbauer.wizard.core.states.InvalidDataException;
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.machine.GameState;
+import eu.jonahbauer.wizard.core.machine.states.InvalidDataException;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -16,7 +16,7 @@ import java.util.Optional;
 import java.util.UUID;
 
 import static eu.jonahbauer.wizard.common.messages.observer.UserInputMessage.Action.CHANGE_PREDICTION;
-import static eu.jonahbauer.wizard.core.states.GameData.*;
+import static eu.jonahbauer.wizard.core.machine.states.GameData.*;
 
 public final class ChangingPrediction extends RoundState {
     private transient final int oldPrediction;

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

@@ -1,15 +1,15 @@
-package eu.jonahbauer.wizard.core.states.round;
+package eu.jonahbauer.wizard.core.machine.states.round;
 
 import eu.jonahbauer.wizard.common.messages.observer.HandMessage;
 import eu.jonahbauer.wizard.common.model.Card;
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.states.GameState;
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.machine.GameState;
 import eu.jonahbauer.wizard.core.model.deck.Deck;
 
 import java.util.*;
 
-import static eu.jonahbauer.wizard.core.states.GameData.*;
+import static eu.jonahbauer.wizard.core.machine.states.GameData.*;
 
 public final class Dealing extends RoundState {
 

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

@@ -1,50 +1,69 @@
-package eu.jonahbauer.wizard.core.states.round;
+package eu.jonahbauer.wizard.core.machine.states.round;
 
-import eu.jonahbauer.wizard.common.messages.observer.HandMessage;
 import eu.jonahbauer.wizard.common.messages.observer.TimeoutMessage;
+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;
 import eu.jonahbauer.wizard.common.messages.observer.TrumpMessage;
 import eu.jonahbauer.wizard.common.messages.observer.UserInputMessage;
 import eu.jonahbauer.wizard.common.messages.player.PickTrumpMessage;
 import eu.jonahbauer.wizard.common.messages.player.PlayerMessage;
-import eu.jonahbauer.wizard.common.model.Card;
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.core.states.GameState;
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.states.TransientState;
+import eu.jonahbauer.wizard.core.machine.GameState;
+import eu.jonahbauer.wizard.core.model.card.GameCards;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
+import static eu.jonahbauer.wizard.core.machine.states.GameData.*;
 import static eu.jonahbauer.wizard.common.messages.observer.UserInputMessage.Action.PICK_TRUMP;
-import static eu.jonahbauer.wizard.core.states.GameData.*;
-import static eu.jonahbauer.wizard.core.states.GameData.TRUMP_CARD;
 
-public final class DeterminingTrumpUserInput extends RoundState implements TransientState {
-    private final transient UUID player;
-    private final transient boolean werewolf;
+public final class DeterminingTrump extends RoundState {
+    private transient UUID player;
+    private transient boolean werewolf;
 
-    public DeterminingTrumpUserInput(GameData data) {
-        super(data.require(TRUMP_CARD).requireEach(PLAYERS, HANDS).require(CURRENT_PLAYER));
-
-        this.player = get(CURRENT_PLAYER);
-        this.werewolf = get(HANDS).get(this.player).contains(Card.WEREWOLF);
+    public DeterminingTrump(GameData data) {
+        super(data.require(TRUMP_CARD).requireEach(PLAYERS, HANDS));
     }
 
     @Override
     public Optional<GameState> onEnter(Game game) {
-        game.notify(new UserInputMessage(this.player, PICK_TRUMP, getTimeout(game, true)));
-        return timeout(game);
+        Card trumpCard = get(TRUMP_CARD);
+
+        // handle werewolf
+        for (Map.Entry<UUID, List<Card>> entry : get(HANDS).entrySet()) {
+            var player = entry.getKey();
+            var hand = entry.getValue();
+            if (hand.contains(Card.WEREWOLF)) {
+                this.player = player;
+                this.werewolf = true;
+                game.notify(new TrumpMessage(trumpCard, null));
+                game.notify(new TrumpMessage(Card.WEREWOLF, null));
+                game.notify(new UserInputMessage(this.player, PICK_TRUMP, getTimeout(game, true)));
+                return timeout(game);
+            }
+        }
+
+        // default trump handling
+        Card.Suit trumpSuit = trumpCard != null ? GameCards.get(trumpCard).getTrumpSuit() : Card.Suit.NONE;
+        if (trumpSuit == null) {
+            this.player = getDealer();
+            game.notify(new TrumpMessage(trumpCard, null));
+            game.notify(new UserInputMessage(this.player, PICK_TRUMP, getTimeout(game, true)));
+            return timeout(game);
+        } else {
+            return transition(game, trumpSuit);
+        }
     }
 
     @Override
     public Optional<GameState> onTimeout(Game game) {
         game.notify(new TimeoutMessage());
-
         Card.Suit[] suits;
         if (werewolf) {
-            suits = new Card.Suit[] {Card.Suit.BLUE, Card.Suit.GREEN, Card.Suit.RED, Card.Suit.YELLOW, Card.Suit.NONE};
+            suits = new Card.Suit[]{Card.Suit.BLUE, Card.Suit.GREEN, Card.Suit.RED, Card.Suit.YELLOW, Card.Suit.NONE};
         } else {
-            suits = new Card.Suit[] {Card.Suit.BLUE, Card.Suit.GREEN, Card.Suit.RED, Card.Suit.YELLOW};
+            suits = new Card.Suit[]{Card.Suit.BLUE, Card.Suit.GREEN, Card.Suit.RED, Card.Suit.YELLOW};
         }
         return transition(game, suits[game.getRandom().nextInt(suits.length)]);
     }

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/round/FinishingRound.java

@@ -1,9 +1,9 @@
-package eu.jonahbauer.wizard.core.states.round;
+package eu.jonahbauer.wizard.core.machine.states.round;
 
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.core.states.GameState;
-import eu.jonahbauer.wizard.core.states.game.Finishing;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.machine.GameState;
+import eu.jonahbauer.wizard.core.machine.states.game.Finishing;
 import eu.jonahbauer.wizard.common.messages.observer.ScoreMessage;
 
 import java.util.HashMap;
@@ -11,7 +11,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 
-import static eu.jonahbauer.wizard.core.states.GameData.*;
+import static eu.jonahbauer.wizard.core.machine.states.GameData.*;
 
 public final class FinishingRound extends RoundState {
 

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/round/Predicting.java

@@ -1,10 +1,10 @@
-package eu.jonahbauer.wizard.core.states.round;
+package eu.jonahbauer.wizard.core.machine.states.round;
 
 import eu.jonahbauer.wizard.common.messages.observer.TimeoutMessage;
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.core.states.GameState;
-import eu.jonahbauer.wizard.core.states.trick.StartingTrick;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.machine.GameState;
+import eu.jonahbauer.wizard.core.machine.states.trick.StartingTrick;
 import eu.jonahbauer.wizard.common.messages.observer.PredictionMessage;
 import eu.jonahbauer.wizard.common.messages.observer.UserInputMessage;
 import eu.jonahbauer.wizard.common.messages.player.PlayerMessage;
@@ -16,7 +16,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 
-import static eu.jonahbauer.wizard.core.states.GameData.*;
+import static eu.jonahbauer.wizard.core.machine.states.GameData.*;
 import static eu.jonahbauer.wizard.common.messages.observer.UserInputMessage.Action.MAKE_PREDICTION;
 
 @Getter

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/round/RoundState.java

@@ -1,11 +1,11 @@
-package eu.jonahbauer.wizard.core.states.round;
+package eu.jonahbauer.wizard.core.machine.states.round;
 
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.states.GameState;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.machine.GameState;
 
 import java.util.UUID;
 
-import static eu.jonahbauer.wizard.core.states.GameData.*;
+import static eu.jonahbauer.wizard.core.machine.states.GameData.*;
 
 public abstract class RoundState extends GameState {
     public static GameData requirements(GameData data) {

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/round/StartingRound.java

@@ -1,8 +1,8 @@
-package eu.jonahbauer.wizard.core.states.round;
+package eu.jonahbauer.wizard.core.machine.states.round;
 
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.core.states.GameState;
-import eu.jonahbauer.wizard.core.states.GameData;
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.machine.GameState;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
 
 import java.util.Optional;
 

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

@@ -1,19 +1,19 @@
-package eu.jonahbauer.wizard.core.states.trick;
+package eu.jonahbauer.wizard.core.machine.states.trick;
 
 import eu.jonahbauer.wizard.common.model.Card;
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.core.states.GameState;
-import eu.jonahbauer.wizard.core.states.InvalidDataException;
-import eu.jonahbauer.wizard.core.states.round.ChangingPrediction;
-import eu.jonahbauer.wizard.core.states.round.FinishingRound;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.machine.GameState;
+import eu.jonahbauer.wizard.core.machine.states.InvalidDataException;
+import eu.jonahbauer.wizard.core.machine.states.round.ChangingPrediction;
+import eu.jonahbauer.wizard.core.machine.states.round.FinishingRound;
 import eu.jonahbauer.wizard.common.messages.observer.TrickMessage;
 import eu.jonahbauer.wizard.core.model.card.*;
-import eu.jonahbauer.wizard.common.util.Pair;
+import eu.jonahbauer.wizard.core.util.Pair;
 
 import java.util.*;
 
-import static eu.jonahbauer.wizard.core.states.GameData.*;
+import static eu.jonahbauer.wizard.core.machine.states.GameData.*;
 
 public final class FinishingTrick extends TrickState {
 

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

@@ -1,4 +1,4 @@
-package eu.jonahbauer.wizard.core.states.trick;
+package eu.jonahbauer.wizard.core.machine.states.trick;
 
 import eu.jonahbauer.wizard.common.messages.observer.HandMessage;
 import eu.jonahbauer.wizard.common.messages.observer.TimeoutMessage;
@@ -6,15 +6,15 @@ 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;
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.states.GameState;
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.machine.GameState;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 import static eu.jonahbauer.wizard.common.messages.observer.UserInputMessage.Action.*;
-import static eu.jonahbauer.wizard.core.states.GameData.*;
+import static eu.jonahbauer.wizard.core.machine.states.GameData.*;
 
 public final class Juggling extends TrickState {
     private final transient Map<UUID, Card> juggledCards = new ConcurrentHashMap<>();

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

@@ -1,22 +1,22 @@
-package eu.jonahbauer.wizard.core.states.trick;
+package eu.jonahbauer.wizard.core.machine.states.trick;
 
 import eu.jonahbauer.wizard.common.messages.observer.TimeoutMessage;
 import eu.jonahbauer.wizard.common.model.Card;
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.core.states.GameState;
-import eu.jonahbauer.wizard.core.states.InvalidDataException;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.machine.GameState;
+import eu.jonahbauer.wizard.core.machine.states.InvalidDataException;
 import eu.jonahbauer.wizard.common.messages.observer.CardMessage;
 import eu.jonahbauer.wizard.common.messages.observer.UserInputMessage;
 import eu.jonahbauer.wizard.common.messages.player.PlayCardMessage;
 import eu.jonahbauer.wizard.common.messages.player.PlayerMessage;
 import eu.jonahbauer.wizard.core.model.card.GameCards;
-import eu.jonahbauer.wizard.common.util.Pair;
+import eu.jonahbauer.wizard.core.util.Pair;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
-import static eu.jonahbauer.wizard.core.states.GameData.*;
+import static eu.jonahbauer.wizard.core.machine.states.GameData.*;
 import static eu.jonahbauer.wizard.common.messages.observer.UserInputMessage.Action.PLAY_CARD;
 
 public final class PlayingCard extends TrickState {

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/trick/StartingTrick.java

@@ -1,8 +1,8 @@
-package eu.jonahbauer.wizard.core.states.trick;
+package eu.jonahbauer.wizard.core.machine.states.trick;
 
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.core.states.GameState;
-import eu.jonahbauer.wizard.core.states.GameData;
+import eu.jonahbauer.wizard.core.machine.Game;
+import eu.jonahbauer.wizard.core.machine.GameState;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
 
 import java.util.Optional;
 

wizard-core/src/main/java/eu/jonahbauer/wizard/core/machine/states/trick/TrickState.java

@@ -1,9 +1,9 @@
-package eu.jonahbauer.wizard.core.states.trick;
+package eu.jonahbauer.wizard.core.machine.states.trick;
 
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.states.round.RoundState;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.machine.states.round.RoundState;
 
-import static eu.jonahbauer.wizard.core.states.GameData.*;
+import static eu.jonahbauer.wizard.core.machine.states.GameData.*;
 
 public abstract class TrickState extends RoundState {
     public static GameData requirements(GameData data) {

wizard-core/src/main/java/eu/jonahbauer/wizard/core/messages/Observer.java

@@ -1,4 +1,4 @@
-package eu.jonahbauer.wizard.core;
+package eu.jonahbauer.wizard.core.messages;
 
 import eu.jonahbauer.wizard.common.messages.observer.ObserverMessage;
 

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 package eu.jonahbauer.wizard.core.model.card;
 
 import eu.jonahbauer.wizard.common.model.Card;
-import eu.jonahbauer.wizard.common.util.Pair;
+import eu.jonahbauer.wizard.core.util.Pair;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.Contract;

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

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

wizard-core/src/main/java/eu/jonahbauer/wizard/core/states/TransientState.java

@@ -1,4 +0,0 @@
-package eu.jonahbauer.wizard.core.states;
-
-public interface TransientState {
-}

wizard-core/src/main/java/eu/jonahbauer/wizard/core/states/game/Starting.java

@@ -1,22 +0,0 @@
-package eu.jonahbauer.wizard.core.states.game;
-
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.states.GameState;
-import eu.jonahbauer.wizard.core.states.round.StartingRound;
-
-import java.util.Optional;
-
-import static eu.jonahbauer.wizard.core.states.GameData.PLAYERS;
-
-public final class Starting extends GameState {
-
-    public Starting(GameData data) {
-        super(data.require(PLAYERS));
-    }
-
-    @Override
-    public Optional<GameState> onEnter(Game game) {
-        return transition(new StartingRound(getData()));
-    }
-}

wizard-core/src/main/java/eu/jonahbauer/wizard/core/states/round/DeterminingTrump.java

@@ -1,56 +0,0 @@
-package eu.jonahbauer.wizard.core.states.round;
-
-import eu.jonahbauer.wizard.common.model.Card;
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.Game;
-import eu.jonahbauer.wizard.common.messages.observer.TrumpMessage;
-import eu.jonahbauer.wizard.core.states.GameState;
-import eu.jonahbauer.wizard.core.model.card.GameCards;
-
-import java.util.*;
-
-import static eu.jonahbauer.wizard.core.states.GameData.*;
-
-public final class DeterminingTrump extends RoundState {
-
-    public DeterminingTrump(GameData data) {
-        super(data.require(TRUMP_CARD).requireEach(PLAYERS, HANDS));
-    }
-
-    @Override
-    public Optional<GameState> onEnter(Game game) {
-        Card trumpCard = get(TRUMP_CARD);
-
-        // handle werewolf
-        for (Map.Entry<UUID, List<Card>> entry : get(HANDS).entrySet()) {
-            var player = entry.getKey();
-            var hand = entry.getValue();
-            if (hand.contains(Card.WEREWOLF)) {
-                game.notify(new TrumpMessage(trumpCard, null));
-                game.notify(new TrumpMessage(Card.WEREWOLF, null));
-
-                var data = getData().with(CURRENT_PLAYER, player);
-                return sync(data, DeterminingTrumpUserInput::new);
-            }
-        }
-
-        // default trump handling
-        Card.Suit trumpSuit = trumpCard != null ? GameCards.get(trumpCard).getTrumpSuit() : Card.Suit.NONE;
-        if (trumpSuit == null) {
-            var player = getDealer();
-            game.notify(new TrumpMessage(trumpCard, null));
-
-            var data = getData().with(CURRENT_PLAYER, player);
-            return sync(data, DeterminingTrumpUserInput::new);
-        } else {
-            var data = getData().with(
-                    TRUMP_SUIT, trumpSuit,
-                    CURRENT_PLAYER, getNextPlayer(getDealer())
-            );
-
-            game.notify(new TrumpMessage(get(TRUMP_CARD), trumpSuit));
-
-            return sync(data, Predicting::new);
-        }
-    }
-}

wizard-core/src/main/java/eu/jonahbauer/wizard/core/util/Pair.java

@@ -1,4 +1,4 @@
-package eu.jonahbauer.wizard.common.util;
+package eu.jonahbauer.wizard.core.util;
 
 import java.util.Map;
 

wizard-core/src/main/java/eu/jonahbauer/wizard/core/util/Util.java

@@ -1,11 +1,11 @@
-package eu.jonahbauer.wizard.common.util;
+package eu.jonahbauer.wizard.core.util;
 
 import lombok.experimental.UtilityClass;
 
 import java.util.Locale;
 
 @UtilityClass
-public class StringUtil {
+public class Util {
     public static String toSnakeCase(String str) {
         return str.replaceAll("([a-z])([A-Z]+)", "$1_$2").toLowerCase(Locale.ROOT);
     }

wizard-core/src/main/java/module-info.java

@@ -1,8 +0,0 @@
-module eu.jonahbauer.wizard.core {
-    exports eu.jonahbauer.wizard.core;
-
-    requires eu.jonahbauer.wizard.common;
-
-    requires static lombok;
-    requires static org.jetbrains.annotations;
-}

wizard-core/src/test/java/eu/jonahbauer/wizard/core/machine/GameTest.java

@@ -1,7 +1,6 @@
-package eu.jonahbauer.wizard.core;
+package eu.jonahbauer.wizard.core.machine;
 
-import eu.jonahbauer.wizard.common.model.Configuration;
-import eu.jonahbauer.wizard.core.Game;
+import eu.jonahbauer.wizard.core.model.Configurations;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.RepetitionInfo;
 
@@ -14,7 +13,7 @@ public class GameTest {
     public void runDefault(RepetitionInfo repetitionInfo) throws InterruptedException, ExecutionException {
         Game game = new Game(
                 repetitionInfo.getCurrentRepetition(),
-                Configuration.DEFAULT, 0, 0,
+                Configurations.DEFAULT.withTimeout(0).withSyncTimeout(0),
                 (player, msg) -> System.out.println(msg)
         );
         var players = List.of(
@@ -32,7 +31,7 @@ public class GameTest {
     public void runAnniversary2016(RepetitionInfo repetitionInfo) throws InterruptedException, ExecutionException {
         Game game = new Game(
                 repetitionInfo.getCurrentRepetition(),
-                Configuration.ANNIVERSARY_2016, 0, 0,
+                Configurations.ANNIVERSARY_2016.withTimeout(0).withSyncTimeout(0),
                 (player, msg) -> System.out.println(msg)
         );
         var players = List.of(
@@ -50,7 +49,7 @@ public class GameTest {
     public void runAnniversary2021(RepetitionInfo repetitionInfo) throws InterruptedException, ExecutionException {
         Game game = new Game(
                 repetitionInfo.getCurrentRepetition(),
-                Configuration.ANNIVERSARY_2021, 0, 0,
+                Configurations.ANNIVERSARY_2021.withTimeout(0).withSyncTimeout(0),
                 (player, msg) -> System.out.println(msg)
         );
         var players = List.of(

wizard-core/src/test/java/eu/jonahbauer/wizard/core/machine/GameTestUtils.java

@@ -1,6 +1,6 @@
-package eu.jonahbauer.wizard.core;
+package eu.jonahbauer.wizard.core.machine;
 
-import eu.jonahbauer.wizard.core.states.game.Finished;
+import eu.jonahbauer.wizard.core.machine.states.game.Finished;
 import lombok.experimental.UtilityClass;
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;

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

@@ -1,11 +1,11 @@
-package eu.jonahbauer.wizard.core;
+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;
-import eu.jonahbauer.wizard.core.states.GameData;
-import eu.jonahbauer.wizard.core.states.GameState;
+import eu.jonahbauer.wizard.core.machine.states.GameData;
+import eu.jonahbauer.wizard.core.messages.Observer;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;