From 190ea5d49f86162880869a677e2296a8128908a2 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 7 Oct 2022 17:28:28 +0100 Subject: [PATCH] Refactor + Fix --- .../kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt | 12 +++--------- .../willfp/eco/internal/spigot/EcoSpigotPlugin.kt | 11 +++++++++-- .../data/{EcoProfileHandler.kt => ProfileHandler.kt} | 2 +- .../spigot/data/storage/LegacyMySQLDataHandler.kt | 6 +++--- .../internal/spigot/data/storage/MongoDataHandler.kt | 4 ++-- .../internal/spigot/data/storage/MySQLDataHandler.kt | 4 ++-- .../eco/internal/spigot/data/storage/ProfileSaver.kt | 4 ++-- .../internal/spigot/data/storage/YamlDataHandler.kt | 4 ++-- 8 files changed, 24 insertions(+), 23 deletions(-) rename eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/{EcoProfileHandler.kt => ProfileHandler.kt} (99%) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt index 4c742a4c..992c7250 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt @@ -4,7 +4,6 @@ import com.willfp.eco.core.Eco import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.PluginLike import com.willfp.eco.core.PluginProps -import com.willfp.eco.core.Prerequisite import com.willfp.eco.core.config.ConfigType import com.willfp.eco.core.config.interfaces.Config import com.willfp.eco.core.data.keys.PersistentDataKey @@ -39,7 +38,7 @@ import com.willfp.eco.internal.logging.EcoLogger import com.willfp.eco.internal.proxy.EcoProxyFactory import com.willfp.eco.internal.scheduling.EcoScheduler import com.willfp.eco.internal.spigot.data.DataYml -import com.willfp.eco.internal.spigot.data.EcoProfileHandler +import com.willfp.eco.internal.spigot.data.ProfileHandler import com.willfp.eco.internal.spigot.data.KeyRegistry import com.willfp.eco.internal.spigot.data.storage.HandlerType import com.willfp.eco.internal.spigot.integrations.bstats.MetricHandler @@ -53,7 +52,6 @@ import com.willfp.eco.internal.spigot.proxy.MiniMessageTranslatorProxy import com.willfp.eco.internal.spigot.proxy.SNBTConverterProxy import com.willfp.eco.internal.spigot.proxy.SkullProxy import com.willfp.eco.internal.spigot.proxy.TPSProxy -import net.kyori.adventure.platform.bukkit.BukkitAudiences import org.bukkit.Location import org.bukkit.NamespacedKey import org.bukkit.configuration.ConfigurationSection @@ -72,7 +70,7 @@ private val loadedEcoPlugins = mutableMapOf() class EcoImpl : EcoSpigotPlugin(), Eco { override val dataYml = DataYml(this) - override val profileHandler = EcoProfileHandler( + override val profileHandler = ProfileHandler( HandlerType.valueOf(this.configYml.getString("data-handler").uppercase()), this ) @@ -81,10 +79,6 @@ class EcoImpl : EcoSpigotPlugin(), Eco { getProxy(CommonsInitializerProxy::class.java).init() } - private var adventure: BukkitAudiences? = if (!Prerequisite.HAS_PAPER.isMet) { - BukkitAudiences.create(this) - } else null - @Suppress("RedundantNullableReturnType") private val keyFactory: InternalNamespacedKeyFactory? = if (this.configYml.getBool("use-safer-namespacedkey-creation")) @@ -236,7 +230,7 @@ class EcoImpl : EcoSpigotPlugin(), Eco { MetricHandler.createMetrics(plugin) override fun getAdventure() = - adventure + bukkitAudiences override fun getServerProfile() = profileHandler.loadServerProfile() diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt index e4cec9b7..0bbdacf0 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt @@ -48,7 +48,7 @@ import com.willfp.eco.internal.lookup.SegmentParserUseIfPresent import com.willfp.eco.internal.spigot.arrows.ArrowDataListener import com.willfp.eco.internal.spigot.data.DataListener import com.willfp.eco.internal.spigot.data.DataYml -import com.willfp.eco.internal.spigot.data.EcoProfileHandler +import com.willfp.eco.internal.spigot.data.ProfileHandler import com.willfp.eco.internal.spigot.data.PlayerBlockListener import com.willfp.eco.internal.spigot.data.storage.ProfileSaver import com.willfp.eco.internal.spigot.display.PacketAutoRecipe @@ -120,6 +120,7 @@ import com.willfp.eco.internal.spigot.recipes.listeners.ComplexInComplex import com.willfp.eco.internal.spigot.recipes.listeners.ComplexInVanilla import com.willfp.eco.internal.spigot.recipes.stackhandlers.ShapedCraftingRecipeStackHandler import com.willfp.eco.internal.spigot.recipes.stackhandlers.ShapelessCraftingRecipeStackHandler +import net.kyori.adventure.platform.bukkit.BukkitAudiences import net.milkbowl.vault.economy.Economy import org.bukkit.Bukkit import org.bukkit.Material @@ -128,7 +129,8 @@ import org.bukkit.inventory.ItemStack abstract class EcoSpigotPlugin : EcoPlugin() { abstract val dataYml: DataYml - protected abstract val profileHandler: EcoProfileHandler + protected abstract val profileHandler: ProfileHandler + protected var bukkitAudiences: BukkitAudiences? = null init { Items.registerArgParser(ArgParserEnchantment) @@ -207,6 +209,11 @@ abstract class EcoSpigotPlugin : EcoPlugin() { // Preload categorized persistent data keys profileHandler.initialize() + + // Init adventure + if (!Prerequisite.HAS_PAPER.isMet) { + bukkitAudiences = BukkitAudiences.create(this) + } } override fun handleDisable() { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoProfileHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/ProfileHandler.kt similarity index 99% rename from eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoProfileHandler.kt rename to eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/ProfileHandler.kt index 5b549169..f1130e80 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoProfileHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/ProfileHandler.kt @@ -18,7 +18,7 @@ import java.util.UUID val serverProfileUUID = UUID(0, 0) -class EcoProfileHandler( +class ProfileHandler( private val type: HandlerType, private val plugin: EcoSpigotPlugin ) { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/LegacyMySQLDataHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/LegacyMySQLDataHandler.kt index 7c7ba1e5..334eb727 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/LegacyMySQLDataHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/LegacyMySQLDataHandler.kt @@ -7,7 +7,7 @@ import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.data.keys.PersistentDataKey import com.willfp.eco.core.data.keys.PersistentDataKeyType import com.willfp.eco.internal.spigot.EcoSpigotPlugin -import com.willfp.eco.internal.spigot.data.EcoProfileHandler +import com.willfp.eco.internal.spigot.data.ProfileHandler import com.willfp.eco.internal.spigot.data.serverProfileUUID import com.zaxxer.hikari.HikariConfig import com.zaxxer.hikari.HikariDataSource @@ -49,7 +49,7 @@ the worst bodge I've shipped in production. @Suppress("UNCHECKED_CAST") class LegacyMySQLDataHandler( plugin: EcoSpigotPlugin, - handler: EcoProfileHandler + handler: ProfileHandler ) : DataHandler(HandlerType.LEGACY_MYSQL) { private val playerHandler: ImplementedMySQLHandler private val serverHandler: ImplementedMySQLHandler @@ -114,7 +114,7 @@ class LegacyMySQLDataHandler( @Suppress("UNCHECKED_CAST") private class ImplementedMySQLHandler( - private val handler: EcoProfileHandler, + private val handler: ProfileHandler, private val table: UUIDTable, private val plugin: EcoPlugin ) { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MongoDataHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MongoDataHandler.kt index 2d4a2790..dee3cd21 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MongoDataHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MongoDataHandler.kt @@ -3,7 +3,7 @@ package com.willfp.eco.internal.spigot.data.storage import com.willfp.eco.core.data.Profile import com.willfp.eco.core.data.keys.PersistentDataKey import com.willfp.eco.internal.spigot.EcoSpigotPlugin -import com.willfp.eco.internal.spigot.data.EcoProfileHandler +import com.willfp.eco.internal.spigot.data.ProfileHandler import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -20,7 +20,7 @@ import java.util.UUID @Suppress("UNCHECKED_CAST") class MongoDataHandler( plugin: EcoSpigotPlugin, - private val handler: EcoProfileHandler + private val handler: ProfileHandler ) : DataHandler(HandlerType.MONGO) { private val client: CoroutineClient private val collection: CoroutineCollection diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MySQLDataHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MySQLDataHandler.kt index f207a438..07f73ea9 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MySQLDataHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MySQLDataHandler.kt @@ -8,7 +8,7 @@ import com.willfp.eco.core.config.interfaces.Config import com.willfp.eco.core.data.keys.PersistentDataKey import com.willfp.eco.core.data.keys.PersistentDataKeyType import com.willfp.eco.internal.spigot.EcoSpigotPlugin -import com.willfp.eco.internal.spigot.data.EcoProfileHandler +import com.willfp.eco.internal.spigot.data.ProfileHandler import com.zaxxer.hikari.HikariConfig import com.zaxxer.hikari.HikariDataSource import org.jetbrains.exposed.dao.id.UUIDTable @@ -35,7 +35,7 @@ Whatever. At least it works. @Suppress("UNCHECKED_CAST") class MySQLDataHandler( private val plugin: EcoSpigotPlugin, - private val handler: EcoProfileHandler + private val handler: ProfileHandler ) : DataHandler(HandlerType.MYSQL) { private val table = UUIDTable("eco_data") diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/ProfileSaver.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/ProfileSaver.kt index 7d8997cd..32e5a257 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/ProfileSaver.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/ProfileSaver.kt @@ -2,11 +2,11 @@ package com.willfp.eco.internal.spigot.data.storage import com.willfp.eco.core.EcoPlugin import com.willfp.eco.internal.spigot.data.EcoProfile -import com.willfp.eco.internal.spigot.data.EcoProfileHandler +import com.willfp.eco.internal.spigot.data.ProfileHandler class ProfileSaver( plugin: EcoPlugin, - handler: EcoProfileHandler + handler: ProfileHandler ) { init { plugin.scheduler.runTimer(1, 1) { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/YamlDataHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/YamlDataHandler.kt index 5979e186..251c53ee 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/YamlDataHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/YamlDataHandler.kt @@ -3,14 +3,14 @@ package com.willfp.eco.internal.spigot.data.storage import com.willfp.eco.core.data.keys.PersistentDataKey import com.willfp.eco.core.data.keys.PersistentDataKeyType import com.willfp.eco.internal.spigot.EcoSpigotPlugin -import com.willfp.eco.internal.spigot.data.EcoProfileHandler +import com.willfp.eco.internal.spigot.data.ProfileHandler import org.bukkit.NamespacedKey import java.util.UUID @Suppress("UNCHECKED_CAST") class YamlDataHandler( plugin: EcoSpigotPlugin, - private val handler: EcoProfileHandler + private val handler: ProfileHandler ) : DataHandler(HandlerType.YAML) { private val dataYml = plugin.dataYml