From 5f172c199691a21cfee876cfeca28abd715c07c4 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 13 Nov 2020 15:43:43 +0000 Subject: [PATCH] Re-added internal placeholder parser --- .../placeholder/PlaceholderManager.java | 17 ++++++++++++++--- .../com/willfp/ecoenchants/loader/Loader.java | 1 + 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/integrations/placeholder/PlaceholderManager.java b/Plugin/src/main/java/com/willfp/ecoenchants/integrations/placeholder/PlaceholderManager.java index cdd18c3c..364303fb 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/integrations/placeholder/PlaceholderManager.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/integrations/placeholder/PlaceholderManager.java @@ -32,8 +32,19 @@ public class PlaceholderManager { } public static String translatePlaceholders(String text, Player player) { - AtomicReference translatedReference = new AtomicReference<>(text); - integrations.forEach(placeholderIntegration -> translatedReference.set(placeholderIntegration.translate(translatedReference.get(), player))); - return translatedReference.get(); + if(integrations.isEmpty()) { + placeholders.forEach(placeholderEntry -> { + if(player == null && placeholderEntry.requiresPlayer()) + return; + + String test = "%ecoenchants_" + placeholderEntry.getIdentifier() + "%"; + text.replaceAll(test, placeholderEntry.getResult(player)); + }); + return text; + } else { + AtomicReference translatedReference = new AtomicReference<>(text); + integrations.forEach(placeholderIntegration -> translatedReference.set(placeholderIntegration.translate(translatedReference.get(), player))); + return translatedReference.get(); + } } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java index 0aefa61a..6acb0d0a 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java @@ -449,6 +449,7 @@ public class Loader { Logger.info(""); Logger.info("Updating cache..."); + EcoEnchants.getAll().forEach(EcoEnchant::update); EnchantmentCache.update(); Logger.info(""); }