Avoid scheduling new coroutines when not necessary

Warzone · Jul 13, 2024 · da8aa6b · da8aa6b
1 parent e702774
commit da8aa6b
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 36 deletions.
diff --git a/src/main/kotlin/network/warzone/mars/Mars.kt b/src/main/kotlin/network/warzone/mars/Mars.kt
@@ -33,6 +33,7 @@ import org.bukkit.plugin.java.JavaPlugin
 import tc.oc.pgm.api.PGM
 import tc.oc.pgm.tablist.MatchTabManager
 import java.util.*
+import java.util.concurrent.CompletableFuture
 
 class Mars : JavaPlugin() {
     companion object {
@@ -44,6 +45,17 @@ class Mars : JavaPlugin() {
             }
         }
 
+        fun asyncAsFuture(block: suspend() -> Unit) : CompletableFuture<Void?> {
+            val future = CompletableFuture<Void?>()
+            Bukkit.getScheduler().runTaskAsynchronously(get()) {
+                runBlocking {
+                    block.invoke()
+                    future.complete(null)
+                }
+            }
+            return future
+        }
+
         fun sync(block: () -> Unit) = Bukkit.getScheduler().runTask(get(), block) // Run next tick
 
         fun get() = instance

diff --git a/src/main/kotlin/network/warzone/mars/broadcast/BroadcastFeature.kt b/src/main/kotlin/network/warzone/mars/broadcast/BroadcastFeature.kt
@@ -25,6 +25,10 @@ object BroadcastFeature : Feature<Broadcast>() {
         return broadcasts.find { it.name.equals(target, ignoreCase = true) }
     }
 
+    override fun fetchCached(target: String): Broadcast? {
+        return broadcasts.find { it.name.equals(target, ignoreCase = true) }
+    }
+
     override suspend fun init() {
         index = 0
         broadcasts = BroadcastService.getBroadcasts()

diff --git a/src/main/kotlin/network/warzone/mars/commands/providers/BroadcastProvider.kt b/src/main/kotlin/network/warzone/mars/commands/providers/BroadcastProvider.kt
@@ -4,7 +4,6 @@ import app.ashcon.intake.argument.ArgumentParseException
 import app.ashcon.intake.argument.CommandArgs
 import app.ashcon.intake.argument.Namespace
 import app.ashcon.intake.bukkit.parametric.provider.BukkitProvider
-import kotlinx.coroutines.runBlocking
 import network.warzone.mars.broadcast.Broadcast
 import network.warzone.mars.broadcast.BroadcastFeature
 import network.warzone.mars.broadcast.exceptions.BroadcastMissingException
@@ -15,13 +14,13 @@ class BroadcastProvider : BukkitProvider<Broadcast> {
         return "broadcast"
     }
 
-    override fun get(sender: CommandSender?, args: CommandArgs, annotations: MutableList<out Annotation>?): Broadcast = runBlocking {
+    override fun get(sender: CommandSender?, args: CommandArgs, annotations: MutableList<out Annotation>?): Broadcast {
         val broadcastName = args.next()
 
-        val broadcast: Broadcast? = BroadcastFeature.fetch(broadcastName)
+        val broadcast: Broadcast? = BroadcastFeature.fetchCached(broadcastName)
         broadcast ?: throw ArgumentParseException(BroadcastMissingException(broadcastName).asTextComponent().content())
 
-        return@runBlocking broadcast
+        return broadcast
     }
 
     override fun getSuggestions(

diff --git a/src/main/kotlin/network/warzone/mars/commands/providers/PlayerProfileProvider.kt b/src/main/kotlin/network/warzone/mars/commands/providers/PlayerProfileProvider.kt
@@ -4,7 +4,6 @@ import app.ashcon.intake.argument.ArgumentParseException
 import app.ashcon.intake.argument.CommandArgs
 import app.ashcon.intake.argument.Namespace
 import app.ashcon.intake.bukkit.parametric.provider.BukkitProvider
-import kotlinx.coroutines.runBlocking
 import network.warzone.mars.player.feature.PlayerFeature
 import network.warzone.mars.player.feature.exceptions.PlayerNotOnlineException
 import network.warzone.mars.player.models.PlayerProfile
@@ -20,13 +19,13 @@ class PlayerProfileProvider : BukkitProvider<PlayerProfile> {
         sender: CommandSender?,
         args: CommandArgs,
         annotations: MutableList<out Annotation>?
-    ): PlayerProfile = runBlocking {
+    ): PlayerProfile {
         val name = args.next()
 
         val profile = PlayerFeature.getCached(name) // Only online players
         profile ?: throw ArgumentParseException(PlayerNotOnlineException(name).asTextComponent().content())
 
-        return@runBlocking profile
+        return profile
     }
 
     override fun getSuggestions(

diff --git a/src/main/kotlin/network/warzone/mars/feature/Feature.kt b/src/main/kotlin/network/warzone/mars/feature/Feature.kt
@@ -8,6 +8,11 @@ abstract class Feature<T : Resource> {
      */
     abstract suspend fun fetch(target: String): T?
 
+    /**
+     * Query cache exclusively
+     */
+    open fun fetchCached(target: String): T? { return null }
+
     /**
      * Get resource from cache first, and API if not in cache.
      * Defaults to API fetch if feature has no cache.

diff --git a/src/main/kotlin/network/warzone/mars/match/tracker/PlayerTracker.kt b/src/main/kotlin/network/warzone/mars/match/tracker/PlayerTracker.kt
@@ -1,6 +1,5 @@
 package network.warzone.mars.match.tracker
 
-import kotlinx.coroutines.runBlocking
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.Component.text
 import net.kyori.adventure.text.format.NamedTextColor
@@ -100,12 +99,12 @@ class PlayerTracker : Listener {
 
     // todo: set XP bar progress & level (and ensure compatibility with vanilla exp)
     @EventHandler
-    fun onPlayerXPGain(event: PlayerXPGainEvent) = runBlocking {
+    fun onPlayerXPGain(event: PlayerXPGainEvent) {
         val (id, gain, reason, notify, multiplier) = event.data
 
-        val context = PlayerManager.getPlayer(id) ?: return@runBlocking
+        val context = PlayerManager.getPlayer(id) ?: return
         val player = context.player
-        val profile = context.getPlayerProfile()
+        val profile = context.getPlayerProfileCached() ?: return
 
         val currentLevel = profile.stats.level
 
@@ -126,7 +125,7 @@ class PlayerTracker : Listener {
     }
 
     @EventHandler
-    fun onPlayerLevelUp(event: PlayerLevelUpEvent) = runBlocking {
+    fun onPlayerLevelUp(event: PlayerLevelUpEvent) {
         val (player, level) = event.data
 
         player.playSound(player.location, Sound.LEVEL_UP, 1000f, 1f)

diff --git a/src/main/kotlin/network/warzone/mars/player/PlayerContext.kt b/src/main/kotlin/network/warzone/mars/player/PlayerContext.kt
@@ -34,4 +34,8 @@ class PlayerContext(val uuid: UUID, val player: Player, val activeSession: Sessi
         // The player is online so we know they exist.
         return PlayerFeature.getKnown(uuid)
     }
+
+    fun getPlayerProfileCached(): PlayerProfile? {
+        return PlayerFeature.getCached(uuid)
+    }
 }
diff --git a/src/main/kotlin/network/warzone/mars/player/achievements/gui/AchievementMenu.kt b/src/main/kotlin/network/warzone/mars/player/achievements/gui/AchievementMenu.kt
@@ -154,7 +154,7 @@ class AchievementMenu(player: Player) : Listener {
     }
 
     // Navigate the player up the menu hierarchy.
-    private fun createBackArrow(action: suspend InventoryClickEvent.(Player) -> Unit): GUI.Slot.() -> Unit {
+    private fun createBackArrow(action: InventoryClickEvent.(Player) -> Unit): GUI.Slot.() -> Unit {
         return {
             item = item(Material.ARROW) {
                 name = "${ChatColor.GRAY}Back"
@@ -164,7 +164,7 @@ class AchievementMenu(player: Player) : Listener {
     }
 
     // Navigate the player to the next page of a paginated GUI.
-    private fun createNextPageArrow(currentPage: Int, action: suspend InventoryClickEvent.(Player) -> Unit): GUI.Slot.() -> Unit {
+    private fun createNextPageArrow(currentPage: Int, action: InventoryClickEvent.(Player) -> Unit): GUI.Slot.() -> Unit {
         return {
             item = item(Material.ARROW) {
                 name = "${ChatColor.GRAY}Next Page"
@@ -175,7 +175,7 @@ class AchievementMenu(player: Player) : Listener {
     }
 
     // Navigate the player to the previous page of a paginated GUI.
-    private fun createPreviousPageArrow(currentPage: Int, action: suspend InventoryClickEvent.(Player) -> Unit): GUI.Slot.() -> Unit {
+    private fun createPreviousPageArrow(currentPage: Int, action: InventoryClickEvent.(Player) -> Unit): GUI.Slot.() -> Unit {
         return {
             item = item(Material.ARROW) {
                 name = "${ChatColor.GRAY}Previous Page"

diff --git a/src/main/kotlin/network/warzone/mars/player/feature/PlayerFeature.kt b/src/main/kotlin/network/warzone/mars/player/feature/PlayerFeature.kt
@@ -166,7 +166,7 @@ object PlayerFeature : NamedCachedFeature<PlayerProfile>(), Listener {
     }
 
     @EventHandler
-    fun onPlayerLogin(event: PlayerLoginEvent) = runBlocking {
+    fun onPlayerLogin(event: PlayerLoginEvent) {
         val player = event.player
 
         val (_, profile, activePuns, activeSession) = queuedJoins[player.uniqueId]
@@ -222,7 +222,7 @@ object PlayerFeature : NamedCachedFeature<PlayerProfile>(), Listener {
     }
 
     @EventHandler
-    fun onPlayerLogout(event: PlayerQuitEvent) = runBlocking {
+    fun onPlayerLogout(event: PlayerQuitEvent) {
         Mars.async {
             val player = event.player
             val uuid = player.uniqueId

diff --git a/src/main/kotlin/network/warzone/mars/player/level/LevelDisplayListener.kt b/src/main/kotlin/network/warzone/mars/player/level/LevelDisplayListener.kt
@@ -1,6 +1,5 @@
 package network.warzone.mars.player.level
 
-import kotlinx.coroutines.runBlocking
 import network.warzone.mars.Mars
 import network.warzone.mars.match.tracker.PlayerXPGainEvent
 import network.warzone.mars.player.PlayerManager
@@ -67,9 +66,9 @@ class LevelDisplayListener : Listener {
     }
 
     // Mars stat system level
-    private fun showStatsLevel(player: Player) = runBlocking {
+    private fun showStatsLevel(player: Player) {
         val context = PlayerManager.getPlayer(player.uniqueId)
-        val profile = context?.getPlayerProfile()
+        val profile = context?.getPlayerProfileCached()
         val stats = profile?.stats
         player.level = stats?.level ?: 1
         player.exp = (stats?.xp?.rem(5000F))?.div(5000F) ?: 0F

diff --git a/src/main/kotlin/network/warzone/mars/report/ReportFeature.kt b/src/main/kotlin/network/warzone/mars/report/ReportFeature.kt
@@ -1,6 +1,5 @@
 package network.warzone.mars.report
 
-import kotlinx.coroutines.runBlocking
 import network.warzone.mars.Mars
 import network.warzone.mars.api.socket.models.SimplePlayer
 import network.warzone.mars.feature.Feature

diff --git a/src/main/kotlin/network/warzone/mars/tag/commands/TagsCommand.kt b/src/main/kotlin/network/warzone/mars/tag/commands/TagsCommand.kt
@@ -54,14 +54,20 @@ class TagsCommand {
                     // todo: send request on GUI close so player can't spam API reqs by clicking
                     onclick = {
                         if (isActive) {
-                            PlayerFeature.setActiveTag(context.uuid.toString(), null)
-                            profile.activeTagId = null
+                            Mars.asyncAsFuture {
+                                PlayerFeature.setActiveTag(context.uuid.toString(), null)
+                            }.thenRun {
+                                profile.activeTagId = null
+                            }
                         } else if (profile.tagIds.contains(tag._id)) {
-                            PlayerFeature.setActiveTag(
-                                context.uuid.toString(),
-                                tag
-                            )
-                            profile.activeTagId = tag._id
+                            Mars.asyncAsFuture {
+                                PlayerFeature.setActiveTag(
+                                    context.uuid.toString(),
+                                    tag
+                                )
+                            }.thenRun {
+                                profile.activeTagId = tag._id
+                            }
                         }
 
                         refresh()

diff --git a/src/main/kotlin/network/warzone/mars/utils/menu/GUI.kt b/src/main/kotlin/network/warzone/mars/utils/menu/GUI.kt
@@ -1,6 +1,5 @@
 package network.warzone.mars.utils.menu
 
-import kotlinx.coroutines.runBlocking
 import network.warzone.mars.Mars
 import org.bukkit.Bukkit
 import org.bukkit.Sound
@@ -49,13 +48,13 @@ class GUI(
     }
 
     @EventHandler(priority = EventPriority.LOWEST)
-    fun onClick(e: InventoryClickEvent) = runBlocking {
-        if (e.inventory != inventory) return@runBlocking
+    fun onClick(e: InventoryClickEvent) {
+        if (e.inventory != inventory) return
         e.isCancelled = true
 
-        if (e.clickedInventory != inventory) return@runBlocking
-        val player = e.whoClicked as? Player ?: return@runBlocking
-        val slot = slots.getOrNull(e.slot) ?: return@runBlocking
+        if (e.clickedInventory != inventory) return
+        val player = e.whoClicked as? Player ?: return
+        val slot = slots.getOrNull(e.slot) ?: return
 
         // Play a sound if the slot has a click handler
         if (slot.onclick != null) {
@@ -73,8 +72,8 @@ class GUI(
 
     inner class Slot {
         var item: Item? = null
-        var onclick: (suspend InventoryClickEvent.(Player) -> Unit)? = null
-        var sound: (suspend InventoryClickEvent.(Player) -> Unit)? = { it.playSound(it.location, Sound.ORB_PICKUP, .05f, 1f) }
+        var onclick: (InventoryClickEvent.(Player) -> Unit)? = null
+        var sound: (InventoryClickEvent.(Player) -> Unit)? = { it.playSound(it.location, Sound.ORB_PICKUP, .05f, 1f) }
     }
 
     fun slot(