diff options
| author | Joffrey BION <joffrey.bion@gmail.com> | 2019-05-22 02:40:48 +0200 |
|---|---|---|
| committer | Joffrey BION <joffrey.bion@gmail.com> | 2019-05-22 02:40:48 +0200 |
| commit | 157edc9b8027f63998758d3c91cbaa1053550f0f (patch) | |
| tree | 3c5b1b6b4c3c33f1493d6ef2a5ec71a796b24603 /sw-server/src/main/kotlin/org/luxons | |
| parent | Reorder subprojects in settings.gradle to make more sense (diff) | |
| download | seven-wonders-157edc9b8027f63998758d3c91cbaa1053550f0f.tar.gz seven-wonders-157edc9b8027f63998758d3c91cbaa1053550f0f.tar.bz2 seven-wonders-157edc9b8027f63998758d3c91cbaa1053550f0f.zip | |
Reorganize packages again
Diffstat (limited to 'sw-server/src/main/kotlin/org/luxons')
6 files changed, 12 insertions, 11 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 |