From 9894bb5f3d70ccbc92a6d9f0ff8c702251844fa0 Mon Sep 17 00:00:00 2001 From: rubenpirreram Date: Fri, 17 Apr 2026 17:17:13 +0200 Subject: [PATCH 1/7] Fix: Game Class and Test --- .../java/it/polimi/ingsw/gc14/Model/Game.java | 20 +++++++++++++++++-- .../polimi/ingsw/gc14/Network/EventType.java | 4 ++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/main/java/it/polimi/ingsw/gc14/Network/EventType.java 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 d0d1112..4091090 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java @@ -60,7 +60,9 @@ public class Game { public int getNPlayers() { return nPlayers; } - public Game(int nPlayers) { + public Game(int nPlayers) throws IllegalArgumentException{ + if(nPlayers < 0||nPlayers > 5) + throw new IllegalArgumentException(); this.nPlayers = nPlayers; board=new Board(nPlayers); slotMap = new LinkedHashMap<>(); @@ -72,8 +74,16 @@ public class Game { playersList = new ArrayList<>(); OptionalCardQueue = new LinkedList<>(); } + public Game() + { + this(0); + } public boolean addPlayer(Player player) { + if(this.nPlayers==0) + { + return false; + } if(currentState.getGameStage()!= GameStages.WAITING) return false; if(playersList.contains(player)) @@ -415,7 +425,13 @@ public class Game { currentState.GameStageUpdate(GameStages.ENDED); } - + public boolean setNPlayer(int nPlayers) + { + if(this.nPlayers!=0) + return false; + this.nPlayers=nPlayers; + return true; + } diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/EventType.java b/src/main/java/it/polimi/ingsw/gc14/Network/EventType.java new file mode 100644 index 0000000..bcacffb --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/Network/EventType.java @@ -0,0 +1,4 @@ +package it.polimi.ingsw.gc14.Network; + +public enum EventType { +} From 8d12267b4ae33ac868e3404e24e34f233bab2d68 Mon Sep 17 00:00:00 2001 From: rubenpirreram Date: Fri, 17 Apr 2026 17:19:19 +0200 Subject: [PATCH 2/7] Fix: Game Test --- src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 848f67b..9dcb81a 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java @@ -20,6 +20,14 @@ class GameTest { Game game=new Game(nPlayers); assertEquals(nPlayers,game.getNPlayers()); assertEquals(GameStages.WAITING,game.getCurrentState().getGameStage()); + + assertThrows(IllegalArgumentException.class,()->new Game(6)); + game=new Game(); + assertFalse(game.addPlayer(new Player("p1"))); + game.setNPlayer(nPlayers); + assertTrue(game.addPlayer(new Player("p1"))); + assertEquals(nPlayers,game.getNPlayers()); + assertEquals(GameStages.WAITING,game.getCurrentState().getGameStage()); } @Test From 60dcb4c5705646d43b711f84d10b879aeef1f910 Mon Sep 17 00:00:00 2001 From: rubenpirreram Date: Fri, 17 Apr 2026 17:39:10 +0200 Subject: [PATCH 3/7] Fix: GameController --- .../java/it/polimi/ingsw/gc14/Controller/GameController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/it/polimi/ingsw/gc14/Controller/GameController.java b/src/main/java/it/polimi/ingsw/gc14/Controller/GameController.java index 0d21e6e..077a9b7 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Controller/GameController.java +++ b/src/main/java/it/polimi/ingsw/gc14/Controller/GameController.java @@ -8,6 +8,11 @@ public class GameController { public GameController(Game model) { this.model = model; } + public GameController() { + } + public void setModel(Game model) { + this.model = model; + } public boolean addPlayer(String username) { return model.addPlayer(new Player(username)); } From d6583a40c2405b1bda5e479144d9b60d77a003a3 Mon Sep 17 00:00:00 2001 From: MatteoPellegrino05 Date: Fri, 17 Apr 2026 22:52:27 +0200 Subject: [PATCH 4/7] Add: GameControllerTest --- .../gc14/Controller/GameControllerTest.java | 228 ++++++++++++++++++ 1 file changed, 228 insertions(+) create mode 100644 src/test/java/it/polimi/ingsw/gc14/Controller/GameControllerTest.java diff --git a/src/test/java/it/polimi/ingsw/gc14/Controller/GameControllerTest.java b/src/test/java/it/polimi/ingsw/gc14/Controller/GameControllerTest.java new file mode 100644 index 0000000..19a845e --- /dev/null +++ b/src/test/java/it/polimi/ingsw/gc14/Controller/GameControllerTest.java @@ -0,0 +1,228 @@ +package it.polimi.ingsw.gc14.Controller; + +import it.polimi.ingsw.gc14.Model.Cards.TribeCard; +import it.polimi.ingsw.gc14.Model.Game; +import it.polimi.ingsw.gc14.Model.GamePackage.GameStages; +import it.polimi.ingsw.gc14.Model.Player; +import org.junit.jupiter.api.Test; + +import java.util.LinkedList; +import java.util.List; +import java.util.Queue; + +import static org.junit.jupiter.api.Assertions.*; + +class GameControllerTest { + + @Test + void addPlayer() { + Game game = new Game(3); + GameController controller = new GameController(game); + + assertTrue(controller.addPlayer("Giorgio")); + assertTrue(controller.addPlayer("Marco")); + assertTrue(controller.addPlayer("Luca")); + + assertNotNull(game.getPlayerByUsername("Giorgio")); + assertNotNull(game.getPlayerByUsername("Marco")); + assertNotNull(game.getPlayerByUsername("Luca")); + + assertEquals(GameStages.SLOT_CHOICE, game.getCurrentState().getGameStage()); + assertFalse(controller.addPlayer("Extra")); + } + + @Test + void allMethodsShouldReturnFalseForUnknownUsername() { + Game game = new Game(3); + GameController controller = new GameController(game); + + assertFalse(controller.slotChoice("ghost", 0)); + assertFalse(controller.drawUpperTribeCard("ghost", 0)); + assertFalse(controller.drawLowerTribeCard("ghost", 0)); + assertFalse(controller.drawUpperBuildingCard("ghost", 0)); + assertFalse(controller.drawLowerBuildingCard("ghost", 0)); + assertFalse(controller.pickOptionalTribeCard("ghost", 0)); + assertFalse(controller.pickOptionalBuildingCard("ghost", 0)); + } + + @Test + void slotChoice() { + Game game = new Game(3); + GameController controller = new GameController(game); + + assertTrue(controller.addPlayer("Giorgio")); + assertTrue(controller.addPlayer("Marco")); + assertTrue(controller.addPlayer("Luca")); + + String cur = game.getCurrentState().getCurrentPlayer().getUserName(); + String other = cur.equals("Giorgio") ? "Marco" : "Giorgio"; + assertFalse(controller.slotChoice(other, 0)); + + Queue order = new LinkedList<>(); + for (int i = 0; i < 3; i++) { + Player p = game.getCurrentState().getCurrentPlayer(); + order.add(p); + assertTrue(controller.slotChoice(p.getUserName(), i)); + } + + assertEquals(GameStages.RESOLVING_ACTIONS, game.getCurrentState().getGameStage()); + assertEquals(order.poll(), game.getCurrentState().getCurrentPlayer()); + } + + @Test + void drawLowerTribeCard() { + Game game = new Game(3); + GameController controller = new GameController(game); + + assertTrue(controller.addPlayer("Giorgio")); + assertTrue(controller.addPlayer("Marco")); + assertTrue(controller.addPlayer("Luca")); + + Queue order = new LinkedList<>(); + for (int i = 0; i < 3; i++) { + Player p = game.getCurrentState().getCurrentPlayer(); + order.add(p); + assertTrue(controller.slotChoice(p.getUserName(), i)); + } + + Player first = order.poll(); + assertEquals(first, game.getCurrentState().getCurrentPlayer()); + + List cards = game.getLowerListTribeCards(); + int idx = cards.indexOf( + cards.stream() + .filter(c -> !c.IsEventCard()) + .findFirst() + .orElseThrow() + ); + + Player wrongPlayer = order.peek(); + assertNotNull(wrongPlayer); + + int before = first.getTotCharacters(); + assertTrue(controller.drawLowerTribeCard(first.getUserName(), idx)); + assertEquals(before + 1, first.getTotCharacters()); + } + + @Test + void drawUpperTribeCard() { + Game game = new Game(3); + GameController controller = new GameController(game); + + assertTrue(controller.addPlayer("Giorgio")); + assertTrue(controller.addPlayer("Marco")); + assertTrue(controller.addPlayer("Luca")); + + for (int i = 0; i < 3; i++) { + Player p = game.getCurrentState().getCurrentPlayer(); + assertTrue(controller.slotChoice(p.getUserName(), i)); + } + + assertEquals(GameStages.RESOLVING_ACTIONS, game.getCurrentState().getGameStage()); + + while (game.getCurrentState().getNUpper() == 0) { + assertTrue(game.getCurrentState().getNLower() > 0); + + Player current = game.getCurrentState().getCurrentPlayer(); + List lower = game.getLowerListTribeCards(); + int lowerIdx = lower.indexOf( + lower.stream() + .filter(c -> !c.IsEventCard()) + .findFirst() + .orElseThrow() + ); + + assertTrue(controller.drawLowerTribeCard(current.getUserName(), lowerIdx)); + } + + Player current = game.getCurrentState().getCurrentPlayer(); + int beforeTot = current.getTotCharacters(); + + List upper = game.getUpperListTribeCards(); + int upperIdx = upper.indexOf( + upper.stream() + .filter(c -> !c.IsEventCard()) + .findFirst() + .orElseThrow() + ); + + assertTrue(controller.drawUpperTribeCard(current.getUserName(), upperIdx)); + assertEquals(beforeTot + 1, current.getTotCharacters()); + } + + @Test + void drawUpperBuildingCard() { + Game game = new Game(3); + GameController controller = new GameController(game); + + assertTrue(controller.addPlayer("Giacomo")); + assertTrue(controller.addPlayer("Marco")); + assertTrue(controller.addPlayer("Luca")); + + for (int i = 0; i < 3; i++) { + Player p = game.getCurrentState().getCurrentPlayer(); + assertTrue(controller.slotChoice(p.getUserName(), i)); + } + + assertEquals(GameStages.RESOLVING_ACTIONS, game.getCurrentState().getGameStage()); + + while (game.getCurrentState().getNUpper() == 0) { + assertTrue(game.getCurrentState().getNLower() > 0); + + Player current = game.getCurrentState().getCurrentPlayer(); + List lower = game.getLowerListTribeCards(); + int lowerIdx = lower.indexOf( + lower.stream() + .filter(c -> !c.IsEventCard()) + .findFirst() + .orElseThrow() + ); + + assertTrue(controller.drawLowerTribeCard(current.getUserName(), lowerIdx)); + } + + Player current = game.getCurrentState().getCurrentPlayer(); + + assertFalse(controller.drawUpperBuildingCard(current.getUserName(), 0)); + + current.addFood(100); + assertTrue(controller.drawUpperBuildingCard(current.getUserName(), 0)); + } + + @Test + void drawLowerBuildingCard() { + Game game = new Game(3); + GameController controller = new GameController(game); + + assertTrue(controller.addPlayer("Giacomo")); + assertTrue(controller.addPlayer("Marco")); + assertTrue(controller.addPlayer("Luca")); + + for (int i = 0; i < 3; i++) { + Player p = game.getCurrentState().getCurrentPlayer(); + assertTrue(controller.slotChoice(p.getUserName(), i)); + } + + String cur = game.getCurrentState().getCurrentPlayer().getUserName(); + assertFalse(controller.drawLowerBuildingCard(cur, 0)); + } + + @Test + void pickOptionalCards() { + Game game = new Game(3); + GameController controller = new GameController(game); + + assertTrue(controller.addPlayer("Giacomo")); + assertTrue(controller.addPlayer("Marco")); + assertTrue(controller.addPlayer("Luca")); + + for (int i = 0; i < 3; i++) { + Player p = game.getCurrentState().getCurrentPlayer(); + assertTrue(controller.slotChoice(p.getUserName(), i)); + } + + String cur = game.getCurrentState().getCurrentPlayer().getUserName(); + assertFalse(controller.pickOptionalTribeCard(cur, 0)); + assertFalse(controller.pickOptionalBuildingCard(cur, 0)); + } +} From b95682979a516ef30e4e2e71e60bcc0ec524fac0 Mon Sep 17 00:00:00 2001 From: rubenpirreram Date: Sat, 18 Apr 2026 15:41:00 +0200 Subject: [PATCH 5/7] Refactor: Network --- .../gc14/Network/Client/RMI/RMIClient.java | 4 +++ .../polimi/ingsw/gc14/Network/EventType.java | 8 ++++++ .../ingsw/gc14/Network/NetworkEvent.java | 10 +++++++ .../gc14/Network/NetworkEvents/AddPlayer.java | 26 +++++++++++++++++++ .../gc14/Network/Server/RMI/RMIServer.java | 8 ++++++ 5 files changed, 56 insertions(+) create mode 100644 src/main/java/it/polimi/ingsw/gc14/Network/Client/RMI/RMIClient.java create mode 100644 src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvent.java create mode 100644 src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/AddPlayer.java create mode 100644 src/main/java/it/polimi/ingsw/gc14/Network/Server/RMI/RMIServer.java diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/Client/RMI/RMIClient.java b/src/main/java/it/polimi/ingsw/gc14/Network/Client/RMI/RMIClient.java new file mode 100644 index 0000000..11a5409 --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/Network/Client/RMI/RMIClient.java @@ -0,0 +1,4 @@ +package it.polimi.ingsw.gc14.Network.Client.RMI; + +public class RMIClient { +} diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/EventType.java b/src/main/java/it/polimi/ingsw/gc14/Network/EventType.java index bcacffb..aae15bf 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Network/EventType.java +++ b/src/main/java/it/polimi/ingsw/gc14/Network/EventType.java @@ -1,4 +1,12 @@ package it.polimi.ingsw.gc14.Network; public enum EventType { + ADD_PLAYER, + SLOT_CHOICE, + DRAW_UPPER_TRIBE, + DRAW_LOWER_TRIBE, + DRAW_UPPER_BUILD, + DRAW_LOWER_BUILD, + PICK_OPTIONAL_TRIBE, + PICK_OPTIONAL_BUILD } diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvent.java b/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvent.java new file mode 100644 index 0000000..feb526d --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvent.java @@ -0,0 +1,10 @@ +package it.polimi.ingsw.gc14.Network; + +import it.polimi.ingsw.gc14.Controller.GameController; + +import java.io.Serializable; + +public abstract class NetworkEvent implements Serializable { + + public abstract boolean apply(GameController gameController); +} diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/AddPlayer.java b/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/AddPlayer.java new file mode 100644 index 0000000..4862a46 --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/AddPlayer.java @@ -0,0 +1,26 @@ +package it.polimi.ingsw.gc14.Network.NetworkEvents; + +import it.polimi.ingsw.gc14.Controller.GameController; +import it.polimi.ingsw.gc14.Network.EventType; +import it.polimi.ingsw.gc14.Network.NetworkEvent; +import it.polimi.ingsw.gc14.View.IView; + +import java.io.Serializable; + +public class AddPlayer extends NetworkEvent implements Serializable { + private String username; + private EventType eventType; + public AddPlayer(String username) { + this.username = username; + this.eventType = EventType.ADD_PLAYER; + } + @Override + public boolean apply(GameController gameController) + { + return gameController.addPlayer(username); + } + public String apply(IView gameController) + { + return gameController.toString(); + } +} diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/Server/RMI/RMIServer.java b/src/main/java/it/polimi/ingsw/gc14/Network/Server/RMI/RMIServer.java new file mode 100644 index 0000000..81e4a16 --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/Network/Server/RMI/RMIServer.java @@ -0,0 +1,8 @@ +package it.polimi.ingsw.gc14.Network.Server.RMI; + +public class RMIServer { + public void Test(String[]args) + { + + } +} From e91d362e2874ecbddb49bdeb309e50d13f24f92e Mon Sep 17 00:00:00 2001 From: rubenpirreram Date: Sat, 18 Apr 2026 16:13:34 +0200 Subject: [PATCH 6/7] Refactor:Network Structure --- .../polimi/ingsw/gc14/Network/Client/RMI/RMIClient.java | 4 ---- .../polimi/ingsw/gc14/Network/Server/RMI/RMIServer.java | 8 -------- .../Network/{Client/TCP => TCP/Client}/TCPClient.java | 2 +- .../it/polimi/ingsw/gc14/Network/{ => TCP}/EventType.java | 2 +- .../polimi/ingsw/gc14/Network/{ => TCP}/NetworkEvent.java | 2 +- .../gc14/Network/{ => TCP}/NetworkEvents/AddPlayer.java | 6 +++--- .../Network/{Server/TCP => TCP/Server}/ClientHandler.java | 2 +- .../Network/{Server/TCP => TCP/Server}/TCPServer.java | 2 +- 8 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 src/main/java/it/polimi/ingsw/gc14/Network/Client/RMI/RMIClient.java delete mode 100644 src/main/java/it/polimi/ingsw/gc14/Network/Server/RMI/RMIServer.java rename src/main/java/it/polimi/ingsw/gc14/Network/{Client/TCP => TCP/Client}/TCPClient.java (95%) rename src/main/java/it/polimi/ingsw/gc14/Network/{ => TCP}/EventType.java (82%) rename src/main/java/it/polimi/ingsw/gc14/Network/{ => TCP}/NetworkEvent.java (83%) rename src/main/java/it/polimi/ingsw/gc14/Network/{ => TCP}/NetworkEvents/AddPlayer.java (79%) rename src/main/java/it/polimi/ingsw/gc14/Network/{Server/TCP => TCP/Server}/ClientHandler.java (96%) rename src/main/java/it/polimi/ingsw/gc14/Network/{Server/TCP => TCP/Server}/TCPServer.java (96%) diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/Client/RMI/RMIClient.java b/src/main/java/it/polimi/ingsw/gc14/Network/Client/RMI/RMIClient.java deleted file mode 100644 index 11a5409..0000000 --- a/src/main/java/it/polimi/ingsw/gc14/Network/Client/RMI/RMIClient.java +++ /dev/null @@ -1,4 +0,0 @@ -package it.polimi.ingsw.gc14.Network.Client.RMI; - -public class RMIClient { -} diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/Server/RMI/RMIServer.java b/src/main/java/it/polimi/ingsw/gc14/Network/Server/RMI/RMIServer.java deleted file mode 100644 index 81e4a16..0000000 --- a/src/main/java/it/polimi/ingsw/gc14/Network/Server/RMI/RMIServer.java +++ /dev/null @@ -1,8 +0,0 @@ -package it.polimi.ingsw.gc14.Network.Server.RMI; - -public class RMIServer { - public void Test(String[]args) - { - - } -} diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/Client/TCP/TCPClient.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Client/TCPClient.java similarity index 95% rename from src/main/java/it/polimi/ingsw/gc14/Network/Client/TCP/TCPClient.java rename to src/main/java/it/polimi/ingsw/gc14/Network/TCP/Client/TCPClient.java index 78aea6f..b4cc5ec 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Network/Client/TCP/TCPClient.java +++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Client/TCPClient.java @@ -1,4 +1,4 @@ -package it.polimi.ingsw.gc14.Network.Client.TCP; +package it.polimi.ingsw.gc14.Network.TCP.Client; import it.polimi.ingsw.gc14.View.IView; diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/EventType.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/EventType.java similarity index 82% rename from src/main/java/it/polimi/ingsw/gc14/Network/EventType.java rename to src/main/java/it/polimi/ingsw/gc14/Network/TCP/EventType.java index aae15bf..3b63fcb 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Network/EventType.java +++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/EventType.java @@ -1,4 +1,4 @@ -package it.polimi.ingsw.gc14.Network; +package it.polimi.ingsw.gc14.Network.TCP; public enum EventType { ADD_PLAYER, diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvent.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/NetworkEvent.java similarity index 83% rename from src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvent.java rename to src/main/java/it/polimi/ingsw/gc14/Network/TCP/NetworkEvent.java index feb526d..addbf74 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvent.java +++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/NetworkEvent.java @@ -1,4 +1,4 @@ -package it.polimi.ingsw.gc14.Network; +package it.polimi.ingsw.gc14.Network.TCP; import it.polimi.ingsw.gc14.Controller.GameController; diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/AddPlayer.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/NetworkEvents/AddPlayer.java similarity index 79% rename from src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/AddPlayer.java rename to src/main/java/it/polimi/ingsw/gc14/Network/TCP/NetworkEvents/AddPlayer.java index 4862a46..0067bcd 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/AddPlayer.java +++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/NetworkEvents/AddPlayer.java @@ -1,8 +1,8 @@ -package it.polimi.ingsw.gc14.Network.NetworkEvents; +package it.polimi.ingsw.gc14.Network.TCP.NetworkEvents; import it.polimi.ingsw.gc14.Controller.GameController; -import it.polimi.ingsw.gc14.Network.EventType; -import it.polimi.ingsw.gc14.Network.NetworkEvent; +import it.polimi.ingsw.gc14.Network.TCP.EventType; +import it.polimi.ingsw.gc14.Network.TCP.NetworkEvent; import it.polimi.ingsw.gc14.View.IView; import java.io.Serializable; diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/Server/TCP/ClientHandler.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/ClientHandler.java similarity index 96% rename from src/main/java/it/polimi/ingsw/gc14/Network/Server/TCP/ClientHandler.java rename to src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/ClientHandler.java index 9977552..a599d19 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Network/Server/TCP/ClientHandler.java +++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/ClientHandler.java @@ -1,4 +1,4 @@ -package it.polimi.ingsw.gc14.Network.Server.TCP; +package it.polimi.ingsw.gc14.Network.TCP.Server; import it.polimi.ingsw.gc14.Controller.GameController; diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/Server/TCP/TCPServer.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java similarity index 96% rename from src/main/java/it/polimi/ingsw/gc14/Network/Server/TCP/TCPServer.java rename to src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java index 4403d84..31a5ff4 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Network/Server/TCP/TCPServer.java +++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java @@ -1,4 +1,4 @@ -package it.polimi.ingsw.gc14.Network.Server.TCP; +package it.polimi.ingsw.gc14.Network.TCP.Server; import it.polimi.ingsw.gc14.Controller.GameController; From 31796aabdb5d03fc3b70315e379ffdcd8a8853e1 Mon Sep 17 00:00:00 2001 From: rubenpirreram Date: Sat, 18 Apr 2026 18:00:49 +0200 Subject: [PATCH 7/7] Updated: GameController --- .../java/it/polimi/ingsw/gc14/Controller/GameController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/it/polimi/ingsw/gc14/Controller/GameController.java b/src/main/java/it/polimi/ingsw/gc14/Controller/GameController.java index 077a9b7..bdc462e 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Controller/GameController.java +++ b/src/main/java/it/polimi/ingsw/gc14/Controller/GameController.java @@ -10,6 +10,9 @@ public class GameController { } public GameController() { } + public Game getModel() { + return model; + } public void setModel(Game model) { this.model = model; }