From a06d782deaf74e24738c19eb2e8ce9f1755bd45d Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 1 Feb 2022 14:12:03 +0000 Subject: [PATCH] Cleaned up StringUtils --- .../java/com/willfp/eco/util/StringUtils.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java b/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java index 378067d1..7b38ae1b 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java +++ b/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java @@ -72,9 +72,9 @@ public final class StringUtils { /** * String format cache. */ - private static final LoadingCache STRING_FORMAT_CACHE = Caffeine.newBuilder() + private static final LoadingCache STRING_FORMAT_CACHE = Caffeine.newBuilder() .expireAfterAccess(10, TimeUnit.SECONDS) - .build(StringUtils::format); + .build(StringUtils::processFormatting); /** * Json -> Legacy Cache. @@ -311,12 +311,11 @@ public final class StringUtils { if (option == FormatOption.WITH_PLACEHOLDERS) { processedMessage = PlaceholderManager.translatePlaceholders(processedMessage, player); } - FormatLookup lookup = new FormatLookup(processedMessage, player); - return STRING_FORMAT_CACHE.get(lookup); + return STRING_FORMAT_CACHE.get(processedMessage); } - private static String format(@NotNull final FormatLookup lookup) { - String processedMessage = lookup.message; + private static String processFormatting(@NotNull final String message) { + String processedMessage = message; processedMessage = ChatColor.translateAlternateColorCodes('&', processedMessage); processedMessage = translateGradients(processedMessage); processedMessage = translateHexColorCodes(processedMessage); @@ -576,11 +575,6 @@ public final class StringUtils { WITHOUT_PLACEHOLDERS } - private static record FormatLookup(@NotNull String message, - @Nullable Player player) { - - } - private StringUtils() { throw new UnsupportedOperationException("This is a utility class and cannot be instantiated"); }