Merge remote-tracking branch 'origin/master'

# Conflicts:
#	core/src/netwerkprog/game/util/graphics/Renderable.java

core/src/netwerkprog/game/util/application/GameApplicationConfiguration.java

@@ -6,36 +6,6 @@ import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
  * custom application config class  for the game
  */
 public class GameApplicationConfiguration extends LwjglApplicationConfiguration {
-    /**
-     * makes a new configuration with the given parameters
-     * @param width the width (in pixels)
-     * @param height the height (in pixels)
-     * @param fullscreen whether the app should run in fullscreen
-     */
-    public GameApplicationConfiguration(int width, int height, boolean fullscreen) {
-        super();
-        super.width = width;
-        super.height = height;
-        super.fullscreen = fullscreen;
-    }
-
-    /**
-     * makes a new configuration with the given parameters.
-     * No fullscreen
-     * @param width the width (in pixels)
-     * @param height the height (in pixels)
-     */
-    public GameApplicationConfiguration(int width, int height) {
-        this(width,height,false);
-    }
-
-    /**
-     * makes a new configuration with standard full hd width and height
-     */
-    public GameApplicationConfiguration() {
-        this(1920,1080,false);
-    }
-
     /**
      * Makes a new configuration with the given parameters
      * @param title the title of the window
@@ -61,13 +31,4 @@ public class GameApplicationConfiguration extends LwjglApplicationConfiguration
     public GameApplicationConfiguration(String title, int width, int height) {
         this(title,width,height,false);
     }
-
-    /**
-     * Makes a new configuration with the given title
-     * the window will be 1920 x 1080 and fullscreen will be off
-     * @param title the window title
-     */
-    public GameApplicationConfiguration(String title) {
-        this(title, 1920,1080);
-    }
 }

core/src/netwerkprog/game/util/application/Updatable.java

@@ -1,5 +0,0 @@
-package netwerkprog.game.util.application;
-
-public interface Updatable {
-    void update(double deltaTime);
-}

core/src/netwerkprog/game/util/data/Data.java

@@ -7,25 +7,17 @@ public class Data implements Serializable {
         return 8000;
     }
 
-    private String objectType;
+    private final String objectType;
     private Data payload;
 
     public Data(String type) {
         this.objectType = type;
     }
 
-    public void setObjectType(String objectType) {
-        this.objectType = objectType;
-    }
-
     public void setPayload(Data payload) {
         this.payload = payload;
     }
 
-    public String getType() {
-        return objectType;
-    }
-
     public Data getPayload() {
         return payload;
     }

core/src/netwerkprog/game/util/data/connection/NameData.java

@@ -3,7 +3,7 @@ package netwerkprog.game.util.data.connection;
 import netwerkprog.game.util.data.Data;
 
 public class NameData extends Data {
-    private String name;
+    private final String name;
     public NameData(String name) {
         super("name");
         super.setPayload(this);

core/src/netwerkprog/game/util/data/connection/ReadyData.java

@@ -1,15 +0,0 @@
-package netwerkprog.game.util.data.connection;
-
-import netwerkprog.game.util.data.Data;
-
-public class ReadyData extends Data {
-    private String username;
-    public ReadyData(String username) {
-        super("ready");
-        this.username = username;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-}

core/src/netwerkprog/game/util/graphics/Renderable.java

@@ -1,6 +1,5 @@
 package netwerkprog.game.util.graphics;
 
-
 public interface Renderable {
     void render();
 }