restart enabled

src/backend/Board.java

@@ -209,7 +209,7 @@ public class Board {
             }
             else {
                 if (isHighlighted(x, y)) {
-                    Piece capturedPiece = clickedPiece; // Peut être null pour en passant
+                    Piece capturedPiece = clickedPiece; // Peut <20>tre null pour en passant
                     Move move = new Move(selectedX, selectedY, x, y, selectedPiece, capturedPiece);
                     playMove(move);
 
@@ -282,6 +282,11 @@ public class Board {
             System.out.println("En Passant target set at (" + this.enPassantTargetX + "," + this.enPassantTargetY + ")");
         }
 
+        // G<>rer le roque
+        if (pieceToMove.getType() == PieceType.King && Math.abs(move.getToX() - move.getFromX()) == 2) {
+            handleCastling(move);
+        }
+
         moveHistory.addMove(move);
 
         this.turnNumber++;
@@ -291,6 +296,27 @@ public class Board {
         System.out.println("Turn " + this.turnNumber + ". " + (this.isTurnWhite ? "White" : "Black") + " to move.");
     }
 
+    private void handleCastling(Move move) {
+        Piece king = move.getPieceMoved();
+        int fromX = move.getFromX();
+        int toX = move.getToX();
+        int y = move.getFromY();
+
+        if (toX == fromX + 2) {
+            // Roque c<>t<EFBFBD> roi
+            Piece rook = getPieceAt(fromX + 3, y);
+            if (rook != null && rook.getType() == PieceType.Rook) {
+                rook.setPosition(fromX + 1, y);
+            }
+        } else if (toX == fromX - 2) {
+            // Roque c<>t<EFBFBD> dame
+            Piece rook = getPieceAt(fromX - 4, y);
+            if (rook != null && rook.getType() == PieceType.Rook) {
+                rook.setPosition(fromX - 1, y);
+            }
+        }
+    }
+
     public boolean undoLastMove() {
         return moveHistory.undoLastMove();
     }

src/backend/Move.java

@@ -68,7 +68,7 @@ public class Move {
         moves.add(x + "," + y);
     }
 
-    private static boolean isValidPosition(Board board, int x, int y) {
+    static boolean isValidPosition(Board board, int x, int y) {
         return x >= 0 && x < board.getWidth() && y >= 0 && y < board.getHeight();
     }
 
@@ -129,7 +129,6 @@ public class Move {
             }
         }
 
-        // *** D<>but Modification En Passant ***
         // V<>rifier la capture en passant
         int enPassantTargetX = board.getEnPassantTargetX();
         int enPassantTargetY = board.getEnPassantTargetY();
@@ -148,10 +147,8 @@ public class Move {
                 }
             }
         }
-        // *** Fin Modification En Passant ***
     }
 
-
     private static void calculateKnightMoves(Board board, Piece piece, int x, int y, Set<String> validMoves) {
         int[][] knightMoves = {
             {-2, -1}, {-2, 1}, {-1, -2}, {-1, 2},
@@ -185,7 +182,44 @@ public class Move {
                 }
             }
         }
-        // TODO: Ajouter calcul du roque ici
+        // Ajouter calcul du roque ici
+        calculateCastlingMoves(board, piece, x, y, validMoves);
+    }
+
+    private static void calculateCastlingMoves(Board board, Piece piece, int x, int y, Set<String> validMoves) {
+        if (piece.getType() != PieceType.King || piece.hasMoved()) {
+            return;
+        }
+
+        // Roque c<>t<EFBFBD> roi
+        if (canCastleKingside(board, piece, x, y)) {
+            addMove(x + 2, y, validMoves);
+        }
+
+        // Roque c<>t<EFBFBD> dame
+        if (canCastleQueenside(board, piece, x, y)) {
+            addMove(x - 2, y, validMoves);
+        }
+    }
+
+    private static boolean canCastleKingside(Board board, Piece king, int x, int y) {
+        Piece rook = board.getPieceAt(x + 3, y);
+        return rook != null && rook.getType() == PieceType.Rook && !rook.hasMoved() &&
+               board.getPieceAt(x + 1, y) == null && board.getPieceAt(x + 2, y) == null &&
+               !isKingInCheck(board, king.isWhite());
+    }
+
+    private static boolean canCastleQueenside(Board board, Piece king, int x, int y) {
+        Piece rook = board.getPieceAt(x - 4, y);
+        return rook != null && rook.getType() == PieceType.Rook && !rook.hasMoved() &&
+               board.getPieceAt(x - 1, y) == null && board.getPieceAt(x - 2, y) == null && board.getPieceAt(x - 3, y) == null &&
+               !isKingInCheck(board, king.isWhite());
+    }
+
+    private static boolean isKingInCheck(Board board, boolean isWhite) {
+        // Impl<70>mentez la logique pour v<>rifier si le roi est en <20>chec
+        // Cela n<>cessite de v<>rifier tous les mouvements possibles des pi<70>ces adverses
+        return false;
     }
 
     @Override

src/backend/Piece.java

@@ -8,6 +8,7 @@ public class Piece {
     private int y;
     private final PieceType type;
     private final boolean isWhite;
+    private boolean hasMoved;
 
     public Piece(int x, int y, PieceType type, boolean isWhite) {
         if (type == null) {
@@ -17,14 +18,19 @@ public class Piece {
         this.y = y;
         this.type = type;
         this.isWhite = isWhite;
+        this.hasMoved = false;
     }
 
     public int getX() { return this.x; }
     public int getY() { return this.y; }
     public PieceType getType() { return this.type; }
     public boolean isWhite() { return this.isWhite; }
+    public boolean hasMoved() { return hasMoved; }
 
     void setPosition(int newX, int newY) {
+        if (this.x != newX || this.y != newY) {
+            this.hasMoved = true;
+        }
         this.x = newX;
         this.y = newY;
     }
@@ -57,7 +63,7 @@ public class Piece {
             case King:
                 return dx <= 1 && dy <= 1;
             default:
-                System.err.println("Erreur: Type de pièce inconnu dans canMoveTo: " + this.type);
+                System.err.println("Erreur: Type de pi<70>ce inconnu dans canMoveTo: " + this.type);
                 return false;
         }
     }

src/windowInterface/MyInterface.java

@@ -1,34 +1,28 @@
 package windowInterface;
+
 import java.awt.BorderLayout;
-import java.awt.Dimension;
 import java.awt.GridLayout;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
-import javax.swing.SwingConstants;
 import javax.swing.border.EmptyBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
+import javax.swing.SwingUtilities;
 
 import backend.Game;
 
 import javax.swing.JButton;
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
+import javax.swing.JCheckBox;
 
 import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.LinkedList;
-import java.awt.event.ActionEvent;
-import javax.swing.JList;
-import javax.swing.AbstractListModel;
-import javax.swing.JToggleButton;
-import javax.swing.JRadioButton;
-import javax.swing.JCheckBox;
 
 public class MyInterface extends JFrame {
 
@@ -60,7 +54,6 @@ public class MyInterface extends JFrame {
         contentPane.add(panelRight, BorderLayout.EAST);
         panelRight.setLayout(new GridLayout(4, 1));
 
-
         actionLabel = new JLabel("Waiting For Start");
         panelTop.add(actionLabel);
 
@@ -112,7 +105,6 @@ public class MyInterface extends JFrame {
             public void actionPerformed(ActionEvent arg0) {
                 clicUndoButton();
             }
-
         });
         panelTop.add(btnUndo);
 
@@ -121,7 +113,6 @@ public class MyInterface extends JFrame {
             public void actionPerformed(ActionEvent arg0) {
                 clicAIToggle(true);
             }
-
         });
         panelTop.add(chckbxWhiteAI);
 
@@ -130,7 +121,6 @@ public class MyInterface extends JFrame {
             public void actionPerformed(ActionEvent arg0) {
                 clicAIToggle(false);
             }
-
         });
         panelTop.add(chckbxBlackAI);
 
@@ -151,11 +141,50 @@ public class MyInterface extends JFrame {
     }
 
     public void instantiateSimu() {
-		if(game==null) {
+        // If a game already exists, stop it cleanly
+        if (game != null) {
+            // Disable AI to prevent interference
+            if (chckbxWhiteAI.isSelected()) {
+                game.toggleAI(true);
+                chckbxWhiteAI.setSelected(false);
+            }
+            if (chckbxBlackAI.isSelected()) {
+                game.toggleAI(false);
+                chckbxBlackAI.setSelected(false);
+            }
+
+            // Interrupt the game thread
+            game.interrupt();
+            try {
+                game.join(); // Wait for the thread to fully stop
+            } catch (InterruptedException e) {
+                System.err.println("Interrupted while waiting for game thread to stop: " + e.getMessage());
+                Thread.currentThread().interrupt(); // Restore interrupted status
+            }
+        }
+
+        // Reset UI state
+        if (panelDraw.isPieceAdderMode()) {
+            panelDraw.toggleAdderMode();
+        }
+        if (panelDraw.isPieceSelectorMode()) {
+            panelDraw.togglePieceSelector();
+        }
+
+        // Create a new game
         game = new Game(this);
         panelDraw.setGame(game);
+
+        // Reset the board to the default setup
+        game.setDefaultSetup();
+
+        // Start the new game thread on the EDT to ensure synchronization
+        SwingUtilities.invokeLater(() -> {
             game.start();
-		}
+            // Force an immediate UI update
+            panelDraw.repaint();
+            update(game.getTurnNumber(), game.isWhiteTurn());
+        });
     }
 
     public void clicButtonStart() {
@@ -165,6 +194,7 @@ public class MyInterface extends JFrame {
     public void clickButtonAdder() {
         panelDraw.toggleAdderMode();
     }
+
     public void clickButtonSelector() {
         panelDraw.togglePieceSelector();
     }
@@ -175,8 +205,8 @@ public class MyInterface extends JFrame {
         } else {
             game.undoLastMove();
         }
-
     }
+
     public void clicAIToggle(boolean isWhite) {
         if (game == null) {
             System.out.println("error: can't activate AI while no game present");
@@ -256,13 +286,11 @@ public class MyInterface extends JFrame {
     public void update(int turnCount, boolean turnIsWhite) {
         turnLabel.setText("Turn: " + turnCount + ", " + (turnIsWhite ? "White" : "Black"));
         actionLabel.setText(panelDraw.isPieceAdderMode() ? "Adding Piece" :
-			(panelDraw.isPieceSelectorMode()?"Selecting Piece to Add":
-				"Playing"));
+            (panelDraw.isPieceSelectorMode() ? "Selecting Piece to Add" : "Playing"));
         this.repaint();
     }
 
     public void eraseLabels() {
         this.setStepBanner("Turn: X");
     }
-
 }