Merge branch 'test' into main

# Conflicts:
#	.idea/misc.xml

Author: vitalline

.gitignore

@@ -1,2 +1,4 @@
+/.gradle/
+/build/
 /imgui.ini
 /PureProg 12.ttf

.idea/Chess.iml

@@ -1,6 +1,5 @@
-#Mon Nov 25 01:15:20 EET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

.idea/libraries-with-intellij-classes.xml

@@ -256,8 +256,7 @@ private void disposeWindow() {
         Objects.requireNonNull(glfwSetErrorCallback(null)).free();
     }
 
-    @NotNull
-    private byte[] loadFromResources(final String fileName) {
+    private byte @NotNull [] loadFromResources(final String fileName) {
         try (InputStream is = Objects.requireNonNull(getClass().getClassLoader().getResourceAsStream(fileName));
              ByteArrayOutputStream buffer = new ByteArrayOutputStream()) {
 

.idea/misc.xml

@@ -17,9 +17,9 @@ public class AI extends Thread {
     private final int depth;
     private Board board;
     private Move bestMove;
-    private Move[] currentMoves;
-    private ArrayList<Hashtable<Move, Integer>> deepMoveScores;
-    private ArrayList<Hashtable<Move, Integer>> deepMoveCounts;
+    private final Move[] currentMoves;
+    private final ArrayList<Hashtable<Move, Integer>> deepMoveScores;
+    private final ArrayList<Hashtable<Move, Integer>> deepMoveCounts;
     private int currentDepth = 0;
     private static final int MAX_DISPLAYED_DEPTH = 3;
     private boolean shouldRun = false;

gradle/wrapper/gradle-wrapper.properties

@@ -28,7 +28,7 @@ public class FileChooser extends Thread {
     /**
      * Whether the menu is used for saving or opening a file.
      */
-    private boolean save;
+    private final boolean save;
 
     /**
      * Constructs a file chooser with the specified mode ("open" by default, "save" if specified).

src/main/java/com/syntech/chess/Main.java

@@ -24,7 +24,8 @@
 
 public class Board implements Cloneable {
     private static final Point pieceNone = new Point(-1, -1);
-    private int width, height;
+    private final int width, height;
+    protected final boolean priority;
     private ArrayList<Point> pieces;
     private ArrayList<Point> movablePieces = new ArrayList<>();
     protected ArrayList<Move> availableMoves = new ArrayList<>();
@@ -55,8 +56,9 @@ public class Board implements Cloneable {
     private Object[] errorArguments = null;
     private static final Piece none = PieceFactory.none();
 
-    private Board(@NotNull Piece[][] board, boolean initialize, boolean update, int turn) {
+    private Board(@NotNull Piece @NotNull [] @NotNull [] board, boolean priority, boolean initialize, boolean update, int turn) {
         this.translation = Translation.EN_US;
+        this.priority = priority;
         this.turn = turn;
         height = board.length;
         width = board.length > 0 ? board[0].length : 0;
@@ -87,24 +89,24 @@ private Board(@NotNull Piece[][] board, boolean initialize, boolean update, int
         }
     }
 
-    public Board(@NotNull Piece[][] board, boolean initialize, boolean update) {
-        this(board, initialize, update, 0);
+    public Board(@NotNull Piece[][] board, boolean priority, boolean initialize, boolean update) {
+        this(board, priority, initialize, update, 0);
     }
 
-    public Board(@NotNull Piece[][] board, int turn) {
-        this(board, false, false, turn);
+    public Board(@NotNull Piece[][] board, boolean priority, int turn) {
+        this(board, priority, false, false, turn);
     }
 
     public Board(@NotNull String errorMessage, Object... errorArguments) {
-        this(new Piece[0][0], false, false, 0);
+        this(new Piece[0][0], false, false, false, 0);
         this.errorMessage = errorMessage;
         this.errorArguments = errorArguments;
     }
 
     @Override
     public Object clone() throws CloneNotSupportedException {
         Board clone = (Board) super.clone();
-        Board copy = new Board(board, turn);
+        Board copy = new Board(board, priority, turn);
         clone.board = copy.board;
         clone.previousBoard = previousBoard;
         clone.selectedPiece = pieceNone;
@@ -140,6 +142,10 @@ public Translation getTranslation() {
         return translation;
     }
 
+    public boolean hasPriority() {
+        return priority;
+    }
+
     public void setTranslation(Translation translation) {
         this.translation = translation;
         status = getStatusConditions(getTurnSide());
@@ -297,7 +303,8 @@ protected void move(int startRow, int startCol, int endRow, int endCol, boolean
         if (enPassantPoint.x == endRow && enPassantPoint.y == endCol
                 && (piece.getType() == PieceType.PAWN)
                 && startCol != endCol) {
-            placePiece(PieceFactory.cell(), endRow + MovementRules.getPawnMoveDirection(enPassantPiece.getSide()), endCol);
+            Point captured = new Point(endRow + MovementRules.getPawnMoveDirection(enPassantPiece.getSide()), endCol);
+            placePiece(PieceFactory.cell(), captured);
             move.setCaptureFlag();
         }
         enPassantPoint = getEnPassantPoint(getTurnSide());
@@ -458,6 +465,7 @@ public void placePiece(Piece piece, int row, int col) {
         try {
             board[row][col] = piece;
             getPiece(row, col).setPosition(row, col);
+            updatePiece(row, col);
         } catch (ArrayIndexOutOfBoundsException ignored) {
         }
     }
@@ -485,13 +493,20 @@ private Color getColor(int row, int col) {
         return cellColorIsWhite(row, col) ? Color.WHITE : Color.BLACK;
     }
 
+    public void updatePiece(int row, int col) {
+        Piece piece = getPiece(row, col);
+        sideCache[row][col] = piece.getSide();
+        typeCache[row][col] = piece.getType();
+    }
+
+    public void updatePiece(@NotNull Point pos) {
+        updatePiece(pos.x, pos.y);
+    }
+
     public void updatePieces() {
         pieces = new ArrayList<>();
         for (int row = 0; row < getHeight(); row++) {
             for (int col = 0; col < getWidth(); col++) {
-                Piece piece = getPiece(row, col);
-                sideCache[row][col] = piece.getSide();
-                typeCache[row][col] = piece.getType();
                 if (!isFree(row, col)) {
                     pieces.add(new Point(row, col));
                 }
@@ -542,7 +557,7 @@ public ArrayList<Move> getAllAvailableMoves(Side side) {
                 moves.addAll(getPiece(p.x, p.y).getAvailableCaptures(this));
             }
         }
-        moves = MovePriorities.topPriorityMoves(moves);
+        if (priority) moves = MovePriorities.topPriorityMoves(moves);
         if (side == Side.WHITE) allAvailableWhiteMoves = moves;
         if (side == Side.BLACK) allAvailableBlackMoves = moves;
         return moves;
@@ -594,7 +609,7 @@ protected void selectPiece(int row, int col) {
     private ArrayList<Move> getAvailableMoves(int row, int col) {
         if (getSide(row, col) == getTurnSide()) {
             ArrayList<Move> availableMoves = getPiece(row, col).getAvailableMoves(this);
-            availableMoves = topPriorityMoves(availableMoves, row, col);
+            if (priority) availableMoves = topPriorityMoves(availableMoves, row, col);
             return availableMoves;
         }
         return new ArrayList<>();
@@ -604,7 +619,7 @@ private ArrayList<Move> getAvailableMoves(int row, int col) {
     private ArrayList<Move> getAvailableCaptures(int row, int col) {
         if (getSide(row, col) == getTurnSide()) {
             ArrayList<Move> availableCaptures = getPiece(row, col).getAvailableCaptures(this);
-            availableCaptures = topPriorityMoves(availableCaptures, row, col);
+            if (priority) availableCaptures = topPriorityMoves(availableCaptures, row, col);
             return availableCaptures;
         }
         return new ArrayList<>();
@@ -654,7 +669,7 @@ private void advanceTurn() {
     }
 
     public Board getMoveResultWithoutPromotion(Move move) {
-        Board moveResult = new Board(board, turn);
+        Board moveResult = new Board(board, priority, turn);
         if (move != null) {
             moveResult.move(move.getStartRow(), move.getStartCol(), move.getEndRow(), move.getEndCol(), false);
         }
@@ -779,7 +794,7 @@ public void saveToPGN(@NotNull String path, Setup setup) throws IOException {
         if (result.length() > 1) {
             sb.append(result);
         }
-        printWriter.print(sb.toString());
+        printWriter.print(sb);
         printWriter.close();
     }
 

src/main/java/com/syntech/chess/ai/AI.java

@@ -7,18 +7,18 @@
 import java.awt.*;
 
 public class Board3D extends Board {
-    private int boardWidth;
+    private final int boardWidth;
 
-    public Board3D(@NotNull Piece[][] board, int boardWidth, boolean initialize, boolean update) {
-        super(board, initialize, false);
+    public Board3D(@NotNull Piece[][] board, boolean priority, int boardWidth, boolean initialize, boolean update) {
+        super(board, priority, initialize, false);
         this.boardWidth = boardWidth;
         if (update) {
             updateMovablePieces();
         }
     }
 
-    public Board3D(@NotNull Piece[][] board, int boardWidth, int turn) {
-        super(board, turn);
+    public Board3D(@NotNull Piece[][] board, boolean priority, int boardWidth, int turn) {
+        super(board, priority, turn);
         this.boardWidth = boardWidth;
     }
 
@@ -66,7 +66,7 @@ public int getPromotionCoordinate(@NotNull Point position) {
 
     @Override
     public Board getMoveResultWithoutPromotion(Move move) {
-        Board3D nextTurn = new Board3D(getBoard(), boardWidth, turn);
+        Board3D nextTurn = new Board3D(getBoard(), priority, boardWidth, turn);
         if (move != null) {
             nextTurn.move(move.getStartRow(), move.getStartCol(), move.getEndRow(), move.getEndCol(), false);
         }

src/main/java/com/syntech/chess/graphic/FileChooser.java

@@ -6,12 +6,12 @@
 import java.util.ArrayList;
 
 public class CyclicBoard extends Board {
-    public CyclicBoard(@NotNull Piece[][] board, boolean initialize, boolean update) {
-        super(board, initialize, update);
+    public CyclicBoard(@NotNull Piece[][] board, boolean priority, boolean initialize, boolean update) {
+        super(board, priority, initialize, update);
     }
 
-    public CyclicBoard(@NotNull Piece[][] board, int turn) {
-        super(board, turn);
+    public CyclicBoard(@NotNull Piece[][] board, boolean priority, int turn) {
+        super(board, priority, turn);
     }
 
     private int getColumn(int col) {
@@ -53,7 +53,7 @@ public ArrayList<Move> getAllAvailableMoves(Side side) {
 
     @Override
     public Board getMoveResultWithoutPromotion(Move move) {
-        CyclicBoard nextTurn = new CyclicBoard(getBoard(), turn);
+        CyclicBoard nextTurn = new CyclicBoard(getBoard(), priority, turn);
         if (move != null) {
             nextTurn.move(move.getStartRow(), move.getStartCol(), move.getEndRow(), move.getEndCol(), false);
         }

src/main/java/com/syntech/chess/logic/Board.java

@@ -13,7 +13,7 @@ public enum LevellingData {
     FORCE_DOWN(false, true, false, false, true),
     FORCE_UP_DOWN(true, true, false, false, true);
 
-    private boolean canLevelUp, canLevelDown, hasResistance, hasPower, forceInvolution;
+    private final boolean canLevelUp, canLevelDown, hasResistance, hasPower, forceInvolution;
 
     LevellingData(boolean canLevelUp, boolean canLevelDown, boolean hasResistance, boolean hasPower, boolean forceInvolution) {
         this.canLevelUp = canLevelUp;

src/main/java/com/syntech/chess/logic/Board3D.java

@@ -335,7 +335,7 @@ public static Move fromPGN(@NotNull String pgn, Board board) {
                 pgn = pgn.substring(1);
             }
 
-            if (pgn.substring(pgn.length() - 1).equals("#") || pgn.substring(pgn.length() - 1).equals("+")) {
+            if (pgn.endsWith("#") || pgn.endsWith("+")) {
                 pgn = pgn.substring(0, pgn.length() - 1);
             }
 
@@ -359,7 +359,7 @@ public static Move fromPGN(@NotNull String pgn, Board board) {
                     pgn = pgn.substring(1);
                 }
 
-                if (pgn.charAt(0) == 'x') {
+                if (pgn.startsWith("x")) {
                     pgn = pgn.substring(1);
                 }
             }

src/main/java/com/syntech/chess/logic/CyclicBoard.java

@@ -1,7 +1,7 @@
 package com.syntech.chess.logic;
 
 public class PromotionInfo implements Cloneable {
-    private int promotionCoordinate;
+    private final int promotionCoordinate;
     private PieceType[] possiblePromotionPieces;
 
     public PromotionInfo(int promotionCoordinate, PieceType... pieces) {