Merge branch 'network' into 'master'

Network

See merge request reswp-2020/galaxytrucker!73

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

@@ -63,7 +63,7 @@ public class ClientControllerCommunicator {
         if (singleton == null){
             singleton = new ClientControllerCommunicator(client);
         }
-        // TODO CREATE ALL CONTROLLERS HERE
+        // TODO CREATE ALL CONTROLLERS HERE, all controllers should be singletons
         return singleton;
     }
 }

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

 package com.galaxytrucker.galaxytruckerreloaded.Model.Crew;
 
 import com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout.Room;
+import com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout.Tile;
 import lombok.*;
 
 import javax.persistence.*;
@@ -53,6 +54,10 @@ public class Crew implements Serializable {
     @OneToOne
     private Room currentRoom;
 
+    /** Tile the crew member is standing on */
+    @OneToOne
+    private Tile tile;
+
     /**
      * The price of the different crew-members
      */

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

@@ -83,7 +83,7 @@ public class Ship implements Serializable {
      * The planet the ship is currently at
      */
     @NonNull
-    @ManyToOne
+    @ManyToOne(cascade = CascadeType.ALL)
     private Planet planet;
 
     /** Shields */
@@ -98,12 +98,12 @@ public class Ship implements Serializable {
 
     /** This ship's systems */
     @NonNull
-    @OneToMany
+    @OneToMany(cascade = CascadeType.ALL)
     private List<Room> systems;
 
     /** Inventory */
     @NonNull
-    @OneToMany
+    @OneToMany(cascade = CascadeType.ALL)
     private List<Weapon> inventory;
 
     /** Whether or not the ship is in combat */

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

@@ -4,12 +4,11 @@ package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
 import com.galaxytrucker.galaxytruckerreloaded.Model.Crew.Crew;
 import lombok.*;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
+/** Rooms make up the spaceship */
 @Getter
 @Setter
 @Entity
@@ -57,6 +56,11 @@ public abstract class Room implements Serializable {
 
     /** Crew in this system */
     @NonNull
-    @OneToMany
+    @OneToMany(cascade = CascadeType.ALL)
     private List<Crew> crew;
+
+    /** Tiles the room is made out of */
+    @NonNull
+    @OneToMany(cascade = CascadeType.ALL)
+    private List<Tile> tiles;
 }

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

+package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
+
+import com.galaxytrucker.galaxytruckerreloaded.Model.Crew.Crew;
+import lombok.*;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import java.io.Serializable;
+
+/** Tiles make up the rooms */
+@NoArgsConstructor(access = AccessLevel.PUBLIC)
+@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
+@Getter
+@Setter
+@Entity
+public class Tile implements Serializable {
+
+    /** ID */
+    @Id @NonNull
+    private int id;
+
+    /** Position x in room */
+    @NonNull
+    private int posX;
+
+    /** Position y in room */
+    @NonNull
+    private int posY;
+
+    /** Crew member on this tile */
+    @OneToOne
+    private Crew standingOnMe = null;
+
+    /** If the tile is empty */
+    public boolean isEmpty(){
+        return standingOnMe != null;
+    }
+}

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

@@ -3,10 +3,7 @@ package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
 import com.galaxytrucker.galaxytruckerreloaded.Model.Weapons.Weapon;
 import lombok.*;
 
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
+import javax.persistence.*;
 import java.util.List;
 
 @RequiredArgsConstructor(access = AccessLevel.PUBLIC)
@@ -20,7 +17,7 @@ public class WeaponSystem extends System {
     private boolean manned = false;
 
     /** List of weapons this ship has */
-    @OneToMany
+    @OneToMany(cascade = CascadeType.ALL)
     private List<Weapon> shipWeapons;
 
 }

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

@@ -26,11 +26,11 @@ public class User implements Serializable {
     /**
      * The user's ship
      */
-    @OneToOne
+    @OneToOne(cascade = CascadeType.ALL)
     private Ship userShip;
 
     /** The user's overWorld map */
-    @OneToOne
+    @OneToOne(cascade = CascadeType.ALL)
     private Overworld overworld;
 
     /** Whether or not the user is logged in */