figure movement wip

client/src/main/java/org/schlunzis/kurtama/client/fx/TilePane.java

@@ -2,18 +2,29 @@
 
 import javafx.scene.control.Label;
 import javafx.scene.layout.AnchorPane;
+import lombok.extern.slf4j.Slf4j;
+import org.schlunzis.kurtama.client.service.IGameService;
 import org.schlunzis.kurtama.common.game.model.ITileDTO;
 
-
+@Slf4j
 public class TilePane extends AnchorPane {
 
+    private final IGameService gameService;
+
     private final Label label = new Label();
     private ITileDTO tileDTO;
 
-    public TilePane(ITileDTO tileDTO) {
+    public TilePane(ITileDTO tileDTO, IGameService gameService) {
         this.tileDTO = tileDTO;
+        this.gameService = gameService;
         label.setText(String.valueOf(tileDTO.id()));
         getChildren().add(label);
+        if (!tileDTO.figures().isEmpty())
+            this.setStyle("-fx-background-color: red;");
+        this.setOnMouseClicked(event -> {
+            log.info("Tile " + tileDTO.id() + " clicked");
+            gameService.sendMoveRequest(tileDTO.id());
+        });
     }
 
 }

client/src/main/java/org/schlunzis/kurtama/client/fx/controller/GameController.java

@@ -52,7 +52,7 @@ private void updateTerrain(IGameStateDTO gameState) {
         }
         for (int x = 0; x < gameState.terrain().width(); x++) {
             for (int y = 0; y < gameState.terrain().height(); y++) {
-                terrainGrid.add(new TilePane(gameState.terrain().tiles()[x][y]), x, y);
+                terrainGrid.add(new TilePane(gameState.terrain().tiles()[x][y], gameService), x, y);
             }
         }
     }

client/src/main/java/org/schlunzis/kurtama/client/service/IGameService.java

@@ -7,5 +7,6 @@ public interface IGameService {
 
     ObjectProperty<IGameStateDTO> getGameState();
 
+    void sendMoveRequest(int id);
 }
 

client/src/main/java/org/schlunzis/kurtama/client/service/impl/GameService.java

@@ -3,21 +3,42 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import org.schlunzis.kurtama.client.service.IGameService;
 import org.schlunzis.kurtama.common.game.model.IGameStateDTO;
+import org.schlunzis.kurtama.common.messages.game.client.MoveRequest;
 import org.schlunzis.kurtama.common.messages.game.server.GameStartedMessage;
+import org.schlunzis.kurtama.common.messages.game.server.UpdateGameStateMessage;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
+import java.util.UUID;
+
+@Getter
 @Service
+@RequiredArgsConstructor
 class GameService implements IGameService {
 
-    @Getter
+    private final ApplicationEventPublisher eventBus;
+
     private final ObjectProperty<IGameStateDTO> gameState = new SimpleObjectProperty<>();
+    private UUID gameID;
 
     @EventListener
     public void onGameStartedMessage(GameStartedMessage gsm) {
         gameState.set(gsm.gameState());
+        gameID = gsm.gameID();
+    }
+
+    @EventListener
+    public void onUpdateGameStateMessage(UpdateGameStateMessage gsm) {
+        gameState.set(gsm.getGameState());
+    }
+
+    @Override
+    public void sendMoveRequest(int id) {
+        eventBus.publishEvent(new MoveRequest(gameID, id));
     }
 
 }

common/src/main/java/org/schlunzis/kurtama/common/game/model/ITileDTO.java

@@ -2,8 +2,11 @@
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver;
+import org.schlunzis.kurtama.common.IUser;
 import org.schlunzis.kurtama.common.util.InheritanceTypeIdResolver;
 
+import java.util.List;
+
 @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, property = "discriminator")
 @JsonTypeIdResolver(InheritanceTypeIdResolver.class)
 public interface ITileDTO {
@@ -12,4 +15,6 @@ public interface ITileDTO {
 
     int[] neighbours();
 
+    List<IUser> figures();
+
 }

common/src/main/java/org/schlunzis/kurtama/common/game/model/SquareTileDTO.java

@@ -1,9 +1,12 @@
 package org.schlunzis.kurtama.common.game.model;
 
+import org.schlunzis.kurtama.common.IUser;
+
 import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
 
-public record SquareTileDTO(int id, int[] neighbours) implements ITileDTO {
+public record SquareTileDTO(int id, int[] neighbours, List<IUser> figures) implements ITileDTO {
 
     @Override
     public String toString() {

common/src/main/java/org/schlunzis/kurtama/common/messages/game/client/AbstractGameRequest.java

@@ -0,0 +1,15 @@
+package org.schlunzis.kurtama.common.messages.game.client;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.schlunzis.kurtama.common.messages.IClientMessage;
+
+import java.util.UUID;
+
+@Getter
+@RequiredArgsConstructor
+public abstract class AbstractGameRequest implements IClientMessage {
+
+    private final UUID gameID;
+
+}

common/src/main/java/org/schlunzis/kurtama/common/messages/game/client/MoveRequest.java

@@ -0,0 +1,17 @@
+package org.schlunzis.kurtama.common.messages.game.client;
+
+import lombok.Getter;
+
+import java.util.UUID;
+
+@Getter
+public class MoveRequest extends AbstractGameRequest {
+
+    private final int fieldIndex;
+
+    public MoveRequest(UUID gameID, int fieldIndex) {
+        super(gameID);
+        this.fieldIndex = fieldIndex;
+    }
+
+}

common/src/main/java/org/schlunzis/kurtama/common/messages/game/server/AbstractGameMessage.java

@@ -0,0 +1,13 @@
+package org.schlunzis.kurtama.common.messages.game.server;
+
+import lombok.RequiredArgsConstructor;
+import org.schlunzis.kurtama.common.messages.IServerMessage;
+
+import java.util.UUID;
+
+@RequiredArgsConstructor
+public abstract class AbstractGameMessage implements IServerMessage {
+
+    private final UUID gameID;
+
+}

common/src/main/java/org/schlunzis/kurtama/common/messages/game/server/GameStartedMessage.java

@@ -3,6 +3,8 @@
 import org.schlunzis.kurtama.common.game.model.IGameStateDTO;
 import org.schlunzis.kurtama.common.messages.IServerMessage;
 
-public record GameStartedMessage(IGameStateDTO gameState) implements IServerMessage {
+import java.util.UUID;
+
+public record GameStartedMessage(UUID gameID, IGameStateDTO gameState) implements IServerMessage {
 
 }

common/src/main/java/org/schlunzis/kurtama/common/messages/game/server/UpdateGameStateMessage.java

@@ -0,0 +1,17 @@
+package org.schlunzis.kurtama.common.messages.game.server;
+
+import lombok.Getter;
+import org.schlunzis.kurtama.common.game.model.IGameStateDTO;
+
+import java.util.UUID;
+
+@Getter
+public class UpdateGameStateMessage extends AbstractGameMessage {
+
+    private final IGameStateDTO gameState;
+
+    public UpdateGameStateMessage(UUID gameID, IGameStateDTO gameState) {
+        super(gameID);
+        this.gameState = gameState;
+    }
+}

server/src/main/java/org/schlunzis/kurtama/server/game/Game.java

@@ -3,6 +3,8 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.schlunzis.kurtama.server.game.model.SquareGameState;
+import org.schlunzis.kurtama.server.game.model.SquareTile;
+import org.schlunzis.kurtama.server.user.ServerUser;
 
 import java.util.UUID;
 
@@ -13,4 +15,10 @@ public class Game {
     private final UUID id;
     private final SquareGameState gameState;
 
+    public void move(ServerUser user, int fieldIndex) {
+        SquareTile currentTile = gameState.findTileWithFigureOfUser(user);
+        currentTile.getFigures().removeIf(figure -> figure.equals(user));
+        gameState.getTerrain().get(fieldIndex).getFigures().add(user);
+    }
+
 }

server/src/main/java/org/schlunzis/kurtama/server/game/GameService.java

@@ -3,8 +3,10 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.schlunzis.kurtama.common.game.GameSettings;
+import org.schlunzis.kurtama.common.messages.game.client.MoveRequest;
 import org.schlunzis.kurtama.common.messages.game.client.StartGameRequest;
 import org.schlunzis.kurtama.common.messages.game.server.GameStartedMessage;
+import org.schlunzis.kurtama.common.messages.game.server.UpdateGameStateMessage;
 import org.schlunzis.kurtama.server.game.model.SquareGameState;
 import org.schlunzis.kurtama.server.service.ClientMessageContext;
 import org.springframework.context.event.EventListener;
@@ -26,7 +28,19 @@ public void onStartGameRequest(ClientMessageContext<StartGameRequest> cmc) {
         Game game = gameManagement.createGame(gameSettings);
         SquareGameState gameState = game.getGameState();
 
-        cmc.respond(new GameStartedMessage(gameState.toDTO()));
+        cmc.respond(new GameStartedMessage(game.getId(), gameState.toDTO()));
+        cmc.close();
+    }
+
+    @EventListener
+    public void onMoveRequest(ClientMessageContext<MoveRequest> cmc) {
+        MoveRequest request = cmc.getClientMessage();
+        log.info("Move request: {}", request);
+
+        Game game = gameManagement.getGame(request.getGameID());
+        game.move(cmc.getUser(), request.getFieldIndex());
+
+        cmc.respond(new UpdateGameStateMessage(game.getId(), game.getGameState().toDTO()));
         cmc.close();
     }
 

server/src/main/java/org/schlunzis/kurtama/server/game/model/ITile.java

@@ -1,6 +1,7 @@
 package org.schlunzis.kurtama.server.game.model;
 
 import org.schlunzis.kurtama.common.game.model.ITileDTO;
+import org.schlunzis.kurtama.server.user.ServerUser;
 
 import java.util.List;
 
@@ -12,7 +13,7 @@ public interface ITile {
 
     void put(IDirection direction, ITile tile);
 
-    List<Team> getFigures();
+    List<ServerUser> getFigures();
 
     List<Team> getStreets(IDirection direction);
 

server/src/main/java/org/schlunzis/kurtama/server/game/model/SquareGameState.java

@@ -3,6 +3,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.schlunzis.kurtama.common.game.model.SquareGameStateDTO;
+import org.schlunzis.kurtama.server.user.ServerUser;
 
 import java.util.List;
 
@@ -17,4 +18,8 @@ public SquareGameStateDTO toDTO() {
         return new SquareGameStateDTO(terrain.toDTO());
     }
 
+    public SquareTile findTileWithFigureOfUser(ServerUser user) {
+        return terrain.findTileWithFigureOfUser(user);
+    }
+
 }

server/src/main/java/org/schlunzis/kurtama/server/game/model/SquareTerrain.java

@@ -4,6 +4,7 @@
 import org.schlunzis.kurtama.common.game.model.ITileDTO;
 import org.schlunzis.kurtama.common.game.model.SquareTerrainDTO;
 import org.schlunzis.kurtama.common.game.model.SquareTileDTO;
+import org.schlunzis.kurtama.server.user.ServerUser;
 
 public class SquareTerrain implements ITerrain {
 
@@ -32,4 +33,15 @@ public ITerrainDTO toDTO() {
         return new SquareTerrainDTO(columns, rows, (SquareTileDTO[][]) tileDTOs);
     }
 
+    public SquareTile findTileWithFigureOfUser(ServerUser user) {
+        for (int x = 0; x < columns; x++) {
+            for (int y = 0; y < rows; y++) {
+                if (tiles[x][y].hasFigureOfUser(user)) {
+                    return tiles[x][y];
+                }
+            }
+        }
+        return null;
+    }
+
 }

server/src/main/java/org/schlunzis/kurtama/server/game/model/SquareTile.java

@@ -1,8 +1,10 @@
 package org.schlunzis.kurtama.server.game.model;
 
 import lombok.Getter;
+import org.schlunzis.kurtama.common.IUser;
 import org.schlunzis.kurtama.common.game.model.ITileDTO;
 import org.schlunzis.kurtama.common.game.model.SquareTileDTO;
+import org.schlunzis.kurtama.server.user.ServerUser;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
@@ -15,7 +17,7 @@ public class SquareTile implements ITile {
 
     private final ITile[] neighbours = new ITile[SquareDirection.values().length];
     @Getter
-    private final List<Team> figures = new ArrayList<>();
+    private final List<ServerUser> figures = new ArrayList<>();
     @Getter
     private final List<Team> villages = new ArrayList<>();
     @Getter
@@ -66,7 +68,15 @@ public ITileDTO toDTO() {
         for (int i = 0; i < neighbours.length; i++) {
             neighbourIds[i] = neighbours[i] == null ? -1 : neighbours[i].getId();
         }
-        return new SquareTileDTO(id, neighbourIds);
+        List<IUser> figureDTOs = new ArrayList<>();
+        for (ServerUser figure : figures) {
+            figureDTOs.add(figure.toDTO());
+        }
+        return new SquareTileDTO(id, neighbourIds, figureDTOs);
+    }
+
+    public boolean hasFigureOfUser(ServerUser user) {
+        return figures.contains(user);
     }
 
 }

server/src/main/java/org/schlunzis/kurtama/server/user/ServerUser.java

@@ -2,6 +2,7 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.schlunzis.kurtama.common.IUser;
 import org.schlunzis.kurtama.common.UserDTO;
@@ -11,8 +12,10 @@
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class ServerUser implements IUser {
 
+    @EqualsAndHashCode.Include
     private UUID id;
     private String email;
     private String username;