Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Cleaned up StringUtils

Browse Source
This commit is contained in:
Auxilor
2022-02-01 14:12:03 +00:00
parent 7e60ee63ea
commit a06d782dea
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
eco-api/src/main/java/com/willfp/eco/util/StringUtils.java
View File

@@ -72,9 +72,9 @@ public final class StringUtils {
/**
* String format cache.
*/
private static final LoadingCache<FormatLookup, String> STRING_FORMAT_CACHE = Caffeine.newBuilder()
private static final LoadingCache<String, String> 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");
}