From 726c6247f928704dd97549694f002f5d100b987b Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Tue, 13 May 2025 10:55:01 -0700 Subject: [PATCH] Fix issues with kotlin & update to latest stickynote version --- settings.gradle.kts | 2 +- .../kotlin/xyz/lncvrt/galaxylobby/GalaxyLobbyPlugin.kt | 8 ++++---- .../lncvrt/galaxylobby/event/ProjectileLaunchListener.kt | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index ff8d6ef..0dd2f22 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,8 +9,8 @@ pluginManagement { } plugins { - id("org.sayandev.stickynote.settings") version "1.9.0" id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" + id("org.sayandev.stickynote.settings") version "1.9.1.10" } rootProject.name = "GalaxyLobby" \ No newline at end of file diff --git a/src/main/kotlin/xyz/lncvrt/galaxylobby/GalaxyLobbyPlugin.kt b/src/main/kotlin/xyz/lncvrt/galaxylobby/GalaxyLobbyPlugin.kt index d6487da..5abf587 100644 --- a/src/main/kotlin/xyz/lncvrt/galaxylobby/GalaxyLobbyPlugin.kt +++ b/src/main/kotlin/xyz/lncvrt/galaxylobby/GalaxyLobbyPlugin.kt @@ -18,9 +18,8 @@ import xyz.lncvrt.galaxylobby.event.* import java.util.* class GalaxyLobbyPlugin : JavaPlugin() { - internal val jumpPadCooldowns = HashMap() - internal val cooldowns = HashMap>() - internal val miniMessage: MiniMessage = MiniMessage.miniMessage() + val jumpPadCooldowns = HashMap() + val cooldowns = HashMap>() override fun onEnable() { StickyNoteBukkitLoader(this) @@ -41,10 +40,11 @@ class GalaxyLobbyPlugin : JavaPlugin() { pluginManager.registerEvents(PlayerMoveListener(this), this) pluginManager.registerEvents(PlayerSwapHandItemsListener(), this) pluginManager.registerEvents(PlayerToggleFlightListener(), this) - pluginManager.registerEvents(ProjectileLaunchListener(this), this) + pluginManager.registerEvents(ProjectileLaunchListener(), this) } internal fun resetPlayer(player: Player, teleport: Boolean, setGamemode: Boolean) { + val miniMessage: MiniMessage = MiniMessage.miniMessage() val effect = PotionEffect(PotionEffectType.SPEED, PotionEffect.INFINITE_DURATION, 1, false, false) player.inventory.clear() diff --git a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/ProjectileLaunchListener.kt b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/ProjectileLaunchListener.kt index a9224a1..0a3123d 100644 --- a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/ProjectileLaunchListener.kt +++ b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/ProjectileLaunchListener.kt @@ -1,5 +1,6 @@ package xyz.lncvrt.galaxylobby.event +import net.kyori.adventure.text.minimessage.MiniMessage import org.bukkit.Material import org.bukkit.entity.Firework import org.bukkit.entity.Player @@ -8,9 +9,8 @@ import org.bukkit.event.Listener import org.bukkit.event.entity.ProjectileLaunchEvent import org.bukkit.inventory.ItemStack import xyz.lncvrt.galaxyapi.utils.MessageFormat -import xyz.lncvrt.galaxylobby.GalaxyLobbyPlugin -class ProjectileLaunchListener(val plugin: GalaxyLobbyPlugin) : Listener { +class ProjectileLaunchListener() : Listener { @EventHandler fun onProjectileLaunchEvent(event: ProjectileLaunchEvent) { val firework = event.getEntity() @@ -19,7 +19,7 @@ class ProjectileLaunchListener(val plugin: GalaxyLobbyPlugin) : Listener { if (player is Player) { val fireworkItem = ItemStack(Material.FIREWORK_ROCKET) val fireworkMeta = fireworkItem.itemMeta - fireworkMeta.displayName(plugin.miniMessage.deserialize(MessageFormat.setPrimaryColor("Elytra ${MessageFormat.setSecondaryColor("(Fly around the lobby!)")}"))) + fireworkMeta.displayName(MiniMessage.miniMessage().deserialize(MessageFormat.setPrimaryColor("Elytra ${MessageFormat.setSecondaryColor("(Fly around the lobby!)")}"))) fireworkItem.setItemMeta(fireworkMeta) player.inventory.setItem(7, fireworkItem) player.setCooldown(fireworkItem.type, 20)