From 5b029650bce61563ce367d1a984c958ed8f77243 Mon Sep 17 00:00:00 2001 From: TheSaminator Date: Wed, 8 Jun 2022 13:17:10 -0400 Subject: [PATCH] Change base package --- build.gradle.kts | 4 +-- .../data/admiralty/admiral_names.kt | 4 +-- .../data/admiralty/ship_names.kt | 6 ++-- .../{ => net}/starshipfights/data/data.kt | 2 +- .../starshipfights/game/admiralty.kt | 4 +-- .../starshipfights/game/ai/ai_behaviors.kt | 6 ++-- .../starshipfights/game/ai/ai_brainitude.kt | 8 ++--- .../starshipfights/game/ai/ai_coroutine.kt | 10 +++---- .../starshipfights/game/ai/ai_optimization.kt | 6 ++-- .../game/ai/ai_optimization_util.kt | 4 +-- .../starshipfights/game/ai/ai_util.kt | 2 +- .../starshipfights/game/ai/ai_util_combat.kt | 4 +-- .../starshipfights/game/ai/ai_util_deploy.kt | 6 ++-- .../starshipfights/game/ai/ai_util_nav.kt | 6 ++-- .../{ => net}/starshipfights/game/ai/util.kt | 8 ++--- .../starshipfights/game/client_mode.kt | 2 +- .../starshipfights/game/game_ability.kt | 4 +-- .../starshipfights/game/game_chat.kt | 4 +-- .../starshipfights/game/game_initiative.kt | 4 +-- .../starshipfights/game/game_packet.kt | 2 +- .../starshipfights/game/game_phase.kt | 2 +- .../starshipfights/game/game_start.kt | 4 +-- .../starshipfights/game/game_state.kt | 4 +-- .../starshipfights/game/game_subplots.kt | 4 +-- .../starshipfights/game/game_time.kt | 2 +- .../starshipfights/game/matchmaking.kt | 4 +-- .../{ => net}/starshipfights/game/math.kt | 2 +- .../starshipfights/game/pick_bounds.kt | 4 +-- .../{ => net}/starshipfights/game/ship.kt | 4 +-- .../starshipfights/game/ship_boarding.kt | 4 +-- .../starshipfights/game/ship_factions.kt | 2 +- .../starshipfights/game/ship_instances.kt | 4 +-- .../net/starshipfights/game/ship_modifiers.kt | 3 ++ .../starshipfights/game/ship_modules.kt | 4 +-- .../starshipfights/game/ship_types.kt | 2 +- .../starshipfights/game/ship_weapons.kt | 4 +-- .../game/ship_weapons_formats.kt | 4 +-- .../starshipfights/game/ship_weapons_list.kt | 2 +- .../{ => net}/starshipfights/game/util.kt | 2 +- .../starshipfights/game/ship_modifiers.kt | 3 -- .../starshipfights/game/ai/util_js.kt | 2 +- .../{ => net}/starshipfights/game/client.kt | 2 +- .../starshipfights/game/client_error.kt | 2 +- .../starshipfights/game/client_game.kt | 2 +- .../starshipfights/game/client_matchmaking.kt | 4 +-- .../starshipfights/game/client_training.kt | 6 ++-- .../starshipfights/game/game_render.kt | 2 +- .../starshipfights/game/game_resources.kt | 4 +-- .../starshipfights/game/game_time_js.kt | 2 +- .../{ => net}/starshipfights/game/game_ui.kt | 4 +-- .../{ => net}/starshipfights/game/loaders.kt | 2 +- .../starshipfights/game/pick_bounds_js.kt | 2 +- .../{ => net}/starshipfights/game/popup.kt | 2 +- .../starshipfights/game/popup_util.kt | 2 +- .../starshipfights/game/ship_selecting.kt | 4 +-- .../{ => net}/starshipfights/game/util_js.kt | 2 +- .../starshipfights/auth/providers.kt | 30 +++++++++---------- .../starshipfights/auth/ratelimit.kt | 4 +-- .../{ => net}/starshipfights/auth/utils.kt | 14 ++++----- .../starshipfights/data/admiralty/admirals.kt | 14 ++++----- .../data/admiralty/battle_records.kt | 16 +++++----- .../data/admiralty/ship_prices.kt | 8 ++--- .../starshipfights/data/auth/user_sessions.kt | 10 +++---- .../starshipfights/data/auth/user_trophies.kt | 8 +++-- .../starshipfights/data/data_connection.kt | 2 +- .../starshipfights/data/data_documents.kt | 2 +- .../{ => net}/starshipfights/data/data_jvm.kt | 2 +- .../starshipfights/data/data_routines.kt | 16 +++++----- .../starshipfights/game/ai/util_jvm.kt | 2 +- .../starshipfights/game/concurrency.kt | 2 +- .../starshipfights/game/endpoints_game.kt | 14 ++++----- .../starshipfights/game/game_start_jvm.kt | 8 ++--- .../starshipfights/game/game_time_jvm.kt | 2 +- .../starshipfights/game/server_game.kt | 18 +++++------ .../starshipfights/game/server_matchmaking.kt | 6 ++-- .../{ => net}/starshipfights/game/util_jvm.kt | 2 +- .../starshipfights/game/views_game.kt | 6 ++-- .../starshipfights/game/views_training.kt | 12 ++++---- .../starshipfights/info/endpoints_info.kt | 12 ++++---- .../starshipfights/info/html_utils.kt | 8 ++--- .../{ => net}/starshipfights/info/view_bar.kt | 6 ++-- .../{ => net}/starshipfights/info/view_nav.kt | 10 +++---- .../{ => net}/starshipfights/info/view_tpl.kt | 6 ++-- .../starshipfights/info/views_error.kt | 9 ++++-- .../starshipfights/info/views_gdpr.kt | 22 +++++++------- .../starshipfights/info/views_main.kt | 8 ++--- .../starshipfights/info/views_ships.kt | 4 +-- .../starshipfights/info/views_user.kt | 16 +++++----- .../kotlin/{ => net}/starshipfights/server.kt | 12 ++++---- .../{ => net}/starshipfights/server_conf.kt | 4 +-- .../{ => net}/starshipfights/server_utils.kt | 2 +- .../starshipfights/game/ai/AITesting.kt | 6 ++-- 92 files changed, 266 insertions(+), 261 deletions(-) rename src/commonMain/kotlin/{ => net}/starshipfights/data/admiralty/admiral_names.kt (99%) rename src/commonMain/kotlin/{ => net}/starshipfights/data/admiralty/ship_names.kt (98%) rename src/commonMain/kotlin/{ => net}/starshipfights/data/data.kt (96%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/admiralty.kt (97%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ai/ai_behaviors.kt (99%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ai/ai_brainitude.kt (91%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ai/ai_coroutine.kt (87%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ai/ai_optimization.kt (98%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ai/ai_optimization_util.kt (97%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ai/ai_util.kt (76%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ai/ai_util_combat.kt (93%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ai/ai_util_deploy.kt (96%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ai/ai_util_nav.kt (98%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ai/util.kt (92%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/client_mode.kt (93%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/game_ability.kt (99%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/game_chat.kt (97%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/game_initiative.kt (98%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/game_packet.kt (98%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/game_phase.kt (96%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/game_start.kt (89%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/game_state.kt (99%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/game_subplots.kt (99%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/game_time.kt (96%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/matchmaking.kt (97%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/math.kt (99%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/pick_bounds.kt (98%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ship.kt (99%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ship_boarding.kt (98%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ship_factions.kt (99%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ship_instances.kt (99%) create mode 100644 src/commonMain/kotlin/net/starshipfights/game/ship_modifiers.kt rename src/commonMain/kotlin/{ => net}/starshipfights/game/ship_modules.kt (99%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ship_types.kt (99%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ship_weapons.kt (99%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ship_weapons_formats.kt (99%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/ship_weapons_list.kt (99%) rename src/commonMain/kotlin/{ => net}/starshipfights/game/util.kt (98%) delete mode 100644 src/commonMain/kotlin/starshipfights/game/ship_modifiers.kt rename src/jsMain/kotlin/{ => net}/starshipfights/game/ai/util_js.kt (87%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/client.kt (98%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/client_error.kt (87%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/client_game.kt (99%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/client_matchmaking.kt (98%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/client_training.kt (96%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/game_render.kt (97%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/game_resources.kt (99%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/game_time_js.kt (93%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/game_ui.kt (99%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/loaders.kt (98%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/pick_bounds_js.kt (99%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/popup.kt (99%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/popup_util.kt (98%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/ship_selecting.kt (96%) rename src/jsMain/kotlin/{ => net}/starshipfights/game/util_js.kt (98%) rename src/jvmMain/kotlin/{ => net}/starshipfights/auth/providers.kt (97%) rename src/jvmMain/kotlin/{ => net}/starshipfights/auth/ratelimit.kt (96%) rename src/jvmMain/kotlin/{ => net}/starshipfights/auth/utils.kt (90%) rename src/jvmMain/kotlin/{ => net}/starshipfights/data/admiralty/admirals.kt (93%) rename src/jvmMain/kotlin/{ => net}/starshipfights/data/admiralty/battle_records.kt (72%) rename src/jvmMain/kotlin/{ => net}/starshipfights/data/admiralty/ship_prices.kt (82%) rename src/jvmMain/kotlin/{ => net}/starshipfights/data/auth/user_sessions.kt (89%) rename src/jvmMain/kotlin/{ => net}/starshipfights/data/auth/user_trophies.kt (86%) rename src/jvmMain/kotlin/{ => net}/starshipfights/data/data_connection.kt (98%) rename src/jvmMain/kotlin/{ => net}/starshipfights/data/data_documents.kt (99%) rename src/jvmMain/kotlin/{ => net}/starshipfights/data/data_jvm.kt (94%) rename src/jvmMain/kotlin/{ => net}/starshipfights/data/data_routines.kt (78%) rename src/jvmMain/kotlin/{ => net}/starshipfights/game/ai/util_jvm.kt (92%) rename src/jvmMain/kotlin/{ => net}/starshipfights/game/concurrency.kt (88%) rename src/jvmMain/kotlin/{ => net}/starshipfights/game/endpoints_game.kt (90%) rename src/jvmMain/kotlin/{ => net}/starshipfights/game/game_start_jvm.kt (93%) rename src/jvmMain/kotlin/{ => net}/starshipfights/game/game_time_jvm.kt (95%) rename src/jvmMain/kotlin/{ => net}/starshipfights/game/server_game.kt (95%) rename src/jvmMain/kotlin/{ => net}/starshipfights/game/server_matchmaking.kt (96%) rename src/jvmMain/kotlin/{ => net}/starshipfights/game/util_jvm.kt (96%) rename src/jvmMain/kotlin/{ => net}/starshipfights/game/views_game.kt (94%) rename src/jvmMain/kotlin/{ => net}/starshipfights/game/views_training.kt (82%) rename src/jvmMain/kotlin/{ => net}/starshipfights/info/endpoints_info.kt (87%) rename src/jvmMain/kotlin/{ => net}/starshipfights/info/html_utils.kt (82%) rename src/jvmMain/kotlin/{ => net}/starshipfights/info/view_bar.kt (87%) rename src/jvmMain/kotlin/{ => net}/starshipfights/info/view_nav.kt (89%) rename src/jvmMain/kotlin/{ => net}/starshipfights/info/view_tpl.kt (93%) rename src/jvmMain/kotlin/{ => net}/starshipfights/info/views_error.kt (91%) rename src/jvmMain/kotlin/{ => net}/starshipfights/info/views_gdpr.kt (93%) rename src/jvmMain/kotlin/{ => net}/starshipfights/info/views_main.kt (98%) rename src/jvmMain/kotlin/{ => net}/starshipfights/info/views_ships.kt (99%) rename src/jvmMain/kotlin/{ => net}/starshipfights/info/views_user.kt (98%) rename src/jvmMain/kotlin/{ => net}/starshipfights/server.kt (95%) rename src/jvmMain/kotlin/{ => net}/starshipfights/server_conf.kt (95%) rename src/jvmMain/kotlin/{ => net}/starshipfights/server_utils.kt (95%) rename src/jvmTest/kotlin/{ => net}/starshipfights/game/ai/AITesting.kt (98%) diff --git a/build.gradle.kts b/build.gradle.kts index 3fad64f..1d23ed9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -128,7 +128,7 @@ kotlin { } application { - mainClass.set("starshipfights.Server") + mainClass.set("net.starshipfights.Server") } tasks.named("jvmProcessResources") { @@ -185,5 +185,5 @@ tasks.named("run") { tasks.create("runAiTest", JavaExec::class.java) { group = "test" classpath = sourceSets.getByName("test").runtimeClasspath - mainClass.set("starshipfights.game.ai.AITesting") + mainClass.set("net.starshipfights.game.ai.AITesting") } diff --git a/src/commonMain/kotlin/starshipfights/data/admiralty/admiral_names.kt b/src/commonMain/kotlin/net/starshipfights/data/admiralty/admiral_names.kt similarity index 99% rename from src/commonMain/kotlin/starshipfights/data/admiralty/admiral_names.kt rename to src/commonMain/kotlin/net/starshipfights/data/admiralty/admiral_names.kt index 520829d..dbb6816 100644 --- a/src/commonMain/kotlin/starshipfights/data/admiralty/admiral_names.kt +++ b/src/commonMain/kotlin/net/starshipfights/data/admiralty/admiral_names.kt @@ -1,6 +1,6 @@ -package starshipfights.data.admiralty +package net.starshipfights.data.admiralty -import starshipfights.game.Faction +import net.starshipfights.game.Faction import kotlin.random.Random enum class AdmiralNameFlavor { diff --git a/src/commonMain/kotlin/starshipfights/data/admiralty/ship_names.kt b/src/commonMain/kotlin/net/starshipfights/data/admiralty/ship_names.kt similarity index 98% rename from src/commonMain/kotlin/starshipfights/data/admiralty/ship_names.kt rename to src/commonMain/kotlin/net/starshipfights/data/admiralty/ship_names.kt index d09ce98..1e89acd 100644 --- a/src/commonMain/kotlin/starshipfights/data/admiralty/ship_names.kt +++ b/src/commonMain/kotlin/net/starshipfights/data/admiralty/ship_names.kt @@ -1,7 +1,7 @@ -package starshipfights.data.admiralty +package net.starshipfights.data.admiralty -import starshipfights.game.Faction -import starshipfights.game.ShipWeightClass +import net.starshipfights.game.Faction +import net.starshipfights.game.ShipWeightClass import kotlin.random.Random fun newShipName(faction: Faction, shipWeightClass: ShipWeightClass, existingNames: MutableSet) = generateSequence { diff --git a/src/commonMain/kotlin/starshipfights/data/data.kt b/src/commonMain/kotlin/net/starshipfights/data/data.kt similarity index 96% rename from src/commonMain/kotlin/starshipfights/data/data.kt rename to src/commonMain/kotlin/net/starshipfights/data/data.kt index 7f67836..ba3f3c2 100644 --- a/src/commonMain/kotlin/starshipfights/data/data.kt +++ b/src/commonMain/kotlin/net/starshipfights/data/data.kt @@ -1,4 +1,4 @@ -package starshipfights.data +package net.starshipfights.data import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable diff --git a/src/commonMain/kotlin/starshipfights/game/admiralty.kt b/src/commonMain/kotlin/net/starshipfights/game/admiralty.kt similarity index 97% rename from src/commonMain/kotlin/starshipfights/game/admiralty.kt rename to src/commonMain/kotlin/net/starshipfights/game/admiralty.kt index bef1076..e6506b6 100644 --- a/src/commonMain/kotlin/starshipfights/game/admiralty.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/admiralty.kt @@ -1,7 +1,7 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable -import starshipfights.data.Id +import net.starshipfights.data.Id enum class AdmiralRank { REAR_ADMIRAL, diff --git a/src/commonMain/kotlin/starshipfights/game/ai/ai_behaviors.kt b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_behaviors.kt similarity index 99% rename from src/commonMain/kotlin/starshipfights/game/ai/ai_behaviors.kt rename to src/commonMain/kotlin/net/starshipfights/game/ai/ai_behaviors.kt index a2f392a..803ae3a 100644 --- a/src/commonMain/kotlin/starshipfights/game/ai/ai_behaviors.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_behaviors.kt @@ -1,4 +1,4 @@ -package starshipfights.game.ai +package net.starshipfights.game.ai import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel @@ -6,8 +6,8 @@ import kotlinx.coroutines.channels.ReceiveChannel import kotlinx.coroutines.channels.SendChannel import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.produceIn -import starshipfights.data.Id -import starshipfights.game.* +import net.starshipfights.data.Id +import net.starshipfights.game.* import kotlin.math.pow import kotlin.random.Random diff --git a/src/commonMain/kotlin/starshipfights/game/ai/ai_brainitude.kt b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_brainitude.kt similarity index 91% rename from src/commonMain/kotlin/starshipfights/game/ai/ai_brainitude.kt rename to src/commonMain/kotlin/net/starshipfights/game/ai/ai_brainitude.kt index e5cd88b..cd1339c 100644 --- a/src/commonMain/kotlin/starshipfights/game/ai/ai_brainitude.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_brainitude.kt @@ -1,11 +1,11 @@ -package starshipfights.game.ai +package net.starshipfights.game.ai import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonElement -import starshipfights.data.Id -import starshipfights.game.ShipInstance -import starshipfights.game.jsonSerializer +import net.starshipfights.data.Id +import net.starshipfights.game.ShipInstance +import net.starshipfights.game.jsonSerializer import kotlin.jvm.JvmInline import kotlin.properties.ReadOnlyProperty diff --git a/src/commonMain/kotlin/starshipfights/game/ai/ai_coroutine.kt b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_coroutine.kt similarity index 87% rename from src/commonMain/kotlin/starshipfights/game/ai/ai_coroutine.kt rename to src/commonMain/kotlin/net/starshipfights/game/ai/ai_coroutine.kt index 0c3cfa5..3644f13 100644 --- a/src/commonMain/kotlin/starshipfights/game/ai/ai_coroutine.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_coroutine.kt @@ -1,4 +1,4 @@ -package starshipfights.game.ai +package net.starshipfights.game.ai import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Job @@ -8,10 +8,10 @@ import kotlinx.coroutines.channels.SendChannel import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.launch -import starshipfights.game.GameEvent -import starshipfights.game.GameState -import starshipfights.game.GlobalSide -import starshipfights.game.PlayerAction +import net.starshipfights.game.GameEvent +import net.starshipfights.game.GameState +import net.starshipfights.game.GlobalSide +import net.starshipfights.game.PlayerAction data class AISession( val mySide: GlobalSide, diff --git a/src/commonMain/kotlin/starshipfights/game/ai/ai_optimization.kt b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_optimization.kt similarity index 98% rename from src/commonMain/kotlin/starshipfights/game/ai/ai_optimization.kt rename to src/commonMain/kotlin/net/starshipfights/game/ai/ai_optimization.kt index 3b01eca..8b755b2 100644 --- a/src/commonMain/kotlin/starshipfights/game/ai/ai_optimization.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_optimization.kt @@ -1,4 +1,4 @@ -package starshipfights.game.ai +package net.starshipfights.game.ai import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel @@ -8,8 +8,8 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.selects.select import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import starshipfights.data.Id -import starshipfights.game.* +import net.starshipfights.data.Id +import net.starshipfights.game.* import kotlin.math.PI import kotlin.random.Random diff --git a/src/commonMain/kotlin/starshipfights/game/ai/ai_optimization_util.kt b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_optimization_util.kt similarity index 97% rename from src/commonMain/kotlin/starshipfights/game/ai/ai_optimization_util.kt rename to src/commonMain/kotlin/net/starshipfights/game/ai/ai_optimization_util.kt index 216f6cb..da20d90 100644 --- a/src/commonMain/kotlin/starshipfights/game/ai/ai_optimization_util.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_optimization_util.kt @@ -1,6 +1,6 @@ -package starshipfights.game.ai +package net.starshipfights.game.ai -import starshipfights.game.EPSILON +import net.starshipfights.game.EPSILON import kotlin.jvm.JvmInline import kotlin.math.abs import kotlin.math.sqrt diff --git a/src/commonMain/kotlin/starshipfights/game/ai/ai_util.kt b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_util.kt similarity index 76% rename from src/commonMain/kotlin/starshipfights/game/ai/ai_util.kt rename to src/commonMain/kotlin/net/starshipfights/game/ai/ai_util.kt index 7f9c525..a953554 100644 --- a/src/commonMain/kotlin/starshipfights/game/ai/ai_util.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_util.kt @@ -1,4 +1,4 @@ -package starshipfights.game.ai +package net.starshipfights.game.ai import kotlinx.serialization.builtins.serializer diff --git a/src/commonMain/kotlin/starshipfights/game/ai/ai_util_combat.kt b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_util_combat.kt similarity index 93% rename from src/commonMain/kotlin/starshipfights/game/ai/ai_util_combat.kt rename to src/commonMain/kotlin/net/starshipfights/game/ai/ai_util_combat.kt index 926ed08..4055603 100644 --- a/src/commonMain/kotlin/starshipfights/game/ai/ai_util_combat.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_util_combat.kt @@ -1,6 +1,6 @@ -package starshipfights.game.ai +package net.starshipfights.game.ai -import starshipfights.game.* +import net.starshipfights.game.* val combatTargetShipWeight by instinct(0.5..2.5) diff --git a/src/commonMain/kotlin/starshipfights/game/ai/ai_util_deploy.kt b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_util_deploy.kt similarity index 96% rename from src/commonMain/kotlin/starshipfights/game/ai/ai_util_deploy.kt rename to src/commonMain/kotlin/net/starshipfights/game/ai/ai_util_deploy.kt index 8bb6e23..097127a 100644 --- a/src/commonMain/kotlin/starshipfights/game/ai/ai_util_deploy.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_util_deploy.kt @@ -1,7 +1,7 @@ -package starshipfights.game.ai +package net.starshipfights.game.ai -import starshipfights.data.Id -import starshipfights.game.* +import net.starshipfights.data.Id +import net.starshipfights.game.* import kotlin.math.sign val deployEscortFocus by instinct(1.0..5.0) diff --git a/src/commonMain/kotlin/starshipfights/game/ai/ai_util_nav.kt b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_util_nav.kt similarity index 98% rename from src/commonMain/kotlin/starshipfights/game/ai/ai_util_nav.kt rename to src/commonMain/kotlin/net/starshipfights/game/ai/ai_util_nav.kt index 55fb9ee..524b4d3 100644 --- a/src/commonMain/kotlin/starshipfights/game/ai/ai_util_nav.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ai/ai_util_nav.kt @@ -1,7 +1,7 @@ -package starshipfights.game.ai +package net.starshipfights.game.ai -import starshipfights.data.Id -import starshipfights.game.* +import net.starshipfights.data.Id +import net.starshipfights.game.* import kotlin.math.expm1 import kotlin.math.pow diff --git a/src/commonMain/kotlin/starshipfights/game/ai/util.kt b/src/commonMain/kotlin/net/starshipfights/game/ai/util.kt similarity index 92% rename from src/commonMain/kotlin/starshipfights/game/ai/util.kt rename to src/commonMain/kotlin/net/starshipfights/game/ai/util.kt index ddd1425..6d01dd4 100644 --- a/src/commonMain/kotlin/starshipfights/game/ai/util.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ai/util.kt @@ -1,8 +1,8 @@ -package starshipfights.game.ai +package net.starshipfights.game.ai -import starshipfights.game.EPSILON -import starshipfights.game.Vec2 -import starshipfights.game.div +import net.starshipfights.game.EPSILON +import net.starshipfights.game.Vec2 +import net.starshipfights.game.div import kotlin.math.absoluteValue import kotlin.math.nextUp import kotlin.math.pow diff --git a/src/commonMain/kotlin/starshipfights/game/client_mode.kt b/src/commonMain/kotlin/net/starshipfights/game/client_mode.kt similarity index 93% rename from src/commonMain/kotlin/starshipfights/game/client_mode.kt rename to src/commonMain/kotlin/net/starshipfights/game/client_mode.kt index b4e9198..246ab83 100644 --- a/src/commonMain/kotlin/starshipfights/game/client_mode.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/client_mode.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable diff --git a/src/commonMain/kotlin/starshipfights/game/game_ability.kt b/src/commonMain/kotlin/net/starshipfights/game/game_ability.kt similarity index 99% rename from src/commonMain/kotlin/starshipfights/game/game_ability.kt rename to src/commonMain/kotlin/net/starshipfights/game/game_ability.kt index 108c367..6b7fb1b 100644 --- a/src/commonMain/kotlin/starshipfights/game/game_ability.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/game_ability.kt @@ -1,7 +1,7 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable -import starshipfights.data.Id +import net.starshipfights.data.Id import kotlin.math.abs import kotlin.random.Random diff --git a/src/commonMain/kotlin/starshipfights/game/game_chat.kt b/src/commonMain/kotlin/net/starshipfights/game/game_chat.kt similarity index 97% rename from src/commonMain/kotlin/starshipfights/game/game_chat.kt rename to src/commonMain/kotlin/net/starshipfights/game/game_chat.kt index a1b2d68..5426847 100644 --- a/src/commonMain/kotlin/starshipfights/game/game_chat.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/game_chat.kt @@ -1,7 +1,7 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable -import starshipfights.data.Id +import net.starshipfights.data.Id @Serializable sealed class ChatEntry { diff --git a/src/commonMain/kotlin/starshipfights/game/game_initiative.kt b/src/commonMain/kotlin/net/starshipfights/game/game_initiative.kt similarity index 98% rename from src/commonMain/kotlin/starshipfights/game/game_initiative.kt rename to src/commonMain/kotlin/net/starshipfights/game/game_initiative.kt index 3e9b700..185632f 100644 --- a/src/commonMain/kotlin/starshipfights/game/game_initiative.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/game_initiative.kt @@ -1,7 +1,7 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable -import starshipfights.data.Id +import net.starshipfights.data.Id @Serializable data class InitiativePair( diff --git a/src/commonMain/kotlin/starshipfights/game/game_packet.kt b/src/commonMain/kotlin/net/starshipfights/game/game_packet.kt similarity index 98% rename from src/commonMain/kotlin/starshipfights/game/game_packet.kt rename to src/commonMain/kotlin/net/starshipfights/game/game_packet.kt index 5231351..0634d3e 100644 --- a/src/commonMain/kotlin/starshipfights/game/game_packet.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/game_packet.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable diff --git a/src/commonMain/kotlin/starshipfights/game/game_phase.kt b/src/commonMain/kotlin/net/starshipfights/game/game_phase.kt similarity index 96% rename from src/commonMain/kotlin/starshipfights/game/game_phase.kt rename to src/commonMain/kotlin/net/starshipfights/game/game_phase.kt index 51b4b93..a32ece2 100644 --- a/src/commonMain/kotlin/starshipfights/game/game_phase.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/game_phase.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable diff --git a/src/commonMain/kotlin/starshipfights/game/game_start.kt b/src/commonMain/kotlin/net/starshipfights/game/game_start.kt similarity index 89% rename from src/commonMain/kotlin/starshipfights/game/game_start.kt rename to src/commonMain/kotlin/net/starshipfights/game/game_start.kt index 64a921b..744349c 100644 --- a/src/commonMain/kotlin/starshipfights/game/game_start.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/game_start.kt @@ -1,7 +1,7 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable -import starshipfights.data.Id +import net.starshipfights.data.Id @Serializable data class GameStart( diff --git a/src/commonMain/kotlin/starshipfights/game/game_state.kt b/src/commonMain/kotlin/net/starshipfights/game/game_state.kt similarity index 99% rename from src/commonMain/kotlin/starshipfights/game/game_state.kt rename to src/commonMain/kotlin/net/starshipfights/game/game_state.kt index 231362b..6cfee8f 100644 --- a/src/commonMain/kotlin/starshipfights/game/game_state.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/game_state.kt @@ -1,7 +1,7 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable -import starshipfights.data.Id +import net.starshipfights.data.Id @Serializable data class GameState( diff --git a/src/commonMain/kotlin/starshipfights/game/game_subplots.kt b/src/commonMain/kotlin/net/starshipfights/game/game_subplots.kt similarity index 99% rename from src/commonMain/kotlin/starshipfights/game/game_subplots.kt rename to src/commonMain/kotlin/net/starshipfights/game/game_subplots.kt index 6d68742..e47ef82 100644 --- a/src/commonMain/kotlin/starshipfights/game/game_subplots.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/game_subplots.kt @@ -1,7 +1,7 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable -import starshipfights.data.Id +import net.starshipfights.data.Id @Serializable data class GameObjective( diff --git a/src/commonMain/kotlin/starshipfights/game/game_time.kt b/src/commonMain/kotlin/net/starshipfights/game/game_time.kt similarity index 96% rename from src/commonMain/kotlin/starshipfights/game/game_time.kt rename to src/commonMain/kotlin/net/starshipfights/game/game_time.kt index 583745d..ca00e24 100644 --- a/src/commonMain/kotlin/starshipfights/game/game_time.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/game_time.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable diff --git a/src/commonMain/kotlin/starshipfights/game/matchmaking.kt b/src/commonMain/kotlin/net/starshipfights/game/matchmaking.kt similarity index 97% rename from src/commonMain/kotlin/starshipfights/game/matchmaking.kt rename to src/commonMain/kotlin/net/starshipfights/game/matchmaking.kt index bbfe00a..a3fda7f 100644 --- a/src/commonMain/kotlin/starshipfights/game/matchmaking.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/matchmaking.kt @@ -1,7 +1,7 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable -import starshipfights.data.Id +import net.starshipfights.data.Id enum class BattleSize(val numPoints: Int, val maxWeightClass: ShipWeightClass, val displayName: String) { SKIRMISH(600, ShipWeightClass.CRUISER, "Skirmish"), diff --git a/src/commonMain/kotlin/starshipfights/game/math.kt b/src/commonMain/kotlin/net/starshipfights/game/math.kt similarity index 99% rename from src/commonMain/kotlin/starshipfights/game/math.kt rename to src/commonMain/kotlin/net/starshipfights/game/math.kt index ea91db8..e89324c 100644 --- a/src/commonMain/kotlin/starshipfights/game/math.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/math.kt @@ -1,6 +1,6 @@ @file:Suppress("NOTHING_TO_INLINE") -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable import kotlin.jvm.JvmInline diff --git a/src/commonMain/kotlin/starshipfights/game/pick_bounds.kt b/src/commonMain/kotlin/net/starshipfights/game/pick_bounds.kt similarity index 98% rename from src/commonMain/kotlin/starshipfights/game/pick_bounds.kt rename to src/commonMain/kotlin/net/starshipfights/game/pick_bounds.kt index 4afa103..1ec2af6 100644 --- a/src/commonMain/kotlin/starshipfights/game/pick_bounds.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/pick_bounds.kt @@ -1,7 +1,7 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable -import starshipfights.data.Id +import net.starshipfights.data.Id import kotlin.math.PI import kotlin.math.abs diff --git a/src/commonMain/kotlin/starshipfights/game/ship.kt b/src/commonMain/kotlin/net/starshipfights/game/ship.kt similarity index 99% rename from src/commonMain/kotlin/starshipfights/game/ship.kt rename to src/commonMain/kotlin/net/starshipfights/game/ship.kt index 123b197..a1eaf9b 100644 --- a/src/commonMain/kotlin/starshipfights/game/ship.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ship.kt @@ -1,7 +1,7 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable -import starshipfights.data.Id +import net.starshipfights.data.Id import kotlin.math.PI @Serializable diff --git a/src/commonMain/kotlin/starshipfights/game/ship_boarding.kt b/src/commonMain/kotlin/net/starshipfights/game/ship_boarding.kt similarity index 98% rename from src/commonMain/kotlin/starshipfights/game/ship_boarding.kt rename to src/commonMain/kotlin/net/starshipfights/game/ship_boarding.kt index de7eccc..599e299 100644 --- a/src/commonMain/kotlin/starshipfights/game/ship_boarding.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ship_boarding.kt @@ -1,6 +1,6 @@ -package starshipfights.game +package net.starshipfights.game -import starshipfights.data.Id +import net.starshipfights.data.Id import kotlin.math.roundToInt fun factionBoardingModifier(faction: Faction): Int = when (faction) { diff --git a/src/commonMain/kotlin/starshipfights/game/ship_factions.kt b/src/commonMain/kotlin/net/starshipfights/game/ship_factions.kt similarity index 99% rename from src/commonMain/kotlin/starshipfights/game/ship_factions.kt rename to src/commonMain/kotlin/net/starshipfights/game/ship_factions.kt index 9791bdf..8074813 100644 --- a/src/commonMain/kotlin/starshipfights/game/ship_factions.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ship_factions.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.html.TagConsumer import kotlinx.html.i diff --git a/src/commonMain/kotlin/starshipfights/game/ship_instances.kt b/src/commonMain/kotlin/net/starshipfights/game/ship_instances.kt similarity index 99% rename from src/commonMain/kotlin/starshipfights/game/ship_instances.kt rename to src/commonMain/kotlin/net/starshipfights/game/ship_instances.kt index c1a41bd..c3b5d48 100644 --- a/src/commonMain/kotlin/starshipfights/game/ship_instances.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ship_instances.kt @@ -1,7 +1,7 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable -import starshipfights.data.Id +import net.starshipfights.data.Id import kotlin.math.abs import kotlin.math.pow import kotlin.math.sqrt diff --git a/src/commonMain/kotlin/net/starshipfights/game/ship_modifiers.kt b/src/commonMain/kotlin/net/starshipfights/game/ship_modifiers.kt new file mode 100644 index 0000000..8b3711e --- /dev/null +++ b/src/commonMain/kotlin/net/starshipfights/game/ship_modifiers.kt @@ -0,0 +1,3 @@ +package net.starshipfights.game + + diff --git a/src/commonMain/kotlin/starshipfights/game/ship_modules.kt b/src/commonMain/kotlin/net/starshipfights/game/ship_modules.kt similarity index 99% rename from src/commonMain/kotlin/starshipfights/game/ship_modules.kt rename to src/commonMain/kotlin/net/starshipfights/game/ship_modules.kt index ded8f80..4916247 100644 --- a/src/commonMain/kotlin/starshipfights/game/ship_modules.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ship_modules.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable @@ -7,7 +7,7 @@ import kotlinx.serialization.builtins.PairSerializer import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder -import starshipfights.data.Id +import net.starshipfights.data.Id import kotlin.jvm.JvmInline @Serializable diff --git a/src/commonMain/kotlin/starshipfights/game/ship_types.kt b/src/commonMain/kotlin/net/starshipfights/game/ship_types.kt similarity index 99% rename from src/commonMain/kotlin/starshipfights/game/ship_types.kt rename to src/commonMain/kotlin/net/starshipfights/game/ship_types.kt index dace42a..a88f433 100644 --- a/src/commonMain/kotlin/starshipfights/game/ship_types.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ship_types.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game enum class ShipWeightClass( val meshIndex: Int, diff --git a/src/commonMain/kotlin/starshipfights/game/ship_weapons.kt b/src/commonMain/kotlin/net/starshipfights/game/ship_weapons.kt similarity index 99% rename from src/commonMain/kotlin/starshipfights/game/ship_weapons.kt rename to src/commonMain/kotlin/net/starshipfights/game/ship_weapons.kt index 73cf8f9..f96d84c 100644 --- a/src/commonMain/kotlin/starshipfights/game/ship_weapons.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ship_weapons.kt @@ -1,7 +1,7 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable -import starshipfights.data.Id +import net.starshipfights.data.Id import kotlin.math.* import kotlin.random.Random diff --git a/src/commonMain/kotlin/starshipfights/game/ship_weapons_formats.kt b/src/commonMain/kotlin/net/starshipfights/game/ship_weapons_formats.kt similarity index 99% rename from src/commonMain/kotlin/starshipfights/game/ship_weapons_formats.kt rename to src/commonMain/kotlin/net/starshipfights/game/ship_weapons_formats.kt index f8fac6d..cff3fd0 100644 --- a/src/commonMain/kotlin/starshipfights/game/ship_weapons_formats.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ship_weapons_formats.kt @@ -1,6 +1,6 @@ -package starshipfights.game +package net.starshipfights.game -import starshipfights.data.Id +import net.starshipfights.data.Id private class ShipWeaponIdCounter { private var numCannons = 0 diff --git a/src/commonMain/kotlin/starshipfights/game/ship_weapons_list.kt b/src/commonMain/kotlin/net/starshipfights/game/ship_weapons_list.kt similarity index 99% rename from src/commonMain/kotlin/starshipfights/game/ship_weapons_list.kt rename to src/commonMain/kotlin/net/starshipfights/game/ship_weapons_list.kt index 234e141..1508a94 100644 --- a/src/commonMain/kotlin/starshipfights/game/ship_weapons_list.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ship_weapons_list.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game val ShipType.armaments: ShipArmaments get() = when (this) { diff --git a/src/commonMain/kotlin/starshipfights/game/util.kt b/src/commonMain/kotlin/net/starshipfights/game/util.kt similarity index 98% rename from src/commonMain/kotlin/starshipfights/game/util.kt rename to src/commonMain/kotlin/net/starshipfights/game/util.kt index 6618d98..e53fc7b 100644 --- a/src/commonMain/kotlin/starshipfights/game/util.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/util.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.html.* import kotlinx.serialization.KSerializer diff --git a/src/commonMain/kotlin/starshipfights/game/ship_modifiers.kt b/src/commonMain/kotlin/starshipfights/game/ship_modifiers.kt deleted file mode 100644 index 6d6cbd1..0000000 --- a/src/commonMain/kotlin/starshipfights/game/ship_modifiers.kt +++ /dev/null @@ -1,3 +0,0 @@ -package starshipfights.game - - diff --git a/src/jsMain/kotlin/starshipfights/game/ai/util_js.kt b/src/jsMain/kotlin/net/starshipfights/game/ai/util_js.kt similarity index 87% rename from src/jsMain/kotlin/starshipfights/game/ai/util_js.kt rename to src/jsMain/kotlin/net/starshipfights/game/ai/util_js.kt index be36797..06f9f77 100644 --- a/src/jsMain/kotlin/starshipfights/game/ai/util_js.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/ai/util_js.kt @@ -1,4 +1,4 @@ -package starshipfights.game.ai +package net.starshipfights.game.ai actual fun logDebug(message: Any?) { console.log(message) diff --git a/src/jsMain/kotlin/starshipfights/game/client.kt b/src/jsMain/kotlin/net/starshipfights/game/client.kt similarity index 98% rename from src/jsMain/kotlin/starshipfights/game/client.kt rename to src/jsMain/kotlin/net/starshipfights/game/client.kt index 5534cc8..edbe1ad 100644 --- a/src/jsMain/kotlin/starshipfights/game/client.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/client.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import io.ktor.client.* import io.ktor.client.engine.js.* diff --git a/src/jsMain/kotlin/starshipfights/game/client_error.kt b/src/jsMain/kotlin/net/starshipfights/game/client_error.kt similarity index 87% rename from src/jsMain/kotlin/starshipfights/game/client_error.kt rename to src/jsMain/kotlin/net/starshipfights/game/client_error.kt index 0618cc6..a2194cd 100644 --- a/src/jsMain/kotlin/starshipfights/game/client_error.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/client_error.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.launch diff --git a/src/jsMain/kotlin/starshipfights/game/client_game.kt b/src/jsMain/kotlin/net/starshipfights/game/client_game.kt similarity index 99% rename from src/jsMain/kotlin/starshipfights/game/client_game.kt rename to src/jsMain/kotlin/net/starshipfights/game/client_game.kt index 2a43721..9b95edb 100644 --- a/src/jsMain/kotlin/starshipfights/game/client_game.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/client_game.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import externals.threejs.* import io.ktor.client.features.websocket.* diff --git a/src/jsMain/kotlin/starshipfights/game/client_matchmaking.kt b/src/jsMain/kotlin/net/starshipfights/game/client_matchmaking.kt similarity index 98% rename from src/jsMain/kotlin/starshipfights/game/client_matchmaking.kt rename to src/jsMain/kotlin/net/starshipfights/game/client_matchmaking.kt index c110bfa..5c6341e 100644 --- a/src/jsMain/kotlin/starshipfights/game/client_matchmaking.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/client_matchmaking.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import externals.threejs.PerspectiveCamera import externals.threejs.Scene @@ -15,7 +15,7 @@ import kotlinx.html.dom.append import kotlinx.html.hiddenInput import kotlinx.html.js.form import kotlinx.html.style -import starshipfights.data.Id +import net.starshipfights.data.Id suspend fun setupBackground() { val camera = PerspectiveCamera(69, window.aspectRatio, 0.01, 1_000) diff --git a/src/jsMain/kotlin/starshipfights/game/client_training.kt b/src/jsMain/kotlin/net/starshipfights/game/client_training.kt similarity index 96% rename from src/jsMain/kotlin/starshipfights/game/client_training.kt rename to src/jsMain/kotlin/net/starshipfights/game/client_training.kt index b6f178c..8086704 100644 --- a/src/jsMain/kotlin/starshipfights/game/client_training.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/client_training.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel @@ -7,8 +7,8 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import starshipfights.game.ai.AISession -import starshipfights.game.ai.aiPlayer +import net.starshipfights.game.ai.AISession +import net.starshipfights.game.ai.aiPlayer class GameSession(gameState: GameState) { private val stateMutable = MutableStateFlow(gameState) diff --git a/src/jsMain/kotlin/starshipfights/game/game_render.kt b/src/jsMain/kotlin/net/starshipfights/game/game_render.kt similarity index 97% rename from src/jsMain/kotlin/starshipfights/game/game_render.kt rename to src/jsMain/kotlin/net/starshipfights/game/game_render.kt index 69e6569..d0ff67f 100644 --- a/src/jsMain/kotlin/starshipfights/game/game_render.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/game_render.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import externals.threejs.* diff --git a/src/jsMain/kotlin/starshipfights/game/game_resources.kt b/src/jsMain/kotlin/net/starshipfights/game/game_resources.kt similarity index 99% rename from src/jsMain/kotlin/starshipfights/game/game_resources.kt rename to src/jsMain/kotlin/net/starshipfights/game/game_resources.kt index 3ab3641..0d73b67 100644 --- a/src/jsMain/kotlin/starshipfights/game/game_resources.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/game_resources.kt @@ -1,12 +1,12 @@ -package starshipfights.game +package net.starshipfights.game import externals.threejs.* import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.joinAll import kotlinx.coroutines.launch +import net.starshipfights.data.Id import org.w3c.dom.Image -import starshipfights.data.Id import kotlin.math.PI import kotlin.math.roundToInt diff --git a/src/jsMain/kotlin/starshipfights/game/game_time_js.kt b/src/jsMain/kotlin/net/starshipfights/game/game_time_js.kt similarity index 93% rename from src/jsMain/kotlin/starshipfights/game/game_time_js.kt rename to src/jsMain/kotlin/net/starshipfights/game/game_time_js.kt index 4ea6ba0..ac246bd 100644 --- a/src/jsMain/kotlin/starshipfights/game/game_time_js.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/game_time_js.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable import kotlin.js.Date diff --git a/src/jsMain/kotlin/starshipfights/game/game_ui.kt b/src/jsMain/kotlin/net/starshipfights/game/game_ui.kt similarity index 99% rename from src/jsMain/kotlin/starshipfights/game/game_ui.kt rename to src/jsMain/kotlin/net/starshipfights/game/game_ui.kt index d18225e..fd2dc23 100644 --- a/src/jsMain/kotlin/starshipfights/game/game_ui.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/game_ui.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import externals.textfit.textFit import externals.threejs.* @@ -11,9 +11,9 @@ import kotlinx.html.dom.append import kotlinx.html.dom.create import kotlinx.html.js.div import kotlinx.html.js.onClickFunction +import net.starshipfights.data.Id import org.w3c.dom.* import org.w3c.dom.events.KeyboardEvent -import starshipfights.data.Id interface GameUIResponder { fun doAction(action: PlayerAction) diff --git a/src/jsMain/kotlin/starshipfights/game/loaders.kt b/src/jsMain/kotlin/net/starshipfights/game/loaders.kt similarity index 98% rename from src/jsMain/kotlin/starshipfights/game/loaders.kt rename to src/jsMain/kotlin/net/starshipfights/game/loaders.kt index f4d25bc..3c0f45b 100644 --- a/src/jsMain/kotlin/starshipfights/game/loaders.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/loaders.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import com.juul.indexeddb.Database import com.juul.indexeddb.Key diff --git a/src/jsMain/kotlin/starshipfights/game/pick_bounds_js.kt b/src/jsMain/kotlin/net/starshipfights/game/pick_bounds_js.kt similarity index 99% rename from src/jsMain/kotlin/starshipfights/game/pick_bounds_js.kt rename to src/jsMain/kotlin/net/starshipfights/game/pick_bounds_js.kt index 619dfc0..ad794c5 100644 --- a/src/jsMain/kotlin/starshipfights/game/pick_bounds_js.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/pick_bounds_js.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import externals.threejs.* import kotlinx.browser.window diff --git a/src/jsMain/kotlin/starshipfights/game/popup.kt b/src/jsMain/kotlin/net/starshipfights/game/popup.kt similarity index 99% rename from src/jsMain/kotlin/starshipfights/game/popup.kt rename to src/jsMain/kotlin/net/starshipfights/game/popup.kt index 09172fb..931508a 100644 --- a/src/jsMain/kotlin/starshipfights/game/popup.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/popup.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.browser.document import kotlinx.coroutines.launch diff --git a/src/jsMain/kotlin/starshipfights/game/popup_util.kt b/src/jsMain/kotlin/net/starshipfights/game/popup_util.kt similarity index 98% rename from src/jsMain/kotlin/starshipfights/game/popup_util.kt rename to src/jsMain/kotlin/net/starshipfights/game/popup_util.kt index ea8bbce..548254d 100644 --- a/src/jsMain/kotlin/starshipfights/game/popup_util.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/popup_util.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game sealed class MainMenuOption { object Singleplayer : MainMenuOption() diff --git a/src/jsMain/kotlin/starshipfights/game/ship_selecting.kt b/src/jsMain/kotlin/net/starshipfights/game/ship_selecting.kt similarity index 96% rename from src/jsMain/kotlin/starshipfights/game/ship_selecting.kt rename to src/jsMain/kotlin/net/starshipfights/game/ship_selecting.kt index 850334d..341a256 100644 --- a/src/jsMain/kotlin/starshipfights/game/ship_selecting.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/ship_selecting.kt @@ -1,13 +1,13 @@ -package starshipfights.game +package net.starshipfights.game import externals.threejs.Group import externals.threejs.Raycaster import kotlinx.browser.document import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow +import net.starshipfights.data.Id import org.w3c.dom.HTMLCanvasElement import org.w3c.dom.events.MouseEvent -import starshipfights.data.Id val threeCanvas = document.getElementById("three-canvas").unsafeCast() diff --git a/src/jsMain/kotlin/starshipfights/game/util_js.kt b/src/jsMain/kotlin/net/starshipfights/game/util_js.kt similarity index 98% rename from src/jsMain/kotlin/starshipfights/game/util_js.kt rename to src/jsMain/kotlin/net/starshipfights/game/util_js.kt index fa5eb96..0897c54 100644 --- a/src/jsMain/kotlin/starshipfights/game/util_js.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/util_js.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import io.ktor.http.cio.websocket.* import kotlinx.browser.window diff --git a/src/jvmMain/kotlin/starshipfights/auth/providers.kt b/src/jvmMain/kotlin/net/starshipfights/auth/providers.kt similarity index 97% rename from src/jvmMain/kotlin/starshipfights/auth/providers.kt rename to src/jvmMain/kotlin/net/starshipfights/auth/providers.kt index f776aaf..4a7c825 100644 --- a/src/jvmMain/kotlin/starshipfights/auth/providers.kt +++ b/src/jvmMain/kotlin/net/starshipfights/auth/providers.kt @@ -1,4 +1,4 @@ -package starshipfights.auth +package net.starshipfights.auth import io.ktor.application.* import io.ktor.auth.* @@ -20,21 +20,21 @@ import kotlinx.coroutines.flow.toList import kotlinx.coroutines.launch import kotlinx.html.* import kotlinx.serialization.Serializable +import net.starshipfights.CurrentConfiguration +import net.starshipfights.DiscordLogin +import net.starshipfights.data.Id +import net.starshipfights.data.admiralty.* +import net.starshipfights.data.auth.PreferredTheme +import net.starshipfights.data.auth.User +import net.starshipfights.data.auth.UserSession +import net.starshipfights.data.createNonce +import net.starshipfights.forbid +import net.starshipfights.game.Faction +import net.starshipfights.game.ShipType +import net.starshipfights.game.toUrlSlug +import net.starshipfights.info.* +import net.starshipfights.redirect import org.litote.kmongo.* -import starshipfights.CurrentConfiguration -import starshipfights.DiscordLogin -import starshipfights.data.Id -import starshipfights.data.admiralty.* -import starshipfights.data.auth.PreferredTheme -import starshipfights.data.auth.User -import starshipfights.data.auth.UserSession -import starshipfights.data.createNonce -import starshipfights.forbid -import starshipfights.game.Faction -import starshipfights.game.ShipType -import starshipfights.game.toUrlSlug -import starshipfights.info.* -import starshipfights.redirect import java.time.Instant import java.time.temporal.ChronoUnit diff --git a/src/jvmMain/kotlin/starshipfights/auth/ratelimit.kt b/src/jvmMain/kotlin/net/starshipfights/auth/ratelimit.kt similarity index 96% rename from src/jvmMain/kotlin/starshipfights/auth/ratelimit.kt rename to src/jvmMain/kotlin/net/starshipfights/auth/ratelimit.kt index e339598..ea00971 100644 --- a/src/jvmMain/kotlin/starshipfights/auth/ratelimit.kt +++ b/src/jvmMain/kotlin/net/starshipfights/auth/ratelimit.kt @@ -1,4 +1,4 @@ -package starshipfights.auth +package net.starshipfights.auth import io.ktor.client.* import io.ktor.client.call.* @@ -11,7 +11,7 @@ import kotlinx.coroutines.delay import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json -import starshipfights.rateLimit +import net.starshipfights.rateLimit import kotlin.math.roundToLong class RateLimit( diff --git a/src/jvmMain/kotlin/starshipfights/auth/utils.kt b/src/jvmMain/kotlin/net/starshipfights/auth/utils.kt similarity index 90% rename from src/jvmMain/kotlin/starshipfights/auth/utils.kt rename to src/jvmMain/kotlin/net/starshipfights/auth/utils.kt index 68c4883..27f015f 100644 --- a/src/jvmMain/kotlin/starshipfights/auth/utils.kt +++ b/src/jvmMain/kotlin/net/starshipfights/auth/utils.kt @@ -1,4 +1,4 @@ -package starshipfights.auth +package net.starshipfights.auth import io.ktor.application.* import io.ktor.features.* @@ -7,12 +7,12 @@ import io.ktor.request.* import io.ktor.sessions.* import io.ktor.util.* import kotlinx.serialization.json.Json -import starshipfights.data.Id -import starshipfights.data.auth.User -import starshipfights.data.auth.UserSession -import starshipfights.data.createNonce -import starshipfights.invalidCsrfToken -import starshipfights.redirect +import net.starshipfights.data.Id +import net.starshipfights.data.auth.User +import net.starshipfights.data.auth.UserSession +import net.starshipfights.data.createNonce +import net.starshipfights.invalidCsrfToken +import net.starshipfights.redirect import java.time.Instant import java.time.temporal.ChronoUnit diff --git a/src/jvmMain/kotlin/starshipfights/data/admiralty/admirals.kt b/src/jvmMain/kotlin/net/starshipfights/data/admiralty/admirals.kt similarity index 93% rename from src/jvmMain/kotlin/starshipfights/data/admiralty/admirals.kt rename to src/jvmMain/kotlin/net/starshipfights/data/admiralty/admirals.kt index 88f1180..7c13054 100644 --- a/src/jvmMain/kotlin/starshipfights/data/admiralty/admirals.kt +++ b/src/jvmMain/kotlin/net/starshipfights/data/admiralty/admirals.kt @@ -1,18 +1,18 @@ -package starshipfights.data.admiralty +package net.starshipfights.data.admiralty import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.toList import kotlinx.serialization.Contextual import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import net.starshipfights.data.DataDocument +import net.starshipfights.data.DocumentTable +import net.starshipfights.data.Id +import net.starshipfights.data.auth.User +import net.starshipfights.data.invoke +import net.starshipfights.game.* import org.bson.conversions.Bson import org.litote.kmongo.* -import starshipfights.data.DataDocument -import starshipfights.data.DocumentTable -import starshipfights.data.Id -import starshipfights.data.auth.User -import starshipfights.data.invoke -import starshipfights.game.* import java.time.Instant @Serializable diff --git a/src/jvmMain/kotlin/starshipfights/data/admiralty/battle_records.kt b/src/jvmMain/kotlin/net/starshipfights/data/admiralty/battle_records.kt similarity index 72% rename from src/jvmMain/kotlin/starshipfights/data/admiralty/battle_records.kt rename to src/jvmMain/kotlin/net/starshipfights/data/admiralty/battle_records.kt index e90c09d..f65b8c5 100644 --- a/src/jvmMain/kotlin/starshipfights/data/admiralty/battle_records.kt +++ b/src/jvmMain/kotlin/net/starshipfights/data/admiralty/battle_records.kt @@ -1,15 +1,15 @@ -package starshipfights.data.admiralty +package net.starshipfights.data.admiralty import kotlinx.serialization.Contextual import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import starshipfights.data.DataDocument -import starshipfights.data.DocumentTable -import starshipfights.data.Id -import starshipfights.data.auth.User -import starshipfights.data.invoke -import starshipfights.game.BattleInfo -import starshipfights.game.GlobalSide +import net.starshipfights.data.DataDocument +import net.starshipfights.data.DocumentTable +import net.starshipfights.data.Id +import net.starshipfights.data.auth.User +import net.starshipfights.data.invoke +import net.starshipfights.game.BattleInfo +import net.starshipfights.game.GlobalSide import java.time.Instant @Serializable diff --git a/src/jvmMain/kotlin/starshipfights/data/admiralty/ship_prices.kt b/src/jvmMain/kotlin/net/starshipfights/data/admiralty/ship_prices.kt similarity index 82% rename from src/jvmMain/kotlin/starshipfights/data/admiralty/ship_prices.kt rename to src/jvmMain/kotlin/net/starshipfights/data/admiralty/ship_prices.kt index d2acbb8..5acf4fd 100644 --- a/src/jvmMain/kotlin/starshipfights/data/admiralty/ship_prices.kt +++ b/src/jvmMain/kotlin/net/starshipfights/data/admiralty/ship_prices.kt @@ -1,8 +1,8 @@ -package starshipfights.data.admiralty +package net.starshipfights.data.admiralty -import starshipfights.game.Faction -import starshipfights.game.ShipType -import starshipfights.game.pointCost +import net.starshipfights.game.Faction +import net.starshipfights.game.ShipType +import net.starshipfights.game.pointCost val ShipType.buyPrice: Int get() = pointCost * 6 / 5 diff --git a/src/jvmMain/kotlin/starshipfights/data/auth/user_sessions.kt b/src/jvmMain/kotlin/net/starshipfights/data/auth/user_sessions.kt similarity index 89% rename from src/jvmMain/kotlin/starshipfights/data/auth/user_sessions.kt rename to src/jvmMain/kotlin/net/starshipfights/data/auth/user_sessions.kt index c602df3..4f1c991 100644 --- a/src/jvmMain/kotlin/starshipfights/data/auth/user_sessions.kt +++ b/src/jvmMain/kotlin/net/starshipfights/data/auth/user_sessions.kt @@ -1,13 +1,13 @@ -package starshipfights.data.auth +package net.starshipfights.data.auth import io.ktor.auth.* import kotlinx.serialization.Contextual import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import starshipfights.data.DataDocument -import starshipfights.data.DocumentTable -import starshipfights.data.Id -import starshipfights.data.invoke +import net.starshipfights.data.DataDocument +import net.starshipfights.data.DocumentTable +import net.starshipfights.data.Id +import net.starshipfights.data.invoke import java.time.Instant @Serializable diff --git a/src/jvmMain/kotlin/starshipfights/data/auth/user_trophies.kt b/src/jvmMain/kotlin/net/starshipfights/data/auth/user_trophies.kt similarity index 86% rename from src/jvmMain/kotlin/starshipfights/data/auth/user_trophies.kt rename to src/jvmMain/kotlin/net/starshipfights/data/auth/user_trophies.kt index 0c8a446..a74eb74 100644 --- a/src/jvmMain/kotlin/starshipfights/data/auth/user_trophies.kt +++ b/src/jvmMain/kotlin/net/starshipfights/data/auth/user_trophies.kt @@ -1,8 +1,10 @@ -package starshipfights.data.auth +package net.starshipfights.data.auth -import kotlinx.html.* +import kotlinx.html.TagConsumer +import kotlinx.html.p +import kotlinx.html.style import kotlinx.serialization.Serializable -import starshipfights.CurrentConfiguration +import net.starshipfights.CurrentConfiguration @Serializable sealed class UserTrophy : Comparable { diff --git a/src/jvmMain/kotlin/starshipfights/data/data_connection.kt b/src/jvmMain/kotlin/net/starshipfights/data/data_connection.kt similarity index 98% rename from src/jvmMain/kotlin/starshipfights/data/data_connection.kt rename to src/jvmMain/kotlin/net/starshipfights/data/data_connection.kt index 5bfa88a..c59f0cb 100644 --- a/src/jvmMain/kotlin/starshipfights/data/data_connection.kt +++ b/src/jvmMain/kotlin/net/starshipfights/data/data_connection.kt @@ -1,4 +1,4 @@ -package starshipfights.data +package net.starshipfights.data import de.flapdoodle.embed.mongo.MongodProcess import de.flapdoodle.embed.mongo.MongodStarter diff --git a/src/jvmMain/kotlin/starshipfights/data/data_documents.kt b/src/jvmMain/kotlin/net/starshipfights/data/data_documents.kt similarity index 99% rename from src/jvmMain/kotlin/starshipfights/data/data_documents.kt rename to src/jvmMain/kotlin/net/starshipfights/data/data_documents.kt index 64a0e64..4328647 100644 --- a/src/jvmMain/kotlin/starshipfights/data/data_documents.kt +++ b/src/jvmMain/kotlin/net/starshipfights/data/data_documents.kt @@ -1,4 +1,4 @@ -package starshipfights.data +package net.starshipfights.data import com.mongodb.client.model.BulkWriteOptions import com.mongodb.client.model.ReplaceOptions diff --git a/src/jvmMain/kotlin/starshipfights/data/data_jvm.kt b/src/jvmMain/kotlin/net/starshipfights/data/data_jvm.kt similarity index 94% rename from src/jvmMain/kotlin/starshipfights/data/data_jvm.kt rename to src/jvmMain/kotlin/net/starshipfights/data/data_jvm.kt index 9253fe0..4ea7f8e 100644 --- a/src/jvmMain/kotlin/starshipfights/data/data_jvm.kt +++ b/src/jvmMain/kotlin/net/starshipfights/data/data_jvm.kt @@ -1,4 +1,4 @@ -package starshipfights.data +package net.starshipfights.data import com.aventrix.jnanoid.jnanoid.NanoIdUtils diff --git a/src/jvmMain/kotlin/starshipfights/data/data_routines.kt b/src/jvmMain/kotlin/net/starshipfights/data/data_routines.kt similarity index 78% rename from src/jvmMain/kotlin/starshipfights/data/data_routines.kt rename to src/jvmMain/kotlin/net/starshipfights/data/data_routines.kt index 9b4cca1..bca4f54 100644 --- a/src/jvmMain/kotlin/starshipfights/data/data_routines.kt +++ b/src/jvmMain/kotlin/net/starshipfights/data/data_routines.kt @@ -1,16 +1,16 @@ -package starshipfights.data +package net.starshipfights.data import kotlinx.coroutines.* +import net.starshipfights.data.admiralty.Admiral +import net.starshipfights.data.admiralty.BattleRecord +import net.starshipfights.data.admiralty.ShipInDrydock +import net.starshipfights.data.admiralty.eq +import net.starshipfights.data.auth.User +import net.starshipfights.data.auth.UserSession +import net.starshipfights.game.AdmiralRank import org.litote.kmongo.inc import org.slf4j.Logger import org.slf4j.LoggerFactory -import starshipfights.data.admiralty.Admiral -import starshipfights.data.admiralty.BattleRecord -import starshipfights.data.admiralty.ShipInDrydock -import starshipfights.data.admiralty.eq -import starshipfights.data.auth.User -import starshipfights.data.auth.UserSession -import starshipfights.game.AdmiralRank import java.time.Instant import java.time.ZoneId diff --git a/src/jvmMain/kotlin/starshipfights/game/ai/util_jvm.kt b/src/jvmMain/kotlin/net/starshipfights/game/ai/util_jvm.kt similarity index 92% rename from src/jvmMain/kotlin/starshipfights/game/ai/util_jvm.kt rename to src/jvmMain/kotlin/net/starshipfights/game/ai/util_jvm.kt index 300acc1..97d1bf4 100644 --- a/src/jvmMain/kotlin/starshipfights/game/ai/util_jvm.kt +++ b/src/jvmMain/kotlin/net/starshipfights/game/ai/util_jvm.kt @@ -1,4 +1,4 @@ -package starshipfights.game.ai +package net.starshipfights.game.ai import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/src/jvmMain/kotlin/starshipfights/game/concurrency.kt b/src/jvmMain/kotlin/net/starshipfights/game/concurrency.kt similarity index 88% rename from src/jvmMain/kotlin/starshipfights/game/concurrency.kt rename to src/jvmMain/kotlin/net/starshipfights/game/concurrency.kt index 2c1bc79..a00a9bf 100644 --- a/src/jvmMain/kotlin/starshipfights/game/concurrency.kt +++ b/src/jvmMain/kotlin/net/starshipfights/game/concurrency.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock diff --git a/src/jvmMain/kotlin/starshipfights/game/endpoints_game.kt b/src/jvmMain/kotlin/net/starshipfights/game/endpoints_game.kt similarity index 90% rename from src/jvmMain/kotlin/starshipfights/game/endpoints_game.kt rename to src/jvmMain/kotlin/net/starshipfights/game/endpoints_game.kt index b6b00e1..1106eb6 100644 --- a/src/jvmMain/kotlin/starshipfights/game/endpoints_game.kt +++ b/src/jvmMain/kotlin/net/starshipfights/game/endpoints_game.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import io.ktor.application.* import io.ktor.html.* @@ -7,13 +7,13 @@ import io.ktor.routing.* import io.ktor.websocket.* import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import net.starshipfights.auth.getUser +import net.starshipfights.data.DocumentTable +import net.starshipfights.data.admiralty.getAllInGameAdmirals +import net.starshipfights.data.auth.User +import net.starshipfights.data.auth.UserStatus +import net.starshipfights.redirect import org.litote.kmongo.setValue -import starshipfights.auth.getUser -import starshipfights.data.DocumentTable -import starshipfights.data.admiralty.getAllInGameAdmirals -import starshipfights.data.auth.User -import starshipfights.data.auth.UserStatus -import starshipfights.redirect fun Routing.installGame() { get("/lobby") { diff --git a/src/jvmMain/kotlin/starshipfights/game/game_start_jvm.kt b/src/jvmMain/kotlin/net/starshipfights/game/game_start_jvm.kt similarity index 93% rename from src/jvmMain/kotlin/starshipfights/game/game_start_jvm.kt rename to src/jvmMain/kotlin/net/starshipfights/game/game_start_jvm.kt index 40bcce5..950e732 100644 --- a/src/jvmMain/kotlin/starshipfights/game/game_start_jvm.kt +++ b/src/jvmMain/kotlin/net/starshipfights/game/game_start_jvm.kt @@ -1,8 +1,8 @@ -package starshipfights.game +package net.starshipfights.game -import starshipfights.data.admiralty.genAI -import starshipfights.data.admiralty.generateFleet -import starshipfights.data.admiralty.getAdmiralsShips +import net.starshipfights.data.admiralty.genAI +import net.starshipfights.data.admiralty.generateFleet +import net.starshipfights.data.admiralty.getAdmiralsShips import kotlin.math.PI suspend fun generateGameStart(hostInfo: InGameAdmiral, guestInfo: InGameAdmiral, battleInfo: BattleInfo): GameStart { diff --git a/src/jvmMain/kotlin/starshipfights/game/game_time_jvm.kt b/src/jvmMain/kotlin/net/starshipfights/game/game_time_jvm.kt similarity index 95% rename from src/jvmMain/kotlin/starshipfights/game/game_time_jvm.kt rename to src/jvmMain/kotlin/net/starshipfights/game/game_time_jvm.kt index 8361dda..9282007 100644 --- a/src/jvmMain/kotlin/starshipfights/game/game_time_jvm.kt +++ b/src/jvmMain/kotlin/net/starshipfights/game/game_time_jvm.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import kotlinx.serialization.Serializable import java.time.Instant diff --git a/src/jvmMain/kotlin/starshipfights/game/server_game.kt b/src/jvmMain/kotlin/net/starshipfights/game/server_game.kt similarity index 95% rename from src/jvmMain/kotlin/starshipfights/game/server_game.kt rename to src/jvmMain/kotlin/net/starshipfights/game/server_game.kt index 4be90be..c14cebe 100644 --- a/src/jvmMain/kotlin/starshipfights/game/server_game.kt +++ b/src/jvmMain/kotlin/net/starshipfights/game/server_game.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import io.ktor.websocket.* import kotlinx.coroutines.* @@ -8,17 +8,17 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock +import net.starshipfights.data.DocumentTable +import net.starshipfights.data.Id +import net.starshipfights.data.admiralty.Admiral +import net.starshipfights.data.admiralty.BattleRecord +import net.starshipfights.data.admiralty.ShipInDrydock +import net.starshipfights.data.admiralty.ShipMemorial +import net.starshipfights.data.auth.User +import net.starshipfights.data.createToken import org.litote.kmongo.`in` import org.litote.kmongo.inc import org.litote.kmongo.setValue -import starshipfights.data.DocumentTable -import starshipfights.data.Id -import starshipfights.data.admiralty.Admiral -import starshipfights.data.admiralty.BattleRecord -import starshipfights.data.admiralty.ShipInDrydock -import starshipfights.data.admiralty.ShipMemorial -import starshipfights.data.auth.User -import starshipfights.data.createToken import java.time.Instant import java.time.temporal.ChronoUnit diff --git a/src/jvmMain/kotlin/starshipfights/game/server_matchmaking.kt b/src/jvmMain/kotlin/net/starshipfights/game/server_matchmaking.kt similarity index 96% rename from src/jvmMain/kotlin/starshipfights/game/server_matchmaking.kt rename to src/jvmMain/kotlin/net/starshipfights/game/server_matchmaking.kt index 1454a74..5157d17 100644 --- a/src/jvmMain/kotlin/starshipfights/game/server_matchmaking.kt +++ b/src/jvmMain/kotlin/net/starshipfights/game/server_matchmaking.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import io.ktor.websocket.* import kotlinx.coroutines.CompletableDeferred @@ -7,8 +7,8 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.ClosedSendChannelException import kotlinx.coroutines.launch -import starshipfights.data.admiralty.getInGameAdmiral -import starshipfights.data.auth.User +import net.starshipfights.data.admiralty.getInGameAdmiral +import net.starshipfights.data.auth.User private val openSessions = ConcurrentCurator(mutableListOf()) diff --git a/src/jvmMain/kotlin/starshipfights/game/util_jvm.kt b/src/jvmMain/kotlin/net/starshipfights/game/util_jvm.kt similarity index 96% rename from src/jvmMain/kotlin/starshipfights/game/util_jvm.kt rename to src/jvmMain/kotlin/net/starshipfights/game/util_jvm.kt index 31ac3ac..3fe4512 100644 --- a/src/jvmMain/kotlin/starshipfights/game/util_jvm.kt +++ b/src/jvmMain/kotlin/net/starshipfights/game/util_jvm.kt @@ -1,4 +1,4 @@ -package starshipfights.game +package net.starshipfights.game import io.ktor.http.cio.websocket.* import kotlinx.coroutines.flow.filterIsInstance diff --git a/src/jvmMain/kotlin/starshipfights/game/views_game.kt b/src/jvmMain/kotlin/net/starshipfights/game/views_game.kt similarity index 94% rename from src/jvmMain/kotlin/starshipfights/game/views_game.kt rename to src/jvmMain/kotlin/net/starshipfights/game/views_game.kt index 4db90d2..96d164d 100644 --- a/src/jvmMain/kotlin/starshipfights/game/views_game.kt +++ b/src/jvmMain/kotlin/net/starshipfights/game/views_game.kt @@ -1,10 +1,10 @@ -package starshipfights.game +package net.starshipfights.game import io.ktor.application.* import io.ktor.request.* import kotlinx.html.* -import starshipfights.auth.getUserSession -import starshipfights.redirect +import net.starshipfights.auth.getUserSession +import net.starshipfights.redirect fun ClientMode.view(): HTML.() -> Unit = { head { diff --git a/src/jvmMain/kotlin/starshipfights/game/views_training.kt b/src/jvmMain/kotlin/net/starshipfights/game/views_training.kt similarity index 82% rename from src/jvmMain/kotlin/starshipfights/game/views_training.kt rename to src/jvmMain/kotlin/net/starshipfights/game/views_training.kt index 23f8f37..eeda0c8 100644 --- a/src/jvmMain/kotlin/starshipfights/game/views_training.kt +++ b/src/jvmMain/kotlin/net/starshipfights/game/views_training.kt @@ -1,12 +1,12 @@ -package starshipfights.game +package net.starshipfights.game import io.ktor.application.* import io.ktor.request.* -import starshipfights.auth.getUserSession -import starshipfights.data.Id -import starshipfights.data.admiralty.Admiral -import starshipfights.data.admiralty.getInGameAdmiral -import starshipfights.redirect +import net.starshipfights.auth.getUserSession +import net.starshipfights.data.Id +import net.starshipfights.data.admiralty.Admiral +import net.starshipfights.data.admiralty.getInGameAdmiral +import net.starshipfights.redirect suspend fun ApplicationCall.getTrainingClientMode(): ClientMode { val userId = getUserSession()?.user ?: redirect("/login") diff --git a/src/jvmMain/kotlin/starshipfights/info/endpoints_info.kt b/src/jvmMain/kotlin/net/starshipfights/info/endpoints_info.kt similarity index 87% rename from src/jvmMain/kotlin/starshipfights/info/endpoints_info.kt rename to src/jvmMain/kotlin/net/starshipfights/info/endpoints_info.kt index dd07d2a..c3809c8 100644 --- a/src/jvmMain/kotlin/starshipfights/info/endpoints_info.kt +++ b/src/jvmMain/kotlin/net/starshipfights/info/endpoints_info.kt @@ -1,15 +1,15 @@ -package starshipfights.info +package net.starshipfights.info import io.ktor.application.* import io.ktor.html.* import io.ktor.http.* import io.ktor.response.* import io.ktor.routing.* -import starshipfights.data.admiralty.AdmiralNameFlavor -import starshipfights.data.admiralty.AdmiralNames -import starshipfights.game.Moment -import starshipfights.game.ShipType -import starshipfights.game.toUrlSlug +import net.starshipfights.data.admiralty.AdmiralNameFlavor +import net.starshipfights.data.admiralty.AdmiralNames +import net.starshipfights.game.Moment +import net.starshipfights.game.ShipType +import net.starshipfights.game.toUrlSlug fun Routing.installPages() { get("/") { diff --git a/src/jvmMain/kotlin/starshipfights/info/html_utils.kt b/src/jvmMain/kotlin/net/starshipfights/info/html_utils.kt similarity index 82% rename from src/jvmMain/kotlin/starshipfights/info/html_utils.kt rename to src/jvmMain/kotlin/net/starshipfights/info/html_utils.kt index eee9510..aaef6b7 100644 --- a/src/jvmMain/kotlin/starshipfights/info/html_utils.kt +++ b/src/jvmMain/kotlin/net/starshipfights/info/html_utils.kt @@ -1,9 +1,9 @@ -package starshipfights.info +package net.starshipfights.info import kotlinx.html.* -import starshipfights.auth.CsrfProtector -import starshipfights.data.Id -import starshipfights.data.auth.UserSession +import net.starshipfights.auth.CsrfProtector +import net.starshipfights.data.Id +import net.starshipfights.data.auth.UserSession var A.method: String? get() = attributes["data-method"] diff --git a/src/jvmMain/kotlin/starshipfights/info/view_bar.kt b/src/jvmMain/kotlin/net/starshipfights/info/view_bar.kt similarity index 87% rename from src/jvmMain/kotlin/starshipfights/info/view_bar.kt rename to src/jvmMain/kotlin/net/starshipfights/info/view_bar.kt index 67de0df..7963688 100644 --- a/src/jvmMain/kotlin/starshipfights/info/view_bar.kt +++ b/src/jvmMain/kotlin/net/starshipfights/info/view_bar.kt @@ -1,8 +1,8 @@ -package starshipfights.info +package net.starshipfights.info import kotlinx.html.* -import starshipfights.game.ShipType -import starshipfights.game.getDefiniteShortName +import net.starshipfights.game.ShipType +import net.starshipfights.game.getDefiniteShortName abstract class Sidebar { protected abstract fun TagConsumer<*>.display() diff --git a/src/jvmMain/kotlin/starshipfights/info/view_nav.kt b/src/jvmMain/kotlin/net/starshipfights/info/view_nav.kt similarity index 89% rename from src/jvmMain/kotlin/starshipfights/info/view_nav.kt rename to src/jvmMain/kotlin/net/starshipfights/info/view_nav.kt index c073434..60357d6 100644 --- a/src/jvmMain/kotlin/starshipfights/info/view_nav.kt +++ b/src/jvmMain/kotlin/net/starshipfights/info/view_nav.kt @@ -1,14 +1,14 @@ -package starshipfights.info +package net.starshipfights.info import io.ktor.application.* import kotlinx.html.DIV import kotlinx.html.a import kotlinx.html.span import kotlinx.html.style -import starshipfights.CurrentConfiguration -import starshipfights.auth.getUserAndSession -import starshipfights.data.Id -import starshipfights.data.auth.UserSession +import net.starshipfights.CurrentConfiguration +import net.starshipfights.auth.getUserAndSession +import net.starshipfights.data.Id +import net.starshipfights.data.auth.UserSession sealed class NavItem { protected abstract fun DIV.display() diff --git a/src/jvmMain/kotlin/starshipfights/info/view_tpl.kt b/src/jvmMain/kotlin/net/starshipfights/info/view_tpl.kt similarity index 93% rename from src/jvmMain/kotlin/starshipfights/info/view_tpl.kt rename to src/jvmMain/kotlin/net/starshipfights/info/view_tpl.kt index d46317d..5952a15 100644 --- a/src/jvmMain/kotlin/starshipfights/info/view_tpl.kt +++ b/src/jvmMain/kotlin/net/starshipfights/info/view_tpl.kt @@ -1,9 +1,9 @@ -package starshipfights.info +package net.starshipfights.info import io.ktor.application.* import kotlinx.html.* -import starshipfights.auth.getUser -import starshipfights.data.auth.PreferredTheme +import net.starshipfights.auth.getUser +import net.starshipfights.data.auth.PreferredTheme suspend fun ApplicationCall.page(pageTitle: String? = null, navBar: List? = null, sidebar: Sidebar? = null, content: SECTIONS.() -> Unit): HTML.() -> Unit { val theme = getUser()?.preferredTheme diff --git a/src/jvmMain/kotlin/starshipfights/info/views_error.kt b/src/jvmMain/kotlin/net/starshipfights/info/views_error.kt similarity index 91% rename from src/jvmMain/kotlin/starshipfights/info/views_error.kt rename to src/jvmMain/kotlin/net/starshipfights/info/views_error.kt index 96fb44c..56ebbc9 100644 --- a/src/jvmMain/kotlin/starshipfights/info/views_error.kt +++ b/src/jvmMain/kotlin/net/starshipfights/info/views_error.kt @@ -1,9 +1,12 @@ -package starshipfights.info +package net.starshipfights.info import io.ktor.application.* import io.ktor.features.* -import kotlinx.html.* -import starshipfights.CurrentConfiguration +import kotlinx.html.HTML +import kotlinx.html.h1 +import kotlinx.html.p +import kotlinx.html.style +import net.starshipfights.CurrentConfiguration private fun SECTIONS.devModeCallId(callId: String?) { callId?.let { id -> diff --git a/src/jvmMain/kotlin/starshipfights/info/views_gdpr.kt b/src/jvmMain/kotlin/net/starshipfights/info/views_gdpr.kt similarity index 93% rename from src/jvmMain/kotlin/starshipfights/info/views_gdpr.kt rename to src/jvmMain/kotlin/net/starshipfights/info/views_gdpr.kt index d80ce00..20e59a1 100644 --- a/src/jvmMain/kotlin/starshipfights/info/views_gdpr.kt +++ b/src/jvmMain/kotlin/net/starshipfights/info/views_gdpr.kt @@ -1,22 +1,22 @@ -package starshipfights.info +package net.starshipfights.info import io.ktor.application.* import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.toList import kotlinx.html.* +import net.starshipfights.auth.getUser +import net.starshipfights.auth.getUserSession +import net.starshipfights.data.admiralty.Admiral +import net.starshipfights.data.admiralty.BattleRecord +import net.starshipfights.data.admiralty.ShipInDrydock +import net.starshipfights.data.admiralty.ShipMemorial +import net.starshipfights.data.auth.User +import net.starshipfights.data.auth.UserSession +import net.starshipfights.game.GlobalSide +import net.starshipfights.redirect import org.litote.kmongo.eq import org.litote.kmongo.or -import starshipfights.auth.getUser -import starshipfights.auth.getUserSession -import starshipfights.data.admiralty.Admiral -import starshipfights.data.admiralty.BattleRecord -import starshipfights.data.admiralty.ShipInDrydock -import starshipfights.data.admiralty.ShipMemorial -import starshipfights.data.auth.User -import starshipfights.data.auth.UserSession -import starshipfights.game.GlobalSide -import starshipfights.redirect import java.time.Instant suspend fun ApplicationCall.privateInfo(): String { diff --git a/src/jvmMain/kotlin/starshipfights/info/views_main.kt b/src/jvmMain/kotlin/net/starshipfights/info/views_main.kt similarity index 98% rename from src/jvmMain/kotlin/starshipfights/info/views_main.kt rename to src/jvmMain/kotlin/net/starshipfights/info/views_main.kt index 82d29a7..635f794 100644 --- a/src/jvmMain/kotlin/starshipfights/info/views_main.kt +++ b/src/jvmMain/kotlin/net/starshipfights/info/views_main.kt @@ -1,14 +1,14 @@ -package starshipfights.info +package net.starshipfights.info import io.ktor.application.* import kotlinx.coroutines.flow.take import kotlinx.coroutines.flow.toList import kotlinx.html.* +import net.starshipfights.CurrentConfiguration +import net.starshipfights.data.auth.User +import net.starshipfights.game.foreign import org.litote.kmongo.descending import org.litote.kmongo.eq -import starshipfights.CurrentConfiguration -import starshipfights.data.auth.User -import starshipfights.game.foreign suspend fun ApplicationCall.mainPage(): HTML.() -> Unit { return page(null, standardNavBar(), null) { diff --git a/src/jvmMain/kotlin/starshipfights/info/views_ships.kt b/src/jvmMain/kotlin/net/starshipfights/info/views_ships.kt similarity index 99% rename from src/jvmMain/kotlin/starshipfights/info/views_ships.kt rename to src/jvmMain/kotlin/net/starshipfights/info/views_ships.kt index b162d9a..648dda0 100644 --- a/src/jvmMain/kotlin/starshipfights/info/views_ships.kt +++ b/src/jvmMain/kotlin/net/starshipfights/info/views_ships.kt @@ -1,8 +1,8 @@ -package starshipfights.info +package net.starshipfights.info import io.ktor.application.* import kotlinx.html.* -import starshipfights.game.* +import net.starshipfights.game.* import kotlin.math.PI import kotlin.math.roundToInt diff --git a/src/jvmMain/kotlin/starshipfights/info/views_user.kt b/src/jvmMain/kotlin/net/starshipfights/info/views_user.kt similarity index 98% rename from src/jvmMain/kotlin/starshipfights/info/views_user.kt rename to src/jvmMain/kotlin/net/starshipfights/info/views_user.kt index b032b60..e9f5eb2 100644 --- a/src/jvmMain/kotlin/starshipfights/info/views_user.kt +++ b/src/jvmMain/kotlin/net/starshipfights/info/views_user.kt @@ -1,4 +1,4 @@ -package starshipfights.info +package net.starshipfights.info import io.ktor.application.* import io.ktor.features.* @@ -6,17 +6,17 @@ import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.toList import kotlinx.html.* +import net.starshipfights.auth.* +import net.starshipfights.data.Id +import net.starshipfights.data.admiralty.* +import net.starshipfights.data.auth.* +import net.starshipfights.forbid +import net.starshipfights.game.* +import net.starshipfights.redirect import org.litote.kmongo.and import org.litote.kmongo.eq import org.litote.kmongo.gt import org.litote.kmongo.or -import starshipfights.auth.* -import starshipfights.data.Id -import starshipfights.data.admiralty.* -import starshipfights.data.auth.* -import starshipfights.forbid -import starshipfights.game.* -import starshipfights.redirect import java.time.Instant suspend fun ApplicationCall.userPage(): HTML.() -> Unit { diff --git a/src/jvmMain/kotlin/starshipfights/server.kt b/src/jvmMain/kotlin/net/starshipfights/server.kt similarity index 95% rename from src/jvmMain/kotlin/starshipfights/server.kt rename to src/jvmMain/kotlin/net/starshipfights/server.kt index 370cd38..0980ad3 100644 --- a/src/jvmMain/kotlin/starshipfights/server.kt +++ b/src/jvmMain/kotlin/net/starshipfights/server.kt @@ -1,6 +1,6 @@ @file:JvmName("Server") -package starshipfights +package net.starshipfights import io.ktor.application.* import io.ktor.features.* @@ -14,12 +14,12 @@ import io.ktor.server.engine.* import io.ktor.server.netty.* import io.ktor.util.* import io.ktor.websocket.* +import net.starshipfights.auth.AuthProvider +import net.starshipfights.data.ConnectionHolder +import net.starshipfights.data.DataRoutines +import net.starshipfights.game.installGame +import net.starshipfights.info.* import org.slf4j.event.Level -import starshipfights.auth.AuthProvider -import starshipfights.data.ConnectionHolder -import starshipfights.data.DataRoutines -import starshipfights.game.installGame -import starshipfights.info.* import java.io.InputStream import java.util.concurrent.atomic.AtomicLong diff --git a/src/jvmMain/kotlin/starshipfights/server_conf.kt b/src/jvmMain/kotlin/net/starshipfights/server_conf.kt similarity index 95% rename from src/jvmMain/kotlin/starshipfights/server_conf.kt rename to src/jvmMain/kotlin/net/starshipfights/server_conf.kt index d96abf4..64166e2 100644 --- a/src/jvmMain/kotlin/starshipfights/server_conf.kt +++ b/src/jvmMain/kotlin/net/starshipfights/server_conf.kt @@ -1,10 +1,10 @@ -package starshipfights +package net.starshipfights import io.ktor.util.* import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json -import starshipfights.data.ConnectionType +import net.starshipfights.data.ConnectionType import java.io.File import java.security.SecureRandom diff --git a/src/jvmMain/kotlin/starshipfights/server_utils.kt b/src/jvmMain/kotlin/net/starshipfights/server_utils.kt similarity index 95% rename from src/jvmMain/kotlin/starshipfights/server_utils.kt rename to src/jvmMain/kotlin/net/starshipfights/server_utils.kt index 87574c2..dc039c0 100644 --- a/src/jvmMain/kotlin/starshipfights/server_utils.kt +++ b/src/jvmMain/kotlin/net/starshipfights/server_utils.kt @@ -1,4 +1,4 @@ -package starshipfights +package net.starshipfights open class ForbiddenException : IllegalArgumentException() diff --git a/src/jvmTest/kotlin/starshipfights/game/ai/AITesting.kt b/src/jvmTest/kotlin/net/starshipfights/game/ai/AITesting.kt similarity index 98% rename from src/jvmTest/kotlin/starshipfights/game/ai/AITesting.kt rename to src/jvmTest/kotlin/net/starshipfights/game/ai/AITesting.kt index 8c5a141..61612a0 100644 --- a/src/jvmTest/kotlin/starshipfights/game/ai/AITesting.kt +++ b/src/jvmTest/kotlin/net/starshipfights/game/ai/AITesting.kt @@ -1,11 +1,11 @@ -package starshipfights.game.ai +package net.starshipfights.game.ai import kotlinx.coroutines.Job import kotlinx.coroutines.runBlocking import kotlinx.html.* import kotlinx.html.stream.createHTML -import starshipfights.game.BattleSize -import starshipfights.game.Faction +import net.starshipfights.game.BattleSize +import net.starshipfights.game.Faction import java.io.File import java.util.concurrent.atomic.AtomicInteger import javax.swing.JOptionPane -- 2.25.1