From 586a552426e433c48b29960faf2541fb5cf41982 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Thu, 14 May 2020 20:32:57 +0200 Subject: [PATCH] remove some redundant files --- .../client/controllers/InputController.java | 14 ------- .../client/controllers/LogicController.java | 4 ++ .../controllers/game/CharacterController.java | 14 ------- .../controllers/game/GameController.java | 37 ------------------- .../controllers/game/ObjectController.java | 14 ------- .../server/controllers/game/Objective.java | 4 -- core/src/netwerkprog/game/util/Callback.java | 4 ++ .../controllers/game => util}/Timer.java | 0 8 files changed, 8 insertions(+), 83 deletions(-) delete mode 100644 core/src/netwerkprog/game/client/controllers/InputController.java create mode 100644 core/src/netwerkprog/game/client/controllers/LogicController.java delete mode 100644 core/src/netwerkprog/game/server/controllers/game/CharacterController.java delete mode 100644 core/src/netwerkprog/game/server/controllers/game/GameController.java delete mode 100644 core/src/netwerkprog/game/server/controllers/game/ObjectController.java delete mode 100644 core/src/netwerkprog/game/server/controllers/game/Objective.java create mode 100644 core/src/netwerkprog/game/util/Callback.java rename core/src/netwerkprog/game/{server/controllers/game => util}/Timer.java (100%) diff --git a/core/src/netwerkprog/game/client/controllers/InputController.java b/core/src/netwerkprog/game/client/controllers/InputController.java deleted file mode 100644 index db2d812..0000000 --- a/core/src/netwerkprog/game/client/controllers/InputController.java +++ /dev/null @@ -1,14 +0,0 @@ -package netwerkprog.game.client.controllers; - -import netwerkprog.game.util.Controller; - -public class InputController extends Controller { - public InputController() { - - } - - @Override - public void run() { - - } -} diff --git a/core/src/netwerkprog/game/client/controllers/LogicController.java b/core/src/netwerkprog/game/client/controllers/LogicController.java new file mode 100644 index 0000000..e4e242a --- /dev/null +++ b/core/src/netwerkprog/game/client/controllers/LogicController.java @@ -0,0 +1,4 @@ +package netwerkprog.game.client.controllers; + +public class LogicController { +} diff --git a/core/src/netwerkprog/game/server/controllers/game/CharacterController.java b/core/src/netwerkprog/game/server/controllers/game/CharacterController.java deleted file mode 100644 index 747d725..0000000 --- a/core/src/netwerkprog/game/server/controllers/game/CharacterController.java +++ /dev/null @@ -1,14 +0,0 @@ -package netwerkprog.game.server.controllers.game; - -import netwerkprog.game.util.Controller; - -public class CharacterController extends Controller { - public CharacterController() { - - } - - @Override - public void run() { - - } -} diff --git a/core/src/netwerkprog/game/server/controllers/game/GameController.java b/core/src/netwerkprog/game/server/controllers/game/GameController.java deleted file mode 100644 index da41613..0000000 --- a/core/src/netwerkprog/game/server/controllers/game/GameController.java +++ /dev/null @@ -1,37 +0,0 @@ -package netwerkprog.game.server.controllers.game; - -import netwerkprog.game.util.Controller; - -import java.util.HashMap; - -public class GameController extends Controller { - private int score; - private Timer timer; - private final CharacterController characterController; - private final ObjectController objectController; - private HashMap objectives; - - private final int id; - - public GameController(int id) { - this.characterController = new CharacterController(); - this.objectController = new ObjectController(); - - this.id = id; - } - - @Override - public void run() { - boolean running = true; - while (running) { - System.out.println("game thread " + id + "active"); - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - - } - - } -} diff --git a/core/src/netwerkprog/game/server/controllers/game/ObjectController.java b/core/src/netwerkprog/game/server/controllers/game/ObjectController.java deleted file mode 100644 index a372024..0000000 --- a/core/src/netwerkprog/game/server/controllers/game/ObjectController.java +++ /dev/null @@ -1,14 +0,0 @@ -package netwerkprog.game.server.controllers.game; - -import netwerkprog.game.util.Controller; - -public class ObjectController extends Controller { - public ObjectController() { - - } - - @Override - public void run() { - - } -} diff --git a/core/src/netwerkprog/game/server/controllers/game/Objective.java b/core/src/netwerkprog/game/server/controllers/game/Objective.java deleted file mode 100644 index c544586..0000000 --- a/core/src/netwerkprog/game/server/controllers/game/Objective.java +++ /dev/null @@ -1,4 +0,0 @@ -package netwerkprog.game.server.controllers.game; - -public class Objective { -} diff --git a/core/src/netwerkprog/game/util/Callback.java b/core/src/netwerkprog/game/util/Callback.java new file mode 100644 index 0000000..3c0c8ca --- /dev/null +++ b/core/src/netwerkprog/game/util/Callback.java @@ -0,0 +1,4 @@ +package netwerkprog.game.util; + +public interface Callback { +} diff --git a/core/src/netwerkprog/game/server/controllers/game/Timer.java b/core/src/netwerkprog/game/util/Timer.java similarity index 100% rename from core/src/netwerkprog/game/server/controllers/game/Timer.java rename to core/src/netwerkprog/game/util/Timer.java