diff --git a/eco-api/src/main/java/com/willfp/eco/core/items/builder/AbstractItemStackBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/items/builder/AbstractItemStackBuilder.java index e08e66ff..b52b5ce7 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/items/builder/AbstractItemStackBuilder.java +++ b/eco-api/src/main/java/com/willfp/eco/core/items/builder/AbstractItemStackBuilder.java @@ -79,7 +79,7 @@ public abstract class AbstractItemStackBuilder lore = meta.hasLore() ? meta.getLore() : new ArrayList<>(); assert lore != null; - lore.add(StringUtils.translate(line)); + lore.add(StringUtils.format(line)); meta.setLore(lore); return (U) this; @@ -112,7 +112,7 @@ public abstract class AbstractItemStackBuilder lore = meta.hasLore() ? meta.getLore() : new ArrayList<>(); assert lore != null; for (String line : lines) { - lore.add(StringUtils.translate(line)); + lore.add(StringUtils.format(line)); } meta.setLore(lore); 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 ae8549ce..e6e3cd2e 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 @@ -41,41 +41,41 @@ public class StringUtils { .build(); /** - * Translate a list of strings - converts Placeholders and Color codes. + * Format a list of strings - converts Placeholders and Color codes. * - * @param list The messages to translate. + * @param list The messages to format. * @param player The player to translate placeholders with respect to. - * @return The message, translated. + * @return The message, format. */ - public List translateList(@NotNull final List list, - @Nullable final Player player) { + public List formatList(@NotNull final List list, + @Nullable final Player player) { List translated = new ArrayList<>(); for (String string : list) { - translated.add(translate(string, player)); + translated.add(format(string, player)); } return translated; } /** - * Translate a list of strings - converts Placeholders and Color codes. + * Format a list of strings - converts Placeholders and Color codes. * - * @param list The messages to translate. - * @return The message, translated. + * @param list The messages to format. + * @return The message, formatted. */ - public List translateList(@NotNull final List list) { - return translateList(list, null); + public List formatList(@NotNull final List list) { + return formatList(list, null); } /** - * Translate a string - converts Placeholders and Color codes. + * Format a string - converts Placeholders and Color codes. * - * @param message The message to translate. + * @param message The message to format. * @param player The player to translate placeholders with respect to. - * @return The message, translated. + * @return The message, formatted. */ - public String translate(@NotNull final String message, - @Nullable final Player player) { + public String format(@NotNull final String message, + @Nullable final Player player) { String processedMessage = message; processedMessage = translateGradients(processedMessage); processedMessage = PlaceholderManager.translatePlaceholders(processedMessage, player); @@ -85,14 +85,14 @@ public class StringUtils { } /** - * Translate a string without respect to a player. + * Format a string without respect to a player. * * @param message The message to translate. - * @return The message, translated. - * @see StringUtils#translate(String, Player) + * @return The message, formatted. + * @see StringUtils#format(String, Player) */ - public String translate(@NotNull final String message) { - return translate(message, null); + public String format(@NotNull final String message) { + return format(message, null); } private static String translateHexColorCodes(@NotNull final String message) { diff --git a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/EcoJSONConfigWrapper.java b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/EcoJSONConfigWrapper.java index e4d2a24f..9a785efe 100644 --- a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/EcoJSONConfigWrapper.java +++ b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/EcoJSONConfigWrapper.java @@ -286,7 +286,7 @@ public class EcoJSONConfigWrapper implements JSONConfig { public String getString(@NotNull final String path, final boolean format) { String string = Objects.requireNonNullElse(getOfKnownType(path, String.class), ""); - return format ? StringUtils.translate(string) : string; + return format ? StringUtils.format(string) : string; } @Override @@ -322,7 +322,7 @@ public class EcoJSONConfigWrapper implements JSONConfig { final boolean format) { List strings = (List) Objects.requireNonNullElse(getOfKnownType(path, Object.class), new ArrayList<>()); - return format ? StringUtils.translateList(strings) : strings; + return format ? StringUtils.formatList(strings) : strings; } @Override diff --git a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/EcoYamlConfigWrapper.java b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/EcoYamlConfigWrapper.java index 6132887a..d73d3930 100644 --- a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/EcoYamlConfigWrapper.java +++ b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/yaml/EcoYamlConfigWrapper.java @@ -202,7 +202,7 @@ public class EcoYamlConfigWrapper implements Con if (cache.containsKey(path)) { return (String) cache.get(path); } else { - cache.put(path, StringUtils.translate(Objects.requireNonNull(handle.getString(path, "")))); + cache.put(path, StringUtils.format(Objects.requireNonNull(handle.getString(path, "")))); return getString(path); } } @@ -214,7 +214,7 @@ public class EcoYamlConfigWrapper implements Con return (String) cache.get(path); } else { String string = Objects.requireNonNull(handle.getString(path, "")); - cache.put(path, format ? StringUtils.translate(string) : string); + cache.put(path, format ? StringUtils.format(string) : string); return getString(path); } } @@ -250,7 +250,7 @@ public class EcoYamlConfigWrapper implements Con public List getStrings(@NotNull final String path, final boolean format) { if (cache.containsKey(path)) { - return format ? StringUtils.translateList((List) cache.get(path)) : (List) cache.get(path); + return format ? StringUtils.formatList((List) cache.get(path)) : (List) cache.get(path); } else { cache.put(path, has(path) ? new ArrayList<>(handle.getStringList(path)) : new ArrayList<>()); return getStrings(path); diff --git a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/gui/menu/EcoMenu.java b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/gui/menu/EcoMenu.java index e452793f..11a76337 100644 --- a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/gui/menu/EcoMenu.java +++ b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/gui/menu/EcoMenu.java @@ -4,10 +4,8 @@ import com.willfp.eco.core.gui.menu.Menu; import com.willfp.eco.core.gui.slot.FillerSlot; import com.willfp.eco.core.gui.slot.Slot; import com.willfp.eco.internal.gui.slot.EcoFillerSlot; -import com.willfp.eco.internal.gui.slot.EcoSlot; import com.willfp.eco.util.StringUtils; import lombok.Getter; -import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryCloseEvent; @@ -90,7 +88,7 @@ public class EcoMenu implements Menu { if (meta != null) { List lore = meta.getLore(); if (lore != null) { - lore.replaceAll(s -> StringUtils.translate(s, player)); + lore.replaceAll(s -> StringUtils.format(s, player)); meta.setLore(lore); } slotItem.setItemMeta(meta); diff --git a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/gui/menu/EcoMenuBuilder.java b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/gui/menu/EcoMenuBuilder.java index 4b19f426..e0cb17d0 100644 --- a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/gui/menu/EcoMenuBuilder.java +++ b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/gui/menu/EcoMenuBuilder.java @@ -51,7 +51,7 @@ public class EcoMenuBuilder implements MenuBuilder { @Override public MenuBuilder setTitle(@NotNull final String title) { - this.title = StringUtils.translate(title); + this.title = StringUtils.format(title); return this; } diff --git a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/logging/EcoLogger.java b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/logging/EcoLogger.java index 5e86a429..327818f7 100644 --- a/eco-core/core-backend/src/main/java/com/willfp/eco/internal/logging/EcoLogger.java +++ b/eco-core/core-backend/src/main/java/com/willfp/eco/internal/logging/EcoLogger.java @@ -17,16 +17,16 @@ public class EcoLogger extends Logger { @Override public void info(@NotNull final String msg) { - super.info(StringUtils.translate(msg)); + super.info(StringUtils.format(msg)); } @Override public void warning(@NotNull final String msg) { - super.warning(StringUtils.translate(msg)); + super.warning(StringUtils.format(msg)); } @Override public void severe(@NotNull final String msg) { - super.severe(StringUtils.translate(msg)); + super.severe(StringUtils.format(msg)); } }