libreforge-updater

# Conflicts:
#	build.gradle
#	gradle.properties

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
     }
 }
 
@@ -44,14 +44,14 @@ allprojects {
     }
 
     dependencies {
-        compileOnly 'com.willfp:eco:6.35.1'
+        compileOnly 'com.willfp:eco:6.44.0'
-        implementation 'com.willfp:libreforge:3.49.0'
+        implementation 'com.willfp:libreforge:3.116.0'
         implementation 'org.joml:joml:1.10.4'
 
         compileOnly 'org.jetbrains:annotations:23.0.0'
         compileOnly 'com.github.ben-manes.caffeine:caffeine:3.0.6'
 
-        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.21'
+        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.7.10'
     }
 
     tasks.withType(JavaCompile) {
@@ -60,7 +60,7 @@ allprojects {
     }
 
     processResources {
-        filesNotMatching(["**/*.png", "**/models/**", "**/textures/**", "**reforges.yml", "**lang.yml"]) {
+        filesNotMatching(["**/*.png", "**/models/**", "**/textures/**", "**/reforges/**", "**lang.yml"]) {
             expand projectVersion: project.version
         }
     }
@@ -68,6 +68,7 @@ allprojects {
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
         kotlinOptions {
             jvmTarget = "17"
+            freeCompilerArgs += ["-Xjvm-default=all"]
         }
     }
 

config/checkstyle/checkstyle.xml

@@ -1,184 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-        "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
-<!--
-
-  Checkstyle configuration that checks the sun coding conventions from:
-
-    - the Java Language Specification at
-      https://docs.oracle.com/javase/specs/jls/se11/html/index.html
-
-    - the Sun Code Conventions at https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
-
-    - the Javadoc guidelines at
-      https://www.oracle.com/technical-resources/articles/java/javadoc-tool.html
-
-    - the JDK Api documentation https://docs.oracle.com/en/java/javase/11/
-
-    - some best practices
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  https://checkstyle.org (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-  To suppress certain violations please review suppression filters.
-
-  Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-    <module name="SuppressionFilter">
-        <property name="file" value="config/checkstyle/suppression.xml"/>
-    </module>
-
-    <!--
-        If you set the basedir property below, then all reported file
-        names will be relative to the specified directory. See
-        https://checkstyle.org/config.html#Checker
-
-        <property name="basedir" value="${basedir}"/>
-    -->
-    <property name="severity" value="error"/>
-
-    <property name="fileExtensions" value="java, properties, xml"/>
-
-    <!-- Excludes all 'module-info.java' files              -->
-    <!-- See https://checkstyle.org/config_filefilters.html -->
-    <module name="BeforeExecutionExclusionFileFilter">
-        <property name="fileNamePattern" value="module\-info\.java$"/>
-    </module>
-
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See https://checkstyle.org/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See https://checkstyle.org/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-    <!-- Checks for Size Violations.                    -->
-    <!-- See https://checkstyle.org/config_sizes.html -->
-    <module name="FileLength"/>
-    <module name="LineLength">
-        <property name="fileExtensions" value="java"/>
-        <property name="max" value="200"/>
-    </module>
-
-    <!-- Checks for whitespace                               -->
-    <!-- See https://checkstyle.org/config_whitespace.html -->
-    <module name="FileTabCharacter"/>
-
-    <!-- Miscellaneous other checks.                   -->
-    <!-- See https://checkstyle.org/config_misc.html -->
-    <module name="RegexpSingleline">
-        <property name="format" value="\s+$"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Line has trailing spaces."/>
-    </module>
-
-    <!-- Checks for Headers                                -->
-    <!-- See https://checkstyle.org/config_header.html   -->
-    <!-- <module name="Header"> -->
-    <!--   <property name="headerFile" value="${checkstyle.header.file}"/> -->
-    <!--   <property name="fileExtensions" value="java"/> -->
-    <!-- </module> -->
-
-    <module name="TreeWalker">
-
-        <!-- Checks for Javadoc comments. -->
-        <!-- See https://checkstyle.org/config_javadoc.html -->
-        <module name="InvalidJavadocPosition"/>
-        <module name="JavadocMethod"/>
-        <module name="JavadocType"/>
-        <module name="JavadocVariable"/>
-        <module name="JavadocStyle"/>
-        <module name="MissingJavadocMethod"/>
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See https://checkstyle.org/config_naming.html -->
-        <module name="ConstantName"/>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-        <!-- Checks for imports                              -->
-        <!-- See https://checkstyle.org/config_imports.html -->
-        <module name="AvoidStarImport"/>
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports">
-            <property name="processJavadoc" value="true"/>
-        </module>
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See https://checkstyle.org/config_sizes.html -->
-        <!-- <module name="MethodLength"/> -->
-        <module name="ParameterNumber"/>
-
-        <!-- Checks for whitespace                               -->
-        <!-- See https://checkstyle.org/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="GenericWhitespace"/>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround"/>
-
-        <!-- Modifier Checks                                    -->
-        <!-- See https://checkstyle.org/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See https://checkstyle.org/config_blocks.html -->
-        <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock"/>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-        <!-- Checks for common coding problems               -->
-        <!-- See https://checkstyle.org/config_coding.html -->
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-        <!-- <module name="MagicNumber"/> -->
-        <module name="MissingSwitchDefault"/>
-        <module name="MultipleVariableDeclarations"/>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See https://checkstyle.org/config_design.html -->
-        <!-- <module name="DesignForExtension"/> -->
-        <module name="FinalClass"/>
-        <!-- <module name="HideUtilityClassConstructor"/> -->
-        <module name="InterfaceIsType"/>
-        <module name="VisibilityModifier"/>
-        <module name="RequireThis"/>
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See https://checkstyle.org/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-        <module name="FinalParameters"/>
-        <module name="TodoComment"/>
-        <module name="UpperEll"/>
-
-    </module>
-</module>

config/checkstyle/suppression.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE suppressions PUBLIC
-        "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-        "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
-<suppressions>
-    <!-- Effects don't need javadoc. -->
-    <suppress files="[\\/]reforges[\\/]reforges[\\/]" checks="MissingJavadocMethod"/>
-    <suppress files="[\\/]reforges[\\/]reforges[\\/]" checks="JavadocVariable"/>
-
-    <!-- Fields don't need javadoc -->
-    <suppress files="Reforges.java" checks="JavadocVariable"/>
-</suppressions>

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt

@@ -7,29 +7,28 @@ import com.willfp.eco.core.items.Items
 import com.willfp.libreforge.LibReforgePlugin
 import com.willfp.reforges.commands.CommandReforge
 import com.willfp.reforges.commands.CommandReforges
-import com.willfp.reforges.config.ReforgesYml
 import com.willfp.reforges.config.TargetYml
 import com.willfp.reforges.display.ReforgesDisplay
 import com.willfp.reforges.integrations.talismans.TalismansIntegration
 import com.willfp.reforges.reforges.Reforges
 import com.willfp.reforges.reforges.util.ReforgeArgParser
-import com.willfp.reforges.util.ReforgeEnableListeners
-import com.willfp.reforges.util.ReforgeLookup
 import com.willfp.reforges.util.AntiPlaceListener
 import com.willfp.reforges.util.DiscoverRecipeListener
+import com.willfp.reforges.util.ReforgeEnableListeners
+import com.willfp.reforges.util.ReforgeLookup
 import org.bukkit.event.Listener
 
 class ReforgesPlugin : LibReforgePlugin() {
     val targetYml: TargetYml =
         TargetYml(this)
-    val reforgesYml: ReforgesYml =
-        ReforgesYml(this)
 
     init {
         instance = this
     }
 
     override fun handleEnableAdditional() {
+        this.copyConfigs("reforges")
+
         Items.registerArgParser(ReforgeArgParser())
         registerHolderProvider { ReforgeLookup.provideReforges(it) }
     }
@@ -63,10 +62,6 @@ class ReforgesPlugin : LibReforgePlugin() {
         )
     }
 
-    override fun getMinimumEcoVersion(): String {
-        return "6.35.1"
-    }
-
     companion object {
         /**
          * Instance of Reforges.

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/commands/CommandReforges.kt

@@ -1,10 +1,15 @@
 package com.willfp.reforges.commands
 
-import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.command.impl.PluginCommand
+import com.willfp.libreforge.LibReforgePlugin
+import com.willfp.libreforge.lrcdb.CommandExport
+import com.willfp.libreforge.lrcdb.CommandImport
+import com.willfp.libreforge.lrcdb.ExportableConfig
+import com.willfp.reforges.reforges.Reforges
 import org.bukkit.command.CommandSender
 
-class CommandReforges(plugin: EcoPlugin) : PluginCommand(plugin, "reforges", "reforges.command.reforges", false) {
+class CommandReforges(plugin: LibReforgePlugin) :
+    PluginCommand(plugin, "reforges", "reforges.command.reforges", false) {
     override fun onExecute(sender: CommandSender, args: List<String>) {
         sender.sendMessage(
             plugin.langYml.getMessage("invalid-command")
@@ -16,5 +21,14 @@ class CommandReforges(plugin: EcoPlugin) : PluginCommand(plugin, "reforges", "re
             .addSubcommand(CommandGive(plugin))
             .addSubcommand(CommandOpen(plugin))
             .addSubcommand(CommandApply(plugin))
+            .addSubcommand(CommandImport("reforges", plugin))
+            .addSubcommand(CommandExport(plugin) {
+                Reforges.values().map {
+                    ExportableConfig(
+                        it.id,
+                        it.config
+                    )
+                }
+            })
     }
-}
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/config/ReforgesYml.kt

@@ -1,7 +0,0 @@
-package com.willfp.reforges.config
-
-import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.config.BaseConfig
-import com.willfp.eco.core.config.ConfigType
-
-class ReforgesYml(plugin: EcoPlugin) : BaseConfig("reforges", plugin, true, ConfigType.YAML)

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt

@@ -3,6 +3,7 @@ package com.willfp.reforges.display
 import com.willfp.eco.core.display.Display
 import com.willfp.eco.core.display.DisplayModule
 import com.willfp.eco.core.display.DisplayPriority
+import com.willfp.eco.core.display.DisplayProperties
 import com.willfp.eco.core.fast.FastItemStack
 import com.willfp.eco.core.fast.fast
 import com.willfp.eco.util.SkullUtils
@@ -24,6 +25,7 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
     override fun display(
         itemStack: ItemStack,
         player: Player?,
+        props: DisplayProperties,
         vararg args: Any
     ) {
         val targets = ReforgeTargets.getForItem(itemStack)
@@ -44,9 +46,8 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
 
         if (reforge == null && stone == null) {
             if (plugin.configYml.getBool("reforge.show-reforgable")) {
-                if (player != null && plugin.configYml.getBool("reforge.no-reforgable-in-gui")) {
+                if (plugin.configYml.getBool("reforge.no-reforgable-in-gui")) {
-                    val inventory = player.openInventory.topInventory
+                    if (props.inGui) {
-                    if (inventory.contents.contains(itemStack) && inventory.holder == null) {
                         return
                     }
                 }

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/PricedReforgeStatus.kt

@@ -0,0 +1,5 @@
+package com.willfp.reforges.gui
+
+import com.willfp.reforges.util.ReforgeStatus
+
+data class PricedReforgeStatus(val status: ReforgeStatus, val cost: Double)

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt

@@ -4,21 +4,21 @@ import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.config.updating.ConfigUpdater
 import com.willfp.eco.core.drops.DropQueue
 import com.willfp.eco.core.fast.fast
+import com.willfp.eco.core.gui.captiveSlot
 import com.willfp.eco.core.gui.menu
 import com.willfp.eco.core.gui.menu.Menu
 import com.willfp.eco.core.gui.slot
 import com.willfp.eco.core.gui.slot.FillerMask
 import com.willfp.eco.core.gui.slot.MaskItems
-import com.willfp.eco.core.gui.slot.Slot
 import com.willfp.eco.core.integrations.economy.EconomyManager
 import com.willfp.eco.core.items.Items
 import com.willfp.eco.core.items.builder.ItemStackBuilder
+import com.willfp.eco.core.items.isEmpty
 import com.willfp.eco.util.NumberUtils
 import com.willfp.reforges.reforges.PriceMultipliers
 import com.willfp.reforges.reforges.Reforge
 import com.willfp.reforges.reforges.ReforgeTarget
 import com.willfp.reforges.reforges.ReforgeTargets
-import com.willfp.reforges.reforges.util.MetadatedReforgeStatus
 import com.willfp.reforges.util.ReforgeStatus
 import com.willfp.reforges.util.getRandomReforge
 import com.willfp.reforges.util.reforge
@@ -28,40 +28,28 @@ import org.bukkit.Material
 import org.bukkit.Sound
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
-import java.util.*
+import java.util.Locale
 import kotlin.math.pow
 
 @Suppress("DEPRECATION")
 object ReforgeGUI {
     private lateinit var menu: Menu
 
-    private fun Menu.getReforgeStatus(player: Player): MetadatedReforgeStatus {
+    private fun Menu.getItemToReforge(player: Player) = this.getState<ItemStack>(
-        val captive = this.getCaptiveItems(player)
+        player,
-        val item = captive.getOrNull(0)
+        "item_to_reforge"
-        val stone = captive.getOrNull(1)
+    )
 
-        val targets = mutableListOf<ReforgeTarget>()
+    private fun Menu.getReforgeStone(player: Player) = this.getState<ItemStack>(
+        player,
+        "reforge_stone"
+    )
 
-        var cost = 0.0
+    private fun Menu.getReforgeStatus(player: Player): PricedReforgeStatus =
-        val status = if (item == null || item.type == Material.AIR) {
+        this.getState<PricedReforgeStatus>(player, "reforge_status") ?: PricedReforgeStatus(
-            ReforgeStatus.NO_ITEM
+            ReforgeStatus.NO_ITEM,
-        } else {
+            0.0
-            targets.addAll(ReforgeTargets.getForItem(item))
+        )
-            if (targets.isEmpty()) {
-                ReforgeStatus.INVALID_ITEM
-            } else {
-                val reforgeStone = stone.reforgeStone
-                if (reforgeStone != null && reforgeStone.canBeAppliedTo(item)) {
-                    cost = reforgeStone.stonePrice.toDouble()
-                    ReforgeStatus.ALLOW_STONE
-                } else {
-                    ReforgeStatus.ALLOW
-                }
-            }
-        }
-
-        return MetadatedReforgeStatus(status, cost)
-    }
 
     @JvmStatic
     fun open(player: Player) {
@@ -77,7 +65,7 @@ object ReforgeGUI {
 
                 val cost = when {
                     status == ReforgeStatus.ALLOW || (status == ReforgeStatus.ALLOW_STONE && specialCost < 0) -> {
-                        val amountOfReforges = menu.getCaptiveItems(player)[0].timesReforged
+                        val amountOfReforges = menu.getItemToReforge(player)?.timesReforged ?: 0
 
                         plugin.configYml.getDouble("reforge.cost") *
                                 plugin.configYml.getDouble("reforge.cost-exponent").pow(amountOfReforges) *
@@ -91,8 +79,8 @@ object ReforgeGUI {
 
                 var xpCost = plugin.configYml.getInt("reforge.xp-cost")
                 if (status == ReforgeStatus.ALLOW) {
-                    val item = menu.getCaptiveItems(player)[0]
+                    val item = menu.getItemToReforge(player)
-                    val reforges = item.timesReforged
+                    val reforges = item?.timesReforged ?: 0
                     xpCost *= PriceMultipliers.getForPlayer(player).multiplier.toInt()
                     xpCost *= plugin.configYml.getDouble("reforge.cost-exponent").pow(reforges.toDouble()).toInt()
                 }
@@ -106,7 +94,7 @@ object ReforgeGUI {
                             .replace("%xpcost%", NumberUtils.format(xpCost.toDouble()))
                             .replace(
                                 "%stone%",
-                                menu.getCaptiveItems(player).getOrNull(1).reforgeStone?.name ?: ""
+                                menu.getReforgeStone(player)?.reforgeStone?.name ?: ""
                             )
                     }
                 }
@@ -114,9 +102,8 @@ object ReforgeGUI {
 
             onLeftClick { event, _, menu ->
                 val player = event.whoClicked as Player
-                val captive = menu.getCaptiveItems(player)
 
-                val item = captive.getOrNull(0) ?: return@onLeftClick
+                val item = menu.getItemToReforge(player) ?: return@onLeftClick
                 val currentReforge = item.reforge
 
                 val targets = ReforgeTargets.getForItem(item)
@@ -124,7 +111,7 @@ object ReforgeGUI {
 
                 var usedStone = false
 
-                val stoneInMenu = menu.getCaptiveItems(player).getOrNull(1).reforgeStone
+                val stoneInMenu = menu.getReforgeStone(player)?.reforgeStone
 
                 val reforge = if (stoneInMenu != null && stoneInMenu.canBeAppliedTo(item)) {
                     usedStone = true
@@ -198,9 +185,9 @@ object ReforgeGUI {
                 item.reforge = reforge
 
                 if (usedStone) {
-                    val stone = menu.getCaptiveItems(player)[1]
+                    val stone = menu.getReforgeStone(player)
-                    stone.itemMeta = null
+                    stone?.itemMeta = null
-                    stone.amount = 0
+                    stone?.amount = 0
                     if (plugin.configYml.getBool("gui.stone-sound.enabled")) {
                         player.playSound(
                             player.location,
@@ -229,8 +216,9 @@ object ReforgeGUI {
             .toTypedArray()
 
         menu = menu(plugin.configYml.getInt("gui.rows")) {
-            setTitle(plugin.langYml.getFormattedString("menu.title"))
+            title = plugin.langYml.getFormattedString("menu.title")
             setMask(FillerMask(MaskItems(*maskItems), *maskPattern))
+            allowChangingHeldItem()
 
             val slot = slot(
                 ItemStackBuilder(Material.BLACK_STAINED_GLASS_PANE)
@@ -261,13 +249,13 @@ object ReforgeGUI {
             setSlot(
                 plugin.configYml.getInt("gui.item-slot.row"),
                 plugin.configYml.getInt("gui.item-slot.column"),
-                Slot.builder().setCaptive().build()
+                captiveSlot()
             )
 
             setSlot(
                 plugin.configYml.getInt("gui.stone-slot.row"),
                 plugin.configYml.getInt("gui.stone-slot.column"),
-                Slot.builder().setCaptive().build()
+                captiveSlot()
             )
 
             setSlot(
@@ -288,6 +276,54 @@ object ReforgeGUI {
                 }
             )
 
+            onRender { player, menu ->
+                menu.setState(
+                    player, "item_to_reforge", menu.getCaptiveItem(
+                        player,
+                        plugin.configYml.getInt("gui.item-slot.row"),
+                        plugin.configYml.getInt("gui.item-slot.column")
+                    )
+                )
+
+                menu.setState(
+                    player, "reforge_stone", menu.getCaptiveItem(
+                        player,
+                        plugin.configYml.getInt("gui.stone-slot.row"),
+                        plugin.configYml.getInt("gui.stone-slot.column")
+                    )
+                )
+
+                val item = menu.getItemToReforge(player)
+
+                val stone = menu.getReforgeStone(player)
+
+                val targets = mutableListOf<ReforgeTarget>()
+
+                var cost = 0.0
+                val status = if (item.isEmpty) {
+                    ReforgeStatus.NO_ITEM
+                } else {
+                    targets.addAll(ReforgeTargets.getForItem(item!!))
+                    if (targets.isEmpty()) {
+                        ReforgeStatus.INVALID_ITEM
+                    } else {
+                        val reforgeStone = stone.reforgeStone
+                        if (reforgeStone == null) {
+                            ReforgeStatus.ALLOW
+                        } else {
+                            if (reforgeStone.canBeAppliedTo(item)) {
+                                cost = reforgeStone.stonePrice.toDouble()
+                                ReforgeStatus.ALLOW_STONE
+                            } else {
+                                ReforgeStatus.INVALID_ITEM
+                            }
+                        }
+                    }
+                }
+
+                menu.setState(player, "reforge_status", PricedReforgeStatus(status, cost))
+            }
+
             onClose { event, menu ->
                 DropQueue(event.player as Player)
                     .addItems(menu.getCaptiveItems(event.player as Player))

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforge.kt

@@ -18,11 +18,10 @@ import java.util.*
 
 @Suppress("DEPRECATION")
 class Reforge(
+    override val id: String,
     internal val config: Config,
     plugin: ReforgesPlugin
 ) : Holder {
-    override val id = config.getString("id")
-
     val name = config.getFormattedString("name")
 
     val namePrefixComponent = StringUtils.toComponent("$name ").decoration(TextDecoration.ITALIC, false)
@@ -31,13 +30,15 @@ class Reforge(
 
     val targets = config.getStrings("targets").mapNotNull { ReforgeTargets.getByName(it) }.toSet()
 
-    override val effects = config.getSubsections("effects").mapNotNull {
+    override val effects = Effects.compile(
-        Effects.compile(it, "Reforge ID $id")
+        config.getSubsections("effects"),
-    }.toSet()
+        "Reforge $id"
+    )
 
-    override val conditions = config.getSubsections("conditions").mapNotNull {
+    override val conditions = Conditions.compile(
-        Conditions.compile(it, "Reforge ID $id")
+        config.getSubsections("conditions"),
-    }.toSet()
+        "Reforge $id"
+    )
 
     val requiresStone = config.getBool("stone.enabled")
 

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforges.kt

@@ -2,9 +2,12 @@ package com.willfp.reforges.reforges
 
 import com.google.common.collect.HashBiMap
 import com.google.common.collect.ImmutableSet
+import com.willfp.eco.core.config.ConfigType
+import com.willfp.eco.core.config.readConfig
 import com.willfp.eco.core.config.updating.ConfigUpdater
 import com.willfp.libreforge.chains.EffectChains
 import com.willfp.reforges.ReforgesPlugin
+import java.io.File
 
 @Suppress("UNUSED")
 object Reforges {
@@ -51,14 +54,22 @@ object Reforges {
     @ConfigUpdater
     @JvmStatic
     fun update(plugin: ReforgesPlugin) {
-        for (config in plugin.reforgesYml.getSubsections("chains")) {
+        val reforgesYml = File(plugin.dataFolder, "reforges.yml").readConfig(ConfigType.YAML)
+
+        for (config in reforgesYml.getSubsections("chains")) {
             EffectChains.compile(config, "Chains")
         }
+
         for (reforge in values()) {
             removeReforge(reforge)
         }
-        for (config in plugin.reforgesYml.getSubsections("reforges")) {
+
-            Reforge(config, plugin)
+        for ((id, config) in plugin.fetchConfigs("reforges")) {
+            Reforge(id, config, plugin)
+        }
+
+        for (config in reforgesYml.getSubsections("reforges")) {
+            Reforge(config.getString("id"), config, plugin)
         }
     }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/util/MetadatedReforgeStatus.kt

@@ -1,5 +0,0 @@
-package com.willfp.reforges.reforges.util
-
-import com.willfp.reforges.util.ReforgeStatus
-
-data class MetadatedReforgeStatus(val status: ReforgeStatus, val cost: Double)

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/util/ReforgeEnableListeners.kt

@@ -40,8 +40,8 @@ class ReforgeEnableListeners(private val plugin: EcoPlugin) : Listener {
         refresh()
         val player = event.player
         for (value in values()) {
-            for ((effect) in value.effects) {
+            for (effect in value.effects) {
-                effect.disableForPlayer(player)
+                effect.disableFor(player)
             }
         }
     }

eco-core/core-plugin/src/main/resources/chains.yml

@@ -0,0 +1,21 @@
+# Read more about chains: https://plugins.auxilor.io/effects/configuring-an-effect#effect-chains
+
+chains:
+  - id: example_chain
+    effects:
+      - id: teleport
+      - id: potion_effect
+        args:
+          effect: blindness
+          level: 3
+          duration: 30
+          apply_to_player: true
+      - id: send_message
+        args:
+          message: "&fYou have been teleported!"
+          action_bar: true
+      - id: play_sound
+        args:
+          sound: entity_dragon_fireball_explode
+          pitch: 1.5
+          volume: 4

eco-core/core-plugin/src/main/resources/config.yml

@@ -179,12 +179,18 @@ cannot-afford-type:
     sound: "BLOCK_NOTE_BLOCK_PLING"
     pitch: 0.5
 
+cannot-afford-price:
+  in-actionbar: true
+  sound:
+    enabled: true
+    sound: "BLOCK_NOTE_BLOCK_PLING"
+    pitch: 0.5
+
 point-names: # If you have point names that look ugly (eg g_souls) then you can map them to nice names to be shown to players.
   example_point: "Nicely Formatted Point"
 
 use-faster-move-trigger: true # Disable if you want move trigger to detect sub-1-block movements
 raytrace-distance: 80 # The distance that alt_click should check for a location
-block-item-drop-place-check: true # If the block_item_drop trigger should only fire on naturally placed blocks (prevents dupes)
 
 potions:
   icon:

eco-core/core-plugin/src/main/resources/lang.yml

@@ -3,7 +3,20 @@ messages:
   no-permission: "&cYou don't have permission to do this!"
   not-player: "&cThis command must be run by a player"
   invalid-command: "&cUnknown subcommand!"
-  reloaded: "Reloaded! (Restart if you're removed reforges!) Took %time%ms"
+  reloaded: "Reloaded!"
+  cannot-afford: "&cYou can't afford to do this! &fCost: &a$$%cost%"
+  cannot-afford-type: "&cYou can't afford to do this! &fCost: &a%cost% %type%"
+  cannot-afford-price: "&cYou can't afford to do this! &fPrice: %price%"
+  on-cooldown: "&cThis effect is on cooldown! &fTime left: &a%seconds% seconds"
+  cannot-transmit: "&cYou can't transmit here!"
+  must-specify-lrcdb-id: "&cYou must specify the ID of the config to download! Not sure what this means? Go to &alrcdb.auxilor.io"
+  lrcdb-import-error: "&cError importing config: &f%message%"
+  lrcdb-import-success: "&fImported &a%name%&f! Reload the plugin to install it"
+  must-specify-config-name: "&cYou must specify the config name!"
+  invalid-config-name: "&cInvalid config name!"
+  lrcdb-export-error: "&cError exporting config: &f%message%"
+  lrcdb-export-success: "&fExported &a%name%&f! View it on &alrcdb.auxilor.io&f, or share your config ID: &f%id%"
+
   insufficient-money: "&cYou don't have enough money for this!"
   insufficient-xp: "&cYou don't have enough xp levels for this!"
   applied-reforge: "Applied %reforge%&r reforge!"
@@ -12,12 +25,8 @@ messages:
   needs-stone: "&cYou must specify a reforge stone"
   invalid-stone: "&cInvalid reforge!"
   give-success: "Gave &a%reforge%&r reforge stone to &a%recipient%"
-  on-cooldown: "&cThis reforge is on cooldown! &fTime left: &a%seconds% seconds"
-  cannot-afford: "&cYou can't afford to do this! &fCost: &a$$%cost%"
-  cannot-afford-type: "&cYou can't afford to do this! &fCost: &a%cost% %type%"
   invalid-reforge: "&cInvalid reforge!"
   needs-reforge: "&cYou must specify a reforge"
-  cannot-transmit: "&cYou can't transmit here!"
 
 menu:
   title: "Reforge Item"

eco-core/core-plugin/src/main/resources/lrcdb.yml

@@ -0,0 +1,19 @@
+# Options for lrcdb (https://lrcdb.auxilor.io), a website to share configs
+# with other server owners, so you can get more configs without making them
+# yourself!
+
+author: "Unknown Author" # The name attached to configs you export
+
+# Options about automatically sharing configs you create
+share-configs:
+  # If you want all your configs to automatically be publicly available,
+  # set this to true. This really helps out other users!
+  publicly: false
+
+  # If you don't want your configs to be usable to gather information about
+  # plugin usage or to improve the plugins in the future, disable this.
+  # Nothing identifying is shared.
+  enabled: true
+
+# If you disable share-configs, you can still share select configs publicly
+# with /ecoenchants export <config>.

eco-core/core-plugin/src/main/resources/plugin.yml

@@ -10,13 +10,17 @@ depend:
   - ProtocolLib
 softdepend:
   - Vault
-  - EcoSkills
-  - Talismans
   - AureliumSkills
   - PlayerPoints
   - Jobs
-  - EcoArmor
   - TMMobcoins
+  - EcoEnchants
+  - EcoBosses
+  - Talismans
+  - EcoArmor
+  - EcoItems
+  - EcoSkills
+  - Boosters
 
 commands:
   reforges:
@@ -42,6 +46,8 @@ permissions:
       reforges.command.give: true
       reforges.command.apply: true
       reforges.command.open: true
+      reforges.command.import: true
+      reforges.command.export: true
 
   reforges.command.reload:
     description: Allows reloading the config
@@ -61,3 +67,9 @@ permissions:
   reforges.command.apply:
     description: Allows the user of /reforges apply.
     default: op
+  reforges.command.import:
+    description: Allows the user of /reforges import.
+    default: op
+  reforges.command.export:
+    description: Allows the user of /reforges export.
+    default: op

eco-core/core-plugin/src/main/resources/reforges.yml

@@ -1,405 +0,0 @@
-chains:
-  - id: example_chain
-    effects:
-      - id: teleport
-      - id: potion_effect
-        args:
-          effect: blindness
-          level: 3
-          duration: 30
-          apply_to_player: true
-      - id: send_message
-        args:
-          message: "&fYou have been teleported!"
-          action_bar: true
-      - id: play_sound
-        args:
-          sound: entity_dragon_fireball_explode
-          pitch: 1.5
-          volume: 4
-
-reforges:
-  - id: acute
-    name: "<gradient:#4776E6>Acute</gradient:#8E54E9>"
-    description:
-      - "&a+2% &fTriple Damage Chance"
-    targets:
-      - axe
-    stone:
-      enabled: false
-      name: ''
-      lore: []
-      item: ''
-      craftable: false
-      recipe: []
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: 3
-          chance: 2
-        triggers:
-          - melee_attack
-    conditions: []
-  - id: aerobic
-    name: "<gradient:#B993D6>Aerobic</gradient:#8CA6DB>"
-    description:
-      - "&a+9% &fDamage when shot in air"
-    targets:
-      - bow
-    stone:
-      enabled: false
-      name: ''
-      lore: []
-      item: ''
-      craftable: false
-      recipe: []
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: 1.09
-        triggers:
-          - bow_attack
-    conditions:
-      - id: in_air
-        args:
-          in_air: true
-  - id: dynamic
-    name: "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>"
-    description:
-      - "&a+5% &fDamage"
-      - "&a+10% &fCrit Damage"
-    targets:
-      - melee
-    stone:
-      enabled: true
-      name: "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>&f Reforge Stone"
-      lore:
-        - "&7Place on the right of the"
-        - "&7reforge menu to apply the"
-        - "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>&7 reforge!"
-      item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmM0YTY1YzY4OWIyZDM2NDA5MTAwYTYwYzJhYjhkM2QwYTY3Y2U5NGVlYTNjMWY3YWM5NzRmZDg5MzU2OGI1ZCJ9fX0=
-      craftable: true
-      recipe:
-        - air
-        - ecoitems:blank_reforge_stone ? air
-        - air
-        - iron_block
-        - daylight_sensor
-        - iron_block
-        - air
-        - phantom_membrane
-        - air
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: 1.05
-        triggers:
-          - melee_attack
-      - id: crit_multiplier
-        args:
-          multiplier: 1.1
-        triggers:
-          - melee_attack
-    conditions: []
-  - id: evasive
-    name: "<gradient:#EFEFBB>Evasive</gradient:#D4D3DD>"
-    description:
-      - "&a+2% &fIgnore Damage Chance"
-    targets:
-      - armor
-    stone:
-      enabled: false
-      name: ''
-      lore: []
-      item: ''
-      craftable: false
-      recipe: []
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: 0
-          chance: 2
-        triggers:
-          - take_damage
-    conditions: []
-  - id: gravitated
-    name: "<gradient:#1e3c72>Gravitated</gradient:#2a5298>"
-    description:
-      - "&a+8% &fCritical Damage"
-    targets:
-      - melee
-    stone:
-      enabled: false
-      name: ''
-      lore: []
-      item: ''
-      craftable: false
-      recipe: []
-    effects:
-      - id: crit_multiplier
-        args:
-          multiplier: 1.08
-        triggers:
-          - melee_attack
-    conditions: []
-  - id: light
-    name: "<gradient:#1c92d2>Light</gradient:#f2fcfe>"
-    description:
-      - "&c-5% &fDamage"
-      - "&c-5% &fKnockback"
-      - "&a+10% &fAttack Speed"
-    targets:
-      - melee
-    stone:
-      enabled: false
-      name: ''
-      lore: []
-      item: ''
-      craftable: false
-      recipe: []
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: 0.95
-        triggers:
-          - melee_attack
-      - id: knockback_multiplier
-        args:
-          multiplier: 0.95
-      - id: attack_speed_multiplier
-        args:
-          multiplier: 1.1
-    conditions: []
-  - id: nautical
-    name: "<gradient:#373B44>Nautical</gradient:#4286f4>"
-    description:
-      - "&a+20% &fDamage in water"
-    targets:
-      - melee
-      - bow
-      - trident
-    stone:
-      enabled: false
-      name: ''
-      lore: []
-      item: ''
-      craftable: false
-      recipe: []
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: 1.2
-        triggers:
-          - melee_attack
-          - bow_attack
-          - trident_attack
-    conditions:
-      - id: in_water
-        args:
-          in_water: true
-  - id: pointy
-    name: "<gradient:#076585>Pointy</gradient:#ffffff>"
-    description:
-      - "&a+10% &fDamage"
-    targets:
-      - trident
-    stone:
-      enabled: false
-      name: ''
-      lore: []
-      item: ''
-      craftable: false
-      recipe: []
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: 1.1
-        triggers:
-          - trident_attack
-    conditions: []
-  - id: prospecting
-    name: "<gradient:#00B4DB>Prospecting</gradient:#0083B0>"
-    description:
-      - "&a+5% &fChance to get &e$$2&f for mining a block"
-    targets:
-      - pickaxe
-    stone:
-      enabled: false
-      name: ''
-      lore: []
-      item: ''
-      craftable: false
-      recipe: []
-    effects:
-      - id: give_money
-        args:
-          amount: 2
-          chance: 5
-        triggers:
-          - mine_block
-    conditions: []
-  - id: reinforced
-    name: "<gradient:#FBD786>Reinforced</gradient:#f7797d>"
-    description:
-      - "&a+4% &fDamage Resistance"
-    targets:
-      - armor
-    stone:
-      enabled: false
-      name: ''
-      lore: []
-      item: ''
-      craftable: false
-      recipe: []
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: 0.96
-        triggers:
-          - take_damage
-    conditions: []
-  - id: rich
-    name: "<gradient:#DBDBDB>Rich</gradient:#F2F2F2>"
-    description:
-      - "&a+$$50 &fFor each mob kill"
-    targets:
-      - trident
-      - bow
-    stone:
-      enabled: true
-      name: "<gradient:#DBDBDB>Rich</gradient:#F2F2F2>&f Reforge Stone"
-      lore:
-        - "&7Place on the right of the"
-        - "&7reforge menu to apply the"
-        - "<gradient:#DBDBDB>Rich</gradient:#F2F2F2>&7 reforge!"
-      item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2RjNTdjNzVhZGYzOWVjNmYwZTA5MTYwNDlkZDk2NzFlOThhOGExZTYwMDEwNGU4NGU2NDVjOTg4OTUwYmQ3In19fQ==
-      craftable: true
-      recipe:
-        - gold_block
-        - trident
-        - gold_block
-        - air
-        - ecoitems:blank_reforge_stone ? obsidian
-        - air
-        - gold_block
-        - bow
-        - gold_block
-    effects:
-      - id: give_money
-        args:
-          amount: 50
-        triggers:
-          - kill
-    conditions: []
-  - id: sharp
-    name: "<gradient:#f12711>Sharp</gradient:#f5af19>"
-    description:
-      - "&a+3% &fDamage"
-    targets:
-      - melee
-    stone:
-      enabled: false
-      name: ''
-      lore: []
-      item: ''
-      craftable: false
-      recipe: []
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: 1.03
-        triggers:
-          - melee_attack
-    conditions: []
-  - id: streamlined
-    name: "<gradient:#74ebd5>Streamlined</gradient:#ACB6E5>"
-    description:
-      - "&a+4% &fDamage"
-    targets:
-      - bow
-    stone:
-      enabled: false
-      name: ''
-      lore: []
-      item: ''
-      craftable: false
-      recipe: []
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: 1.04
-        triggers:
-          - bow_attack
-    conditions: []
-  - id: strong
-    name: "<gradient:#ED213A>Strong</gradient:#93291E>"
-    description:
-      - "&a+2% &fDamage"
-      - "&a+10% &fKnockback"
-    targets:
-      - melee
-    stone:
-      enabled: false
-      name: ''
-      lore: []
-      item: ''
-      craftable: false
-      recipe: []
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: 1.02
-        triggers:
-          - melee_attack
-      - id: knockback_multiplier
-        args:
-          multiplier: 1.1
-    conditions: []
-  - id: thin
-    name: "<gradient:#D1913C>Thin</gradient:#FFD194>"
-    description:
-      - "&c-5% &fDamage Resistance"
-      - "&a+2.5% &fMovement Speed"
-    targets:
-      - armor
-    stone:
-      enabled: false
-      name: ''
-      lore: []
-      item: ''
-      craftable: false
-      recipe: []
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: 1.05
-        triggers:
-          - take_damage
-      - id: movement_speed_multiplier
-        args:
-          multiplier: 1.025
-    conditions: []
-  - id: tough
-    name: "<gradient:#a73737>Tough</gradient:#7a2828>"
-    description:
-      - "&c+8% &fDamage Resistance"
-      - "&a-5% &fMovement Speed"
-    targets:
-      - armor
-    stone:
-      enabled: false
-      name: ''
-      lore: []
-      item: ''
-      craftable: false
-      recipe: []
-    effects:
-      - id: damage_multiplier
-        args:
-          multiplier: 0.92
-        triggers:
-          - take_damage
-      - id: movement_speed_multiplier
-        args:
-          multiplier: 0.95
-    conditions: []

eco-core/core-plugin/src/main/resources/reforges/_example.yml

@@ -0,0 +1,51 @@
+# The ID of the reforge is the name of the .yml file,
+# for example acute.yml has the ID of acute
+# You can place reforges anywhere in this folder,
+# including in subfolders if you want to organize your reforge configs
+# _example.yml is not loaded.
+
+name: "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>" # The display name for the reforge
+description: # The lore to add to an item with this reforge:
+  - "&a+5% &fDamage"
+  - "&a+10% &fCrit Damage"
+targets: # The targets that this reforge can be applied to
+  - melee
+
+# Options for the reforge stone
+stone:
+  enabled: true # If this reforge requires the use of a reforge stone
+  name: "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>&f Reforge Stone" # The display name of the stone
+  lore: # The lore of the stone
+    - "&7Place on the right of the"
+    - "&7reforge menu to apply the"
+    - "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>&7 reforge!"
+  item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmM0YTY1YzY4OWIyZDM2NDA5MTAwYTYwYzJhYjhkM2QwYTY3Y2U5NGVlYTNjMWY3YWM5NzRmZDg5MzU2OGI1ZCJ9fX0=
+  craftable: true # If the reforge stone should be craftable
+  price: 100000 # (Optional) The price required to apply this reforge, overrides the default reforge price
+  recipe: # The recipe for the stone to have
+    - air
+    - ecoitems:blank_reforge_stone ? air
+    - air
+    - iron_block
+    - daylight_sensor
+    - iron_block
+    - air
+    - phantom_membrane
+    - air
+
+# The effects of the reforge (i.e. the functionality)
+# See here: https://plugins.auxilor.io/effects/configuring-an-effect
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: 1.05
+    triggers:
+      - melee_attack
+  - id: crit_multiplier
+    args:
+      multiplier: 1.1
+    triggers:
+      - melee_attack
+
+# The conditions required to use the reforge
+conditions: []

eco-core/core-plugin/src/main/resources/reforges/acute.yml

@@ -0,0 +1,20 @@
+name: "<gradient:#4776E6>Acute</gradient:#8E54E9>"
+description:
+  - "&a+2% &fTriple Damage Chance"
+targets:
+  - axe
+stone:
+  enabled: false
+  name: ''
+  lore: []
+  item: ''
+  craftable: false
+  recipe: []
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: 3
+      chance: 2
+    triggers:
+      - melee_attack
+conditions: []

eco-core/core-plugin/src/main/resources/reforges/aerobic.yml

@@ -0,0 +1,22 @@
+name: "<gradient:#B993D6>Aerobic</gradient:#8CA6DB>"
+description:
+  - "&a+9% &fDamage when shot in air"
+targets:
+  - bow
+stone:
+  enabled: false
+  name: ''
+  lore: []
+  item: ''
+  craftable: false
+  recipe: []
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: 1.09
+    triggers:
+      - bow_attack
+conditions:
+  - id: in_air
+    args:
+      in_air: true

eco-core/core-plugin/src/main/resources/reforges/dynamic.yml

@@ -0,0 +1,38 @@
+name: "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>"
+description:
+  - "&a+5% &fDamage"
+  - "&a+10% &fCrit Damage"
+targets:
+  - melee
+stone:
+  enabled: true
+  name: "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>&f Reforge Stone"
+  lore:
+    - "&7Place on the right of the"
+    - "&7reforge menu to apply the"
+    - "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>&7 reforge!"
+  item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmM0YTY1YzY4OWIyZDM2NDA5MTAwYTYwYzJhYjhkM2QwYTY3Y2U5NGVlYTNjMWY3YWM5NzRmZDg5MzU2OGI1ZCJ9fX0=
+  craftable: true
+  price: 100000
+  recipe:
+    - air
+    - ecoitems:blank_reforge_stone ? air
+    - air
+    - iron_block
+    - daylight_sensor
+    - iron_block
+    - air
+    - phantom_membrane
+    - air
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: 1.05
+    triggers:
+      - melee_attack
+  - id: crit_multiplier
+    args:
+      multiplier: 1.1
+    triggers:
+      - melee_attack
+conditions: []

eco-core/core-plugin/src/main/resources/reforges/evasive.yml

@@ -0,0 +1,20 @@
+name: "<gradient:#EFEFBB>Evasive</gradient:#D4D3DD>"
+description:
+  - "&a+2% &fIgnore Damage Chance"
+targets:
+  - armor
+stone:
+  enabled: false
+  name: ''
+  lore: []
+  item: ''
+  craftable: false
+  recipe: []
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: 0
+      chance: 2
+    triggers:
+      - take_damage
+conditions: []

eco-core/core-plugin/src/main/resources/reforges/gravitated.yml

@@ -0,0 +1,19 @@
+name: "<gradient:#1e3c72>Gravitated</gradient:#2a5298>"
+description:
+  - "&a+8% &fCritical Damage"
+targets:
+  - melee
+stone:
+  enabled: false
+  name: ''
+  lore: []
+  item: ''
+  craftable: false
+  recipe: []
+effects:
+  - id: crit_multiplier
+    args:
+      multiplier: 1.08
+    triggers:
+      - melee_attack
+conditions: []

eco-core/core-plugin/src/main/resources/reforges/light.yml

@@ -0,0 +1,27 @@
+name: "<gradient:#1c92d2>Light</gradient:#f2fcfe>"
+description:
+  - "&c-5% &fDamage"
+  - "&c-5% &fKnockback"
+  - "&a+10% &fAttack Speed"
+targets:
+  - melee
+stone:
+  enabled: false
+  name: ''
+  lore: []
+  item: ''
+  craftable: false
+  recipe: []
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: 0.95
+    triggers:
+      - melee_attack
+  - id: knockback_multiplier
+    args:
+      multiplier: 0.95
+  - id: attack_speed_multiplier
+    args:
+      multiplier: 1.1
+conditions: []

eco-core/core-plugin/src/main/resources/reforges/nautical.yml

@@ -0,0 +1,26 @@
+name: "<gradient:#373B44>Nautical</gradient:#4286f4>"
+description:
+  - "&a+20% &fDamage in water"
+targets:
+  - melee
+  - bow
+  - trident
+stone:
+  enabled: false
+  name: ''
+  lore: []
+  item: ''
+  craftable: false
+  recipe: []
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: 1.2
+    triggers:
+      - melee_attack
+      - bow_attack
+      - trident_attack
+conditions:
+  - id: in_water
+    args:
+      in_water: true

eco-core/core-plugin/src/main/resources/reforges/pointy.yml

@@ -0,0 +1,19 @@
+name: "<gradient:#076585>Pointy</gradient:#ffffff>"
+description:
+  - "&a+10% &fDamage"
+targets:
+  - trident
+stone:
+  enabled: false
+  name: ''
+  lore: []
+  item: ''
+  craftable: false
+  recipe: []
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: 1.1
+    triggers:
+      - trident_attack
+conditions: []

eco-core/core-plugin/src/main/resources/reforges/prospecting.yml

@@ -0,0 +1,20 @@
+name: "<gradient:#00B4DB>Prospecting</gradient:#0083B0>"
+description:
+  - "&a+5% &fChance to get &e$$2&f for mining a block"
+targets:
+  - pickaxe
+stone:
+  enabled: false
+  name: ''
+  lore: []
+  item: ''
+  craftable: false
+  recipe: []
+effects:
+  - id: give_money
+    args:
+      amount: 2
+      chance: 5
+    triggers:
+      - mine_block
+conditions: []

eco-core/core-plugin/src/main/resources/reforges/reinforced.yml

@@ -0,0 +1,19 @@
+name: "<gradient:#FBD786>Reinforced</gradient:#f7797d>"
+description:
+  - "&a+4% &fDamage Resistance"
+targets:
+  - armor
+stone:
+  enabled: false
+  name: ''
+  lore: []
+  item: ''
+  craftable: false
+  recipe: []
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: 0.96
+    triggers:
+      - take_damage
+conditions: []

eco-core/core-plugin/src/main/resources/reforges/rich.yml

@@ -0,0 +1,32 @@
+name: "<gradient:#DBDBDB>Rich</gradient:#F2F2F2>"
+description:
+  - "&a+$$50 &fFor each mob kill"
+targets:
+  - trident
+  - bow
+stone:
+  enabled: true
+  name: "<gradient:#DBDBDB>Rich</gradient:#F2F2F2>&f Reforge Stone"
+  lore:
+    - "&7Place on the right of the"
+    - "&7reforge menu to apply the"
+    - "<gradient:#DBDBDB>Rich</gradient:#F2F2F2>&7 reforge!"
+  item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2RjNTdjNzVhZGYzOWVjNmYwZTA5MTYwNDlkZDk2NzFlOThhOGExZTYwMDEwNGU4NGU2NDVjOTg4OTUwYmQ3In19fQ==
+  craftable: true
+  recipe:
+    - gold_block
+    - trident
+    - gold_block
+    - air
+    - ecoitems:blank_reforge_stone ? obsidian
+    - air
+    - gold_block
+    - bow
+    - gold_block
+effects:
+  - id: give_money
+    args:
+      amount: 50
+    triggers:
+      - kill
+conditions: []

eco-core/core-plugin/src/main/resources/reforges/sharp.yml

@@ -0,0 +1,19 @@
+name: "<gradient:#f12711>Sharp</gradient:#f5af19>"
+description:
+  - "&a+3% &fDamage"
+targets:
+  - melee
+stone:
+  enabled: false
+  name: ''
+  lore: []
+  item: ''
+  craftable: false
+  recipe: []
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: 1.03
+    triggers:
+      - melee_attack
+conditions: []

eco-core/core-plugin/src/main/resources/reforges/streamlined.yml

@@ -0,0 +1,19 @@
+name: "<gradient:#74ebd5>Streamlined</gradient:#ACB6E5>"
+description:
+  - "&a+4% &fDamage"
+targets:
+  - bow
+stone:
+  enabled: false
+  name: ''
+  lore: []
+  item: ''
+  craftable: false
+  recipe: []
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: 1.04
+    triggers:
+      - bow_attack
+conditions: []

eco-core/core-plugin/src/main/resources/reforges/strong.yml

@@ -0,0 +1,23 @@
+name: "<gradient:#ED213A>Strong</gradient:#93291E>"
+description:
+  - "&a+2% &fDamage"
+  - "&a+10% &fKnockback"
+targets:
+  - melee
+stone:
+  enabled: false
+  name: ''
+  lore: []
+  item: ''
+  craftable: false
+  recipe: []
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: 1.02
+    triggers:
+      - melee_attack
+  - id: knockback_multiplier
+    args:
+      multiplier: 1.1
+conditions: []

eco-core/core-plugin/src/main/resources/reforges/thin.yml

@@ -0,0 +1,23 @@
+name: "<gradient:#D1913C>Thin</gradient:#FFD194>"
+description:
+  - "&c-5% &fDamage Resistance"
+  - "&a+2.5% &fMovement Speed"
+targets:
+  - armor
+stone:
+  enabled: false
+  name: ''
+  lore: []
+  item: ''
+  craftable: false
+  recipe: []
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: 1.05
+    triggers:
+      - take_damage
+  - id: movement_speed_multiplier
+    args:
+      multiplier: 1.025
+conditions: []

eco-core/core-plugin/src/main/resources/reforges/tough.yml

@@ -0,0 +1,23 @@
+name: "<gradient:#a73737>Tough</gradient:#7a2828>"
+description:
+  - "&c+8% &fDamage Resistance"
+  - "&a-5% &fMovement Speed"
+targets:
+  - armor
+stone:
+  enabled: false
+  name: ''
+  lore: []
+  item: ''
+  craftable: false
+  recipe: []
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: 0.92
+    triggers:
+      - take_damage
+  - id: movement_speed_multiplier
+    args:
+      multiplier: 0.95
+conditions: []

gradle.properties

@@ -1,4 +1,4 @@
 #libreforge-updater
-#Sun May 22 15:27:50 BST 2022
+#Fri Oct 28 11:34:59 BST 2022
-version=5.0.0
+version=5.67.0
 plugin-name=Reforges