From 5d355e2e3f41b818f304f6e83e08ed1930bd0b4d Mon Sep 17 00:00:00 2001
From: stefagr <stefagr@stud.ntnu.no>
Date: Sat, 3 Apr 2021 17:14:50 +0200
Subject: [PATCH] small changes to lobby creation
---
.../game/controllers/NetworkController.java | 4 ++--
.../game/controllers/PlayerController.java | 12 ++++++------
.../game/controllers/commands/cLobbyCreate.java | 10 +++++++++-
.../core/src/com/mygdx/game/model/Lobby.java | 8 ++++++--
.../.idea/caches/build_file_checksums.ser | Bin 637 -> 636 bytes
.../Gradle__CheckersServer_core_core_1_0.xml | 9 +++++++++
...adle__CheckersServer_desktop_desktop_1_0.xml | 9 +++++++++
CheckersServer/.idea/modules.xml | 2 +-
.../game/controller/NetworkController.java | 4 ++--
.../game/controller/commands/cLobbyCreate.java | 9 ++++++---
.../core/src/com/mygdx/game/model/Lobby.java | 5 ++++-
11 files changed, 54 insertions(+), 18 deletions(-)
create mode 100644 CheckersServer/.idea/libraries/Gradle__CheckersServer_core_core_1_0.xml
create mode 100644 CheckersServer/.idea/libraries/Gradle__CheckersServer_desktop_desktop_1_0.xml
diff --git a/CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java b/CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java
index d0d256f..d2b3d6c 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 b583aee..1e03b01 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 de48edb..45856d5 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 d198b3d..1a0ed52 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
GIT binary patch
delta 61
zcmey%@`q)@43^3BIp%MiBg{DY4x`@W^^DSr)vFupJGwXz`)HK$o!PaNv4lax*(xTq
SIJKxarnn^4&~maAQ!)SrZx>hq
delta 61
zcmeyv@|R`843_${*5(`M2s2K;%P1}I`=sUdf}IWa@n$~BBF@Stlh-mD2xvN6#e^28
S78S<?q?VMV7EP99N(KP_iWdz4
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 0000000..50fec34
--- /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 0000000..369215d
--- /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 a8a1a25..1b6b39a 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 18c9ad7..ecb8e86 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 e0a8510..06c2633 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 d558e7b..8ff977f 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 +
'}';
--
GitLab