Merge branch 'network' into 'master'

kestrel generation done

See merge request reswp-2020/galaxytrucker!76

core/src/com/galaxytrucker/galaxytruckerreloaded/Communication/Client.java

@@ -10,8 +10,9 @@ import lombok.NonNull;
 
 import java.io.*;
 import java.net.Socket;
+import java.util.UUID;
 
-/** This class handles the client-side networking */
+/** This class handles the client side networking */
 public class Client {
 
     /**
@@ -49,6 +50,9 @@ public class Client {
     @Getter
     private Overworld overworld;
 
+    /** Ship type */
+    private Enum<ShipType> shipType;
+
     /**
      * Send a request to the server
      *

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Crew/Crew.java

@@ -45,27 +45,30 @@ public class Crew implements Serializable {
      * Das Array besteht aus
      * [Weapon, Shield, Engine, Repair, Combat]
      */
+    @NonNull
     @ElementCollection
     private List<Integer> stats;
 
     /**
      * The room this crew member is in
      */
-    @OneToOne
+    @OneToOne(cascade = CascadeType.ALL)
     private Room currentRoom;
 
     /** Tile the crew member is standing on */
-    @OneToOne
+    @OneToOne(cascade = CascadeType.ALL)
     private Tile tile;
 
     /**
      * The price of the different crew-members
      */
+    @NonNull
     private int price;
 
     /**
      * The user who owns this crew member
      */
+    @NonNull
     private String associatedUser;
 
 }

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/BlankRoom.java

-package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
-
-import lombok.*;
-
-import javax.persistence.Entity;
-
-@Getter
-@Setter
-@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
-@Entity
-public class BlankRoom extends Room {
-
-}

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/System.java

@@ -6,7 +6,6 @@ import lombok.*;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import java.io.Serializable;
 import java.util.List;

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Tile.java

@@ -3,6 +3,7 @@ package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
 import com.galaxytrucker.galaxytruckerreloaded.Model.Crew.Crew;
 import lombok.*;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
@@ -29,7 +30,7 @@ public class Tile implements Serializable {
     private int posY;
 
     /** Crew member on this tile */
-    @OneToOne
+    @OneToOne(cascade = CascadeType.ALL)
     private Crew standingOnMe = null;
 
     /** If the tile is empty */

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Bomb.java

-package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
-
-import lombok.*;
-
-import javax.persistence.Entity;
-import java.io.Serializable;
-
-@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
-@NoArgsConstructor(access = AccessLevel.PUBLIC)
-@Getter
-@Setter
-@Entity
-public class Bomb extends Weapon implements Serializable {
-
-    /** Weapon name */
-    @NonNull
-    private String name;
-
-}

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/HealBomb.java

-package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
-
-import lombok.*;
-
-import javax.persistence.Entity;
-import java.io.Serializable;
-
-@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
-@NoArgsConstructor(access = AccessLevel.PUBLIC)
-@Getter
-@Setter
-@Entity
-public class HealBomb extends Weapon implements Serializable {
-
-    /**
-     * Weapon name
-     */
-    @NonNull
-    private String name;
-}

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/LaserBlaster.java

-package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
-
-import lombok.*;
-
-import javax.persistence.Entity;
-import java.io.Serializable;
-
-@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
-@NoArgsConstructor(access = AccessLevel.PUBLIC)
-@Getter
-@Setter
-@Entity
-public class LaserBlaster extends Weapon implements Serializable {
-
-    /** Weapon name */
-    @NonNull
-    private String name;
-
-}

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/RadiationBomb.java

-package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
-
-import lombok.*;
-
-import javax.persistence.Entity;
-import java.io.Serializable;
-
-@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
-@NoArgsConstructor(access = AccessLevel.PUBLIC)
-@Getter
-@Setter
-@Entity
-public class RadiationBomb extends Weapon implements Serializable {
-
-    /** Weapon name */
-    @NonNull
-    private String name;
-}

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Radio.java

-package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
-
-import lombok.*;
-
-import javax.persistence.Entity;
-import java.io.Serializable;
-
-@Getter
-@Setter
-@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
-@NoArgsConstructor(access = AccessLevel.PUBLIC)
-@Entity
-public class Radio extends Weapon implements Serializable {
-
-    /** Weapon name */
-    @NonNull
-    private String name;
-}

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Rocket.java

-package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
-
-import lombok.*;
-
-import javax.persistence.Entity;
-import java.io.Serializable;
-
-@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
-@NoArgsConstructor(access = AccessLevel.PUBLIC)
-@Getter
-@Setter
-@Entity
-public class Rocket extends Weapon implements Serializable {
-
-    /** Weapon name */
-    @NonNull
-    private String weaponName;
-
-}

core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java

@@ -11,7 +11,9 @@ import java.util.List;
 @Getter
 @Setter
 @Entity
-public abstract class Weapon implements Serializable {
+@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
+@NoArgsConstructor(access = AccessLevel.PUBLIC)
+public class Weapon implements Serializable {
 
     /**
      * ID
@@ -52,7 +54,7 @@ public abstract class Weapon implements Serializable {
      * Weapon accuracy
      */
     @NonNull
-    private float precision;
+    private float accuracy;
 
     /**
      * probability of randomly finding this weapon
@@ -94,4 +96,12 @@ public abstract class Weapon implements Serializable {
     @OneToOne
     private System weaponSystem;
 
+    /** Weapon name */
+    @NonNull
+    private String weaponName;
+
+    /** Weapon price */
+    @NonNull
+    private int weaponPrice;
+
 }

core/src/com/galaxytrucker/galaxytruckerreloaded/Server/ClientHandler.java

@@ -136,7 +136,7 @@ public class ClientHandler implements Runnable {
                         send.println("[NEW-GAME]");
                         // ==================== Overworld Creation ====================
                         this.seed = UUID.randomUUID().hashCode();
-                        Overworld overworld = generateOverworld(this.seed,username);
+                        Overworld overworld = generateOverworld(this.seed, username);
                         user.setOverworld(overworld);
                         //====================== Ship Creation ==================
                         ShipType shipType = (ShipType) receiveObject.readObject();
@@ -197,7 +197,7 @@ public class ClientHandler implements Runnable {
      */
     private String getPlanetName(List<String> names, List<String> usedNames, int seed) {
         Random random = new Random(seed);
-        String newName = names.get(random.nextInt(names.size()-1));
+        String newName = names.get(random.nextInt(names.size() - 1));
         if (usedNames.contains(newName)) {
             getPlanetName(names, usedNames, seed);
         }
@@ -210,7 +210,7 @@ public class ClientHandler implements Runnable {
      * @param seed - the world seed
      * @return the generated overworld
      */
-    private Overworld generateOverworld(int seed,String username) {
+    private Overworld generateOverworld(int seed, String username) {
         Random random = new Random(seed);
         List<PlanetEvent> planetEvents = new ArrayList<PlanetEvent>();
         planetEvents.add(PlanetEvent.SHOP);
@@ -220,19 +220,21 @@ public class ClientHandler implements Runnable {
         planetEvents.add(PlanetEvent.NEBULA);
         List<Planet> planets = new ArrayList<Planet>();
         // Create start planet
-        planets.add(new Planet(UUID.randomUUID().hashCode(),getPlanetName(planetNames,usedPlanetNames,seed),
-                0,0,PlanetEvent.VOID,new ArrayList<Ship>()));
-        for (int i=0;i<5;i++){
-            for (int a = 0;a<5;a++){
-                String nextPlanet = getPlanetName(planetNames,usedPlanetNames,seed);
-                planets.add(new Planet(UUID.randomUUID().hashCode(),nextPlanet,i,a,
-                        planetEvents.get(random.nextInt(planetEvents.size()-1)),new ArrayList<Ship>()));
+        //TODO CHANGE RANDOMIZER TO HAVE EVERYTHING IN EACH MAP
+        //TODO ADD TRADER WITH ITEMS TO MAP
+        planets.add(new Planet(UUID.randomUUID().hashCode(), getPlanetName(planetNames, usedPlanetNames, seed),
+                0, 0, PlanetEvent.VOID, new ArrayList<Ship>()));
+        for (int i = 0; i < 5; i++) {
+            for (int a = 0; a < 5; a++) {
+                String nextPlanet = getPlanetName(planetNames, usedPlanetNames, seed);
+                planets.add(new Planet(UUID.randomUUID().hashCode(), nextPlanet, i, a,
+                        planetEvents.get(random.nextInt(planetEvents.size() - 1)), new ArrayList<Ship>()));
             }
         }
         // Boss planet
-        planets.add(new Planet(UUID.randomUUID().hashCode(),getPlanetName(planetNames,usedPlanetNames,seed),
-                30,30,PlanetEvent.BOSS,new ArrayList<Ship>()));
-        Overworld overworld = new Overworld(UUID.randomUUID().hashCode(),seed,username);
+        planets.add(new Planet(UUID.randomUUID().hashCode(), getPlanetName(planetNames, usedPlanetNames, seed),
+                30, 30, PlanetEvent.BOSS, new ArrayList<Ship>()));
+        Overworld overworld = new Overworld(UUID.randomUUID().hashCode(), seed, username);
         overworld.setStartPlanet(planets.get(0));
         overworld.setPlanetMap(planets);
         return overworld;
@@ -244,12 +246,18 @@ public class ClientHandler implements Runnable {
      * @param shipType - the ship type
      * @return the created ship
      */
+    @SuppressWarnings("Duplicates")
     private Ship generateShip(ShipType shipType, String username, Overworld overworld) {
         List<Weapon> inventory = new ArrayList<>();
         List<Room> rooms = new ArrayList<>();
         List<Tile> tiles = new ArrayList<>();
         switch (shipType) {
+            // ========== KESTREL A ==========
             case DEFAULT:
+                List<Integer> crewStats = new ArrayList<>();
+                for (int f = 0; f < 5; f++) {
+                    crewStats.add(2);
+                }
                 for (int i = 0; i < 17; i++) {
                     // ========== Tile generator ==========
                     // 2 Above each other
@@ -279,16 +287,41 @@ public class ClientHandler implements Runnable {
                     else if (i == 2) {
                         Room engine = new System(UUID.randomUUID().hashCode(), 0, 100, i, new ArrayList<Crew>(),
                                 new ArrayList<Tile>(), 2, 5, 0, SystemType.ENGINE, new ArrayList<Weapon>());
-                        //TODO add crew member
                         engine.setTiles(tiles);
+                        Crew crew = new Crew(UUID.randomUUID().hashCode(), "Isac", 8, 8, crewStats, 3 * crewStats.size() * 2, username);
+                        crew.setTile(engine.getTiles().get(0));
+                        engine.getTiles().get(0).setStandingOnMe(crew);
+                        crew.setCurrentRoom(engine);
+                        List<Crew> crewInRoom = engine.getCrew();
+                        crewInRoom.add(crew);
+                        engine.setCrew(crewInRoom);
                         rooms.add(engine);
                     }
                     // Weapons
                     else if (i == 5) {
-                        Room weapons = new System(UUID.randomUUID().hashCode(), 0, 100, i, new ArrayList<Crew>(),
+                        System weapons = new System(UUID.randomUUID().hashCode(), 0, 100, i, new ArrayList<Crew>(),
                                 new ArrayList<Tile>(), 3, 5, 0, SystemType.WEAPON_SYSTEM, new ArrayList<Weapon>());
-                        //TODO add weapons and crew member
                         weapons.setTiles(tiles);
+                        // Add crew
+                        Crew crew = new Crew(UUID.randomUUID().hashCode(), "Newton", 8, 8, crewStats, 3 * crewStats.size() * 2, username);
+                        crew.setTile(weapons.getTiles().get(0));
+                        crew.setCurrentRoom(weapons);
+                        List<Crew> crewInRoom = weapons.getCrew();
+                        crewInRoom.add(crew);
+                        weapons.getTiles().get(0).setStandingOnMe(crew);
+                        weapons.setCrew(crewInRoom);
+                        // Add Weapons
+                        Weapon laser = new Weapon(UUID.randomUUID().hashCode(), 2, 1, 1, 1, 0,
+                                (float) 1.0, (float) 0.3, 0, (float) 0.3, 1, 1, "Laser Gun", 30);
+                        Weapon rocket = new Weapon(UUID.randomUUID().hashCode(), 1, 2, 2, 1, 1, (float) 1.0,
+                                (float) 0.25, 4, (float) 1.0, 2, 1, "Allahu Akbar", 30);
+                        // TODO add weapon price list
+                        laser.setWeaponSystem(weapons);
+                        rocket.setWeaponSystem(weapons);
+                        List<Weapon> shipWeapons = new ArrayList<>();
+                        shipWeapons.add(laser);
+                        shipWeapons.add(rocket);
+                        weapons.setShipWeapons(shipWeapons);
                         rooms.add(weapons);
                     }
                     // Medbay
@@ -316,8 +349,15 @@ public class ClientHandler implements Runnable {
                     else if (i == 16) {
                         Room cockpit = new System(UUID.randomUUID().hashCode(), 0, 100, i, new ArrayList<Crew>(),
                                 new ArrayList<Tile>(), 1, 5, 0, SystemType.COCKPIT, new ArrayList<Weapon>());
-                        //TODO add crew member
                         cockpit.setTiles(tiles);
+                        // Add crew
+                        Crew crew = new Crew(UUID.randomUUID().hashCode(), "Ahmad", 8, 8, crewStats, 3 * crewStats.size() * 2, username);
+                        crew.setTile(cockpit.getTiles().get(0));
+                        crew.setCurrentRoom(cockpit);
+                        List<Crew> crewInRoom = cockpit.getCrew();
+                        crewInRoom.add(crew);
+                        cockpit.getTiles().get(0).setStandingOnMe(crew);
+                        cockpit.setCrew(crewInRoom);
                         rooms.add(cockpit);
                     } else {
                         Room room = new Room(UUID.randomUUID().hashCode(), 0, 100, i, new ArrayList<Crew>(), new ArrayList<Tile>());
@@ -326,8 +366,13 @@ public class ClientHandler implements Runnable {
                     }
                     tiles.clear();
                 }
-                return new Ship(UUID.randomUUID().hashCode(), username, shipType, 30, 60, 11, 7, 0,
-                        0, 0, 0, overworld.getStartPlanet(), 1, 100, rooms, new ArrayList<Weapon>(), false);
+                return new Ship(UUID.randomUUID().hashCode(), username, shipType, 30, 60, 11, 7, 8,
+                        0, 0, 0, overworld.getStartPlanet(), 0, 100, rooms, inventory, false);
+            // ========== Bulwark A ==========
+            case TANK:
+                // ========== Tile Generator ==========
+
+                // ========== Room Generator ==========
             default:
                 return null;
         }

core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Database/Database.java

@@ -5,7 +5,11 @@ import lombok.*;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
+import javax.persistence.PersistenceContext;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 
+/** Creates the database and entity manager */
 @Getter
 @NoArgsConstructor(access = AccessLevel.PUBLIC)
 public class Database {
@@ -32,11 +36,4 @@ public class Database {
     public static EntityManager getEntityManager() {
         return entityManagerFactory.createEntityManager();
     }
-
-    /**
-     * Backup database
-     */
-    public void backupDatabase() {
-
-    }
 }

core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/CrewNotFoundException.java

 package com.galaxytrucker.galaxytruckerreloaded.Server.Exception;
 
+/** Thrown when no crew can be found */
 public class CrewNotFoundException extends Exception {
 }

core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/DuplicateCrewException.java

 package com.galaxytrucker.galaxytruckerreloaded.Server.Exception;
 
+/** Thrown when the crew object already exists */
 public class DuplicateCrewException extends Exception {
 }

core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/DuplicateOverworldException.java

 package com.galaxytrucker.galaxytruckerreloaded.Server.Exception;
 
+/** Thrown when the overWorld object already exists */
 public class DuplicateOverworldException extends Exception {
 }

core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/DuplicatePlanetException.java

 package com.galaxytrucker.galaxytruckerreloaded.Server.Exception;
 
+/** Thrown when the planet object already exists */
 public class DuplicatePlanetException extends Exception {
 }

core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/DuplicateRequestObjectException.java

 package com.galaxytrucker.galaxytruckerreloaded.Server.Exception;
 
+/** Thrown when the request object already exists */
 public class DuplicateRequestObjectException extends Exception {
 }

core/src/com/galaxytrucker/galaxytruckerreloaded/Server/Exception/DuplicateResponseObjectException.java

+package com.galaxytrucker.galaxytruckerreloaded.Server.Exception;
+
+/** Thrown when the response object already exists */
+public class DuplicateResponseObjectException extends Exception {
+}