From 1e8d93269eea8e82f1a7ac4ef20e22afd2e6e741 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 13 Nov 2020 12:27:57 +0000 Subject: [PATCH] Added rarity placeholders --- .../ecoenchants/enchantments/EcoEnchant.java | 6 +++++ .../enchantments/meta/EnchantmentRarity.java | 24 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java index 134f2a56..0d22659d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java @@ -149,6 +149,12 @@ public abstract class EcoEnchant extends Enchantment implements Listener, Regist } private void updatePlaceholders() { + PlaceholderManager.registerPlaceholder( + new PlaceholderEntry(this.getPermissionName() + "_" + "enabled", (player) -> { + return String.valueOf(this.isEnabled()); + }) + ); + if(this.getConfig().config.get(EcoEnchants.CONFIG_LOCATION + "chance-per-level") != null) { PlaceholderManager.registerPlaceholder( new PlaceholderEntry(this.getPermissionName() + "_" + "chance_per_level", (player) -> { diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java index fde7cc91..20f12eb8 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java @@ -1,6 +1,9 @@ package com.willfp.ecoenchants.enchantments.meta; import com.willfp.ecoenchants.config.ConfigManager; +import com.willfp.ecoenchants.integrations.placeholder.PlaceholderEntry; +import com.willfp.ecoenchants.integrations.placeholder.PlaceholderManager; +import com.willfp.ecoenchants.util.NumberUtils; import com.willfp.ecoenchants.util.StringUtils; import com.willfp.ecoenchants.util.interfaces.Registerable; @@ -44,6 +47,27 @@ public class EnchantmentRarity implements Registerable { Optional matching = rarities.stream().filter(rarity -> rarity.getName().equalsIgnoreCase(name)).findFirst(); matching.ifPresent(rarities::remove); + PlaceholderManager.registerPlaceholder(new PlaceholderEntry( + "rarity_" + this.getName() + "_probability", + (player) -> NumberUtils.format(this.probability) + )); + PlaceholderManager.registerPlaceholder(new PlaceholderEntry( + "rarity_" + this.getName() + "_minlevel", + (player) -> NumberUtils.format(this.minimumLevel) + )); + PlaceholderManager.registerPlaceholder(new PlaceholderEntry( + "rarity_" + this.getName() + "_villagerprobability", + (player) -> NumberUtils.format(this.villagerProbability) + )); + PlaceholderManager.registerPlaceholder(new PlaceholderEntry( + "rarity_" + this.getName() + "_lootprobability", + (player) -> NumberUtils.format(this.lootProbability) + )); + PlaceholderManager.registerPlaceholder(new PlaceholderEntry( + "rarity_" + this.getName() + "_color", + (player) -> this.customColor + )); + rarities.add(this); }