From aaf0eab4fbca574faae63b56a5d3b5c241238b23 Mon Sep 17 00:00:00 2001
From: morkolai <nikolai-mork@live.no>
Date: Mon, 26 Apr 2021 19:34:26 +0200
Subject: [PATCH] Removed redundant code from model
---
.../game/controllers/NetworkController.java | 2 +-
.../core/src/com/mygdx/game/model/GameMode.kt | 8 --------
.../core/src/com/mygdx/game/model/GameState.kt | 16 ----------------
.../core/src/com/mygdx/game/model/Lobby.kt | 3 ---
.../game/model/gamemodes/boards/Direction.kt | 2 +-
5 files changed, 2 insertions(+), 29 deletions(-)
delete mode 100644 CheckersClient/core/src/com/mygdx/game/model/Lobby.kt
diff --git a/CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java b/CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java
index db20201..071dfeb 100644
--- a/CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java
+++ b/CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java
@@ -22,7 +22,7 @@ public class NetworkController {
this.client = new Client();
client.start();
try {
- String IP4_LAN_ADDRESS = "192.168.0.136";
+ String IP4_LAN_ADDRESS = "192.168.1.65";
client.connect(10000, IP4_LAN_ADDRESS, 54555);
} catch (IOException e) {
diff --git a/CheckersClient/core/src/com/mygdx/game/model/GameMode.kt b/CheckersClient/core/src/com/mygdx/game/model/GameMode.kt
index 8b30f79..fe39b02 100644
--- a/CheckersClient/core/src/com/mygdx/game/model/GameMode.kt
+++ b/CheckersClient/core/src/com/mygdx/game/model/GameMode.kt
@@ -14,18 +14,10 @@ class GameMode(rules:AbstractRules, board:AbstractBoard) {
this.board = board
}
- fun setBoard(board:AbstractBoard) {
- this.board = board
- }
-
fun getBoard(): AbstractBoard {
return this.board
}
- fun setRules(rules: AbstractRules) {
- this.rules = rules
- }
-
fun getRules(): AbstractRules {
return this.rules
}
diff --git a/CheckersClient/core/src/com/mygdx/game/model/GameState.kt b/CheckersClient/core/src/com/mygdx/game/model/GameState.kt
index 61af09e..f226493 100644
--- a/CheckersClient/core/src/com/mygdx/game/model/GameState.kt
+++ b/CheckersClient/core/src/com/mygdx/game/model/GameState.kt
@@ -32,22 +32,6 @@ class GameState(gameMode: GameMode) {
return this.gameMode
}
- fun isStarted(): Boolean {
- return isStarted
- }
-
- fun setStarted() {
- this.isStarted = true
- }
-
- fun isFinished(): Boolean {
- return isFinished
- }
-
- fun getWinner(): Int? {
- return this.winner
- }
-
fun setWinner(winner: Int) {
this.winner = winner
}
diff --git a/CheckersClient/core/src/com/mygdx/game/model/Lobby.kt b/CheckersClient/core/src/com/mygdx/game/model/Lobby.kt
deleted file mode 100644
index 5ced24c..0000000
--- a/CheckersClient/core/src/com/mygdx/game/model/Lobby.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-//Wich players are int the game, holds a Game
-//Controller?
-// TODO: remove? Replaced by Lobby.java
\ No newline at end of file
diff --git a/CheckersClient/core/src/com/mygdx/game/model/gamemodes/boards/Direction.kt b/CheckersClient/core/src/com/mygdx/game/model/gamemodes/boards/Direction.kt
index e49fa59..1652466 100644
--- a/CheckersClient/core/src/com/mygdx/game/model/gamemodes/boards/Direction.kt
+++ b/CheckersClient/core/src/com/mygdx/game/model/gamemodes/boards/Direction.kt
@@ -1,4 +1,4 @@
-package com.mygdx.game.model
+ package com.mygdx.game.model
import com.badlogic.gdx.math.Vector3
--
GitLab