From 00a5a408202264359376d2206d5ca02ec76f301f Mon Sep 17 00:00:00 2001 From: Tristan Date: Thu, 26 May 2022 19:21:20 -0400 Subject: [PATCH] Bump Minestom --- build.gradle.kts | 6 ++--- .../cepi/orchestra/command/PlayCommand.kt | 26 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0b5345c..6976362 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,13 +32,13 @@ dependencies { compileOnly(kotlin("reflect")) // Compile Minestom into project - compileOnly("com.github.Minestom:Minestom:4ee5cbe424") + compileOnly("com.github.Minestom", "Minestom", "7867313290") // Get KStom - compileOnly("com.github.Project-Cepi:KStom:f962764331") + compileOnly("com.github.Project-Cepi:KStom:82f7000079") // import kotlinx serialization - compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2") + compileOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3") // Add Kepi compileOnly("com.github.Project-Cepi:Kepi:c31304d5dd") diff --git a/src/main/kotlin/world/cepi/orchestra/command/PlayCommand.kt b/src/main/kotlin/world/cepi/orchestra/command/PlayCommand.kt index e111379..d961466 100644 --- a/src/main/kotlin/world/cepi/orchestra/command/PlayCommand.kt +++ b/src/main/kotlin/world/cepi/orchestra/command/PlayCommand.kt @@ -25,7 +25,7 @@ object PlayCommand : Kommand({ val songName = ArgumentType.Word("songName") - syntax(play, songName).onlyPlayers { + syntax(play, songName) { val file = Orchestra.folderDir.resolve("${context[songName]}.nbs") if (file.exists()) { @@ -46,15 +46,15 @@ object PlayCommand : Kommand({ } else { player.sendFormattedTranslatableMessage("orchestra", "none", Component.text(context[songName], NamedTextColor.BLUE)) } - } + }.onlyPlayers() - syntax(stop).onlyPlayers { + syntax(stop) { val song = GlobalSongPlayerManager.remove(player) if (song == null) { player.sendFormattedTranslatableMessage("orchestra", "play.none") - return@onlyPlayers + return@syntax } song.stop() @@ -62,36 +62,36 @@ object PlayCommand : Kommand({ player.stopSound(SoundStop.source(Sound.Source.VOICE)) player.sendFormattedTranslatableMessage("orchestra", "stop", Component.text(song.header.name, NamedTextColor.BLUE)) - } + }.onlyPlayers() - syntax(pause).onlyPlayers { + syntax(pause) { val song = GlobalSongPlayerManager[player] if (song == null) { player.sendFormattedTranslatableMessage("orchestra", "play.none") - return@onlyPlayers + return@syntax } song.stop() player.sendFormattedTranslatableMessage("orchestra", "pause", Component.text(song.header.name, NamedTextColor.BLUE)) - } + }.onlyPlayers() - syntax(resume).onlyPlayers { + syntax(resume) { val song = GlobalSongPlayerManager[player] if (song == null) { player.sendFormattedTranslatableMessage("orchestra", "play.none") - return@onlyPlayers + return@syntax } song.resume() player.sendFormattedTranslatableMessage("orchestra", "resume", Component.text(song.header.name, NamedTextColor.BLUE)) - } + }.onlyPlayers() - syntax(tempoLiteral, tempo).onlyPlayers { + syntax(tempoLiteral, tempo) { GlobalSongPlayerManager[player]?.tempo = !tempo - } + }.onlyPlayers() }, "orchestra") \ No newline at end of file