From e50cf43b737d84ec74fb45d48b0dbc3fd400b4ed Mon Sep 17 00:00:00 2001 From: rubenpirreram Date: Sun, 3 May 2026 17:19:47 +0200 Subject: [PATCH] FIx: case sensitive --- .../polimi/ingsw/gc14/ClientLauncherTUI.java | 72 +++++++++++++------ 1 file changed, 51 insertions(+), 21 deletions(-) diff --git a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java index 77b7b87..2094aba 100644 --- a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java +++ b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java @@ -4,6 +4,9 @@ import it.polimi.ingsw.gc14.Network.NetworkEvent; import it.polimi.ingsw.gc14.Network.RMI.Client.RMIClient; import it.polimi.ingsw.gc14.Network.TCP.Client.TCPClient; import it.polimi.ingsw.gc14.View.TUI.TUI; + +import java.util.ArrayList; +import java.util.List; import java.util.Scanner; /** @@ -14,6 +17,8 @@ import java.util.Scanner; */ public class ClientLauncherTUI { + List admissibleChar=new ArrayList<>(); + /** * The TUI view associated with this client. */ @@ -29,6 +34,23 @@ public class ClientLauncherTUI { */ public void main() throws InterruptedException { view = new TUI(null); + admissibleChar.add("0"); + admissibleChar.add("1"); + admissibleChar.add("2"); + admissibleChar.add("3"); + admissibleChar.add("4"); + admissibleChar.add("5"); + admissibleChar.add("6"); + admissibleChar.add("7"); + admissibleChar.add("8"); + admissibleChar.add("9"); + admissibleChar.add("A"); + admissibleChar.add("B"); + admissibleChar.add("C"); + admissibleChar.add("a"); + admissibleChar.add("b"); + admissibleChar.add("c"); + ClientController controller = new ClientController(view); Scanner scanner = new Scanner(System.in); System.out.println("Insert username: "); @@ -103,29 +125,37 @@ public class ClientLauncherTUI { private void getInput(Scanner scanner, ClientController controller, String username) { String action = scanner.next(); int pos = -1; - if (!action.equals("7") && !action.equals("8") && !action.equals("9") && !action.equals("A") && !action.equals("B") && !action.equals("C")) { - try { - System.out.println("Insert the required position:"); - pos = scanner.nextInt(); - } catch (Exception e) { - System.out.println("ERROR: Invalid input(expected number)"); + + if(admissibleChar.contains(username)) + { + if (!action.equals("7") && !action.equals("8") && !action.equals("9") && !action.equals("A") && !action.equals("B") && !action.equals("C")) { + try { + System.out.println("Insert the required position:"); + pos = scanner.nextInt(); + } catch (Exception e) { + System.out.println("ERROR: Invalid input(expected number)"); + } + } + switch (action) { + case "0" -> controller.slotChoice(username, pos); + case "1" -> controller.drawUpperTribeCard(username, pos); + case "2" -> controller.drawUpperBuildingCard(username, pos); + case "3" -> controller.drawLowerTribeCard(username, pos); + case "4" -> controller.drawLowerBuildingCard(username, pos); + case "5" -> controller.pickOptionalTribeCard(username, pos); + case "6" -> controller.pickOptionalBuildingCard(username, pos); + case "7" -> controller.noOptionalCard(username); + case "8" -> controller.skipUpper(username); + case "9" -> controller.skipLower(username); + case "A", "a" -> view.fullRender(); + case "B", "b" -> view.renderBoard(); + case "C", "c" -> view.renderPlayer(); + default -> {} } } - switch (action) { - case "0" -> controller.slotChoice(username, pos); - case "1" -> controller.drawUpperTribeCard(username, pos); - case "2" -> controller.drawUpperBuildingCard(username, pos); - case "3" -> controller.drawLowerTribeCard(username, pos); - case "4" -> controller.drawLowerBuildingCard(username, pos); - case "5" -> controller.pickOptionalTribeCard(username, pos); - case "6" -> controller.pickOptionalBuildingCard(username, pos); - case "7" -> controller.noOptionalCard(username); - case "8" -> controller.skipUpper(username); - case "9" -> controller.skipLower(username); - case "A" -> view.fullRender(); - case "B" -> view.renderBoard(); - case "C" -> view.renderPlayer(); - default -> {} + else + { + System.out.println("ERROR: Invalid input(action not valid)"); } } } \ No newline at end of file