Extract game engine as separate artifact

117 files changed, 34 insertions, 18 deletions

diff --git a/backend/build.gradle b/backend/build.gradle
index 5ef36783..dd3f4ffd 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -20,9 +20,9 @@ configurations {
 }
 
 dependencies {
+    compile project(':game-engine')
     compile 'org.springframework.boot:spring-boot-starter-websocket'
     compile 'org.springframework.security:spring-security-core:4.2.0.RELEASE'
-    compile 'com.google.code.gson:gson:2.8.0'
     compile 'ch.qos.logback:logback-classic:1.1.8'
     compile 'org.hildan.livedoc:livedoc-springboot:4.3.2'
     compile 'org.hildan.livedoc:livedoc-ui-webjar:4.3.2'
diff --git a/backend/src/main/java/org/luxons/sevenwonders/repositories/LobbyRepository.java b/backend/src/main/java/org/luxons/sevenwonders/repositories/LobbyRepository.java
index eb573479..b1b11c82 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/repositories/LobbyRepository.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/repositories/LobbyRepository.java
@@ -20,8 +20,8 @@ public class LobbyRepository {
     private long lastGameId = 0;
 
     @Autowired
-    public LobbyRepository(GameDefinitionLoader gameDefinitionLoader) {
-        this.gameDefinitionLoader = gameDefinitionLoader;
+    public LobbyRepository() {
+        this.gameDefinitionLoader = new GameDefinitionLoader();
     }
 
     public Collection<Lobby> list() {
diff --git a/backend/src/test/java/org/luxons/sevenwonders/controllers/GameBrowserControllerTest.java b/backend/src/test/java/org/luxons/sevenwonders/controllers/GameBrowserControllerTest.java
index 6c971517..65d2aa04 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/controllers/GameBrowserControllerTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/controllers/GameBrowserControllerTest.java
@@ -8,13 +8,12 @@ import org.junit.Test;
 import org.luxons.sevenwonders.actions.CreateGameAction;
 import org.luxons.sevenwonders.actions.JoinGameAction;
 import org.luxons.sevenwonders.controllers.GameBrowserController.UserAlreadyInGameException;
-import org.luxons.sevenwonders.test.TestUtils;
-import org.luxons.sevenwonders.game.data.GameDefinitionLoader;
 import org.luxons.sevenwonders.lobby.Lobby;
 import org.luxons.sevenwonders.lobby.Player;
 import org.luxons.sevenwonders.repositories.LobbyRepository;
 import org.luxons.sevenwonders.repositories.PlayerRepository;
 import org.luxons.sevenwonders.repositories.PlayerRepository.PlayerNotFoundException;
+import org.luxons.sevenwonders.test.TestUtils;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 
 import static org.junit.Assert.assertEquals;
@@ -31,7 +30,7 @@ public class GameBrowserControllerTest {
     @Before
     public void setUp() {
         playerRepository = new PlayerRepository();
-        LobbyRepository lobbyRepository = new LobbyRepository(new GameDefinitionLoader());
+        LobbyRepository lobbyRepository = new LobbyRepository();
         SimpMessagingTemplate template = TestUtils.createSimpMessagingTemplate();
         LobbyController lobbyController = new LobbyController(playerRepository, template);
         gameBrowserController = new GameBrowserController(lobbyController, lobbyRepository, playerRepository, template);
diff --git a/backend/src/test/java/org/luxons/sevenwonders/controllers/LobbyControllerTest.java b/backend/src/test/java/org/luxons/sevenwonders/controllers/LobbyControllerTest.java
index 6958ad8b..db165e83 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/controllers/LobbyControllerTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/controllers/LobbyControllerTest.java
@@ -13,7 +13,6 @@ import org.luxons.sevenwonders.actions.UpdateSettingsAction;
 import org.luxons.sevenwonders.controllers.LobbyController.PlayerIsNotOwnerException;
 import org.luxons.sevenwonders.controllers.LobbyController.PlayerNotInLobbyException;
 import org.luxons.sevenwonders.game.api.CustomizableSettings;
-import org.luxons.sevenwonders.game.data.GameDefinitionLoader;
 import org.luxons.sevenwonders.game.data.definitions.WonderSidePickMethod;
 import org.luxons.sevenwonders.lobby.Lobby;
 import org.luxons.sevenwonders.lobby.Player;
@@ -41,7 +40,7 @@ public class LobbyControllerTest {
     @Before
     public void setUp() {
         playerRepository = new PlayerRepository();
-        lobbyRepository = new LobbyRepository(new GameDefinitionLoader());
+        lobbyRepository = new LobbyRepository();
         SimpMessagingTemplate template = TestUtils.createSimpMessagingTemplate();
         lobbyController = new LobbyController(playerRepository, template);
     }
diff --git a/backend/src/test/java/org/luxons/sevenwonders/repositories/LobbyRepositoryTest.java b/backend/src/test/java/org/luxons/sevenwonders/repositories/LobbyRepositoryTest.java
index 4ba7d6e3..444e7aaa 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/repositories/LobbyRepositoryTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/repositories/LobbyRepositoryTest.java
@@ -2,7 +2,6 @@ package org.luxons.sevenwonders.repositories;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.luxons.sevenwonders.game.data.GameDefinitionLoader;
 import org.luxons.sevenwonders.lobby.Lobby;
 import org.luxons.sevenwonders.lobby.Player;
 import org.luxons.sevenwonders.repositories.LobbyRepository.LobbyNotFoundException;
@@ -18,7 +17,7 @@ public class LobbyRepositoryTest {
 
     @Before
     public void setUp() {
-        repository = new LobbyRepository(new GameDefinitionLoader());
+        repository = new LobbyRepository();
     }
 
     @Test
diff --git a/backend/src/test/java/org/luxons/sevenwonders/validation/DestinationAccessValidatorTest.java b/backend/src/test/java/org/luxons/sevenwonders/validation/DestinationAccessValidatorTest.java
index bdf6c8c9..604b927d 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/validation/DestinationAccessValidatorTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/validation/DestinationAccessValidatorTest.java
@@ -2,7 +2,6 @@ package org.luxons.sevenwonders.validation;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.luxons.sevenwonders.game.data.GameDefinitionLoader;
 import org.luxons.sevenwonders.lobby.Lobby;
 import org.luxons.sevenwonders.lobby.Player;
 import org.luxons.sevenwonders.repositories.LobbyRepository;
@@ -19,7 +18,7 @@ public class DestinationAccessValidatorTest {
 
     @Before
     public void setup() {
-        lobbyRepository = new LobbyRepository(new GameDefinitionLoader());
+        lobbyRepository = new LobbyRepository();
         destinationAccessValidator = new DestinationAccessValidator(lobbyRepository);
     }
 
diff --git a/game-engine/build.gradle b/game-engine/build.gradle
new file mode 100644
index 00000000..956e9f3a
--- /dev/null
+++ b/game-engine/build.gradle
@@ -0,0 +1,24 @@
+apply plugin: 'java-library'
+apply plugin: 'checkstyle'
+
+group 'org.luxons'
+
+repositories {
+    mavenCentral()
+}
+
+configurations {
+    checkstyleConfig
+}
+
+dependencies {
+    implementation 'com.google.code.gson:gson:2.8.0'
+    testImplementation 'junit:junit:4.12'
+    checkstyleConfig "org.hildan.checkstyle:checkstyle-config:2.1.0"
+}
+
+checkstyle {
+    maxWarnings = 0
+    toolVersion = '8.2'
+    config = resources.text.fromArchiveEntry(configurations.checkstyleConfig, "checkstyle.xml")
+}
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/Game.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/Game.java
index ed11913b..ed11913b 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/Game.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/Game.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/Settings.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/Settings.java
index f05b0b01..f05b0b01 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/Settings.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/Settings.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/api/Action.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/api/Action.java
index 88e392f9..88e392f9 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/api/Action.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/api/Action.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/api/CustomizableSettings.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/api/CustomizableSettings.java
index 2cbf8727..2cbf8727 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/api/CustomizableSettings.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/api/CustomizableSettings.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/api/HandCard.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/api/HandCard.java
index a97679c2..a97679c2 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/api/HandCard.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/api/HandCard.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/api/PlayerMove.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/api/PlayerMove.java
index 179656cb..bad8f852 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/api/PlayerMove.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/api/PlayerMove.java
@@ -2,17 +2,14 @@ package org.luxons.sevenwonders.game.api;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.validation.constraints.NotNull;
 
 import org.luxons.sevenwonders.game.moves.MoveType;
 import org.luxons.sevenwonders.game.resources.BoughtResources;
 
 public class PlayerMove {
 
-    @NotNull
     private MoveType type;
 
-    @NotNull
     private String cardName;
 
     private List<BoughtResources> boughtResources = new ArrayList<>();
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/api/PlayerTurnInfo.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/api/PlayerTurnInfo.java
index 3d92d40b..3d92d40b 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/api/PlayerTurnInfo.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/api/PlayerTurnInfo.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/api/Table.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/api/Table.java
index 82f9055a..82f9055a 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/api/Table.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/api/Table.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/boards/Board.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/boards/Board.java
index a59bbfae..a59bbfae 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/boards/Board.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/boards/Board.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/boards/BoardElementType.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/boards/BoardElementType.java
index e50f4ea0..e50f4ea0 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/boards/BoardElementType.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/boards/BoardElementType.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/boards/Military.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/boards/Military.java
index e5cc7033..e5cc7033 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/boards/Military.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/boards/Military.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/boards/RelativeBoardPosition.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/boards/RelativeBoardPosition.java
index 16b2f3a9..16b2f3a9 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/boards/RelativeBoardPosition.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/boards/RelativeBoardPosition.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/boards/Science.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/boards/Science.java
index 34928bcc..34928bcc 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/boards/Science.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/boards/Science.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/boards/ScienceType.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/boards/ScienceType.java
index f1b14c6d..f1b14c6d 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/boards/ScienceType.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/boards/ScienceType.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/cards/Card.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/cards/Card.java
index 084d19a5..084d19a5 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/cards/Card.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/cards/Card.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/cards/CardBack.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/cards/CardBack.java
index f925b6c4..f925b6c4 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/cards/CardBack.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/cards/CardBack.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/cards/Color.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/cards/Color.java
index 80d06c55..80d06c55 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/cards/Color.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/cards/Color.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/cards/Decks.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/cards/Decks.java
index aa2b00bf..aa2b00bf 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/cards/Decks.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/cards/Decks.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/cards/HandRotationDirection.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/cards/HandRotationDirection.java
index f3902fb5..f3902fb5 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/cards/HandRotationDirection.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/cards/HandRotationDirection.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/cards/Hands.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/cards/Hands.java
index 4a8bc143..4a8bc143 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/cards/Hands.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/cards/Hands.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/cards/Requirements.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/cards/Requirements.java
index 93683ff8..93683ff8 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/cards/Requirements.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/cards/Requirements.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/GameDefinition.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/GameDefinition.java
index 7604ca6a..7604ca6a 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/GameDefinition.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/GameDefinition.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/GameDefinitionLoader.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/GameDefinitionLoader.java
index f0da6d63..7a9c5af0 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/GameDefinitionLoader.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/GameDefinitionLoader.java
@@ -24,13 +24,11 @@ import org.luxons.sevenwonders.game.effects.ScienceProgress;
 import org.luxons.sevenwonders.game.resources.Production;
 import org.luxons.sevenwonders.game.resources.ResourceType;
 import org.luxons.sevenwonders.game.resources.Resources;
-import org.springframework.stereotype.Component;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 
-@Component
 public class GameDefinitionLoader {
 
     private static final String BASE_PACKAGE = GameDefinitionLoader.class.getPackage().getName();
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/CardDefinition.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/CardDefinition.java
index 621bed2c..621bed2c 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/CardDefinition.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/CardDefinition.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/DecksDefinition.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/DecksDefinition.java
index 6f97e55f..6f97e55f 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/DecksDefinition.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/DecksDefinition.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/Definition.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/Definition.java
index 6c6b4b19..6c6b4b19 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/Definition.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/Definition.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/EffectsDefinition.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/EffectsDefinition.java
index e35463d4..e35463d4 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/EffectsDefinition.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/EffectsDefinition.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderDefinition.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderDefinition.java
index a972a517..a972a517 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderDefinition.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderDefinition.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSide.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSide.java
index 34091350..34091350 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSide.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSide.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSideDefinition.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSideDefinition.java
index c84bba4e..c84bba4e 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSideDefinition.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSideDefinition.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethod.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethod.java
index 08aaad14..08aaad14 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethod.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethod.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderStageDefinition.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderStageDefinition.java
index 887b414a..887b414a 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderStageDefinition.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderStageDefinition.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializer.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializer.java
index c0a75d80..c0a75d80 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializer.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializer.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializer.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializer.java
index c3eb1386..c3eb1386 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializer.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializer.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ProductionSerializer.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/serializers/ProductionSerializer.java
index 178134bb..178134bb 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ProductionSerializer.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/serializers/ProductionSerializer.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializer.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializer.java
index d2a49180..d2a49180 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializer.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializer.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializer.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializer.java
index 89d3e723..89d3e723 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializer.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializer.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializer.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializer.java
index 9c27b2a1..9c27b2a1 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializer.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializer.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializer.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializer.java
index cecad405..cecad405 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializer.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializer.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElement.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElement.java
index e9f9fe5f..e9f9fe5f 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElement.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElement.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/effects/Discount.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/Discount.java
index 976ebf35..976ebf35 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/effects/Discount.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/Discount.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/effects/Effect.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/Effect.java
index 692eaea0..692eaea0 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/effects/Effect.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/Effect.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/effects/EndGameEffect.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/EndGameEffect.java
index 1bae16a6..1bae16a6 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/effects/EndGameEffect.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/EndGameEffect.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/effects/GoldIncrease.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/GoldIncrease.java
index 4c1215d4..4c1215d4 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/effects/GoldIncrease.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/GoldIncrease.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/effects/InstantOwnBoardEffect.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/InstantOwnBoardEffect.java
index 8f4340cf..8f4340cf 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/effects/InstantOwnBoardEffect.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/InstantOwnBoardEffect.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcements.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcements.java
index 7da112f5..7da112f5 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcements.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcements.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/effects/ProductionIncrease.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/ProductionIncrease.java
index 514c65db..514c65db 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/effects/ProductionIncrease.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/ProductionIncrease.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/effects/RawPointsIncrease.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/RawPointsIncrease.java
index 9a5d66ed..9a5d66ed 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/effects/RawPointsIncrease.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/RawPointsIncrease.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/effects/ScienceProgress.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/ScienceProgress.java
index 4e6764ee..4e6764ee 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/effects/ScienceProgress.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/ScienceProgress.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbility.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbility.java
index cdf67f20..cdf67f20 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbility.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbility.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivation.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivation.java
index a5953c2f..a5953c2f 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivation.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivation.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/moves/BuildWonderMove.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/BuildWonderMove.java
index f1cb50b3..f1cb50b3 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/moves/BuildWonderMove.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/BuildWonderMove.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/moves/CardFromHandMove.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/CardFromHandMove.java
index 1794966d..1794966d 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/moves/CardFromHandMove.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/CardFromHandMove.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/moves/CopyGuildMove.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/CopyGuildMove.java
index a93670c5..a93670c5 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/moves/CopyGuildMove.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/CopyGuildMove.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/moves/DiscardMove.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/DiscardMove.java
index 076a593c..076a593c 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/moves/DiscardMove.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/DiscardMove.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/moves/InvalidMoveException.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/InvalidMoveException.java
index 58190274..58190274 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/moves/InvalidMoveException.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/InvalidMoveException.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/moves/Move.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/Move.java
index 40c61eea..40c61eea 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/moves/Move.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/Move.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/moves/MoveType.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/MoveType.java
index bf64344d..bf64344d 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/moves/MoveType.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/MoveType.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/moves/PlayCardMove.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/PlayCardMove.java
index 82052981..82052981 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/moves/PlayCardMove.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/PlayCardMove.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/moves/PlayFreeCardMove.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/PlayFreeCardMove.java
index 4e8eefa5..4e8eefa5 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/moves/PlayFreeCardMove.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/moves/PlayFreeCardMove.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/resources/BestPriceCalculator.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/resources/BestPriceCalculator.java
index 8fed41d1..8fed41d1 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/resources/BestPriceCalculator.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/resources/BestPriceCalculator.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/resources/BoughtResources.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/resources/BoughtResources.java
index ec261c8c..ec261c8c 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/resources/BoughtResources.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/resources/BoughtResources.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/resources/Production.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/resources/Production.java
index 7fa83e51..7fa83e51 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/resources/Production.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/resources/Production.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/resources/Provider.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/resources/Provider.java
index 9c4aa3f9..9c4aa3f9 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/resources/Provider.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/resources/Provider.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/resources/ResourceType.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/resources/ResourceType.java
index baad8451..baad8451 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/resources/ResourceType.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/resources/ResourceType.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/resources/Resources.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/resources/Resources.java
index 04278fea..04278fea 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/resources/Resources.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/resources/Resources.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/resources/TradingRules.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/resources/TradingRules.java
index 8cd1d9bc..8cd1d9bc 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/resources/TradingRules.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/resources/TradingRules.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/scoring/PlayerScore.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/scoring/PlayerScore.java
index f4a0d832..f4a0d832 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/scoring/PlayerScore.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/scoring/PlayerScore.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreBoard.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreBoard.java
index e7cdaedd..e7cdaedd 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreBoard.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreBoard.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreCategory.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreCategory.java
index a6a9537d..a6a9537d 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreCategory.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreCategory.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/wonders/Wonder.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/wonders/Wonder.java
index 73fff305..73fff305 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/wonders/Wonder.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/wonders/Wonder.java
diff --git a/backend/src/main/java/org/luxons/sevenwonders/game/wonders/WonderStage.java b/game-engine/src/main/java/org/luxons/sevenwonders/game/wonders/WonderStage.java
index 5f6765ee..5f6765ee 100644
--- a/backend/src/main/java/org/luxons/sevenwonders/game/wonders/WonderStage.java
+++ b/game-engine/src/main/java/org/luxons/sevenwonders/game/wonders/WonderStage.java
diff --git a/backend/src/main/resources/org/luxons/sevenwonders/game/data/cards.json b/game-engine/src/main/resources/org/luxons/sevenwonders/game/data/cards.json
index 83777d9e..83777d9e 100644
--- a/backend/src/main/resources/org/luxons/sevenwonders/game/data/cards.json
+++ b/game-engine/src/main/resources/org/luxons/sevenwonders/game/data/cards.json
diff --git a/backend/src/main/resources/org/luxons/sevenwonders/game/data/wonders.json b/game-engine/src/main/resources/org/luxons/sevenwonders/game/data/wonders.json
index 5beceadd..5beceadd 100644
--- a/backend/src/main/resources/org/luxons/sevenwonders/game/data/wonders.json
+++ b/game-engine/src/main/resources/org/luxons/sevenwonders/game/data/wonders.json
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/GameTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/GameTest.java
index e504126d..e504126d 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/GameTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/GameTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/api/TableTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/api/TableTest.java
index 71dbeb89..71dbeb89 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/api/TableTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/api/TableTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/boards/BoardTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/boards/BoardTest.java
index c54ff0b2..c54ff0b2 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/boards/BoardTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/boards/BoardTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/boards/MilitaryTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/boards/MilitaryTest.java
index b391c6b0..b391c6b0 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/boards/MilitaryTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/boards/MilitaryTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.java
index 9f60e572..9f60e572 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/boards/ScienceTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/boards/ScienceTest.java
index 24c63b31..24c63b31 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/boards/ScienceTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/boards/ScienceTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/cards/CardBackTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/cards/CardBackTest.java
index 6f637f87..6f637f87 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/cards/CardBackTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/cards/CardBackTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/cards/CardTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/cards/CardTest.java
index 437c5f21..437c5f21 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/cards/CardTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/cards/CardTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/cards/DecksTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/cards/DecksTest.java
index 8adeb44d..8adeb44d 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/cards/DecksTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/cards/DecksTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.java
index ddd69b70..ddd69b70 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/cards/HandsTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/cards/HandsTest.java
index c20508e6..c20508e6 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/cards/HandsTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/cards/HandsTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/cards/RequirementsTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/cards/RequirementsTest.java
index b01f9002..b01f9002 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/cards/RequirementsTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/cards/RequirementsTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionLoaderTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionLoaderTest.java
index e678e6a5..e678e6a5 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionLoaderTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionLoaderTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionTest.java
index c693a2a2..c693a2a2 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.java
index 0b7de3d6..0b7de3d6 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.java
index 861d5a09..861d5a09 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.java
index 8c5108ba..8c5108ba 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ProductionSerializerTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/serializers/ProductionSerializerTest.java
index 86ee16e9..86ee16e9 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ProductionSerializerTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/serializers/ProductionSerializerTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.java
index 3a688f4d..3a688f4d 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.java
index b5011fa5..b5011fa5 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.java
index e1dc4e2b..e1dc4e2b 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.java
index 0387e198..0387e198 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.java
index bacea896..bacea896 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/effects/DiscountTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/DiscountTest.java
index c6819d3a..c6819d3a 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/effects/DiscountTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/DiscountTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.java
index be124251..be124251 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.java
index 478af746..478af746 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.java
index b6a47292..b6a47292 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.java
index 020eda73..020eda73 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/effects/ScienceProgressTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/ScienceProgressTest.java
index b5402a7e..b5402a7e 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/effects/ScienceProgressTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/ScienceProgressTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.java
index 0f30a3a5..0f30a3a5 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/resources/BestPriceCalculatorTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/resources/BestPriceCalculatorTest.java
index e6438789..e6438789 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/resources/BestPriceCalculatorTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/resources/BestPriceCalculatorTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/resources/ProductionTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/resources/ProductionTest.java
index 2247147c..2247147c 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/resources/ProductionTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/resources/ProductionTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/resources/ResourcesTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/resources/ResourcesTest.java
index 1f260a11..1f260a11 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/resources/ResourcesTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/resources/ResourcesTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/resources/TradingRulesTest.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/resources/TradingRulesTest.java
index 0fd1b52b..0fd1b52b 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/resources/TradingRulesTest.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/resources/TradingRulesTest.java
diff --git a/backend/src/test/java/org/luxons/sevenwonders/game/test/TestUtils.java b/game-engine/src/test/java/org/luxons/sevenwonders/game/test/TestUtils.java
index 4b727944..4b727944 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/game/test/TestUtils.java
+++ b/game-engine/src/test/java/org/luxons/sevenwonders/game/test/TestUtils.java
diff --git a/settings.gradle b/settings.gradle
index aa4804f3..81a2a09e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,3 @@
 include 'frontend'
-include 'backend'
\ No newline at end of file
+include 'backend'
+include 'game-engine'