Merge branch 'main' into Fix-tests-and-javadoc-idIMG
This commit is contained in:
@@ -47,7 +47,6 @@ public class ClientLauncherTUI {
|
||||
admissibleChar.add("6");
|
||||
admissibleChar.add("7");
|
||||
admissibleChar.add("8");
|
||||
admissibleChar.add("9");
|
||||
admissibleChar.add("A");
|
||||
admissibleChar.add("B");
|
||||
admissibleChar.add("C");
|
||||
@@ -138,7 +137,7 @@ public class ClientLauncherTUI {
|
||||
|
||||
if(admissibleChar.contains(action))
|
||||
{
|
||||
if (!action.equals("7") && !action.equals("8") && !action.equals("9") && !action.equals("A") && !action.equals("B") && !action.equals("C")&&!action.equals("a") && !action.equals("b") && !action.equals("c")) {
|
||||
if (!action.equals("7") && !action.equals("8") && !action.equals("A") && !action.equals("B") && !action.equals("C")&&!action.equals("a") && !action.equals("b") && !action.equals("c")) {
|
||||
try {
|
||||
System.out.println("Insert the required position:");
|
||||
pos = scanner.nextInt();
|
||||
@@ -156,8 +155,7 @@ public class ClientLauncherTUI {
|
||||
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 "8" -> controller.skipTurn(username);
|
||||
case "A", "a" -> view.fullRender();
|
||||
case "B", "b" -> view.renderBoard();
|
||||
case "C", "c" -> view.renderPlayer();
|
||||
@@ -184,18 +182,15 @@ public class ClientLauncherTUI {
|
||||
public static String chooseNetworkInterface(Scanner scanner) throws Exception {
|
||||
List<String> ips = new ArrayList<>();
|
||||
|
||||
// Lista tutte le interfacce attive con IP reale
|
||||
Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
|
||||
while (interfaces.hasMoreElements()) {
|
||||
NetworkInterface ni = interfaces.nextElement();
|
||||
|
||||
// Salta loopback, interfacce spente o virtuali
|
||||
if (!ni.isUp() || ni.isLoopback() || ni.isVirtual()) continue;
|
||||
|
||||
Enumeration<InetAddress> addresses = ni.getInetAddresses();
|
||||
while (addresses.hasMoreElements()) {
|
||||
InetAddress addr = addresses.nextElement();
|
||||
// Solo IPv4
|
||||
if (addr instanceof Inet4Address) {
|
||||
System.out.println("[" + ips.size() + "] " + ni.getDisplayName() + " -> " + addr.getHostAddress());
|
||||
ips.add(addr.getHostAddress());
|
||||
@@ -203,13 +198,13 @@ public class ClientLauncherTUI {
|
||||
}
|
||||
}
|
||||
|
||||
if (ips.isEmpty()) throw new Exception("Nessuna interfaccia disponibile");
|
||||
if (ips.isEmpty()) throw new Exception("No interface available");
|
||||
if (ips.size() == 1) {
|
||||
System.out.println("Una sola interfaccia trovata, uso: " + ips.get(0));
|
||||
System.out.println("Only one interface found, used: " + ips.get(0));
|
||||
return ips.get(0);
|
||||
}
|
||||
|
||||
System.out.print("Scegli interfaccia: ");
|
||||
System.out.print("Choose the interface: ");
|
||||
int choice = scanner.nextInt();
|
||||
return ips.get(choice);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user