Reorganize packages again

10 files changed, 19 insertions, 18 deletions

diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/PrepareMoveAction.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/PrepareMoveAction.kt
index 6b39c486..ed420cfc 100644
--- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/PrepareMoveAction.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/PrepareMoveAction.kt
@@ -3,7 +3,7 @@ package org.luxons.sevenwonders.actions
 import org.hildan.livedoc.core.annotations.types.ApiType
 import org.hildan.livedoc.core.annotations.types.ApiTypeProperty
 import org.luxons.sevenwonders.doc.Documentation
-import org.luxons.sevenwonders.game.api.PlayerMove
+import org.luxons.sevenwonders.model.PlayerMove
 
 /**
  * The action to prepare the next move during a game.
diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/UpdateSettingsAction.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/UpdateSettingsAction.kt
index d13e5b45..33303044 100644
--- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/UpdateSettingsAction.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/actions/UpdateSettingsAction.kt
@@ -3,7 +3,7 @@ package org.luxons.sevenwonders.actions
 import org.hildan.livedoc.core.annotations.types.ApiType
 import org.hildan.livedoc.core.annotations.types.ApiTypeProperty
 import org.luxons.sevenwonders.doc.Documentation
-import org.luxons.sevenwonders.game.api.CustomizableSettings
+import org.luxons.sevenwonders.model.CustomizableSettings
 
 /**
  * The action to update the settings of the game. Can only be called in the lobby by the owner of the game.
diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/controllers/GameController.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/controllers/GameController.kt
index 132efd54..a46cb18d 100644
--- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/controllers/GameController.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/controllers/GameController.kt
@@ -4,9 +4,9 @@ import org.hildan.livedoc.core.annotations.Api
 import org.luxons.sevenwonders.actions.PrepareMoveAction
 import org.luxons.sevenwonders.api.PlayerDTO
 import org.luxons.sevenwonders.api.toDTO
-import org.luxons.sevenwonders.game.Game
-import org.luxons.sevenwonders.game.api.ApiTable
-import org.luxons.sevenwonders.game.api.cards.CardBack
+import org.luxons.sevenwonders.engine.Game
+import org.luxons.sevenwonders.model.ApiTable
+import org.luxons.sevenwonders.model.cards.CardBack
 import org.luxons.sevenwonders.lobby.Player
 import org.luxons.sevenwonders.repositories.PlayerRepository
 import org.slf4j.LoggerFactory
diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/lobby/Lobby.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/lobby/Lobby.kt
index 08249193..4b9f5bc3 100644
--- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/lobby/Lobby.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/lobby/Lobby.kt
@@ -1,8 +1,8 @@
 package org.luxons.sevenwonders.lobby
 
-import org.luxons.sevenwonders.game.Game
-import org.luxons.sevenwonders.game.api.CustomizableSettings
-import org.luxons.sevenwonders.game.data.GameDefinition
+import org.luxons.sevenwonders.engine.Game
+import org.luxons.sevenwonders.model.CustomizableSettings
+import org.luxons.sevenwonders.engine.data.GameDefinition
 
 enum class State {
     LOBBY, PLAYING
@@ -16,7 +16,8 @@ class Lobby(
 ) {
     private val players: MutableList<Player> = ArrayList(gameDefinition.maxPlayers)
 
-    var settings: CustomizableSettings = CustomizableSettings()
+    var settings: CustomizableSettings =
+        CustomizableSettings()
 
     var state = State.LOBBY
         private set
diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/lobby/Player.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/lobby/Player.kt
index d6e9b344..d057fcb2 100644
--- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/lobby/Player.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/lobby/Player.kt
@@ -1,7 +1,7 @@
 package org.luxons.sevenwonders.lobby
 
 import org.luxons.sevenwonders.errors.ApiMisuseException
-import org.luxons.sevenwonders.game.Game
+import org.luxons.sevenwonders.engine.Game
 
 class Player(
     val username: String,
diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/repositories/LobbyRepository.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/repositories/LobbyRepository.kt
index 768aa659..02866ffc 100644
--- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/repositories/LobbyRepository.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/repositories/LobbyRepository.kt
@@ -1,6 +1,6 @@
 package org.luxons.sevenwonders.repositories
 
-import org.luxons.sevenwonders.game.data.GameDefinition
+import org.luxons.sevenwonders.engine.data.GameDefinition
 import org.luxons.sevenwonders.lobby.Lobby
 import org.luxons.sevenwonders.lobby.Player
 import org.springframework.beans.factory.annotation.Autowired
diff --git a/sw-server/src/test/kotlin/org/luxons/sevenwonders/controllers/LobbyControllerTest.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/controllers/LobbyControllerTest.kt
index a140e000..90db48f5 100644
--- a/sw-server/src/test/kotlin/org/luxons/sevenwonders/controllers/LobbyControllerTest.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/controllers/LobbyControllerTest.kt
@@ -4,8 +4,8 @@ import org.junit.Before
 import org.junit.Test
 import org.luxons.sevenwonders.actions.ReorderPlayersAction
 import org.luxons.sevenwonders.actions.UpdateSettingsAction
-import org.luxons.sevenwonders.game.api.CustomizableSettings
-import org.luxons.sevenwonders.game.api.WonderSidePickMethod.ALL_A
+import org.luxons.sevenwonders.model.CustomizableSettings
+import org.luxons.sevenwonders.model.WonderSidePickMethod.ALL_A
 import org.luxons.sevenwonders.lobby.Lobby
 import org.luxons.sevenwonders.lobby.Player
 import org.luxons.sevenwonders.lobby.PlayerIsNotOwnerException
diff --git a/sw-server/src/test/kotlin/org/luxons/sevenwonders/lobby/LobbyTest.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/lobby/LobbyTest.kt
index 967a97e2..bf1ea4bf 100644
--- a/sw-server/src/test/kotlin/org/luxons/sevenwonders/lobby/LobbyTest.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/lobby/LobbyTest.kt
@@ -8,8 +8,8 @@ import org.junit.experimental.theories.DataPoints
 import org.junit.experimental.theories.Theories
 import org.junit.experimental.theories.Theory
 import org.junit.runner.RunWith
-import org.luxons.sevenwonders.game.api.CustomizableSettings
-import org.luxons.sevenwonders.game.data.GameDefinition
+import org.luxons.sevenwonders.model.CustomizableSettings
+import org.luxons.sevenwonders.engine.data.GameDefinition
 import org.luxons.sevenwonders.lobby.Lobby.GameAlreadyStartedException
 import org.luxons.sevenwonders.lobby.Lobby.PlayerListMismatchException
 import org.luxons.sevenwonders.lobby.Lobby.PlayerNameAlreadyUsedException
diff --git a/sw-server/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersClient.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersClient.kt
index ee5827cc..a89ff77a 100644
--- a/sw-server/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersClient.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersClient.kt
@@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.module.kotlin.KotlinModule
 import org.hildan.jackstomp.JackstompClient
 import org.luxons.sevenwonders.config.SEVEN_WONDERS_WS_ENDPOINT
-import org.luxons.sevenwonders.game.resources.MutableResources
-import org.luxons.sevenwonders.game.resources.Resources
+import org.luxons.sevenwonders.engine.resources.MutableResources
+import org.luxons.sevenwonders.engine.resources.Resources
 import org.springframework.messaging.converter.MappingJackson2MessageConverter
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.TimeoutException
diff --git a/sw-server/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersSession.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersSession.kt
index 70031a71..f02a5c3b 100644
--- a/sw-server/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersSession.kt
+++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/test/api/SevenWondersSession.kt
@@ -8,7 +8,7 @@ import org.luxons.sevenwonders.actions.JoinGameAction
 import org.luxons.sevenwonders.api.LobbyDTO
 import org.luxons.sevenwonders.api.PlayerDTO
 import org.luxons.sevenwonders.errors.ErrorDTO
-import org.luxons.sevenwonders.game.api.PlayerTurnInfo
+import org.luxons.sevenwonders.model.PlayerTurnInfo
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue