From c854e7c47cc7b5f64d5121380c1006cde75bc416 Mon Sep 17 00:00:00 2001 From: Logan Gorence Date: Thu, 23 Dec 2021 22:51:42 +0000 Subject: [PATCH] Finalize package organization. --- .../cloud/kubelet/foundation/core/features/dev/DevFeature.kt | 1 - .../core/{devupdate => features/dev}/DevUpdateConfig.kt | 2 +- .../core/{devupdate => features/dev}/DevUpdatePayload.kt | 2 +- .../core/{devupdate => features/dev}/DevUpdateServer.kt | 2 +- .../core/{command => features/player}/GamemodeCommand.kt | 2 +- .../kubelet/foundation/core/features/player/PlayerFeature.kt | 1 - .../core/{command => features/world}/SetSpawnCommand.kt | 2 +- .../core/{command => features/world}/SpawnCommand.kt | 2 +- .../kubelet/foundation/core/features/world/WorldFeature.kt | 4 ---- 9 files changed, 6 insertions(+), 12 deletions(-) rename foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/{devupdate => features/dev}/DevUpdateConfig.kt (77%) rename foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/{devupdate => features/dev}/DevUpdatePayload.kt (85%) rename foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/{devupdate => features/dev}/DevUpdateServer.kt (98%) rename foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/{command => features/player}/GamemodeCommand.kt (92%) rename foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/{command => features/world}/SetSpawnCommand.kt (91%) rename foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/{command => features/world}/SpawnCommand.kt (90%) diff --git a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/dev/DevFeature.kt b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/dev/DevFeature.kt index 17d8499..c137a83 100644 --- a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/dev/DevFeature.kt +++ b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/dev/DevFeature.kt @@ -2,7 +2,6 @@ package cloud.kubelet.foundation.core.features.dev import cloud.kubelet.foundation.core.FoundationCorePlugin import cloud.kubelet.foundation.core.abstraction.Feature -import cloud.kubelet.foundation.core.devupdate.DevUpdateServer import org.koin.core.component.inject class DevFeature : Feature() { diff --git a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/devupdate/DevUpdateConfig.kt b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/dev/DevUpdateConfig.kt similarity index 77% rename from foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/devupdate/DevUpdateConfig.kt rename to foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/dev/DevUpdateConfig.kt index a64d3ac..1a7b0ae 100644 --- a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/devupdate/DevUpdateConfig.kt +++ b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/dev/DevUpdateConfig.kt @@ -1,4 +1,4 @@ -package cloud.kubelet.foundation.core.devupdate +package cloud.kubelet.foundation.core.features.dev import kotlinx.serialization.Serializable diff --git a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/devupdate/DevUpdatePayload.kt b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/dev/DevUpdatePayload.kt similarity index 85% rename from foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/devupdate/DevUpdatePayload.kt rename to foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/dev/DevUpdatePayload.kt index a23a8c8..2de1b61 100644 --- a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/devupdate/DevUpdatePayload.kt +++ b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/dev/DevUpdatePayload.kt @@ -1,4 +1,4 @@ -package cloud.kubelet.foundation.core.devupdate +package cloud.kubelet.foundation.core.features.dev import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/devupdate/DevUpdateServer.kt b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/dev/DevUpdateServer.kt similarity index 98% rename from foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/devupdate/DevUpdateServer.kt rename to foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/dev/DevUpdateServer.kt index 9eb5aca..8b45ba8 100644 --- a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/devupdate/DevUpdateServer.kt +++ b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/dev/DevUpdateServer.kt @@ -1,4 +1,4 @@ -package cloud.kubelet.foundation.core.devupdate +package cloud.kubelet.foundation.core.features.dev import cloud.kubelet.foundation.core.FoundationCorePlugin import cloud.kubelet.foundation.core.Util diff --git a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/command/GamemodeCommand.kt b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/player/GamemodeCommand.kt similarity index 92% rename from foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/command/GamemodeCommand.kt rename to foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/player/GamemodeCommand.kt index 7cf57d1..e5ca5e6 100644 --- a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/command/GamemodeCommand.kt +++ b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/player/GamemodeCommand.kt @@ -1,4 +1,4 @@ -package cloud.kubelet.foundation.core.command +package cloud.kubelet.foundation.core.features.player import org.bukkit.GameMode import org.bukkit.command.Command diff --git a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/player/PlayerFeature.kt b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/player/PlayerFeature.kt index 4191627..7d1f769 100644 --- a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/player/PlayerFeature.kt +++ b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/player/PlayerFeature.kt @@ -1,7 +1,6 @@ package cloud.kubelet.foundation.core.features.player import cloud.kubelet.foundation.core.abstraction.Feature -import cloud.kubelet.foundation.core.command.GamemodeCommand import org.bukkit.GameMode class PlayerFeature : Feature() { diff --git a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/command/SetSpawnCommand.kt b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/world/SetSpawnCommand.kt similarity index 91% rename from foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/command/SetSpawnCommand.kt rename to foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/world/SetSpawnCommand.kt index 85abd01..6f97fd0 100644 --- a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/command/SetSpawnCommand.kt +++ b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/world/SetSpawnCommand.kt @@ -1,4 +1,4 @@ -package cloud.kubelet.foundation.core.command +package cloud.kubelet.foundation.core.features.world import org.bukkit.command.Command import org.bukkit.command.CommandExecutor diff --git a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/command/SpawnCommand.kt b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/world/SpawnCommand.kt similarity index 90% rename from foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/command/SpawnCommand.kt rename to foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/world/SpawnCommand.kt index bf5c81b..3932ceb 100644 --- a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/command/SpawnCommand.kt +++ b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/world/SpawnCommand.kt @@ -1,4 +1,4 @@ -package cloud.kubelet.foundation.core.command +package cloud.kubelet.foundation.core.features.world import org.bukkit.command.Command import org.bukkit.command.CommandExecutor diff --git a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/world/WorldFeature.kt b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/world/WorldFeature.kt index 2edf88b..2927c31 100644 --- a/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/world/WorldFeature.kt +++ b/foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/world/WorldFeature.kt @@ -1,10 +1,6 @@ package cloud.kubelet.foundation.core.features.world import cloud.kubelet.foundation.core.abstraction.Feature -import cloud.kubelet.foundation.core.command.GamemodeCommand -import cloud.kubelet.foundation.core.command.SetSpawnCommand -import cloud.kubelet.foundation.core.command.SpawnCommand -import org.bukkit.GameMode class WorldFeature : Feature() { override fun enable() {