From 39a213c7278dd3df44b8699bfe27f13ea8eac463 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Mon, 17 Jan 2022 19:11:55 +0000 Subject: [PATCH] Updated placeholders --- .../java/com/willfp/ecoenchants/enchantments/EcoEnchant.java | 2 +- .../com/willfp/ecoenchants/enchantments/itemtypes/Spell.java | 1 + .../willfp/ecoenchants/enchantments/util/EnchantmentUtils.java | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java index dbcc057d..51587d21 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java @@ -53,7 +53,7 @@ public abstract class EcoEnchant extends Enchantment implements Listener, Watche /** * Instance of EcoEnchants for enchantments to be able to access. */ - @Getter(AccessLevel.PROTECTED) + @Getter private final EcoEnchantsPlugin plugin = EcoEnchantsPlugin.getInstance(); /** diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java index 99e54e49..12825113 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java @@ -110,6 +110,7 @@ public abstract class Spell extends EcoEnchant { PlaceholderManager.registerPlaceholder( new PlaceholderEntry( + this.getPlugin(), this.getPermissionName() + "_" + "cooldown", player -> StringUtils.internalToString(getCooldown(this, player)) ) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantmentUtils.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantmentUtils.java index 9cc37585..7df3facd 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantmentUtils.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantmentUtils.java @@ -82,6 +82,7 @@ public class EnchantmentUtils { public static void registerPlaceholders(@NotNull final EcoEnchant enchantment) { PlaceholderManager.registerPlaceholder( new PlaceholderEntry( + enchantment.getPlugin(), enchantment.getPermissionName() + "_" + "enabled", player -> String.valueOf(enchantment.isEnabled()) ) @@ -93,6 +94,7 @@ public class EnchantmentUtils { PlaceholderManager.registerPlaceholder( new PlaceholderEntry( + enchantment.getPlugin(), enchantment.getPermissionName() + "_" + key, player -> StringUtils.internalToString(object) )