some cleanup

Author: h908714124

src/main/client/src/Game.jsx

@@ -45,7 +45,6 @@ export const Game = () => {
   let auth = useAuthStore(state => state.auth)
   let setGameState = useGameStore(state => state.setGameState)
   let queueStatus = useGameStore(state => state.queueStatus)
-  let queueLength = useGameStore(state => state.queueLength)
   let addMove = useGameStore(state => state.addMove)
   let currentPlayer = useGameStore(state => state.currentPlayer)
   let counting = useGameStore(state => state.counting)
@@ -166,12 +165,11 @@ export const Game = () => {
       destination: "/app/game/move",
       body: JSON.stringify({
         id: gameId,
-        n: queueLength(),
         x: cursor_x,
         y: cursor_y,
       }),
     })
-  }, [context, currentPlayer, currentColor, auth, board, gameId, stompClient, counting, forbidden_x, forbidden_y, queueLength, gameHasEnded])
+  }, [context, currentPlayer, currentColor, auth, board, gameId, stompClient, counting, forbidden_x, forbidden_y, gameHasEnded])
 
   useEffect(() => {
     if (!board.length) {

src/main/client/src/feature/GamePanel.jsx

@@ -62,31 +62,28 @@ function Panel({zoom, setZoom}) {
       destination: "/app/game/move",
       body: JSON.stringify({
         id: gameId,
-        n: queueLength(),
         pass: true,
       }),
     })
-  }, [stompClient, gameId, queueLength])
+  }, [stompClient, gameId])
   let onResetCounting = useCallback(() => {
     stompClient.publish({
       destination: "/app/game/move",
       body: JSON.stringify({
         id: gameId,
-        n: queueLength(),
         resetCounting: true,
       }),
     })
-  }, [stompClient, gameId, queueLength])
+  }, [stompClient, gameId])
   let onCountingAgree = useCallback(() => {
     stompClient.publish({
       destination: "/app/game/move",
       body: JSON.stringify({
         id: gameId,
-        n: queueLength(),
         agreeCounting: true,
       }),
     })
-  }, [stompClient, gameId, queueLength])
+  }, [stompClient, gameId])
   if (!board.length) {
     return <span>Loading...</span>
   }

src/main/java/com/bernd/GameController.java

@@ -11,6 +11,8 @@
 import com.bernd.model.ViewGame;
 import com.bernd.util.Auth;
 import com.bernd.util.RandomString;
+import java.security.Principal;
+import java.util.Objects;
 import org.springframework.http.ResponseEntity;
 import org.springframework.messaging.core.MessageSendingOperations;
 import org.springframework.messaging.handler.annotation.MessageMapping;
@@ -21,8 +23,6 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.security.Principal;
-
 @Controller
 public class GameController {
 
@@ -55,40 +55,44 @@ public ViewGame getGame(@PathVariable String id) {
   @MessageMapping("/game/move")
   public void action(Move move, Principal p) {
     Game game = games.get(move.id());
-    if (game == null) {
+    if (p == null || game == null) {
       return;
     }
-    String principal = p.getName();
-    MoveList moves = game.moves();
-    int moveNumber = moves.size();
+    String principal = Objects.toString(p.getName(), "");
     int color = principal.equals(game.black().name()) ? Board.B :
         principal.equals(game.white().name()) ? Board.W : 0;
-    if (color == 0) {
+    if (!canMove(game, color)) {
       return;
     }
-    if (!game.counting()) {
-      if (moves.isEmpty()) {
-        if (color == Board.W) {
-          return;
-        }
-      } else {
-        GameMove lastMove = moves.get(moves.size() - 1);
-        if (lastMove.color() == color) {
-          return;
-        }
-      }
-      if (move.n() != moveNumber) {
-        return;
-      }
-    }
-    Move updatedMove = move.withColor(color);
+    Move updatedMove = move.withColor(color).withMoveNumber(game.moves().size());
     Game updated = game.update(updatedMove);
     games.put(updated);
     if (updated.gameHasEnded()) {
       operations.convertAndSend("/topic/move/" + game.id(), updatedMove.gameEnd(updated.counting()));
     } else if (!move.agreeCounting()) {
-      operations.convertAndSend("/topic/move/" + game.id(), updatedMove.toView(updated.counting()));
+      operations.convertAndSend("/topic/move/" + game.id(), updatedMove.toGameMove(updated.counting()));
+    }
+  }
+
+  private boolean canMove(Game game, int color) {
+    if (game.gameHasEnded()) {
+      return false;
+    }
+    if (color == 0) {
+      return false;
+    }
+    MoveList moves = game.moves();
+    if (game.counting()) {
+      return true;
+    }
+    if (game.handicap() != 0) {
+      return color == Board.B;
+    }
+    if (moves.isEmpty()) {
+      return color == Board.B;
     }
+    GameMove lastMove = moves.get(moves.size() - 1);
+    return color != lastMove.color();
   }
 
   @ResponseBody

src/main/java/com/bernd/game/MoveList.java

@@ -2,137 +2,47 @@
 
 import com.bernd.model.GameMove;
 import com.bernd.model.Move;
-
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import static com.bernd.util.Util.divUp;
-
 public final class MoveList {
 
-  private static final int LO = 0xffff;
-  private static final int HI = 0xffff0000;
-  private static final int WHITE = 0x1000;
-  private static final int PASS = 0x2000;
-  private static final int COUNTING = 0x4000;
-  private static final int GAME_END = 0x8000;
-  private static final int DATA = 0x0fff;
-
-  private int pos;
-  private int capacity;
-  private final int dim;
-  private int[] buffer;
+  private final List<GameMove> moves;
 
-  private MoveList(
-      int dim,
-      int[] buffer) {
-    this.capacity = 2 * buffer.length;
-    this.dim = dim;
-    this.buffer = buffer;
+  private MoveList(List<GameMove> moves) {
+    this.moves = moves;
   }
 
-  public static MoveList create(int dim, int size) {
-    return new MoveList(dim, new int[divUp(size, 2)]);
-  }
-
-  public static MoveList create(int dim) {
-    return new MoveList(dim, new int[16]);
+  public static MoveList create(int size) {
+    return new MoveList(new ArrayList<>(size));
   }
 
   public void addGameEndMarker() {
-    ensureCapacity();
-    set(GAME_END);
-    pos++;
+    moves.add(new GameMove(moves.size(), 0, true, -1, -1, true, false, true));
   }
 
   public void add(Move move, boolean counting) {
-    ensureCapacity();
-    int ptId;
-    if (move.pass()) {
-      ptId = PASS;
-    } else {
-      ptId = dim * move.y() + move.x();
-    }
-    if (move.color() == Board.W) {
-      ptId |= WHITE;
-    }
-    if (counting) {
-      ptId |= COUNTING;
-    }
-    set(ptId);
-    pos++;
-  }
-
-  private void ensureCapacity() {
-    if (pos >= capacity) {
-      int boardSize = dim * dim;
-      int newCapacity = capacity < boardSize ? boardSize : capacity + boardSize;
-      buffer = Arrays.copyOf(buffer, divUp(newCapacity, 2));
-      capacity = newCapacity;
-    }
+    moves.add(move.toGameMove(counting));
   }
 
   public GameMove get(int i) {
-    int code = buffer[i / 2];
-    int ptId = i % 2 == 0 ? code & LO : (code >> 16);
-    int color = (ptId & WHITE) != 0 ? Board.W : Board.B;
-    if ((ptId & GAME_END) != 0) {
-      return new GameMove(i, 0, true, -1, -1, true, false, true);
-    }
-    boolean counting = (ptId & COUNTING) != 0;
-    if ((ptId & PASS) != 0) {
-      return new GameMove(i, color, true, -1, -1, counting, false, false);
-    } else {
-      int data = ptId & DATA;
-      int x = data % dim;
-      int y = data / dim;
-      return new GameMove(i, color, false, x, y, counting, false, false);
-    }
+    return moves.get(i);
   }
 
   public boolean isEmpty() {
-    return pos == 0;
-  }
-
-  private void set(int ptId) {
-    int i = pos / 2;
-    if (pos % 2 == 0) {
-      buffer[i] = (buffer[i] & HI) | ptId;
-    } else {
-      buffer[i] = (ptId << 16) | (buffer[i] & LO);
-    }
+    return moves.isEmpty();
   }
 
   public int size() {
-    return pos;
+    return moves.size();
   }
 
   public List<GameMove> asList() {
-    List<GameMove> result = new ArrayList<>(size());
-    for (int i = 0; i < pos; i++) {
-      result.add(get(i));
-    }
-    return result;
-  }
-
-  public int dim() {
-    return dim;
+    return List.copyOf(moves);
   }
 
   @Override
   public String toString() {
-    if (pos == 0) {
-      return "[]";
-    }
-    StringBuilder sb = new StringBuilder("[");
-    for (int i = 0; i < pos; i++) {
-      sb.append("(")
-          .append(get(i))
-          .append("), ");
-    }
-    sb.setLength(sb.length() - 2);
-    sb.append("]");
-    return sb.toString();
+    return moves.toString();
   }
 }

src/main/java/com/bernd/model/Game.java

@@ -49,24 +49,19 @@ private Game updateInternal(Move move) {
     }
     moves.add(move, counting);
     if (counting) {
-      if (move.resetCounting()) {
-        int[][] resetted = Toggle.resetCounting(board);
-        return toBuilder()
-            .withBoard(Count.count(resetted))
-            .withForbidden(NOT_FORBIDDEN)
-            .build();
-      }
-      int[][] toggled = Toggle.toggleStonesAt(board, move.x(), move.y());
+      int[][] updated = move.resetCounting() ?
+          Toggle.resetCounting(board) :
+          Toggle.toggleStonesAt(board, move.x(), move.y());
       return toBuilder()
-          .withBoard(Count.count(toggled))
+          .withBoard(Count.count(updated))
           .withForbidden(NOT_FORBIDDEN)
           .build();
     }
     if (move.pass()) {
       if (opponentPassed) {
         return toBuilder()
-            .withBoard(Count.count(board))
             .withCounting(true)
+            .withBoard(Count.count(board))
             .withForbidden(NOT_FORBIDDEN)
             .build();
       }
@@ -85,11 +80,13 @@ private Game updateInternal(Move move) {
       return toBuilder()
           .withBoard(result)
           .withForbidden(direction.moveX(x), direction.moveY(y))
+          .withOpponentPassed(false)
           .build();
     }
     return toBuilder()
         .withBoard(result)
         .withForbidden(NOT_FORBIDDEN)
+        .withOpponentPassed(false)
         .build();
   }
 

src/main/java/com/bernd/model/Move.java

@@ -10,7 +10,7 @@ public record Move(
     int x,
     int y) {
 
-  public GameMove toView(boolean counting) {
+  public GameMove toGameMove(boolean counting) {
     return new GameMove(n, color, pass, x, y, counting, resetCounting, false);
   }
 
@@ -21,4 +21,8 @@ public GameMove gameEnd(boolean counting) {
   public Move withColor(int color) {
     return new Move(id, color, n, pass, resetCounting, agreeCounting, x, y);
   }
+
+  public Move withMoveNumber(int n) {
+    return new Move(id, color, n, pass, resetCounting, agreeCounting, x, y);
+  }
 }