move loadout class, make square use position

core/src/com/mygdx/game/model/Game.java

 package com.mygdx.game.model;
 
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.audio.Sound;
 import com.mygdx.game.controller.SoundManager;
 import com.mygdx.game.model.board.Board;
-import com.mygdx.game.model.board.Loadout;
+import com.mygdx.game.model.player.Loadout;
 import com.mygdx.game.model.board.Move;
 import com.mygdx.game.model.board.Square;
 import com.mygdx.game.model.pieces.King;
@@ -12,7 +10,6 @@ import com.mygdx.game.model.player.Player;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 

core/src/com/mygdx/game/model/Position.java

@@ -18,8 +18,8 @@ public class Position {
         return y;
     }
 
-    public boolean equals(Position position) {
-        return this.x == position.x && this.y == position.y;
+    public boolean equals(Position that) {
+        return this.x == that.x && this.y == that.y;
     }
 
     @Override

core/src/com/mygdx/game/model/board/Board.java

@@ -3,6 +3,7 @@ package com.mygdx.game.model.board;
 import com.mygdx.game.model.Game;
 import com.mygdx.game.model.Piece;
 import com.mygdx.game.model.Position;
+import com.mygdx.game.model.player.Loadout;
 
 public class Board {
     private int width;

core/src/com/mygdx/game/model/board/Square.java

@@ -6,28 +6,24 @@ import com.mygdx.game.model.Position;
 import com.sun.org.apache.xpath.internal.operations.Bool;
 
 public class Square {
-    private int x;
-    private int y;
+    private Position position;
     private Piece piece;
 
     private boolean isOccupied;
     private Boolean isHighlighted = false;
 
     public Square(int x, int y) {
-        this.x = x;
-        this.y = y;
         this.piece = null;
+        this.position = new Position(x, y);
     }
 
     public Square(Position position) {
-        this.x = position.getX();
-        this.y = position.getY();
         this.piece = null;
+        this.position = position;
     }
 
     public Square(Square that) {
-        this.x = that.x;
-        this.y = that.y;
+        this.position = new Position(that.getPosition().getX(), that.getPosition().getY());
         if (that.piece == null) {
             this.piece = null;
         } else {
@@ -69,15 +65,15 @@ public class Square {
     }
 
     public int getX() {
-        return x;
+        return position.getX();
     }
 
     public int getY() {
-        return y;
+        return position.getY();
     }
 
     public Position getPosition() {
-        return new Position(x, y);
+        return position;
     }
 
     public void setIsHighlighted(Boolean isHighlighted) {
@@ -94,8 +90,8 @@ public class Square {
     @Override
     public String toString() {
         return "Square{" +
-                "x=" + x +
-                ", y=" + y +
+                "x=" + position.getX() +
+                ", y=" + position.getY() +
                 ", piece=" + getPieceNameIfNotNull() +
                 ", isOccupied=" + isOccupied +
                 ", canMoveTo=" + isHighlighted +
@@ -103,6 +99,6 @@ public class Square {
     }
 
     public Boolean equals(Square that) {
-        return this.x == that.x && this.y == that.y;
+        return this.position.equals(that.position);
     }
 }

core/src/com/mygdx/game/model/board/Loadout.java → core/src/com/mygdx/game/model/player/Loadout.java

-package com.mygdx.game.model.board;
+package com.mygdx.game.model.player;
 
 import com.badlogic.gdx.Files;
 import com.badlogic.gdx.Gdx;
@@ -8,6 +8,7 @@ import com.badlogic.gdx.utils.JsonReader;
 import com.badlogic.gdx.utils.JsonValue;
 import com.mygdx.game.model.ChessPieceFactory;
 import com.mygdx.game.model.Piece;
+import com.mygdx.game.model.board.Board;
 
 import org.json.JSONObject;
 

core/src/com/mygdx/game/model/player/Player.java

 package com.mygdx.game.model.player;
 
 import com.mygdx.game.model.Piece;
-import com.mygdx.game.model.board.Loadout;
-import com.mygdx.game.model.board.Move;
 
 public class Player {
     private String name;