diff --git a/build.gradle b/build.gradle index ecbc897..0163165 100644 --- a/build.gradle +++ b/build.gradle @@ -58,12 +58,11 @@ allprojects { shadowJar { relocate('com.willfp.libreforge', 'com.willfp.ecoarmor.libreforge') - relocate('redempt.crunch', 'com.willfp.ecoarmor.libreforge.crunch') } dependencies { compileOnly 'io.auxilor:eco:6.18.1' - implementation 'com.willfp:libreforge:2.18.1' + implementation 'com.willfp:libreforge:3.0.0' compileOnly 'org.jetbrains:annotations:23.0.0' diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/EcoArmorPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/EcoArmorPlugin.kt index 2ef773c..98c6949 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/EcoArmorPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/EcoArmorPlugin.kt @@ -1,9 +1,7 @@ package com.willfp.ecoarmor -import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.command.impl.PluginCommand import com.willfp.eco.core.display.DisplayModule -import com.willfp.eco.core.integrations.IntegrationLoader import com.willfp.eco.util.ListUtils import com.willfp.ecoarmor.commands.CommandEcoarmor import com.willfp.ecoarmor.config.EcoArmorYml @@ -17,31 +15,22 @@ import com.willfp.ecoarmor.upgrades.CrystalListener import com.willfp.ecoarmor.upgrades.Tiers import com.willfp.ecoarmor.util.DiscoverRecipeListener import com.willfp.ecoarmor.util.EffectListener -import com.willfp.libreforge.LibReforge +import com.willfp.libreforge.LibReforgePlugin import org.bukkit.event.Listener -class EcoArmorPlugin : EcoPlugin(687, 10002, "&c") { +class EcoArmorPlugin : LibReforgePlugin(687, 10002, "&c") { val ecoArmorYml: EcoArmorYml init { instance = this ecoArmorYml = EcoArmorYml(this) - LibReforge.init(this) - LibReforge.registerHolderProvider { ListUtils.toSingletonList(ArmorUtils.getActiveSet(it)) } + registerHolderProvider { ListUtils.toSingletonList(ArmorUtils.getActiveSet(it)) } } - override fun handleEnable() { - LibReforge.enable(this) - } - - override fun handleDisable() { - LibReforge.disable(this) - } - override fun handleReload() { + override fun handleReloadAdditional() { logger.info(Tiers.values().size.toString() + " Tiers Loaded") logger.info(ArmorSets.values().size.toString() + " Sets Loaded") - LibReforge.reload(this) } override fun loadPluginCommands(): List { @@ -61,16 +50,12 @@ class EcoArmorPlugin : EcoPlugin(687, 10002, "&c") { ) } - override fun loadIntegrationLoaders(): List { - return LibReforge.getIntegrationLoaders() - } - override fun createDisplayModule(): DisplayModule { return ArmorDisplay(this) } override fun getMinimumEcoVersion(): String { - return "6.17.0" + return "6.19.0" } companion object { diff --git a/gradle.properties b/gradle.properties index a027a54..96be739 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 7.14.3 +version = 7.15.0 plugin-name = EcoArmor \ No newline at end of file