diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/CategoryWithRegistry.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/CategoryWithRegistry.kt deleted file mode 100644 index 2fbe1bf..0000000 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/CategoryWithRegistry.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.willfp.ecoskills - -import com.willfp.eco.core.registry.Registrable -import com.willfp.eco.core.registry.Registry -import com.willfp.libreforge.loader.configs.ConfigCategory - -abstract class CategoryWithRegistry( - id: String, - directory: String -) : ConfigCategory(id, directory) { - protected val registry = Registry() - - fun getByID(id: String?): T? = id?.let { registry[id] } - - fun values(): Set = registry.values() -} diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/Effects.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/Effects.kt index f043c9a..37101b0 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/Effects.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/Effects.kt @@ -1,11 +1,11 @@ package com.willfp.ecoskills.effects import com.willfp.eco.core.config.interfaces.Config -import com.willfp.ecoskills.CategoryWithRegistry import com.willfp.ecoskills.EcoSkillsPlugin import com.willfp.libreforge.loader.LibreforgePlugin +import com.willfp.libreforge.loader.configs.RegistrableCategory -object Effects : CategoryWithRegistry("effect", "effects") { +object Effects : RegistrableCategory("effect", "effects") { override val supportsSharing = false override fun clear(plugin: LibreforgePlugin) { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/magic/MagicTypes.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/magic/MagicTypes.kt index ce9a885..0ea3d1f 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/magic/MagicTypes.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/magic/MagicTypes.kt @@ -1,11 +1,11 @@ package com.willfp.ecoskills.magic import com.willfp.eco.core.config.interfaces.Config -import com.willfp.ecoskills.CategoryWithRegistry import com.willfp.ecoskills.EcoSkillsPlugin import com.willfp.libreforge.loader.LibreforgePlugin +import com.willfp.libreforge.loader.configs.RegistrableCategory -object MagicTypes : CategoryWithRegistry("magic_type", "magic_types") { +object MagicTypes : RegistrableCategory("magic_type", "magic_types") { override val supportsSharing = false override fun clear(plugin: LibreforgePlugin) { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skills.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skills.kt index b301e2e..01d730a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skills.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skills.kt @@ -2,18 +2,18 @@ package com.willfp.ecoskills.skills import com.github.benmanes.caffeine.cache.Caffeine import com.willfp.eco.core.config.interfaces.Config -import com.willfp.ecoskills.CategoryWithRegistry import com.willfp.ecoskills.EcoSkillsPlugin import com.willfp.ecoskills.api.totalSkillLevel import com.willfp.ecoskills.gui.menus.SkillsGUI import com.willfp.ecoskills.util.InvalidConfigurationException import com.willfp.ecoskills.util.LeaderboardEntry import com.willfp.libreforge.loader.LibreforgePlugin +import com.willfp.libreforge.loader.configs.RegistrableCategory import org.bukkit.Bukkit import java.util.UUID import java.util.concurrent.TimeUnit -object Skills : CategoryWithRegistry("skill", "skills") { +object Skills : RegistrableCategory("skill", "skills") { // Totally not copied over from Levellable private val leaderboardCache = Caffeine.newBuilder() .expireAfterWrite(1, TimeUnit.MINUTES) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stats.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stats.kt index cb6990a..95a0def 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stats.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stats.kt @@ -3,14 +3,14 @@ package com.willfp.ecoskills.stats import com.willfp.eco.core.config.interfaces.Config import com.willfp.eco.core.placeholder.PlayerPlaceholder import com.willfp.eco.util.toNiceString -import com.willfp.ecoskills.CategoryWithRegistry import com.willfp.ecoskills.EcoSkillsPlugin import com.willfp.ecoskills.api.averageSkillLevel import com.willfp.ecoskills.api.totalSkillLevel import com.willfp.ecoskills.gui.menus.StatsGUI import com.willfp.libreforge.loader.LibreforgePlugin +import com.willfp.libreforge.loader.configs.RegistrableCategory -object Stats : CategoryWithRegistry("stat", "stats") { +object Stats : RegistrableCategory("stat", "stats") { override val supportsSharing = false override fun beforeReload(plugin: LibreforgePlugin) {