From e17cddcb0bb9a6542abb8ac210d963c63175cb91 Mon Sep 17 00:00:00 2001
From: Leonard <Leonard@Leonard.Leo>
Date: Wed, 13 May 2020 18:51:49 +0300
Subject: [PATCH] added some more classes
---
Server/src/Persistence/DAO.java | 10 -----
Server/src/Persistence/Database.java | 22 +++++++++++
Server/src/Server.java | 37 +++++++++++++++++++
build.gradle | 3 +-
.../galaxytruckerreloaded/IO/Screen/Map.java | 4 ++
.../Model/Planet/Planet.java | 7 ++++
.../galaxytruckerreloaded/Model/Ship.java | 29 +++++++++++++++
.../Model/Weapons/Weapon.java | 2 +
.../View/BaseRenderer.java | 2 +
.../View/Ship/ShipView.java | 6 +++
.../View/Weapons/WeaponView.java | 7 ++++
gradle/wrapper/gradle-wrapper.properties | 3 +-
12 files changed, 120 insertions(+), 12 deletions(-)
delete mode 100644 Server/src/Persistence/DAO.java
create mode 100644 Server/src/Persistence/Database.java
create mode 100644 core/src/com/galaxytrucker/galaxytruckerreloaded/IO/Screen/Map.java
create mode 100644 core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/Planet.java
create mode 100644 core/src/com/galaxytrucker/galaxytruckerreloaded/View/Ship/ShipView.java
create mode 100644 core/src/com/galaxytrucker/galaxytruckerreloaded/View/Weapons/WeaponView.java
diff --git a/Server/src/Persistence/DAO.java b/Server/src/Persistence/DAO.java
deleted file mode 100644
index c55d9b16..00000000
--- a/Server/src/Persistence/DAO.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package Persistence;
-
-public abstract class DAO<T> {
-
- public abstract void persist(T object);
-
- public abstract void update(T object);
-
- public abstract void remove(T object);
-}
diff --git a/Server/src/Persistence/Database.java b/Server/src/Persistence/Database.java
new file mode 100644
index 00000000..42bfeca9
--- /dev/null
+++ b/Server/src/Persistence/Database.java
@@ -0,0 +1,22 @@
+package Persistence;
+
+public class Database {
+
+ /**
+ * Load or create sqLite database
+ */
+ public void setup() {
+ }
+
+ /**
+ * Create new database
+ */
+ private void createDatabase() {
+ }
+
+ /**
+ * Backup database
+ */
+ public void backupDatabase() {
+ }
+}
diff --git a/Server/src/Server.java b/Server/src/Server.java
index 90fba1c4..0a9b874e 100644
--- a/Server/src/Server.java
+++ b/Server/src/Server.java
@@ -1,2 +1,39 @@
+import Persistence.Database;
+
+/**
+ * This class creates the game server and handles storing the data
+ */
public class Server {
+
+ /**
+ * Start the server
+ */
+ public static void main(String[] args) {
+
+ }
+
+ /**
+ * Send some data
+ */
+ public void sendPackets() {
+ }
+
+ /**
+ * Receive some data
+ */
+ public void receivePackets() {
+ }
+
+ /**
+ * Validate packets
+ */
+ public void validatePackets() {
+ }
+
+ /**
+ * Current database
+ */
+ private Database currentDatabase() {
+ return null;
+ }
}
diff --git a/build.gradle b/build.gradle
index 23efb98b..e722a74f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,8 @@ project(":desktop") {
implementation project(":core")
api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
-
+ // sqlite
+ compile group:'org.xerial', name:'sqlite-jdbc', version:'3.8.11.2'
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/IO/Screen/Map.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/IO/Screen/Map.java
new file mode 100644
index 00000000..0575b6af
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/IO/Screen/Map.java
@@ -0,0 +1,4 @@
+package com.galaxytrucker.galaxytruckerreloaded.IO.Screen;
+
+public class Map {
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/Planet.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/Planet.java
new file mode 100644
index 00000000..2f4ddbcd
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/Planet.java
@@ -0,0 +1,7 @@
+package com.galaxytrucker.galaxytruckerreloaded.Model.Planet;
+
+public abstract class Planet {
+
+ /** Planet name */
+ private String name;
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
index 5e443dcd..c042567c 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
@@ -1,4 +1,33 @@
package com.galaxytrucker.galaxytruckerreloaded.Model;
public class Ship {
+
+ /**
+ * HP
+ */
+ private int hp;
+
+ /**
+ * Shields
+ */
+ private int shields;
+
+ /**
+ * Take damage
+ */
+ private void takeDamage(int amount) {
+ }
+
+ /**
+ * Add hp
+ */
+ private void heal(int hp) {
+ }
+
+ /**
+ * Add shields
+ */
+ private void applyShields(int shields) {
+ }
+
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
index 836b2e5a..641b418c 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
@@ -2,7 +2,9 @@ package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
public abstract class Weapon {
+ /** Weapon damage */
private int damage;
+ /** Weapon coolDown */
private int cooldown;
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/BaseRenderer.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/BaseRenderer.java
index 773d8a39..1c3a7a21 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/BaseRenderer.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/BaseRenderer.java
@@ -2,7 +2,9 @@ package com.galaxytrucker.galaxytruckerreloaded.View;
public interface BaseRenderer {
+ /** Setup */
public void setup();
+ /** Render */
public void render();
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Ship/ShipView.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Ship/ShipView.java
new file mode 100644
index 00000000..c7ae4ced
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Ship/ShipView.java
@@ -0,0 +1,6 @@
+package com.galaxytrucker.galaxytruckerreloaded.View.Ship;
+
+import com.galaxytrucker.galaxytruckerreloaded.View.BaseRenderer;
+
+public abstract class ShipView implements BaseRenderer {
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Weapons/WeaponView.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Weapons/WeaponView.java
new file mode 100644
index 00000000..d6b6dff3
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Weapons/WeaponView.java
@@ -0,0 +1,7 @@
+package com.galaxytrucker.galaxytruckerreloaded.View.Weapons;
+
+import com.galaxytrucker.galaxytruckerreloaded.View.BaseRenderer;
+
+public abstract class WeaponView implements BaseRenderer {
+
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f4d7b2bf..a4368dd3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed May 13 18:41:23 IDT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
--
GitLab