diff --git a/build.gradle.kts b/build.gradle.kts index a1f6892..6f8c249 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,7 +30,7 @@ plugins { //Botendo version 6 val ownerID = 372703841151614976L -group = "de.limited_dev.botendo" +group = "net.moonleay.botendo" version = System.getenv("CI_COMMIT_TAG")?.let { "$it-${System.getenv("CI_COMMIT_SHORT_SHA")}-prod" } ?: System.getenv("CI_COMMIT_SHORT_SHA")?.let { "$it-dev" } ?: "6.4.0" @@ -115,7 +115,7 @@ tasks { withType { manifest { - attributes["Main-Class"] = "de.limited_dev.botendo.MainKt" + attributes["Main-Class"] = "net.moonleay.botendo.MainKt" } // To add all of the dependencies from(sourceSets.main.get().output) diff --git a/src/main/kotlin/de/limited_dev/botendo/Bot.kt b/src/main/kotlin/net/moonleay/botendo/Bot.kt similarity index 89% rename from src/main/kotlin/de/limited_dev/botendo/Bot.kt rename to src/main/kotlin/net/moonleay/botendo/Bot.kt index 91d756f..487a506 100644 --- a/src/main/kotlin/de/limited_dev/botendo/Bot.kt +++ b/src/main/kotlin/net/moonleay/botendo/Bot.kt @@ -17,21 +17,20 @@ * */ -package de.limited_dev.botendo +package net.moonleay.botendo import com.kotlindiscord.kord.extensions.ExtensibleBot -import de.limited_dev.botendo.buttons.ButtonManager -import de.limited_dev.botendo.data.CredentialManager -import de.limited_dev.botendo.extensions.music.* -import de.limited_dev.botendo.extensions.util.InfoExtension -import de.limited_dev.botendo.util.Logger -import de.limited_dev.botendo.util.MessageUtil import dev.kord.common.Color import dev.kord.core.behavior.interaction.response.respond import dev.kord.core.event.interaction.ButtonInteractionCreateEvent import dev.kord.core.on import dev.schlaubi.lavakord.LavaKord import dev.schlaubi.lavakord.kord.lavakord +import net.moonleay.botendo.data.CredentialManager +import net.moonleay.botendo.extensions.music.* +import net.moonleay.botendo.extensions.util.InfoExtension +import net.moonleay.botendo.util.Logger +import net.moonleay.botendo.util.MessageUtil object Bot { //The kord object gets set at app launch @@ -83,7 +82,7 @@ object Bot { val response = inter.deferPublicResponse() val u = inter.user val g = this.interaction.getOriginalInteractionResponse().getGuild() - for (b in ButtonManager.buttons) { + for (b in net.moonleay.botendo.buttons.ButtonManager.buttons) { if (b.id != inter.componentId) continue b.onInteraction(response, g, u) diff --git a/src/main/kotlin/de/limited_dev/botendo/Main.kt b/src/main/kotlin/net/moonleay/botendo/Main.kt similarity index 82% rename from src/main/kotlin/de/limited_dev/botendo/Main.kt rename to src/main/kotlin/net/moonleay/botendo/Main.kt index 428f277..882f7fb 100644 --- a/src/main/kotlin/de/limited_dev/botendo/Main.kt +++ b/src/main/kotlin/net/moonleay/botendo/Main.kt @@ -17,9 +17,7 @@ * */ -package de.limited_dev.botendo - -import de.limited_dev.botendo.build.BuildConstants +package net.moonleay.botendo ///Show the splash and launch the Bot @@ -34,6 +32,6 @@ suspend fun main() { "M#########M \n" + " " ) - println("Bot v.${BuildConstants.version}, Kord Extensions v.${BuildConstants.kordVersion}, LavaKord v.${BuildConstants.lavaVersion}, Coroutines v.${BuildConstants.coroutinesVersion}") + println("Bot v.${net.moonleay.botendo.build.BuildConstants.version}, Kord Extensions v.${net.moonleay.botendo.build.BuildConstants.kordVersion}, LavaKord v.${net.moonleay.botendo.build.BuildConstants.lavaVersion}, Coroutines v.${net.moonleay.botendo.build.BuildConstants.coroutinesVersion}") Bot.start() } diff --git a/src/main/kotlin/de/limited_dev/botendo/buttons/Button.kt b/src/main/kotlin/net/moonleay/botendo/buttons/Button.kt similarity index 96% rename from src/main/kotlin/de/limited_dev/botendo/buttons/Button.kt rename to src/main/kotlin/net/moonleay/botendo/buttons/Button.kt index ea63f82..40b55ec 100644 --- a/src/main/kotlin/de/limited_dev/botendo/buttons/Button.kt +++ b/src/main/kotlin/net/moonleay/botendo/buttons/Button.kt @@ -17,7 +17,7 @@ * */ -package de.limited_dev.botendo.buttons +package net.moonleay.botendo.buttons import dev.kord.core.behavior.interaction.response.DeferredPublicMessageInteractionResponseBehavior import dev.kord.core.entity.Guild diff --git a/src/main/kotlin/de/limited_dev/botendo/buttons/ButtonManager.kt b/src/main/kotlin/net/moonleay/botendo/buttons/ButtonManager.kt similarity index 76% rename from src/main/kotlin/de/limited_dev/botendo/buttons/ButtonManager.kt rename to src/main/kotlin/net/moonleay/botendo/buttons/ButtonManager.kt index 618676b..512dcbb 100644 --- a/src/main/kotlin/de/limited_dev/botendo/buttons/ButtonManager.kt +++ b/src/main/kotlin/net/moonleay/botendo/buttons/ButtonManager.kt @@ -17,10 +17,16 @@ * */ -package de.limited_dev.botendo.buttons +package net.moonleay.botendo.buttons -import de.limited_dev.botendo.buttons.music.* +import net.moonleay.botendo.buttons.music.* object ButtonManager { - val buttons = listOf(RepeatButton(), PauseButton(), SkipButton(), QueueButton(), StopButton()) + val buttons = listOf( + RepeatButton(), + PauseButton(), + SkipButton(), + QueueButton(), + StopButton() + ) } diff --git a/src/main/kotlin/de/limited_dev/botendo/buttons/music/PauseButton.kt b/src/main/kotlin/net/moonleay/botendo/buttons/music/PauseButton.kt similarity index 90% rename from src/main/kotlin/de/limited_dev/botendo/buttons/music/PauseButton.kt rename to src/main/kotlin/net/moonleay/botendo/buttons/music/PauseButton.kt index df894b0..80423c1 100644 --- a/src/main/kotlin/de/limited_dev/botendo/buttons/music/PauseButton.kt +++ b/src/main/kotlin/net/moonleay/botendo/buttons/music/PauseButton.kt @@ -17,13 +17,8 @@ * */ -package de.limited_dev.botendo.buttons.music +package net.moonleay.botendo.buttons.music -import de.limited_dev.botendo.Bot -import de.limited_dev.botendo.buttons.Button -import de.limited_dev.botendo.extensions.music.components.MusicManager -import de.limited_dev.botendo.util.ButtonUtil -import de.limited_dev.botendo.util.MessageUtil import dev.kord.common.Color import dev.kord.core.behavior.interaction.response.DeferredPublicMessageInteractionResponseBehavior import dev.kord.core.behavior.interaction.response.respond @@ -31,15 +26,18 @@ import dev.kord.core.entity.Guild import dev.kord.core.entity.User import dev.kord.rest.builder.message.modify.actionRow import dev.schlaubi.lavakord.audio.Link +import net.moonleay.botendo.extensions.music.components.MusicManager +import net.moonleay.botendo.util.ButtonUtil +import net.moonleay.botendo.util.MessageUtil -class PauseButton : Button("btn.music.pause") { +class PauseButton : net.moonleay.botendo.buttons.Button("btn.music.pause") { override suspend fun onInteraction( response: DeferredPublicMessageInteractionResponseBehavior, guild: Guild, user: User ) { val guildId = guild.id - val link = Bot.lava.getLink(guildId.toString()) + val link = net.moonleay.botendo.Bot.lava.getLink(guildId.toString()) val player = link.player val voiceState = user.asMember(guildId).getVoiceStateOrNull() if (voiceState == null) { diff --git a/src/main/kotlin/de/limited_dev/botendo/buttons/music/QueueButton.kt b/src/main/kotlin/net/moonleay/botendo/buttons/music/QueueButton.kt similarity index 88% rename from src/main/kotlin/de/limited_dev/botendo/buttons/music/QueueButton.kt rename to src/main/kotlin/net/moonleay/botendo/buttons/music/QueueButton.kt index ef6d94b..d88bb58 100644 --- a/src/main/kotlin/de/limited_dev/botendo/buttons/music/QueueButton.kt +++ b/src/main/kotlin/net/moonleay/botendo/buttons/music/QueueButton.kt @@ -17,14 +17,8 @@ * */ -package de.limited_dev.botendo.buttons.music +package net.moonleay.botendo.buttons.music -import de.limited_dev.botendo.Bot -import de.limited_dev.botendo.buttons.Button -import de.limited_dev.botendo.extensions.music.components.MusicManager -import de.limited_dev.botendo.util.ButtonUtil -import de.limited_dev.botendo.util.MessageUtil -import de.limited_dev.botendo.util.TimeUtil import dev.kord.common.Color import dev.kord.core.behavior.interaction.response.DeferredPublicMessageInteractionResponseBehavior import dev.kord.core.behavior.interaction.response.respond @@ -32,15 +26,19 @@ import dev.kord.core.entity.Guild import dev.kord.core.entity.User import dev.kord.rest.builder.message.modify.actionRow import dev.schlaubi.lavakord.audio.Link +import net.moonleay.botendo.extensions.music.components.MusicManager +import net.moonleay.botendo.util.ButtonUtil +import net.moonleay.botendo.util.MessageUtil +import net.moonleay.botendo.util.TimeUtil -class QueueButton : Button("btn.music.queue") { +class QueueButton : net.moonleay.botendo.buttons.Button("btn.music.queue") { override suspend fun onInteraction( response: DeferredPublicMessageInteractionResponseBehavior, guild: Guild, user: User ) { val guildId = guild.id - val link = Bot.lava.getLink(guildId.toString()) + val link = net.moonleay.botendo.Bot.lava.getLink(guildId.toString()) val player = link.player if (link.state == Link.State.NOT_CONNECTED) { response.respond { diff --git a/src/main/kotlin/de/limited_dev/botendo/buttons/music/RepeatButton.kt b/src/main/kotlin/net/moonleay/botendo/buttons/music/RepeatButton.kt similarity index 90% rename from src/main/kotlin/de/limited_dev/botendo/buttons/music/RepeatButton.kt rename to src/main/kotlin/net/moonleay/botendo/buttons/music/RepeatButton.kt index 92c3ae2..ee3fdb6 100644 --- a/src/main/kotlin/de/limited_dev/botendo/buttons/music/RepeatButton.kt +++ b/src/main/kotlin/net/moonleay/botendo/buttons/music/RepeatButton.kt @@ -17,13 +17,8 @@ * */ -package de.limited_dev.botendo.buttons.music +package net.moonleay.botendo.buttons.music -import de.limited_dev.botendo.Bot -import de.limited_dev.botendo.buttons.Button -import de.limited_dev.botendo.extensions.music.components.MusicManager -import de.limited_dev.botendo.util.ButtonUtil -import de.limited_dev.botendo.util.MessageUtil import dev.kord.common.Color import dev.kord.core.behavior.interaction.response.DeferredPublicMessageInteractionResponseBehavior import dev.kord.core.behavior.interaction.response.respond @@ -31,15 +26,18 @@ import dev.kord.core.entity.Guild import dev.kord.core.entity.User import dev.kord.rest.builder.message.modify.actionRow import dev.schlaubi.lavakord.audio.Link +import net.moonleay.botendo.extensions.music.components.MusicManager +import net.moonleay.botendo.util.ButtonUtil +import net.moonleay.botendo.util.MessageUtil -class RepeatButton : Button("btn.music.repeat") { +class RepeatButton : net.moonleay.botendo.buttons.Button("btn.music.repeat") { override suspend fun onInteraction( response: DeferredPublicMessageInteractionResponseBehavior, guild: Guild, user: User ) { val guildId = guild.id - val link = Bot.lava.getLink(guildId.toString()) + val link = net.moonleay.botendo.Bot.lava.getLink(guildId.toString()) val player = link.player val voiceState = user.asMember(guildId).getVoiceStateOrNull() if (voiceState == null) { diff --git a/src/main/kotlin/de/limited_dev/botendo/buttons/music/SkipButton.kt b/src/main/kotlin/net/moonleay/botendo/buttons/music/SkipButton.kt similarity index 91% rename from src/main/kotlin/de/limited_dev/botendo/buttons/music/SkipButton.kt rename to src/main/kotlin/net/moonleay/botendo/buttons/music/SkipButton.kt index 2ae263d..3c2b8e2 100644 --- a/src/main/kotlin/de/limited_dev/botendo/buttons/music/SkipButton.kt +++ b/src/main/kotlin/net/moonleay/botendo/buttons/music/SkipButton.kt @@ -17,15 +17,9 @@ * */ -package de.limited_dev.botendo.buttons.music +package net.moonleay.botendo.buttons.music + -import de.limited_dev.botendo.Bot -import de.limited_dev.botendo.buttons.Button -import de.limited_dev.botendo.extensions.music.components.MusicManager -import de.limited_dev.botendo.util.ButtonUtil -import de.limited_dev.botendo.util.MessageUtil -import de.limited_dev.botendo.util.TimeUtil -import de.limited_dev.botendo.util.UrlUtil import dev.kord.common.Color import dev.kord.core.behavior.interaction.response.DeferredPublicMessageInteractionResponseBehavior import dev.kord.core.behavior.interaction.response.respond @@ -33,15 +27,20 @@ import dev.kord.core.entity.Guild import dev.kord.core.entity.User import dev.kord.rest.builder.message.modify.actionRow import dev.schlaubi.lavakord.audio.Link +import net.moonleay.botendo.extensions.music.components.MusicManager +import net.moonleay.botendo.util.ButtonUtil +import net.moonleay.botendo.util.MessageUtil +import net.moonleay.botendo.util.TimeUtil +import net.moonleay.botendo.util.UrlUtil -class SkipButton : Button("btn.music.skip") { +class SkipButton : net.moonleay.botendo.buttons.Button("btn.music.skip") { override suspend fun onInteraction( response: DeferredPublicMessageInteractionResponseBehavior, guild: Guild, user: User ) { val guildId = guild.id - val link = Bot.lava.getLink(guildId.toString()) + val link = net.moonleay.botendo.Bot.lava.getLink(guildId.toString()) val player = link.player val voiceState = user.asMember(guildId).getVoiceStateOrNull() if (voiceState == null) { diff --git a/src/main/kotlin/de/limited_dev/botendo/buttons/music/StopButton.kt b/src/main/kotlin/net/moonleay/botendo/buttons/music/StopButton.kt similarity index 90% rename from src/main/kotlin/de/limited_dev/botendo/buttons/music/StopButton.kt rename to src/main/kotlin/net/moonleay/botendo/buttons/music/StopButton.kt index a6a1697..19b7632 100644 --- a/src/main/kotlin/de/limited_dev/botendo/buttons/music/StopButton.kt +++ b/src/main/kotlin/net/moonleay/botendo/buttons/music/StopButton.kt @@ -17,27 +17,25 @@ * */ -package de.limited_dev.botendo.buttons.music +package net.moonleay.botendo.buttons.music -import de.limited_dev.botendo.Bot -import de.limited_dev.botendo.buttons.Button -import de.limited_dev.botendo.extensions.music.components.MusicManager -import de.limited_dev.botendo.util.MessageUtil import dev.kord.common.Color import dev.kord.core.behavior.interaction.response.DeferredPublicMessageInteractionResponseBehavior import dev.kord.core.behavior.interaction.response.respond import dev.kord.core.entity.Guild import dev.kord.core.entity.User import dev.schlaubi.lavakord.audio.Link +import net.moonleay.botendo.extensions.music.components.MusicManager +import net.moonleay.botendo.util.MessageUtil -class StopButton : Button("btn.music.stop") { +class StopButton : net.moonleay.botendo.buttons.Button("btn.music.stop") { override suspend fun onInteraction( response: DeferredPublicMessageInteractionResponseBehavior, guild: Guild, user: User ) { val guildId = guild.id - val link = Bot.lava.getLink(guildId.toString()) + val link = net.moonleay.botendo.Bot.lava.getLink(guildId.toString()) val player = link.player val voiceState = user.asMember(guildId).getVoiceStateOrNull() if (voiceState == null) { diff --git a/src/main/kotlin/de/limited_dev/botendo/data/CredentialManager.kt b/src/main/kotlin/net/moonleay/botendo/data/CredentialManager.kt similarity index 98% rename from src/main/kotlin/de/limited_dev/botendo/data/CredentialManager.kt rename to src/main/kotlin/net/moonleay/botendo/data/CredentialManager.kt index 78868fa..63fc538 100644 --- a/src/main/kotlin/de/limited_dev/botendo/data/CredentialManager.kt +++ b/src/main/kotlin/net/moonleay/botendo/data/CredentialManager.kt @@ -17,7 +17,7 @@ * */ -package de.limited_dev.botendo.data +package net.moonleay.botendo.data import java.io.* import java.util.* diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/NowPlayingExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/NowPlayingExtension.kt similarity index 90% rename from src/main/kotlin/de/limited_dev/botendo/extensions/music/NowPlayingExtension.kt rename to src/main/kotlin/net/moonleay/botendo/extensions/music/NowPlayingExtension.kt index 5788901..fe2773c 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/NowPlayingExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/NowPlayingExtension.kt @@ -17,21 +17,20 @@ * */ -package de.limited_dev.botendo.extensions.music +package net.moonleay.botendo.extensions.music import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import com.kotlindiscord.kord.extensions.types.respond -import de.limited_dev.botendo.Bot -import de.limited_dev.botendo.extensions.music.components.MusicManager -import de.limited_dev.botendo.util.ButtonUtil -import de.limited_dev.botendo.util.MessageUtil -import de.limited_dev.botendo.util.TimeUtil -import de.limited_dev.botendo.util.UrlUtil import dev.kord.common.Color import dev.kord.rest.builder.message.create.actionRow import dev.schlaubi.lavakord.audio.Link import dev.schlaubi.lavakord.kord.getLink +import net.moonleay.botendo.extensions.music.components.MusicManager +import net.moonleay.botendo.util.ButtonUtil +import net.moonleay.botendo.util.MessageUtil +import net.moonleay.botendo.util.TimeUtil +import net.moonleay.botendo.util.UrlUtil class NowPlayingExtension : Extension() { override val name = "nowplaying" @@ -41,7 +40,7 @@ class NowPlayingExtension : Extension() { description = "Show what's currently playing" this.action { val guildId = this.guild!!.id - val link = Bot.lava.getLink(guildId) + val link = net.moonleay.botendo.Bot.lava.getLink(guildId) val player = link.player if (link.state == Link.State.NOT_CONNECTED) { MessageUtil.sendEmbedForPublicSlashCommand( diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/PlayExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/PlayExtension.kt similarity index 91% rename from src/main/kotlin/de/limited_dev/botendo/extensions/music/PlayExtension.kt rename to src/main/kotlin/net/moonleay/botendo/extensions/music/PlayExtension.kt index fa92f32..0eec770 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/PlayExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/PlayExtension.kt @@ -17,18 +17,17 @@ * */ -package de.limited_dev.botendo.extensions.music +package net.moonleay.botendo.extensions.music import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import com.kotlindiscord.kord.extensions.types.respond -import de.limited_dev.botendo.Bot -import de.limited_dev.botendo.extensions.music.components.LinkArguments -import de.limited_dev.botendo.extensions.music.components.MusicManager -import de.limited_dev.botendo.util.MessageUtil import dev.kord.common.Color import dev.schlaubi.lavakord.audio.Link import dev.schlaubi.lavakord.kord.getLink +import net.moonleay.botendo.extensions.music.components.LinkArguments +import net.moonleay.botendo.extensions.music.components.MusicManager +import net.moonleay.botendo.util.MessageUtil class PlayExtension : Extension() { @@ -41,7 +40,7 @@ class PlayExtension : Extension() { description = "Play music" this.action { val guildId = this.guild!!.id - val link = Bot.lava.getLink(guildId) + val link = net.moonleay.botendo.Bot.lava.getLink(guildId) val u = this.user val vcsUser = u.asMember(guildId).getVoiceStateOrNull() if (vcsUser == null) { diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/QueueExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/QueueExtension.kt similarity index 90% rename from src/main/kotlin/de/limited_dev/botendo/extensions/music/QueueExtension.kt rename to src/main/kotlin/net/moonleay/botendo/extensions/music/QueueExtension.kt index c27bde5..b75c629 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/QueueExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/QueueExtension.kt @@ -17,19 +17,18 @@ * */ -package de.limited_dev.botendo.extensions.music +package net.moonleay.botendo.extensions.music import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import com.kotlindiscord.kord.extensions.types.respond -import de.limited_dev.botendo.Bot -import de.limited_dev.botendo.extensions.music.components.MusicManager -import de.limited_dev.botendo.util.ButtonUtil -import de.limited_dev.botendo.util.MessageUtil -import de.limited_dev.botendo.util.TimeUtil import dev.kord.common.Color import dev.kord.rest.builder.message.create.actionRow import dev.schlaubi.lavakord.audio.Link +import net.moonleay.botendo.extensions.music.components.MusicManager +import net.moonleay.botendo.util.ButtonUtil +import net.moonleay.botendo.util.MessageUtil +import net.moonleay.botendo.util.TimeUtil class QueueExtension : Extension() { override val name = "queue" @@ -39,7 +38,7 @@ class QueueExtension : Extension() { description = "Show whats up next" this.action { val guildId = this.guild!!.id - val link = Bot.lava.getLink(guildId.toString()) + val link = net.moonleay.botendo.Bot.lava.getLink(guildId.toString()) val player = link.player if (link.state == Link.State.NOT_CONNECTED) { MessageUtil.sendEmbedForPublicSlashCommand( diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/SkipExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/SkipExtension.kt similarity index 92% rename from src/main/kotlin/de/limited_dev/botendo/extensions/music/SkipExtension.kt rename to src/main/kotlin/net/moonleay/botendo/extensions/music/SkipExtension.kt index 48b530d..ef761df 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/SkipExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/SkipExtension.kt @@ -17,20 +17,19 @@ * */ -package de.limited_dev.botendo.extensions.music +package net.moonleay.botendo.extensions.music import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import com.kotlindiscord.kord.extensions.types.respond -import de.limited_dev.botendo.Bot -import de.limited_dev.botendo.extensions.music.components.MusicManager -import de.limited_dev.botendo.util.ButtonUtil -import de.limited_dev.botendo.util.MessageUtil -import de.limited_dev.botendo.util.TimeUtil -import de.limited_dev.botendo.util.UrlUtil import dev.kord.common.Color import dev.kord.rest.builder.message.create.actionRow import dev.schlaubi.lavakord.audio.Link +import net.moonleay.botendo.extensions.music.components.MusicManager +import net.moonleay.botendo.util.ButtonUtil +import net.moonleay.botendo.util.MessageUtil +import net.moonleay.botendo.util.TimeUtil +import net.moonleay.botendo.util.UrlUtil class SkipExtension : Extension() { override val name = "skip" @@ -40,7 +39,7 @@ class SkipExtension : Extension() { description = "Skip to the next song in queue" this.action { val guildId = this.guild!!.id - val link = Bot.lava.getLink(guildId.toString()) + val link = net.moonleay.botendo.Bot.lava.getLink(guildId.toString()) val player = link.player val u = this.user val voiceState = u.asMember(guildId).getVoiceStateOrNull() diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/StopExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/StopExtension.kt similarity index 93% rename from src/main/kotlin/de/limited_dev/botendo/extensions/music/StopExtension.kt rename to src/main/kotlin/net/moonleay/botendo/extensions/music/StopExtension.kt index b52330b..6b49b53 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/StopExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/StopExtension.kt @@ -17,17 +17,16 @@ * */ -package de.limited_dev.botendo.extensions.music +package net.moonleay.botendo.extensions.music import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import com.kotlindiscord.kord.extensions.types.respond -import de.limited_dev.botendo.Bot -import de.limited_dev.botendo.extensions.music.components.MusicManager -import de.limited_dev.botendo.util.MessageUtil import dev.kord.common.Color import dev.schlaubi.lavakord.audio.Link import dev.schlaubi.lavakord.kord.getLink +import net.moonleay.botendo.extensions.music.components.MusicManager +import net.moonleay.botendo.util.MessageUtil class StopExtension : Extension() { override val name = "stop" @@ -37,7 +36,7 @@ class StopExtension : Extension() { description = "Stop playing and start leavin'" this.action { val guildId = this.guild!!.id - val link = Bot.lava.getLink(guildId) + val link = net.moonleay.botendo.Bot.lava.getLink(guildId) val player = link.player val u = this.user val vcsUser = u.asMember(guildId).getVoiceStateOrNull() diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/UpsertExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/UpsertExtension.kt similarity index 91% rename from src/main/kotlin/de/limited_dev/botendo/extensions/music/UpsertExtension.kt rename to src/main/kotlin/net/moonleay/botendo/extensions/music/UpsertExtension.kt index 2b0fe14..557eb85 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/UpsertExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/UpsertExtension.kt @@ -17,18 +17,17 @@ * */ -package de.limited_dev.botendo.extensions.music +package net.moonleay.botendo.extensions.music import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import com.kotlindiscord.kord.extensions.types.respond -import de.limited_dev.botendo.Bot -import de.limited_dev.botendo.extensions.music.components.LinkArguments -import de.limited_dev.botendo.extensions.music.components.MusicManager -import de.limited_dev.botendo.util.MessageUtil import dev.kord.common.Color import dev.schlaubi.lavakord.audio.Link import dev.schlaubi.lavakord.kord.getLink +import net.moonleay.botendo.extensions.music.components.LinkArguments +import net.moonleay.botendo.extensions.music.components.MusicManager +import net.moonleay.botendo.util.MessageUtil class UpsertExtension : Extension() { @@ -41,7 +40,7 @@ class UpsertExtension : Extension() { description = "Upsert music" this.action { val guildId = this.guild!!.id - val link = Bot.lava.getLink(guildId) + val link = net.moonleay.botendo.Bot.lava.getLink(guildId) val u = this.user val vcsUser = u.asMember(guildId).getVoiceStateOrNull() if (vcsUser == null) { diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/components/GuildTrackScheduler.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/components/GuildTrackScheduler.kt similarity index 95% rename from src/main/kotlin/de/limited_dev/botendo/extensions/music/components/GuildTrackScheduler.kt rename to src/main/kotlin/net/moonleay/botendo/extensions/music/components/GuildTrackScheduler.kt index 57505be..9b35620 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/components/GuildTrackScheduler.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/components/GuildTrackScheduler.kt @@ -17,13 +17,12 @@ * */ -package de.limited_dev.botendo.extensions.music.components +package net.moonleay.botendo.extensions.music.components -import de.limited_dev.botendo.Bot -import de.limited_dev.botendo.util.Logger import dev.schlaubi.lavakord.audio.* import dev.schlaubi.lavakord.audio.player.Player import dev.schlaubi.lavakord.rest.models.PartialTrack +import net.moonleay.botendo.util.Logger import java.util.concurrent.BlockingQueue import java.util.concurrent.LinkedBlockingQueue @@ -97,7 +96,7 @@ class GuildTrackScheduler(val pl: Player) { return } Logger.out("Track has ended; Playing next...") - playNext(Bot.lava.getLink(e.guildId)) + playNext(net.moonleay.botendo.Bot.lava.getLink(e.guildId)) } } diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/components/LinkArguments.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/components/LinkArguments.kt similarity index 94% rename from src/main/kotlin/de/limited_dev/botendo/extensions/music/components/LinkArguments.kt rename to src/main/kotlin/net/moonleay/botendo/extensions/music/components/LinkArguments.kt index f364e01..8c0c065 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/components/LinkArguments.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/components/LinkArguments.kt @@ -17,7 +17,7 @@ * */ -package de.limited_dev.botendo.extensions.music.components +package net.moonleay.botendo.extensions.music.components import com.kotlindiscord.kord.extensions.commands.Arguments import com.kotlindiscord.kord.extensions.commands.converters.impl.string diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/components/MusicManager.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/components/MusicManager.kt similarity index 97% rename from src/main/kotlin/de/limited_dev/botendo/extensions/music/components/MusicManager.kt rename to src/main/kotlin/net/moonleay/botendo/extensions/music/components/MusicManager.kt index 3eb47b5..327c2ab 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/components/MusicManager.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/components/MusicManager.kt @@ -17,15 +17,11 @@ * */ -package de.limited_dev.botendo.extensions.music.components +package net.moonleay.botendo.extensions.music.components import com.kotlindiscord.kord.extensions.commands.application.slash.PublicSlashCommandContext import com.kotlindiscord.kord.extensions.components.forms.ModalForm import com.kotlindiscord.kord.extensions.types.respond -import de.limited_dev.botendo.util.ButtonUtil -import de.limited_dev.botendo.util.MessageUtil -import de.limited_dev.botendo.util.TimeUtil -import de.limited_dev.botendo.util.UrlUtil import dev.kord.common.Color import dev.kord.common.entity.Snowflake import dev.kord.core.entity.Guild @@ -34,6 +30,10 @@ import dev.schlaubi.lavakord.audio.Link import dev.schlaubi.lavakord.audio.player.Player import dev.schlaubi.lavakord.rest.loadItem import dev.schlaubi.lavakord.rest.models.TrackResponse +import net.moonleay.botendo.util.ButtonUtil +import net.moonleay.botendo.util.MessageUtil +import net.moonleay.botendo.util.TimeUtil +import net.moonleay.botendo.util.UrlUtil object MusicManager { private var musicManagerMap: MutableMap = mutableMapOf() diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/util/InfoExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/util/InfoExtension.kt similarity index 68% rename from src/main/kotlin/de/limited_dev/botendo/extensions/util/InfoExtension.kt rename to src/main/kotlin/net/moonleay/botendo/extensions/util/InfoExtension.kt index 1414ef1..c7a8a25 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/util/InfoExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/util/InfoExtension.kt @@ -17,13 +17,12 @@ * */ -package de.limited_dev.botendo.extensions.util +package net.moonleay.botendo.extensions.util import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand -import de.limited_dev.botendo.build.BuildConstants -import de.limited_dev.botendo.util.MessageUtil import dev.kord.common.Color +import net.moonleay.botendo.util.MessageUtil class InfoExtension : Extension() { override val name = "info" @@ -34,11 +33,11 @@ class InfoExtension : Extension() { this.action { MessageUtil.sendEmbedForPublicSlashCommand( this, Color(0x52E01A), "Botendo", - "Botendo ***v." + BuildConstants.version + "***\n" + - "Kord-Extensions ***v." + BuildConstants.kordVersion + "***\n" + - "lavalink.kt ***v." + BuildConstants.lavaVersion + "***\n" + - "Coroutines ***v." + BuildConstants.coroutinesVersion + "***\n\n\n" + - "***Bot made by moonleay#7441***\n" + + "Botendo ***v." + net.moonleay.botendo.build.BuildConstants.version + "***\n" + + "Kord-Extensions ***v." + net.moonleay.botendo.build.BuildConstants.kordVersion + "***\n" + + "lavalink.kt ***v." + net.moonleay.botendo.build.BuildConstants.lavaVersion + "***\n" + + "Coroutines ***v." + net.moonleay.botendo.build.BuildConstants.coroutinesVersion + "***\n\n\n" + + "***Bot made by moonleay#0069***\n" + "(c) 2023, licensed under GPL-3.0" ) } diff --git a/src/main/kotlin/de/limited_dev/botendo/util/ButtonUtil.kt b/src/main/kotlin/net/moonleay/botendo/util/ButtonUtil.kt similarity index 97% rename from src/main/kotlin/de/limited_dev/botendo/util/ButtonUtil.kt rename to src/main/kotlin/net/moonleay/botendo/util/ButtonUtil.kt index bf53762..c3b5ce6 100644 --- a/src/main/kotlin/de/limited_dev/botendo/util/ButtonUtil.kt +++ b/src/main/kotlin/net/moonleay/botendo/util/ButtonUtil.kt @@ -17,7 +17,7 @@ * */ -package de.limited_dev.botendo.util +package net.moonleay.botendo.util import dev.kord.common.entity.ButtonStyle import dev.kord.rest.builder.component.ActionRowBuilder diff --git a/src/main/kotlin/de/limited_dev/botendo/util/Logger.kt b/src/main/kotlin/net/moonleay/botendo/util/Logger.kt similarity index 97% rename from src/main/kotlin/de/limited_dev/botendo/util/Logger.kt rename to src/main/kotlin/net/moonleay/botendo/util/Logger.kt index dc5af6d..dde0ed5 100644 --- a/src/main/kotlin/de/limited_dev/botendo/util/Logger.kt +++ b/src/main/kotlin/net/moonleay/botendo/util/Logger.kt @@ -17,7 +17,7 @@ * */ -package de.limited_dev.botendo.util +package net.moonleay.botendo.util import java.time.LocalDateTime import java.time.format.DateTimeFormatter diff --git a/src/main/kotlin/de/limited_dev/botendo/util/MessageUtil.kt b/src/main/kotlin/net/moonleay/botendo/util/MessageUtil.kt similarity index 98% rename from src/main/kotlin/de/limited_dev/botendo/util/MessageUtil.kt rename to src/main/kotlin/net/moonleay/botendo/util/MessageUtil.kt index 1760c92..5255a2d 100644 --- a/src/main/kotlin/de/limited_dev/botendo/util/MessageUtil.kt +++ b/src/main/kotlin/net/moonleay/botendo/util/MessageUtil.kt @@ -17,7 +17,7 @@ * */ -package de.limited_dev.botendo.util +package net.moonleay.botendo.util import com.kotlindiscord.kord.extensions.commands.Arguments import com.kotlindiscord.kord.extensions.commands.application.slash.PublicSlashCommandContext diff --git a/src/main/kotlin/de/limited_dev/botendo/util/Status.kt b/src/main/kotlin/net/moonleay/botendo/util/Status.kt similarity index 96% rename from src/main/kotlin/de/limited_dev/botendo/util/Status.kt rename to src/main/kotlin/net/moonleay/botendo/util/Status.kt index 05cf91e..cc39a5d 100644 --- a/src/main/kotlin/de/limited_dev/botendo/util/Status.kt +++ b/src/main/kotlin/net/moonleay/botendo/util/Status.kt @@ -17,7 +17,7 @@ * */ -package de.limited_dev.botendo.util +package net.moonleay.botendo.util object Status { //TODO: impl. diff --git a/src/main/kotlin/de/limited_dev/botendo/util/TimeUtil.kt b/src/main/kotlin/net/moonleay/botendo/util/TimeUtil.kt similarity index 98% rename from src/main/kotlin/de/limited_dev/botendo/util/TimeUtil.kt rename to src/main/kotlin/net/moonleay/botendo/util/TimeUtil.kt index 2c914dd..75c9e0a 100644 --- a/src/main/kotlin/de/limited_dev/botendo/util/TimeUtil.kt +++ b/src/main/kotlin/net/moonleay/botendo/util/TimeUtil.kt @@ -17,7 +17,7 @@ * */ -package de.limited_dev.botendo.util +package net.moonleay.botendo.util import java.util.concurrent.TimeUnit diff --git a/src/main/kotlin/de/limited_dev/botendo/util/UrlUtil.kt b/src/main/kotlin/net/moonleay/botendo/util/UrlUtil.kt similarity index 96% rename from src/main/kotlin/de/limited_dev/botendo/util/UrlUtil.kt rename to src/main/kotlin/net/moonleay/botendo/util/UrlUtil.kt index 064d252..a922c1a 100644 --- a/src/main/kotlin/de/limited_dev/botendo/util/UrlUtil.kt +++ b/src/main/kotlin/net/moonleay/botendo/util/UrlUtil.kt @@ -17,7 +17,7 @@ * */ -package de.limited_dev.botendo.util +package net.moonleay.botendo.util object UrlUtil { ///Strip the video ID from a YouTube link