diff --git a/OOP_2B1_Project/src/backend/AutoPlayer.java b/OOP_2B1_Project/src/backend/AutoPlayer.java index c827d37..4079549 100644 --- a/OOP_2B1_Project/src/backend/AutoPlayer.java +++ b/OOP_2B1_Project/src/backend/AutoPlayer.java @@ -4,6 +4,7 @@ import java.util.ArrayList; public class AutoPlayer { + private PieceCreation pc = new PieceCreation(); private KingCheck kingCheck = new KingCheck(); public int MAX_DEPTH; public AutoPlayer() {} @@ -175,7 +176,7 @@ public class AutoPlayer { ArrayList newRow = new ArrayList<>(); for (Piece p : row) { if (p != null) { - newRow.add(PieceCreation.createPiece(p.getX(), p.getY(), p.getType(), p.isWhite())); + newRow.add(pc.createPiece(p.getX(), p.getY(), p.getType(), p.isWhite())); } else { newRow.add(null); } diff --git a/OOP_2B1_Project/src/backend/Board.java b/OOP_2B1_Project/src/backend/Board.java index a963215..0f61b8b 100644 --- a/OOP_2B1_Project/src/backend/Board.java +++ b/OOP_2B1_Project/src/backend/Board.java @@ -6,6 +6,7 @@ import java.util.LinkedList; import javax.swing.JOptionPane; public class Board { + private PieceCreation pc = new PieceCreation(); private KingCheck kingCheck = new KingCheck(); private SoundEffect soundEffect = new SoundEffect(); private int width = 8; @@ -59,7 +60,7 @@ public class Board { } public void setPiece(int x, int y, PieceType type, boolean isWhite) { - Piece piece = PieceCreation.createPiece(x,y,type,isWhite); + Piece piece = pc.createPiece(x,y,type,isWhite); board.get(y).set(x, piece); } diff --git a/OOP_2B1_Project/src/backend/BoardHistory.java b/OOP_2B1_Project/src/backend/BoardHistory.java index ca380fd..6f4ee12 100644 --- a/OOP_2B1_Project/src/backend/BoardHistory.java +++ b/OOP_2B1_Project/src/backend/BoardHistory.java @@ -9,6 +9,7 @@ public class BoardHistory { public int turnNumber; public boolean turnColor; public Move lastMove; + private PieceCreation pc = new PieceCreation(); public BoardHistory(ArrayList> board, int turnNumber, boolean turnColor, Move lastMove) { this.board = deepCopyBoard(board); this.turnNumber = turnNumber; @@ -21,7 +22,7 @@ public class BoardHistory { ArrayList newRow = new ArrayList<>(); for (Piece p : row) { if (p != null) { - newRow.add(PieceCreation.createPiece(p.getX(), p.getY(), p.getType(), p.isWhite())); + newRow.add(pc.createPiece(p.getX(), p.getY(), p.getType(), p.isWhite())); } else { newRow.add(null); } diff --git a/OOP_2B1_Project/src/backend/FileBoard.java b/OOP_2B1_Project/src/backend/FileBoard.java index bb8f7be..e2a17b4 100644 --- a/OOP_2B1_Project/src/backend/FileBoard.java +++ b/OOP_2B1_Project/src/backend/FileBoard.java @@ -6,6 +6,7 @@ public class FileBoard { public ArrayList> board = new ArrayList<>(); public int turnNumber; public boolean turnColor; + private PieceCreation pc = new PieceCreation(); public FileBoard(ArrayList> board,int turnNumber, boolean turnColor) { this.board = board; this.turnColor = turnColor; @@ -70,7 +71,7 @@ public class FileBoard { color = pieceChar.charAt(0); type = pieceChar.charAt(1); col = color == 'W'; - Piece piece = PieceCreation.createPiece(x,y,PieceType.fromSummary(type),col); + Piece piece = pc.createPiece(x,y,PieceType.fromSummary(type),col); boardF.get(y).set(x, piece); } } diff --git a/OOP_2B1_Project/src/backend/KingCheck.java b/OOP_2B1_Project/src/backend/KingCheck.java index b02e4a3..660ff6a 100644 --- a/OOP_2B1_Project/src/backend/KingCheck.java +++ b/OOP_2B1_Project/src/backend/KingCheck.java @@ -6,6 +6,7 @@ public class KingCheck { private boolean opponentWasInCheck = false; private SoundEffect soundEffect = new SoundEffect(); private boolean soundShouldPlay = true; + private PieceCreation pc = new PieceCreation(); public ArrayList> getLegalMoves(Piece piece, ArrayList> board, Move lastMove) { ArrayList> rawMoves = piece.getPossibleMoves(board,lastMove); @@ -88,7 +89,7 @@ public class KingCheck { ArrayList newRow = new ArrayList<>(); for (Piece p : row) { if (p != null) { - newRow.add(PieceCreation.createPiece(p.getX(), p.getY(), p.getType(), p.isWhite())); + newRow.add(pc.createPiece(p.getX(), p.getY(), p.getType(), p.isWhite())); } else { newRow.add(null); } diff --git a/OOP_2B1_Project/src/backend/PieceCreation.java b/OOP_2B1_Project/src/backend/PieceCreation.java index 2dc6516..1ba29d5 100644 --- a/OOP_2B1_Project/src/backend/PieceCreation.java +++ b/OOP_2B1_Project/src/backend/PieceCreation.java @@ -1,8 +1,7 @@ package backend; public class PieceCreation { - - public static Piece createPiece(int x, int y, PieceType type, boolean isWhite) { + public Piece createPiece(int x, int y, PieceType type, boolean isWhite) { switch (type) { case Pawn: return new Pawn(x, y, isWhite); case Rook: return new Rook(x, y, isWhite);