diff --git a/build.gradle.kts b/build.gradle.kts index 3da3140..cecb6fc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { val audioServerVersion: String by project -group = "de.themeparkcraft.audioserver" +group = "net.blockventuremc.audioserver" version = audioServerVersion repositories { @@ -20,7 +20,7 @@ kotlin { compilerOptions { jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21) apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) - freeCompilerArgs.addAll(listOf("-opt-in=kotlin.RequiresOptIn", "-Xopt-in=dev.kord.common.annotation.KordPreview", "-Xopt-in=dev.kord.common.annotation.KordExperimental", "-Xopt-in=kotlin.time.ExperimentalTime", "-Xopt-in=kotlin.contracts.ExperimentalContracts")) + freeCompilerArgs.addAll(listOf("-opt-in=kotlin.RequiresOptIn", "-Xopt-in=kotlin.time.ExperimentalTime", "-Xopt-in=kotlin.contracts.ExperimentalContracts")) } } @@ -30,7 +30,7 @@ subprojects { maven("https://nexus.flawcra.cc/repository/maven-mirrors/") } - group = "de.themeparkcraft.audioserver" + group = "net.blockventuremc.audioserver" version = audioServerVersion } \ No newline at end of file diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/rabbit/Constants.kt b/common/src/main/kotlin/de/themeparkcraft/audioserver/common/rabbit/Constants.kt deleted file mode 100644 index 6ac5bf3..0000000 --- a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/rabbit/Constants.kt +++ /dev/null @@ -1,4 +0,0 @@ -package de.themeparkcraft.audioserver.common.rabbit - -const val EXCHANGE_NAME = "themeparkcraft" -const val ROUTIING_KEY = "themeparkcraft:audioserver" \ No newline at end of file diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/data/RabbitConfiguration.kt b/common/src/main/kotlin/net/blockventuremc/audioserver/common/data/RabbitConfiguration.kt similarity index 93% rename from common/src/main/kotlin/de/themeparkcraft/audioserver/common/data/RabbitConfiguration.kt rename to common/src/main/kotlin/net/blockventuremc/audioserver/common/data/RabbitConfiguration.kt index cd49ef5..bdd867c 100644 --- a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/data/RabbitConfiguration.kt +++ b/common/src/main/kotlin/net/blockventuremc/audioserver/common/data/RabbitConfiguration.kt @@ -1,4 +1,4 @@ -package de.themeparkcraft.audioserver.common.data +package net.blockventuremc.audioserver.common.data /** * Represents the configuration settings for connecting to a RabbitMQ server. diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/errors/AudioServerNotInitializedError.kt b/common/src/main/kotlin/net/blockventuremc/audioserver/common/errors/AudioServerNotInitializedError.kt similarity index 90% rename from common/src/main/kotlin/de/themeparkcraft/audioserver/common/errors/AudioServerNotInitializedError.kt rename to common/src/main/kotlin/net/blockventuremc/audioserver/common/errors/AudioServerNotInitializedError.kt index 9e7980e..258374c 100644 --- a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/errors/AudioServerNotInitializedError.kt +++ b/common/src/main/kotlin/net/blockventuremc/audioserver/common/errors/AudioServerNotInitializedError.kt @@ -1,4 +1,4 @@ -package de.themeparkcraft.audioserver.common.errors +package net.blockventuremc.audioserver.common.errors /** * This class represents an error that occurs when attempting to use the AudioServer without initializing it first. diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/extensions/JDKExtensions.kt b/common/src/main/kotlin/net/blockventuremc/audioserver/common/extensions/JDKExtensions.kt similarity index 80% rename from common/src/main/kotlin/de/themeparkcraft/audioserver/common/extensions/JDKExtensions.kt rename to common/src/main/kotlin/net/blockventuremc/audioserver/common/extensions/JDKExtensions.kt index 926de19..444e17a 100644 --- a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/extensions/JDKExtensions.kt +++ b/common/src/main/kotlin/net/blockventuremc/audioserver/common/extensions/JDKExtensions.kt @@ -1,4 +1,4 @@ -package de.themeparkcraft.audioserver.common.extensions +package net.blockventuremc.audioserver.common.extensions import org.slf4j.LoggerFactory diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/AreaAudioSource.kt b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/AreaAudioSource.kt similarity index 91% rename from common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/AreaAudioSource.kt rename to common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/AreaAudioSource.kt index 7e627a6..54276f1 100644 --- a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/AreaAudioSource.kt +++ b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/AreaAudioSource.kt @@ -1,4 +1,4 @@ -package de.themeparkcraft.audioserver.common.interfaces +package net.blockventuremc.audioserver.common.interfaces import kotlinx.serialization.Serializable diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/AudioSource.kt b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/AudioSource.kt similarity index 84% rename from common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/AudioSource.kt rename to common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/AudioSource.kt index 7dbaab5..7b34cbc 100644 --- a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/AudioSource.kt +++ b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/AudioSource.kt @@ -1,4 +1,4 @@ -package de.themeparkcraft.audioserver.common.interfaces +package net.blockventuremc.audioserver.common.interfaces import kotlinx.serialization.Serializable diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/GlobalParkAudioSource.kt b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/GlobalParkAudioSource.kt similarity index 91% rename from common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/GlobalParkAudioSource.kt rename to common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/GlobalParkAudioSource.kt index e5cce0c..655eea9 100644 --- a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/GlobalParkAudioSource.kt +++ b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/GlobalParkAudioSource.kt @@ -1,4 +1,4 @@ -package de.themeparkcraft.audioserver.common.interfaces +package net.blockventuremc.audioserver.common.interfaces import kotlinx.serialization.Serializable diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/PlayerPositionUpdate.kt b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/PlayerPositionUpdate.kt similarity index 89% rename from common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/PlayerPositionUpdate.kt rename to common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/PlayerPositionUpdate.kt index 6a4f746..09340cb 100644 --- a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/PlayerPositionUpdate.kt +++ b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/PlayerPositionUpdate.kt @@ -1,4 +1,4 @@ -package de.themeparkcraft.audioserver.common.interfaces +package net.blockventuremc.audioserver.common.interfaces import kotlinx.serialization.Serializable diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/PlayerRelatedAudioSource.kt b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/PlayerRelatedAudioSource.kt similarity index 90% rename from common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/PlayerRelatedAudioSource.kt rename to common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/PlayerRelatedAudioSource.kt index 4e6ccf2..7dca40b 100644 --- a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/PlayerRelatedAudioSource.kt +++ b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/PlayerRelatedAudioSource.kt @@ -1,4 +1,4 @@ -package de.themeparkcraft.audioserver.common.interfaces +package net.blockventuremc.audioserver.common.interfaces import kotlinx.serialization.Serializable diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/PointedWorldPosition.kt b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/PointedWorldPosition.kt similarity index 95% rename from common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/PointedWorldPosition.kt rename to common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/PointedWorldPosition.kt index 687cb43..dd143b3 100644 --- a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/PointedWorldPosition.kt +++ b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/PointedWorldPosition.kt @@ -1,4 +1,4 @@ -package de.themeparkcraft.audioserver.common.interfaces +package net.blockventuremc.audioserver.common.interfaces import kotlinx.serialization.Serializable diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/PositionedAudioSource.kt b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/PositionedAudioSource.kt similarity index 88% rename from common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/PositionedAudioSource.kt rename to common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/PositionedAudioSource.kt index fe24eae..5c1230e 100644 --- a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/PositionedAudioSource.kt +++ b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/PositionedAudioSource.kt @@ -1,4 +1,4 @@ -package de.themeparkcraft.audioserver.common.interfaces +package net.blockventuremc.audioserver.common.interfaces import kotlinx.serialization.Serializable diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/RabbitSendable.kt b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/RabbitSendable.kt similarity index 86% rename from common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/RabbitSendable.kt rename to common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/RabbitSendable.kt index 66342e3..dd18f59 100644 --- a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/RabbitSendable.kt +++ b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/RabbitSendable.kt @@ -1,4 +1,4 @@ -package de.themeparkcraft.audioserver.common.interfaces +package net.blockventuremc.audioserver.common.interfaces import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/WorldPosition.kt b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/WorldPosition.kt similarity index 94% rename from common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/WorldPosition.kt rename to common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/WorldPosition.kt index 95f9360..29c2322 100644 --- a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/WorldPosition.kt +++ b/common/src/main/kotlin/net/blockventuremc/audioserver/common/interfaces/WorldPosition.kt @@ -1,4 +1,4 @@ -package de.themeparkcraft.audioserver.common.interfaces +package net.blockventuremc.audioserver.common.interfaces import kotlinx.serialization.Serializable diff --git a/common/src/main/kotlin/net/blockventuremc/audioserver/common/rabbit/Constants.kt b/common/src/main/kotlin/net/blockventuremc/audioserver/common/rabbit/Constants.kt new file mode 100644 index 0000000..766f1b6 --- /dev/null +++ b/common/src/main/kotlin/net/blockventuremc/audioserver/common/rabbit/Constants.kt @@ -0,0 +1,4 @@ +package net.blockventuremc.audioserver.common.rabbit + +const val EXCHANGE_NAME = "venturelibs" +const val ROUTIING_KEY = "venturelibs:audioserver" \ No newline at end of file diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/rabbit/RabbitClient.kt b/common/src/main/kotlin/net/blockventuremc/audioserver/common/rabbit/RabbitClient.kt similarity index 93% rename from common/src/main/kotlin/de/themeparkcraft/audioserver/common/rabbit/RabbitClient.kt rename to common/src/main/kotlin/net/blockventuremc/audioserver/common/rabbit/RabbitClient.kt index 5b0534b..41776a9 100644 --- a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/rabbit/RabbitClient.kt +++ b/common/src/main/kotlin/net/blockventuremc/audioserver/common/rabbit/RabbitClient.kt @@ -1,9 +1,9 @@ -package de.themeparkcraft.audioserver.common.rabbit +package net.blockventuremc.audioserver.common.rabbit import com.rabbitmq.client.* -import de.themeparkcraft.audioserver.common.data.RabbitConfiguration -import de.themeparkcraft.audioserver.common.extensions.getLogger -import de.themeparkcraft.audioserver.common.interfaces.RabbitSendable +import net.blockventuremc.audioserver.common.data.RabbitConfiguration +import net.blockventuremc.audioserver.common.extensions.getLogger +import net.blockventuremc.audioserver.common.interfaces.RabbitSendable import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/gradle.properties b/gradle.properties index 1593b06..30569b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ kotlin.code.style=official -audioServerVersion=0.5-Snapshot +audioServerVersion=2024.05.07-SNAPSHOT diff --git a/minecraft/src/main/kotlin/de/themeparkcraft/audioserver/minecraft/AudioServer.kt b/minecraft/src/main/kotlin/net/blockventuremc/audioserver/minecraft/AudioServer.kt similarity index 80% rename from minecraft/src/main/kotlin/de/themeparkcraft/audioserver/minecraft/AudioServer.kt rename to minecraft/src/main/kotlin/net/blockventuremc/audioserver/minecraft/AudioServer.kt index 3f543d4..e1d40a0 100644 --- a/minecraft/src/main/kotlin/de/themeparkcraft/audioserver/minecraft/AudioServer.kt +++ b/minecraft/src/main/kotlin/net/blockventuremc/audioserver/minecraft/AudioServer.kt @@ -1,11 +1,11 @@ -package de.themeparkcraft.audioserver.minecraft +package net.blockventuremc.audioserver.minecraft -import de.themeparkcraft.audioserver.common.interfaces.PlayerPositionUpdate -import de.themeparkcraft.audioserver.common.data.RabbitConfiguration -import de.themeparkcraft.audioserver.common.errors.AudioServerNotInitializedError -import de.themeparkcraft.audioserver.common.interfaces.AudioSource -import de.themeparkcraft.audioserver.common.rabbit.RabbitClient -import de.themeparkcraft.audioserver.minecraft.extensions.worldPosition +import net.blockventuremc.audioserver.common.interfaces.PlayerPositionUpdate +import net.blockventuremc.audioserver.common.data.RabbitConfiguration +import net.blockventuremc.audioserver.common.errors.AudioServerNotInitializedError +import net.blockventuremc.audioserver.common.interfaces.AudioSource +import net.blockventuremc.audioserver.common.rabbit.RabbitClient +import net.blockventuremc.audioserver.minecraft.extensions.worldPosition import org.bukkit.entity.Player import java.util.UUID diff --git a/minecraft/src/main/kotlin/de/themeparkcraft/audioserver/minecraft/extensions/PlayerExtensions.kt b/minecraft/src/main/kotlin/net/blockventuremc/audioserver/minecraft/extensions/PlayerExtensions.kt similarity index 87% rename from minecraft/src/main/kotlin/de/themeparkcraft/audioserver/minecraft/extensions/PlayerExtensions.kt rename to minecraft/src/main/kotlin/net/blockventuremc/audioserver/minecraft/extensions/PlayerExtensions.kt index 8738c6b..9a2bcb5 100644 --- a/minecraft/src/main/kotlin/de/themeparkcraft/audioserver/minecraft/extensions/PlayerExtensions.kt +++ b/minecraft/src/main/kotlin/net/blockventuremc/audioserver/minecraft/extensions/PlayerExtensions.kt @@ -1,6 +1,6 @@ -package de.themeparkcraft.audioserver.minecraft.extensions +package net.blockventuremc.audioserver.minecraft.extensions -import de.themeparkcraft.audioserver.common.interfaces.PointedWorldPosition +import net.blockventuremc.audioserver.common.interfaces.PointedWorldPosition import org.bukkit.entity.Player /** diff --git a/standalone/build.gradle.kts b/standalone/build.gradle.kts index 0b05c51..1e77b9a 100644 --- a/standalone/build.gradle.kts +++ b/standalone/build.gradle.kts @@ -36,7 +36,7 @@ tasks { archiveFileName.set("AudioServerStandalone.jar") manifest { - attributes["Main-Class"] = "de.themeparkcraft.audioserver.StartKt" + attributes["Main-Class"] = "net.blockventuremc.audioserver.StartKt" } } } \ No newline at end of file diff --git a/standalone/src/main/kotlin/de/themeparkcraft/audioserver/AudioServerStandalone.kt b/standalone/src/main/kotlin/net/blockventuremc/audioserver/AudioServerStandalone.kt similarity index 81% rename from standalone/src/main/kotlin/de/themeparkcraft/audioserver/AudioServerStandalone.kt rename to standalone/src/main/kotlin/net/blockventuremc/audioserver/AudioServerStandalone.kt index cbba874..cfe7d9c 100644 --- a/standalone/src/main/kotlin/de/themeparkcraft/audioserver/AudioServerStandalone.kt +++ b/standalone/src/main/kotlin/net/blockventuremc/audioserver/AudioServerStandalone.kt @@ -1,10 +1,10 @@ -package de.themeparkcraft.audioserver +package net.blockventuremc.audioserver -import de.themeparkcraft.audioserver.common.data.RabbitConfiguration -import de.themeparkcraft.audioserver.common.extensions.getLogger -import de.themeparkcraft.audioserver.common.interfaces.PlayerPositionUpdate -import de.themeparkcraft.audioserver.common.rabbit.RabbitClient -import de.themeparkcraft.audioserver.utils.Environment +import net.blockventuremc.audioserver.common.data.RabbitConfiguration +import net.blockventuremc.audioserver.common.extensions.getLogger +import net.blockventuremc.audioserver.common.interfaces.PlayerPositionUpdate +import net.blockventuremc.audioserver.common.rabbit.RabbitClient +import net.blockventuremc.audioserver.utils.Environment import kotlin.system.exitProcess class AudioServerStandalone { diff --git a/standalone/src/main/kotlin/de/themeparkcraft/audioserver/Start.kt b/standalone/src/main/kotlin/net/blockventuremc/audioserver/Start.kt similarity index 52% rename from standalone/src/main/kotlin/de/themeparkcraft/audioserver/Start.kt rename to standalone/src/main/kotlin/net/blockventuremc/audioserver/Start.kt index 9ab7905..061afd5 100644 --- a/standalone/src/main/kotlin/de/themeparkcraft/audioserver/Start.kt +++ b/standalone/src/main/kotlin/net/blockventuremc/audioserver/Start.kt @@ -1,4 +1,4 @@ -package de.themeparkcraft.audioserver +package net.blockventuremc.audioserver fun main() { AudioServerStandalone() diff --git a/standalone/src/main/kotlin/de/themeparkcraft/audioserver/utils/Environment.kt b/standalone/src/main/kotlin/net/blockventuremc/audioserver/utils/Environment.kt similarity index 91% rename from standalone/src/main/kotlin/de/themeparkcraft/audioserver/utils/Environment.kt rename to standalone/src/main/kotlin/net/blockventuremc/audioserver/utils/Environment.kt index e4c7d82..b72cbbb 100644 --- a/standalone/src/main/kotlin/de/themeparkcraft/audioserver/utils/Environment.kt +++ b/standalone/src/main/kotlin/net/blockventuremc/audioserver/utils/Environment.kt @@ -1,4 +1,4 @@ -package de.themeparkcraft.audioserver.utils +package net.blockventuremc.audioserver.utils import io.github.cdimascio.dotenv.dotenv