Skip to content

Commit

Permalink
Updated libreforge
Browse files Browse the repository at this point in the history
  • Loading branch information
WillFP committed Jan 12, 2022
1 parent ff20640 commit c27ba6e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 26 deletions.
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,11 @@ allprojects {

shadowJar {
relocate('com.willfp.libreforge', 'com.willfp.ecoitems.libreforge')
relocate('redempt.crunch', 'com.willfp.ecoitems.libreforge.crunch')
}

dependencies {
compileOnly 'com.willfp: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'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
package com.willfp.ecoitems

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.ecoitems.commands.CommandEcoItems
import com.willfp.ecoitems.config.ItemsYml
import com.willfp.ecoitems.display.ItemsDisplay
import com.willfp.ecoitems.fuels.FuelHandler
import com.willfp.ecoitems.util.DiscoverRecipeListener
import com.willfp.ecoitems.items.ItemListener
import com.willfp.ecoitems.items.ItemAttributeListener
import com.willfp.ecoitems.items.ItemListener
import com.willfp.ecoitems.items.ItemUtils
import com.willfp.ecoitems.items.toSingletonList
import com.willfp.libreforge.LibReforge
import com.willfp.ecoitems.util.DiscoverRecipeListener
import com.willfp.libreforge.LibReforgePlugin
import org.bukkit.event.Listener

class EcoItemsPlugin : EcoPlugin(1241, 12205, "&#ff0000", true) {
class EcoItemsPlugin : LibReforgePlugin(1241, 12205, "&#ff0000") {
/**
* items.yml.
*/
Expand All @@ -28,20 +26,10 @@ class EcoItemsPlugin : EcoPlugin(1241, 12205, "&#ff0000", true) {
init {
instance = this
itemsYml = ItemsYml(this)
LibReforge.init(this)
LibReforge.registerHolderProvider { ItemUtils.getEcoItemOnPlayer(it).toSingletonList() }
}

override fun handleEnable() {
LibReforge.enable(this)
}

override fun handleDisable() {
LibReforge.disable(this)
registerHolderProvider { ItemUtils.getEcoItemOnPlayer(it).toSingletonList() }
}

override fun handleReload() {
LibReforge.reload(this)
override fun handleReloadAdditional() {
FuelHandler.createRunnable(this)
}

Expand All @@ -54,10 +42,6 @@ class EcoItemsPlugin : EcoPlugin(1241, 12205, "&#ff0000", true) {
)
}

override fun loadIntegrationLoaders(): List<IntegrationLoader> {
return LibReforge.getIntegrationLoaders()
}

override fun loadPluginCommands(): List<PluginCommand> {
return listOf(
CommandEcoItems(this)
Expand All @@ -69,7 +53,7 @@ class EcoItemsPlugin : EcoPlugin(1241, 12205, "&#ff0000", true) {
}

override fun getMinimumEcoVersion(): String {
return "6.15.0"
return "6.19.0"
}

companion object {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = 3.9.3
version = 3.10.0
plugin-name = EcoItems

0 comments on commit c27ba6e

Please sign in to comment.