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

bugfixes

Browse Source
This commit is contained in:
Jonah Bauer
2022-01-12 12:51:22 +01:00
parent ec77b05b0d
commit 2375a5ed83
35 changed files with 102 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/Client.java
View File

@@ -28,7 +28,11 @@ public class Client extends TimeoutContext<ClientState, Client> {
@Override
protected void handleError(Throwable t) {
// TODO better error handling
t.printStackTrace();
log.error("", t);
var menu = new Menu();
forceTransition(menu);
menu.onEnter(this);
}
public void setSocket(ClientSocket socket) {
@@ -39,15 +43,27 @@ public class Client extends TimeoutContext<ClientState, Client> {
}
public void onOpen() {
execute(s -> s.onOpen(this));
try {
execute(s -> s.onOpen(this));
} catch (Throwable t) {
handleError(t);
}
}
public void onClose(int code, String reason, boolean remote) {
execute(s -> s.onClose(this, code, reason, remote));
try {
execute(s -> s.onClose(this, code, reason, remote));
} catch (Throwable t) {
handleError(t);
}
}
public void onMessage(ServerMessage message) {
execute(s -> s.onMessage(this, message));
try {
execute(s -> s.onMessage(this, message));
} catch (Throwable t) {
handleError(t);
}
}
@Override

2
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/ClientSocket.java
View File

@@ -39,7 +39,7 @@ public class ClientSocket extends WebSocketClient {
@Override
public void onError(Exception e) {
e.printStackTrace();
log.error("", e);
close(CloseFrame.ABNORMAL_CLOSE, e.getMessage());
}

2
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/game/overlay/ChangePredictionOverlay.java → wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actions/overlay/ChangePredictionOverlay.java
View File

@@ -1,4 +1,4 @@
package eu.jonahbauer.wizard.client.libgdx.actors.game.overlay;
package eu.jonahbauer.wizard.client.libgdx.actions.overlay;
import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup;
import eu.jonahbauer.wizard.client.libgdx.actors.game.CardActor;

5
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actions/overlay/InteractionOverlay.java Normal file
View File

@@ -0,0 +1,5 @@
package eu.jonahbauer.wizard.client.libgdx.actions.overlay;
public interface InteractionOverlay {
void close();
}

2
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/game/overlay/MakePredictionOverlay.java → wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actions/overlay/MakePredictionOverlay.java
View File

@@ -1,4 +1,4 @@
package eu.jonahbauer.wizard.client.libgdx.actors.game.overlay;
package eu.jonahbauer.wizard.client.libgdx.actions.overlay;
import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup;

2
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/game/overlay/Overlay.java → wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actions/overlay/Overlay.java
View File

@@ -1,4 +1,4 @@
package eu.jonahbauer.wizard.client.libgdx.actors.game.overlay;
package eu.jonahbauer.wizard.client.libgdx.actions.overlay;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureAtlas;

2
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/game/overlay/PickTrumpOverlay.java → wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actions/overlay/PickTrumpOverlay.java
View File

@@ -1,4 +1,4 @@
package eu.jonahbauer.wizard.client.libgdx.actors.game.overlay;
package eu.jonahbauer.wizard.client.libgdx.actions.overlay;
import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.InputEvent;

2
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/game/overlay/PlayColoredCardOverlay.java → wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actions/overlay/PlayColoredCardOverlay.java
View File

@@ -1,4 +1,4 @@
package eu.jonahbauer.wizard.client.libgdx.actors.game.overlay;
package eu.jonahbauer.wizard.client.libgdx.actions.overlay;
import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.InputEvent;

2
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/game/overlay/StartRoundOverlay.java → wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actions/overlay/StartRoundOverlay.java
View File

@@ -1,4 +1,4 @@
package eu.jonahbauer.wizard.client.libgdx.actors.game.overlay;
package eu.jonahbauer.wizard.client.libgdx.actions.overlay;
import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.Group;

8
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/game/overlay/TrumpOverlay.java → wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actions/overlay/TrumpOverlay.java
View File

@@ -1,4 +1,4 @@
package eu.jonahbauer.wizard.client.libgdx.actors.game.overlay;
package eu.jonahbauer.wizard.client.libgdx.actions.overlay;
import com.badlogic.gdx.math.Interpolation;
import com.badlogic.gdx.scenes.scene2d.Actor;
@@ -85,7 +85,7 @@ public class TrumpOverlay extends Overlay {
);
private final @Nullable String player;
private final @NotNull Card card;
private final @Nullable Card card;
private final @Nullable Card.Suit suit;
private final @NotNull CardActor trumpCardActor;
@@ -93,7 +93,7 @@ public class TrumpOverlay extends Overlay {
private boolean animateCard = true;
public TrumpOverlay(@NotNull GameScreen gameScreen, @Nullable String player, @NotNull Card card, @Nullable Card.Suit suit) {
public TrumpOverlay(@NotNull GameScreen gameScreen, @Nullable String player, @Nullable Card card, @Nullable Card.Suit suit) {
super(gameScreen, Long.MAX_VALUE);
this.player = player;
this.card = card;
@@ -140,7 +140,7 @@ public class TrumpOverlay extends Overlay {
} else {
trumpCardActor.remove();
cardGroup.addActor(trumpCardActor);
trumpCardActor.setCard(card);
trumpCardActor.setCard(card != null ? card : Card.HIDDEN);
}
trumpSuitActor.remove();

5
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/game/overlay/InteractionOverlay.java
View File

@@ -1,5 +0,0 @@
package eu.jonahbauer.wizard.client.libgdx.actors.game.overlay;
public interface InteractionOverlay {
void close();
}

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

@@ -16,11 +16,11 @@ import com.badlogic.gdx.utils.I18NBundle;
import eu.jonahbauer.wizard.client.libgdx.AnimationTimings;
import eu.jonahbauer.wizard.client.libgdx.GameAtlas;
import eu.jonahbauer.wizard.client.libgdx.WizardGame;
import eu.jonahbauer.wizard.client.libgdx.actions.overlay.*;
import eu.jonahbauer.wizard.client.libgdx.actors.game.CardActor;
import eu.jonahbauer.wizard.client.libgdx.actors.game.CardStack;
import eu.jonahbauer.wizard.client.libgdx.actors.game.CardsGroup;
import eu.jonahbauer.wizard.client.libgdx.actors.game.PadOfTruth;
import eu.jonahbauer.wizard.client.libgdx.actors.game.overlay.*;
import eu.jonahbauer.wizard.client.libgdx.state.Game;
import eu.jonahbauer.wizard.common.messages.observer.UserInputMessage;
import eu.jonahbauer.wizard.common.model.Card;
@@ -451,7 +451,7 @@ public class GameScreen extends MenuScreen {
}
//<editor-fold desc="Overlays" defaultstate="collapsed">
public void showTrumpOverlay(@Nullable UUID player, @NotNull Card trumpCard, @Nullable Card.Suit trumpSuit) {
public void showTrumpOverlay(@Nullable UUID player, @Nullable Card trumpCard, @Nullable Card.Suit trumpSuit) {
if (trumpCardActor == null) {
trumpCardActor = new CardActor(Card.HIDDEN, atlas);
}
@@ -489,7 +489,7 @@ public class GameScreen extends MenuScreen {
delay(AnimationTimings.OVERLAY_HOLD),
parallel(
targeting(padOfTruth, scaleTo(PadOfTruth.COLLAPSED_SCALE, PadOfTruth.COLLAPSED_SCALE, AnimationTimings.OVERLAY_SHARED_ELEMENT)),
targeting(padOfTruth, moveTo(WizardGame.WIDTH - 10 - PadOfTruth.EXTENDED_WIDTH, 10))
targeting(padOfTruth, moveTo(WizardGame.WIDTH - 10 - PadOfTruth.EXTENDED_WIDTH, 10, AnimationTimings.OVERLAY_SHARED_ELEMENT))
),
run(() -> padOfTruth.setEnabled(true))
));

2
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/MenuScreen.java
View File

@@ -8,7 +8,7 @@ import eu.jonahbauer.wizard.client.libgdx.WizardGame;
public abstract class MenuScreen implements Screen {
protected final float BUTTON_BAR_Y = WizardGame.HEIGHT * 0.15f;
protected WizardGame game;
protected final WizardGame game;
public MenuScreen(WizardGame game) {
this.game = game;

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

@@ -29,9 +29,7 @@ public class WaitingScreen extends MenuScreen {
private Label labelPlayerName;
private List<PlayerData> players;
private AutoFocusScrollPane listContainer;
private final ChangeListener listener = new ChangeListener() {
@Override
public void changed(ChangeEvent event, Actor actor) {
@@ -81,7 +79,7 @@ public class WaitingScreen extends MenuScreen {
}
};
listContainer = new AutoFocusScrollPane(players, game.data.skin);
var listContainer = new AutoFocusScrollPane(players, game.data.skin);
listContainer.layout();
var content = new HorizontalGroup().grow().space(20);

2
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/state/Awaiting.java
View File

@@ -11,7 +11,7 @@ import java.util.Optional;
public abstract class Awaiting extends BaseState implements ClientState {
@Override
public Optional<ClientState> onMessage(Client client, ServerMessage message) {
return unexpectedMessage(client, message);
return unexpectedMessage(message);
}
@Override

2
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/state/BaseState.java
View File

@@ -29,7 +29,7 @@ public abstract class BaseState implements ClientState {
return Optional.of(new Menu());
}
protected static Optional<ClientState> unexpectedMessage(Client client, ServerMessage message) {
protected static Optional<ClientState> unexpectedMessage(ServerMessage message) {
// return to menu on unexpected message
log.fatal("Unexpected message {}. Returning to menu.", message);
return Optional.of(new Menu());

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

@@ -1,7 +1,7 @@
package eu.jonahbauer.wizard.client.libgdx.state;
import eu.jonahbauer.wizard.client.libgdx.Client;
import eu.jonahbauer.wizard.client.libgdx.actors.game.overlay.InteractionOverlay;
import eu.jonahbauer.wizard.client.libgdx.actions.overlay.InteractionOverlay;
import eu.jonahbauer.wizard.client.libgdx.screens.GameScreen;
import eu.jonahbauer.wizard.client.libgdx.util.Pair;
import eu.jonahbauer.wizard.common.messages.client.InteractionMessage;
@@ -14,10 +14,15 @@ 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.model.Configuration;
import lombok.Data;
import lombok.Getter;
import lombok.experimental.Accessors;
import lombok.extern.log4j.Log4j2;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.Range;
import org.jetbrains.annotations.Unmodifiable;
import java.lang.ref.WeakReference;
import java.time.Instant;
@@ -34,6 +39,7 @@ public final class Game extends BaseState {
private final UUID self;
private final UUID session;
private final String sessionName;
private final Configuration configuration;
private final String secret;
private final LinkedHashMap<UUID, String> players;
@@ -59,10 +65,11 @@ public final class Game extends BaseState {
private Card juggleCard;
private boolean werewolf;
public Game(UUID self, UUID session, String sessionName, String secret, LinkedHashMap<UUID, String> players) {
public Game(UUID self, UUID session, String sessionName, Configuration configuration, String secret, LinkedHashMap<UUID, String> players) {
this.self = self;
this.session = session;
this.sessionName = sessionName;
this.configuration = configuration;
this.secret = secret;
this.players = players;
}
@@ -117,12 +124,12 @@ public final class Game extends BaseState {
}
return Optional.empty();
} else if (message instanceof NackMessage nack) {
return onNackMessage(client, message, nack);
return onNackMessage(nack);
} else if (message instanceof AckMessage) {
onAckMessage();
return Optional.empty();
} else {
return unexpectedMessage(client, message);
return unexpectedMessage(message);
}
} finally {
if (pendingClearActivePlayer > 0 && --pendingClearActivePlayer == 0) {
@@ -165,7 +172,7 @@ public final class Game extends BaseState {
log.error("The game has finished with an error.");
}
private void onHandMessage(UUID player, List<Card> hand) {
private void onHandMessage(@NotNull UUID player, @Unmodifiable @NotNull List<@NotNull Card> hand) {
checkPlayer(player);
log.info("{} hand cards are: {}", nameOf(player, true, true), hand);
@@ -178,7 +185,7 @@ public final class Game extends BaseState {
juggling = false;
}
private void onPredictionMessage(UUID player, int prediction) {
private void onPredictionMessage(@NotNull UUID player, @Range(from = 0, to = Integer.MAX_VALUE) int prediction) {
checkPlayer(player);
checkActivePlayer(player, MAKE_PREDICTION, CHANGE_PREDICTION);
log.info("{} predicted: {}", nameOf(player, true, false), prediction);
@@ -190,13 +197,13 @@ public final class Game extends BaseState {
gameScreen.addPrediction(round, player, prediction, changed);
}
private void onTrumpMessage(Card trumpCard, Card.Suit trumpSuit) {
private void onTrumpMessage(@Nullable Card trumpCard, @Nullable Card.Suit trumpSuit) {
if (trumpCard == null) {
log.info("There is no trump in this round.");
} else {
log.info("The trump suit is {} ({}).", trumpSuit != null ? trumpSuit : "yet to be determined.", trumpCard);
}
var player = currentInteraction != null && currentInteraction.action() == PICK_TRUMP ? currentInteraction.player() : null;
finishInteraction();
this.trumpCard = trumpCard;
@@ -205,11 +212,11 @@ public final class Game extends BaseState {
werewolf = true;
} else {
werewolf = false;
gameScreen.showTrumpOverlay(null, trumpCard, trumpSuit);
gameScreen.showTrumpOverlay(player, trumpCard, trumpSuit);
}
}
private void onTrickMessage(UUID player, List<Card> cards) {
private void onTrickMessage(@NotNull UUID player, @Unmodifiable @NotNull List<@NotNull Card> cards) {
checkPlayer(player);
log.info("This trick {} goes to {}.", cards, nameOf(player));
@@ -219,7 +226,7 @@ public final class Game extends BaseState {
gameScreen.finishTrick(player);
}
private void onCardMessage(UUID player, Card card) {
private void onCardMessage(@NotNull UUID player, @NotNull Card card) {
checkPlayer(player);
checkActivePlayer(player, PLAY_CARD);
log.info("{} played {}.", nameOf(player, true, false), card);
@@ -242,14 +249,14 @@ public final class Game extends BaseState {
gameScreen.playCard(player, handCard);
}
private void onScoreMessage(Map<UUID, Integer> points) {
private void onScoreMessage(@Unmodifiable Map<@NotNull UUID, @NotNull Integer> points) {
log.info("The scores are as follows: " + points);
points.forEach((player, p) -> scores.merge(player, p, Integer::sum));
gameScreen.addScores(round, points);
gameScreen.showScoreOverlay();
}
private void onUserInputMessage(UUID player, UserInputMessage.Action action, long timeout) {
private void onUserInputMessage(@Nullable UUID player, @NotNull UserInputMessage.Action action, long timeout) {
checkPlayer(player);
log.info(
"Waiting for input {} from {}. (times out at {})",
@@ -264,7 +271,7 @@ public final class Game extends BaseState {
currentInteraction = new Interaction(player, action, timeout);
gameScreen.setActivePlayer(player, action, timeout);
if (werewolf && action == PICK_TRUMP) {
if (player != null && werewolf && action == PICK_TRUMP) {
gameScreen.swapTrumpCard(player);
}
@@ -289,7 +296,7 @@ public final class Game extends BaseState {
gameScreen.timeout();
}
private Optional<ClientState> onNackMessage(Client client, ServerMessage message, NackMessage nack) {
private Optional<ClientState> onNackMessage(@NotNull NackMessage nack) {
sending.set(false);
if (isActive() && currentInteraction.action() == JUGGLE_CARD && juggleCard != null) {
@@ -303,7 +310,7 @@ public final class Game extends BaseState {
gameScreen.ready(false);
return Optional.empty();
} else {
return unexpectedMessage(client, message);
return unexpectedMessage(nack);
}
}
@@ -321,7 +328,7 @@ public final class Game extends BaseState {
//</editor-fold>
//<editor-fold desc="Screen Callbacks" defaultstate="collapsed">
public Optional<ClientState> onCardClicked(Client client, Card card) {
public Optional<ClientState> onCardClicked(Client client, @NotNull Card card) {
if (isActive()) {
if (currentInteraction.action() == PLAY_CARD) {
if (card == Card.CLOUD || card == Card.JUGGLER) {
@@ -342,7 +349,7 @@ public final class Game extends BaseState {
return Optional.empty();
}
public Optional<ClientState> onSuitClicked(Client client, Card.Suit suit) {
public Optional<ClientState> onSuitClicked(Client client, @NotNull Card.Suit suit) {
if (isActive() && currentInteraction.action() == PICK_TRUMP) {
send(client, new PickTrumpMessage(suit));
} else {
@@ -371,7 +378,7 @@ public final class Game extends BaseState {
private Optional<ClientState> returnToSession() {
return Optional.of(new Session(
new SessionData(session, sessionName, -1, null),
new SessionData(session, sessionName, -1, configuration),
players.entrySet().stream()
.map(entry -> new PlayerData(entry.getKey(), entry.getValue(), false))
.toList(),

2
wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/state/Lobby.java
View File

@@ -63,7 +63,7 @@ public final class Lobby extends BaseState {
}
return Optional.empty();
} else {
return unexpectedMessage(client, message);
return unexpectedMessage(message);
}
}

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

@@ -24,7 +24,7 @@ public final class Session extends BaseState {
private final UUID session;
private final String sessionName;
private final Configuration configuration;
private final List<PlayerData> players = new ArrayList<>();
private final Map<UUID, PlayerData> players = new LinkedHashMap<>();
private boolean sending;
@@ -32,7 +32,7 @@ public final class Session extends BaseState {
this.session = session.getUuid();
this.sessionName = session.getName();
this.configuration = session.getConfiguration();
this.players.addAll(players);
players.forEach(player -> this.players.put(player.getUuid(), player));
this.self = self;
this.secret = secret;
@@ -42,7 +42,7 @@ public final class Session extends BaseState {
public Optional<ClientState> onEnter(Client client) {
sessionScreen = new WaitingScreen(client.getGame());
client.getGame().setScreen(sessionScreen);
sessionScreen.setPlayers(players.toArray(new PlayerData[0]));
sessionScreen.setPlayers(players.values().toArray(new PlayerData[0]));
sessionScreen.setReady(false);
sessionScreen.setPlayerName(getName());
sessionScreen.setSession(session, sessionName, configuration);
@@ -53,19 +53,20 @@ public final class Session extends BaseState {
@Override
public Optional<ClientState> onMessage(Client client, ServerMessage message) {
if (message instanceof PlayerJoinedMessage join) {
sessionScreen.addPlayer(join.getPlayer());
players.add(join.getPlayer());
var player = join.getPlayer();
sessionScreen.addPlayer(player);
players.put(player.getUuid(), player);
return Optional.empty();
} else if (message instanceof PlayerLeftMessage leave) {
sessionScreen.removePlayer(leave.getPlayer());
players.remove(new PlayerData(leave.getPlayer(), null, false));
var player = leave.getPlayer();
sessionScreen.removePlayer(player);
players.remove(player);
return Optional.empty();
} else if (message instanceof PlayerModifiedMessage modified) {
var player = modified.getPlayer();
sessionScreen.modifyPlayer(player);
players.remove(player);
players.add(player);
players.put(player.getUuid(), player);
if (self.equals(player.getUuid())) {
sessionScreen.setReady(player.isReady());
@@ -74,8 +75,8 @@ public final class Session extends BaseState {
return Optional.empty();
} else if (message instanceof StartingGameMessage) {
var players = new LinkedHashMap<UUID, String>();
this.players.forEach(player -> players.put(player.getUuid(), player.getName()));
return Optional.of(new Game(self, session, sessionName, secret, players));
this.players.forEach((uuid, player) -> players.put(uuid, player.getName()));
return Optional.of(new Game(self, session, sessionName, configuration, secret, players));
} else if (sending && message instanceof NackMessage nack) {
// TODO display error
log.error(nack.getMessage());
@@ -87,7 +88,7 @@ public final class Session extends BaseState {
sessionScreen.setSending(false);
return Optional.empty();
} else {
return unexpectedMessage(client, message);
return unexpectedMessage(message);
}
}
@@ -112,7 +113,7 @@ public final class Session extends BaseState {
}
private boolean isReady() {
for (PlayerData player : players) {
for (PlayerData player : players.values()) {
if (self.equals(player.getUuid())) {
return player.isReady();
}
@@ -121,7 +122,7 @@ public final class Session extends BaseState {
}
private String getName() {
for (PlayerData player : players) {
for (PlayerData player : players.values()) {
if (self.equals(player.getUuid())) {
return player.getName();
}