make turn counter and win state more robust

src/randomtestfive/chess3d/graphics/MainDisplay.java

@@ -1,6 +1,7 @@
 package randomtestfive.chess3d.graphics;
 
 
+import java.awt.Graphics;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -16,50 +17,63 @@
 import randomtestfive.chess3d.core.pieces.ChessPiece;
 import randomtestfive.chess3d.core.pieces.King;
 
-public class MainDisplay {
-	public JFrame frame;
-	JPanel boards;
+public class MainDisplay extends JFrame {
+	private static final long serialVersionUID = 1L;
+	private JPanel boards;
+	private Board b;
 
 	public MainDisplay(Board b) {
-		frame = new JFrame("3D Chess (NOT READY)");
+		super("3D Chess (NOT READY)");
+		this.b = b;
 		boards = new JPanel();
 		boards.setLayout(new BoxLayout(boards, BoxLayout.X_AXIS));
-		boards.add(new SubboardDisplay(false, b, 4));
+		boards.add(new SubboardDisplay(false, b, 4, this::repaint));
 		boards.add(Box.createHorizontalStrut(10));
-		boards.add(new SubboardDisplay(true, b, 3));
+		boards.add(new SubboardDisplay(true, b, 3, this::repaint));
 		boards.add(Box.createHorizontalStrut(10));
-		boards.add(new SubboardDisplay(false, b, 2));
+		boards.add(new SubboardDisplay(false, b, 2, this::repaint));
 		boards.add(Box.createHorizontalStrut(10));
-		boards.add(new SubboardDisplay(true, b, 1));
+		boards.add(new SubboardDisplay(true, b, 1, this::repaint));
 		boards.add(Box.createHorizontalStrut(10));
-		boards.add(new SubboardDisplay(false, b, 0));
-		frame.getContentPane().setLayout(new BoxLayout(frame.getContentPane(), BoxLayout.Y_AXIS));
-		JLabel turn = new JLabel("Turn: 1 - WHITE");
+		boards.add(new SubboardDisplay(false, b, 0, this::repaint));
+		getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS));
+		JLabel turn = new JLabel("Turn: 1 - WHITE") {
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public void paint(Graphics g) {
+				setText("Turn: "+Globals.getTurn()+" - "+Player.values()[Globals.getTurn()%2]);
+				super.paint(g);
+			}
+		};
 		turn.setHorizontalAlignment(JLabel.LEFT);
 		turn.setAlignmentX(-1);
 		boards.setAlignmentX(-1);
-		frame.add(turn);
-		frame.add(boards);
-		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		frame.pack();
-		frame.setVisible(true);
+		add(turn);
+		add(boards);
+		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		pack();
+		setVisible(true);
 		new Thread(()->{
 			while(!Globals.getReady()) {
 				Thread.yield();
 			}
-			frame.setTitle("3D Chess - "+Globals.getPlayer());
-			while(true) {
-				turn.setText("Turn: "+Globals.getTurn()+" - "+Player.values()[Globals.getTurn()%2]);
-				Set<ChessPiece> kings = b.getPieces().stream()
-						.filter(p->p instanceof King)
-						.collect(Collectors.toSet());
-				if(kings.size()<2) {
-					Globals.done();
-					JOptionPane.showMessageDialog(frame, kings.stream().findFirst().get().getOwner()+" WINS");
-					System.exit(0);
-				}
-				Thread.yield();
-			}
+			setTitle("3D Chess - "+Globals.getPlayer());
 		}).start();
 	}
+
+	@Override
+	public void paint(Graphics g) {
+		super.paint(g);
+		if(b!=null) {
+			Set<ChessPiece> kings = b.getPieces().stream()
+					.filter(p->p instanceof King)
+					.collect(Collectors.toSet());
+			if(kings.size()<2) {
+				Globals.done();
+				JOptionPane.showMessageDialog(this, kings.stream().findFirst().get().getOwner()+" WINS");
+				System.exit(0);
+			}
+		}
+	}
 }

src/randomtestfive/chess3d/graphics/Startup.java

@@ -57,10 +57,11 @@ public void actionPerformed(ActionEvent arg0) {
 		}
 		Board b = new Board();
 		b.getPieces().addAll(StartPieces.getStartPieces());
+
 		MainDisplay md = new MainDisplay(b);
 
 		if(!arg0.getSource().equals(local)) {
-			new Chess3DClient(text.getText(), b, md.boards::repaint);
+			new Chess3DClient(text.getText(), b, md::repaint);
 		} else {
 			Globals.setPlayer(Player.WHITE);
 			Globals.ready();

src/randomtestfive/chess3d/graphics/SubboardDisplay.java

@@ -29,8 +29,9 @@ public class SubboardDisplay extends JPanel implements MouseListener, MouseMotio
 	private Board board;
 	private int layer;
 	private static Map<String, BufferedImage[]> sprites;
+	private final Runnable callback;
 
-	public SubboardDisplay(boolean invert, Board b, int layer) {
+	public SubboardDisplay(boolean invert, Board b, int layer, Runnable c) {
 		super();
 		//setSize(100, 100);
 		this.invert = invert;
@@ -60,6 +61,8 @@ public SubboardDisplay(boolean invert, Board b, int layer) {
 		addMouseListener(this);
 		addMouseMotionListener(this);
 		setPreferredSize(new Dimension(320, 320));
+
+		callback = c;
 	}
 
 	@Override
@@ -107,6 +110,7 @@ public void mouseClicked(MouseEvent e) {
 					Globals.commitMove(piece.getPosition(), p);
 					Globals.nextTurn();
 					piece.moveTo(p,board.getPieces());
+					callback.run();
 				});
 			Globals.setSelection(null);
 		} else {