diff --git a/build.gradle.kts b/build.gradle.kts index c92e0b4..ad2b151 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ import org.sayandev.plugin.StickyNoteModules plugins { java - kotlin("jvm") version "2.2.0" + kotlin("jvm") version "2.1.21" id("xyz.jpenilla.run-paper") version "2.3.1" id("de.eldoria.plugin-yml.bukkit") version "0.7.1" id("org.sayandev.stickynote.project") @@ -28,7 +28,7 @@ repositories { } dependencies { - compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT") compileOnly("xyz.lncvrt:galaxyapi:1.0.6") } @@ -79,8 +79,7 @@ tasks { expand( "version" to project.version as String, "slug" to slug, - "name" to rootProject.name, - "description" to project.description + "name" to rootProject.name ) } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55..8bdaf60 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradlew b/gradlew index 23d15a9..ef07e01 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/main/kotlin/xyz/lncvrt/galaxylobby/GalaxyLobbyPlugin.kt b/src/main/kotlin/xyz/lncvrt/galaxylobby/GalaxyLobbyPlugin.kt index 5abf587..d2fb5ba 100644 --- a/src/main/kotlin/xyz/lncvrt/galaxylobby/GalaxyLobbyPlugin.kt +++ b/src/main/kotlin/xyz/lncvrt/galaxylobby/GalaxyLobbyPlugin.kt @@ -12,8 +12,7 @@ import org.bukkit.potion.PotionEffect import org.bukkit.potion.PotionEffectType import org.sayandev.stickynote.loader.bukkit.StickyNoteBukkitLoader import xyz.lncvrt.galaxyapi.utils.MessageFormat -import xyz.lncvrt.galaxylobby.command.DiscordCommand -import xyz.lncvrt.galaxylobby.command.WebsiteCommand +import xyz.lncvrt.galaxylobby.command.* import xyz.lncvrt.galaxylobby.event.* import java.util.* @@ -32,7 +31,7 @@ class GalaxyLobbyPlugin : JavaPlugin() { val pluginManager = server.pluginManager pluginManager.registerEvents(InventoryClickListener(), this) pluginManager.registerEvents(PlayerAdvancementCriterionGrantListener(), this) - pluginManager.registerEvents(PlayerGameModeChangeListener(this), this) + pluginManager.registerEvents(PlayerGameModeChangeListener(), this) pluginManager.registerEvents(PlayerInteractListener(this), this) pluginManager.registerEvents(PlayerItemDamageListener(), this) pluginManager.registerEvents(PlayerItemHeldListener(), this) @@ -40,7 +39,7 @@ class GalaxyLobbyPlugin : JavaPlugin() { pluginManager.registerEvents(PlayerMoveListener(this), this) pluginManager.registerEvents(PlayerSwapHandItemsListener(), this) pluginManager.registerEvents(PlayerToggleFlightListener(), this) - pluginManager.registerEvents(ProjectileLaunchListener(), this) + pluginManager.registerEvents(PlayerElytraBoostListener(), this) } internal fun resetPlayer(player: Player, teleport: Boolean, setGamemode: Boolean) { @@ -68,7 +67,7 @@ class GalaxyLobbyPlugin : JavaPlugin() { fireworkItem.setItemMeta(fireworkMeta) player.inventory.setItem(7, fireworkItem) - player.health = player.getAttribute(Attribute.GENERIC_MAX_HEALTH)?.value ?: 20.0 + player.health = player.getAttribute(Attribute.MAX_HEALTH)?.value ?: 20.0 player.foodLevel = 20 player.saturation = 20f player.clearActivePotionEffects() diff --git a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerElytraBoostListener.kt b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerElytraBoostListener.kt new file mode 100644 index 0000000..13f6a22 --- /dev/null +++ b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerElytraBoostListener.kt @@ -0,0 +1,33 @@ +package xyz.lncvrt.galaxylobby.event + +import com.destroystokyo.paper.event.player.PlayerElytraBoostEvent +import net.kyori.adventure.text.minimessage.MiniMessage +import org.bukkit.Material +import org.bukkit.event.EventHandler +import org.bukkit.event.Listener +import org.bukkit.inventory.ItemStack +import org.sayandev.stickynote.bukkit.plugin +import xyz.lncvrt.galaxyapi.utils.MessageFormat + +class PlayerElytraBoostListener() : Listener { + @EventHandler + fun onPlayerElytraBoostEvent(event: PlayerElytraBoostEvent) { + plugin.server.scheduler.runTaskLater(plugin, Runnable { + val player = event.player + val fireworkItem = ItemStack(Material.FIREWORK_ROCKET) + val fireworkMeta = fireworkItem.itemMeta + 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) + }, 1) + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerGameModeChangeListener.kt b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerGameModeChangeListener.kt index 2be121b..bd4890f 100644 --- a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerGameModeChangeListener.kt +++ b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerGameModeChangeListener.kt @@ -4,9 +4,8 @@ import org.bukkit.GameMode import org.bukkit.event.EventHandler import org.bukkit.event.Listener import org.bukkit.event.player.PlayerGameModeChangeEvent -import xyz.lncvrt.galaxylobby.GalaxyLobbyPlugin -class PlayerGameModeChangeListener(val plugin: GalaxyLobbyPlugin) : Listener { +class PlayerGameModeChangeListener() : Listener { @EventHandler fun onPlayerGameModeChangeEvent(event: PlayerGameModeChangeEvent) { val player = event.getPlayer() diff --git a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerInteractListener.kt b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerInteractListener.kt index 3692a00..d542b17 100644 --- a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerInteractListener.kt +++ b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerInteractListener.kt @@ -13,7 +13,7 @@ import xyz.lncvrt.galaxylobby.GalaxyLobbyPlugin class PlayerInteractListener(val plugin: GalaxyLobbyPlugin) : Listener { @EventHandler fun onPlayerInteractEvent(event: PlayerInteractEvent) { - if (event.getAction() !== Action.RIGHT_CLICK_AIR && event.getAction() !== Action.RIGHT_CLICK_BLOCK) { + if (event.action !== Action.RIGHT_CLICK_AIR && event.action !== Action.RIGHT_CLICK_BLOCK) { return } @@ -32,6 +32,6 @@ class PlayerInteractListener(val plugin: GalaxyLobbyPlugin) : Listener { "[Server Selector (Right Click)]" -> CommandHelper().executeAsConsole("dmenu open serverselector ${player.name}") } - playerCooldowns.put(name, currentTime) + playerCooldowns[name] = currentTime } } \ No newline at end of file diff --git a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerMoveListener.kt b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerMoveListener.kt index d2bd923..05cd980 100644 --- a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerMoveListener.kt +++ b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerMoveListener.kt @@ -31,8 +31,7 @@ class PlayerMoveListener(val plugin: GalaxyLobbyPlugin) : Listener { @EventHandler fun onPlayerMoveLaunchPad(event: PlayerMoveEvent) { val player = event.getPlayer() - val world: World? = plugin.server.getWorld("world") - if (world == null) return + val world: World = plugin.server.getWorld("world") ?: return val playerBlock = world.getBlockAt(player.location) val playerId = player.uniqueId @@ -44,7 +43,7 @@ class PlayerMoveListener(val plugin: GalaxyLobbyPlugin) : Listener { } if (playerBlock.type === Material.MANGROVE_PRESSURE_PLATE) { - plugin.jumpPadCooldowns.put(playerId, currentTime) + plugin.jumpPadCooldowns[playerId] = currentTime if (player.gameMode == GameMode.ADVENTURE && player.inventory.heldItemSlot == 7) { player.velocity = Vector(0, 1, 0) diff --git a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/ProjectileLaunchListener.kt b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/ProjectileLaunchListener.kt deleted file mode 100644 index 0a3123d..0000000 --- a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/ProjectileLaunchListener.kt +++ /dev/null @@ -1,29 +0,0 @@ -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 -import org.bukkit.event.EventHandler -import org.bukkit.event.Listener -import org.bukkit.event.entity.ProjectileLaunchEvent -import org.bukkit.inventory.ItemStack -import xyz.lncvrt.galaxyapi.utils.MessageFormat - -class ProjectileLaunchListener() : Listener { - @EventHandler - fun onProjectileLaunchEvent(event: ProjectileLaunchEvent) { - val firework = event.getEntity() - val player = firework.shooter - if (firework is Firework) { - if (player is Player) { - val fireworkItem = ItemStack(Material.FIREWORK_ROCKET) - val fireworkMeta = fireworkItem.itemMeta - 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) - } - } - } -} \ No newline at end of file