diff --git a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java new file mode 100644 index 0000000..8da0d9e --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java @@ -0,0 +1,53 @@ +package it.polimi.ingsw.gc14; +import it.polimi.ingsw.gc14.Controller.ClientController; +import it.polimi.ingsw.gc14.Network.RMI.Client.RMIClient; +import it.polimi.ingsw.gc14.View.IView; + +import java.util.Scanner; + +public class ClientLauncherTUI { + public void main() throws InterruptedException { + ClientController controller = new ClientController(); + + Scanner scanner = new Scanner(System.in); + + System.out.println("Selezionare nome utente: "); + String username = scanner.next(); + System.out.println(username); + + System.out.println("Selezionare numero di giocatori desiderato: "); + int proposedNumPlayers = scanner.nextInt(); + System.out.println(proposedNumPlayers); + + System.out.println("Selezionare RMI[0] o TCP[1]: "); + int networkType = scanner.nextInt(); + System.out.println(networkType); + + scanner.close(); + + if (networkType == 0) { + RMIClient client = new RMIClient("localhost", 1099); + if (client.connect(username, proposedNumPlayers, controller)) { + System.out.println("Succesfully connected to RMI server\n\n"); + } else { + System.out.println("RMI connection refused\n\n"); + } + + while(true) { + System.out.flush(); + if (controller.localModel!=null) { + break; + } + Thread.sleep(500); + } + + System.out.println("Model set\n\n"); + + + + + } else if (networkType == 1) { + return; + } + } +} \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java b/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java index d206d22..1da7933 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java +++ b/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java @@ -6,9 +6,9 @@ import it.polimi.ingsw.gc14.View.IView; public class ClientController { - private Game localModel; + public Game localModel; public GameController localController; - public final IView view; + public IView view=null; public ClientController(IView view,Game localModel) { this.view = view; @@ -16,12 +16,18 @@ public class ClientController { this.localController = new GameController(localModel); } + public ClientController() { + this.localController = new GameController(localModel); + } + public void setModel(Game model) { this.localModel = model; localController.setModel(model); - localModel.addObserver((Observer) view); // registra la view come observer + // localModel.addObserver((Observer) view); // registra la view come observer } + + public void onError(String message) { view.showError(message); } diff --git a/src/main/java/it/polimi/ingsw/gc14/LimitedList.java b/src/main/java/it/polimi/ingsw/gc14/LimitedList.java new file mode 100644 index 0000000..6aa8cf9 --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/LimitedList.java @@ -0,0 +1,32 @@ +package it.polimi.ingsw.gc14; + +import java.util.ArrayList; + +public class LimitedList extends ArrayList { + private int limit; + private Runnable action; + + public LimitedList(int limit, Runnable action) { + this.limit = limit; + this.action = action; + } + + @Override + public boolean add(T element) { + boolean result = super.add(element); + if (size() >= limit) { + action.run(); + } + return result; + } + + public void setLimit(int num) { + this.limit=num; + } + + public int getLimit(){return limit;} + + public void setAction(Runnable action) { + this.action=action; + } +} \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java index cdf7261..e0b064c 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java @@ -2,11 +2,8 @@ package it.polimi.ingsw.gc14.Model.Cards.Building.Effects; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; -import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Character; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType; -import it.polimi.ingsw.gc14.Model.Player; -import java.util.HashMap; /** * During the Sustenance Event, you have a discount of 1 food token on the total you @@ -47,4 +44,8 @@ public class Building1 extends BuildingCard { return new Building1(getEra(),getPrice(),getPrestigeValue(),getIcon()); } + @Override + public String toString() { + return super.toString() + " Icon: " + this.icon.toString().charAt(0); + } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java index 5b47de1..543adcf 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java @@ -6,6 +6,7 @@ import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType; import it.polimi.ingsw.gc14.Model.Player; public class Building11 extends BuildingCard { + private CharacterType icon ; /** @@ -14,6 +15,7 @@ public class Building11 extends BuildingCard { * @return the CharacterType associated with this building card effect. */ public CharacterType getIcon() {return icon;} + private int PrestigeMul; /** @@ -65,4 +67,9 @@ public class Building11 extends BuildingCard { throw new IllegalArgumentException(); player.addPrestige(player.getNType(getIcon()) * this.getPrestigeMul()); } + + @Override + public String toString() { + return super.toString() + " Icon: " + this.icon.toString().charAt(0) + " MP: " + this.PrestigeMul; + } } \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java index 352f25a..24e41a1 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java @@ -182,6 +182,6 @@ public class BuildingCard extends PlayableCard implements Cloneable , BuildingEf */ @Override public String toString() { - return "Era:"+String.valueOf(getEra())+" Price:"+String.valueOf(getPrice())+" Prestige:"+String.valueOf(getPrestigeValue()); + return "⎕:" + " ID:" + String.valueOf(getEffectId())+ " $:"+String.valueOf(getPrice())+" PV:"+String.valueOf(getPrestigeValue()); } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Character.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Character.java index 9cdb9ae..ba405ce 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Character.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Character.java @@ -57,7 +57,13 @@ public abstract class Character extends TribeCard implements Cloneable { */ @Override public String toString() { - return super.toString()+" "+type.toString(); + return super.toString(); + } + + @Override + public String toStringBoard() + { + return super.toStringBoard()+" "+getType().toString()+" "; } /** diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java index 3fb9706..975fa6f 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java @@ -86,7 +86,15 @@ public class Builder extends Character * @return the string representation of this Builder card. */ @Override - public String toString() { return super.toString()+" Reduction Value: " + String.valueOf(reductionValue) + "\n Prestige Value: " + String.valueOf(prestigeValue); } + public String toString() { + return super.toString() + " RV:" + String.valueOf(reductionValue) + " PV:" + String.valueOf(prestigeValue); + } + @Override + public String toStringBoard() + { + return super.toStringBoard()+" "+ " RV:" + String.valueOf(reductionValue) + " PV:" + String.valueOf(prestigeValue); + } + /** * Creates and returns a copy of this Builder card. diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java index b956a18..0137dd2 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java @@ -47,8 +47,21 @@ public class Hunter extends Character { */ @Override public String toString() { - return super.toString() + "Icon: " + String.valueOf(icon); + String toPrint = super.toString(); + if(this.icon){ + toPrint += " I"; + } + return toPrint; } + @Override + public String toStringBoard() { + String toPrint = super.toStringBoard(); + if(this.icon){ + toPrint += " I"; + } + return toPrint; + } + /** * Creates and returns a copy of this Hunter card. diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Inventor.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Inventor.java index d8c5f45..4d6b77b 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Inventor.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Inventor.java @@ -52,7 +52,11 @@ public class Inventor extends Character { */ @Override public String toString() { - return super.toString() + " Symbol:" + String.valueOf(icon); + return super.toString() + " I_ID:" + String.valueOf(icon); + } + @Override + public String toStringBoard() { + return super.toStringBoard() + " I_ID:" + String.valueOf(icon); } /** diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java index b04098f..10b3360 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java @@ -49,8 +49,13 @@ public class Shaman extends Character { */ @Override public String toString() { - return super.toString() + "Icon: " + String.valueOf(icon); + return super.toString() + " *:" + String.valueOf(icon); } + @Override + public String toStringBoard() { + return super.toStringBoard() + " *:" + String.valueOf(icon); + } + /** * Creates and returns a copy of this Shaman card. diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/EventCard.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/EventCard.java index 82d10b6..43b937a 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/EventCard.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/EventCard.java @@ -62,7 +62,11 @@ public abstract class EventCard extends TribeCard { */ @Override public String toString() { - return super.toString()+", "+type.toString(); + return super.toString()+" "+type.toString(); + } + @Override + public String toStringBoard() { + return super.toString()+" "+type.toString(); } /** diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintings.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintings.java index cbb1458..5a70bfb 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintings.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintings.java @@ -85,4 +85,9 @@ public class CavePaintings extends EventCard { { return new CavePaintings(getEra(), NLower, NPrestigeRem, NPrestigeMul) ; } + + @Override + public String toStringBoard() { + return super.toString()+" 0-"+(NLower-1)+":"+NPrestigeRem+" "+NLower+"+:"+NPrestigeMul; + } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java index cfe472d..59898d3 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java @@ -70,5 +70,9 @@ public class Hunt extends EventCard { public EventCard clone() { return new Hunt(getEra(), prestigeMultiplier); } + @Override + public String toStringBoard() { + return super.toString()+" 1F+"+prestigeMultiplier+"PP"+" X N Hunter"; + } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java index b447c13..573f1f0 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java @@ -96,6 +96,9 @@ public class ShamanicRitual extends EventCard { public EventCard clone() { return new ShamanicRitual(getEra(), prestigeToAdd, prestigeToRemove); } - + @Override + public String toStringBoard() { + return super.toString()+" *>:"+prestigeToAdd+" *<:"+prestigeToRemove; + } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java index 59be90f..0d92015 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java @@ -89,4 +89,9 @@ public class Sustenance extends EventCard { public EventCard clone() { return new Sustenance(getEra(), PrestigeDebt); } + + @Override + public String toStringBoard() { + return super.toString()+" -1F/-"+PrestigeDebt+"PP"; + } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java index a7f5609..76272c6 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java @@ -18,6 +18,9 @@ import java.io.Serializable; import java.util.*; import java.util.stream.Collectors; import it.polimi.ingsw.gc14.Network.Observer; +import it.polimi.ingsw.gc14.View.TUI.AsciiTable; +import it.polimi.ingsw.gc14.View.TUI.BorderStyle; + /** * Represents the main game model. * A Game object stores the players, the current state of the match, @@ -36,6 +39,15 @@ public class Game implements Serializable { o.update(this); } } + + /** + * Returns the list of players participating in the game. + * @return + */ + public List getPlayers() { + return playersList; + } + /** * The current number of players. */ @@ -746,4 +758,90 @@ public class Game implements Serializable { return true; } + @Override + public String toString() { + var table = new AsciiTable(BorderStyle.UNICODE, slotMap.size()); + List stringUp=new ArrayList<>(); + List stringEmpty=new ArrayList<>(); + List stringDown=new ArrayList<>(); + for(Map.Entry entry:slotMap.entrySet()) + { + stringEmpty.add(" "); + stringDown.add(entry.getKey().toStringTUI()); + if(entry.getValue()!=null) + stringUp.add(entry.getValue().getUserName()); + else + stringUp.add(" "); + } + table.addRow(stringUp); + table.addRow(stringEmpty); + table.addRow(stringDown); + + Listlines=List.of(orderLogicCard.toString().split("\n")); + List lines2=new ArrayList<>(); + lines2.add("OFFER TRACK"); + lines2.addAll(List.of(table.build().split("\n"))); + + String boardToString=AsciiTable.sideBySide(lines,lines2,1); + + + + var table2 = new AsciiTable(BorderStyle.UNICODE, Math.max(getUpperListTribeCards().size(),getLowerListTribeCards().size())); + List stringUp2=new ArrayList<>(); + List stringDown2=new ArrayList<>(); + for(int i=0;i stringUp3=new ArrayList<>(); + List stringDown3=new ArrayList<>(); + for(int i=0;i buildingDeck = new ArrayList<>(DecksCreator.loadBuildingDeckByEra(1)); Collections.shuffle(buildingDeck); if(nTotem==2) - upperListBuilding= buildingDeck.subList(0,1); + upperListBuilding = new ArrayList<>(buildingDeck.subList(0,1)); else - upperListBuilding= buildingDeck.subList(0,2); + upperListBuilding = new ArrayList<>(buildingDeck.subList(0,2)); } /** diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/OrderLogicCard.java b/src/main/java/it/polimi/ingsw/gc14/Model/OrderLogicCard.java index 7a51f3e..84eb72c 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/OrderLogicCard.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/OrderLogicCard.java @@ -1,21 +1,22 @@ package it.polimi.ingsw.gc14.Model; import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; +import it.polimi.ingsw.gc14.Model.Orders.OrderPlayer; +import it.polimi.ingsw.gc14.View.TUI.AsciiTable; +import it.polimi.ingsw.gc14.View.TUI.BorderStyle; import java.io.Serializable; import java.util.*; +import java.util.stream.Collectors; -/** - * Abstract base class for all order logic cards. - * An OrderLogicCard manages a queue of players and defines the effects - * applied when players are pushed back into the queue. - */ public abstract class OrderLogicCard implements Serializable { /** * The queue of players associated with this order logic card. */ - private Queue players; + protected Queue players; + protected List playerList; + /** * Creates an order logic card with the specified list of players. @@ -26,6 +27,8 @@ public abstract class OrderLogicCard implements Serializable { public OrderLogicCard(ArrayList players) { Collections.shuffle(players); this.players = new LinkedList<>(players); + + this.playerList=new ArrayList<>(players.stream().map(x->new OrderPlayer(x,false)).toList()); } /** @@ -36,7 +39,15 @@ public abstract class OrderLogicCard implements Serializable { */ public void push(Player player){ effect(player,players.size()); + if(players.size()==0) + { + playerList=new ArrayList<>(); + + } + playerList.add(new OrderPlayer(player,false)); players.add(player); + + } /** @@ -45,6 +56,13 @@ public abstract class OrderLogicCard implements Serializable { * @return the first player in the queue, or {@code null} if the queue is empty. */ public Player pull(){ + for(OrderPlayer p:playerList){ + if(p.played==false) + { + p.played=true; + break; + } + } return players.poll(); } @@ -79,4 +97,17 @@ public abstract class OrderLogicCard implements Serializable { for(BuildingCard b : player.buildingCards.stream().filter(x->x.getEffectId()==3).toList()) player.addFood(1); } + + protected int getPosition(String username) + { + int pos = 0; + for (Player p : players) { + if (p.getUserName().equals(username)) + return pos; + pos++; + } + return -1; + } + + } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java index 387eb1a..6d926c4 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java @@ -2,8 +2,11 @@ package it.polimi.ingsw.gc14.Model.Orders; import it.polimi.ingsw.gc14.Model.OrderLogicCard; import it.polimi.ingsw.gc14.Model.Player; +import it.polimi.ingsw.gc14.View.TUI.AsciiTable; +import it.polimi.ingsw.gc14.View.TUI.BorderStyle; import java.util.*; +import java.util.stream.IntStream; public class Order2 extends OrderLogicCard { @@ -49,4 +52,35 @@ public class Order2 extends OrderLogicCard { } } } + @Override + public String toString() + { + + var table = new AsciiTable(BorderStyle.UNICODE, 2); + List stringUp=new ArrayList<>(); + List stringDown=new ArrayList<>(); + for(int i=0;i<2;i++) + { + try { + playerList.get(i); + stringUp.add(i+". "+playerList.get(i).player.getUserName()); + if(playerList.get(i).played) + stringDown.add(" Placed"); + else + stringDown.add(" Not Placed"); + } + catch (IndexOutOfBoundsException e) { + stringUp.add(""); + stringDown.add(""); + } + } + table.addRow(stringUp); + table.addRow(stringDown); + + List stringList=new ArrayList<>(); + stringList.add("+1 Food"); + stringList.add("-1 Food / -2 PP"); + table.addRow(stringList); + return "TURN ORDER\n" + table.build() + "\n"; + } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order3.java b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order3.java index 28037ff..1d434ea 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order3.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order3.java @@ -2,8 +2,11 @@ package it.polimi.ingsw.gc14.Model.Orders; import it.polimi.ingsw.gc14.Model.OrderLogicCard; import it.polimi.ingsw.gc14.Model.Player; +import it.polimi.ingsw.gc14.View.TUI.AsciiTable; +import it.polimi.ingsw.gc14.View.TUI.BorderStyle; import java.util.ArrayList; +import java.util.List; import java.util.NoSuchElementException; public class Order3 extends OrderLogicCard { @@ -49,4 +52,40 @@ public class Order3 extends OrderLogicCard { } } } + @Override + public String toString() + { + + var table = new AsciiTable(BorderStyle.UNICODE, 3); + + List stringUp=new ArrayList<>(); + List stringDown=new ArrayList<>(); + for(int i=0;i<3;i++) + { + try { + playerList.get(i); + stringUp.add(i+". "+playerList.get(i).player.getUserName()); + if(playerList.get(i).played) + stringDown.add(" Placed"); + else + stringDown.add(" Not Placed"); + } + catch (IndexOutOfBoundsException e) { + stringUp.add(""); + stringDown.add(""); + } + } + table.addRow(stringUp); + table.addRow(stringDown); + + List stringList=new ArrayList<>(); + + stringList.add("+2 Food"); + stringList.add("--"); + stringList.add("-1 Food / -2 PP"); + table.addRow(stringList); + + + return "TURN ORDER\n" + table.build() + "\n"; + } } \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order4.java b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order4.java index 442858f..608bcb6 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order4.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order4.java @@ -2,8 +2,11 @@ package it.polimi.ingsw.gc14.Model.Orders; import it.polimi.ingsw.gc14.Model.OrderLogicCard; import it.polimi.ingsw.gc14.Model.Player; +import it.polimi.ingsw.gc14.View.TUI.AsciiTable; +import it.polimi.ingsw.gc14.View.TUI.BorderStyle; import java.util.ArrayList; +import java.util.List; import java.util.NoSuchElementException; public class Order4 extends OrderLogicCard { @@ -57,4 +60,37 @@ public class Order4 extends OrderLogicCard { } } } + @Override + public String toString() + { + + var table = new AsciiTable(BorderStyle.UNICODE, 4); + List stringUp=new ArrayList<>(); + List stringDown=new ArrayList<>(); + for(int i=0;i<4;i++) + { + try { + playerList.get(i); + stringUp.add(i+". "+playerList.get(i).player.getUserName()); + if(playerList.get(i).played) + stringDown.add(" Placed"); + else + stringDown.add(" Not Placed"); + } + catch (IndexOutOfBoundsException e) { + stringUp.add(""); + stringDown.add(""); + } + } + table.addRow(stringUp); + table.addRow(stringDown); + + List stringList=new ArrayList<>(); + stringList.add("+2 Food"); + stringList.add("+1 Food"); + stringList.add("--"); + stringList.add("-1 Food / -2 PP"); + table.addRow(stringList); + return "TURN ORDER\n" + table.build() + "\n"; + } } \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order5.java b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order5.java index d527b83..b75602d 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order5.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order5.java @@ -2,8 +2,11 @@ package it.polimi.ingsw.gc14.Model.Orders; import it.polimi.ingsw.gc14.Model.OrderLogicCard; import it.polimi.ingsw.gc14.Model.Player; +import it.polimi.ingsw.gc14.View.TUI.AsciiTable; +import it.polimi.ingsw.gc14.View.TUI.BorderStyle; import java.util.ArrayList; +import java.util.List; import java.util.NoSuchElementException; public class Order5 extends OrderLogicCard { @@ -58,4 +61,38 @@ public class Order5 extends OrderLogicCard { } } } + @Override + public String toString() + { + + var table = new AsciiTable(BorderStyle.UNICODE, 5); + List stringUp=new ArrayList<>(); + List stringDown=new ArrayList<>(); + for(int i=0;i<5;i++) + { + try { + playerList.get(i); + stringUp.add(i+". "+playerList.get(i).player.getUserName()); + if(playerList.get(i).played) + stringDown.add(" Placed"); + else + stringDown.add(" Not Placed"); + } + catch (IndexOutOfBoundsException e) { + stringUp.add(""); + stringDown.add(""); + } + } + table.addRow(stringUp); + table.addRow(stringDown); + + List stringList=new ArrayList<>(); + stringList.add("+3 Food"); + stringList.add("+1 Food"); + stringList.add("--"); + stringList.add("--"); + stringList.add("-1 Food / -2 PP"); + table.addRow(stringList); + return "TURN ORDER\n" + table.build() + "\n"; + } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/OrderPlayer.java b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/OrderPlayer.java new file mode 100644 index 0000000..360bebc --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/OrderPlayer.java @@ -0,0 +1,21 @@ +package it.polimi.ingsw.gc14.Model.Orders; + +import it.polimi.ingsw.gc14.Model.Player; + +/** + * Abstract base class for all order logic cards. + * An OrderLogicCard manages a queue of players and defines the effects + * applied when players are pushed back into the queue. + */ +public class OrderPlayer{ + public Player player; + public boolean played; + public OrderPlayer(Player player,boolean played){ + this.player=player; + this.played=played; + } + @Override + public String toString() { + return player.getUserName()+" "+played; + } +} diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/PlayableCard.java b/src/main/java/it/polimi/ingsw/gc14/Model/PlayableCard.java index a6c61d7..386f731 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/PlayableCard.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/PlayableCard.java @@ -43,6 +43,10 @@ public abstract class PlayableCard implements Serializable { */ @Override public String toString() { - return "Era:"+String.valueOf(Era); + return "⎕:"; + } + public String toStringBoard() + { + return "⎕:"; } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java index bef8cbd..fd0a3ba 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java @@ -3,10 +3,14 @@ package it.polimi.ingsw.gc14.Model; import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.*; +import it.polimi.ingsw.gc14.View.TUI.AsciiTable; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; +import java.util.List; + +import static it.polimi.ingsw.gc14.View.TUI.BorderStyle.*; /** * Default Player class; contains all identifiers and methods needed. @@ -224,21 +228,91 @@ public class Player implements Serializable { // endregion constructors // region Functions - // TODO tostring usr + food + prestige \n tab foreach(characters.cards + spazio) @Override public String toString() { - String toPrint = ""; - toPrint = this.getUserName() - + ":\n\tFood: " + this.getFoodValue() - + "\n\tPrestige: " + this.getPrestigeValue() - + "\n\tArtists: " + this.artists.toString() - + "\n\tBuilders: " + this.builders.toString() - + "\n\tGatherers: " + this.gatherers.toString() - + "\n\tShamans: " + this.shamans.toString() - + "\n\tHunters: " + this.hunters.toString() - + "\n\tBuildings: " - + this.buildingCards.toString(); - return toPrint; + int Last = 6; + + var table = new AsciiTable(UNICODE, 1); + + table.addHeader(this.getUserName()); + table.addRow("RESOURCES:"); + table.addRow("Food: " + this.getFoodValue()); + table.addSeparator(); + table.addRow("Prestige: " + this.getPrestigeValue()); + + if(!this.hunters.isEmpty()){ + Last = 6; + } + else if(!this.inventors.isEmpty()){ + Last = 5; + } + else if(!this.shamans.isEmpty()){ + Last = 4; + } + else if(!this.gatherers.isEmpty()){ + Last = 3; + } + else if(!this.builders.isEmpty()){ + Last = 2; + } + else if(!this.artists.isEmpty()){ + Last = 1; + } + else{ + Last = 0; + } + + if(Last == 0){ + table.addSeparator(); + } + table.addRow("CHARACTERS:"); + if(!this.artists.isEmpty()){ + if(Last == 1){ + table.addSeparator(); + } + table.addRow("Artists: " + this.artists.toString()); + } + + if(!this.builders.isEmpty()){ + if(Last == 2){ + table.addSeparator(); + } + table.addRow("Builders: " + this.builders.toString()); + } + + if(!this.gatherers.isEmpty()){ + if(Last == 3){ + table.addSeparator(); + } + table.addRow("Gatherers: " + this.gatherers.toString()); + } + + if(!this.shamans.isEmpty()){ + if(Last == 4){ + table.addSeparator(); + } + table.addRow("Shamans: " + this.shamans.toString()); + } + + if(!this.inventors.isEmpty()){ + if(Last == 5){ + table.addSeparator(); + } + table.addRow("Inventors: " + this.inventors.toString()); + } + + + if(!this.hunters.isEmpty()){ + table.addSeparator(); + table.addRow("Hunters: " + this.hunters.toString()); + } + + table.addRow("BUILDING CARDS:"); + if(!this.buildingCards.isEmpty()){ + table.addRow("Buildings: " + this.buildingCards.toString()); + } + + return table.build(); } // endregion functions } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Slot.java b/src/main/java/it/polimi/ingsw/gc14/Model/Slot.java index 5cc2f2f..456ee1a 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Slot.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Slot.java @@ -152,7 +152,25 @@ public class Slot implements Serializable { */ @Override public String toString() { - return ("SlotID: "+this.getSlotId()+"\nNUpper: "+this.getNUpper()+"\nNLower: "+this.getNLower()+"\nFood: "+this.getFood()+"\nNMinPlayer: "+this.getNMinPlayer()+"\n"); + return ("SlotID: "+this.getSlotId()+"\nNUpper: "+this.getNUpper()+"\nNLower: "+this.getNLower()+"\nFood: "+this.getFood()+"\n"); + } + + + public String toStringTUI() + { + StringBuilder s = new StringBuilder(); + s.append(this.getSlotId()+" "); + for(int i=0;i clients = new ConcurrentHashMap<>(); + + /** Queue containing the events to be applied to the game model */ BlockingQueue actionQueue; + /** + * List containing the usernames of joined players. + * {@link LimitedList}'s limit defines at which size the list calls its action. The limit can be set using {@link LimitedList#setLimit(int)}. + */ + private LimitedList playerList; - // Costruttore - public RMIServer(GameController controller, int nPort, BlockingQueue actionQueue) throws RemoteException { + + /** + * Class constructor that initializes the attributes. + * @param controller The game controller + * @param nPort The RMI port + * @param actionQueue The action queue + * @param playerList The player's usernames list + * @throws RemoteException if an RMI error occurs + */ + public RMIServer(GameController controller, int nPort, BlockingQueue actionQueue,LimitedList playerList) throws RemoteException { this.controller = controller; this.nPort = nPort; this.actionQueue = actionQueue; + this.playerList = playerList; } - - - // Metodi esposti RMI - public void setController (GameController controller) { - this.controller = controller; - } + // RMI's exposed methods + /** + * Allows a player to join the game. + * If the desired number of player is invalid, the request is rejected. + * If this is the first player, a new game model is created and passed to the controller. Additionally, the playerList's limit is set. + * Then, if the controller successfully adds the player, the username is added to {@link #playerList} and {@link #clients}. + * @param username The player's name + * @param preferredInt The desired number of players + * @param callback The client's callback interface + * @return true if the player successfully joined the game, false otherwise + */ @Override - public boolean joinGame(String username, IClientCallback callback) { - if(controller.addPlayer(username)) - { - clients.put(username, callback); - return true; + public boolean joinGame(String username, int preferredInt, IClientCallback callback) { + if (preferredInt<2 || preferredInt>5) { + return false; } - return false; + synchronized (controller) { + if(playerList.isEmpty()){ + model = new Game(preferredInt); + controller.setModel(model); + playerList.setLimit(preferredInt); + } + if (controller.addPlayer(username)) { + clients.put(username, callback); + playerList.add(username); + return true; + } + return false; + } + } + + + /** + * Push an action in actionQueue. + * @param action The desired actio + * @return true if the action was successfully added, false otherwise + */ @Override - public boolean doEvent(NetworkEvent event) throws RemoteException { - return actionQueue.offer(event); + public boolean doEvent(NetworkEvent action) { + return actionQueue.offer(action); } - - - // Metodi interni del server + // RMI's internal methods + /** + * Sends an action to all RMI clients. + * @param action The desired action + */ public void notifyAll(NetworkEvent action) throws RemoteException { for (IClientCallback cb : clients.values()) { cb.onAction(action); } } + + + /** + * Sends a game model to all RMI clients. + * @param model The desired model + */ public void notifyAll(Game model) throws RemoteException { for (IClientCallback cb : clients.values()) { cb.onGameInit(model); } } - public void notifyError(String username, String message) throws RemoteException { - IClientCallback cb = clients.get(username); - if (cb != null) cb.onError(message); - } - - // Metodi per avviare server RMI + /** + * Starts the RMI server. + * @return true if the server starts successfully, false otherwise + */ public boolean start() { try { registry = LocateRegistry.createRegistry(nPort); registry.rebind("RMIGameServer", this); - System.out.println("RMI Server avviato sulla porta "+nPort); + System.out.println("RMI Server started on port: "+nPort); return true; } catch (Exception e) { @@ -92,6 +151,12 @@ public class RMIServer implements IGameServer { return false; } } + + + /** + * Stops the RMI server. + * @return true if the server stops successfully, false otherwise + */ public boolean stop() { try { registry.unbind("RMIGameServer"); diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Client/TCPClient.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Client/TCPClient.java index 113cd2e..c69734e 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Client/TCPClient.java +++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Client/TCPClient.java @@ -1,70 +1,118 @@ package it.polimi.ingsw.gc14.Network.TCP.Client; import it.polimi.ingsw.gc14.Controller.GameController; +import it.polimi.ingsw.gc14.Model.Game; import it.polimi.ingsw.gc14.Network.NetworkEvent; import it.polimi.ingsw.gc14.Network.NetworkEvents.AddPlayer; import java.io.*; import java.net.*; -public class TCPClient implements Serializable{ - Socket communicationSocket = null; +/** + * Client TCP. Sends and receives messages with the TCP server. + */ +public class TCPClient { + + /** Socket TCP */ + Socket communicationSocket; + + /** Input stream used receive objects from the server */ ObjectInputStream socketReceive; + + /** Output stream used to send objects to the server */ ObjectOutputStream socketSend; + /** Client game's controller */ GameController controller; + + /** IP address of the server to connect to */ String hostname; + + /** TCP port */ int port; - public TCPClient(GameController controller, String hostname, int port){ + + /** + * Class constructor that initializes the attributes. + * @param controller The game controller + * @param hostname The IP address of the server + * @param port The TCP port of the server + */ + public TCPClient(GameController controller, String hostname, int port) { this.controller = controller; this.hostname = hostname; this.port = port; } - public boolean start(String user){ - try{ + + /** + * Starts the TCP connection with the server. + * Sends an {@link AddPlayer} event, if the server responds with {@code -1}, the connection is refused and the method returns {@code false}. + * Otherwise, a listener thread is started. + * @param user The username of the player + * @param proposedNPlayers The desired number of players for the game + * @return true if the connection is successful, false otherwise. + */ + public boolean start(String user, int proposedNPlayers) { + try { communicationSocket = new Socket(hostname, port); socketSend = new ObjectOutputStream(communicationSocket.getOutputStream()); socketReceive = new ObjectInputStream(communicationSocket.getInputStream()); - socketSend.writeObject(new AddPlayer(user)); - if(communicationSocket.getInputStream().read() == -1){ + sendEvent(new AddPlayer(user, proposedNPlayers)); + if (communicationSocket.getInputStream().read() == -1) { + System.out.println("Could not connect to server"); return false; - } - else{ - Thread listener = new Thread(() -> ReceiveMessage()); + } else { + Thread listener = new Thread(() -> receiveMessage()); listener.start(); return true; } - } - catch(Exception e){ + } catch (IOException e) { + e.printStackTrace(); return false; } } - private void ReceiveMessage(){ - while(true){ - try{ - ((NetworkEvent)(socketReceive.readObject())).apply(controller); - } - catch(IOException e){ + + /** + * Listens continuously for incoming objects from the server. + * - If the received object is a {@link NetworkEvent} flagged as an error, it is printed. + * - If the received object is a valid {@link NetworkEvent}, it is applied to the game controller. + * - If the received object is a {@link Game} model, the controller's model is set. + */ + private void receiveMessage() { + while (true) { + try { + Object read = socketReceive.readObject(); + if (read instanceof NetworkEvent event) { //TODO: avoid instanceof + if (event.getIsError()) { + System.out.println(event); + } else { + event.apply(controller); + //clientController.view.update(); TODO + } + } else if (read instanceof Game model) { + controller.setModel(model); + } + } catch (IOException e) { e.printStackTrace(); - } - catch(ClassNotFoundException e){ + } catch (ClassNotFoundException e) { throw new RuntimeException(e); } - return; } } - private void SendEvent(NetworkEvent event){ - try{ + + /** + * Sends a {@link NetworkEvent} to the server. + * @param event The NetworkEvent to send. + */ + private void sendEvent(NetworkEvent event) { + try { socketSend.writeObject(event); - } - catch (IOException e) { + } catch (IOException e) { e.printStackTrace(); } } - -} +} \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/ClientHandler.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/ClientHandler.java index 97ea3c1..07864f0 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/ClientHandler.java +++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/ClientHandler.java @@ -1,76 +1,105 @@ package it.polimi.ingsw.gc14.Network.TCP.Server; -import it.polimi.ingsw.gc14.Controller.GameController; +import it.polimi.ingsw.gc14.Model.Game; import it.polimi.ingsw.gc14.Network.NetworkEvent; -import it.polimi.ingsw.gc14.Network.EventType; import java.io.*; import java.net.*; import java.util.List; +import java.util.concurrent.BlockingQueue; +/** + * Handles the TCP connection with a single client. + * Each instance runs on a dedicated thread and is responsible for receiving {@link NetworkEvent} from its client and adding them + * to the {@link #actionQueue}. + * It is also responsible to send events and game model updates back to the client. + */ public class ClientHandler implements Runnable { + + /** The TCP socket */ private Socket clientSocket; - private TCPServer server; - public ObjectInputStream in = null; - public ObjectOutputStream out = null; + + /** Input stream used to receive objects from the client */ + public ObjectInputStream in; + + /** Output stream used to send objects to the client */ + public ObjectOutputStream out; + + /** + * Shared list of all client handlers. + * This handler removes itself from the list when disconnected. + */ List clientHandlers; - GameController gameController; - private EventType eventType; - public Socket getClientSocket() { - return clientSocket; - } + /** Queue containing the events to be applied to the game model */ + BlockingQueue actionQueue; - public ClientHandler(Socket clientSocket, List clientHandlers, GameController gameController) { + + /** + * Class constructor that initializes the attributes. + * @param clientSocket The socket representing the client's TCP connection + * @param clientHandlers The shared list of all active client handlers + * @param actionQueue The queue containing incoming events + */ + public ClientHandler(Socket clientSocket, List clientHandlers, BlockingQueue actionQueue) { this.clientSocket = clientSocket; this.clientHandlers = clientHandlers; - this.gameController = gameController; + this.actionQueue = actionQueue; } + + /** + * Listens for incoming {@link NetworkEvent}s from the client and adds them to the {@link #actionQueue}. + * Upon disconnection, this handler removes itself from {@link #clientHandlers}. + */ @Override - public void run(){ - clientLoop(); - } - - private void clientLoop(){ - try{ - NetworkEvent input = null; - synchronized(in){ - in = new ObjectInputStream(clientSocket.getInputStream()); + public void run() { + try { + in = new ObjectInputStream(clientSocket.getInputStream()); + out = new ObjectOutputStream(clientSocket.getOutputStream()); + while (true) { + NetworkEvent event = (NetworkEvent) in.readObject(); + if (!actionQueue.add(event)) { + System.out.println("Error inserting action into queue"); + } } - while(true){ - try{ - input = (NetworkEvent) (in.readObject()); - if(input.apply(gameController)){ - server.broadcastUpdate(input); - } - } - catch(java.io.IOException e){ - e.printStackTrace(); - } - catch (ClassNotFoundException e){ - throw new RuntimeException(e); - } - - - } - } - catch (IOException e) { + } catch (IOException e) { + clientHandlers.remove(this); e.printStackTrace(); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); } } - public void notifyEvent(NetworkEvent event){ - synchronized(out){ - try{ + + /** + * Sends a {@link NetworkEvent} to the client. + * @param event The network event to send to the client. + */ + public void notifyEvent(NetworkEvent event) { + synchronized (out) { + try { out = new ObjectOutputStream(clientSocket.getOutputStream()); - out.writeObject(gameController.getModel()); - } - catch(IOException e){ + out.writeObject(event); + } catch (IOException e) { e.printStackTrace(); } } } -} + /** + * Sends the current game model to this client. + * @param game The current state of the game to send to the client. + */ + public void notifyModel(Game game) { + synchronized (out) { + try { + out = new ObjectOutputStream(clientSocket.getOutputStream()); + out.writeObject(game); + } catch (IOException e) { + e.printStackTrace(); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java index f7910a3..16c4cfb 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java +++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java @@ -1,7 +1,11 @@ package it.polimi.ingsw.gc14.Network.TCP.Server; import it.polimi.ingsw.gc14.Controller.GameController; +import it.polimi.ingsw.gc14.LimitedList; +import it.polimi.ingsw.gc14.Model.Game; +import it.polimi.ingsw.gc14.Network.EventType; import it.polimi.ingsw.gc14.Network.NetworkEvent; +import it.polimi.ingsw.gc14.Network.NetworkEvents.AddPlayer; import java.io.*; import java.net.*; @@ -9,86 +13,139 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.BlockingQueue; +/** + * Server TCP. Accepts connections and manages all client handlers. + */ public class TCPServer { - int port = -1; - int ConnectedPlayers = 0; - ServerSocket serverTCP = null; - GameController gameController; + + /** TCP port */ + int port; + + /** Number of currently connected clients */ + int ConnectedPlayers; + + /** Socket TCP */ + ServerSocket socketTCP; + + /** Server game's controller */ + GameController controller; + + /** Queue containing the events to be applied to the game model */ BlockingQueue actionQueue; + /** + * List containing the usernames of joined players. + * {@link LimitedList}'s limit defines at which size the list calls its action. The limit can be set using {@link LimitedList#setLimit(int)}. + */ + private LimitedList playerList; + + /** List containing all client's handlers */ private List clientHandlers; - - private int getConnectedPlayers(){ - return ConnectedPlayers; + /** + * Class constructor that initializes the attributes. + * @param controller The game controller + * @param port The TCP port + * @param actionQueue The action queue + * @param playerList The player's usernames list + */ + public TCPServer(GameController controller, int port, BlockingQueue actionQueue, LimitedList playerList){ + this.port = port; + this.ConnectedPlayers = 0; + this.socketTCP = null; + this.controller = controller; + this.actionQueue = actionQueue; + this.playerList = playerList; + this.clientHandlers = new ArrayList<>(); } + + /** + * Starts the TCP server. + * If the first event is not AddPlayer, the request is rejected. + * If the desired number of player is invalid, the request is rejected. + * + * If this is the first player to connect, a new game model is created and passed to the controller. Additionally, the playerList's limit is set. + * If the controller successfully adds the player, the username is added to {@link #playerList} and the handler is added to {@link #clientHandlers}. + * + * If any error occurs, the server sends -1 back to the client. Otherwise, it sends 1. + */ public void start(){ - clientHandlers = new ArrayList<>(); try{ - serverTCP = new ServerSocket(port); + socketTCP = new ServerSocket(port); } catch (IOException e){ - System.out.println("Could not listen on port: " + port); + System.out.println("Could not start the server TCP on port: " + port); e.printStackTrace(); return; } - System.out.println("Listening on port: " + port); + System.out.println("Server TCP started on port: " + port); + Socket clientSocket; while(true){ - Socket clientSocket = null; try{ - clientSocket = serverTCP.accept(); - if(!gameController.addPlayer(clientSocket.getInputStream().toString()) || ConnectedPlayers > gameController.getModel().getNPlayers()){ + clientSocket = socketTCP.accept(); + ObjectInputStream clientSocketObj = new ObjectInputStream(clientSocket.getInputStream()); + NetworkEvent event = (NetworkEvent) clientSocketObj.readObject(); + + if(!(event.getEventType() == EventType.ADD_PLAYER)){ clientSocket.getOutputStream().write((int)(-1)); clientSocket.close(); System.out.println("Invalid parameters. Connection terminated.\n"); } else{ - clientSocket.getOutputStream().write((int)(1)); - } - // gestione di ADD_PLAYER - } - catch (IOException e){ - e.printStackTrace(); - } + AddPlayer eventAddPlayer = (AddPlayer) event; + if (eventAddPlayer.getProposedNPlayer() < 2 || eventAddPlayer.getProposedNPlayer() > 5) { + clientSocket.getOutputStream().write((int) (-1)); + clientSocket.close(); + System.out.println("Invalid parameters. Connection terminated.\n"); + } + synchronized (controller) { + if (playerList.isEmpty()){ + Game model = new Game(eventAddPlayer.getProposedNPlayer()); + controller.setModel(model); + playerList.setLimit(eventAddPlayer.getProposedNPlayer()); + } + if (controller.addPlayer(eventAddPlayer.getUsername())) { + playerList.add(eventAddPlayer.getUsername()); + clientSocket.getOutputStream().write((int) (1)); - System.out.println("Accepted player: " + gameController.getModel().getPlayerByUsername(clientSocket.getInetAddress().toString())); + System.out.println("Accepted player: " + eventAddPlayer.getUsername()); + ClientHandler clientHandler = new ClientHandler(clientSocket, clientHandlers, actionQueue); + clientHandlers.add(clientHandler); + ConnectedPlayers++; - ConnectedPlayers++; - ClientHandler clientHandler = new ClientHandler(clientSocket, clientHandlers, gameController); - clientHandlers.add(clientHandler); - - //Sending model to clients - if(ConnectedPlayers == gameController.getModel().getNPlayers()){ - for (ClientHandler handler : clientHandlers) { - try { - synchronized(handler.out){ - ObjectOutputStream socketTx = new ObjectOutputStream(handler.getClientSocket().getOutputStream()); - socketTx.writeObject(gameController.getModel()); + Thread t = new Thread(clientHandler); + t.start(); + } else { + clientSocket.getOutputStream().write((int) (-1)); + clientSocket.close(); + System.out.println("Player could not be added. Connection terminated.\n"); } } - catch(IOException e){ - e.printStackTrace(); - } } } - - Thread t = new Thread(clientHandler); - t.start(); + catch(IOException e){ + e.printStackTrace(); + } + catch(ClassNotFoundException e){ + throw new RuntimeException(e); + } } } - public TCPServer(GameController gameController, int port, BlockingQueue actionQueue){ - this.port = port; - this.gameController = gameController; - this.actionQueue = actionQueue; - } - public void broadcastUpdate(NetworkEvent event){ + /** Sends an action to all TCP clients */ + public void notifyAll(NetworkEvent event){ clientHandlers.forEach((x) -> x.notifyEvent(event)); } + + + /** Sends a game model to all TCP clients */ + public void notifyAll(Game model){ + clientHandlers.forEach((x) -> x.notifyModel(model)); + } } diff --git a/src/main/java/it/polimi/ingsw/gc14/ServerLauncher.java b/src/main/java/it/polimi/ingsw/gc14/ServerLauncher.java index b3c14d7..9c8a10e 100644 --- a/src/main/java/it/polimi/ingsw/gc14/ServerLauncher.java +++ b/src/main/java/it/polimi/ingsw/gc14/ServerLauncher.java @@ -4,6 +4,7 @@ package it.polimi.ingsw.gc14; import it.polimi.ingsw.gc14.Controller.GameController; import it.polimi.ingsw.gc14.Model.Game; import it.polimi.ingsw.gc14.Network.NetworkEvent; +import it.polimi.ingsw.gc14.Network.NetworkEvents.AddPlayer; import it.polimi.ingsw.gc14.Network.RMI.Server.RMIServer; import it.polimi.ingsw.gc14.Network.TCP.Server.TCPServer; @@ -11,14 +12,58 @@ import java.rmi.RemoteException; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; + +/** + * Main server launcher that handles both TCP and RMI connections. + * The workflow is divided into two parts: game creation and game execution. + * + * The process flow for game creation is as follows: + * - The first client (TCP/RMI) requests to join the game by providing a username and the desired number of players + * - The TCP/RMI server checks {@link #playerList} and, if it is empty, sets the number of players according to the first user's request using {@link LimitedList#setLimit(int)} + * - The TCP/RMI server creates the {@link Game} with the requested number of players and adds the player to {@link #playerList} + * - Other players request to join the game (their requested number of players is ignored) + * - When the number of players in {@link #playerList} reaches the {@link LimitedList}'s limit, the list calls {@link #run()} + * - All players are notified of the {@link Game} + * + * The process flow for game execution is as follows: + * - The TCP/RMI server receives a {@link NetworkEvent} from a client and adds it to the {@link #actionQueue} + * - The {@link #run()} method repeatedly calls {@link #doFirstEvent()}, which takes the first event in the {@link #actionQueue} and tries to apply it + * - If the event cannot be successfully applied to the model, its {@code isError} flag is set to {@code true} + * - All players are notified of the event + */ public class ServerLauncher { + + /** + * Queue containinetworkTypeng the events to be applied to the game model. + * Thread safe by design. + */ BlockingQueue actionQueue; + + /** Game controller. Used to apply events */ GameController gameController; + + /** Server RMI. Handles RMI clients */ RMIServer serverRMI; + + /** Server TCP. Handles TCP clients */ TCPServer serverTCP; + /** + * List containing the usernames of joined players. + * {@link LimitedList}'s limit defines at which size the list calls its action + * Both the limit and the action can be set using {@link LimitedList#setLimit(int)} and {@link LimitedList#setAction(Runnable)} + * The limit is set by the first player joining the game. The action consists in calling {@link #run()} + */ + static LimitedList playerList; + /** + * Class constructor that initializes the attributes. + * @param actionQueue The queue containing the events + * @param gameController The game controller + * @param serverRMI The server RMI + * @param serverTCP The server TCP + */ public ServerLauncher(BlockingQueue actionQueue, GameController gameController, RMIServer serverRMI, TCPServer serverTCP) { this.actionQueue = actionQueue; this.serverRMI = serverRMI; @@ -26,35 +71,74 @@ public class ServerLauncher { this.serverTCP = serverTCP; } + + /** + * Takes the first event in the actionQueue and attempts to apply it to the game controller. + * If the event cannot be applied, its isError flag is set to true; otherwise, it is set to false. + * All clients (both TCP and RMI) are notified of the event + * @return the outcome of applying the event to the controller + * @throws InterruptedException if an error occurs while accessing the actionQueue + * @throws RemoteException if an RMI error occurs + */ public boolean doFirstEvent() throws InterruptedException, RemoteException { NetworkEvent event = actionQueue.take(); - if(event.apply(gameController)) { - serverRMI.notifyAll(event); - serverTCP.broadcastUpdate(event); - return true; - } else { - serverRMI.notifyError(event.getUsername(), "Mossa non valida"); // TODO Converrebbe mettere in network event un booleano che dice se è stato accettato e fare una notifyAll anche per errori - //serverTCP // TODO non esiste un notify error (guarda sopra) - return false; - } + event.setIsError(!event.apply(gameController)); + + serverRMI.notifyAll(event); + serverTCP.notifyAll(event); + + return !event.getIsError(); } - public static void main() throws RemoteException { + /** + * The first method executed when the server program is launched. + * It creates all the objects needed: playerList, actionQueue, gameController, serverRMI, serverTCP, launcher. + * Then sets the playerList's action to execute launcher.run() and starts the TCP/RMI servers. + * Note: the model is initialized and set in the controller in TCP/RMI servers when the first user decides the number of players. + * + * @throws InterruptedException if this exception is issued by run method + * @throws RemoteException if this exception is issued by run method + */ + public static void main(String[] args) throws InterruptedException, RemoteException { + playerList = new LimitedList<>(5, ()->{}); BlockingQueue actionQueue = new LinkedBlockingQueue<>(); - Game model = new Game(); - GameController gameController = new GameController(model); - RMIServer serverRMI = new RMIServer(gameController, 1099, actionQueue); - TCPServer serverTCP = new TCPServer(gameController, 8080, actionQueue); + GameController gameController = new GameController(); + RMIServer serverRMI = new RMIServer(gameController, 1099, actionQueue, playerList); + TCPServer serverTCP = new TCPServer(gameController, 8080, actionQueue, playerList); + ServerLauncher launcher = new ServerLauncher(actionQueue, gameController, serverRMI, serverTCP); + + playerList.setAction(()->{ + new Thread(()->{ + try { + launcher.run(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } catch (RemoteException e) { + throw new RuntimeException(e); + } + }).start(); + }); serverRMI.start(); - new Thread (()->{serverTCP.start();}).start(); - - ServerLauncher launcher = new ServerLauncher(actionQueue, gameController, serverRMI, serverTCP); - launcher.run(); + new Thread(()->{serverTCP.start();}).start(); } - public void run() { + + /** + * Creates and executes the game. + * Game creation: TCP/RMI servers send the game model to all players. + * Game execution: repeatedly calls doFirstEvent() to process the events in the actionQueue. + * @throws InterruptedException if the TCP server thread is interrupted + * @throws RemoteException if an RMI error occurs + */ + public void run() throws InterruptedException, RemoteException { + // Game creation + System.out.println("\n\nNotifying model"); + serverRMI.notifyAll(gameController.getModel()); + serverTCP.notifyAll(gameController.getModel()); + + // Game execution while (true) { try { this.doFirstEvent(); diff --git a/src/main/java/it/polimi/ingsw/gc14/View/TUI/AsciiTable.java b/src/main/java/it/polimi/ingsw/gc14/View/TUI/AsciiTable.java new file mode 100644 index 0000000..33e93ad --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/View/TUI/AsciiTable.java @@ -0,0 +1,70 @@ +package it.polimi.ingsw.gc14.View.TUI; +import java.util.*; + +// Helper generale per costruire tabelle ASCII +public class AsciiTable { + private final BorderStyle s; + private final int cols; + private final List> rows = new ArrayList<>(); + private final List separators = new ArrayList<>(); + + public AsciiTable(BorderStyle s, int cols) { + this.s = s; this.cols = cols; + } + + public void addRow(String... cells) { rows.add(Arrays.asList(cells)); } + public void addRow(List cells) { rows.add(cells); } + public void addHeader(String... cells) { rows.add(0, Arrays.asList(cells)); separators.add(0); } + public void addSeparator() { separators.add(rows.size()); } + + public String build() { + var sb = new StringBuilder(); + int maxWidth = rows.stream().mapToInt(x->x.stream().mapToInt(y->y.length()).max().getAsInt()).max().getAsInt()+1; + sb.append(hline(s.tl(), s.mt(), s.tr(),maxWidth)).append('\n'); + + for (int i = 0; i < rows.size(); i++) { + sb.append(s.v()); + for (String cell : rows.get(i)) + sb.append(rpad(" " + cell, maxWidth)).append(s.v()); + sb.append('\n'); + if (separators.contains(i) && i < rows.size() - 1) + sb.append(hline(s.sl(), s.sx(), s.sr(),maxWidth)).append('\n'); + } + sb.append(hline(s.bl(), s.mb(), s.br(), maxWidth)); + return sb.toString(); + } + + private String hline(String l, String m, String r,int maxWidth) { + var sb = new StringBuilder(l); + for (int i = 0; i < cols; i++) { + sb.append(s.h().repeat(maxWidth)); + if (i < cols - 1) sb.append(m); + } + return sb.append(r).toString(); + } + + private static String rpad(String s, int w) { + if (s.length() >= w) return s.substring(0, w); + return s + " ".repeat(w - s.length()); + } + public static String sideBySide(List left, List right, int gap) { + int leftWidth = left.stream().mapToInt(String::length).max().orElse(0); + int maxHeight = Math.max(left.size(), right.size()); + String padding = " ".repeat(gap); + + var sb = new StringBuilder(); + for (int i = 0; i < maxHeight; i++) { + String l = i < left.size() + ? left.get(i) + : " ".repeat(leftWidth); + + // padda la riga sinistra se è più corta delle altre + l = rpad(l, leftWidth); + + String r = i < right.size() ? right.get(i) : ""; + sb.append(l).append(padding).append(r).append('\n'); + } + return sb.toString(); + } + +} \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/View/TUI/BorderStyle.java b/src/main/java/it/polimi/ingsw/gc14/View/TUI/BorderStyle.java new file mode 100644 index 0000000..13b365d --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/View/TUI/BorderStyle.java @@ -0,0 +1,39 @@ +package it.polimi.ingsw.gc14.View.TUI; + +public enum BorderStyle { + UNICODE("╔","╗","╚","╝","═","║","╠","╣","╦","╩","╬","├","┤","─","┼"), + ASCII ("+","+","+","+","-","|","+","+","+","+","+","+","+","-","+"), + ROUNDED("╭","╮","╰","╯","─","│","├","┤","┬","┴","┼","├","┤","─","┼"); + + private final String tl,tr,bl,br,h,v,ml,mr,mt,mb,x,sl,sr,sh,sx; + + BorderStyle(String tl,String tr,String bl,String br, + String h, String v, String ml,String mr, + String mt,String mb,String x, + String sl,String sr,String sh,String sx) { + this.tl = tl; this.tr = tr; + this.bl = bl; this.br = br; + this.h = h; this.v = v; + this.ml = ml; this.mr = mr; + this.mt = mt; this.mb = mb; + this.x = x; + this.sl = sl; this.sr = sr; + this.sh = sh; this.sx = sx; + } + + public String tl() { return tl; } + public String tr() { return tr; } + public String bl() { return bl; } + public String br() { return br; } + public String h() { return h; } + public String v() { return v; } + public String ml() { return ml; } + public String mr() { return mr; } + public String mt() { return mt; } + public String mb() { return mb; } + public String x() { return x; } + public String sl() { return sl; } + public String sr() { return sr; } + public String sh() { return sh; } + public String sx() { return sx; } +} diff --git a/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java b/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java new file mode 100644 index 0000000..8d25fa3 --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java @@ -0,0 +1,93 @@ +//package it.polimi.ingsw.gc14.View.TUI; +//import it.polimi.ingsw.gc14.Model.Game; +// +//public class TUI { +// +// // ── dati di stato ─────────────────────────────────────────── +// private BorderStyle style = BorderStyle.UNICODE; +// private Game model; +// // ── punto di ingresso ─────────────────────────────────────── +// public String render() { +// var sb = new StringBuilder(); +// sb.append(renderHeader()); +// sb.append(renderTurnOrder()); +// sb.append(renderOfferTrack()); +// sb.append(renderCardRows()); +// sb.append(renderTableaux()); +// sb.append(renderFooter()); +// return sb.toString(); +// } +// +// // ── sezioni ───────────────────────────────────────────────── +// private String renderTurnOrder() { +// var table = new AsciiTable(style, 4, 10); // 4 colonne, largh 10 +// table.addRow(model.getPlayers().stream() +// .map(p -> + ". " + p.getUserName()) +// .toList()); +// table.addRow(state.getPlayers().stream() +// .map(p -> p.getTotemPosition() != null +// ? "totem: " + p.getTotemPosition() +// : "(da piaz)") +// .toList()); +// return " TURN ORDER\n" + table.build() + "\n"; +// } +// +// private String renderOfferTrack() { +// var table = new AsciiTable(style, 5, 14); +// table.addRow(state.getOfferTiles().stream() +// .map(t -> t.getId() + ": " + t.getLabel()).toList()); +// table.addRow(state.getOfferTiles().stream() +// .map(OfferTile::getRowsLabel).toList()); +// table.addRow(state.getOfferTiles().stream() +// .map(t -> state.getTotemOnTile(t.getId())).toList()); +// return " OFFER TRACK\n" + table.build() + "\n"; +// } +// +// private String renderCardRows() { +// int cols = state.getTopRow().size(); +// var table = new AsciiTable(style, cols, 13); +// table.addRow(state.getTopRow().stream() +// .map(c -> "[" + c.getTypeLabel() + "]").toList()); +// table.addRow(state.getTopRow().stream() +// .map(Card::getName).toList()); +// table.addSeparator(); +// table.addRow(state.getBotRow().stream() +// .map(c -> "[" + c.getTypeLabel() + "]").toList()); +// table.addRow(state.getBotRow().stream() +// .map(Card::getName).toList()); +// return " CARTE IN GIOCO\n" + prefix("TOP ", "BOT ", table.build()) + "\n"; +// } +// +// private String renderTableaux() { +// var sb = new StringBuilder(" TABLEAU GIOCATORI\n\n"); +// for (Player p : state.getPlayers()) { +// String marker = p.isActive() ? ">>>" : " "; +// sb.append(String.format(" %s %s%s Food:%d PP:%d%n", +// marker, p.getName(), +// p.isActive() ? " [TUO TURNO]" : "", +// p.getFood(), p.getPP())); +// sb.append(renderPlayerTableau(p)); +// sb.append("\n"); +// } +// return sb.toString(); +// } +// +// private String renderPlayerTableau(Player p) { +// var table = new AsciiTable(style, 3, 14); +// table.addHeader("PERSONAGGI", "EDIFICI", "RISORSE"); +// int rows = Math.max(p.getChars().size(), +// Math.max(p.getBuildings().size(), 3)); +// for (int i = 0; i < rows; i++) { +// String ch = i < p.getChars().size() ? p.getChars().get(i) : ""; +// String bd = i < p.getBuildings().size() ? p.getBuildings().get(i) : ""; +// String rs = switch (i) { +// case 0 -> "Food: " + "O".repeat(p.getFood()); +// case 1 -> "PP: " + p.getPP(); +// case 2 -> "Chars:" + p.getChars().size() + " Edif:" + p.getBuildings().size(); +// default -> ""; +// }; +// table.addRow(ch, bd, rs); +// } +// return " " + table.build().replace("\n", "\n "); +// } +//} diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 732a715..e178647 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -8,7 +8,14 @@ module it.polimi.ingsw.gc14 { opens it.polimi.ingsw.gc14 to javafx.fxml, com.google.gson; opens it.polimi.ingsw.gc14.Model to com.google.gson; + opens it.polimi.ingsw.gc14.Model.GamePackage to com.google.gson; exports it.polimi.ingsw.gc14; - opens it.polimi.ingsw.gc14.Model.GamePackage to com.google.gson; + + // RMI + exports it.polimi.ingsw.gc14.Network.RMI.Common to java.rmi; + exports it.polimi.ingsw.gc14.Network.RMI.Server to java.rmi; + exports it.polimi.ingsw.gc14.Network.RMI.Client to java.rmi; + exports it.polimi.ingsw.gc14.Network to java.rmi; + exports it.polimi.ingsw.gc14.Model to java.rmi, com.google.gson; } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0Test.java index 5420c00..effb1df 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0Test.java @@ -143,8 +143,4 @@ class Building0Test { b0.buy(p1); assertFalse(b0.buy(p2)); } - - - - } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java index 296b0da..620233a 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java @@ -3,7 +3,6 @@ package it.polimi.ingsw.gc14.Model.Cards.Building.Effects; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.Artist; -import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.Hunter; import it.polimi.ingsw.gc14.Model.Player; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -109,4 +108,26 @@ class Building11Test { b4.applyEffect(p5); }); } + + @Test + @DisplayName("toString") + void testToString(){ + Building11 b11 = new Building11(1,2,3, CharacterType.INVENTOR, 1); + assertEquals("Era:1 Price:2 Prestige:3 Icon: INVENTOR", b11.toString()); + + b11 = new Building11(1,2,3, CharacterType.BUILDER, 1); + assertEquals("Era:1 Price:2 Prestige:3 Icon: BUILDER", b11.toString()); + + b11 = new Building11(1,2,3, CharacterType.GATHERER, 1); + assertEquals("Era:1 Price:2 Prestige:3 Icon: GATHERER", b11.toString()); + + b11 = new Building11(1,2,3, CharacterType.ARTIST, 1); + assertEquals("Era:1 Price:2 Prestige:3 Icon: ARTIST", b11.toString()); + + b11 = new Building11(1,2,3, CharacterType.SHAMAN, 1); + assertEquals("Era:1 Price:2 Prestige:3 Icon: SHAMAN", b11.toString()); + + b11 = new Building11(1,2,3, CharacterType.HUNTER, 1); + assertEquals("Era:1 Price:2 Prestige:3 Icon: HUNTER", b11.toString()); + } } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java index eb76d5c..cfd9ef4 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java @@ -66,4 +66,26 @@ class Building1Test { assertEquals(Prestige, bClone.getPrestigeValue()); assertEquals(ct, b0.getIcon()); } + + @Test + @DisplayName("toString") + void testToString(){ + Building1 b1 = new Building1(1,2,3, CharacterType.INVENTOR); + assertEquals("Era:1 Price:2 Prestige:3 Icon: INVENTOR", b1.toString()); + + b1 = new Building1(1,2,3, CharacterType.BUILDER); + assertEquals("Era:1 Price:2 Prestige:3 Icon: BUILDER", b1.toString()); + + b1 = new Building1(1,2,3, CharacterType.GATHERER); + assertEquals("Era:1 Price:2 Prestige:3 Icon: GATHERER", b1.toString()); + + b1 = new Building1(1,2,3, CharacterType.ARTIST); + assertEquals("Era:1 Price:2 Prestige:3 Icon: ARTIST", b1.toString()); + + b1 = new Building1(1,2,3, CharacterType.SHAMAN); + assertEquals("Era:1 Price:2 Prestige:3 Icon: SHAMAN", b1.toString()); + + b1 = new Building1(1,2,3, CharacterType.HUNTER); + assertEquals("Era:1 Price:2 Prestige:3 Icon: HUNTER", b1.toString()); + } } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java index 163876d..eb71ceb 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java @@ -347,6 +347,7 @@ class GameTest { assertNotEquals(thirdPlayer, game.getCurrentState().getCurrentPlayer()); + System.out.println(game); } @@ -805,5 +806,23 @@ class GameTest { assertFalse(game.PickOptionalBuildingCard(current, 0)); } + @Test + void toStringModel() + { + Game game=new Game(3); + Player p1=new Player("p1"); + Player p2=new Player("p2"); + Player p3=new Player("p3"); + assertTrue(game.addPlayer(p1)); + assertTrue(game.addPlayer(p2)); + assertTrue(game.addPlayer(p3)); + + Queueplayers=new LinkedList<>(); + for(int i=0;i<3;i++) { + players.add( game.getCurrentState().getCurrentPlayer()); + assertTrue(game.SlotChoiceByIndex(game.getCurrentState().getCurrentPlayer(), i)); + } + System.out.println(game); + } } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order2Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order2Test.java index f089711..22347b3 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order2Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order2Test.java @@ -4,9 +4,10 @@ import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; import it.polimi.ingsw.gc14.Model.Player; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.NoSuchElementException; + +import java.lang.reflect.Field; +import java.util.*; + import static org.junit.jupiter.api.Assertions.*; class Order2Test { @@ -154,4 +155,16 @@ class Order2Test { assertEquals(p1, order.getFirst()); assertEquals(p1, order.getFirst()); } + @Test + void toStringTest() throws NoSuchFieldException, IllegalAccessException { + Player p1 = new Player("wPIshEUhiOpRRnIBFfM89s2$@q$9FGbz"); + Player p2 = new Player("L*Ncw1rjjrF2xn%H@4P1iC@&NNIooQQk"); + Order2 order = new Order2(new ArrayList<>(Arrays.asList(p1, p2))); + order.pull(); + order.pull(); + order.push(p2); + order.push(p1); + order.pull().getUserName(); + System.out.println(order); + } } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order3Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order3Test.java index 44108ed..3e24680 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order3Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order3Test.java @@ -4,9 +4,10 @@ import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; import it.polimi.ingsw.gc14.Model.Player; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.NoSuchElementException; + +import java.lang.reflect.Field; +import java.util.*; + import static org.junit.jupiter.api.Assertions.*; class Order3Test { @@ -180,5 +181,30 @@ class Order3Test { assertEquals(p1, order.getFirst()); assertEquals(p1, order.getFirst()); } + @Test + void toStringTest() throws NoSuchFieldException, IllegalAccessException { + Player p1 = new Player("wPIshEUhiOpRRnIBFfM89s2$@q$9FGbz"); + Player p2 = new Player("L*Ncw1rjjrF2xn%H@4P1iC@&NNIooQQk"); + Player p3 = new Player("L*Ncw1ryyrF2xn%H@4P1iC@&NNIooQQk"); + Order3 order = new Order3(new ArrayList<>(Arrays.asList(p1, p2,p3))); + Field field = Order3.class.getSuperclass().getDeclaredField("playerList"); + field.setAccessible(true); + List values =(ArrayList)field.get(order); + + String userPulled=order.pull().getUserName(); + userPulled=order.pull().getUserName(); + userPulled=order.pull().getUserName(); + + System.out.println(values); + order.push(p1); + order.push(p2); + values =(ArrayList)field.get(order); + System.out.println(order); +// assertEquals("TURN ORDER\n" + +// "╔════════════════════════════════════╦════════════════════════════════════╦════════════════════════════════════╗\n" + +// "║ 0. ║ 1. "+values.get(1).getUserName() +"║ 2. "+values.get(2).getUserName()+"║\n" + +// "║ +2 Food ║ -- ║ -1 Food / -2 Prestige ║\n"+ +// "╚════════════════════════════════════╩════════════════════════════════════╩════════════════════════════════════╝\n", order.toString()); + } } diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order4Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order4Test.java index c2395c2..78e731f 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order4Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order4Test.java @@ -4,9 +4,10 @@ import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; import it.polimi.ingsw.gc14.Model.Player; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.NoSuchElementException; + +import java.lang.reflect.Field; +import java.util.*; + import static org.junit.jupiter.api.Assertions.*; class Order4Test { @@ -272,22 +273,14 @@ class Order4Test { } @Test - void getFirst() { - Player p1 = new Player("p1"); - Player p2 = new Player("p2"); - Player p3 = new Player("p3"); - Player p4 = new Player("p4"); - Order4 order = new Order4(new ArrayList<>(Arrays.asList(p1, p2, p3, p4))); + void toStringTest() throws NoSuchFieldException, IllegalAccessException { + Player p1 = new Player("wPIshNQhiOpRRnIBFfM89s2$@q$9FGbz"); + Player p2 = new Player("L*Ncw1rjjrF2xn%H@4P1iC@&NNIooQQk"); + Player p3 = new Player("wPIshEUhiOpRRnIBFfM89s2$@q$9FGbz"); + Player p4 = new Player("wPIshOThiOpRRnIBFfM89s2$@q$9FGbz"); + Order4 order = new Order4(new ArrayList<>(Arrays.asList(p1, p2,p3,p4))); + String userPulled=order.pull().getUserName(); + System.out.println(order); - order.pull(); - order.pull(); - order.pull(); - order.pull(); - assertNull(order.getFirst()); - - order.push(p1); - - assertEquals(p1, order.getFirst()); - assertEquals(p1, order.getFirst()); } } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order5Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order5Test.java index 0ea1740..9e838fb 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order5Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order5Test.java @@ -5,6 +5,12 @@ import it.polimi.ingsw.gc14.Model.Player; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import java.lang.reflect.Field; +import java.util.*; + +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.NoSuchElementException; @@ -361,6 +367,23 @@ class Order5Test { assertEquals(p1, order.getFirst()); assertEquals(p1, order.getFirst()); } + @Test + void toStringTest() throws NoSuchFieldException, IllegalAccessException { + Player p1 = new Player("wPIshUEhiOpRRnIBFfM89s2$@q$9FGbz"); + Player p2 = new Player("L*Ncw1rjjrF2xn%H@4P1iC@&NNIooQQk"); + Player p3 = new Player("wPIshOUhiOpRRnIBFfM89s2$@q$9FGbz"); + Player p4 = new Player("wPIshNUhiOpRRnIBFfM89s2$@q$9FGbz"); + Player p5 = new Player("wPIshKUhiOpRRnIBFfM89s2$@q$9FGbz"); + Order5 order = new Order5(new ArrayList<>(Arrays.asList(p1, p2,p3,p4,p5))); + order.pull(); + order.pull(); + order.pull(); + order.pull(); + order.pull(); + order.push(p1); + System.out.println(order); + + } } diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java index 79990ec..31cd1b0 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java @@ -1,5 +1,6 @@ package it.polimi.ingsw.gc14.Model; +import it.polimi.ingsw.gc14.Model.Cards.Building.Effects.*; import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.*; @@ -200,17 +201,44 @@ class PlayerTest { p.addPrestige(15); p.addFood(7); p.artists.add(new Artist(1)); + p.artists.add(new Artist(1)); + p.artists.add(new Artist(1)); + p.artists.add(new Artist(1)); + p.artists.add(new Artist(1)); + p.artists.add(new Artist(1)); p.artists.add(new Artist(2)); + p.builders.add(new Builder(2, 5, 1)); + p.gatherers.add(new Gatherer(1, 3)); + p.shamans.add(new Shaman(2, 3, 3)); + p.shamans.add(new Shaman(2, 3, 4)); + p.inventors.add(new Inventor(3, 1)); + p.hunters.add(new Hunter(3, true)); + p.hunters.add(new Hunter(2, false)); + p.buildingCards.add(new BuildingCard(2, 1,2, 5)); p.buildingCards.add(new BuildingCard(2, 2,3, 6)); - assertEquals("test_usr:"+ "\n\t" + - "Food: 7" + "\n\t" + - "Prestige: 15" + "\n\t" + - "Artists: [Era:1 ARTIST, Era:2 ARTIST]" + "\n\t" + "Builders: []" + "\n\t" + - "Gatherers: []" + "\n\t" + - "Shamans: []" + "\n\t" + - "Hunters: []" + "\n\t" + - "Buildings: [Era:1 Price:2 Prestige:5, Era:2 Price:3 Prestige:6]", - p.toString()); + p.buildingCards.add(new Building1(2, 5, 5, CharacterType.INVENTOR)); + p.buildingCards.add(new Building1(2, 5, 5, CharacterType.SHAMAN)); + p.buildingCards.add(new Building11(1, 5, 7, CharacterType.ARTIST , 3)); + //System.out.println(p.toString()); + assertEquals(""+ + "╔═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╗\n" + + "║ test_usr ║\n" + + "├═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════┤\n" + + "║ RESOURCES: ║\n" + + "║ Food: 7 ║\n" + + "║ Prestige: 15 ║\n" + + "├═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════┤\n" + + "║ CHARACTERS: ║\n" + + "║ Artists: [⎕:, ⎕:, ⎕:, ⎕:, ⎕:, ⎕:, ⎕:] ║\n" + + "║ Builders: [⎕: RV:5 PV:1] ║\n" + + "║ Gatherers: [⎕:] ║\n" + + "║ Shamans: [⎕: *:3, ⎕: *:3] ║\n" + + "║ Inventors: [⎕: I_ID:1] ║\n" + + "║ Hunters: [⎕: I, ⎕:] ║\n" + + "├═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════┤\n" + + "║ BUILDING CARDS: ║\n" + + "║ Buildings: [⎕: ID:2 $:2 PV:5, ⎕: ID:2 $:3 PV:6, ⎕: ID:1 $:5 PV:5 Icon: I, ⎕: ID:1 $:5 PV:5 Icon: S, ⎕: ID:11 $:5 PV:7 Icon: A MP: 3]║\n" + + "╚═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝", p.toString()); } } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/SlotTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/SlotTest.java index 5d44ca9..ca32b35 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/SlotTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/SlotTest.java @@ -46,7 +46,8 @@ class SlotTest { assertEquals(0, s.getNLower()); assertEquals(0, s.getNUpper()); assertEquals(5, s.getNMinPlayer()); - assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\nNMinPlayer: "+s.getNMinPlayer()+"\n", s.toString()); + System.out.println(s); + assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\n", s.toString()); } @Test @@ -59,7 +60,8 @@ class SlotTest { assertEquals(1, s.getNLower()); assertEquals(0, s.getNUpper()); assertEquals(0, s.getNMinPlayer()); - assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\nNMinPlayer: "+s.getNMinPlayer()+"\n", s.toString()); + System.out.println(s); + assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\n", s.toString()); } @Test @@ -72,8 +74,8 @@ class SlotTest { assertEquals(0, s.getNLower()); assertEquals(1, s.getNUpper()); assertEquals(0, s.getNMinPlayer()); - assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\nNMinPlayer: "+s.getNMinPlayer()+"\n", s.toString()); - } + System.out.println(s); + assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\n", s.toString()); } @Test void SlotIdD() { @@ -85,7 +87,8 @@ class SlotTest { assertEquals(2, s.getNLower()); assertEquals(0, s.getNUpper()); assertEquals(3, s.getNMinPlayer()); - assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\nNMinPlayer: "+s.getNMinPlayer()+"\n", s.toString()); + System.out.println(s); + assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\n", s.toString()); } @Test @@ -98,7 +101,8 @@ class SlotTest { assertEquals(1, s.getNLower()); assertEquals(1, s.getNUpper()); assertEquals(0, s.getNMinPlayer()); - assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\nNMinPlayer: "+s.getNMinPlayer()+"\n", s.toString()); + System.out.println(s); + assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\n", s.toString()); } @Test @@ -111,7 +115,8 @@ class SlotTest { assertEquals(0, s.getNLower()); assertEquals(2, s.getNUpper()); assertEquals(0, s.getNMinPlayer()); - assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\nNMinPlayer: "+s.getNMinPlayer()+"\n", s.toString()); + System.out.println(s); + assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\n", s.toString()); } @Test @@ -124,6 +129,7 @@ class SlotTest { assertEquals(1, s.getNLower()); assertEquals(2, s.getNUpper()); assertEquals(4, s.getNMinPlayer()); - assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\nNMinPlayer: "+s.getNMinPlayer()+"\n", s.toString()); + System.out.println(s); + assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\n", s.toString()); } } \ No newline at end of file