Skip to content

Split player into PlayerIdentity and PlayerState #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bladh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Split player into PlayerIdentity and PlayerState #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/me/ars/pokerbot/irc/Irc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.ars.pokerbot.irc;

import me.ars.pokerbot.poker.Player;
import me.ars.pokerbot.poker.PlayerIdentifier;

import java.util.List;

Expand All @@ -12,7 +12,7 @@ public interface Irc {
* @param player
* @param message
*/
void message(Player player, String message);
void message(PlayerIdentifier player, String message);

void gameEnded(List<Player> players);
void gameEnded(List<PlayerIdentifier> players);
}
4 changes: 2 additions & 2 deletions src/main/java/me/ars/pokerbot/irc/IrcPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package me.ars.pokerbot.irc;

import me.ars.pokerbot.poker.Player;
import me.ars.pokerbot.poker.PlayerIdentifier;

public class IrcPlayer extends Player {
public class IrcPlayer extends PlayerIdentifier {

private String nick;
private String login;
Expand Down
40 changes: 20 additions & 20 deletions src/main/java/me/ars/pokerbot/irc/IrcStateCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import me.ars.pokerbot.poker.Card;
import me.ars.pokerbot.poker.Hand;
import me.ars.pokerbot.poker.Player;
import me.ars.pokerbot.poker.PlayerIdentifier;
import me.ars.pokerbot.poker.StateCallback;

import java.util.Arrays;
Expand Down Expand Up @@ -67,7 +67,7 @@ private String renderCard(Card card) {
return Formatting.BOLD + color + valueStr + suit + Formatting.CLEAR;
}

private String renderNick(Player player) {
private String renderNick(PlayerIdentifier player) {
return Formatting.BOLD + player.getName() + Formatting.CLEAR;
}

Expand All @@ -78,17 +78,17 @@ private String renderHand(Hand hand) {
}

@Override
public void playerCalled(Player player, int money) {
public void playerCalled(PlayerIdentifier player, int money) {
ircBot.message(channel, renderNick(player) + " called! (" + moneyString(money) + ")");
}

@Override
public void playerRaised(Player player, int newRaise) {
public void playerRaised(PlayerIdentifier player, int newRaise) {
ircBot.message(channel, renderNick(player) + " raised " + moneyString(newRaise) + ".");
}

@Override
public void playerChecked(Player player) {
public void playerChecked(PlayerIdentifier player) {
// Too verbose. Skip
}

Expand All @@ -98,7 +98,7 @@ public void announce(String message) {
}

@Override
public void updateTable(List<Card> table, int pot, Player currentPlayer) {
public void updateTable(List<Card> table, int pot, PlayerIdentifier currentPlayer) {
final String tableStr = table.isEmpty() ? "no cards" : table.stream()
.map(this::renderCard).collect(Collectors.joining(", "));
if (currentPlayer == null) {
Expand All @@ -110,32 +110,32 @@ public void updateTable(List<Card> table, int pot, Player currentPlayer) {
}

@Override
public void mustCallRaise(Player player, int amountOwed) {
public void mustCallRaise(PlayerIdentifier player, int amountOwed) {
ircBot.message(channel, renderNick(player) + " must at least call last raise (" + moneyString(amountOwed) + ").");
}

@Override
public void playerCannotRaise(Player player, int money) {
public void playerCannotRaise(PlayerIdentifier player, int money) {
ircBot.message(channel, renderNick(player) + " doesn't have enough money to make the raise. They only have " + moneyString(money) + ".");
}

@Override
public void playerAllin(Player player) {
public void playerAllin(PlayerIdentifier player) {
ircBot.message(channel, renderNick(player) + " goes all in!");
}

@Override
public void playerFolded(Player player) {
public void playerFolded(PlayerIdentifier player) {
// Too verbose. Skip.
}

@Override
public void playerCashedOut(Player player, int money) {
public void playerCashedOut(PlayerIdentifier player, int money) {
ircBot.message(channel, renderNick(player) + " cashed out with " + moneyString(money) + "!");
}

@Override
public void showPlayerCards(Player player, Card card1, Card card2, Card spyCard) {
public void showPlayerCards(PlayerIdentifier player, Card card1, Card card2, Card spyCard) {
final StringBuilder sb = new StringBuilder();
sb.append("[").append(channel).append("] Your cards: ").append(renderCard(card1)).append(", ").append(renderCard(card2));
if (spyCard != null) {
Expand All @@ -145,14 +145,14 @@ public void showPlayerCards(Player player, Card card1, Card card2, Card spyCard)
}

@Override
public void showPlayers(Map<Player, Integer> players) {
public void showPlayers(Map<PlayerIdentifier, Integer> players) {
ircBot.message(channel, players.keySet().stream()
.map(player -> "[" + renderNick(player) + " - " + moneyString(players.get(player)) + "]")
.collect(Collectors.joining(" ")));
}

@Override
public void revealPlayers(Map<Player, List<Card>> reveal) {
public void revealPlayers(Map<PlayerIdentifier, List<Card>> reveal) {
ircBot.message(channel, reveal.keySet().stream()
.map(player -> "[" + renderNick(player) + " - " +
renderCard(reveal.get(player).get(0)) + ", " +
Expand All @@ -161,7 +161,7 @@ public void revealPlayers(Map<Player, List<Card>> reveal) {
}

@Override
public void declareWinner(Player player, Hand winningHand, int pot) {
public void declareWinner(PlayerIdentifier player, Hand winningHand, int pot) {
final StringBuilder sb = new StringBuilder();
sb.append(renderNick(player)).append(" wins ").append(moneyString(pot));
if (winningHand != null) {
Expand All @@ -172,15 +172,15 @@ public void declareWinner(Player player, Hand winningHand, int pot) {
}

@Override
public void declareSplitPot(List<Player> winners, Hand.HandType handType, int pot) {
public void declareSplitPot(List<PlayerIdentifier> winners, Hand.HandType handType, int pot) {
ircBot.message(channel,
"Split pot between "
+ winners.stream().map(Player::getName).collect(Collectors.joining(", "))
+ winners.stream().map(PlayerIdentifier::getName).collect(Collectors.joining(", "))
+ " (each with a " + handType + ").");
}

@Override
public void declarePlayerTurn(Player player) {
public void declarePlayerTurn(PlayerIdentifier player) {
ircBot.message(channel, renderNick(player) + "'s turn!");
}

Expand All @@ -190,12 +190,12 @@ public void collectAnte(int ante) {
}

@Override
public void collectBlinds(Player bigBlindPlayer, int bigBlind, Player smallBlindPlayer, int smallBlind) {
public void collectBlinds(PlayerIdentifier bigBlindPlayer, int bigBlind, PlayerIdentifier smallBlindPlayer, int smallBlind) {
ircBot.message(channel, "Collecting blinds (" + moneyString(bigBlind) + " from " + renderNick(bigBlindPlayer) + ", " + moneyString(smallBlind) + " from " + renderNick(smallBlindPlayer) + ")");
}

@Override
public void gameEnded(List<Player> oldPlayers) {
public void gameEnded(List<PlayerIdentifier> oldPlayers) {
ircBot.gameEnded(oldPlayers);
}
}
14 changes: 7 additions & 7 deletions src/main/java/me/ars/pokerbot/irc/KittehBot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
import me.ars.pokerbot.config.BotConfig;
import me.ars.pokerbot.poker.Player;
import me.ars.pokerbot.poker.PlayerIdentifier;
import me.ars.pokerbot.poker.Table;
import me.ars.pokerbot.stats.Roster;
import me.ars.pokerbot.stats.Stats;
Expand Down Expand Up @@ -194,7 +194,7 @@ public void onMessage(String channel, String sender, String login, String hostna
break;
}
case "players": {
final Collection<Player> players = table.getPlayers();
final Collection<PlayerIdentifier> players = table.getPlayers();
if (players.isEmpty()) {
message(channel, "No joined players.");
break;
Expand All @@ -204,13 +204,13 @@ public void onMessage(String channel, String sender, String login, String hostna
message(
channel,
"Now playing: "
+ players.stream().map(p -> p.getName() + " $" + p.getMoney())
+ players.stream().map(PlayerIdentifier::getName)
.collect(Collectors.joining(", ")) + ".");
} else {
message(
channel,
"Joined players: "
+ players.stream().map(Player::getName)
+ players.stream().map(PlayerIdentifier::getName)
.collect(Collectors.joining(", ")) + ".");
}
break;
Expand Down Expand Up @@ -258,7 +258,7 @@ public void onMessage(String channel, String sender, String login, String hostna
if (!table.isGameInProgress()) {
break;
}
final List<Player> oldPlayers = table.getPlayers();
final List<PlayerIdentifier> oldPlayers = table.getPlayers();
table.stopGame();
for (Table otherTable: tables.values()) {
oldPlayers.removeAll(otherTable.getPlayers());
Expand Down Expand Up @@ -408,7 +408,7 @@ public void message(String channel, String message) {
}

@Override
public void message(Player player, String message) {
public void message(PlayerIdentifier player, String message) {
if (ircClient == null) {
logError("Bot not yet connected to irc.");
return;
Expand Down Expand Up @@ -439,7 +439,7 @@ private void setUpTable(String channel) {
}

@Override
public void gameEnded(List<Player> oldPlayers) {
public void gameEnded(List<PlayerIdentifier> oldPlayers) {
for (Table otherTable: tables.values()) {
oldPlayers.removeAll(otherTable.getPlayers());
}
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/me/ars/pokerbot/poker/Hand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public String toString() {
/*
* the player with the hand
*/
private final Player player;
private final PlayerState player;

/*
* the type of hand
Expand All @@ -66,8 +66,8 @@ public String toString() {
*/
private final Card[] bestHand;

private Hand(final Player player, final HandType type,
final Card... bestHand) {
private Hand(final PlayerState player, final HandType type,
final Card... bestHand) {
if (bestHand.length != 5) {
throw new IllegalArgumentException("Invalid hand size: " + bestHand.length);
}
Expand All @@ -77,12 +77,12 @@ private Hand(final Player player, final HandType type,
this.bestHand = bestHand;
}

Hand(final Player player, final HandType type,
final List<Card> bestHandList) {
Hand(final PlayerState player, final HandType type,
final List<Card> bestHandList) {
this(player, type, bestHandList.toArray(new Card[bestHandList.size()]));
}

public Player getPlayer() {
PlayerState getPlayer() {
return player;
}

Expand Down Expand Up @@ -113,7 +113,7 @@ private static boolean isStraightAt(List<Card> uniqueCards, int index) {
/*
* @param cards the 7 cards to be analyzed
*/
public static Hand getBestHand(Player player, Card... cards) {
static Hand getBestHand(PlayerState player, Card... cards) {
final Hand hand1 = bestHand(player, cards);
if (containsValue(cards, 14)) {
try {
Expand All @@ -132,7 +132,7 @@ public static Hand getBestHand(Player player, Card... cards) {
return hand1;
}

private static Hand bestHand(Player player, Card... cards) {
private static Hand bestHand(PlayerState player, Card... cards) {
Arrays.sort(cards);

int[] suitFreqs = new int[4];
Expand Down
Loading