working

app/src/main/java/chess/ConsoleMain.java

@@ -5,26 +5,17 @@ package chess;
 
 import chess.controller.CommandExecutor;
 import chess.controller.commands.NewGameCommand;
-import chess.model.ChessBoard;
 import chess.model.Game;
-import chess.simulator.PromoteTest;
 import chess.view.consolerender.Console;
 
 public class ConsoleMain {
     public static void main(String[] args) {
-        Game game = new Game(new ChessBoard());
+        Game game = new Game();
         CommandExecutor commandExecutor = new CommandExecutor(game);
 
-        PromoteTest promoteTest = new PromoteTest(commandExecutor);
-        commandExecutor.addListener(promoteTest);
-
         Console console = new Console(commandExecutor);
         commandExecutor.addListener(console);
         
-        promoteTest.onComplete.connect(() -> {
-            console.setCaptureInput(true);
-        });
-
         commandExecutor.executeCommand(new NewGameCommand());
     }
 }

app/src/main/java/chess/OpenGLMain.java

@@ -1,33 +0,0 @@
-package chess;
-
-import chess.ai.DumbAI;
-import chess.controller.CommandExecutor;
-import chess.controller.commands.NewGameCommand;
-import chess.controller.event.GameAdaptator;
-import chess.model.ChessBoard;
-import chess.model.Color;
-import chess.model.Game;
-import chess.pgn.PgnExport;
-import chess.view.render.Window;
-
-public class OpenGLMain {
-
-    public static void main(String[] args) {
-        Game game = new Game(new ChessBoard());
-        CommandExecutor commandExecutor = new CommandExecutor(game);
-
-        Window window = new Window(commandExecutor);
-        commandExecutor.addListener(window);
-
-        // DumbAI ai = new DumbAI(commandExecutor, Color.Black);
-        // commandExecutor.addListener(ai);
-
-        // DumbAI ai2 = new DumbAI(commandExecutor, Color.White);
-        // commandExecutor.addListener(ai2);
-
-        commandExecutor.executeCommand(new NewGameCommand());
-
-        window.run();
-    }
-
-}

app/src/main/java/chess/SwingMain.java

@@ -1,10 +1,11 @@
 package chess;
 
+import chess.ai.AlphaBetaAI;
 import chess.ai.DumbAI;
+import chess.ai.HungryAI;
 import chess.controller.CommandExecutor;
 import chess.controller.commands.NewGameCommand;
 import chess.controller.event.GameAdaptator;
-import chess.model.ChessBoard;
 import chess.model.Color;
 import chess.model.Game;
 import chess.pgn.PgnExport;
@@ -12,18 +13,21 @@ import chess.view.simplerender.Window;
 
 public class SwingMain {
 	public static void main(String[] args) {
-        Game game = new Game(new ChessBoard());
+        Game game = new Game();
         CommandExecutor commandExecutor = new CommandExecutor(game);
 
         Window window = new Window(commandExecutor, false);
         commandExecutor.addListener(window);
 
-        DumbAI ai = new DumbAI(commandExecutor, Color.Black);
+        DumbAI ai = new DumbAI(commandExecutor, Color.White);
         commandExecutor.addListener(ai);
 
-        DumbAI ai2 = new DumbAI(commandExecutor, Color.White);
+        AlphaBetaAI ai2 = new AlphaBetaAI(commandExecutor, Color.Black, 3);
         commandExecutor.addListener(ai2);
 
+        // Window window2 = new Window(ai2.getSimulation(), false);
+        // ai2.getSimulation().addListener(window2);
+
         commandExecutor.addListener(new GameAdaptator(){
             @Override
             public void onGameEnd() {

app/src/main/java/chess/ai/AI.java

@@ -0,0 +1,81 @@
+package chess.ai;
+
+import java.util.List;
+
+import chess.controller.Command;
+import chess.controller.CommandExecutor;
+import chess.controller.Command.CommandResult;
+import chess.controller.commands.GetPieceAtCommand;
+import chess.controller.commands.GetPlayerMovesCommand;
+import chess.controller.commands.GetAllowedCastlingsCommand;
+import chess.controller.commands.GetAllowedCastlingsCommand.CastlingResult;
+import chess.controller.event.GameAdaptator;
+import chess.model.Color;
+import chess.model.Coordinate;
+import chess.model.Move;
+import chess.model.Piece;
+
+public abstract class AI extends GameAdaptator{
+
+	protected final CommandExecutor commandExecutor;
+	protected final Color color;
+
+	public AI(CommandExecutor commandExecutor, Color color) {
+		this.commandExecutor = commandExecutor;
+		this.color = color;
+	}
+
+	protected abstract void play();
+	protected abstract void promote(Coordinate pawnCoords);
+
+	@Override
+	public void onPlayerTurn(Color color, boolean undone) {
+		if (this.color != color || undone)
+			return;
+
+		play();
+	}
+
+	@Override
+	public void onPromotePawn(Coordinate pieceCoords) {
+		Piece pawn = pieceAt(pieceCoords);
+		if (pawn.getColor() != this.color)
+			return;
+		promote(pieceCoords);
+	}
+
+	protected Piece pieceAt(Coordinate coordinate) {
+		GetPieceAtCommand command = new GetPieceAtCommand(coordinate);
+		sendCommand(command);
+		return command.getPiece();
+	}
+
+	protected List<Move> getAllowedMoves() {
+		return getAllowedMoves(this.commandExecutor);
+	}
+
+	protected List<Move> getAllowedMoves(CommandExecutor commandExecutor) {
+		GetPlayerMovesCommand cmd = new GetPlayerMovesCommand();
+		sendCommand(cmd, commandExecutor);
+		return cmd.getMoves();
+	}
+
+	protected CastlingResult getAllowedCastlings() {
+		GetAllowedCastlingsCommand cmd2 = new GetAllowedCastlingsCommand();
+		sendCommand(cmd2);
+		return cmd2.getCastlingResult();
+	}
+
+	protected CommandResult sendCommand(Command command) {
+		return sendCommand(command, this.commandExecutor);
+	}
+
+	protected CommandResult sendCommand(Command command, CommandExecutor commandExecutor) {
+		CommandResult result = commandExecutor.executeCommand(command);
+		if(result == CommandResult.NotAllowed){
+			System.out.println("eeeeee");
+		}
+		return result;
+	}
+	
+}

app/src/main/java/chess/ai/AlphaBetaAI.java

@@ -0,0 +1,162 @@
+package chess.ai;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import chess.controller.CommandExecutor;
+import chess.controller.commands.CastlingCommand;
+import chess.controller.commands.MoveCommand;
+import chess.controller.commands.NewGameCommand;
+import chess.controller.commands.PromoteCommand;
+import chess.controller.commands.PromoteCommand.PromoteType;
+import chess.controller.event.EmptyGameDispatcher;
+import chess.controller.commands.UndoCommand;
+import chess.model.ChessBoard;
+import chess.model.Color;
+import chess.model.Coordinate;
+import chess.model.Game;
+import chess.model.Move;
+
+public class AlphaBetaAI extends AI {
+
+	private final int searchDepth;
+	private final PieceCost pieceCost;
+	private final CommandExecutor simulation;
+	private final Game gameSimulation;
+
+	private final int GREAT_MOVE = -9999;
+	private final int HORRIBLE_MOVE = -GREAT_MOVE;
+
+	public AlphaBetaAI(CommandExecutor commandExecutor, Color color, int searchDepth) {
+		super(commandExecutor, color);
+		this.searchDepth = searchDepth;
+		this.pieceCost = new PieceCost(color);
+		this.gameSimulation = new Game();
+		this.simulation = new CommandExecutor(this.gameSimulation, new EmptyGameDispatcher());
+	}
+
+	public CommandExecutor getSimulation() {
+		return simulation;
+	}
+
+	private int getBoardEvaluation() {
+		final ChessBoard board = this.gameSimulation.getBoard();
+		int result = 0;
+		for (int i = 0; i < Coordinate.VALUE_MAX; i++) {
+			for (int j = 0; j < Coordinate.VALUE_MAX; j++) {
+				result += pieceCost.getCost(board.pieceAt(new Coordinate(i, j)));
+			}
+		}
+		if (this.gameSimulation.getPlayerTurn() != color)
+			return -result;
+		return result;
+	}
+
+	private int getEndGameEvaluation() {
+		Color currentTurn = this.gameSimulation.getPlayerTurn();
+		if (currentTurn == this.color) {
+			return HORRIBLE_MOVE;
+		} else {
+			if (this.gameSimulation.getBoard().isKingInCheck(currentTurn))
+				return GREAT_MOVE;
+			return getBoardEvaluation() - PieceCost.PAWN;
+		}
+	}
+
+	private void simulateMove(Move move) {
+		sendCommand(new MoveCommand(move), this.simulation);
+		if (this.gameSimulation.getBoard().pawnShouldBePromoted())
+			sendCommand(new PromoteCommand(PromoteType.Queen), this.simulation);
+	}
+
+	private void simulateUndo() {
+		sendCommand(new UndoCommand(), this.simulation);
+	}
+
+	private int negaMax(int depth, int alpha, int beta) {
+		if (depth == 0)
+			return getBoardEvaluation();
+
+		int value = Integer.MIN_VALUE;
+
+		List<Move> moves = getAllowedMoves(this.simulation);
+
+		if (moves.isEmpty())
+			return getEndGameEvaluation();
+
+		for (Move move : moves) {
+			simulateMove(move);
+			value = Integer.max(value, -negaMax(depth - 1, -beta, -alpha));
+			simulateUndo();
+			alpha = Integer.max(alpha, value);
+			if (alpha >= beta)
+				return value;
+		}
+
+		return value;
+	}
+
+	private Move getBestMove() {
+		List<Move> moves = getAllowedMoves(this.simulation);
+		int bestMove = Integer.MIN_VALUE;
+		List<Move> bestMoves = new ArrayList<>(20);
+
+		for (Move move : moves) {
+			simulateMove(move);
+			int value = -negaMax(this.searchDepth - 1, Integer.MIN_VALUE, Integer.MAX_VALUE);
+			simulateUndo();
+			if (value > bestMove) {
+				bestMove = value;
+				bestMoves.clear();
+				bestMoves.add(move);
+			} else if (value == bestMove) {
+				bestMoves.add(move);
+			}
+		}
+
+		System.out.println("Best move : " + bestMove + " count : " + bestMoves.size());
+
+		return bestMoves.get(new Random().nextInt(bestMoves.size()));
+	}
+
+	@Override
+	public void onGameStart() {
+		sendCommand(new NewGameCommand(), this.simulation);
+	}
+
+	@Override
+	public void onGameEnd() {
+		this.simulation.close();
+	}
+
+	@Override
+	public void onPawnPromoted(PromoteType promotion) {
+		sendCommand(new PromoteCommand(promotion), this.simulation);
+	}
+
+	@Override
+	public void onCastling(boolean bigCastling) {
+		sendCommand(new CastlingCommand(bigCastling), this.simulation);
+	}
+
+	@Override
+	public void onMove(Move move) {
+		sendCommand(new MoveCommand(move), this.simulation);
+	}
+
+	@Override
+	protected void play() {
+		long current = System.currentTimeMillis();
+		Move move = getBestMove();
+		long elapsed = System.currentTimeMillis() - current;
+		System.out.println("Took " + elapsed + "ms");
+		sendCommand(new MoveCommand(move));
+	}
+
+	@Override
+	protected void promote(Coordinate pawnCoords) {
+		sendCommand(new PromoteCommand(PromoteType.Queen));
+	}
+
+}

app/src/main/java/chess/ai/DumbAI.java

@@ -3,46 +3,28 @@ package chess.ai;
 import java.util.List;
 import java.util.Random;
 
-import chess.controller.Command;
 import chess.controller.CommandExecutor;
 import chess.controller.commands.CastlingCommand;
-import chess.controller.commands.GetAllowedCastlingsCommand;
-import chess.controller.commands.GetPieceAtCommand;
-import chess.controller.commands.GetPlayerMovesCommand;
+import chess.controller.commands.GetAllowedCastlingsCommand.CastlingResult;
 import chess.controller.commands.MoveCommand;
 import chess.controller.commands.PromoteCommand;
-import chess.controller.commands.GetAllowedCastlingsCommand.CastlingResult;
 import chess.controller.commands.PromoteCommand.PromoteType;
-import chess.controller.event.GameAdaptator;
 import chess.model.Color;
 import chess.model.Coordinate;
 import chess.model.Move;
-import chess.model.Piece;
 
-public class DumbAI extends GameAdaptator {
+public class DumbAI extends AI {
 
-	private final Color player;
-	private final CommandExecutor commandExecutor;
 	private final Random random = new Random();
 
 	public DumbAI(CommandExecutor commandExecutor, Color color) {
-		this.player = color;
-		this.commandExecutor = commandExecutor;
+		super(commandExecutor, color);
 	}
 
 	@Override
-	public void onPlayerTurn(Color color) {
-		if (color != player)
-			return;
-
-		GetPlayerMovesCommand cmd = new GetPlayerMovesCommand();
-		sendCommand(cmd);
-
-		GetAllowedCastlingsCommand cmd2 = new GetAllowedCastlingsCommand();
-		sendCommand(cmd2);
-
-		CastlingResult castlings = cmd2.getCastlingResult();
-		List<Move> moves = cmd.getMoves();
+	protected void play() {
+		CastlingResult castlings = getAllowedCastlings();
+		List<Move> moves = getAllowedMoves();
 
 		switch (castlings) {
 			case Both: {
@@ -53,20 +35,12 @@ public class DumbAI extends GameAdaptator {
 				return;
 			}
 
-			case Small: {
-				int randomMove = this.random.nextInt(moves.size() + 1);
-				if (randomMove != moves.size())
-					break;
-				this.commandExecutor.executeCommand(new CastlingCommand(false));
-				return;
-
-			}
-
+			case Small:
 			case Big: {
 				int randomMove = this.random.nextInt(moves.size() + 1);
 				if (randomMove != moves.size())
 					break;
-				this.commandExecutor.executeCommand(new CastlingCommand(true));
+				this.commandExecutor.executeCommand(new CastlingCommand(castlings == CastlingResult.Big));
 				return;
 			}
 
@@ -76,27 +50,12 @@ public class DumbAI extends GameAdaptator {
 
 		int randomMove = this.random.nextInt(moves.size());
 		this.commandExecutor.executeCommand(new MoveCommand(moves.get(randomMove)));
-
 	}
 
 	@Override
-	public void onPromotePawn(Coordinate pieceCoords) {
-		Piece pawn = pieceAt(pieceCoords);
-		if (pawn.getColor() != this.player)
-			return;
-
+	protected void promote(Coordinate pawnCoords) {
 		int promote = this.random.nextInt(PromoteType.values().length);
 		this.commandExecutor.executeCommand(new PromoteCommand(PromoteType.values()[promote]));
 	}
 
-	private Piece pieceAt(Coordinate coordinate) {
-		GetPieceAtCommand command = new GetPieceAtCommand(coordinate);
-		sendCommand(command);
-		return command.getPiece();
-	}
-
-	private void sendCommand(Command command) {
-		this.commandExecutor.executeCommand(command);
-	}
-
 }

app/src/main/java/chess/ai/HungryAI.java

@@ -0,0 +1,61 @@
+package chess.ai;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import chess.controller.CommandExecutor;
+import chess.controller.commands.MoveCommand;
+import chess.controller.commands.PromoteCommand;
+import chess.controller.commands.PromoteCommand.PromoteType;
+import chess.model.Color;
+import chess.model.Coordinate;
+import chess.model.Move;
+import chess.model.Piece;
+
+public class HungryAI extends AI {
+
+	private final PieceCost pieceCost;
+	private final Random random;
+
+	public HungryAI(CommandExecutor commandExecutor, Color color) {
+		super(commandExecutor, color);
+		this.pieceCost = new PieceCost(color);
+		this.random = new Random();
+	}
+
+	private int getMoveCost(Move move) {
+		Piece piece = pieceAt(move.getDeadPieceCoords());
+		return pieceCost.getCost(piece);
+	}
+
+	private List<Move> getBestMoves() {
+		List<Move> moves = getAllowedMoves();
+		List<Move> bestMoves = new ArrayList<>();
+		int bestCost = 0;
+		for (Move move : moves) {
+			int moveCost = getMoveCost(move);
+			if (moveCost == bestCost) {
+				bestMoves.add(move);
+			} else if (moveCost > bestCost) {
+				bestMoves.clear();
+				bestMoves.add(move);
+				bestCost = moveCost;
+			}
+		}
+		return bestMoves;
+	}
+
+	@Override
+	protected void play() {
+		List<Move> bestMoves = getBestMoves();
+		int randomMove = this.random.nextInt(bestMoves.size());
+		this.commandExecutor.executeCommand(new MoveCommand(bestMoves.get(randomMove)));
+	}
+
+	@Override
+	protected void promote(Coordinate pawnCoords) {
+		sendCommand(new PromoteCommand(PromoteType.Queen));
+	}
+
+}

app/src/main/java/chess/ai/PieceCost.java

@@ -0,0 +1,67 @@
+package chess.ai;
+
+import chess.model.Color;
+import chess.model.Piece;
+import chess.model.PieceVisitor;
+import chess.model.pieces.Bishop;
+import chess.model.pieces.King;
+import chess.model.pieces.Knight;
+import chess.model.pieces.Pawn;
+import chess.model.pieces.Queen;
+import chess.model.pieces.Rook;
+
+public class PieceCost implements PieceVisitor<Integer> {
+
+	private final Color player;
+
+	public static final int BISHOP = 3;
+	public static final int KING = 90;
+	public static final int KNIGHT = 3;
+	public static final int PAWN = 1;
+	public static final int QUEEN = 9;
+	public static final int ROOK = 5;
+
+	public PieceCost(Color color) {
+		this.player = color;
+	}
+
+	public int getCost(Piece piece) {
+		if (piece == null)
+			return 0;
+		int cost = visit(piece);
+		if (piece.getColor() != player)
+			cost = -cost;
+		return cost;
+	}
+
+	@Override
+	public Integer visitPiece(Bishop bishop) {
+		return BISHOP;
+	}
+
+	@Override
+	public Integer visitPiece(King king) {
+		return KING;
+	}
+
+	@Override
+	public Integer visitPiece(Knight knight) {
+		return KNIGHT;
+	}
+
+	@Override
+	public Integer visitPiece(Pawn pawn) {
+		return PAWN;
+	}
+
+	@Override
+	public Integer visitPiece(Queen queen) {
+		return QUEEN;
+	}
+
+	@Override
+	public Integer visitPiece(Rook rook) {
+		return ROOK;
+	}
+
+}

app/src/main/java/chess/controller/CommandExecutor.java

@@ -52,19 +52,21 @@ public class CommandExecutor {
 				return;
 
 			case Moved:
+				boolean notifyPlayerTurn = true;
 				this.dispatcher.onBoardUpdate();
 				if (checkGameStatus()) {
 					this.dispatcher.onGameEnd();
-					return;
+					notifyPlayerTurn = false;
 				}
-				switchPlayerTurn();
+				switchPlayerTurn(command instanceof UndoCommand, notifyPlayerTurn);
 				return;
 		}
 	}
 
-	private void switchPlayerTurn() {
+	private void switchPlayerTurn(boolean undone, boolean notifyPlayerTurn) {
 		this.game.switchPlayerTurn();
-		this.dispatcher.onPlayerTurn(this.game.getPlayerTurn());
+		if (notifyPlayerTurn)
+			this.dispatcher.onPlayerTurn(this.game.getPlayerTurn(), undone);
 	}
 
 	/**

app/src/main/java/chess/controller/commands/CastlingCommand.java

@@ -49,6 +49,8 @@ public class CastlingCommand extends PlayerCommand {
 		board.applyMove(this.kingMove);
 		board.applyMove(this.rookMove);
 
+		outputSystem.onCastling(this.bigCastling);
+
 		return CommandResult.Moved;
 	}
 

app/src/main/java/chess/controller/commands/MoveCommand.java

@@ -37,7 +37,6 @@ public class MoveCommand extends PlayerCommand {
 				return result;
 
 			case Moved:
-				outputSystem.onMove(this.move);
 				game.saveTraitPiecesPos();
 				return result;
 
@@ -76,11 +75,14 @@ public class MoveCommand extends PlayerCommand {
 		}
 
 		if (tryPromote(game, outputSystem)) {
+			outputSystem.onMove(this.move);
 			return CommandResult.ActionNeeded;
 		}
 
 		board.setLastMove(this.move);
 
+		outputSystem.onMove(this.move);
+
 		return CommandResult.Moved;
 	}
 

app/src/main/java/chess/controller/commands/NewGameCommand.java

@@ -51,7 +51,7 @@ public class NewGameCommand extends Command {
 		game.reset();
 
 		outputSystem.onGameStart();
-		outputSystem.onPlayerTurn(game.getPlayerTurn());
+		outputSystem.onPlayerTurn(game.getPlayerTurn(), false);
 
 		return CommandResult.NotMoved;
 	}

app/src/main/java/chess/controller/commands/PromoteCommand.java

@@ -55,6 +55,8 @@ public class PromoteCommand extends PlayerCommand {
 		this.oldPawn = pawn;
 		board.pieceComes(createPiece(this.promoteType, pawn.getColor()), this.pieceCoords);
 
+		outputSystem.onPawnPromoted(this.promoteType);
+
 		return CommandResult.Moved;
 	}
 

app/src/main/java/chess/controller/event/EmptyGameDispatcher.java

@@ -1,5 +1,6 @@
 package chess.controller.event;
 
+import chess.controller.commands.PromoteCommand.PromoteType;
 import chess.model.Color;
 import chess.model.Coordinate;
 import chess.model.Move;
@@ -43,7 +44,7 @@ public class EmptyGameDispatcher extends GameDispatcher {
 	}
 
 	@Override
-	public void onPlayerTurn(Color color) {
+	public void onPlayerTurn(Color color, boolean undone) {
 	}
 
 	@Override
@@ -58,4 +59,12 @@ public class EmptyGameDispatcher extends GameDispatcher {
 	public void onWin(Color winner) {
 	}
 
+	@Override
+	public void onCastling(boolean bigCastling) {
+	}
+
+	@Override
+	public void onPawnPromoted(PromoteType promotion) {
+	}
+
 }

app/src/main/java/chess/controller/event/GameAdaptator.java

@@ -1,5 +1,6 @@
 package chess.controller.event;
 
+import chess.controller.commands.PromoteCommand.PromoteType;
 import chess.model.Color;
 import chess.model.Coordinate;
 import chess.model.Move;
@@ -7,7 +8,7 @@ import chess.model.Move;
 public abstract class GameAdaptator implements GameListener {
 
 	@Override
-	public void onPlayerTurn(Color color) {}
+	public void onPlayerTurn(Color color, boolean undone) {}
 
 	@Override
 	public void onWin(Color color) {}
@@ -45,4 +46,10 @@ public abstract class GameAdaptator implements GameListener {
 	@Override
 	public void onDraw() {}
 
+	@Override
+	public void onCastling(boolean bigCastling) {}
+
+	@Override
+	public void onPawnPromoted(PromoteType promotion) {}
+
 }

app/src/main/java/chess/controller/event/GameDispatcher.java

@@ -6,6 +6,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.Consumer;
 
+import chess.controller.commands.PromoteCommand.PromoteType;
 import chess.model.Color;
 import chess.model.Coordinate;
 import chess.model.Move;
@@ -29,8 +30,8 @@ public class GameDispatcher implements GameListener {
 	}
 
 	@Override
-	public void onPlayerTurn(Color color) {
-		asyncForEachCall((l) -> l.onPlayerTurn(color));
+	public void onPlayerTurn(Color color, boolean undone) {
+		asyncForEachCall((l) -> l.onPlayerTurn(color, undone));
 	}
 
 	@Override
@@ -93,6 +94,16 @@ public class GameDispatcher implements GameListener {
 		asyncForEachCall((l) -> l.onDraw());
 	}
 
+	@Override
+	public void onCastling(boolean bigCastling) {
+		asyncForEachCall((l) -> l.onCastling(bigCastling));		
+	}
+
+	@Override
+	public void onPawnPromoted(PromoteType promotion) {
+		asyncForEachCall((l) -> l.onPawnPromoted(promotion));
+	}
+
 	public void stopService() {
 		this.executor.shutdown();
 	}

app/src/main/java/chess/controller/event/GameListener.java

@@ -1,5 +1,6 @@
 package chess.controller.event;
 
+import chess.controller.commands.PromoteCommand.PromoteType;
 import chess.model.Color;
 import chess.model.Coordinate;
 import chess.model.Move;
@@ -38,12 +39,14 @@ public interface GameListener {
 
 	/**
 	 * Invoked when a valid move on the board occurs
+	 * 
 	 * @param move the move to be processed
 	 */
 	void onMove(Move move);
 
 	/**
 	 * Invoked when a sent move is not allowed
+	 * 
 	 * @param move the move to be processed
 	 */
 	void onMoveNotAllowed(Move move);
@@ -55,26 +58,46 @@ public interface GameListener {
 
 	/**
 	 * Invoked when it's the player turn
+	 * 
 	 * @param color  the color of the player who should play
+	 * @param undone true if it's a result of an undo command
 	 */
-	void onPlayerTurn(Color color);
+	void onPlayerTurn(Color color, boolean undone);
 
 	/**
 	 * Invoked when a pawn should be promoted
+	 * 
 	 * @param pieceCoords the coordinates of the pawn
 	 */
 	void onPromotePawn(Coordinate pieceCoords);
 
 	/**
 	 * Invoked when a players surrenders
+	 * 
 	 * @param coward the player who gave up
 	 */
 	void onSurrender(Color coward);
 
 	/**
 	 * Invoked when a player wins (by checkmate or if the other one surrenders)
+	 * 
 	 * @param winner
 	 */
 	void onWin(Color winner);
 
+	/**
+	 * Invoked when a castling is done
+	 * 
+	 * @param bigCastling if it's queen side castling
+	 */
+	void onCastling(boolean bigCastling);
+
+	/**
+	 * Invoked when a pawn is promoted
+	 * 
+	 * @param promotion the type of promotion
+	 * @param player the player who promoted the pawns
+	 */
+	void onPawnPromoted(PromoteType promotion);
+
 }

app/src/main/java/chess/model/Game.java

@@ -20,8 +20,8 @@ public class Game {
 		Draw, Check, CheckMate, OnGoing, Pat;
 	}
 
-	public Game(ChessBoard board) {
-		this.board = board;
+	public Game() {
+		this.board = new ChessBoard();
 		this.movesHistory = new Stack<>();
 		this.traitsPos = new HashMap<>();
 	}
@@ -70,24 +70,26 @@ public class Game {
 		playerTurn = Color.getEnemy(playerTurn);
 	}
 
-	public GameStatus checkGameStatus() {
-		final Color enemy = Color.getEnemy(getPlayerTurn());
-
+	public GameStatus checkGameStatus(Color color) {
 		if (checkDraw())
 			return GameStatus.Draw;
 
-		if (this.board.isKingInCheck(enemy))
-			if (this.board.hasAllowedMoves(enemy))
+		if (this.board.isKingInCheck(color))
+			if (this.board.hasAllowedMoves(color))
 				return GameStatus.Check;
 			else
 				return GameStatus.CheckMate;
 
-		if (!board.hasAllowedMoves(enemy))
+		if (!board.hasAllowedMoves(color))
 			return GameStatus.Pat;
 
 		return GameStatus.OnGoing;
 	}
 
+	public GameStatus checkGameStatus() {
+		return checkGameStatus(Color.getEnemy(getPlayerTurn()));
+	}
+
 	public void addAction(PlayerCommand command) {
 		this.movesHistory.add(command);
 	}

app/src/main/java/chess/pgn/PgnExport.java

@@ -11,7 +11,6 @@ import chess.controller.commands.MoveCommand;
 import chess.controller.commands.NewGameCommand;
 import chess.controller.commands.PromoteCommand;
 import chess.controller.event.EmptyGameDispatcher;
-import chess.model.ChessBoard;
 import chess.model.Color;
 import chess.model.Coordinate;
 import chess.model.Game;
@@ -22,7 +21,7 @@ import chess.model.pieces.Pawn;
 public class PgnExport {
 
 	// public static void main(String[] args) {
-	// 	final Game game = new Game(new ChessBoard());
+	// 	final Game game = new Game();
 	// 	final CommandExecutor commandExecutor = new CommandExecutor(game);
 
 	// 	DumbAI ai1 = new DumbAI(commandExecutor, Color.White);
@@ -138,7 +137,7 @@ public class PgnExport {
 	}
 
 	private static String checkCheckMate(Game game) {
-		switch (game.checkGameStatus()) {
+		switch (game.checkGameStatus(game.getPlayerTurn())) {
 			case CheckMate:
 				return "#";
 
@@ -190,8 +189,7 @@ public class PgnExport {
 
 	public static String exportGame(Game game) {
 
-		ChessBoard board = new ChessBoard();
-		Game virtualGame = new Game(board);
+		Game virtualGame = new Game();
 
 		CommandExecutor executor = new CommandExecutor(virtualGame, new EmptyGameDispatcher());
 		executor.executeCommand(new NewGameCommand());

app/src/main/java/chess/view/consolerender/Console.java

@@ -20,12 +20,17 @@ public class Console implements GameListener {
     private final Scanner scanner = new Scanner(System.in);
     private final CommandExecutor commandExecutor;
     private final ConsolePieceName consolePieceName = new ConsolePieceName();
-    private boolean captureInput = false;
+    private boolean captureInput;
     private final ExecutorService executor;
 
-    public Console(CommandExecutor commandExecutor) {
+    public Console(CommandExecutor commandExecutor, boolean captureInput) {
         this.commandExecutor = commandExecutor;
         this.executor = Executors.newSingleThreadExecutor();
+        this.captureInput = captureInput;
+    }
+
+    public Console(CommandExecutor commandExecutor) {
+        this(commandExecutor, true);
     }
 
     private Piece pieceAt(int x, int y) {
@@ -61,7 +66,7 @@ public class Console implements GameListener {
     }
 
     @Override
-    public void onPlayerTurn(Color color) {
+    public void onPlayerTurn(Color color, boolean undone) {
         if (!captureInput)
             return;
         System.out.println(Colors.RED + "Player turn: " + color + Colors.RESET);
@@ -328,4 +333,11 @@ public class Console implements GameListener {
         this.captureInput = captureInput;
     }
 
+    @Override
+    public void onCastling(boolean bigCastling) {}
+
+    @Override
+    public void onPawnPromoted(PromoteType promotion) {}
+    
+
 }

app/src/main/java/chess/view/render/Renderer.java

@@ -3,7 +3,6 @@ package chess.view.render;
 import org.joml.Vector3f;
 import org.lwjgl.opengl.*;
 
-import chess.model.Coordinate;
 import chess.view.render.shader.BoardShader;
 
 import static org.lwjgl.opengl.GL30.*;
@@ -60,42 +59,16 @@ public class Renderer {
 		return positions;
 	}
 
-	private Coordinate GetCellFromColor(Vector3f color) {
-		int offset = 1;
-
-		if (color.x > 0.5) {
-			color = new Vector3f(1.0f, 1.0f, 1.0f).sub(color);
-			offset = 0;
-		}
-
-		int r = (int) (color.x * 255.0f);
-		int g = (int) (color.y * 255.0f);
-		int b = (int) (color.z * 255.0f);
-
-		int index = (r + g + b) * 2 + offset;
-
-		return Coordinate.fromIndex(index);
-	}
-
-	private Vector3f GetCellColor(int x, int y) {
-		float index = (y * BOARD_WIDTH + x) / 2.0f;
-		float r = (int) (index / 3) / 255.0f;
-		float g = (int) ((index + 1) / 3) / 255.0f;
-		float b = (int) ((index + 2) / 3) / 255.0f;
-		if ((x + y) % 2 != 0) {
-			System.out.println(GetCellFromColor(new Vector3f(1.0f - r - 1.0f / 255.0f, 1.0f - g - 1.0f / 255.0f, 1.0f - b - 1.0f / 255.0f)));
-			return new Vector3f(1.0f - r - 1.0f / 255.0f, 1.0f - g - 1.0f / 255.0f, 1.0f - b - 1.0f / 255.0f);
-		} else {
-			System.out.println(GetCellFromColor(new Vector3f(r, g, b)));
-			return new Vector3f(r, g, b);
-		}
-	}
-
 	private float[] GetBoardColors() {
 		float[] colors = new float[BOARD_SIZE * SQUARE_VERTEX_COUNT * 3];
-		for (int j = 0; j < BOARD_HEIGHT; j++) {
 		for (int i = 0; i < BOARD_WIDTH; i++) {
-				Vector3f color = GetCellColor(i, j);
+			for (int j = 0; j < BOARD_HEIGHT; j++) {
+				Vector3f color;
+				if ((i + j) % 2 != 0) {
+					color = new Vector3f(1.0f, 1.0f, 1.0f);
+				} else {
+					color = new Vector3f(0.0f, 0.0f, 0.0f);
+				}
 				int squareIndex = i * BOARD_WIDTH + j;
 				for (int k = 0; k < SQUARE_VERTEX_COUNT; k++) {
 					colors[squareIndex * SQUARE_VERTEX_COUNT * 3 + k * 3] = color.x;
@@ -136,12 +109,6 @@ public class Renderer {
 		this.vao.Unbind();
 	}
 
-	public Coordinate GetSelectedCell() {
-		float pixels[] = new float[3];
-		GL30.glReadPixels(500, 500, 1, 1, GL_RGB, GL_FLOAT, pixels);
-		return GetCellFromColor(new Vector3f(pixels[0], pixels[1], pixels[2]));
-	}
-
 	public void Render(Camera cam) {
 		this.shader.Start();
 		this.shader.SetCamMatrix(cam.getMatrix());

app/src/main/java/chess/view/render/Window.java

@@ -5,12 +5,6 @@ import org.lwjgl.glfw.*;
 import org.lwjgl.opengl.*;
 import org.lwjgl.system.*;
 
-import chess.controller.CommandExecutor;
-import chess.controller.event.GameListener;
-import chess.model.Color;
-import chess.model.Coordinate;
-import chess.model.Move;
-
 import java.nio.*;
 
 import static org.lwjgl.glfw.Callbacks.*;
@@ -19,20 +13,17 @@ import static org.lwjgl.opengl.GL11.*;
 import static org.lwjgl.system.MemoryStack.*;
 import static org.lwjgl.system.MemoryUtil.*;
 
-public class Window implements GameListener{
+public class Window {
 
 	// The window handle
 	private long window;
 
-	private final CommandExecutor commandExecutor;
-
 	private Renderer renderer;
 	private Camera cam;
 
-	public Window(CommandExecutor commandExecutor) {
+	public Window() {
 		this.renderer = new Renderer();
 		this.cam = new Camera();
-		this.commandExecutor = new CommandExecutor();
 	}
 
 	public void run() {
@@ -123,8 +114,6 @@ public class Window implements GameListener{
 
 			render();
 
-			System.out.println(this.renderer.GetSelectedCell());
-
 			glfwSwapBuffers(window); // swap the color buffers
 
 			// Poll for window events. The key callback above will only be
@@ -143,82 +132,4 @@ public class Window implements GameListener{
 		}
 	}
 
-	@Override
-	public void onBoardUpdate() {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException("Unimplemented method 'onBoardUpdate'");
-	}
-
-	@Override
-	public void onDraw() {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException("Unimplemented method 'onDraw'");
-	}
-
-	@Override
-	public void onGameEnd() {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException("Unimplemented method 'onGameEnd'");
-	}
-
-	@Override
-	public void onGameStart() {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException("Unimplemented method 'onGameStart'");
-	}
-
-	@Override
-	public void onKingInCheck() {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException("Unimplemented method 'onKingInCheck'");
-	}
-
-	@Override
-	public void onKingInMat() {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException("Unimplemented method 'onKingInMat'");
-	}
-
-	@Override
-	public void onMove(Move move) {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException("Unimplemented method 'onMove'");
-	}
-
-	@Override
-	public void onMoveNotAllowed(Move move) {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException("Unimplemented method 'onMoveNotAllowed'");
-	}
-
-	@Override
-	public void onPatSituation() {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException("Unimplemented method 'onPatSituation'");
-	}
-
-	@Override
-	public void onPlayerTurn(Color color) {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException("Unimplemented method 'onPlayerTurn'");
-	}
-
-	@Override
-	public void onPromotePawn(Coordinate pieceCoords) {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException("Unimplemented method 'onPromotePawn'");
-	}
-
-	@Override
-	public void onSurrender(Color coward) {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException("Unimplemented method 'onSurrender'");
-	}
-
-	@Override
-	public void onWin(Color winner) {
-		// TODO Auto-generated method stub
-		throw new UnsupportedOperationException("Unimplemented method 'onWin'");
-	}
-
 }

app/src/main/java/chess/view/simplerender/Window.java

@@ -213,7 +213,7 @@ public class Window extends JFrame implements GameListener {
 	}
 
 	@Override
-	public void onPlayerTurn(chess.model.Color color) {
+	public void onPlayerTurn(chess.model.Color color, boolean undone) {
 		this.displayText.setText("Current turn: " + color);
 		updateButtons();
 	}
@@ -318,4 +318,10 @@ public class Window extends JFrame implements GameListener {
 		JOptionPane.showMessageDialog(this, "Same position was repeated three times. It's a draw!");
 	}
 
+	@Override
+	public void onCastling(boolean bigCastling) {}
+
+	@Override
+	public void onPawnPromoted(PromoteType promotion) {}
+
 }

app/src/test/java/chess/AppTest.java

@@ -3,24 +3,20 @@
  */
 package chess;
 
+import org.junit.jupiter.api.Test;
+
 import chess.ai.DumbAI;
 import chess.controller.Command;
 import chess.controller.CommandExecutor;
 import chess.controller.commands.NewGameCommand;
 import chess.controller.commands.UndoCommand;
 import chess.controller.event.GameAdaptator;
-import chess.model.*;
-import chess.model.pieces.*;
-import chess.simulator.Simulator;
-import chess.view.simplerender.Window;
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-import java.util.Objects;
+import chess.model.Color;
+import chess.model.Game;
 
 class AppTest {
     @Test void functionalRollback(){
-        Game game = new Game(new ChessBoard());
+        Game game = new Game();
         CommandExecutor commandExecutor = new CommandExecutor(game);
 
         DumbAI ai = new DumbAI(commandExecutor, Color.Black);
@@ -38,9 +34,9 @@ class AppTest {
                     result = commandExecutor.executeCommand(new UndoCommand());
                 } while (result != Command.CommandResult.NotAllowed);
 
-                Game initialGame = new Game(new ChessBoard());
+                Game initialGame = new Game();
                 CommandExecutor initialCommandExecutor = new CommandExecutor(initialGame);
-                commandExecutor.executeCommand(new NewGameCommand());
+                initialCommandExecutor.executeCommand(new NewGameCommand());
 
                 assert(game.getBoard().equals(initialGame.getBoard()));