From 42aa948d0b0dc1e6a8ed6eaf60f6330516a64f81 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 27 Oct 2021 19:02:53 +0100 Subject: [PATCH] Minor internal changes --- .../java/com/willfp/reforges/ReforgesPlugin.java | 8 ++++---- .../reforges/reforges/util/ReforgeHandler.java | 2 +- .../com/willfp/reforges/vault/EconomyHandler.java | 12 ++++++++---- .../aureliumskills/AureliumSkillsIntegration.kt | 1 + .../integrations/ecoskills/EcoSkillsIntegration.kt | 1 + .../integrations/talismans/TalismansIntegration.kt | 1 + .../integrations/ultimateskills/EffectAddAbility.kt | 3 --- .../integrations/ultimateskills/EffectAddPerk.kt | 6 ------ .../ultimateskills/UltimateSkillsIntegration.kt | 1 + 9 files changed, 17 insertions(+), 18 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java index d94fea0..1599cb8 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java @@ -129,11 +129,11 @@ public class ReforgesPlugin extends EcoPlugin { @Override protected List loadIntegrationLoaders() { return Arrays.asList( - new IntegrationLoader("UltimateSkills", UltimateSkillsIntegration.INSTANCE::load), - new IntegrationLoader("EcoSkills", EcoSkillsIntegration.INSTANCE::load), - new IntegrationLoader("Talismans", TalismansIntegration.INSTANCE::registerProvider), + 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.INSTANCE::load) + new IntegrationLoader("AureliumSkills", AureliumSkillsIntegration::load) ); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeHandler.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeHandler.java index 90f3018..6e9bed8 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeHandler.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeHandler.java @@ -65,7 +65,7 @@ public class ReforgeHandler extends PluginDependent { cost = reforge.getStonePrice(); } - if (!EconomyHandler.getInstance().has(player, cost)) { + if (!EconomyHandler.has(player, cost)) { player.sendMessage(this.getPlugin().getLangYml().getMessage("insufficient-money")); player.playSound( diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/vault/EconomyHandler.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/vault/EconomyHandler.java index e3a9e12..c02b109 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/vault/EconomyHandler.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/vault/EconomyHandler.java @@ -10,8 +10,6 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.RegisteredServiceProvider; import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicReference; @UtilityClass public final class EconomyHandler { @@ -44,7 +42,14 @@ public final class EconomyHandler { return EconomyHandler.instance; } - public static boolean has(Player player, double amount) { + /** + * 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; @@ -53,7 +58,6 @@ public final class EconomyHandler { } } return getInstance().has(player, amount); - } public static boolean isEnabled() { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/aureliumskills/AureliumSkillsIntegration.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/aureliumskills/AureliumSkillsIntegration.kt index 03e16b3..f0cb626 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/aureliumskills/AureliumSkillsIntegration.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/aureliumskills/AureliumSkillsIntegration.kt @@ -6,6 +6,7 @@ import com.willfp.reforges.effects.Effect object AureliumSkillsIntegration : Integration { private lateinit var ADD_STAT: Effect + @JvmStatic fun load() { ADD_STAT = EffectAddStat() } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ecoskills/EcoSkillsIntegration.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ecoskills/EcoSkillsIntegration.kt index e2da6ad..3514233 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ecoskills/EcoSkillsIntegration.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ecoskills/EcoSkillsIntegration.kt @@ -6,6 +6,7 @@ import com.willfp.reforges.effects.Effect object EcoSkillsIntegration : Integration { private lateinit var ADD_STAT: Effect + @JvmStatic fun load() { ADD_STAT = EffectAddStat() } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/talismans/TalismansIntegration.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/talismans/TalismansIntegration.kt index 6bc7be6..50e422e 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/talismans/TalismansIntegration.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/talismans/TalismansIntegration.kt @@ -7,6 +7,7 @@ import com.willfp.talismans.talismans.util.TalismanChecks import org.bukkit.inventory.ItemStack object TalismansIntegration : Integration { + @JvmStatic fun registerProvider() { ReforgeLookup.registerProvider { player -> val provided = mutableMapOf() diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt index 12927c9..4a18d03 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt @@ -6,12 +6,10 @@ import com.willfp.reforges.ReforgesPlugin import com.willfp.reforges.effects.Effect import mc.ultimatecore.skills.HyperSkills import mc.ultimatecore.skills.objects.abilities.Ability -import mc.ultimatecore.skills.objects.perks.Perk import org.bukkit.entity.Player import org.bukkit.persistence.PersistentDataType class EffectAddAbility : Effect("add_ultimateskills_ability") { - override fun handleEnable( player: Player, config: JSONConfig @@ -37,5 +35,4 @@ class EffectAddAbility : Effect("add_ultimateskills_ability") { ) } } - } \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt index c513b03..7f57eb9 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt @@ -1,20 +1,15 @@ package com.willfp.reforges.integrations.ultimateskills -import com.archyx.aureliumskills.api.AureliumAPI -import com.archyx.aureliumskills.stats.Stats 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 com.willfp.reforges.effects.getEffectAmount import mc.ultimatecore.skills.HyperSkills -import mc.ultimatecore.skills.api.HyperSkillsAPI 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 @@ -39,5 +34,4 @@ class EffectAddPerk : Effect("add_ultimateskills_perk") { ) } } - } \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/UltimateSkillsIntegration.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/UltimateSkillsIntegration.kt index 0ae9c51..dbd4fd6 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/UltimateSkillsIntegration.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/UltimateSkillsIntegration.kt @@ -7,6 +7,7 @@ object UltimateSkillsIntegration : Integration { private lateinit var ADD_PERK: Effect private lateinit var ADD_ABILITY: Effect + @JvmStatic fun load() { ADD_PERK = EffectAddPerk() ADD_ABILITY = EffectAddAbility()