Merge branch 'Working' of https://git.zipcode.rocks/nedredmond/ZCW-OOP-Casino into Working

merging current

src/main/java/io/zipcoder/casino/Casino.java

@@ -1,6 +1,9 @@
 package io.zipcoder.casino;
 
 
+import io.zipcoder.casino.player.Players;
+import io.zipcoder.casino.utilities.Game;
+
 public class Casino {
     private Game game;
 

src/main/java/io/zipcoder/casino/BlackJack.java → src/main/java/io/zipcoder/casino/cardgames/BlackJack.java

@@ -1,4 +1,10 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.cardgames;
+
+import io.zipcoder.casino.cardgames.cards.Deck;
+import io.zipcoder.casino.utilities.Gamble;
+import io.zipcoder.casino.player.BlackJackPlayer;
+import io.zipcoder.casino.player.Player;
+import io.zipcoder.casino.player.Players;
 
 import java.util.ArrayList;
 
@@ -11,7 +17,7 @@ public class BlackJack extends CardGame implements Gamble {
     }
 
     public void readyPlayers() {
-        for (Player player : Players.getInstance().playerList) {
+        for (Player player : Players.getInstance().getPlayers()) {
             blackJackPlayers.add(new BlackJackPlayer(player));
         }
     }

src/main/java/io/zipcoder/casino/CardGame.java → src/main/java/io/zipcoder/casino/cardgames/CardGame.java

@@ -1,4 +1,9 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.cardgames;
+
+import io.zipcoder.casino.cardgames.cards.CardHand;
+import io.zipcoder.casino.cardgames.cards.Deck;
+import io.zipcoder.casino.utilities.Game;
+import io.zipcoder.casino.player.Player;
 
 public class CardGame extends Game {
 

src/main/java/io/zipcoder/casino/GoFish.java → src/main/java/io/zipcoder/casino/cardgames/GoFish.java

@@ -1,4 +1,8 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.cardgames;
+
+import io.zipcoder.casino.player.GoFishPlayer;
+import io.zipcoder.casino.player.Player;
+import io.zipcoder.casino.player.Players;
 
 import java.util.ArrayList;
 
@@ -11,7 +15,7 @@ public class GoFish extends CardGame {
     }
 
     public void readyPlayers() {
-        for (Player player : Players.getInstance().playerList) {
+        for (Player player : Players.getInstance().getPlayers()) {
             goFishPlayers.add(new GoFishPlayer(player));
         }
     }

src/main/java/io/zipcoder/casino/Card.java → src/main/java/io/zipcoder/casino/cardgames/cards/Card.java

@@ -1,4 +1,4 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.cardgames.cards;
 
 public final class Card {
 

src/main/java/io/zipcoder/casino/CardHand.java → src/main/java/io/zipcoder/casino/cardgames/cards/CardHand.java

@@ -1,4 +1,4 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.cardgames.cards;
 
 public class CardHand {
 
@@ -9,7 +9,6 @@ public class CardHand {
         this.numberOfCards = numberOfCards;
     }
 
-
     public CardHand() {
     }
 }

src/main/java/io/zipcoder/casino/CardSuit.java → src/main/java/io/zipcoder/casino/cardgames/cards/CardSuit.java

@@ -1,4 +1,4 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.cardgames.cards;
 
 public enum CardSuit {
     HEARTS,

src/main/java/io/zipcoder/casino/CardValue.java → src/main/java/io/zipcoder/casino/cardgames/cards/CardValue.java

@@ -1,4 +1,4 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.cardgames.cards;
 
 public enum CardValue {
     ACE(1),

src/main/java/io/zipcoder/casino/Deck.java → src/main/java/io/zipcoder/casino/cardgames/cards/Deck.java

@@ -1,7 +1,6 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.cardgames.cards;
 
 import java.util.ArrayList;
-import java.util.Collections;
 
 public class Deck {
 

src/main/java/io/zipcoder/casino/Craps.java → src/main/java/io/zipcoder/casino/dicegames/Craps.java

@@ -1,4 +1,9 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.dicegames;
+
+import io.zipcoder.casino.utilities.Gamble;
+import io.zipcoder.casino.player.CrapsPlayer;
+import io.zipcoder.casino.player.Player;
+import io.zipcoder.casino.player.Players;
 
 import java.util.ArrayList;
 
@@ -19,7 +24,7 @@ public class Craps extends DiceGame implements Gamble {
     }
 
     public void readyPlayers() {
-        for (Player player : Players.getInstance().playerList) {
+        for (Player player : Players.getInstance().getPlayers()) {
             crapsPlayers.add(new CrapsPlayer(player));
         }
     }
@@ -45,17 +50,17 @@ public class Craps extends DiceGame implements Gamble {
         int sum = rollDie(2); // roll two dice, store sum in sum field.
 
         if (sum == 7 || sum == 11) {
-            evaluateBet(currentPlayer.crapsPlayer, bet*2);
+            evaluateBet(currentPlayer.getP(), bet*2);
         } else if (sum == 2 || sum == 3 || sum == 12) {
-            evaluateBet(currentPlayer.crapsPlayer, -(bet*2));
+            evaluateBet(currentPlayer.getP(), -(bet*2));
         } else {
             int point = sum;
             do {
                 sum = rollDie(2);
                 if (sum == 7) {
-                    evaluateBet(currentPlayer.crapsPlayer, -bet);
+                    evaluateBet(currentPlayer.getP(), -bet);
                 } else if (sum == point) {
-                    evaluateBet(currentPlayer.crapsPlayer, bet);
+                    evaluateBet(currentPlayer.getP(), bet);
                 }
             } while (sum != point && sum != 7);
         }
@@ -63,7 +68,7 @@ public class Craps extends DiceGame implements Gamble {
 
     public void print(){
         for(int i = 0; i < crapsPlayers.size(); i++){
-            System.out.println(crapsPlayers.get(i).crapsPlayer.getChipBalance());
+            System.out.println(crapsPlayers.get(i).getP().getChipBalance());
         }
     }
 }

src/main/java/io/zipcoder/casino/DiceGame.java → src/main/java/io/zipcoder/casino/dicegames/DiceGame.java

@@ -1,4 +1,7 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.dicegames;
+
+import io.zipcoder.casino.dicegames.dice.Dice;
+import io.zipcoder.casino.utilities.Game;
 
 public class DiceGame extends Game {
     private Dice dice = new Dice(1);

src/main/java/io/zipcoder/casino/Dice.java → src/main/java/io/zipcoder/casino/dicegames/dice/Dice.java

@@ -1,11 +1,10 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.dicegames.dice;
 
     import java.util.Random;
 
     public class Dice {
         public int dieCount;
 
-        Dice(){ this.dieCount = 1; }
         Dice(int dieCount) {
             this.dieCount = dieCount;
         }

src/main/java/io/zipcoder/casino/BlackJackPlayer.java → src/main/java/io/zipcoder/casino/player/BlackJackPlayer.java

@@ -1,6 +1,6 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.player;
 
-import java.util.ArrayList;
+import io.zipcoder.casino.cardgames.cards.CardHand;
 
 public class BlackJackPlayer {
     private CardHand hand;
@@ -17,6 +17,10 @@ public class BlackJackPlayer {
     public void stay(Player player) {
     }
 
+    public Player getP() {
+        return blackJackPlayer;
+    }
+
     public CardHand getHand() {
         return hand;
     }

src/main/java/io/zipcoder/casino/CrapsPlayer.java → src/main/java/io/zipcoder/casino/player/CrapsPlayer.java

@@ -1,4 +1,4 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.player;
 
 public class CrapsPlayer {
     Player crapsPlayer;
@@ -13,6 +13,10 @@ public class CrapsPlayer {
         this.bet = bet;
     }
 
+    public Player getP() {
+        return crapsPlayer;
+    }
+
     public long getBet() {
         return bet;
     }

src/main/java/io/zipcoder/casino/GoFishPlayer.java → src/main/java/io/zipcoder/casino/player/GoFishPlayer.java

@@ -1,4 +1,6 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.player;
+
+import io.zipcoder.casino.cardgames.cards.CardHand;
 
 public class GoFishPlayer {
     private CardHand hand;
@@ -9,6 +11,10 @@ public class GoFishPlayer {
         this.goFishPlayer = player;
     }
 
+    public Player getP() {
+        return goFishPlayer;
+    }
+
     public CardHand getHand() {
         return hand;
     }

src/main/java/io/zipcoder/casino/Player.java → src/main/java/io/zipcoder/casino/player/Player.java

@@ -1,4 +1,4 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.player;
 
 public class Player {
 

src/main/java/io/zipcoder/casino/Players.java → src/main/java/io/zipcoder/casino/player/Players.java

@@ -1,4 +1,4 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.player;
 
 import java.util.ArrayList;
 
@@ -29,6 +29,9 @@ public class Players {
         }
     }
 
+    public ArrayList<Player> getPlayers() {
+        return playerList;
+    }
 
     public void removePlayer(final Player player) {
         playerList.removeIf(Player -> Player.equals(player));

src/main/java/io/zipcoder/casino/Console.java → src/main/java/io/zipcoder/casino/utilities/Console.java

@@ -1,4 +1,4 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.utilities;
 
 import java.awt.peer.SystemTrayPeer;
 import java.util.Scanner;

src/main/java/io/zipcoder/casino/Gamble.java → src/main/java/io/zipcoder/casino/utilities/Gamble.java

@@ -1,4 +1,6 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.utilities;
+
+import io.zipcoder.casino.player.Player;
 
 public interface Gamble {
     public void placeBet();

src/main/java/io/zipcoder/casino/Game.java → src/main/java/io/zipcoder/casino/utilities/Game.java

@@ -1,4 +1,4 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.utilities;
 
 public class Game {
     public void promptContinue() {

src/main/java/io/zipcoder/casino/Pot.java → src/main/java/io/zipcoder/casino/utilities/Pot.java

@@ -1,4 +1,4 @@
-package io.zipcoder.casino;
+package io.zipcoder.casino.utilities;
 
 public class Pot {
 

src/test/java/io/zipcoder/casino/BlackJackPlayerTest.java

@@ -1,10 +1,10 @@
 package io.zipcoder.casino;
 
+import io.zipcoder.casino.player.BlackJackPlayer;
+import io.zipcoder.casino.player.Player;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 public class BlackJackPlayerTest {
     Player player = new Player("Mr. Guy");
 

src/test/java/io/zipcoder/casino/CrapsTest.java

@@ -1,7 +1,9 @@
 package io.zipcoder.casino;
 
+import io.zipcoder.casino.dicegames.Craps;
+import io.zipcoder.casino.player.CrapsPlayer;
+import io.zipcoder.casino.player.Player;
 import org.junit.Test;
-import org.junit.Assert;
 
 import java.util.*;
 

src/test/java/io/zipcoder/casino/PlayerTest.java

@@ -1,11 +1,10 @@
 package io.zipcoder.casino;
 
+import io.zipcoder.casino.player.Player;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 public class PlayerTest {
 
     Player player;

src/test/java/io/zipcoder/casino/PlayersTest.java

@@ -1,13 +1,11 @@
 package io.zipcoder.casino;
 
+import io.zipcoder.casino.player.Player;
+import io.zipcoder.casino.player.Players;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.ArrayList;
-
-import static org.junit.Assert.*;
-
 public class PlayersTest {
 
     Player player1 = new Player("Bobbert");