diff --git a/CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java b/CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java index d0d256f416d766962c45c77396c77684f36bd198..d2b3d6c07b182aa94a9468b07b6e14ae15bec878 100644 --- a/CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java +++ b/CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java @@ -19,13 +19,13 @@ public class NetworkController { private Kryo kryo; private Queue<Command> commandQueue; - private boolean devMode = true; + private boolean devMode = false; public NetworkController(){ this.client = new Client(); client.start(); try { - String IP4_LAN_ADDRESS = "192.168.87.20"; + String IP4_LAN_ADDRESS = "192.168.10.154"; client.connect(10000, IP4_LAN_ADDRESS, 54555, 54777); } catch (IOException e) { e.printStackTrace(); diff --git a/CheckersClient/core/src/com/mygdx/game/controllers/PlayerController.java b/CheckersClient/core/src/com/mygdx/game/controllers/PlayerController.java index b583aee91f43ac58278a1522a2f08ffc9da9cc9a..1e03b01484cb906973925399f558b69fc771fced 100644 --- a/CheckersClient/core/src/com/mygdx/game/controllers/PlayerController.java +++ b/CheckersClient/core/src/com/mygdx/game/controllers/PlayerController.java @@ -15,7 +15,6 @@ public class PlayerController { private Lobby lobby; //Current lobby private ArrayList<Lobby> lobbies; //List of all lobbies - private String playerName; // NB..! THIS IS TEMPORARY.. SHOULD BE IN MODEL.. public PlayerController(NetworkController networkController){ @@ -32,6 +31,7 @@ public class PlayerController { }); net.sendToServer(new cPlayerJoin()); + net.sendToServer(new cLobbyCreate("test",4)); } @@ -49,15 +49,11 @@ public class PlayerController { // UpdatePlayerName code } - public String getPlayerName(){ - return this.playerName; - } - public void joinLobby(int id){ net.sendToServer(new cLobbyJoin(id)); } public void lobbyGetList(){ net.sendToServer(new cLobbyGetList()); } - public void createLobby(int MAX_PLAYERS){ net.sendToServer(new cLobbyCreate(MAX_PLAYERS)); } + public void createLobby(String name, int MAX_PLAYERS){ net.sendToServer(new cLobbyCreate(name, MAX_PLAYERS)); } public void deleteLobby(int id){ net.sendToServer(new cLobbyDelete(id)); } @@ -67,6 +63,10 @@ public class PlayerController { public Player getPlayer(){ return player; } + public String getPlayerName(){ + return this.playerName; + } + public void setPlayer(Player player){ this.player = player; } public void setLobby(Lobby lobby){ this.lobby = lobby; } diff --git a/CheckersClient/core/src/com/mygdx/game/controllers/commands/cLobbyCreate.java b/CheckersClient/core/src/com/mygdx/game/controllers/commands/cLobbyCreate.java index de48edb5cfae4fc4fb5e2f5443ee8ba8d28d5e8a..45856d504f3926f95185e1915a5b1fc28830a384 100644 --- a/CheckersClient/core/src/com/mygdx/game/controllers/commands/cLobbyCreate.java +++ b/CheckersClient/core/src/com/mygdx/game/controllers/commands/cLobbyCreate.java @@ -4,11 +4,19 @@ import com.esotericsoftware.kryonet.Connection; import com.mygdx.game.controllers.PlayerController; import com.mygdx.game.model.Lobby; +import java.util.ArrayList; + public class cLobbyCreate extends Command { public cLobbyCreate() { super("cLobbyCreate"); } - public cLobbyCreate(int MAX_PLAYERS) { super("cLobbyCreate", (Integer) MAX_PLAYERS); } + public cLobbyCreate(String name, int MAX_PLAYERS) { + super("cLobbyCreate"); + ArrayList<Object> data = new ArrayList<Object>(); + data.add(name); + data.add(MAX_PLAYERS); + this.data = data; + } @Override public void execute(PlayerController playerController, Connection connection){ diff --git a/CheckersClient/core/src/com/mygdx/game/model/Lobby.java b/CheckersClient/core/src/com/mygdx/game/model/Lobby.java index d198b3d091395e403dbca069f5988b14323bbf5c..1a0ed52fd514eb3443b622e38391ad2b75ba04d4 100644 --- a/CheckersClient/core/src/com/mygdx/game/model/Lobby.java +++ b/CheckersClient/core/src/com/mygdx/game/model/Lobby.java @@ -5,6 +5,7 @@ import java.util.ArrayList; public class Lobby { private int ID; + private String name; private int MAX_PLAYERS; private ArrayList<Player> players; @@ -15,14 +16,17 @@ public class Lobby { players = new ArrayList<Player>(); } - public Lobby(int ID, int MAX_PLAYERS){ + public Lobby(int ID, String name, int MAX_PLAYERS){ this.ID = ID; + this.name = name; this.MAX_PLAYERS = MAX_PLAYERS; players = new ArrayList<Player>(); } public int getID(){ return ID; } + public String getName(){ return name; } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -35,9 +39,9 @@ public class Lobby { public String toString() { return "Lobby{" + "ID=" + ID + + ", name='" + name + '\'' + ", MAX_PLAYERS=" + MAX_PLAYERS + ", players=" + players + '}'; } - } diff --git a/CheckersServer/.idea/caches/build_file_checksums.ser b/CheckersServer/.idea/caches/build_file_checksums.ser index cded6a6adf181af804787500f203a3a24ec0611d..5b4be2908f1258a62a07de75b289aba8bd287729 100644 Binary files a/CheckersServer/.idea/caches/build_file_checksums.ser and b/CheckersServer/.idea/caches/build_file_checksums.ser differ diff --git a/CheckersServer/.idea/libraries/Gradle__CheckersServer_core_core_1_0.xml b/CheckersServer/.idea/libraries/Gradle__CheckersServer_core_core_1_0.xml new file mode 100644 index 0000000000000000000000000000000000000000..50fec341c8000eb96f59c19192ccb94fd1f8912d --- /dev/null +++ b/CheckersServer/.idea/libraries/Gradle__CheckersServer_core_core_1_0.xml @@ -0,0 +1,9 @@ +<component name="libraryTable"> + <library name="Gradle: CheckersServer.core.core-1.0"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/core/build/libs/core-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component> \ No newline at end of file diff --git a/CheckersServer/.idea/libraries/Gradle__CheckersServer_desktop_desktop_1_0.xml b/CheckersServer/.idea/libraries/Gradle__CheckersServer_desktop_desktop_1_0.xml new file mode 100644 index 0000000000000000000000000000000000000000..369215da594e454a7837187b554b3dc8ecc711ec --- /dev/null +++ b/CheckersServer/.idea/libraries/Gradle__CheckersServer_desktop_desktop_1_0.xml @@ -0,0 +1,9 @@ +<component name="libraryTable"> + <library name="Gradle: CheckersServer.desktop.desktop-1.0"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/desktop/build/libs/desktop-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component> \ No newline at end of file diff --git a/CheckersServer/.idea/modules.xml b/CheckersServer/.idea/modules.xml index a8a1a256e267fb1c91b1d411ada464e27057576c..1b6b39a904880d385885858851fd070502bff0f7 100644 --- a/CheckersServer/.idea/modules.xml +++ b/CheckersServer/.idea/modules.xml @@ -2,7 +2,7 @@ <project version="4"> <component name="ProjectModuleManager"> <modules> - <module fileurl="file://$PROJECT_DIR$/.idea/CheckersServer.iml" filepath="$PROJECT_DIR$/.idea/CheckersServer.iml" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/CheckersServer.iml" filepath="$PROJECT_DIR$/.idea/modules/CheckersServer.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/android/CheckersServer.android.iml" filepath="$PROJECT_DIR$/.idea/modules/android/CheckersServer.android.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/core/CheckersServer.core.iml" filepath="$PROJECT_DIR$/.idea/modules/core/CheckersServer.core.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/desktop/CheckersServer.desktop.iml" filepath="$PROJECT_DIR$/.idea/modules/desktop/CheckersServer.desktop.iml" /> diff --git a/CheckersServer/core/src/com/mygdx/game/controller/NetworkController.java b/CheckersServer/core/src/com/mygdx/game/controller/NetworkController.java index 18c9ad7015af7207b2eeee3a46afa3d8edbbf8ff..ecb8e866f29ea6f4a773e37fa6a9588af024695e 100644 --- a/CheckersServer/core/src/com/mygdx/game/controller/NetworkController.java +++ b/CheckersServer/core/src/com/mygdx/game/controller/NetworkController.java @@ -66,10 +66,10 @@ public class NetworkController { if (index!= -1) players.remove(index); } - public Lobby createLobby(int MAX_PLAYERS){ + public Lobby createLobby(String name, int MAX_PLAYERS){ if(lobbies.size() < MAX_LOBBIES){ lobby_id++; - Lobby lobby = new Lobby(lobby_id, MAX_PLAYERS); + Lobby lobby = new Lobby(lobby_id, name, MAX_PLAYERS); lobbies.add(lobby); return lobby; } diff --git a/CheckersServer/core/src/com/mygdx/game/controller/commands/cLobbyCreate.java b/CheckersServer/core/src/com/mygdx/game/controller/commands/cLobbyCreate.java index e0a85104aacf5e6967b3de07f8ae197eb8a16f60..06c2633c9e2718e9766088afad23cf65728902cc 100644 --- a/CheckersServer/core/src/com/mygdx/game/controller/commands/cLobbyCreate.java +++ b/CheckersServer/core/src/com/mygdx/game/controller/commands/cLobbyCreate.java @@ -6,6 +6,8 @@ import com.mygdx.game.controller.commands.Command; import com.mygdx.game.model.Lobby; import com.mygdx.game.model.Player; +import java.util.ArrayList; + public class cLobbyCreate extends Command { public cLobbyCreate() { super("cLobbyCreate"); } @@ -14,9 +16,10 @@ public class cLobbyCreate extends Command { @Override public void execute(NetworkController net, Connection connection){ - if(data instanceof Integer){ - int MAX_PLAYERS = (int) data; - data = net.createLobby(MAX_PLAYERS); + if(data instanceof ArrayList){ + String name = (String) ((ArrayList) data).get(0); + int MAX_PLAYERS = (int) ((ArrayList) data).get(1); + data = net.createLobby(name, MAX_PLAYERS); System.out.printf("Request to create lobby received. Returning Lobby w. ID: %d \n", ((Lobby)data).getID()); connection.sendTCP(this); } diff --git a/CheckersServer/core/src/com/mygdx/game/model/Lobby.java b/CheckersServer/core/src/com/mygdx/game/model/Lobby.java index d558e7b2bb432894d846e8986a90bc1bb192f317..8ff977f2ae9896d7374d8d0e5ade7c9df68b0035 100644 --- a/CheckersServer/core/src/com/mygdx/game/model/Lobby.java +++ b/CheckersServer/core/src/com/mygdx/game/model/Lobby.java @@ -6,6 +6,7 @@ import java.util.HashSet; public class Lobby { private int ID; + private String name; private int MAX_PLAYERS; private ArrayList<Player> players; @@ -16,8 +17,9 @@ public class Lobby { players = new ArrayList<Player>(); } - public Lobby(int ID, int MAX_PLAYERS){ + public Lobby(int ID, String name, int MAX_PLAYERS){ this.ID = ID; + this.name = name; this.MAX_PLAYERS = MAX_PLAYERS; players = new ArrayList<Player>(); } @@ -62,6 +64,7 @@ public class Lobby { public String toString() { return "Lobby{" + "ID=" + ID + + ", name='" + name + '\'' + ", MAX_PLAYERS=" + MAX_PLAYERS + ", players=" + players + '}';