More improvements and fixes

# Conflicts:
#	build.gradle
#	gradle.properties

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Auxilor Community Discord
+    url: https://discord.gg/ZcwpSsE/
+    about: Join the Auxilor discord to get help from support staff and the general community!
+  - name: The most common issues people have
+    url: https://github.com/Auxilor/eco/issues/78
+    about: Check the list of known common issues to see if your issue has already been solved

.github/ISSUE_TEMPLATE/report-a-bug.md

@@ -0,0 +1,31 @@
+---
+name: Report a Bug
+about: Report an issue with the plugin
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior: 
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Server Information (please complete the following information):**
+- Version: (output of `/ver` command)
+- Version of plugin and eco (`/ver eco`, `/ver <plugin>`)
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/request-a-feature.md

@@ -0,0 +1,20 @@
+---
+name: Request a Feature
+about: Suggest an idea for this plugin
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

README.md

@@ -1,6 +1,6 @@
 <h1 align="center">
   <br>
-  <img src="https://i.imgur.com/co0zeyJ.png" alt="Reforges logo" width="256">
+  <img src="https://i.imgur.com/wMgkc0e.png" alt="Reforges logo" width="256">
   <br>
 </h1>
 

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
     }
 }
 
@@ -27,6 +27,7 @@ allprojects {
 
     repositories {
         mavenCentral()
+        mavenLocal()
         maven { url 'https://jitpack.io' }
         maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
         maven { url 'https://papermc.io/repo/repository/maven-public/' }
@@ -37,20 +38,20 @@ allprojects {
         onlyIf { !sourceSets.main.allSource.files.isEmpty() }
     }
 
+    shadowJar {
+        relocate('com.willfp.libreforge', 'com.willfp.reforges.libreforge')
+        relocate('org.joml', 'com.willfp.reforges.libreforge.joml')
+    }
+
     dependencies {
-        compileOnly 'org.black_ixx:playerpoints:3.0.0'
+        compileOnly 'com.willfp:eco:6.35.1'
-        compileOnly 'com.willfp:eco:6.9.0'
+        implementation 'com.willfp:libreforge:3.49.0'
+        implementation 'org.joml:joml:1.10.4'
 
-        compileOnly 'org.jetbrains:annotations:19.0.0'
+        compileOnly 'org.jetbrains:annotations:23.0.0'
+        compileOnly 'com.github.ben-manes.caffeine:caffeine:3.0.6'
 
-        compileOnly 'org.projectlombok:lombok:1.18.20'
+        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.21'
-        annotationProcessor 'org.projectlombok:lombok:1.18.20'
-
-        testCompileOnly 'org.projectlombok:lombok:1.18.20'
-        testAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
-
-        compileOnly 'org.jetbrains:annotations:19.0.0'
-        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.5.21'
     }
 
     tasks.withType(JavaCompile) {
@@ -59,11 +60,20 @@ allprojects {
     }
 
     processResources {
-        filesNotMatching(["**/*.png", "**/models/**", "**/textures/**"]) {
+        filesNotMatching(["**/*.png", "**/models/**", "**/textures/**", "**reforges.yml", "**lang.yml"]) {
             expand projectVersion: project.version
         }
     }
 
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+        kotlinOptions {
+            jvmTarget = "17"
+        }
+    }
+
+    java.sourceCompatibility = JavaVersion.VERSION_17
+    java.targetCompatibility = JavaVersion.VERSION_17
+
     compileJava.options.encoding = 'UTF-8'
     compileJava.dependsOn clean
 
@@ -89,8 +99,17 @@ jar {
 group = 'com.willfp'
 archivesBaseName = project.name
 version = findProperty("version")
-java.sourceCompatibility = JavaVersion.VERSION_16
-
-compileJava.options.encoding = 'UTF-8'
 
 build.dependsOn shadowJar
+
+task buyThePlugins {
+    dependsOn subprojects.build
+
+    doLast {
+        println 'If you like the plugin, please consider buying it on Spigot or Polymart!'
+        println 'Spigot: https://www.spigotmc.org/resources/authors/auxilor.507394/'
+        println 'Polymart: https://polymart.org/user/auxilor.1107/'
+        println 'Buying gives you access to support and the plugin auto-updater, and it allows me to keep developing plugins.'
+    }
+}
+build.finalizedBy buyThePlugins

eco-core/core-plugin/build.gradle

@@ -6,10 +6,8 @@ dependencies {
     compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT'
     compileOnly 'com.github.MilkBowl:VaultAPI:1.7'
     compileOnly 'com.willfp:EcoSkills:1.4.0'
-    compileOnly 'com.willfp:Talismans:4.6.0'
+    compileOnly 'com.willfp:Talismans:5.28.2'
     compileOnly 'com.github.Archy-X:AureliumSkills:Beta1.2.4'
-    compileOnly 'org.black_ixx:playerpoints:3.0.0'
-    compileOnly fileTree(dir: '../../lib', include: ['*.jar'])
 }
 
 build.dependsOn publishToMavenLocal

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

@@ -1,153 +0,0 @@
-package com.willfp.reforges;
-
-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.core.items.Items;
-import com.willfp.reforges.commands.CommandReforge;
-import com.willfp.reforges.commands.CommandReforges;
-import com.willfp.reforges.config.ReforgesJson;
-import com.willfp.reforges.config.TargetYml;
-import com.willfp.reforges.display.ReforgesDisplay;
-import com.willfp.reforges.effects.ConfiguredEffect;
-import com.willfp.reforges.effects.Effect;
-import com.willfp.reforges.effects.Effects;
-import com.willfp.reforges.integrations.aureliumskills.AureliumSkillsIntegration;
-import com.willfp.reforges.integrations.ecoskills.EcoSkillsIntegration;
-import com.willfp.reforges.integrations.talismans.TalismansIntegration;
-import com.willfp.reforges.integrations.ultimateskills.UltimateSkillsIntegration;
-import com.willfp.reforges.reforges.Reforge;
-import com.willfp.reforges.reforges.Reforges;
-import com.willfp.reforges.reforges.util.ReforgeArgParser;
-import com.willfp.reforges.reforges.util.ReforgeEnableListeners;
-import com.willfp.reforges.reforges.util.ReforgeLookup;
-import com.willfp.reforges.reforges.util.WatcherTriggers;
-import com.willfp.reforges.util.AntiPlaceListener;
-import com.willfp.reforges.util.DiscoverRecipeListener;
-import com.willfp.reforges.vault.EconomyHandler;
-import lombok.Getter;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class ReforgesPlugin extends EcoPlugin {
-    /**
-     * Instance of Reforges.
-     */
-    private static ReforgesPlugin instance;
-
-    /**
-     * target.yml.
-     */
-    @Getter
-    private final TargetYml targetYml;
-
-    /**
-     * reforges.json.
-     */
-    @Getter
-    private final ReforgesJson reforgesJson;
-
-    /**
-     * Internal constructor called by bukkit on plugin load.
-     */
-    public ReforgesPlugin() {
-        super(1330, 12412, "&3", true);
-        this.targetYml = new TargetYml(this);
-        this.reforgesJson = new ReforgesJson(this);
-        instance = this;
-    }
-
-    @Override
-    protected void handleEnable() {
-        Items.registerArgParser(new ReforgeArgParser());
-    }
-
-    @Override
-    protected void handleDisable() {
-        for (Player player : Bukkit.getOnlinePlayers()) {
-            for (Reforge value : Reforges.values()) {
-                for (ConfiguredEffect effect : value.getEffects()) {
-                    effect.getEffect().handleDisabling(player);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void handleAfterLoad() {
-        EconomyHandler.setEnabled(EconomyHandler.init());
-
-        if (!EconomyHandler.isEnabled()) {
-            this.getLogger().severe("Vault economy support not enabled");
-        }
-    }
-
-    @Override
-    protected void handleReload() {
-        for (Effect effect : Effects.values()) {
-            HandlerList.unregisterAll(effect);
-            this.getScheduler().run(() -> this.getEventManager().registerListener(effect));
-        }
-        this.getLogger().info(Reforges.values().size() + " Reforges Loaded");
-        this.getScheduler().runTimer(() -> {
-            for (Player player : Bukkit.getOnlinePlayers()) {
-                ReforgeLookup.updateReforges(player);
-            }
-        }, 81, 81);
-    }
-
-    @Override
-    protected List<Listener> loadListeners() {
-        return Arrays.asList(
-                new DiscoverRecipeListener(this),
-                new AntiPlaceListener(),
-                new WatcherTriggers(this),
-                new ReforgeEnableListeners(this)
-        );
-    }
-
-    @Override
-    protected List<PluginCommand> loadPluginCommands() {
-        return Arrays.asList(
-                new CommandReforge(this),
-                new CommandReforges(this)
-        );
-    }
-
-    @Override
-    protected @Nullable DisplayModule createDisplayModule() {
-        return new ReforgesDisplay(this);
-    }
-
-    @Override
-    protected List<IntegrationLoader> loadIntegrationLoaders() {
-        return Arrays.asList(
-                new IntegrationLoader("UltimateSkills", UltimateSkillsIntegration::load),
-                new IntegrationLoader("EcoSkills", EcoSkillsIntegration::load),
-                new IntegrationLoader("Talismans", TalismansIntegration::registerProvider),
-                new IntegrationLoader("PlayerPoints", () -> EconomyHandler.setUsePlayerPoints(true)),
-                new IntegrationLoader("AureliumSkills", AureliumSkillsIntegration::load)
-        );
-    }
-
-    @Override
-    public String getMinimumEcoVersion() {
-        return "6.9.0";
-    }
-
-    /**
-     * Get an instance of Reforges.
-     *
-     * @return The instance.
-     */
-    public static ReforgesPlugin getInstance() {
-        return instance;
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/reforges/conditions/Condition.java

@@ -1,62 +0,0 @@
-package com.willfp.reforges.conditions;
-
-import com.willfp.eco.core.config.interfaces.JSONConfig;
-import com.willfp.reforges.ReforgesPlugin;
-import lombok.AccessLevel;
-import lombok.Getter;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Listener;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Objects;
-
-public abstract class Condition implements Listener {
-    /**
-     * Instance of Reforges.
-     */
-    @Getter(AccessLevel.PROTECTED)
-    private final ReforgesPlugin plugin = ReforgesPlugin.getInstance();
-
-    /**
-     * The name of the condition.
-     */
-    @Getter
-    private final String id;
-
-    /**
-     * Create a new condition.
-     *
-     * @param id The condition id.
-     */
-    protected Condition(@NotNull final String id) {
-        this.id = id;
-
-        Conditions.addNewCondition(this);
-    }
-
-    /**
-     * Get if condition is met for a player.
-     *
-     * @param player The player.
-     * @param config The config of the condition.
-     * @return If met.
-     */
-    public abstract boolean isConditionMet(@NotNull Player player,
-                                           @NotNull JSONConfig config);
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof Condition condition)) {
-            return false;
-        }
-        return getId().equals(condition.getId());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.getId());
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/reforges/conditions/Conditions.java

@@ -1,76 +0,0 @@
-package com.willfp.reforges.conditions;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.google.common.collect.ImmutableList;
-import com.willfp.reforges.conditions.conditions.ConditionAboveHealthPercent;
-import com.willfp.reforges.conditions.conditions.ConditionAboveHungerPercent;
-import com.willfp.reforges.conditions.conditions.ConditionAboveXPLevel;
-import com.willfp.reforges.conditions.conditions.ConditionAboveY;
-import com.willfp.reforges.conditions.conditions.ConditionBelowHealthPercent;
-import com.willfp.reforges.conditions.conditions.ConditionBelowHungerPercent;
-import com.willfp.reforges.conditions.conditions.ConditionBelowXPLevel;
-import com.willfp.reforges.conditions.conditions.ConditionBelowY;
-import com.willfp.reforges.conditions.conditions.ConditionHasPermission;
-import com.willfp.reforges.conditions.conditions.ConditionInAir;
-import com.willfp.reforges.conditions.conditions.ConditionInBiome;
-import com.willfp.reforges.conditions.conditions.ConditionInWater;
-import com.willfp.reforges.conditions.conditions.ConditionInWorld;
-import com.willfp.reforges.conditions.conditions.ConditionIsSneaking;
-import lombok.experimental.UtilityClass;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-@UtilityClass
-@SuppressWarnings("unused")
-public class Conditions {
-    /**
-     * All registered conditions.
-     */
-    private static final BiMap<String, Condition> BY_ID = HashBiMap.create();
-
-    public static final Condition BELOW_Y = new ConditionBelowY();
-    public static final Condition ABOVE_Y = new ConditionAboveY();
-    public static final Condition ABOVE_HEALTH_PERCENT = new ConditionAboveHealthPercent();
-    public static final Condition BELOW_HEALTH_PERCENT = new ConditionBelowHealthPercent();
-    public static final Condition IN_WATER = new ConditionInWater();
-    public static final Condition IN_WORLD = new ConditionInWorld();
-    public static final Condition ABOVE_XP_LEVEL = new ConditionAboveXPLevel();
-    public static final Condition BELOW_XP_LEVEL = new ConditionBelowXPLevel();
-    public static final Condition ABOVE_HUNGER_PERCENT = new ConditionAboveHungerPercent();
-    public static final Condition BELOW_HUNGER_PERCENT = new ConditionBelowHungerPercent();
-    public static final Condition IN_BIOME = new ConditionInBiome();
-    public static final Condition HAS_PERMISSION = new ConditionHasPermission();
-    public static final Condition IS_SNEAKING = new ConditionIsSneaking();
-    public static final Condition IN_AIR = new ConditionInAir();
-
-    /**
-     * Get condition matching name.s
-     *
-     * @param name The name to query.
-     * @return The matching condition, or null if not found.
-     */
-    public static Condition getByID(@NotNull final String name) {
-        return BY_ID.get(name);
-    }
-
-    /**
-     * List of all registered conditions.
-     *
-     * @return The conditions.
-     */
-    public static List<Condition> values() {
-        return ImmutableList.copyOf(BY_ID.values());
-    }
-
-    /**
-     * Add new condition to EcoArmor.
-     *
-     * @param condition The condition to add.
-     */
-    public static void addNewCondition(@NotNull final Condition condition) {
-        BY_ID.remove(condition.getId());
-        BY_ID.put(condition.getId(), condition);
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/reforges/config/ReforgesJson.java

@@ -1,16 +0,0 @@
-package com.willfp.reforges.config;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.config.json.JSONBaseConfig;
-import org.jetbrains.annotations.NotNull;
-
-public class ReforgesJson extends JSONBaseConfig {
-    /**
-     * Instantiate reforges.json.
-     *
-     * @param plugin Instance of reforges.
-     */
-    public ReforgesJson(@NotNull final EcoPlugin plugin) {
-        super("reforges", true, plugin);
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/reforges/config/TargetYml.java

@@ -1,54 +0,0 @@
-package com.willfp.reforges.config;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.config.yaml.YamlBaseConfig;
-import com.willfp.eco.core.items.Items;
-import com.willfp.eco.core.items.TestableItem;
-import com.willfp.reforges.reforges.meta.ReforgeTarget;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TargetYml extends YamlBaseConfig {
-    /**
-     * Instantiate target.yml.
-     *
-     * @param plugin Instance of EcoEnchants.
-     */
-    public TargetYml(@NotNull final EcoPlugin plugin) {
-        super("target", false, plugin);
-    }
-
-    /**
-     * Get all target names.
-     *
-     * @return Set of all names.
-     */
-    public List<String> getTargets() {
-        return this.getKeys(false);
-    }
-
-    /**
-     * Get all materials from a target name.
-     *
-     * @param target The name of the target.
-     * @return All materials.
-     */
-    public Set<TestableItem> getTargetItems(@NotNull final String target) {
-        Set<TestableItem> items = new HashSet<>();
-        this.getStrings(target + ".items", false).forEach(s -> items.add(Items.lookup(s.toUpperCase())));
-        return items;
-    }
-
-    /**
-     * Get all materials from a target name.
-     *
-     * @param target The name of the target.
-     * @return All materials.
-     */
-    public ReforgeTarget.Slot getSlot(@NotNull final String target) {
-        return ReforgeTarget.Slot.valueOf(this.getString(target + ".slot").toUpperCase());
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/reforges/effects/Effect.java

@@ -1,118 +0,0 @@
-package com.willfp.reforges.effects;
-
-import com.willfp.eco.core.config.interfaces.JSONConfig;
-import com.willfp.reforges.ReforgesPlugin;
-import com.willfp.reforges.reforges.util.Watcher;
-import lombok.AccessLevel;
-import lombok.Getter;
-import org.bukkit.NamespacedKey;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Listener;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.UUID;
-
-public abstract class Effect implements Listener, Watcher {
-    /**
-     * Instance of reforges.
-     */
-    @Getter(AccessLevel.PROTECTED)
-    private final ReforgesPlugin plugin = ReforgesPlugin.getInstance();
-
-    /**
-     * The effect ID.
-     */
-    private final String id;
-
-    /**
-     * Create a new effect.
-     *
-     * @param id The id.
-     */
-    protected Effect(@NotNull final String id) {
-        this.id = id;
-        Effects.addNewEffect(this);
-    }
-
-    /**
-     * Get the effect ID.
-     *
-     * @return The ID.
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Generate a UUID with a specified index.
-     *
-     * @param index The index.
-     * @param extra The extra
-     * @return The UUID.
-     */
-    protected UUID getUUID(final int index,
-                           @NotNull final Object... extra) {
-        return UUID.nameUUIDFromBytes((this.id + index + Arrays.hashCode(extra)).getBytes());
-    }
-
-    /**
-     * Generate a NamespacedKey with a specified index.
-     *
-     * @param index The index.
-     * @return The NamespacedKey.
-     */
-    protected NamespacedKey getNamespacedKey(final int index) {
-        return this.getPlugin().getNamespacedKeyFactory().create(this.id + "_" + index);
-    }
-
-    /**
-     * Handle application of a reforge containing this effect.
-     *
-     * @param player The player.
-     * @param config The config.
-     */
-    public final void handleEnabling(@NotNull final Player player,
-                                     @NotNull final JSONConfig config) {
-        PlayerEffectStack.pushEffect(player, this);
-
-        this.handleEnable(player, config);
-    }
-
-    protected void handleEnable(@NotNull final Player player,
-                                @NotNull final JSONConfig config) {
-        // Override when needed.
-    }
-
-    /**
-     * Handle removal of a reforge containing this effect.
-     *
-     * @param player The player.
-     */
-    public final void handleDisabling(@NotNull final Player player) {
-        this.handleDisable(player);
-
-        PlayerEffectStack.popEffect(player, this);
-    }
-
-    protected void handleDisable(@NotNull final Player player) {
-        // Override when needed.
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof Effect effect)) {
-            return false;
-        }
-        return this.getId().equals(effect.getId());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.getId());
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/reforges/effects/Effects.java

@@ -1,68 +0,0 @@
-package com.willfp.reforges.effects;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.google.common.collect.ImmutableList;
-import com.willfp.reforges.effects.effects.EffectAttackSpeedMultiplier;
-import com.willfp.reforges.effects.effects.EffectCritMultiplier;
-import com.willfp.reforges.effects.effects.EffectDamageMultiplier;
-import com.willfp.reforges.effects.effects.EffectDurabilityMultiplier;
-import com.willfp.reforges.effects.effects.EffectIncomingDamageMultiplier;
-import com.willfp.reforges.effects.effects.EffectKnockbackMultiplier;
-import com.willfp.reforges.effects.effects.EffectMovementSpeedMultiplier;
-import com.willfp.reforges.effects.effects.EffectRewardBlockBreak;
-import com.willfp.reforges.effects.effects.EffectRewardKill;
-import lombok.experimental.UtilityClass;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-@UtilityClass
-@SuppressWarnings("unused")
-public class Effects {
-    /**
-     * All registered effects.
-     */
-    private static final BiMap<String, Effect> BY_ID = HashBiMap.create();
-
-    public static final Effect DAMAGE_MULTIPLIER = new EffectDamageMultiplier();
-    public static final Effect CRIT_MULTIPLIER = new EffectCritMultiplier();
-    public static final Effect REWARD_KILL = new EffectRewardKill();
-    public static final Effect KNOCKBACK_MULTIPLIER = new EffectKnockbackMultiplier();
-    public static final Effect REWARD_BLOCK_BREAK = new EffectRewardBlockBreak();
-    public static final Effect INCOMING_DAMAGE_MULTIPLIER = new EffectIncomingDamageMultiplier();
-    public static final Effect ATTACK_SPEED_MULTIPLIER = new EffectAttackSpeedMultiplier();
-    public static final Effect DURABILITY_MULTIPLIER = new EffectDurabilityMultiplier();
-    public static final Effect MOVEMENT_SPEED_MULTIPLIER = new EffectMovementSpeedMultiplier();
-
-    /**
-     * Get effect matching id.
-     *
-     * @param id The id to query.
-     * @return The matching effect, or null if not found.
-     */
-    @Nullable
-    public static Effect getByID(@NotNull final String id) {
-        return BY_ID.get(id);
-    }
-
-    /**
-     * List of all registered effects.
-     *
-     * @return The effects.
-     */
-    public static List<Effect> values() {
-        return ImmutableList.copyOf(BY_ID.values());
-    }
-
-    /**
-     * Add new effect to EcoWeapons.
-     *
-     * @param effect The effect to add.
-     */
-    public static void addNewEffect(@NotNull final Effect effect) {
-        BY_ID.remove(effect.getId());
-        BY_ID.put(effect.getId(), effect);
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/reforges/events/EffectActivateEvent.java

@@ -1,106 +0,0 @@
-package com.willfp.reforges.events;
-
-import com.willfp.reforges.effects.Effect;
-import com.willfp.reforges.reforges.Reforge;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
-import org.jetbrains.annotations.NotNull;
-
-public class EffectActivateEvent extends PlayerEvent implements Cancellable {
-    /**
-     * The reforge.
-     */
-    private final Reforge reforge;
-
-    /**
-     * The effect that activated.
-     */
-    private final Effect effect;
-
-    /**
-     * If the event is cancelled.
-     */
-    private boolean cancelled;
-
-    /**
-     * Bukkit parity.
-     */
-    private static final HandlerList HANDLERS = new HandlerList();
-
-    /**
-     * Create new EffectActivateEvent.
-     *
-     * @param who     The player.
-     * @param reforge The reforge.
-     * @param effect  The effect.
-     */
-    public EffectActivateEvent(@NotNull final Player who,
-                               @NotNull final Reforge reforge,
-                               @NotNull final Effect effect) {
-        super(who);
-        this.reforge = reforge;
-        this.effect = effect;
-        this.cancelled = false;
-    }
-
-    /**
-     * Get if the effect activation is cancelled.
-     *
-     * @return If cancelled.
-     */
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    /**
-     * Set if the event is cancelled.
-     *
-     * @param cancel If cancelled.
-     */
-    @Override
-    public void setCancelled(final boolean cancel) {
-        this.cancelled = cancel;
-    }
-
-    /**
-     * Bukkit parity.
-     *
-     * @return The handlers.
-     */
-    @Override
-    public @NotNull HandlerList getHandlers() {
-        return HANDLERS;
-    }
-
-    /**
-     * Get the reforge associated with the event.
-     *
-     * @return The reforge.
-     */
-    @NotNull
-    public Reforge getReforge() {
-        return this.reforge;
-    }
-
-    /**
-     * Get the effect associated with the event.
-     *
-     * @return The effect.
-     */
-    @NotNull
-    public Effect getEffect() {
-        return this.effect;
-    }
-
-    /**
-     * Bukkit parity.
-     *
-     * @return The handler list.
-     */
-    public static HandlerList getHandlerList() {
-        return HANDLERS;
-    }
-}

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

@@ -1,87 +0,0 @@
-package com.willfp.reforges.reforges;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.google.common.collect.ImmutableSet;
-import com.willfp.eco.core.config.interfaces.JSONConfig;
-import com.willfp.eco.core.config.updating.ConfigUpdater;
-import com.willfp.reforges.ReforgesPlugin;
-import lombok.experimental.UtilityClass;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Set;
-
-@UtilityClass
-@SuppressWarnings("unused")
-public class Reforges {
-    private static final BiMap<String, Reforge> BY_KEY = HashBiMap.create();
-
-    /**
-     * Get all registered {@link Reforge}s.
-     *
-     * @return A list of all {@link Reforge}s.
-     */
-    public static Set<Reforge> values() {
-        return ImmutableSet.copyOf(BY_KEY.values());
-    }
-
-    /**
-     * Get {@link String}s for all registered {@link Reforge}s.
-     *
-     * @return A list of all {@link Reforge}s.
-     */
-    public static Set<String> keySet() {
-        return ImmutableSet.copyOf(BY_KEY.keySet());
-    }
-
-    /**
-     * Get {@link Reforge} matching key.
-     *
-     * @param key The key to search for.
-     * @return The matching {@link Reforge}, or null if not found.
-     */
-    public static Reforge getByKey(@Nullable final String key) {
-        if (key == null) {
-            return null;
-        }
-        return BY_KEY.get(key);
-    }
-
-    /**
-     * Update all {@link Reforge}s.
-     *
-     * @param plugin Instance of Reforges.
-     */
-    @ConfigUpdater
-    public static void update(@NotNull final ReforgesPlugin plugin) {
-        for (Reforge reforge : values()) {
-            removeReforge(reforge);
-        }
-
-        for (JSONConfig config : plugin.getReforgesJson().getSubsections("reforges")) {
-            new Reforge(config, plugin);
-        }
-    }
-
-    /**
-     * Add new {@link Reforge} to Reforges.
-     * <p>
-     * Only for internal use, reforges are automatically added in the constructor.
-     *
-     * @param reforge The {@link Reforge} to add.
-     */
-    public static void addNewReforge(@NotNull final Reforge reforge) {
-        BY_KEY.remove(reforge.getId());
-        BY_KEY.put(reforge.getId(), reforge);
-    }
-
-    /**
-     * Remove {@link Reforge} from Reforges.
-     *
-     * @param reforge The {@link Reforge} to remove.
-     */
-    public static void removeReforge(@NotNull final Reforge reforge) {
-        BY_KEY.remove(reforge.getId());
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/meta/ReforgeTarget.java

@@ -1,152 +0,0 @@
-package com.willfp.reforges.reforges.meta;
-
-import com.google.common.collect.ImmutableSet;
-import com.willfp.eco.core.config.updating.ConfigUpdater;
-import com.willfp.eco.core.items.TestableItem;
-import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
-import com.willfp.reforges.ReforgesPlugin;
-import lombok.Getter;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-public class ReforgeTarget {
-    /**
-     * Target containing the materials from all other targets.
-     */
-    public static final ReforgeTarget ALL = new ReforgeTarget("all", Slot.ANY, new HashSet<>());
-
-    /**
-     * All registered targets.
-     */
-    private static final Map<String, ReforgeTarget> REGISTERED = new HashMap<>();
-
-    static {
-        REGISTERED.put("all", ALL);
-        update(ReforgesPlugin.getInstance());
-    }
-
-    /**
-     * The name of the target.
-     */
-    @Getter
-    private final String name;
-
-    /**
-     * The materials of the target.
-     */
-    @Getter
-    private final Set<TestableItem> items;
-
-    /**
-     * The slot for the target.
-     */
-    @Getter
-    private final Slot slot;
-
-    /**
-     * Create new target.
-     *
-     * @param name  The name of the target.
-     * @param items The items for the target.
-     */
-    public ReforgeTarget(@NotNull final String name,
-                         @NotNull final Slot slot,
-                         @NotNull final Set<TestableItem> items) {
-        this.name = name;
-        items.removeIf(item -> item instanceof EmptyTestableItem);
-        this.items = items;
-        this.slot = slot;
-    }
-
-    /**
-     * If an item matches the target.
-     *
-     * @param itemStack The ItemStack.
-     * @return If matches.
-     */
-    public boolean matches(@NotNull final ItemStack itemStack) {
-        for (TestableItem item : this.items) {
-            if (item.matches(itemStack)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Get ReforgeTarget matching name.
-     *
-     * @param name The name to search for.
-     * @return The matching ReforgeTarget, or null if not found.
-     */
-    public static ReforgeTarget getByName(@NotNull final String name) {
-        return REGISTERED.get(name);
-    }
-
-    /**
-     * Get target from item.
-     *
-     * @param item The item.
-     * @return The target.
-     */
-    public static List<ReforgeTarget> getForItem(@NotNull final ItemStack item) {
-        return REGISTERED.values().stream()
-                .filter(target -> !target.getName().equalsIgnoreCase("all"))
-                .filter(target -> target.matches(item))
-                .collect(Collectors.toList());
-    }
-
-    /**
-     * Update all targets.
-     *
-     * @param plugin Instance of Reforges.
-     */
-    @ConfigUpdater
-    public static void update(@NotNull final ReforgesPlugin plugin) {
-        ALL.items.clear();
-        for (String id : new ArrayList<>(REGISTERED.keySet())) {
-            if (id.equalsIgnoreCase("all")) {
-                continue;
-            }
-
-            REGISTERED.remove(id);
-        }
-
-        for (String id : plugin.getTargetYml().getTargets()) {
-            ReforgeTarget target = new ReforgeTarget(
-                    id,
-                    plugin.getTargetYml().getSlot(id),
-                    plugin.getTargetYml().getTargetItems(id)
-            );
-            REGISTERED.put(id, target);
-            ALL.items.addAll(target.items);
-        }
-    }
-
-    /**
-     * Get all targets.
-     *
-     * @return A set of all targets.
-     */
-    public static Set<ReforgeTarget> values() {
-        return ImmutableSet.copyOf(REGISTERED.values());
-    }
-
-    /**
-     * Reforge slots.
-     */
-    public enum Slot {
-        HANDS,
-        ARMOR,
-        ANY
-    }
-}

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

@@ -1,126 +0,0 @@
-package com.willfp.reforges.reforges.util;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginDependent;
-import com.willfp.reforges.effects.ConfiguredEffect;
-import com.willfp.reforges.reforges.Reforge;
-import com.willfp.reforges.reforges.Reforges;
-import com.willfp.reforges.reforges.meta.ReforgeTarget;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityPickupItemEvent;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.player.PlayerDropItemEvent;
-import org.bukkit.event.player.PlayerItemHeldEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.jetbrains.annotations.NotNull;
-
-public class ReforgeEnableListeners extends PluginDependent<EcoPlugin> implements Listener {
-    /**
-     * Initialize new listeners and link them to a plugin.
-     *
-     * @param plugin The plugin to link to.
-     */
-    public ReforgeEnableListeners(@NotNull final EcoPlugin plugin) {
-        super(plugin);
-    }
-
-    /**
-     * Called on item pickup.
-     *
-     * @param event The event to listen for.
-     */
-    @EventHandler
-    public void onItemPickup(@NotNull final EntityPickupItemEvent event) {
-        if (!(event.getEntity() instanceof Player player)) {
-            return;
-        }
-
-        if (!ReforgeTarget.ALL.matches(event.getItem().getItemStack())) {
-            return;
-        }
-
-        refreshPlayer(player);
-    }
-
-    /**
-     * Called on player join.
-     *
-     * @param event The event to listen for.
-     */
-    @EventHandler
-    public void onPlayerJoin(@NotNull final PlayerJoinEvent event) {
-        refresh();
-    }
-
-    /**
-     * Called on player leave.
-     *
-     * @param event The event to listen for.
-     */
-    @EventHandler
-    public void onPlayerLeave(@NotNull final PlayerQuitEvent event) {
-        refresh();
-
-        Player player = event.getPlayer();
-
-        for (Reforge value : Reforges.values()) {
-            for (ConfiguredEffect effect : value.getEffects()) {
-                effect.getEffect().handleDisabling(player);
-            }
-        }
-    }
-
-    /**
-     * Called on item drop.
-     *
-     * @param event The event to listen for.
-     */
-    @EventHandler
-    public void onInventoryDrop(@NotNull final PlayerDropItemEvent event) {
-        if (!ReforgeTarget.ALL.matches(event.getItemDrop().getItemStack())) {
-            return;
-        }
-
-        refreshPlayer(event.getPlayer());
-    }
-
-    /**
-     * Called on slot change.
-     *
-     * @param event The event to listen for.
-     */
-    @EventHandler
-    public void onChangeSlot(@NotNull final PlayerItemHeldEvent event) {
-        refreshPlayer(event.getPlayer());
-    }
-
-    /**
-     * Called on inventory click.
-     *
-     * @param event The event to listen for.
-     */
-    @EventHandler
-    public void onInventoryClick(@NotNull final InventoryClickEvent event) {
-        if (!(event.getWhoClicked() instanceof Player)) {
-            return;
-        }
-
-        refreshPlayer((Player) event.getWhoClicked());
-    }
-
-    /**
-     * Force refresh all online players.
-     * <p>
-     * This is a very expensive method.
-     */
-    public void refresh() {
-        this.getPlugin().getServer().getOnlinePlayers().forEach(this::refreshPlayer);
-    }
-
-    private void refreshPlayer(@NotNull final Player player) {
-        ReforgeLookup.updateReforges(player);
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeHandler.java

@@ -1,131 +0,0 @@
-package com.willfp.reforges.reforges.util;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.PluginDependent;
-import com.willfp.eco.core.gui.menu.Menu;
-import com.willfp.eco.core.gui.slot.Slot;
-import com.willfp.reforges.reforges.Reforge;
-import com.willfp.reforges.reforges.meta.ReforgeTarget;
-import com.willfp.reforges.vault.EconomyHandler;
-import org.bukkit.Sound;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-public class ReforgeHandler extends PluginDependent<EcoPlugin> {
-    /**
-     * Pass an {@link EcoPlugin} in order to interface with it.
-     *
-     * @param plugin The plugin to manage.
-     */
-    public ReforgeHandler(@NotNull EcoPlugin plugin) {
-        super(plugin);
-    }
-
-    public void handleReforgeClick(@NotNull final InventoryClickEvent event,
-                                   @NotNull final Slot slot,
-                                   @NotNull final Menu menu) {
-        Player player = (Player) event.getWhoClicked();
-        ItemStack toReforge = menu.getCaptiveItems(player).isEmpty() ? null : menu.getCaptiveItems(player).get(0);
-        if (toReforge == null) {
-            return;
-        }
-
-        List<ReforgeTarget> target = ReforgeTarget.getForItem(toReforge);
-
-        Reforge reforge = null;
-        boolean usedStone = false;
-
-        if (menu.getCaptiveItems(player).size() == 2) {
-            Reforge stone = ReforgeUtils.getReforgeStone(menu.getCaptiveItems(player).get(1));
-            if (stone != null) {
-                if (stone.getTargets().stream().anyMatch(reforgeTarget -> reforgeTarget.matches(toReforge))) {
-                    reforge = stone;
-                    usedStone = true;
-                }
-            }
-        }
-
-        if (reforge == null) {
-            reforge = ReforgeUtils.getRandomReforge(target);
-        }
-
-        if (reforge == null) {
-            return;
-        }
-
-        double cost = 0;
-        if (EconomyHandler.isEnabled()) {
-            cost = this.getPlugin().getConfigYml().getDouble("reforge.cost");
-            int reforges = ReforgeUtils.getReforges(toReforge);
-            cost *= Math.pow(this.getPlugin().getConfigYml().getDouble("reforge.cost-exponent"), reforges);
-            if (reforge.getRequiresStone() && reforge.getStonePrice() != -1) {
-                cost = reforge.getStonePrice();
-            }
-
-            if (!EconomyHandler.has(player, cost)) {
-                player.sendMessage(this.getPlugin().getLangYml().getMessage("insufficient-money"));
-
-                player.playSound(
-                        player.getLocation(),
-                        Sound.valueOf(this.getPlugin().getConfigYml().getString("gui.insufficient-money-sound.id").toUpperCase()),
-                        1f,
-                        (float) this.getPlugin().getConfigYml().getDouble("gui.insufficient-money-sound.pitch")
-                );
-
-                return;
-            }
-        }
-
-        int xpCost = this.getPlugin().getConfigYml().getInt("reforge.xp-cost");
-        int reforges = ReforgeUtils.getReforges(toReforge);
-        xpCost *= Math.pow(this.getPlugin().getConfigYml().getDouble("reforge.cost-exponent"), reforges);
-        if (player.getLevel() < xpCost) {
-            player.sendMessage(this.getPlugin().getLangYml().getMessage("insufficient-xp"));
-
-            player.playSound(
-                    player.getLocation(),
-                    Sound.valueOf(this.getPlugin().getConfigYml().getString("gui.insufficient-money-sound.id").toUpperCase()),
-                    1f,
-                    (float) this.getPlugin().getConfigYml().getDouble("gui.insufficient-money-sound.pitch")
-            );
-
-            return;
-        }
-
-        if (EconomyHandler.isEnabled()) {
-            EconomyHandler.getInstance().withdrawPlayer(player, cost);
-        }
-
-        player.setLevel(player.getLevel() - xpCost);
-
-        player.sendMessage(this.getPlugin().getLangYml().getMessage("applied-reforge").replace("%reforge%", reforge.getName()));
-
-        ReforgeUtils.incrementReforges(toReforge);
-
-        ReforgeUtils.setReforge(toReforge, reforge);
-
-        if (usedStone) {
-            ItemStack stone = menu.getCaptiveItems(player).get(1);
-            stone.setItemMeta(null);
-            stone.setAmount(0);
-
-            player.playSound(
-                    player.getLocation(),
-                    Sound.valueOf(this.getPlugin().getConfigYml().getString("gui.stone-sound.id").toUpperCase()),
-                    1f,
-                    (float) this.getPlugin().getConfigYml().getDouble("gui.stone-sound.pitch")
-            );
-        }
-
-        player.playSound(
-                player.getLocation(),
-                Sound.valueOf(this.getPlugin().getConfigYml().getString("gui.sound.id").toUpperCase()),
-                1f,
-                (float) this.getPlugin().getConfigYml().getDouble("gui.sound.pitch")
-        );
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeLookup.java

@@ -1,239 +0,0 @@
-package com.willfp.reforges.reforges.util;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.reforges.ReforgesPlugin;
-import com.willfp.reforges.conditions.ConfiguredCondition;
-import com.willfp.reforges.reforges.Reforge;
-import com.willfp.reforges.reforges.meta.ReforgeTarget;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.UUID;
-import java.util.WeakHashMap;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-public class ReforgeLookup {
-    /**
-     * All registered providers.
-     */
-    private static final Set<Function<Player, Map<ItemStack, ReforgeTarget.Slot>>> PROVIDERS = new HashSet<>();
-
-    /**
-     * Cached items.
-     */
-    private static final Map<UUID, Map<ItemStack, ReforgeTarget.Slot>> ITEM_CACHE = new WeakHashMap<>();
-
-    /**
-     * Cached reforges.
-     */
-    private static final Map<UUID, Collection<Reforge>> REFORGE_CACHE = new WeakHashMap<>();
-
-    /**
-     * Instance of Reforges.
-     */
-    private static final EcoPlugin PLUGIN = ReforgesPlugin.getInstance();
-
-    /**
-     * Register provider.
-     *
-     * @param provider The provider.
-     */
-    public static void registerProvider(@NotNull final Function<Player, Map<ItemStack, ReforgeTarget.Slot>> provider) {
-        PROVIDERS.add(provider);
-    }
-
-    /**
-     * Provide ItemStacks.
-     *
-     * @param player The player.
-     * @return The ItemStacks.
-     */
-    public static Map<ItemStack, ReforgeTarget.Slot> provide(@NotNull final Player player) {
-        if (ITEM_CACHE.containsKey(player.getUniqueId())) {
-            return new HashMap<>(ITEM_CACHE.get(player.getUniqueId()));
-        }
-
-        Map<ItemStack, ReforgeTarget.Slot> found = new HashMap<>();
-        for (Function<Player, Map<ItemStack, ReforgeTarget.Slot>> provider : PROVIDERS) {
-            found.putAll(provider.apply(player));
-        }
-        found.keySet().removeIf(Objects::isNull);
-
-        ITEM_CACHE.put(player.getUniqueId(), found);
-        PLUGIN.getScheduler().runLater(() -> ITEM_CACHE.remove(player.getUniqueId()), 40);
-
-        return found;
-    }
-
-    /**
-     * Provide Reforges.
-     *
-     * @param player The player.
-     * @return The Reforges.
-     */
-    public static List<Reforge> provideReforges(@NotNull final Player player) {
-        if (REFORGE_CACHE.containsKey(player.getUniqueId())) {
-            return new ArrayList<>(REFORGE_CACHE.get(player.getUniqueId()));
-        }
-
-        List<Reforge> found = new ArrayList<>();
-
-        for (Map.Entry<ItemStack, ReforgeTarget.Slot> entry : provide(player).entrySet()) {
-            ItemStack itemStack = entry.getKey();
-            ReforgeTarget.Slot slot = entry.getValue();
-
-            if (itemStack == null) {
-                continue;
-            }
-
-            Reforge reforge = ReforgeUtils.getReforge(itemStack);
-
-            if (reforge == null) {
-                continue;
-            }
-
-            if (!reforge.getTargets().stream()
-                    .map(ReforgeTarget::getSlot)
-                    .collect(Collectors.toList())
-                    .contains(slot)) {
-                continue;
-            }
-
-            found.add(reforge);
-        }
-
-        REFORGE_CACHE.put(player.getUniqueId(), found);
-        PLUGIN.getScheduler().runLater(() -> REFORGE_CACHE.remove(player.getUniqueId()), 40);
-
-        return found;
-    }
-
-    /**
-     * Clear caches.
-     *
-     * @param player The player.
-     */
-    public static void clearCaches(@NotNull final Player player) {
-        REFORGE_CACHE.remove(player.getUniqueId());
-        ITEM_CACHE.remove(player.getUniqueId());
-    }
-
-    /**
-     * Update reforges for a player.
-     *
-     * @param player The player.
-     */
-    public static void updateReforges(@NotNull final Player player) {
-        List<Reforge> before = ReforgeLookup.provideReforges(player);
-        ReforgeLookup.clearCaches(player);
-        PLUGIN.getScheduler().run(() -> {
-            List<Reforge> after = ReforgeLookup.provideReforges(player);
-            Map<Reforge, Integer> beforeFrequency = listToFrequencyMap(before);
-            Map<Reforge, Integer> afterFrequency = listToFrequencyMap(after);
-
-            List<Reforge> added = new ArrayList<>();
-            List<Reforge> removed = new ArrayList<>();
-
-            for (Map.Entry<Reforge, Integer> entry : new HashSet<>(afterFrequency.entrySet())) {
-                int amount = entry.getValue();
-                Reforge reforge = entry.getKey();
-
-                amount -= beforeFrequency.getOrDefault(reforge, 0);
-
-                if (amount < 1) {
-                    continue;
-                }
-
-                for (int i = 0; i < amount; i++) {
-                    added.add(reforge);
-                }
-            }
-
-            for (Map.Entry<Reforge, Integer> entry : new HashSet<>(beforeFrequency.entrySet())) {
-                int amount = entry.getValue();
-                Reforge reforge = entry.getKey();
-
-                amount -= afterFrequency.getOrDefault(reforge, 0);
-
-                if (amount < 1) {
-                    continue;
-                }
-
-                for (int i = 0; i < amount; i++) {
-                    removed.add(reforge);
-                }
-            }
-
-            for (Reforge reforge : added) {
-                boolean areConditionsMet = true;
-                for (ConfiguredCondition condition : reforge.getConditions()) {
-                    if (!condition.getCondition().isConditionMet(player, condition.getConfig())) {
-                        areConditionsMet = false;
-                        break;
-                    }
-                }
-                if (areConditionsMet) {
-                    reforge.handleActivation(player);
-                }
-            }
-
-            for (Reforge reforge : removed) {
-                reforge.handleDeactivation(player);
-            }
-
-            for (Reforge reforge : after) {
-                boolean areConditionsMet = true;
-                for (ConfiguredCondition condition : reforge.getConditions()) {
-                    if (!condition.getCondition().isConditionMet(player, condition.getConfig())) {
-                        areConditionsMet = false;
-                        break;
-                    }
-                }
-                if (!areConditionsMet) {
-                    reforge.handleDeactivation(player);
-                }
-            }
-        });
-    }
-
-    private static <T> Map<T, Integer> listToFrequencyMap(@NotNull final List<T> list) {
-        Map<T, Integer> frequencyMap = new HashMap<>();
-        for (T object : list) {
-            if (frequencyMap.containsKey(object)) {
-                frequencyMap.put(object, frequencyMap.get(object) + 1);
-            } else {
-                frequencyMap.put(object, 1);
-            }
-        }
-
-        return frequencyMap;
-    }
-
-    static {
-        registerProvider(player -> Map.of(
-                player.getInventory().getItemInMainHand(),
-                ReforgeTarget.Slot.HANDS
-        ));
-        registerProvider(player -> Map.of(
-                player.getInventory().getItemInOffHand(),
-                ReforgeTarget.Slot.HANDS
-        ));
-        registerProvider(player -> {
-            Map<ItemStack, ReforgeTarget.Slot> items = new HashMap<>();
-            for (ItemStack stack : player.getInventory().getArmorContents()) {
-                items.put(stack, ReforgeTarget.Slot.ARMOR);
-            }
-            return items;
-        });
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeStatus.java

@@ -1,23 +0,0 @@
-package com.willfp.reforges.reforges.util;
-
-public enum ReforgeStatus {
-    /**
-     * Allow the reforge.
-     */
-    ALLOW,
-
-    /**
-     * Allow the reforge with a stone.
-     */
-    ALLOW_STONE,
-
-    /**
-     * Invalid item to reforge.
-     */
-    INVALID_ITEM,
-
-    /**
-     * No item at all.
-     */
-    NO_ITEM
-}

eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeUtils.java

@@ -1,285 +0,0 @@
-package com.willfp.reforges.reforges.util;
-
-import com.willfp.eco.core.EcoPlugin;
-import com.willfp.reforges.ReforgesPlugin;
-import com.willfp.reforges.reforges.Reforge;
-import com.willfp.reforges.reforges.Reforges;
-import com.willfp.reforges.reforges.meta.ReforgeTarget;
-import lombok.experimental.UtilityClass;
-import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataContainer;
-import org.bukkit.persistence.PersistentDataType;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-@UtilityClass
-public class ReforgeUtils {
-    /**
-     * Instance of StatTrackers.
-     */
-    private static final EcoPlugin PLUGIN = ReforgesPlugin.getInstance();
-
-    /**
-     * The key for storing reforges.
-     */
-    private static final NamespacedKey REFORGE_KEY = PLUGIN.getNamespacedKeyFactory().create("reforge");
-
-    /**
-     * The key for storing reforge amounts.
-     */
-    private static final NamespacedKey REFORGE_AMOUNT = PLUGIN.getNamespacedKeyFactory().create("reforge_amount");
-
-    /**
-     * The key for storing reforge stones.
-     */
-    private static final NamespacedKey REFORGE_STONE_KEY = PLUGIN.getNamespacedKeyFactory().create("reforge_stone");
-
-    /**
-     * Get a random reforge for a target.
-     *
-     * @param targets The targets.
-     */
-    public static Reforge getRandomReforge(@NotNull final Collection<ReforgeTarget> targets) {
-        List<Reforge> applicable = new ArrayList<>();
-
-        for (Reforge reforge : Reforges.values()) {
-            for (ReforgeTarget target : targets) {
-                if (reforge.getTargets().contains(target) && !reforge.getRequiresStone()) {
-                    applicable.add(reforge);
-                }
-            }
-        }
-
-        Collections.shuffle(applicable);
-
-        if (applicable.isEmpty()) {
-            return null;
-        }
-
-        return applicable.get(0);
-    }
-
-    public static MetadatedReforgeStatus getStatus(@NotNull final List<ItemStack> captive) {
-        ItemStack toReforge = captive.isEmpty() ? null : captive.get(0);
-        ItemStack stone = captive.size() == 2 ? captive.get(1) : null;
-        ReforgeStatus status = null;
-
-        List<ReforgeTarget> target = new ArrayList<>();
-
-        if (toReforge == null || toReforge.getType() == Material.AIR) {
-            status = ReforgeStatus.NO_ITEM;
-        } else {
-            target.addAll(ReforgeTarget.getForItem(toReforge));
-            if (target.isEmpty()) {
-                status = ReforgeStatus.INVALID_ITEM;
-            }
-        }
-
-        if (!target.isEmpty()) {
-            status = ReforgeStatus.ALLOW;
-        }
-
-        double cost = 0;
-        if (status == ReforgeStatus.ALLOW) {
-            Reforge reforgeStone = getReforgeStone(stone);
-            if (reforgeStone != null && reforgeStone.getTargets().stream()
-                    .anyMatch(reforgeTarget -> reforgeTarget.getItems().stream()
-                            .anyMatch(item -> item.matches(toReforge)))) {
-                cost = reforgeStone.getStonePrice();
-                status = ReforgeStatus.ALLOW_STONE;
-            }
-        }
-
-        return new MetadatedReforgeStatus(status, cost);
-    }
-
-    /**
-     * Get reforge on an item.
-     *
-     * @param item The item to query.
-     * @return The found reforge, or null.
-     */
-    public static Reforge getReforge(@Nullable final ItemStack item) {
-        if (item == null) {
-            return null;
-        }
-
-        ItemMeta meta = item.getItemMeta();
-
-        if (meta == null) {
-            return null;
-        }
-
-        return getReforge(meta);
-    }
-
-    /**
-     * Get reforge on an item.
-     *
-     * @param meta The item to query.
-     * @return The found reforge, or null.
-     */
-    public static Reforge getReforge(@Nullable final ItemMeta meta) {
-        if (meta == null) {
-            return null;
-        }
-
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-
-        if (!container.has(REFORGE_KEY, PersistentDataType.STRING)) {
-            return null;
-        }
-
-        String active = container.get(REFORGE_KEY, PersistentDataType.STRING);
-
-        return Reforges.getByKey(active);
-    }
-
-    /**
-     * Set reforge on an item.
-     *
-     * @param item    The item.
-     * @param reforge The reforge.
-     */
-    public static void setReforge(@NotNull final ItemStack item,
-                                  @NotNull final Reforge reforge) {
-
-        if (item.getItemMeta() == null) {
-            return;
-        }
-
-        ItemMeta meta = item.getItemMeta();
-
-        setReforge(meta, reforge);
-
-        item.setItemMeta(meta);
-    }
-
-    /**
-     * Set reforge on an item.
-     *
-     * @param meta    The meta.
-     * @param reforge The reforge.
-     */
-    public static void setReforge(@NotNull final ItemMeta meta,
-                                  @NotNull final Reforge reforge) {
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-
-        container.set(REFORGE_KEY, PersistentDataType.STRING, reforge.getId());
-    }
-
-    /**
-     * Get reforge stone on an item.
-     *
-     * @param item The item to query.
-     * @return The found reforge, or null.
-     */
-    public static Reforge getReforgeStone(@Nullable final ItemStack item) {
-        if (item == null) {
-            return null;
-        }
-
-        ItemMeta meta = item.getItemMeta();
-
-        if (meta == null) {
-            return null;
-        }
-
-        return getReforgeStone(meta);
-    }
-
-    /**
-     * Get reforge stone on an item.
-     *
-     * @param meta The item to query.
-     * @return The found reforge, or null.
-     */
-    public static Reforge getReforgeStone(@Nullable final ItemMeta meta) {
-        if (meta == null) {
-            return null;
-        }
-
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-
-        if (!container.has(REFORGE_STONE_KEY, PersistentDataType.STRING)) {
-            return null;
-        }
-
-        String active = container.get(REFORGE_STONE_KEY, PersistentDataType.STRING);
-
-        return Reforges.getByKey(active);
-    }
-
-    /**
-     * Set an item to be a reforge stone.
-     *
-     * @param item    The item.
-     * @param reforge The reforge.
-     */
-    public static void setReforgeStone(@NotNull final ItemStack item,
-                                       @NotNull final Reforge reforge) {
-        if (item.getItemMeta() == null) {
-            return;
-        }
-
-        ItemMeta meta = item.getItemMeta();
-
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-
-        container.set(REFORGE_STONE_KEY, PersistentDataType.STRING, reforge.getId());
-
-        item.setItemMeta(meta);
-    }
-
-    /**
-     * Get the amount of reforges done to an item.
-     *
-     * @param item The item.
-     */
-    public static int getReforges(@NotNull final ItemStack item) {
-        ItemMeta meta = item.getItemMeta();
-
-        if (meta == null) {
-            return 0;
-        }
-
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-
-        if (!container.has(REFORGE_AMOUNT, PersistentDataType.INTEGER)) {
-            container.set(REFORGE_AMOUNT, PersistentDataType.INTEGER, 0);
-            item.setItemMeta(meta);
-        }
-
-        Integer amount = container.get(REFORGE_AMOUNT, PersistentDataType.INTEGER);
-
-        return amount == null ? 0 : amount;
-    }
-
-    /**
-     * Get the amount of reforges done to an item.
-     *
-     * @param item The item.
-     */
-    public static void incrementReforges(@NotNull final ItemStack item) {
-        ItemMeta meta = item.getItemMeta();
-
-        if (meta == null) {
-            return;
-        }
-
-        int amount = getReforges(item);
-        amount++;
-
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        container.set(REFORGE_AMOUNT, PersistentDataType.INTEGER, amount);
-        item.setItemMeta(meta);
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/Watcher.java

@@ -1,209 +0,0 @@
-package com.willfp.reforges.reforges.util;
-
-import com.willfp.eco.core.config.interfaces.JSONConfig;
-import com.willfp.eco.core.events.EntityDeathByEntityEvent;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Arrow;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Projectile;
-import org.bukkit.entity.Trident;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.ProjectileHitEvent;
-import org.bukkit.event.entity.ProjectileLaunchEvent;
-import org.bukkit.event.player.PlayerItemDamageEvent;
-import org.bukkit.event.player.PlayerMoveEvent;
-import org.jetbrains.annotations.NotNull;
-
-@SuppressWarnings("unused")
-public interface Watcher {
-
-    /**
-     * Called when a player breaks a block.
-     *
-     * @param player The player.
-     * @param block  The block that was broken.
-     * @param event  The event that called this watcher.
-     * @param config The effect config.
-     */
-    default void onBlockBreak(@NotNull final Player player,
-                              @NotNull final Block block,
-                              @NotNull final BlockBreakEvent event,
-                              @NotNull final JSONConfig config) {
-        // Empty default as effects only override required watchers.
-    }
-
-    /**
-     * Called when an entity attacks another entity via any mean.
-     *
-     * @param attacker The attacker.
-     * @param victim   The victim.
-     * @param event    The event.
-     * @param config   The effect config.
-     */
-    default void onAnyDamage(@NotNull final Player attacker,
-                             @NotNull final LivingEntity victim,
-                             @NotNull final EntityDamageByEntityEvent event,
-                             @NotNull final JSONConfig config) {
-        // Empty default as effects only override required watchers.
-    }
-
-    /**
-     * Called when an entity shoots another entity with an arrow.
-     *
-     * @param attacker The shooter.
-     * @param victim   The victim.
-     * @param arrow    The arrow entity.
-     * @param event    The event that called this watcher.
-     * @param config   The effect config.
-     */
-    default void onArrowDamage(@NotNull final Player attacker,
-                               @NotNull final LivingEntity victim,
-                               @NotNull final Arrow arrow,
-                               @NotNull final EntityDamageByEntityEvent event,
-                               @NotNull final JSONConfig config) {
-        // Empty default as effects only override required watchers.
-    }
-
-    /**
-     * Called when an entity damages another entity with a trident throw.
-     *
-     * @param attacker The shooter.
-     * @param victim   The victim.
-     * @param trident  The trident entity.
-     * @param event    The event that called this watcher.
-     * @param config   The effect config.
-     */
-    default void onTridentDamage(@NotNull final Player attacker,
-                                 @NotNull final LivingEntity victim,
-                                 @NotNull final Trident trident,
-                                 @NotNull final EntityDamageByEntityEvent event,
-                                 @NotNull final JSONConfig config) {
-        // Empty default as effects only override required watchers.
-    }
-
-    /**
-     * Called when a player jumps.
-     *
-     * @param player The player.
-     * @param event  The event that called this watcher.
-     * @param config The effect config.
-     */
-    default void onJump(@NotNull final Player player,
-                        @NotNull final PlayerMoveEvent event,
-                        @NotNull final JSONConfig config) {
-        // Empty default as effects only override required watchers.
-    }
-
-    /**
-     * Called when an entity attacks another entity with a melee attack.
-     *
-     * @param attacker The attacker.
-     * @param victim   The victim.
-     * @param event    The event that called this watcher.
-     * @param config   The effect config.
-     */
-    default void onMeleeAttack(@NotNull final Player attacker,
-                               @NotNull final LivingEntity victim,
-                               @NotNull final EntityDamageByEntityEvent event,
-                               @NotNull final JSONConfig config) {
-        // Empty default as effects only override required watchers.
-    }
-
-    /**
-     * Called when an entity shoots a projectile.
-     *
-     * @param shooter    The entity that shot the bow.
-     * @param projectile The projectile that was shot.
-     * @param event      The event that called this watcher.
-     * @param config     The effect config.
-     */
-    default void onProjectileLaunch(@NotNull final Player shooter,
-                                    @NotNull final Projectile projectile,
-                                    @NotNull final ProjectileLaunchEvent event,
-                                    @NotNull final JSONConfig config) {
-        // Empty default as effects only override required watchers.
-    }
-
-    /**
-     * Called when an entity takes fall damage.
-     *
-     * @param faller The entity that took the fall damage.
-     * @param event  The event that called this watcher.
-     * @param config The effect config.
-     */
-    default void onFallDamage(@NotNull final Player faller,
-                              @NotNull final EntityDamageEvent event,
-                              @NotNull final JSONConfig config) {
-        // Empty default as effects only override required watchers.
-    }
-
-    /**
-     * Called when a projectile hits a block or entity.
-     *
-     * @param shooter The entity that shot the arrow.
-     * @param event   The event that called this watcher.
-     * @param config  The effect config.
-     */
-    default void onProjectileHit(@NotNull final Player shooter,
-                                 @NotNull final ProjectileHitEvent event,
-                                 @NotNull final JSONConfig config) {
-        // Empty default as effects only override required watchers.
-    }
-
-    /**
-     * Called when an entity kills another entity.
-     *
-     * @param killer The killer.
-     * @param victim The victim.
-     * @param event  The event.
-     * @param config The effect config.
-     */
-    default void onKill(@NotNull final Player killer,
-                        @NotNull final LivingEntity victim,
-                        @NotNull final EntityDeathByEntityEvent event,
-                        @NotNull final JSONConfig config) {
-        // Empty default as effects only override required watchers.
-    }
-
-    /**
-     * Called when an entity takes damage wearing armor.
-     *
-     * @param victim The entity that took damage.
-     * @param event  The event that called this watcher.
-     * @param config The effect config.
-     */
-    default void onDamageWearingArmor(@NotNull final Player victim,
-                                      @NotNull final EntityDamageEvent event,
-                                      @NotNull final JSONConfig config) {
-        // Empty default as effects only override required watchers.
-    }
-
-    /**
-     * Called when an entity throws a trident.
-     *
-     * @param shooter The entity that threw the trident.
-     * @param trident The trident that was thrown.
-     * @param event   The event that called this watcher.
-     * @param config  The effect config.
-     */
-    default void onTridentLaunch(@NotNull final Player shooter,
-                                 @NotNull final Trident trident,
-                                 @NotNull final ProjectileLaunchEvent event,
-                                 @NotNull final JSONConfig config) {
-        // Empty default as effects only override required watchers.
-    }
-
-    /**
-     * Called when an item takes durability damage.
-     *
-     * @param event  The event that called this watcher.
-     * @param config The effect config.
-     */
-    default void onDurabilityDamage(@NotNull final PlayerItemDamageEvent event,
-                                    @NotNull final JSONConfig config) {
-        // Empty default as effects only override required watchers.
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/reforges/vault/EconomyHandler.java

@@ -1,66 +0,0 @@
-package com.willfp.reforges.vault;
-
-import com.willfp.reforges.ReforgesPlugin;
-import lombok.Setter;
-import lombok.experimental.UtilityClass;
-import net.milkbowl.vault.economy.Economy;
-import org.black_ixx.playerpoints.PlayerPoints;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.RegisteredServiceProvider;
-
-import java.util.concurrent.ExecutionException;
-
-@UtilityClass
-public final class EconomyHandler {
-    /**
-     * The instance.
-     */
-    private static Economy instance = null;
-
-    @Setter
-    private static boolean usePlayerPoints = false;
-
-    @Setter
-    private static boolean enabled = false;
-
-    /**
-     * Initialize the economy manager.
-     *
-     * @return If was successful.
-     */
-    public static boolean init() {
-        RegisteredServiceProvider<Economy> rsp = Bukkit.getServer().getServicesManager().getRegistration(Economy.class);
-        if (rsp == null) {
-            return false;
-        }
-        instance = rsp.getProvider();
-        return true;
-    }
-
-    public static Economy getInstance() {
-        return EconomyHandler.instance;
-    }
-
-    /**
-     * Get if a player has a specified amount.
-     *
-     * @param player The player.
-     * @param amount The amount.
-     * @return If a player has the amount.
-     */
-    public static boolean has(Player player, double amount) {
-        if (usePlayerPoints && ReforgesPlugin.getInstance().getConfigYml().getBool("reforge.use-player-points")) {
-            try {
-                return PlayerPoints.getInstance().getAPI().lookAsync(player.getUniqueId()).get() >= amount;
-            } catch (ExecutionException | InterruptedException e) {
-                return false;
-            }
-        }
-        return getInstance().has(player, amount);
-    }
-
-    public static boolean isEnabled() {
-        return EconomyHandler.enabled;
-    }
-}

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

@@ -0,0 +1,78 @@
+package com.willfp.reforges
+
+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.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 org.bukkit.event.Listener
+
+class ReforgesPlugin : LibReforgePlugin() {
+    val targetYml: TargetYml =
+        TargetYml(this)
+    val reforgesYml: ReforgesYml =
+        ReforgesYml(this)
+
+    init {
+        instance = this
+    }
+
+    override fun handleEnableAdditional() {
+        Items.registerArgParser(ReforgeArgParser())
+        registerHolderProvider { ReforgeLookup.provideReforges(it) }
+    }
+
+    override fun handleReloadAdditional() {
+        logger.info(Reforges.values().size.toString() + " Reforges Loaded")
+    }
+
+    override fun loadListeners(): List<Listener> {
+        return listOf(
+            DiscoverRecipeListener(this),
+            AntiPlaceListener(),
+            ReforgeEnableListeners(this)
+        )
+    }
+
+    override fun loadPluginCommands(): List<PluginCommand> {
+        return listOf(
+            CommandReforge(this),
+            CommandReforges(this)
+        )
+    }
+
+    override fun createDisplayModule(): DisplayModule {
+        return ReforgesDisplay(this)
+    }
+
+    override fun loadAdditionalIntegrations(): List<IntegrationLoader> {
+        return listOf(
+            IntegrationLoader("Talismans") { TalismansIntegration.registerProvider() }
+        )
+    }
+
+    override fun getMinimumEcoVersion(): String {
+        return "6.35.1"
+    }
+
+    companion object {
+        /**
+         * Instance of Reforges.
+         */
+        @JvmStatic
+        lateinit var instance: ReforgesPlugin
+            private set
+    }
+}

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

@@ -0,0 +1,82 @@
+package com.willfp.reforges.commands
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.command.impl.Subcommand
+import com.willfp.reforges.reforges.Reforges
+import com.willfp.reforges.util.reforge
+import org.bukkit.Bukkit
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+import org.bukkit.util.StringUtil
+
+class CommandApply(
+    plugin: EcoPlugin
+) : Subcommand(plugin, "apply", "reforges.command.apply", false) {
+    override fun onExecute(sender: CommandSender, args: MutableList<String>) {
+        if (args.isEmpty()) {
+            sender.sendMessage(plugin.langYml.getMessage("needs-reforge"))
+            return
+        }
+
+        val reforge = Reforges.getByKey(args[0].lowercase())
+
+        if (reforge == null) {
+            sender.sendMessage(plugin.langYml.getMessage("invalid-reforge"))
+            return
+        }
+
+        if (sender is Player) {
+            val item = sender.inventory.itemInMainHand
+            item.reforge = reforge
+            sender.sendMessage(
+                plugin.langYml.getMessage("applied-reforge")
+                    .replace("%reforge%", reforge.name)
+            )
+        } else {
+            if (args.size < 2) {
+                sender.sendMessage(plugin.langYml.getMessage("needs-player"))
+                return
+            }
+
+            val player = Bukkit.getPlayer(args[1])
+
+            if (player == null) {
+                sender.sendMessage(plugin.langYml.getMessage("invalid-player"))
+                return
+            }
+
+            player.inventory.itemInMainHand.reforge = reforge
+            sender.sendMessage(
+                plugin.langYml.getMessage("applied-reforge")
+                    .replace("%reforge%", reforge.name)
+            )
+        }
+    }
+
+    override fun tabComplete(sender: CommandSender, args: List<String>): List<String> {
+        val completions = mutableListOf<String>()
+        if (args.isEmpty()) {
+            // Currently, this case is not ever reached
+            return Reforges.values().map { it.id }
+        }
+        if (args.size == 1) {
+            StringUtil.copyPartialMatches(
+                args[0],
+                Reforges.values().map { it.id },
+                completions
+            )
+            completions.sort()
+            return completions
+        }
+        if (args.size == 2) {
+            StringUtil.copyPartialMatches(
+                args[1],
+                Bukkit.getOnlinePlayers().map { it.name },
+                completions
+            )
+            completions.sort()
+            return completions
+        }
+        return emptyList()
+    }
+}

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

@@ -1,11 +1,10 @@
 package com.willfp.reforges.commands
 
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.command.CommandHandler
-import com.willfp.eco.core.command.TabCompleteHandler
 import com.willfp.eco.core.command.impl.Subcommand
 import com.willfp.reforges.reforges.Reforges
 import org.bukkit.Bukkit
+import org.bukkit.command.CommandSender
 import org.bukkit.util.StringUtil
 
 class CommandGive(
@@ -22,16 +21,15 @@ class CommandGive(
         "64"
     )
 
-    override fun getHandler(): CommandHandler {
+    override fun onExecute(sender: CommandSender, args: MutableList<String>) {
-        return CommandHandler { sender, args ->
         if (args.isEmpty()) {
             sender.sendMessage(plugin.langYml.getMessage("needs-player"))
-                return@CommandHandler
+            return
         }
 
         if (args.size == 1) {
             sender.sendMessage(plugin.langYml.getMessage("needs-stone"))
-                return@CommandHandler
+            return
         }
 
         val amount = if (args.size > 2) args[2].toIntOrNull() ?: 1 else 1
@@ -39,13 +37,13 @@ class CommandGive(
         val reciever = Bukkit.getPlayer(recieverName)
         if (reciever == null) {
             sender.sendMessage(plugin.langYml.getMessage("invalid-player"))
-                return@CommandHandler
+            return
         }
         val key = args[1]
         val reforge = Reforges.getByKey(key)
         if (reforge == null) {
             sender.sendMessage(plugin.langYml.getMessage("invalid-stone"))
-                return@CommandHandler
+            return
         }
         var message = plugin.langYml.getMessage("give-success")
         message = message.replace("%reforge%", reforge.name).replace("%recipient%", reciever.name)
@@ -54,14 +52,13 @@ class CommandGive(
         itemStack.amount = amount
         reciever.inventory.addItem(itemStack)
     }
-    }
 
-    override fun getTabCompleter(): TabCompleteHandler {
+    override fun tabComplete(sender: CommandSender, args: List<String>): List<String> {
-        return TabCompleteHandler { _, args ->
+
         val completions = mutableListOf<String>()
         if (args.isEmpty()) {
             // Currently, this case is not ever reached
-                return@TabCompleteHandler Reforges.values().filter { it.requiresStone }.map { it.id }
+            return Reforges.values().filter { it.requiresStone }.map { it.id }
         }
         if (args.size == 1) {
             StringUtil.copyPartialMatches(
@@ -69,7 +66,7 @@ class CommandGive(
                 Bukkit.getOnlinePlayers().map { it.name },
                 completions
             )
-                return@TabCompleteHandler completions
+            return completions
         }
         if (args.size == 2) {
             StringUtil.copyPartialMatches(
@@ -78,7 +75,7 @@ class CommandGive(
                 completions
             )
             completions.sort()
-                return@TabCompleteHandler completions
+            return completions
         }
         if (args.size == 3) {
             StringUtil.copyPartialMatches(args[2], numbers, completions)
@@ -87,9 +84,8 @@ class CommandGive(
                 val t2 = s2.toInt()
                 t1 - t2
             }
-                return@TabCompleteHandler completions
+            return completions
-            }
-            emptyList()
         }
+        return emptyList()
     }
 }

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

@@ -1,40 +1,39 @@
 package com.willfp.reforges.commands
 
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.command.CommandHandler
-import com.willfp.eco.core.command.TabCompleteHandler
 import com.willfp.eco.core.command.impl.PluginCommand
-import com.willfp.reforges.gui.ReforgeGUI.menu
+import com.willfp.reforges.gui.ReforgeGUI
 import org.bukkit.Bukkit
 import org.bukkit.Sound
+import org.bukkit.command.CommandSender
 import org.bukkit.util.StringUtil
 
 class CommandOpen(
     plugin: EcoPlugin
 ) : PluginCommand(plugin, "open", "reforges.command.open", false) {
-    override fun getHandler(): CommandHandler {
+    override fun onExecute(sender: CommandSender, args: List<String>) {
-        return CommandHandler { sender, args ->
         if (args.isEmpty()) {
             sender.sendMessage(plugin.langYml.getMessage("needs-player"))
-                return@CommandHandler
+            return
         }
         val player = Bukkit.getPlayer(args[0])
         if (player == null) {
             sender.sendMessage(plugin.langYml.getMessage("invalid-player"))
-                return@CommandHandler
+            return
         }
+        if (plugin.configYml.getBool("gui.open-sound.enabled")) {
             player.playSound(
                 player.location,
                 Sound.valueOf(plugin.configYml.getString("gui.open-sound.id").uppercase()),
                 1f,
                 plugin.configYml.getDouble("gui.open-sound.pitch").toFloat()
             )
-            menu.open(player)
-        }
         }
 
-    override fun getTabCompleter(): TabCompleteHandler {
+        ReforgeGUI.open(player)
-        return TabCompleteHandler { _, args ->
+    }
+
+    override fun tabComplete(sender: CommandSender, args: List<String>): List<String> {
         val completions = mutableListOf<String>()
         if (args.size == 1) {
             StringUtil.copyPartialMatches(
@@ -42,9 +41,8 @@ class CommandOpen(
                 Bukkit.getOnlinePlayers().map { it.name },
                 completions
             )
-                return@TabCompleteHandler completions
+            return completions
-            }
-            emptyList()
         }
+        return emptyList()
     }
 }

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

@@ -1,25 +1,26 @@
 package com.willfp.reforges.commands
 
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.command.CommandHandler
 import com.willfp.eco.core.command.impl.PluginCommand
-import com.willfp.reforges.gui.ReforgeGUI.menu
+import com.willfp.reforges.gui.ReforgeGUI
 import org.bukkit.Sound
+import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 
 class CommandReforge(
     plugin: EcoPlugin
 ) : PluginCommand(plugin, "reforge", "reforges.command.reforge", true) {
-    override fun getHandler(): CommandHandler {
+    override fun onExecute(player: CommandSender, args: List<String>) {
-        return CommandHandler { player, _ ->
         player as Player
+        if (plugin.configYml.getBool("gui.open-sound.enabled")) {
             player.playSound(
                 player.location,
                 Sound.valueOf(plugin.configYml.getString("gui.open-sound.id").uppercase()),
                 1f,
                 plugin.configYml.getDouble("gui.open-sound.pitch").toFloat()
             )
-            menu.open(player)
         }
+
+        ReforgeGUI.open(player)
     }
 }

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

@@ -1,21 +1,20 @@
 package com.willfp.reforges.commands
 
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.command.CommandHandler
 import com.willfp.eco.core.command.impl.PluginCommand
+import org.bukkit.command.CommandSender
 
 class CommandReforges(plugin: EcoPlugin) : PluginCommand(plugin, "reforges", "reforges.command.reforges", false) {
-    override fun getHandler(): CommandHandler {
+    override fun onExecute(sender: CommandSender, args: List<String>) {
-        return CommandHandler { sender, _ ->
         sender.sendMessage(
             plugin.langYml.getMessage("invalid-command")
         )
     }
-    }
 
     init {
         addSubcommand(CommandReload(plugin))
             .addSubcommand(CommandGive(plugin))
             .addSubcommand(CommandOpen(plugin))
+            .addSubcommand(CommandApply(plugin))
     }
 }

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

@@ -1,14 +1,15 @@
 package com.willfp.reforges.commands
 
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.command.CommandHandler
 import com.willfp.eco.core.command.impl.Subcommand
+import com.willfp.eco.util.StringUtils
+import org.bukkit.command.CommandSender
 
 class CommandReload(plugin: EcoPlugin) : Subcommand(plugin, "reload", "reforges.command.reload", false) {
-    override fun getHandler(): CommandHandler {
+    override fun onExecute(sender: CommandSender, args: List<String>) {
-        return CommandHandler { sender, _ ->
+        sender.sendMessage(
-            plugin.reload()
+            plugin.langYml.getMessage("reloaded", StringUtils.FormatOption.WITHOUT_PLACEHOLDERS)
-            sender.sendMessage(plugin.langYml.getMessage("reloaded"))
+                .replace("%time%", plugin.reloadWithTime().toString())
-        }
+        )
     }
 }

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

@@ -1,5 +0,0 @@
-package com.willfp.reforges.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-
-data class ConfiguredCondition(val condition: Condition, val config: JSONConfig)

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

@@ -1,48 +0,0 @@
-package com.willfp.reforges.conditions.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.conditions.Condition
-import com.willfp.reforges.reforges.util.ReforgeLookup
-import org.bukkit.attribute.Attribute
-import org.bukkit.entity.Player
-import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
-import org.bukkit.event.entity.EntityDamageEvent
-import org.bukkit.event.entity.EntityRegainHealthEvent
-
-class ConditionAboveHealthPercent: Condition("above_health_percent") {
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: EntityRegainHealthEvent) {
-        val player = event.entity
-
-        if (player !is Player) {
-            return
-        }
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: EntityDamageEvent) {
-        val player = event.entity
-
-        if (player !is Player) {
-            return
-        }
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    override fun isConditionMet(player: Player, config: JSONConfig): Boolean {
-        val maxHealth = player.getAttribute(Attribute.GENERIC_MAX_HEALTH)?.value ?: return false
-        val health = player.health
-
-        return health / maxHealth * 100 >= config.getDouble("percent")
-    }
-}

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

@@ -1,30 +0,0 @@
-package com.willfp.reforges.conditions.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.conditions.Condition
-import com.willfp.reforges.reforges.util.ReforgeLookup
-import org.bukkit.entity.Player
-import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
-import org.bukkit.event.entity.FoodLevelChangeEvent
-
-
-class ConditionAboveHungerPercent : Condition("above_hunger_percent") {
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: FoodLevelChangeEvent) {
-        val player = event.entity
-
-        if (player !is Player) {
-            return
-        }
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    override fun isConditionMet(player: Player, config: JSONConfig): Boolean {
-        return (player.foodLevel / 20) * 100 >= config.getDouble("percent")
-    }
-}

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

@@ -1,26 +0,0 @@
-package com.willfp.reforges.conditions.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.conditions.Condition
-import com.willfp.reforges.reforges.util.ReforgeLookup
-import org.bukkit.entity.Player
-import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
-import org.bukkit.event.player.PlayerExpChangeEvent
-
-
-class ConditionAboveXPLevel : Condition("above_xp_level") {
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: PlayerExpChangeEvent) {
-        val player = event.player
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    override fun isConditionMet(player: Player, config: JSONConfig): Boolean {
-        return player.level >= config.getInt("level")
-    }
-}

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

@@ -1,29 +0,0 @@
-package com.willfp.reforges.conditions.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.conditions.Condition
-import com.willfp.reforges.reforges.util.ReforgeLookup
-import org.bukkit.entity.Player
-import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
-import org.bukkit.event.player.PlayerMoveEvent
-
-class ConditionAboveY: Condition("above_y") {
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: PlayerMoveEvent) {
-        val player = event.player
-
-        if (event.from.y == event.to.y) {
-            return
-        }
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    override fun isConditionMet(player: Player, config: JSONConfig): Boolean {
-        return player.location.y >= config.getDouble("y")
-    }
-}

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

@@ -1,48 +0,0 @@
-package com.willfp.reforges.conditions.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.conditions.Condition
-import com.willfp.reforges.reforges.util.ReforgeLookup
-import org.bukkit.attribute.Attribute
-import org.bukkit.entity.Player
-import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
-import org.bukkit.event.entity.EntityDamageEvent
-import org.bukkit.event.entity.EntityRegainHealthEvent
-
-class ConditionBelowHealthPercent: Condition("below_health_percent") {
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: EntityRegainHealthEvent) {
-        val player = event.entity
-
-        if (player !is Player) {
-            return
-        }
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: EntityDamageEvent) {
-        val player = event.entity
-
-        if (player !is Player) {
-            return
-        }
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    override fun isConditionMet(player: Player, config: JSONConfig): Boolean {
-        val maxHealth = player.getAttribute(Attribute.GENERIC_MAX_HEALTH)?.value ?: return false
-        val health = player.health
-
-        return health / maxHealth * 100 <= config.getDouble("percent")
-    }
-}

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

@@ -1,30 +0,0 @@
-package com.willfp.reforges.conditions.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.conditions.Condition
-import com.willfp.reforges.reforges.util.ReforgeLookup
-import org.bukkit.entity.Player
-import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
-import org.bukkit.event.entity.FoodLevelChangeEvent
-
-
-class ConditionBelowHungerPercent : Condition("below_hunger_percent") {
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: FoodLevelChangeEvent) {
-        val player = event.entity
-
-        if (player !is Player) {
-            return
-        }
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    override fun isConditionMet(player: Player, config: JSONConfig): Boolean {
-        return (player.foodLevel / 20) * 100 <= config.getDouble("percent")
-    }
-}

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

@@ -1,26 +0,0 @@
-package com.willfp.reforges.conditions.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.conditions.Condition
-import com.willfp.reforges.reforges.util.ReforgeLookup
-import org.bukkit.entity.Player
-import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
-import org.bukkit.event.player.PlayerExpChangeEvent
-
-
-class ConditionBelowXPLevel: Condition("below_xp_level") {
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: PlayerExpChangeEvent) {
-        val player = event.player
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    override fun isConditionMet(player: Player, config: JSONConfig): Boolean {
-        return player.level < config.getInt("level")
-    }
-}

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

@@ -1,29 +0,0 @@
-package com.willfp.reforges.conditions.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.conditions.Condition
-import com.willfp.reforges.reforges.util.ReforgeLookup
-import org.bukkit.entity.Player
-import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
-import org.bukkit.event.player.PlayerMoveEvent
-
-class ConditionBelowY: Condition("below_y") {
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: PlayerMoveEvent) {
-        val player = event.player
-
-        if (event.from.y == event.to.y) {
-            return
-        }
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    override fun isConditionMet(player: Player, config: JSONConfig): Boolean {
-        return player.location.y < config.getDouble("y")
-    }
-}

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

@@ -1,12 +0,0 @@
-package com.willfp.reforges.conditions.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.conditions.Condition
-import org.bukkit.entity.Player
-
-
-class ConditionHasPermission : Condition("is_sneaking") {
-    override fun isConditionMet(player: Player, config: JSONConfig): Boolean {
-        return player.hasPermission(config.getString("permission"))
-    }
-}

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

@@ -1,25 +0,0 @@
-package com.willfp.reforges.conditions.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.conditions.Condition
-import com.willfp.reforges.reforges.util.ReforgeLookup
-import org.bukkit.entity.Player
-import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
-import org.bukkit.event.player.PlayerMoveEvent
-
-class ConditionInAir: Condition("in_air") {
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: PlayerMoveEvent) {
-        val player = event.player
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    override fun isConditionMet(player: Player, config: JSONConfig): Boolean {
-        return player.location.block.isEmpty
-    }
-}

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

@@ -1,33 +0,0 @@
-package com.willfp.reforges.conditions.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.conditions.Condition
-import com.willfp.reforges.reforges.util.ReforgeLookup
-import org.bukkit.entity.Player
-import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
-import org.bukkit.event.player.PlayerMoveEvent
-
-class ConditionInBiome: Condition("in_biome") {
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: PlayerMoveEvent) {
-        val player = event.player
-
-        if (event.from.world?.getBiome(event.from) == event.to.world?.getBiome(event.to)) {
-            return
-        }
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    override fun isConditionMet(player: Player, config: JSONConfig): Boolean {
-        return config.getStrings("biomes").contains(player.world.getBiome(
-            player.location.blockX,
-            player.location.blockY,
-            player.location.blockZ
-        ).name.lowercase())
-    }
-}

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

@@ -1,29 +0,0 @@
-package com.willfp.reforges.conditions.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.conditions.Condition
-import com.willfp.reforges.reforges.util.ReforgeLookup
-import org.bukkit.entity.Player
-import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
-import org.bukkit.event.player.PlayerMoveEvent
-
-class ConditionInWater: Condition("in_water") {
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: PlayerMoveEvent) {
-        val player = event.player
-
-        if (event.from.world?.getBlockAt(event.from)?.type == event.to.world?.getBlockAt(event.to)?.type) {
-            return
-        }
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    override fun isConditionMet(player: Player, config: JSONConfig): Boolean {
-        return player.isInWater
-    }
-}

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

@@ -1,29 +0,0 @@
-package com.willfp.reforges.conditions.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.conditions.Condition
-import com.willfp.reforges.reforges.util.ReforgeLookup
-import org.bukkit.entity.Player
-import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
-import org.bukkit.event.player.PlayerMoveEvent
-
-class ConditionInWorld: Condition("in_world") {
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: PlayerMoveEvent) {
-        val player = event.player
-
-        if (event.from.world == event.to.world) {
-            return
-        }
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    override fun isConditionMet(player: Player, config: JSONConfig): Boolean {
-        return player.world.name.equals(config.getString("world"), ignoreCase = true)
-    }
-}

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

@@ -1,25 +0,0 @@
-package com.willfp.reforges.conditions.conditions
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.conditions.Condition
-import com.willfp.reforges.reforges.util.ReforgeLookup
-import org.bukkit.entity.Player
-import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
-import org.bukkit.event.player.PlayerToggleSneakEvent
-
-class ConditionIsSneaking: Condition("is_sneaking") {
-    @EventHandler(
-        priority = EventPriority.MONITOR,
-        ignoreCancelled = true
-    )
-    fun handle(event: PlayerToggleSneakEvent) {
-        val player = event.player
-
-        ReforgeLookup.updateReforges(player)
-    }
-
-    override fun isConditionMet(player: Player, config: JSONConfig): Boolean {
-        return player.isSprinting
-    }
-}

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

@@ -0,0 +1,7 @@
+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/config/TargetYml.kt

@@ -0,0 +1,43 @@
+package com.willfp.reforges.config
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.config.ConfigType
+import com.willfp.eco.core.config.StaticBaseConfig
+import com.willfp.eco.core.items.Items
+import com.willfp.eco.core.items.TestableItem
+import com.willfp.reforges.reforges.ReforgeTarget
+import java.util.*
+import java.util.function.Consumer
+
+class TargetYml(plugin: EcoPlugin) : StaticBaseConfig("target", plugin, ConfigType.YAML) {
+    /**
+     * Get all target names.
+     *
+     * @return Set of all names.
+     */
+    val targets: List<String>
+        get() = getKeys(false)
+
+    /**
+     * Get all materials from a target name.
+     *
+     * @param target The name of the target.
+     * @return All materials.
+     */
+    fun getTargetItems(target: String): Set<TestableItem> {
+        val items: MutableSet<TestableItem> = HashSet()
+        this.getStrings("$target.items")
+            .forEach(Consumer { s: String -> items.add(Items.lookup(s.uppercase(Locale.getDefault()))) })
+        return items
+    }
+
+    /**
+     * Get all materials from a target name.
+     *
+     * @param target The name of the target.
+     * @return All materials.
+     */
+    fun getSlot(target: String): ReforgeTarget.Slot {
+        return ReforgeTarget.Slot.valueOf(this.getString("$target.slot").uppercase(Locale.getDefault()))
+    }
+}

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

@@ -1,62 +1,58 @@
 package com.willfp.reforges.display
 
-import com.willfp.eco.core.Prerequisite
 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.fast.FastItemStack
+import com.willfp.eco.core.fast.fast
 import com.willfp.eco.util.SkullUtils
 import com.willfp.eco.util.StringUtils
+import com.willfp.eco.util.toJSON
 import com.willfp.reforges.ReforgesPlugin
-import com.willfp.reforges.reforges.meta.ReforgeTarget
+import com.willfp.reforges.reforges.ReforgeTargets
-import com.willfp.reforges.reforges.util.ReforgeUtils
+import com.willfp.reforges.util.reforge
-import net.kyori.adventure.text.Component
+import com.willfp.reforges.util.reforgeStone
-import net.kyori.adventure.text.TextReplacementConfig
+import org.bukkit.entity.Player
-import net.kyori.adventure.text.format.TextDecoration
-import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer
-import org.bukkit.Material
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.SkullMeta
 import org.bukkit.persistence.PersistentDataType
 
 @Suppress("DEPRECATION")
-class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin, DisplayPriority.HIGHEST) {
+class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin, DisplayPriority.HIGH) {
-    /**
+    private val tempKey = plugin.namespacedKeyFactory.create("temp")
-     * Deprecated
-     */
-    @Deprecated("Use PDC components!")
-    private val replacement = TextReplacementConfig.builder()
-        .match("§w(.+)§w")
-        .replacement("")
-        .build()
-
-    private val originalComponentKey = plugin.namespacedKeyFactory.create("real_name")
-    private val serializer = GsonComponentSerializer.gson()
 
     override fun display(
         itemStack: ItemStack,
+        player: Player?,
         vararg args: Any
     ) {
-        val target = ReforgeTarget.getForItem(itemStack)
+        val targets = ReforgeTargets.getForItem(itemStack)
 
-        if (target == null && itemStack.type != Material.PLAYER_HEAD) {
+        val fast = itemStack.fast()
+
+        val stone = fast.persistentDataContainer.reforgeStone
+
+        if (targets.isEmpty() && stone == null) {
             return
         }
 
-        val meta = itemStack.itemMeta ?: return
-
         val fastItemStack = FastItemStack.wrap(itemStack)
 
         val lore = fastItemStack.lore
 
-        val reforge = ReforgeUtils.getReforge(meta)
+        val reforge = fast.persistentDataContainer.reforge
 
-        val stone = ReforgeUtils.getReforgeStone(meta)
+        if (reforge == null && stone == null) {
-
-        if (reforge == null && stone == null && target != null) {
             if (plugin.configYml.getBool("reforge.show-reforgable")) {
+                if (player != null && plugin.configYml.getBool("reforge.no-reforgable-in-gui")) {
+                    val inventory = player.openInventory.topInventory
+                    if (inventory.contents.contains(itemStack) && inventory.holder == null) {
+                        return
+                    }
+                }
+
                 val addLore: MutableList<String> = ArrayList()
-                for (string in plugin.configYml.getStrings("reforge.reforgable-suffix")) {
+                for (string in plugin.configYml.getFormattedStrings("reforge.reforgable-suffix")) {
                     addLore.add(Display.PREFIX + string)
                 }
                 lore.addAll(addLore)
@@ -64,56 +60,87 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
         }
 
         if (stone != null) {
-            meta.setDisplayName(plugin.configYml.getString("reforge.stone.name").replace("%reforge%", stone.name))
+            val meta = itemStack.itemMeta
-            if (stone.config.has("stone.texture") && stone.config.getString("stone.texture").isNotEmpty()) {
+            meta.setDisplayName(stone.config.getFormattedString("stone.name"))
-                SkullUtils.setSkullTexture(
+            val stoneMeta = stone.stone.itemMeta
-                    meta as SkullMeta,
+            if (stoneMeta is SkullMeta) {
-                    stone.config.getString("stone.texture")
+                val stoneTexture = SkullUtils.getSkullTexture(stoneMeta)
-                )
+
+                if (stoneTexture != null) {
+                    try {
+                        SkullUtils.setSkullTexture(meta as SkullMeta, stoneTexture)
+                    } catch (e: StringIndexOutOfBoundsException) {
+                        // Do nothing
+                    }
+                }
             }
             itemStack.itemMeta = meta
-            val stoneLore = plugin.configYml.getStrings("reforge.stone.lore").map {
+            val stoneLore = stone.config.getFormattedStrings("stone.lore").map {
-                "${Display.PREFIX}${it.replace("%reforge%", stone.name)}"
+                "${Display.PREFIX}$it"
             }.toList()
             lore.addAll(0, stoneLore)
         }
+
         if (reforge != null) {
             if (plugin.configYml.getBool("reforge.display-in-lore")) {
                 val addLore: MutableList<String> = ArrayList()
-                addLore.add(" ")
+                for (string in plugin.configYml.getFormattedStrings("reforge.reforged-prefix")) {
-                addLore.add(reforge.name)
+                    addLore.add(Display.PREFIX + string.replace("%reforge%", reforge.name))
+                }
                 addLore.addAll(reforge.description)
                 addLore.replaceAll { "${Display.PREFIX}$it" }
                 lore.addAll(addLore)
             }
-            if (plugin.configYml.getBool("reforge.display-in-name") && Prerequisite.HAS_PAPER.isMet) {
+            if (plugin.configYml.getBool("reforge.display-in-name")) {
-                val displayName = (meta.displayName() ?: Component.translatable(itemStack)).replaceText(replacement)
+                val displayName = fastItemStack.displayNameComponent
-                meta.persistentDataContainer.set(
+
-                    originalComponentKey,
+                if (!fastItemStack.displayName.contains(reforge.name)) {
+                    fastItemStack.persistentDataContainer.set(
+                        tempKey,
                         PersistentDataType.STRING,
-                    serializer.serialize(displayName)
+                        displayName.toJSON()
                     )
-                val newName = StringUtils.toComponent("${reforge.name} ")
+
-                    .decoration(TextDecoration.ITALIC, false).append(displayName)
+                    val newName = reforge.namePrefixComponent.append(displayName)
-                meta.displayName(newName)
+
+                    fastItemStack.setDisplayName(newName)
                 }
             }
-        itemStack.itemMeta = meta
+
+
+            if (player != null) {
+                val lines = reforge.getNotMetLines(player).map { Display.PREFIX + it }
+
+                if (lines.isNotEmpty()) {
+                    lore.add(Display.PREFIX)
+                    lore.addAll(lines)
+                }
+            }
+        }
+
         fastItemStack.lore = lore
     }
 
     override fun revert(itemStack: ItemStack) {
-        ReforgeTarget.getForItem(itemStack) ?: return
+        itemStack.reforge ?: return
 
-        val meta = itemStack.itemMeta ?: return
+        val fis = FastItemStack.wrap(itemStack)
 
-        if (plugin.configYml.getBool("reforge.display-in-name") && Prerequisite.HAS_PAPER.isMet) {
+        if (!plugin.configYml.getBool("reforge.display-in-name")) {
-            val originalName =
+            return
-                meta.persistentDataContainer.get(originalComponentKey, PersistentDataType.STRING) ?: return
-            meta.persistentDataContainer.remove(originalComponentKey)
-            meta.displayName(serializer.deserialize(originalName).replaceText(replacement))
         }
 
-        itemStack.itemMeta = meta
+        if (fis.persistentDataContainer.has(tempKey, PersistentDataType.STRING)) {
+            fis.setDisplayName(
+                StringUtils.jsonToComponent(
+                    fis.persistentDataContainer.get(
+                        tempKey,
+                        PersistentDataType.STRING
+                    )
+                )
+            )
+
+            fis.persistentDataContainer.remove(tempKey)
+        }
     }
 }

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

@@ -1,5 +0,0 @@
-package com.willfp.reforges.effects
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-
-data class ConfiguredEffect(val effect: Effect, val config: JSONConfig)

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

@@ -1,29 +0,0 @@
-@file:JvmName("PlayerEffectStack")
-
-package com.willfp.reforges.effects
-
-import org.bukkit.entity.Player
-import java.util.*
-
-private val effectStack = mutableMapOf<UUID, MutableMap<Effect, Int>>()
-
-fun Player.pushEffect(effect: Effect) {
-    val stack = effectStack[this.uniqueId] ?: mutableMapOf()
-    var amount = stack[effect] ?: 0
-    amount++
-    stack[effect] = amount
-    effectStack[this.uniqueId] = stack
-}
-
-fun Player.popEffect(effect: Effect) {
-    val stack = effectStack[this.uniqueId] ?: mutableMapOf()
-    var amount = stack[effect] ?: 0
-    amount--
-    stack[effect] = if (amount < 0) 0 else amount
-    effectStack[this.uniqueId] = stack
-}
-
-fun Player.getEffectAmount(effect: Effect): Int {
-    val stack = effectStack[this.uniqueId] ?: mutableMapOf()
-    return stack[effect] ?: 0
-}

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

@@ -1,36 +0,0 @@
-package com.willfp.reforges.effects.effects
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.effects.Effect
-import com.willfp.reforges.effects.getEffectAmount
-import org.bukkit.attribute.Attribute
-import org.bukkit.attribute.AttributeModifier
-import org.bukkit.entity.Player
-
-class EffectAttackSpeedMultiplier : Effect("attack_speed_multiplier") {
-    override fun handleEnable(player: Player, config: JSONConfig) {
-        val attribute = player.getAttribute(Attribute.GENERIC_ATTACK_SPEED) ?: return
-        val uuid = this.getUUID(player.getEffectAmount(this))
-        attribute.removeModifier(AttributeModifier(uuid, this.id, 0.0, AttributeModifier.Operation.MULTIPLY_SCALAR_1))
-        attribute.addModifier(
-            AttributeModifier(
-                uuid,
-                this.id,
-                config.getDouble("multiplier") - 1,
-                AttributeModifier.Operation.MULTIPLY_SCALAR_1
-            )
-        )
-    }
-
-    override fun handleDisable(player: Player) {
-        val attribute = player.getAttribute(Attribute.GENERIC_ATTACK_SPEED) ?: return
-        attribute.removeModifier(
-            AttributeModifier(
-                this.getUUID(player.getEffectAmount(this)),
-                this.id,
-                0.0,
-                AttributeModifier.Operation.MULTIPLY_SCALAR_1
-            )
-        )
-    }
-}

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

@@ -1,21 +0,0 @@
-package com.willfp.reforges.effects.effects
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.effects.Effect
-import org.bukkit.entity.LivingEntity
-import org.bukkit.entity.Player
-import org.bukkit.event.entity.EntityDamageByEntityEvent
-
-class EffectCritMultiplier : Effect("crit_multiplier") {
-    override fun onAnyDamage(
-        attacker: Player,
-        victim: LivingEntity,
-        event: EntityDamageByEntityEvent,
-        config: JSONConfig
-    ) {
-        if (attacker.velocity.y >= 0) {
-            return
-        }
-        event.damage *= config.getDouble("multiplier")
-    }
-}

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

@@ -1,18 +0,0 @@
-package com.willfp.reforges.effects.effects
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.effects.Effect
-import org.bukkit.entity.LivingEntity
-import org.bukkit.entity.Player
-import org.bukkit.event.entity.EntityDamageByEntityEvent
-
-class EffectDamageMultiplier : Effect("damage_multiplier") {
-    override fun onAnyDamage(
-        attacker: Player,
-        victim: LivingEntity,
-        event: EntityDamageByEntityEvent,
-        config: JSONConfig
-    ) {
-        event.damage *= config.getDouble("multiplier")
-    }
-}

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

@@ -1,30 +0,0 @@
-package com.willfp.reforges.effects.effects
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.eco.util.NumberUtils
-import com.willfp.reforges.effects.Effect
-import org.bukkit.event.player.PlayerItemDamageEvent
-import kotlin.math.ceil
-
-class EffectDurabilityMultiplier : Effect("durability_multiplier") {
-    override fun onDurabilityDamage(
-        event: PlayerItemDamageEvent,
-        config: JSONConfig
-    ) {
-        val multiplier = config.getDouble("multiplier")
-        if (multiplier == 0.0) {
-            event.isCancelled = true
-            return
-        }
-
-        if (multiplier < 1) {
-            event.damage *= ceil(1 / multiplier).toInt()
-            return
-        }
-
-        val chance = 1 - (1 / multiplier)
-        if (NumberUtils.randFloat(0.0, 1.0) < chance) {
-            event.isCancelled = true
-        }
-    }
-}

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

@@ -1,16 +0,0 @@
-package com.willfp.reforges.effects.effects
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.effects.Effect
-import org.bukkit.entity.Player
-import org.bukkit.event.entity.EntityDamageEvent
-
-class EffectIncomingDamageMultiplier : Effect("incoming_damage_multiplier") {
-    override fun onDamageWearingArmor(
-        victim: Player,
-        event: EntityDamageEvent,
-        config: JSONConfig
-    ) {
-        event.damage *= config.getDouble("multiplier")
-    }
-}

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

@@ -1,39 +0,0 @@
-package com.willfp.reforges.effects.effects
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.effects.Effect
-import com.willfp.reforges.effects.getEffectAmount
-import org.bukkit.attribute.Attribute
-import org.bukkit.attribute.AttributeModifier
-import org.bukkit.entity.Player
-
-class EffectKnockbackMultiplier : Effect("knockback_multiplier") {
-    override fun handleEnable(
-        player: Player,
-        config: JSONConfig
-    ) {
-        val attribute = player.getAttribute(Attribute.GENERIC_ATTACK_KNOCKBACK) ?: return
-        val uuid = this.getUUID(player.getEffectAmount(this))
-        attribute.removeModifier(AttributeModifier(uuid, this.id, 0.0, AttributeModifier.Operation.MULTIPLY_SCALAR_1))
-        attribute.addModifier(
-            AttributeModifier(
-                uuid,
-                this.id,
-                config.getDouble("multiplier") - 1,
-                AttributeModifier.Operation.MULTIPLY_SCALAR_1
-            )
-        )
-    }
-
-    override fun handleDisable(player: Player) {
-        val attribute = player.getAttribute(Attribute.GENERIC_ATTACK_KNOCKBACK) ?: return
-        attribute.removeModifier(
-            AttributeModifier(
-                this.getUUID(player.getEffectAmount(this)),
-                this.id,
-                0.0,
-                AttributeModifier.Operation.MULTIPLY_SCALAR_1
-            )
-        )
-    }
-}

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

@@ -1,39 +0,0 @@
-package com.willfp.reforges.effects.effects
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.effects.Effect
-import com.willfp.reforges.effects.getEffectAmount
-import org.bukkit.attribute.Attribute
-import org.bukkit.attribute.AttributeModifier
-import org.bukkit.entity.Player
-
-class EffectMovementSpeedMultiplier : Effect("movement_speed_multiplier") {
-    override fun handleEnable(
-        player: Player,
-        config: JSONConfig
-    ) {
-        val attribute = player.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED) ?: return
-        val uuid = this.getUUID(player.getEffectAmount(this))
-        attribute.removeModifier(AttributeModifier(uuid, this.id, 0.0, AttributeModifier.Operation.MULTIPLY_SCALAR_1))
-        attribute.addModifier(
-            AttributeModifier(
-                uuid,
-                this.id,
-                config.getDouble("multiplier") - 1,
-                AttributeModifier.Operation.MULTIPLY_SCALAR_1
-            )
-        )
-    }
-
-    override fun handleDisable(player: Player) {
-        val attribute = player.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED) ?: return
-        attribute.removeModifier(
-            AttributeModifier(
-                this.getUUID(player.getEffectAmount(this)),
-                this.id,
-                0.0,
-                AttributeModifier.Operation.MULTIPLY_SCALAR_1
-            )
-        )
-    }
-}

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

@@ -1,21 +0,0 @@
-package com.willfp.reforges.effects.effects
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.effects.Effect
-import com.willfp.reforges.vault.EconomyHandler
-import org.bukkit.block.Block
-import org.bukkit.entity.Player
-import org.bukkit.event.block.BlockBreakEvent
-
-class EffectRewardBlockBreak : Effect("reward_block_break") {
-    override fun onBlockBreak(
-        player: Player,
-        block: Block,
-        event: BlockBreakEvent,
-        config: JSONConfig
-    ) {
-        if (EconomyHandler.isEnabled()) {
-            EconomyHandler.getInstance().depositPlayer(player, config.getDouble("amount"))
-        }
-    }
-}

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

@@ -1,19 +0,0 @@
-package com.willfp.reforges.effects.effects
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.eco.core.events.EntityDeathByEntityEvent
-import com.willfp.reforges.effects.Effect
-import com.willfp.reforges.vault.EconomyHandler
-import org.bukkit.entity.LivingEntity
-import org.bukkit.entity.Player
-
-class EffectRewardKill : Effect("reward_kill") {
-    override fun onKill(killer: Player,
-                        victim: LivingEntity,
-                        event: EntityDeathByEntityEvent,
-                        config: JSONConfig) {
-        if (EconomyHandler.isEnabled()) {
-            EconomyHandler.getInstance().depositPlayer(killer, config.getDouble("amount"))
-        }
-    }
-}

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

@@ -3,48 +3,85 @@ package com.willfp.reforges.gui
 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.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.MaskMaterials
+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.util.NumberUtils
-import com.willfp.reforges.ReforgesPlugin
+import com.willfp.reforges.reforges.PriceMultipliers
-import com.willfp.reforges.reforges.util.ReforgeHandler
+import com.willfp.reforges.reforges.Reforge
-import com.willfp.reforges.reforges.util.ReforgeStatus
+import com.willfp.reforges.reforges.ReforgeTarget
-import com.willfp.reforges.reforges.util.ReforgeUtils
+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
+import com.willfp.reforges.util.reforgeStone
+import com.willfp.reforges.util.timesReforged
 import org.bukkit.Material
+import org.bukkit.Sound
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
+import java.util.*
 import kotlin.math.pow
 
 @Suppress("DEPRECATION")
 object ReforgeGUI {
-    @JvmStatic
+    private lateinit var menu: Menu
-    lateinit var menu: Menu
 
-    init {
+    private fun Menu.getReforgeStatus(player: Player): MetadatedReforgeStatus {
-        update(ReforgesPlugin.getInstance())
+        val captive = this.getCaptiveItems(player)
+        val item = captive.getOrNull(0)
+        val stone = captive.getOrNull(1)
+
+        val targets = mutableListOf<ReforgeTarget>()
+
+        var cost = 0.0
+        val status = if (item == null || item.type == Material.AIR) {
+            ReforgeStatus.NO_ITEM
+        } else {
+            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) {
+        menu.open(player)
     }
 
     @JvmStatic
     @ConfigUpdater
     fun update(plugin: EcoPlugin) {
-        val handler = ReforgeHandler(plugin)
+        val activatorSlot = slot(ItemStack(Material.ANVIL)) {
+            setUpdater { player, menu, _ ->
+                val (status, specialCost) = menu.getReforgeStatus(player)
 
-        val activatorSlot = Slot.builder(
+                val cost = when {
-            ItemStack(Material.ANVIL)
-        ).apply {
-            setModifier { player, menu, previous ->
-                val meta = previous.itemMeta ?: return@setModifier
-
-                val (status, specialCost) = ReforgeUtils.getStatus(menu.getCaptiveItems(player))
-
-                val cost: Double = when {
                     status == ReforgeStatus.ALLOW || (status == ReforgeStatus.ALLOW_STONE && specialCost < 0) -> {
-                        val amountOfReforges = ReforgeUtils.getReforges(menu.getCaptiveItems(player)[0])
+                        val amountOfReforges = menu.getCaptiveItems(player)[0].timesReforged
+
                         plugin.configYml.getDouble("reforge.cost") *
-                                plugin.configYml.getDouble("reforge.cost-exponent").pow(amountOfReforges)
+                                plugin.configYml.getDouble("reforge.cost-exponent").pow(amountOfReforges) *
+                                PriceMultipliers.getForPlayer(player).multiplier
                     }
                     status == ReforgeStatus.ALLOW_STONE -> {
                         specialCost
@@ -55,136 +92,209 @@ object ReforgeGUI {
                 var xpCost = plugin.configYml.getInt("reforge.xp-cost")
                 if (status == ReforgeStatus.ALLOW) {
                     val item = menu.getCaptiveItems(player)[0]
-                    val reforges = ReforgeUtils.getReforges(item)
+                    val reforges = item.timesReforged
+                    xpCost *= PriceMultipliers.getForPlayer(player).multiplier.toInt()
                     xpCost *= plugin.configYml.getDouble("reforge.cost-exponent").pow(reforges.toDouble()).toInt()
                 }
 
-                when (status) {
+                val configKey = status.configKey
-                    ReforgeStatus.INVALID_ITEM -> {
+
-                        previous.type = Material.getMaterial(
+                Items.lookup(plugin.configYml.getString("gui.$configKey.material")).item.apply {
-                            plugin.configYml.getString("gui.invalid-item.material").uppercase()
+                    this.fast().displayName = plugin.configYml.getFormattedString("gui.$configKey.name")
-                        )!!
+                    this.fast().lore = plugin.configYml.getFormattedStrings("gui.$configKey.lore").map {
-                        meta.setDisplayName(plugin.configYml.getString("gui.invalid-item.name"))
-                        meta.lore = plugin.configYml.getStrings("gui.invalid-item.lore").map {
-                            it.replace("%cost%", NumberUtils.format(cost))
-                                .replace("%xpcost%", NumberUtils.format(xpCost.toDouble()))
-                        }
-                    }
-                    ReforgeStatus.ALLOW -> {
-                        previous.type = Material.getMaterial(
-                            plugin.configYml.getString("gui.allow.material").uppercase()
-                        )!!
-                        meta.setDisplayName(plugin.configYml.getString("gui.allow.name"))
-                        meta.lore = plugin.configYml.getStrings("gui.allow.lore").map {
-                            it.replace("%cost%", NumberUtils.format(cost))
-                                .replace("%xpcost%", NumberUtils.format(xpCost.toDouble()))
-                        }
-                    }
-                    ReforgeStatus.ALLOW_STONE -> {
-                        previous.type = Material.getMaterial(
-                            plugin.configYml.getString("gui.allow-stone.material").uppercase()
-                        )!!
-                        meta.setDisplayName(plugin.configYml.getString("gui.allow-stone.name"))
-                        meta.lore = plugin.configYml.getStrings("gui.allow-stone.lore").map {
-                            it.replace("%cost%", NumberUtils.format(cost))
-                                .replace("%xpcost%", NumberUtils.format(xpCost.toDouble()))
-                                .replace("%stone%", ReforgeUtils.getReforgeStone(menu.getCaptiveItems(player)[1]).name)
-                        }
-                    }
-                    ReforgeStatus.NO_ITEM -> {
-                        previous.type = Material.getMaterial(
-                            plugin.configYml.getString("gui.no-item.material").uppercase()
-                        )!!
-                        meta.setDisplayName(plugin.configYml.getString("gui.no-item.name"))
-                        meta.lore = plugin.configYml.getStrings("gui.no-item.lore").map {
                         it.replace("%cost%", NumberUtils.format(cost))
                             .replace("%xpcost%", NumberUtils.format(xpCost.toDouble()))
+                            .replace(
+                                "%stone%",
+                                menu.getCaptiveItems(player).getOrNull(1).reforgeStone?.name ?: ""
+                            )
                     }
                 }
             }
 
-                previous.itemMeta = meta
+            onLeftClick { event, _, menu ->
+                val player = event.whoClicked as Player
+                val captive = menu.getCaptiveItems(player)
+
+                val item = captive.getOrNull(0) ?: return@onLeftClick
+                val currentReforge = item.reforge
+
+                val targets = ReforgeTargets.getForItem(item)
+
+
+                var usedStone = false
+
+                val stoneInMenu = menu.getCaptiveItems(player).getOrNull(1).reforgeStone
+
+                val reforge = if (stoneInMenu != null && stoneInMenu.canBeAppliedTo(item)) {
+                    usedStone = true
+                    stoneInMenu
+                } else {
+                    val disallowed = mutableListOf<Reforge>()
+                    if (currentReforge != null) {
+                        disallowed.add(currentReforge)
                     }
-            onLeftClick(handler::handleReforgeClick)
-        }.build()
 
-        val maskPattern = plugin.configYml.getStrings("gui.mask.pattern", false).toTypedArray()
+                    targets.getRandomReforge(disallowed = disallowed)
+                }
 
-        val maskMaterials = plugin.configYml.getStrings("gui.mask.materials", false)
+                if (reforge == null) {
-            .mapNotNull { Material.getMaterial(it.uppercase()) }
+                    return@onLeftClick
+                }
+
+                var cost = 0.0
+
+                val reforges = item.timesReforged
+
+                if (EconomyManager.hasRegistrations()) {
+                    cost = plugin.configYml.getDouble("reforge.cost")
+                    cost *= plugin.configYml.getDouble("reforge.cost-exponent").pow(reforges.toDouble())
+                    if (reforge.requiresStone && reforge.stonePrice != -1) {
+                        cost = reforge.stonePrice.toDouble()
+                    }
+                    cost *= PriceMultipliers.getForPlayer(player).multiplier
+                    if (!EconomyManager.hasAmount(player, cost)) {
+                        player.sendMessage(plugin.langYml.getMessage("insufficient-money"))
+                        if (plugin.configYml.getBool("gui.insufficient-money-sound.enabled")) {
+                            player.playSound(
+                                player.location,
+                                Sound.valueOf(
+                                    plugin.configYml.getString("gui.insufficient-money-sound.id")
+                                        .uppercase(Locale.getDefault())
+                                ),
+                                1f, plugin.configYml.getDouble("gui.insufficient-money-sound.pitch").toFloat()
+                            )
+                        }
+                        return@onLeftClick
+                    }
+                }
+
+                var xpCost = plugin.configYml.getInt("reforge.xp-cost")
+
+                xpCost *= plugin.configYml.getDouble("reforge.cost-exponent").pow(reforges.toDouble()).toInt()
+                xpCost *= PriceMultipliers.getForPlayer(player).multiplier.toInt()
+                if (player.level < xpCost) {
+                    player.sendMessage(plugin.langYml.getMessage("insufficient-xp"))
+                    if (plugin.configYml.getBool("gui.insufficient-money-sound.enabled")) {
+                        player.playSound(
+                            player.location,
+                            Sound.valueOf(
+                                plugin.configYml.getString("gui.insufficient-money-sound.id")
+                                    .uppercase(Locale.getDefault())
+                            ),
+                            1f, plugin.configYml.getDouble("gui.insufficient-money-sound.pitch").toFloat()
+                        )
+                    }
+                    return@onLeftClick
+                }
+                if (EconomyManager.hasRegistrations()) {
+                    EconomyManager.removeMoney(player, cost)
+                }
+                player.level = player.level - xpCost
+
+                player.sendMessage(plugin.langYml.getMessage("applied-reforge").replace("%reforge%", reforge.name))
+
+                item.timesReforged++
+                item.reforge = reforge
+
+                if (usedStone) {
+                    val stone = menu.getCaptiveItems(player)[1]
+                    stone.itemMeta = null
+                    stone.amount = 0
+                    if (plugin.configYml.getBool("gui.stone-sound.enabled")) {
+                        player.playSound(
+                            player.location,
+                            Sound.valueOf(
+                                plugin.configYml.getString("gui.stone-sound.id").uppercase(Locale.getDefault())
+                            ),
+                            1f, plugin.configYml.getDouble("gui.stone-sound.pitch").toFloat()
+                        )
+                    }
+                }
+
+                if (plugin.configYml.getBool("gui.sound.enabled")) {
+                    player.playSound(
+                        player.location,
+                        Sound.valueOf(plugin.configYml.getString("gui.sound.id").uppercase(Locale.getDefault())),
+                        1f, plugin.configYml.getDouble("gui.sound.pitch").toFloat()
+                    )
+                }
+            }
+        }
+
+        val maskPattern = plugin.configYml.getStrings("gui.mask.pattern").toTypedArray()
+
+        val maskItems = plugin.configYml.getStrings("gui.mask.materials")
+            .mapNotNull { Items.lookup(it) }
             .toTypedArray()
 
-        val allowMaterial =
+        menu = menu(plugin.configYml.getInt("gui.rows")) {
-            Material.getMaterial(plugin.configYml.getString("gui.show-allowed.allow-material", false).uppercase())!!
+            setTitle(plugin.langYml.getFormattedString("menu.title"))
-        val denyMaterial =
+            setMask(FillerMask(MaskItems(*maskItems), *maskPattern))
-            Material.getMaterial(plugin.configYml.getString("gui.show-allowed.deny-material", false).uppercase())!!
-        val closeMaterial =
-            Material.getMaterial(plugin.configYml.getString("gui.close.material", false).toUpperCase())!!
 
-        menu = Menu.builder(plugin.configYml.getInt("gui.rows")).apply {
+            val slot = slot(
-            setTitle(plugin.langYml.getString("menu.title"))
-            setMask(FillerMask(MaskMaterials(*maskMaterials), *maskPattern))
-            modfiy { builder ->
-                val slot = Slot.builder(
                 ItemStackBuilder(Material.BLACK_STAINED_GLASS_PANE)
                     .setDisplayName("&r")
                     .build()
-                ).apply {
+            ) {
-                    setModifier { player, menu, previous ->
+                setUpdater { player, menu, _ ->
-                        val status = ReforgeUtils.getStatus(
+                    val status = menu.getReforgeStatus(player).status
-                            menu.getCaptiveItems(player)
-                        ).status
 
                     if (status == ReforgeStatus.ALLOW || status == ReforgeStatus.ALLOW_STONE) {
-                            previous.type = allowMaterial
+                        Items.lookup(plugin.configYml.getString("gui.show-allowed.allow-material")).item
                     } else {
-                            previous.type = denyMaterial
+                        Items.lookup(plugin.configYml.getString("gui.show-allowed.deny-material")).item
+                    }
                 }
             }
-                }.build()
 
             val allowedPattern = plugin.configYml.getStrings("gui.show-allowed.pattern")
             for (i in 1..allowedPattern.size) {
                 val row = allowedPattern[i - 1]
                 for (j in 1..9) {
                     if (row[j - 1] != '0') {
-                            builder.setSlot(i, j, slot)
+                        setSlot(i, j, slot)
-                        }
                     }
                 }
             }
+
             setSlot(
                 plugin.configYml.getInt("gui.item-slot.row"),
                 plugin.configYml.getInt("gui.item-slot.column"),
                 Slot.builder().setCaptive().build()
             )
+
             setSlot(
                 plugin.configYml.getInt("gui.stone-slot.row"),
                 plugin.configYml.getInt("gui.stone-slot.column"),
                 Slot.builder().setCaptive().build()
             )
+
             setSlot(
                 plugin.configYml.getInt("gui.activator-slot.row"),
                 plugin.configYml.getInt("gui.activator-slot.column"),
                 activatorSlot
             )
+
             setSlot(
                 plugin.configYml.getInt("gui.close.location.row"),
                 plugin.configYml.getInt("gui.close.location.column"),
-                Slot.builder(
+                slot(
-                    ItemStackBuilder(closeMaterial)
+                    ItemStackBuilder(Items.lookup(plugin.configYml.getString("gui.close.material")))
-                        .setDisplayName(plugin.langYml.getString("menu.close"))
+                        .setDisplayName(plugin.langYml.getFormattedString("menu.close"))
                         .build()
-                ).onLeftClick { event, _, _ ->
+                ) {
-                    event.whoClicked.closeInventory()
+                    onLeftClick { event, _, _ -> event.whoClicked.closeInventory() }
-                }.build()
+                }
             )
+
             onClose { event, menu ->
                 DropQueue(event.player as Player)
                     .addItems(menu.getCaptiveItems(event.player as Player))
                     .setLocation(event.player.eyeLocation)
+                    .forceTelekinesis()
                     .push()
             }
-        }.build()
+        }
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/aureliumskills/AureliumSkillsIntegration.kt

@@ -1,17 +0,0 @@
-package com.willfp.reforges.integrations.aureliumskills
-
-import com.willfp.eco.core.integrations.Integration
-import com.willfp.reforges.effects.Effect
-
-object AureliumSkillsIntegration : Integration {
-    private lateinit var ADD_STAT: Effect
-
-    @JvmStatic
-    fun load() {
-        ADD_STAT = EffectAddStat()
-    }
-
-    override fun getPluginName(): String {
-        return "AureliumSkills"
-    }
-}

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/aureliumskills/EffectAddStat.kt

@@ -1,29 +0,0 @@
-package com.willfp.reforges.integrations.aureliumskills
-
-import com.archyx.aureliumskills.api.AureliumAPI
-import com.archyx.aureliumskills.stats.Stats
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.reforges.effects.Effect
-import com.willfp.reforges.effects.getEffectAmount
-import org.bukkit.entity.Player
-
-class EffectAddStat : Effect("add_stat") {
-    override fun handleEnable(
-        player: Player,
-        config: JSONConfig
-    ) {
-        AureliumAPI.addStatModifier(
-            player,
-            this.getNamespacedKey(player.getEffectAmount(this)).key,
-            Stats.valueOf(config.getString("stat", false)),
-            config.getDouble("amount")
-        )
-    }
-
-    override fun handleDisable(player: Player) {
-        AureliumAPI.removeStatModifier(
-            player,
-            this.getNamespacedKey(player.getEffectAmount(this)).key,
-        )
-    }
-}

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ecoskills/EcoSkillsIntegration.kt

@@ -1,17 +0,0 @@
-package com.willfp.reforges.integrations.ecoskills
-
-import com.willfp.eco.core.integrations.Integration
-import com.willfp.reforges.effects.Effect
-
-object EcoSkillsIntegration : Integration {
-    private lateinit var ADD_STAT: Effect
-
-    @JvmStatic
-    fun load() {
-        ADD_STAT = EffectAddStat()
-    }
-
-    override fun getPluginName(): String {
-        return "EcoSkills"
-    }
-}

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ecoskills/EffectAddStat.kt

@@ -1,39 +0,0 @@
-package com.willfp.reforges.integrations.ecoskills
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.ecoskills.api.EcoSkillsAPI
-import com.willfp.ecoskills.api.modifier.PlayerStatModifier
-import com.willfp.ecoskills.stats.Stats
-import com.willfp.reforges.effects.Effect
-import com.willfp.reforges.effects.getEffectAmount
-import org.bukkit.Bukkit
-import org.bukkit.entity.Player
-
-class EffectAddStat : Effect("add_stat") {
-    private val api = EcoSkillsAPI.getInstance()
-
-    override fun handleEnable(
-        player: Player,
-        config: JSONConfig
-    ) {
-        api.addStatModifier(
-            player,
-            PlayerStatModifier(
-                this.getNamespacedKey(player.getEffectAmount(this)),
-                Stats.getByID(config.getString("stat", false)) ?: Stats.WISDOM,
-                config.getInt("amount")
-            )
-        )
-    }
-
-    override fun handleDisable(player: Player) {
-        api.removeStatModifier(
-            player,
-            PlayerStatModifier(
-                this.getNamespacedKey(player.getEffectAmount(this)),
-                Stats.STRENGTH,
-                0
-            )
-        )
-    }
-}

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/talismans/TalismansIntegration.kt

@@ -1,8 +1,8 @@
 package com.willfp.reforges.integrations.talismans
 
 import com.willfp.eco.core.integrations.Integration
-import com.willfp.reforges.reforges.meta.ReforgeTarget
+import com.willfp.reforges.reforges.ReforgeTarget
-import com.willfp.reforges.reforges.util.ReforgeLookup
+import com.willfp.reforges.util.ReforgeLookup
 import com.willfp.talismans.talismans.util.TalismanChecks
 import org.bukkit.inventory.ItemStack
 
@@ -10,8 +10,8 @@ object TalismansIntegration : Integration {
     @JvmStatic
     fun registerProvider() {
         ReforgeLookup.registerProvider { player ->
-            val provided = mutableMapOf<ItemStack, ReforgeTarget.Slot>()
+            val provided = mutableMapOf<ItemStack?, ReforgeTarget.Slot?>()
-            for (itemStack in TalismanChecks.getTalismanItemsOnPlayer(player, true)) {
+            for (itemStack in TalismanChecks.getTalismanItemsOnPlayer(player)) {
                 provided[itemStack] = ReforgeTarget.Slot.ANY
             }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt

@@ -1,38 +0,0 @@
-package com.willfp.reforges.integrations.ultimateskills
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.eco.util.NumberUtils
-import com.willfp.reforges.ReforgesPlugin
-import com.willfp.reforges.effects.Effect
-import mc.ultimatecore.skills.HyperSkills
-import mc.ultimatecore.skills.objects.abilities.Ability
-import org.bukkit.entity.Player
-import org.bukkit.persistence.PersistentDataType
-
-class EffectAddAbility : Effect("add_ultimateskills_ability") {
-    override fun handleEnable(
-        player: Player,
-        config: JSONConfig
-    ) {
-        HyperSkills.getInstance().api.addAbility(
-            player.uniqueId,
-            Ability.valueOf(config.getString("ability", false)),
-            config.getDouble("amount")
-        )
-        player.persistentDataContainer.set(
-            ReforgesPlugin.getInstance().namespacedKeyFactory.create("addAbility"), PersistentDataType.STRING,
-            NumberUtils.format(config.getDouble("amount")) + "::" + config.getString("ability", false)
-        )
-    }
-
-    override fun handleDisable(player: Player) {
-        player.persistentDataContainer.get(ReforgesPlugin.getInstance().namespacedKeyFactory.create("addAbility"), PersistentDataType.STRING)
-            ?.let {
-                HyperSkills.getInstance().api.removeAbility(
-                    player.uniqueId,
-                    Ability.valueOf(it.split("::")[1]),
-                    it.split("::")[0].toDouble()
-                )
-            }
-    }
-}

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt

@@ -1,37 +0,0 @@
-package com.willfp.reforges.integrations.ultimateskills
-
-import com.willfp.eco.core.config.interfaces.JSONConfig
-import com.willfp.eco.util.NumberUtils
-import com.willfp.reforges.ReforgesPlugin
-import com.willfp.reforges.effects.Effect
-import mc.ultimatecore.skills.HyperSkills
-import mc.ultimatecore.skills.objects.perks.Perk
-import org.bukkit.entity.Player
-import org.bukkit.persistence.PersistentDataType
-
-class EffectAddPerk : Effect("add_ultimateskills_perk") {
-    override fun handleEnable(
-        player: Player,
-        config: JSONConfig
-    ) {
-        HyperSkills.getInstance().api.addPerk(
-            player.uniqueId,
-            Perk.valueOf(config.getString("perk", false)),
-            config.getDouble("amount")
-        )
-        player.persistentDataContainer.set(ReforgesPlugin.getInstance().namespacedKeyFactory.create("addPerk"), PersistentDataType.STRING,
-            NumberUtils.format(config.getDouble("amount")) + "::" + config.getString("perk", false)
-        )
-    }
-
-    override fun handleDisable(player: Player) {
-        player.persistentDataContainer.get(ReforgesPlugin.getInstance().namespacedKeyFactory.create("addPerk"), PersistentDataType.STRING)
-            ?.let {
-                HyperSkills.getInstance().api.removePerk(
-                    player.uniqueId,
-                    Perk.valueOf(it.split("::")[1]),
-                    it.split("::")[0].toDouble()
-                )
-            }
-    }
-}

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/UltimateSkillsIntegration.kt

@@ -1,19 +0,0 @@
-package com.willfp.reforges.integrations.ultimateskills
-
-import com.willfp.eco.core.integrations.Integration
-import com.willfp.reforges.effects.Effect
-
-object UltimateSkillsIntegration : Integration {
-    private lateinit var ADD_PERK: Effect
-    private lateinit var ADD_ABILITY: Effect
-
-    @JvmStatic
-    fun load() {
-        ADD_PERK = EffectAddPerk()
-        ADD_ABILITY = EffectAddAbility()
-    }
-
-    override fun getPluginName(): String {
-        return "UltimateSkills"
-    }
-}

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

@@ -0,0 +1,23 @@
+package com.willfp.reforges.reforges
+
+import org.bukkit.Bukkit
+import org.bukkit.permissions.Permission
+import org.bukkit.permissions.PermissionDefault
+
+data class PriceMultiplier(
+    val permission: String,
+    val multiplier: Double,
+    val priority: Int
+) {
+    init {
+        if (Bukkit.getPluginManager().getPermission(permission) == null) {
+            Bukkit.getPluginManager().addPermission(
+                Permission(
+                    permission,
+                    "Gives a ${multiplier}x price multiplier when reforging",
+                    PermissionDefault.FALSE
+                )
+            )
+        }
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.willfp.reforges.reforges
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.config.updating.ConfigUpdater
+import org.bukkit.entity.Player
+
+@Suppress("UNUSED")
+object PriceMultipliers {
+    private val REGISTRY = mutableListOf<PriceMultiplier>()
+    private val NO_MULTIPLIER = PriceMultiplier("none", 1.0, 0)
+
+    /**
+     * Get the permission multiplier for a given player.
+     *
+     * @param player The player.
+     * @return The multiplier.
+     */
+    @JvmStatic
+    fun getForPlayer(player: Player): PriceMultiplier {
+        var current = NO_MULTIPLIER
+
+        for (multiplier in REGISTRY) {
+            if (multiplier.priority < current.priority) {
+                continue
+            }
+
+            if (!player.hasPermission(multiplier.permission)) {
+                continue
+            }
+
+            current = multiplier
+        }
+
+        return current
+    }
+
+    /**
+     * List of all registered multipliers.
+     *
+     * @return The multipliers.
+     */
+    @JvmStatic
+    fun values(): List<PriceMultiplier> {
+        return REGISTRY.toList()
+    }
+
+    @ConfigUpdater
+    @JvmStatic
+    fun update(plugin: EcoPlugin) {
+        REGISTRY.clear()
+
+        for (config in plugin.configYml.getSubsections("price-multipliers")) {
+            val multiplier = PriceMultiplier(
+                config.getString("permission"),
+                config.getDouble("multiplier"),
+                config.getInt("priority")
+            )
+            REGISTRY.add(multiplier)
+        }
+    }
+}

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

@@ -1,52 +1,51 @@
 package com.willfp.reforges.reforges
 
-import com.willfp.eco.core.config.interfaces.JSONConfig
+import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.eco.core.display.Display
 import com.willfp.eco.core.items.CustomItem
-import com.willfp.eco.core.items.builder.SkullBuilder
+import com.willfp.eco.core.items.Items
+import com.willfp.eco.core.items.builder.ItemStackBuilder
 import com.willfp.eco.core.recipe.Recipes
+import com.willfp.eco.util.StringUtils
+import com.willfp.libreforge.Holder
+import com.willfp.libreforge.conditions.Conditions
+import com.willfp.libreforge.effects.Effects
 import com.willfp.reforges.ReforgesPlugin
-import com.willfp.reforges.conditions.Conditions
+import com.willfp.reforges.util.reforgeStone
-import com.willfp.reforges.conditions.ConfiguredCondition
+import net.kyori.adventure.text.format.TextDecoration
-import com.willfp.reforges.effects.ConfiguredEffect
-import com.willfp.reforges.effects.Effects
-import com.willfp.reforges.reforges.meta.ReforgeTarget
-import com.willfp.reforges.reforges.util.ReforgeUtils
-import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 import java.util.*
 
 @Suppress("DEPRECATION")
 class Reforge(
-    internal val config: JSONConfig,
+    internal val config: Config,
-    private val plugin: ReforgesPlugin
+    plugin: ReforgesPlugin
-) {
+) : Holder {
-    val id = config.getString("id")
+    override val id = config.getString("id")
 
-    val name = config.getString("name")
+    val name = config.getFormattedString("name")
 
-    val description: List<String> = config.getStrings("description")
+    val namePrefixComponent = StringUtils.toComponent("$name ").decoration(TextDecoration.ITALIC, false)
 
-    val targets = config.getStrings("targets").map { ReforgeTarget.getByName(it) }.toSet()
+    val description: List<String> = config.getFormattedStrings("description")
 
-    val effects = config.getSubsections("effects").map {
+    val targets = config.getStrings("targets").mapNotNull { ReforgeTargets.getByName(it) }.toSet()
-        val effect = Effects.getByID(it.getString("id")) ?: return@map null
-        ConfiguredEffect(effect, it)
-    }.filterNotNull().toSet()
 
-    val conditions = config.getSubsections("conditions").map {
+    override val effects = config.getSubsections("effects").mapNotNull {
-        val condition = Conditions.getByID(it.getString("id")) ?: return@map null
+        Effects.compile(it, "Reforge ID $id")
-        ConfiguredCondition(condition, it)
+    }.toSet()
-    }.filterNotNull().toSet()
+
+    override val conditions = config.getSubsections("conditions").mapNotNull {
+        Conditions.compile(it, "Reforge ID $id")
+    }.toSet()
 
     val requiresStone = config.getBool("stone.enabled")
 
-    val stone: ItemStack = SkullBuilder().apply {
+    val stone: ItemStack = ItemStackBuilder(Items.lookup(config.getString("stone.item")).item).apply {
         if (config.getBool("stone.enabled")) {
-            setSkullTexture(config.getString("stone.texture"))
+            setDisplayName(config.getFormattedString("stone.name").replace("%reforge%", name))
-            setDisplayName(plugin.configYml.getString("reforge.stone.name").replace("%reforge%", name))
             addLoreLines(
-                plugin.configYml.getStrings("stone.lore").map { "${Display.PREFIX}${it.replace("%reforge%", name)}" })
+                config.getFormattedStrings("stone.lore").map { "${Display.PREFIX}${it.replace("%reforge%", name)}" })
         }
     }.build()
 
@@ -55,36 +54,29 @@ class Reforge(
     init {
         Reforges.addNewReforge(this)
 
-        ReforgeUtils.setReforgeStone(stone, this)
+        stone.reforgeStone = this
-
         Display.display(stone)
 
+        if (config.getBool("stone.enabled")) {
             CustomItem(
                 plugin.namespacedKeyFactory.create("stone_" + this.id),
-            { test -> ReforgeUtils.getReforgeStone(test) == this },
+                { test -> test.reforgeStone == this },
                 stone
             ).register()
 
-        if (config.getBool("stone.craftable") && config.getBool("stone.enabled")) {
+            if (config.getBool("stone.craftable")) {
                 Recipes.createAndRegisterRecipe(
                     plugin,
                     "stone_" + this.id,
                     stone,
-                config.getStrings("stone.recipe", false)
+                    config.getStrings("stone.recipe")
                 )
             }
         }
-
-    fun handleActivation(player: Player) {
-        for ((effect, config) in this.effects) {
-            effect.handleEnabling(player, config)
-        }
     }
 
-    fun handleDeactivation(player: Player) {
+    fun canBeAppliedTo(item: ItemStack?): Boolean {
-        for ((effect, _) in this.effects) {
+        return targets.any { target -> target.items.any { it.matches(item) } }
-            effect.handleDisabling(player)
-        }
     }
 
     override fun equals(other: Any?): Boolean {

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

@@ -0,0 +1,43 @@
+package com.willfp.reforges.reforges
+
+import com.willfp.eco.core.items.TestableItem
+import com.willfp.eco.core.recipe.parts.EmptyTestableItem
+import org.bukkit.inventory.ItemStack
+import java.util.*
+
+class ReforgeTarget(
+    val id: String,
+    val slot: Slot,
+    val items: MutableSet<TestableItem>
+) {
+    init {
+        items.removeIf { it is EmptyTestableItem }
+    }
+
+    fun matches(itemStack: ItemStack): Boolean {
+        for (item in items) {
+            if (item.matches(itemStack)) {
+                return true
+            }
+        }
+        return false
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (other !is ReforgeTarget) {
+            return false
+        }
+
+        return this.id == other.id
+    }
+
+    override fun hashCode(): Int {
+        return Objects.hash(this.id)
+    }
+
+    enum class Slot {
+        HANDS,
+        ARMOR,
+        ANY
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.willfp.reforges.reforges
+
+import com.google.common.collect.ImmutableSet
+import com.willfp.eco.core.config.updating.ConfigUpdater
+import com.willfp.reforges.ReforgesPlugin
+import org.bukkit.inventory.ItemStack
+
+object ReforgeTargets {
+    private val registered = mutableMapOf<String, ReforgeTarget>()
+
+    val ALL = ReforgeTarget("all", ReforgeTarget.Slot.ANY, HashSet())
+
+    init {
+        registered["all"] = ALL
+        update(ReforgesPlugin.instance)
+    }
+
+    /**
+     * Get ReforgeTarget matching name.
+     *
+     * @param name The name to search for.
+     * @return The matching ReforgeTarget, or null if not found.
+     */
+    @JvmStatic
+    fun getByName(name: String): ReforgeTarget? {
+        return registered[name]
+    }
+
+    /**
+     * Get target from item.
+     *
+     * @param item The item.
+     * @return The target.
+     */
+    @JvmStatic
+    fun getForItem(item: ItemStack): List<ReforgeTarget> {
+        return registered.values
+            .filter { !it.id.equals("all", ignoreCase = true) }
+            .filter { it.matches(item) }
+    }
+
+    /**
+     * Update all targets.
+     *
+     * @param plugin Instance of Reforges.
+     */
+    @ConfigUpdater
+    @JvmStatic
+    fun update(plugin: ReforgesPlugin) {
+        ALL.items.clear()
+        for (id in ArrayList(registered.keys)) {
+            if (id.equals("all", ignoreCase = true)) {
+                continue
+            }
+            registered.remove(id)
+        }
+        for (id in plugin.targetYml.targets) {
+            val target = ReforgeTarget(
+                id,
+                plugin.targetYml.getSlot(id),
+                plugin.targetYml.getTargetItems(id).toMutableSet()
+            )
+            registered[id] = target
+            ALL.items.addAll(target.items)
+        }
+    }
+
+    /**
+     * Get all targets.
+     *
+     * @return A set of all targets.
+     */
+    @JvmStatic
+    fun values(): Set<ReforgeTarget> {
+        return ImmutableSet.copyOf(registered.values)
+    }
+}

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

@@ -0,0 +1,86 @@
+package com.willfp.reforges.reforges
+
+import com.google.common.collect.HashBiMap
+import com.google.common.collect.ImmutableSet
+import com.willfp.eco.core.config.updating.ConfigUpdater
+import com.willfp.libreforge.chains.EffectChains
+import com.willfp.reforges.ReforgesPlugin
+
+@Suppress("UNUSED")
+object Reforges {
+    private val BY_KEY = HashBiMap.create<String, Reforge>()
+
+    /**
+     * Get all registered [Reforge]s.
+     *
+     * @return A list of all [Reforge]s.
+     */
+    @JvmStatic
+    fun values(): Set<Reforge> {
+        return ImmutableSet.copyOf(BY_KEY.values)
+    }
+
+    /**
+     * Get [String]s for all registered [Reforge]s.
+     *
+     * @return A list of all [Reforge]s.
+     */
+    @JvmStatic
+    fun keySet(): Set<String> {
+        return ImmutableSet.copyOf(BY_KEY.keys)
+    }
+
+    /**
+     * Get [Reforge] matching key.
+     *
+     * @param key The key to search for.
+     * @return The matching [Reforge], or null if not found.
+     */
+    @JvmStatic
+    fun getByKey(key: String?): Reforge? {
+        return if (key == null) {
+            null
+        } else BY_KEY[key]
+    }
+
+    /**
+     * Update all [Reforge]s.
+     *
+     * @param plugin Instance of Reforges.
+     */
+    @ConfigUpdater
+    @JvmStatic
+    fun update(plugin: ReforgesPlugin) {
+        for (config in plugin.reforgesYml.getSubsections("chains")) {
+            EffectChains.compile(config, "Chains")
+        }
+        for (reforge in values()) {
+            removeReforge(reforge)
+        }
+        for (config in plugin.reforgesYml.getSubsections("reforges")) {
+            Reforge(config, plugin)
+        }
+    }
+
+    /**
+     * Remove [Reforge] from Reforges.
+     *
+     * @param reforge The [Reforge] to remove.
+     */
+    @JvmStatic
+    fun removeReforge(reforge: Reforge) {
+        BY_KEY.remove(reforge.id)
+    }
+
+    /**
+     * Add new [Reforge] to Reforges.
+     *
+     * Only for internal use, reforges are automatically added in the constructor.
+     *
+     * @param reforge The [Reforge] to add.
+     */
+    internal fun addNewReforge(reforge: Reforge) {
+        BY_KEY.remove(reforge.id)
+        BY_KEY[reforge.id] = reforge
+    }
+}

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

@@ -1,3 +1,5 @@
 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/reforges/util/ReforgeArgParser.kt

@@ -3,6 +3,7 @@ package com.willfp.reforges.reforges.util
 import com.willfp.eco.core.items.args.LookupArgParser
 import com.willfp.reforges.reforges.Reforge
 import com.willfp.reforges.reforges.Reforges
+import com.willfp.reforges.util.reforge
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.ItemMeta
 import java.util.function.Predicate
@@ -26,11 +27,17 @@ class ReforgeArgParser : LookupArgParser {
 
         reforge ?: return null
 
-        ReforgeUtils.setReforge(meta, reforge)
+        meta.reforge = reforge
 
         return Predicate { test ->
             val testMeta = test.itemMeta ?: return@Predicate false
-            reforge == ReforgeUtils.getReforge(testMeta)
+            reforge == testMeta.reforge
         }
     }
+
+    override fun serializeBack(meta: ItemMeta): String? {
+        val reforge = meta.reforge ?: return null
+
+        return "reforge:${reforge.id}"
+    }
 }

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

@@ -1,388 +0,0 @@
-package com.willfp.reforges.reforges.util
-
-import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.events.EntityDeathByEntityEvent
-import com.willfp.eco.core.events.PlayerJumpEvent
-import com.willfp.eco.core.integrations.antigrief.AntigriefManager
-import com.willfp.eco.core.integrations.mcmmo.McmmoManager
-import com.willfp.eco.util.NumberUtils
-import com.willfp.reforges.events.EffectActivateEvent
-import org.bukkit.entity.*
-import org.bukkit.event.EventHandler
-import org.bukkit.event.Listener
-import org.bukkit.event.block.BlockBreakEvent
-import org.bukkit.event.entity.EntityDamageByEntityEvent
-import org.bukkit.event.entity.EntityDamageEvent
-import org.bukkit.event.entity.ProjectileHitEvent
-import org.bukkit.event.entity.ProjectileLaunchEvent
-import org.bukkit.event.player.PlayerItemDamageEvent
-
-class WatcherTriggers(
-    private val plugin: EcoPlugin
-) : Listener {
-    @EventHandler(ignoreCancelled = true)
-    fun onBlockBreak(event: BlockBreakEvent) {
-        if (McmmoManager.isFake(event)) {
-            return
-        }
-
-        val player = event.player
-        val block = event.block
-        if (!AntigriefManager.canBreakBlock(player, block)) {
-            return
-        }
-
-        for (reforge in ReforgeLookup.provideReforges(player)) {
-            for ((key, value) in reforge.effects) {
-                if (NumberUtils.randFloat(0.0, 100.0) > (value.getDoubleOrNull("chance") ?: 100.0)) {
-                    continue
-                }
-                val aEvent = EffectActivateEvent(player, reforge, key)
-                this.plugin.server.pluginManager.callEvent(aEvent)
-                if (!aEvent.isCancelled) {
-                    key.onBlockBreak(player, block, event, value)
-                }
-            }
-        }
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    fun onArrowDamage(event: EntityDamageByEntityEvent) {
-        if (McmmoManager.isFake(event)) {
-            return
-        }
-
-        val arrow = event.damager
-        val victim = event.entity
-
-        if (arrow !is Arrow) {
-            return
-        }
-
-        if (victim !is LivingEntity) {
-            return
-        }
-
-        val shooter = arrow.shooter
-
-        if (shooter !is Player) {
-            return
-        }
-
-        if (!AntigriefManager.canInjure(shooter, victim)) {
-            return
-        }
-
-        if (event.isCancelled) {
-            return
-        }
-
-        for (reforge in ReforgeLookup.provideReforges(shooter)) {
-            for ((effect, config) in reforge.effects) {
-                if (NumberUtils.randFloat(0.0, 100.0) > (config.getDoubleOrNull("chance") ?: 100.0)) {
-                    continue
-                }
-                val aEvent = EffectActivateEvent(shooter, reforge, effect)
-                this.plugin.server.pluginManager.callEvent(aEvent)
-                if (!aEvent.isCancelled) {
-                    effect.onArrowDamage(shooter, victim, arrow, event, config)
-                    effect.onAnyDamage(shooter, victim, event, config)
-                }
-            }
-        }
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    fun onTridentDamage(event: EntityDamageByEntityEvent) {
-        if (McmmoManager.isFake(event)) {
-            return
-        }
-
-        val trident = event.damager
-        val victim = event.entity
-
-        if (trident !is Trident) {
-            return
-        }
-
-        if (victim !is LivingEntity) {
-            return
-        }
-
-        val shooter = trident.shooter
-
-        if (shooter !is Player) {
-            return
-        }
-
-        val item = trident.item
-
-        if (!AntigriefManager.canInjure(shooter, victim)) {
-            return
-        }
-
-        if (event.isCancelled) {
-            return
-        }
-
-        val tridentReforge = ReforgeUtils.getReforge(item)
-        val add = if (tridentReforge == null) emptyList() else listOf(tridentReforge)
-
-        for (reforge in ReforgeLookup.provideReforges(shooter) union add) {
-            for ((effect, config) in reforge.effects) {
-                if (NumberUtils.randFloat(0.0, 100.0) > (config.getDoubleOrNull("chance") ?: 100.0)) {
-                    continue
-                }
-                val aEvent = EffectActivateEvent(shooter, reforge, effect)
-                this.plugin.server.pluginManager.callEvent(aEvent)
-                if (!aEvent.isCancelled) {
-                    effect.onTridentDamage(shooter, victim, trident, event, config)
-                    effect.onAnyDamage(shooter, victim, event, config)
-                }
-            }
-        }
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    fun onJump(event: PlayerJumpEvent) {
-        if (McmmoManager.isFake(event)) {
-            return
-        }
-        val player = event.player
-
-        for (reforge in ReforgeLookup.provideReforges(player)) {
-            for ((effect, config) in reforge.effects) {
-                if (NumberUtils.randFloat(0.0, 100.0) > (config.getDoubleOrNull("chance") ?: 100.0)) {
-                    continue
-                }
-                val aEvent = EffectActivateEvent(player, reforge, effect)
-                this.plugin.server.pluginManager.callEvent(aEvent)
-                if (!aEvent.isCancelled) {
-                    effect.onJump(player, event, config)
-                }
-            }
-        }
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    fun onMeleeAttack(event: EntityDamageByEntityEvent) {
-        if (McmmoManager.isFake(event)) {
-            return
-        }
-
-        val attacker = event.damager
-
-        if (attacker !is Player) {
-            return
-        }
-
-        val victim = event.entity
-
-        if (victim !is LivingEntity) {
-            return
-        }
-
-        if (event.isCancelled) {
-            return
-        }
-
-        if (event.cause == EntityDamageEvent.DamageCause.THORNS) {
-            return
-        }
-
-        if (!AntigriefManager.canInjure(attacker, victim)) {
-            return
-        }
-
-        for (reforge in ReforgeLookup.provideReforges(attacker)) {
-            for ((effect, config) in reforge.effects) {
-                if (NumberUtils.randFloat(0.0, 100.0) > (config.getDoubleOrNull("chance") ?: 100.0)) {
-                    continue
-                }
-                val aEvent = EffectActivateEvent(attacker, reforge, effect)
-                this.plugin.server.pluginManager.callEvent(aEvent)
-                if (!aEvent.isCancelled) {
-                    effect.onMeleeAttack(attacker, victim, event, config)
-                    effect.onAnyDamage(attacker, victim, event, config)
-                }
-            }
-        }
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    fun onKill(event: EntityDeathByEntityEvent) {
-        if (McmmoManager.isFake(event)) {
-            return
-        }
-
-        var killer: Any? = null
-        if (event.killer is Player) {
-            killer = event.killer
-        } else if (event.killer is Projectile) {
-            if ((event.killer as Projectile).shooter is Player) {
-                killer = (event.killer as Projectile).shooter
-            }
-        }
-
-        if (killer !is Player) {
-            return
-        }
-
-        val victim = event.victim
-
-        if (!AntigriefManager.canInjure(killer, victim)) {
-            return
-        }
-
-        val trident = if (event.killer is Trident) (event.killer as Trident).item else null
-        val tridentReforge = if (trident == null) null else ReforgeUtils.getReforge(trident)
-        val add = if (tridentReforge == null) emptyList() else listOf(tridentReforge)
-
-        for (reforge in ReforgeLookup.provideReforges(killer) union add) {
-            for ((effect, config) in reforge.effects) {
-                if (NumberUtils.randFloat(0.0, 100.0) > (config.getDoubleOrNull("chance") ?: 100.0)) {
-                    continue
-                }
-                val aEvent = EffectActivateEvent(killer, reforge, effect)
-                this.plugin.server.pluginManager.callEvent(aEvent)
-                if (!aEvent.isCancelled) {
-                    (effect as Watcher).onKill(killer, victim, event, config)
-                }
-            }
-        }
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    fun onProjectileLaunch(event: ProjectileLaunchEvent) {
-        if (McmmoManager.isFake(event)) {
-            return
-        }
-
-        val shooter = event.entity.shooter
-
-        if (shooter !is Player) {
-            return
-        }
-
-        for (reforge in ReforgeLookup.provideReforges(shooter)) {
-            for ((effect, config) in reforge.effects) {
-                if (NumberUtils.randFloat(0.0, 100.0) > (config.getDoubleOrNull("chance") ?: 100.0)) {
-                    continue
-                }
-                val aEvent = EffectActivateEvent(shooter, reforge, effect)
-                this.plugin.server.pluginManager.callEvent(aEvent)
-                if (!aEvent.isCancelled) {
-                    effect.onProjectileLaunch(shooter, event.entity, event, config)
-                }
-            }
-        }
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    fun onFallDamage(event: EntityDamageEvent) {
-        if (McmmoManager.isFake(event)) {
-            return
-        }
-
-        if (event.cause != EntityDamageEvent.DamageCause.FALL) {
-            return
-        }
-
-        val victim = event.entity
-
-        if (victim !is Player) {
-            return
-        }
-
-        for (reforge in ReforgeLookup.provideReforges(victim)) {
-            for ((effect, config) in reforge.effects) {
-                if (NumberUtils.randFloat(0.0, 100.0) > (config.getDoubleOrNull("chance") ?: 100.0)) {
-                    continue
-                }
-                val aEvent = EffectActivateEvent(victim, reforge, effect)
-                this.plugin.server.pluginManager.callEvent(aEvent)
-                if (!aEvent.isCancelled) {
-                    effect.onFallDamage(victim, event, config)
-                }
-            }
-        }
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    fun onProjectileHit(event: ProjectileHitEvent) {
-        if (McmmoManager.isFake(event)) {
-            return
-        }
-
-        val projectile = event.entity
-        val shooter = projectile.shooter
-
-        if (shooter !is Player) {
-            return
-        }
-
-        val trident = if (projectile is Trident) projectile.item else null
-        val tridentReforge = if (trident == null) null else ReforgeUtils.getReforge(trident)
-        val add = if (tridentReforge == null) emptyList() else listOf(tridentReforge)
-
-        for (reforge in ReforgeLookup.provideReforges(shooter) union add) {
-            for ((effect, config) in reforge.effects) {
-                if (NumberUtils.randFloat(0.0, 100.0) > (config.getDoubleOrNull("chance") ?: 100.0)) {
-                    continue
-                }
-                val aEvent = EffectActivateEvent(shooter, reforge, effect)
-                this.plugin.server.pluginManager.callEvent(aEvent)
-                if (!aEvent.isCancelled) {
-                    effect.onProjectileHit(shooter, event, config)
-                }
-            }
-        }
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    fun onDurabilityDamage(event: PlayerItemDamageEvent) {
-        if (McmmoManager.isFake(event)) {
-            return
-        }
-
-        val item = event.item
-        val reforge = ReforgeUtils.getReforge(item) ?: return
-
-        for ((effect, config) in reforge.effects) {
-            if (NumberUtils.randFloat(0.0, 100.0) > (config.getDoubleOrNull("chance") ?: 100.0)) {
-                continue
-            }
-            val aEvent = EffectActivateEvent(event.player, reforge, effect)
-            this.plugin.server.pluginManager.callEvent(aEvent)
-            if (!aEvent.isCancelled) {
-                effect.onDurabilityDamage(event, config)
-            }
-        }
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    fun onDamageWearingArmor(event: EntityDamageEvent) {
-        if (McmmoManager.isFake(event)) {
-            return
-        }
-
-        val victim = event.entity
-
-        if (victim !is Player) {
-            return
-        }
-
-        for (reforge in ReforgeLookup.provideReforges(victim)) {
-            for ((effect, config) in reforge.effects) {
-                if (NumberUtils.randFloat(0.0, 100.0) > (config.getDoubleOrNull("chance") ?: 100.0)) {
-                    continue
-                }
-                val aEvent = EffectActivateEvent(victim, reforge, effect)
-                this.plugin.server.pluginManager.callEvent(aEvent)
-                if (!aEvent.isCancelled) {
-                    effect.onDamageWearingArmor(victim, event, config)
-                }
-            }
-        }
-    }
-}

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

@@ -1,6 +1,5 @@
 package com.willfp.reforges.util
 
-import com.willfp.reforges.reforges.util.ReforgeUtils
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.block.BlockPlaceEvent
@@ -8,7 +7,7 @@ import org.bukkit.event.block.BlockPlaceEvent
 class AntiPlaceListener : Listener {
     @EventHandler
     fun onBlockPlace(event: BlockPlaceEvent) {
-        if (ReforgeUtils.getReforgeStone(event.itemInHand) != null) {
+        if (event.itemInHand.reforgeStone != null) {
             event.isCancelled = true
             event.setBuild(false)
         }

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

@@ -2,29 +2,23 @@ package com.willfp.reforges.util
 
 import com.willfp.eco.core.EcoPlugin
 import org.bukkit.Bukkit
+import org.bukkit.Keyed
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.inventory.Recipe
-import org.bukkit.inventory.ShapedRecipe
 
-class DiscoverRecipeListener(
+class DiscoverRecipeListener(private val plugin: EcoPlugin) : Listener {
-    private val plugin: EcoPlugin
-) : Listener {
     @EventHandler
     fun onJoin(event: PlayerJoinEvent) {
-        val player = event.player
+        if (!plugin.configYml.getBool("discover-recipes")) {
-        if (plugin.configYml.getBool("discover-recipes")) {
+            return
-            Bukkit.getServer().recipeIterator().forEachRemaining { recipe: Recipe ->
-                if (recipe is ShapedRecipe) {
-                    val key = recipe.key
-                    if (key.namespace == "reforges") {
-                        if (!key.key.contains("displayed")) {
-                            player.discoverRecipe(key)
-                        }
-                    }
-                }
-            }
         }
+        mutableListOf<Recipe>()
+            .apply { Bukkit.getServer().recipeIterator().forEachRemaining(this::add) }
+            .filterIsInstance<Keyed>().map { it.key }
+            .filter { it.namespace == plugin.name.lowercase() }
+            .filter { !it.key.contains("displayed") }
+            .forEach { event.player.discoverRecipe(it) }
     }
 }

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

@@ -0,0 +1,84 @@
+package com.willfp.reforges.util
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.events.ArmorChangeEvent
+import com.willfp.libreforge.updateEffects
+import com.willfp.reforges.reforges.ReforgeTargets
+import com.willfp.reforges.reforges.Reforges.values
+import com.willfp.reforges.util.ReforgeLookup.clearCache
+import org.bukkit.entity.Player
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.entity.EntityPickupItemEvent
+import org.bukkit.event.inventory.InventoryClickEvent
+import org.bukkit.event.player.PlayerDropItemEvent
+import org.bukkit.event.player.PlayerItemHeldEvent
+import org.bukkit.event.player.PlayerJoinEvent
+import org.bukkit.event.player.PlayerQuitEvent
+
+@Suppress("UNUSED", "UNUSED_PARAMETER")
+class ReforgeEnableListeners(private val plugin: EcoPlugin) : Listener {
+    @EventHandler
+    fun onItemPickup(event: EntityPickupItemEvent) {
+        if (event.entity !is Player) {
+            return
+        }
+        val player = event.entity as Player
+        if (!ReforgeTargets.ALL.matches(event.item.itemStack)) {
+            return
+        }
+        refreshPlayer(player)
+    }
+
+    @EventHandler
+    fun onPlayerJoin(event: PlayerJoinEvent) {
+        refresh()
+    }
+
+    @EventHandler
+    fun onPlayerLeave(event: PlayerQuitEvent) {
+        refresh()
+        val player = event.player
+        for (value in values()) {
+            for ((effect) in value.effects) {
+                effect.disableForPlayer(player)
+            }
+        }
+    }
+
+    @EventHandler
+    fun onInventoryDrop(event: PlayerDropItemEvent) {
+        if (!ReforgeTargets.ALL.matches(event.itemDrop.itemStack)) {
+            return
+        }
+        refreshPlayer(event.player)
+    }
+
+    @EventHandler
+    fun onChangeSlot(event: PlayerItemHeldEvent) {
+        refreshPlayer(event.player)
+        plugin.scheduler.run { refreshPlayer(event.player) }
+    }
+
+    @EventHandler
+    fun onArmorChange(event: ArmorChangeEvent) {
+        refreshPlayer(event.player)
+    }
+
+    @EventHandler
+    fun onInventoryClick(event: InventoryClickEvent) {
+        if (event.whoClicked !is Player) {
+            return
+        }
+        refreshPlayer(event.whoClicked as Player)
+    }
+
+    private fun refresh() {
+        plugin.server.onlinePlayers.forEach { player: Player -> refreshPlayer(player) }
+    }
+
+    private fun refreshPlayer(player: Player) {
+        clearCache(player)
+        player.updateEffects()
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.willfp.reforges.util
+
+import com.github.benmanes.caffeine.cache.Caffeine
+import com.willfp.reforges.ReforgesPlugin
+import com.willfp.reforges.reforges.Reforge
+import com.willfp.reforges.reforges.ReforgeTarget
+import org.bukkit.entity.Player
+import org.bukkit.inventory.ItemStack
+import java.util.concurrent.TimeUnit
+
+typealias SlotProvider = (Player) -> Map<ItemStack?, ReforgeTarget.Slot?>
+
+object ReforgeLookup {
+    private val plugin = ReforgesPlugin.instance
+    private val slotProviders = mutableSetOf<(Player) -> Map<ItemStack, ReforgeTarget.Slot>>()
+    private val itemCache = Caffeine.newBuilder()
+        .expireAfterWrite(2, TimeUnit.SECONDS)
+        .build<Player, Map<ItemStack, ReforgeTarget.Slot>>()
+    private val reforgeCache = Caffeine.newBuilder()
+        .expireAfterWrite(2, TimeUnit.SECONDS)
+        .build<Player, Collection<Reforge>>()
+
+    @JvmStatic
+    fun registerProvider(provider: SlotProvider) {
+        slotProviders.add {
+            val found = mutableMapOf<ItemStack, ReforgeTarget.Slot>()
+            for ((item, slot) in provider(it)) {
+                if (item != null && slot != null) {
+                    found[item] = slot
+                }
+            }
+            found
+        }
+    }
+
+    private fun provide(player: Player): Map<ItemStack, ReforgeTarget.Slot> {
+        return itemCache.get(player) {
+            val found = mutableMapOf<ItemStack, ReforgeTarget.Slot>()
+            for (provider in slotProviders) {
+                found.putAll(provider(player))
+            }
+
+            found
+        }
+    }
+
+    fun provideReforges(player: Player): List<Reforge> {
+        return reforgeCache.get(player) {
+            val found = mutableListOf<Reforge>()
+
+            for ((itemStack, slot) in provide(player)) {
+                val reforge = itemStack.reforge ?: continue
+                if (slot != ReforgeTarget.Slot.ANY) {
+                    if (!reforge.targets.map { it.slot }.contains(slot)) {
+                        continue
+                    }
+                }
+                found.add(reforge)
+            }
+
+            found
+        }.toList()
+    }
+
+    /**
+     * Clear cache.
+     *
+     * @param player The player.
+     */
+    @JvmStatic
+    fun clearCache(player: Player) {
+        itemCache.invalidate(player)
+        reforgeCache.invalidate(player)
+    }
+
+    init {
+        registerProvider {
+            mapOf(
+                Pair(
+                    it.inventory.itemInMainHand,
+                    ReforgeTarget.Slot.HANDS
+                )
+            )
+        }
+
+        if (!plugin.configYml.getBool("no-offhand")) {
+            registerProvider {
+                mapOf(
+                    Pair(
+                        it.inventory.itemInOffHand,
+                        ReforgeTarget.Slot.HANDS
+                    )
+                )
+            }
+        }
+
+
+        registerProvider {
+            val items = mutableMapOf<ItemStack?, ReforgeTarget.Slot?>()
+            for (stack in it.inventory.armorContents) {
+                items[stack] = ReforgeTarget.Slot.ARMOR
+            }
+            items
+        }
+    }
+}

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

@@ -0,0 +1,10 @@
+package com.willfp.reforges.util
+
+enum class ReforgeStatus(
+    val configKey: String
+) {
+    ALLOW("allow"),
+    ALLOW_STONE("allow-stone"),
+    INVALID_ITEM("invalid-item"),
+    NO_ITEM("no-item")
+}

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

@@ -0,0 +1,115 @@
+package com.willfp.reforges.util
+
+import com.willfp.eco.core.fast.fast
+import com.willfp.reforges.ReforgesPlugin
+import com.willfp.reforges.reforges.Reforge
+import com.willfp.reforges.reforges.ReforgeTarget
+import com.willfp.reforges.reforges.Reforges
+import org.bukkit.inventory.ItemStack
+import org.bukkit.inventory.meta.ItemMeta
+import org.bukkit.persistence.PersistentDataContainer
+import org.bukkit.persistence.PersistentDataType
+
+private val plugin = ReforgesPlugin.instance
+private val reforgeKey = plugin.namespacedKeyFactory.create("reforge")
+private val reforgeAmountKey = plugin.namespacedKeyFactory.create("reforge_amount")
+private val reforgeStoneKey = plugin.namespacedKeyFactory.create("reforge_stone")
+
+var ItemStack?.reforge: Reforge?
+    get() {
+        this ?: return null
+        return this.fast().persistentDataContainer.reforge
+    }
+    set(value) {
+        this ?: return
+        this.fast().persistentDataContainer.reforge = value
+    }
+
+var ItemMeta?.reforge: Reforge?
+    get() {
+        this ?: return null
+        return this.persistentDataContainer.reforge
+    }
+    set(value) {
+        this ?: return
+        this.persistentDataContainer.reforge = value
+    }
+
+var PersistentDataContainer?.reforge: Reforge?
+    get() {
+        this ?: return null
+
+        if (!this.has(reforgeKey, PersistentDataType.STRING)) {
+            return null
+        }
+
+        val active = this.get(reforgeKey, PersistentDataType.STRING)
+        return Reforges.getByKey(active)
+    }
+    set(value) {
+        this ?: return
+        if (value == null) {
+            this.remove(reforgeKey)
+        } else {
+            this.set(reforgeKey, PersistentDataType.STRING, value.id)
+        }
+    }
+
+var ItemStack?.reforgeStone: Reforge?
+    get() {
+        this ?: return null
+        return this.fast().persistentDataContainer.reforgeStone
+    }
+    set(value) {
+        this ?: return
+        this.fast().persistentDataContainer.reforgeStone = value
+    }
+
+var ItemMeta?.reforgeStone: Reforge?
+    get() {
+        this ?: return null
+        return this.persistentDataContainer.reforgeStone
+    }
+    set(value) {
+        this ?: return
+        this.persistentDataContainer.reforgeStone = value
+    }
+
+var PersistentDataContainer?.reforgeStone: Reforge?
+    get() {
+        this ?: return null
+
+        if (!this.has(reforgeStoneKey, PersistentDataType.STRING)) {
+            return null
+        }
+
+        val active = this.get(reforgeStoneKey, PersistentDataType.STRING)
+        return Reforges.getByKey(active)
+    }
+    set(value) {
+        this ?: return
+        if (value == null) {
+            this.remove(reforgeStoneKey)
+        } else {
+            this.set(reforgeStoneKey, PersistentDataType.STRING, value.id)
+        }
+    }
+
+var ItemStack.timesReforged: Int
+    get() = this.fast().persistentDataContainer.get(reforgeAmountKey, PersistentDataType.INTEGER) ?: 0
+    set(value) = this.fast().persistentDataContainer.set(reforgeAmountKey, PersistentDataType.INTEGER, value)
+
+fun Collection<ReforgeTarget>.getRandomReforge(
+    disallowed: Collection<Reforge> = emptyList()
+): Reforge? {
+    val applicable = mutableListOf<Reforge>()
+
+    for (reforge in Reforges.values()) {
+        if (reforge.targets.intersect(this.toSet()).isNotEmpty() && !reforge.requiresStone) {
+            applicable.add(reforge)
+        }
+    }
+
+    applicable.removeAll(disallowed)
+    return applicable.randomOrNull()
+}

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

@@ -4,6 +4,19 @@
 #
 
 discover-recipes: true
+no-offhand: false # Restart your server after this option, doesn't work with /reforges reload
+
+# If a reward allows permission multipliers, the weights
+# will be multiplied by highest-priority multiplier that a player
+# has permission for - i.e. if a player has both vip and mvp permissions,
+# than they'll have the mvp one applied as it has a higher priority.
+price-multipliers:
+  - permission: reforges.mutliplier.vip
+    multiplier: 0.8
+    priority: 1
+  - permission: reforges.mutliplier.mvp
+    multiplier: 0.7
+    priority: 2
 
 gui:
   rows: 6
@@ -105,18 +118,22 @@ gui:
       - '&7You cannot reforge this item!'
 
   sound:
+    enabled: true
     id: BLOCK_ANVIL_USE
     pitch: 1
 
   open-sound:
+    enabled: true
     id: BLOCK_ANVIL_PLACE
     pitch: 0.8
 
   stone-sound:
+    enabled: true
     id: ENTITY_ENDER_DRAGON_HURT
     pitch: 0.5
 
   insufficient-money-sound:
+    enabled: true
     id: ENTITY_VILLAGER_NO
     pitch: 0.8
 
@@ -131,13 +148,51 @@ reforge:
   reforgable-suffix:
     - ""
     - "&8This item can be reforged!"
+  no-reforgable-in-gui: true # Not perfect, won't work 100% of the time
+  # due to how GUIs are handled differently in different plugins, but should help.
 
   display-in-lore: true
-  display-in-name: true # Requires paper to be installed on the server
+  display-in-name: true
 
-  stone:
+  reforged-prefix:
-    name: "%reforge%&f Reforge Stone"
+    - ""
-    lore:
+    - "%reforge%"
-      - "&7Place on the right of the"
+
-      - "&7reforge menu to apply the"
+cooldown:
-      - "%reforge%&7 reforge!"
+  in-actionbar: true
+  sound:
+    enabled: true
+    sound: "BLOCK_NOTE_BLOCK_PLING"
+    pitch: 0.5
+
+cannot-afford:
+  in-actionbar: true
+  sound:
+    enabled: true
+    sound: "BLOCK_NOTE_BLOCK_PLING"
+    pitch: 0.5
+
+cannot-afford-type:
+  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:
+    permanent: true
+    triggered: true
+  ambient:
+    permanent: false
+    triggered: true
+  particles:
+    permanent: false
+    triggered: true

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

@@ -0,0 +1,3 @@
+resource-id: 1330
+bstats-id: 12412
+color: "&3"

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

@@ -3,7 +3,7 @@ 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!)"
+  reloaded: "Reloaded! (Restart if you're removed reforges!) Took %time%ms"
   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,6 +12,12 @@ 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/plugin.yml

@@ -14,8 +14,9 @@ softdepend:
   - Talismans
   - AureliumSkills
   - PlayerPoints
-libraries:
+  - Jobs
-  - 'org.jetbrains.kotlin:kotlin-stdlib:1.5.21'
+  - EcoArmor
+  - TMMobcoins
 
 commands:
   reforges:
@@ -39,6 +40,7 @@ permissions:
       reforges.command.reforges: true
       reforges.command.reforge: true
       reforges.command.give: true
+      reforges.command.apply: true
       reforges.command.open: true
 
   reforges.command.reload:
@@ -56,3 +58,6 @@ permissions:
   reforges.command.open:
     description: Allows the user of /reforges open.
     default: op
+  reforges.command.apply:
+    description: Allows the user of /reforges apply.
+    default: op

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

@@ -1,473 +0,0 @@
-{
-  "reforges": [
-    {
-      "id": "acute",
-      "name": "<gradient:#4776E6>Acute</gradient:#8E54E9>",
-      "description": [
-        "&a+2% &fTriple Damage Chance"
-      ],
-      "targets": [
-        "axe"
-      ],
-      "stone": {
-        "enabled": false,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "damage_multiplier",
-          "multiplier": 3,
-          "chance": 2
-        }
-      ],
-      "conditions": []
-    },
-    {
-      "id": "aerobic",
-      "name": "<gradient:#B993D6>Aerobic</gradient:#8CA6DB>",
-      "description": [
-        "&a+9% &fDamage when shot in air"
-      ],
-      "targets": [
-        "bow"
-      ],
-      "stone": {
-        "enabled": false,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "damage_multiplier",
-          "multiplier": 1.09
-        }
-      ],
-      "conditions": [
-        {
-          "id": "in_air"
-        }
-      ]
-    },
-    {
-      "id": "durable",
-      "name": "<gradient:#0EA3C3>Durable</gradient:#0BCBC8>",
-      "description": [
-        "&a+15% &fMore durability"
-      ],
-      "targets": [
-        "all"
-      ],
-      "stone": {
-        "enabled": false,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "durability_multiplier",
-          "multiplier": 1.15
-        }
-      ],
-      "conditions": [
-      ]
-    },
-    {
-      "id": "dynamic",
-      "name": "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>",
-      "description": [
-        "&a+5% &fDamage",
-        "&a+10% &fCrit Damage"
-      ],
-      "targets": [
-        "melee"
-      ],
-      "stone": {
-        "enabled": true,
-        "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",
-          "multiplier": 1.05
-        },
-        {
-          "id": "crit_multiplier",
-          "multiplier": 1.10
-        }
-      ],
-      "conditions": [
-      ]
-    },
-    {
-      "id": "evasive",
-      "name": "<gradient:#EFEFBB>Evasive</gradient:#D4D3DD>",
-      "description": [
-        "&a+2% &fIgnore Damage Chance"
-      ],
-      "targets": [
-        "armor"
-      ],
-      "stone": {
-        "enabled": false,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "incoming_damage_multiplier",
-          "multiplier": 0,
-          "chance": 2
-        }
-      ],
-      "conditions": [
-      ]
-    },
-    {
-      "id": "gravitated",
-      "name": "<gradient:#1e3c72>Gravitated</gradient:#2a5298>",
-      "description": [
-        "&a+8% &fCritical Damage"
-      ],
-      "targets": [
-        "melee"
-      ],
-      "stone": {
-        "enabled": false,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "crit_multiplier",
-          "multiplier": 1.08
-        }
-      ],
-      "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,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "damage_multiplier",
-          "multiplier": 0.95
-        },
-        {
-          "id": "knockback_multiplier",
-          "multiplier": 0.95
-        },
-        {
-          "id": "attack_speed_multiplier",
-          "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,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "damage_multiplier",
-          "multiplier": 1.2
-        }
-      ],
-      "conditions": [
-        {
-          "id": "in_water"
-        }
-      ]
-    },
-    {
-      "id": "pointy",
-      "name": "<gradient:#076585>Pointy</gradient:#ffffff>",
-      "description": [
-        "&a+10% &fDamage"
-      ],
-      "targets": [
-        "trident"
-      ],
-      "stone": {
-        "enabled": false,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "damage_multiplier",
-          "multiplier": 1.1
-        }
-      ],
-      "conditions": [
-      ]
-    },
-    {
-      "id": "prospecting",
-      "name": "<gradient:#00B4DB>Prospecting</gradient:#0083B0>",
-      "description": [
-        "&a+5% &fChance to get &e\u00242&f for mining a block"
-      ],
-      "targets": [
-        "pickaxe"
-      ],
-      "stone": {
-        "enabled": false,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "reward_block_break",
-          "amount": 2,
-          "chance": 5
-        }
-      ],
-      "conditions": [
-      ]
-    },
-    {
-      "id": "reinforced",
-      "name": "<gradient:#FBD786>Reinforced</gradient:#f7797d>",
-      "description": [
-        "&a+4% &fDamage Resistance"
-      ],
-      "targets": [
-        "armor"
-      ],
-      "stone": {
-        "enabled": false,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "incoming_damage_multiplier",
-          "multiplier": 0.96
-        }
-      ],
-      "conditions": [
-      ]
-    },
-    {
-      "id": "rich",
-      "name": "<gradient:#DBDBDB>Rich</gradient:#F2F2F2>",
-      "description": [
-        "&a+\u002450 &fFor each mob kill"
-      ],
-      "targets": [
-        "trident",
-        "bow"
-      ],
-      "stone": {
-        "enabled": true,
-        "texture": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2RjNTdjNzVhZGYzOWVjNmYwZTA5MTYwNDlkZDk2NzFlOThhOGExZTYwMDEwNGU4NGU2NDVjOTg4OTUwYmQ3In19fQ==",
-        "craftable": true,
-        "recipe": [
-          "gold_block",
-          "trident",
-          "gold_block",
-          "air",
-          "ecoitems:blank_reforge_stone ? obsidian",
-          "air",
-          "gold_block",
-          "bow",
-          "gold_block"
-        ]
-      },
-      "effects": [
-        {
-          "id": "reward_kill",
-          "amount": 50
-        }
-      ],
-      "conditions": [
-      ]
-    },
-    {
-      "id": "sharp",
-      "name": "<gradient:#f12711>Sharp</gradient:#f5af19>",
-      "description": [
-        "&a+3% &fDamage"
-      ],
-      "targets": [
-        "melee"
-      ],
-      "stone": {
-        "enabled": false,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "damage_multiplier",
-          "multiplier": 1.03
-        }
-      ],
-      "conditions": [
-      ]
-    },
-    {
-      "id": "streamlined",
-      "name": "<gradient:#74ebd5>Streamlined</gradient:#ACB6E5>",
-      "description": [
-        "&a+4% &fDamage"
-      ],
-      "targets": [
-        "bow"
-      ],
-      "stone": {
-        "enabled": false,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "damage_multiplier",
-          "multiplier": 1.04
-        }
-      ],
-      "conditions": [
-      ]
-    },
-    {
-      "id": "strong",
-      "name": "<gradient:#ED213A>Strong</gradient:#93291E>",
-      "description": [
-        "&a+2% &fDamage",
-        "&a+10% &fKnockback"
-      ],
-      "targets": [
-        "melee"
-      ],
-      "stone": {
-        "enabled": false,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "damage_multiplier",
-          "multiplier": 1.02
-        },
-        {
-          "id": "knockback_multiplier",
-          "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,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "incoming_damage_multiplier",
-          "multiplier": 1.05
-        },
-        {
-          "id": "movement_speed_multiplier",
-          "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,
-        "texture": "",
-        "craftable": false,
-        "recipe": []
-      },
-      "effects": [
-        {
-          "id": "incoming_damage_multiplier",
-          "multiplier": 0.92
-        },
-        {
-          "id": "movement_speed_multiplier",
-          "multiplier": 0.95
-        }
-      ],
-      "conditions": [
-      ]
-    }
-  ]
-}

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

@@ -0,0 +1,405 @@
+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: []

gradle.properties

@@ -1,2 +1,4 @@
-version = 3.7.0
+#libreforge-updater
-plugin-name = Reforges
+#Sun May 22 15:27:50 BST 2022
+version=5.0.0
+plugin-name=Reforges

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jitpack.yml

@@ -1,6 +1,6 @@
-jdk: openjdk16
+jdk: openjdk17
 before_install:
   - source "$HOME/.sdkman/bin/sdkman-init.sh"
   - sdk update
-  - sdk install java 16.0.1-open
+  - sdk install java 17.0.1-tem
-  - sdk use java 16.0.1-open
+  - sdk use java 17.0.1-tem