GalaxyNetwork/GalaxyLobby
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issues with kotlin & update to latest stickynote version

Browse Source
This commit is contained in:
Lncvrt
2025-05-13 10:55:01 -07:00
parent 2fe634664a
commit 726c6247f9
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
settings.gradle.kts
View File

@@ -9,8 +9,8 @@ pluginManagement {
} }
plugins { plugins {
id("org.sayandev.stickynote.settings") version "1.9.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.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" rootProject.name = "GalaxyLobby"

8
src/main/kotlin/xyz/lncvrt/galaxylobby/GalaxyLobbyPlugin.kt
View File

@@ -18,9 +18,8 @@ import xyz.lncvrt.galaxylobby.event.*
import java.util.* import java.util.*
class GalaxyLobbyPlugin : JavaPlugin() { class GalaxyLobbyPlugin : JavaPlugin() {
internal val jumpPadCooldowns = HashMap<UUID, Long>() val jumpPadCooldowns = HashMap<UUID, Long>()
internal val cooldowns = HashMap<Player, MutableMap<String, Long>>() val cooldowns = HashMap<Player, MutableMap<String, Long>>()
internal val miniMessage: MiniMessage = MiniMessage.miniMessage()
override fun onEnable() { override fun onEnable() {
StickyNoteBukkitLoader(this) StickyNoteBukkitLoader(this)
@@ -41,10 +40,11 @@ class GalaxyLobbyPlugin : JavaPlugin() {
pluginManager.registerEvents(PlayerMoveListener(this), this) pluginManager.registerEvents(PlayerMoveListener(this), this)
pluginManager.registerEvents(PlayerSwapHandItemsListener(), this) pluginManager.registerEvents(PlayerSwapHandItemsListener(), this)
pluginManager.registerEvents(PlayerToggleFlightListener(), this) pluginManager.registerEvents(PlayerToggleFlightListener(), this)
pluginManager.registerEvents(ProjectileLaunchListener(this), this) pluginManager.registerEvents(ProjectileLaunchListener(), this)
} }
internal fun resetPlayer(player: Player, teleport: Boolean, setGamemode: Boolean) { 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) val effect = PotionEffect(PotionEffectType.SPEED, PotionEffect.INFINITE_DURATION, 1, false, false)
player.inventory.clear() player.inventory.clear()

6
src/main/kotlin/xyz/lncvrt/galaxylobby/event/ProjectileLaunchListener.kt
View File

@@ -1,5 +1,6 @@
package xyz.lncvrt.galaxylobby.event package xyz.lncvrt.galaxylobby.event
import net.kyori.adventure.text.minimessage.MiniMessage
import org.bukkit.Material import org.bukkit.Material
import org.bukkit.entity.Firework import org.bukkit.entity.Firework
import org.bukkit.entity.Player import org.bukkit.entity.Player
@@ -8,9 +9,8 @@ import org.bukkit.event.Listener
import org.bukkit.event.entity.ProjectileLaunchEvent import org.bukkit.event.entity.ProjectileLaunchEvent
import org.bukkit.inventory.ItemStack import org.bukkit.inventory.ItemStack
import xyz.lncvrt.galaxyapi.utils.MessageFormat import xyz.lncvrt.galaxyapi.utils.MessageFormat
import xyz.lncvrt.galaxylobby.GalaxyLobbyPlugin
class ProjectileLaunchListener(val plugin: GalaxyLobbyPlugin) : Listener { class ProjectileLaunchListener() : Listener {
@EventHandler @EventHandler
fun onProjectileLaunchEvent(event: ProjectileLaunchEvent) { fun onProjectileLaunchEvent(event: ProjectileLaunchEvent) {
val firework = event.getEntity() val firework = event.getEntity()
@@ -19,7 +19,7 @@ class ProjectileLaunchListener(val plugin: GalaxyLobbyPlugin) : Listener {
if (player is Player) { if (player is Player) {
val fireworkItem = ItemStack(Material.FIREWORK_ROCKET) val fireworkItem = ItemStack(Material.FIREWORK_ROCKET)
val fireworkMeta = fireworkItem.itemMeta val fireworkMeta = fireworkItem.itemMeta
fireworkMeta.displayName(plugin.miniMessage.deserialize(MessageFormat.setPrimaryColor("<italic:false>Elytra ${MessageFormat.setSecondaryColor("(Fly around the lobby!)")}</italic>"))) fireworkMeta.displayName(MiniMessage.miniMessage().deserialize(MessageFormat.setPrimaryColor("<italic:false>Elytra ${MessageFormat.setSecondaryColor("(Fly around the lobby!)")}</italic>")))
fireworkItem.setItemMeta(fireworkMeta) fireworkItem.setItemMeta(fireworkMeta)
player.inventory.setItem(7, fireworkItem) player.inventory.setItem(7, fireworkItem)
player.setCooldown(fireworkItem.type, 20) player.setCooldown(fireworkItem.type, 20)