From a3be5f1e201a74687789c0122d35aa2bd91f3b1b Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Sun, 17 Apr 2022 13:16:36 +0100
Subject: [PATCH] Updated to eco placeholder system

---
 build.gradle                                  |  2 +-
 .../com/willfp/boosters/BoostersPlugin.kt     | 87 ++++++++-----------
 2 files changed, 39 insertions(+), 50 deletions(-)

diff --git a/build.gradle b/build.gradle
index 77ccff6..31d85c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,7 @@ allprojects {
     }
 
     dependencies {
-        compileOnly 'com.willfp:eco:6.33.0'
+        compileOnly 'com.willfp:eco:6.30.0'
         implementation 'com.willfp:libreforge:3.34.0'
 
         compileOnly 'org.jetbrains:annotations:23.0.0'
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt
index 70b395c..f63f5ad 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt
@@ -9,8 +9,8 @@ import com.willfp.eco.core.data.ServerProfile
 import com.willfp.eco.core.data.keys.PersistentDataKey
 import com.willfp.eco.core.data.keys.PersistentDataKeyType
 import com.willfp.eco.core.data.profile
-import com.willfp.eco.core.integrations.placeholder.PlaceholderEntry
 import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
+import com.willfp.eco.core.placeholder.PlayerlessPlaceholder
 import com.willfp.eco.util.ListUtils
 import com.willfp.eco.util.formatEco
 import com.willfp.eco.util.savedDisplayName
@@ -73,92 +73,81 @@ class BoostersPlugin : LibReforgePlugin(2036, 14269, "&e") {
 
     override fun handleEnableAdditional() {
         PlaceholderManager.registerPlaceholder(
-            PlaceholderEntry(
+            PlayerlessPlaceholder(
                 this,
                 "booster_info",
                 {
                     val booster = activeBooster
 
                     if (booster == null) {
-                        return@PlaceholderEntry this.langYml.getString("no-currently-active")
+                        return@PlayerlessPlaceholder this.langYml.getString("no-currently-active")
                             .formatEco(formatPlaceholders = false)
                     } else {
-                        return@PlaceholderEntry this.langYml.getString("active-placeholder")
+                        return@PlayerlessPlaceholder this.langYml.getString("active-placeholder")
                             .replace("%player%", booster.player.savedDisplayName)
                             .replace("%booster%", booster.booster.name)
                             .formatEco(formatPlaceholders = false)
                     }
-                },
-                false
+                }
             )
         )
 
         PlaceholderManager.registerPlaceholder(
-            PlaceholderEntry(
+            PlayerlessPlaceholder(
                 this,
                 "active",
-                {
-                    activeBooster?.booster?.id ?: ""
-                },
-                false
-            )
+            ) {
+                activeBooster?.booster?.id ?: ""
+            }
         )
 
         PlaceholderManager.registerPlaceholder(
-            PlaceholderEntry(
+            PlayerlessPlaceholder(
                 this,
-                "active_name",
-                {
-                    activeBooster?.booster?.name ?: ""
-                },
-                false
-            )
+                "active_name"
+            ) {
+                activeBooster?.booster?.name ?: ""
+            }
         )
 
         PlaceholderManager.registerPlaceholder(
-            PlaceholderEntry(
+            PlayerlessPlaceholder(
                 this,
                 "active_player",
-                {
-                    activeBooster?.player?.savedDisplayName ?: ""
-                },
-                false
-            )
+            ) {
+                activeBooster?.player?.savedDisplayName ?: ""
+            }
         )
 
         PlaceholderManager.registerPlaceholder(
-            PlaceholderEntry(
+            PlayerlessPlaceholder(
                 this,
-                "seconds_remaining",
-                {
-                    secondsLeft.toString()
-                },
-                false
-            )
+                "seconds_remaining"
+            ) {
+                secondsLeft.toString()
+            }
         )
 
         PlaceholderManager.registerPlaceholder(
-            PlaceholderEntry(
+            PlayerlessPlaceholder(
                 this,
-                "time_remaining",
-                {
-                    if (secondsLeft <= 0) {
-                        return@PlaceholderEntry "00:00:00"
-                    }
+                "time_remaining"
+            ) {
+                if (secondsLeft <= 0) {
+                    return@PlayerlessPlaceholder "00:00:00"
+                }
 
-                    // if you've seen this code on the internet, no you haven't. shush
-                    val seconds = secondsLeft % 3600 % 60
-                    val minutes = floor(secondsLeft % 3600 / 60.0).toInt()
-                    val hours = floor(secondsLeft / 3600.0).toInt()
+                // if you've seen this code on the internet, no you haven't. shush
+                val seconds = secondsLeft % 3600 % 60
+                val minutes = floor(secondsLeft % 3600 / 60.0).toInt()
+                val hours = floor(secondsLeft / 3600.0).toInt()
 
-                    val hh = (if (hours < 10) "0" else "") + hours
-                    val mm = (if (minutes < 10) "0" else "") + minutes
-                    val ss = (if (seconds < 10) "0" else "") + seconds
+                val hh = (if (hours < 10) "0" else "") + hours
+                val mm = (if (minutes < 10) "0" else "") + minutes
+                val ss = (if (seconds < 10) "0" else "") + seconds
 
-                    "${hh}:${mm}:${ss}"
-                },
-                false
-            )
+                "${hh}:${mm}:${ss}"
+            }
         )
 
         this.registerHolderProvider { ListUtils.toSingletonList(activeBooster?.booster as Holder) }