From 01b6dfbd1cdaa1cdf42661a04a43481efbb72390 Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris@kearneymail.com>
Date: Tue, 16 Aug 2016 20:53:49 -0700
Subject: [PATCH] better cards

---
 src/main/java/com/comandante/creeper/blackjack/Deck.java | 4 ++--
 .../comandante/creeper/bot/commands/CardsCommand.java    | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/comandante/creeper/blackjack/Deck.java b/src/main/java/com/comandante/creeper/blackjack/Deck.java
index 8ebc0a5d..86fba581 100644
--- a/src/main/java/com/comandante/creeper/blackjack/Deck.java
+++ b/src/main/java/com/comandante/creeper/blackjack/Deck.java
@@ -7,7 +7,7 @@ import java.util.*;
 
 public class Deck implements Iterator<BlackJack.Card> {
 
-    enum Type {
+    public enum Type {
         ACE(1, "A"),
         KING(10, "K"),
         QUEEN(10, "Q"),
@@ -38,7 +38,7 @@ public class Deck implements Iterator<BlackJack.Card> {
         }
     }
 
-    enum Suit {
+    public enum Suit {
         SPADES("â™ "),
         HEARTS("♥"),
         DIAMONDS("♦"),
diff --git a/src/main/java/com/comandante/creeper/bot/commands/CardsCommand.java b/src/main/java/com/comandante/creeper/bot/commands/CardsCommand.java
index 50ad41ab..6f7f0fb4 100644
--- a/src/main/java/com/comandante/creeper/bot/commands/CardsCommand.java
+++ b/src/main/java/com/comandante/creeper/bot/commands/CardsCommand.java
@@ -3,11 +3,11 @@ package com.comandante.creeper.bot.commands;
 import com.comandante.creeper.blackjack.BlackJack;
 import com.comandante.creeper.blackjack.Deck;
 import com.comandante.creeper.bot.BotCommandManager;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 public class CardsCommand extends BotCommand {
 
@@ -24,9 +24,8 @@ public class CardsCommand extends BotCommand {
         Deck deck = new Deck();
         deck.shuffle();
         List<BlackJack.Card> cards = com.google.common.collect.Lists.newArrayList(deck.next(), deck.next(), deck.next(), deck.next(), deck.deal());
-        String asciiPlayingCardHand = BlackJack.getAsciiPlayingCardHand(cards);
-        List<String> resp = Lists.newArrayList();
-        resp.addAll(Lists.newArrayList(asciiPlayingCardHand.split("[\\r\\n]+")));
-        return resp;
+        return cards.stream()
+                .map(card -> card.type.textRepresentation + card.suit.textRepresentation + " / ")
+                .collect(Collectors.toList());
     }
 }
-- 
GitLab