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

Renamed StringUtils.translate to StringUtils.format

Browse Source
This commit is contained in:
Auxilor
2021-07-20 00:16:46 +01:00
committed by Auxilor
parent 226ad14ede
commit b40c3a41c2
7 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eco-api/src/main/java/com/willfp/eco/core/items/builder/AbstractItemStackBuilder.java
View File

@@ -79,7 +79,7 @@ public abstract class AbstractItemStackBuilder<T extends ItemMeta, U extends Abs
@Override
public U setDisplayName(@NotNull final String name) {
meta.setDisplayName(StringUtils.translate(name));
meta.setDisplayName(StringUtils.format(name));
return (U) this;
}
@@ -94,7 +94,7 @@ public abstract class AbstractItemStackBuilder<T extends ItemMeta, U extends Abs
public U addLoreLine(@NotNull final String line) {
List<String> 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<T extends ItemMeta, U extends Abs
List<String> 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);

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

@@ -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<String> translateList(@NotNull final List<String> list,
@Nullable final Player player) {
public List<String> formatList(@NotNull final List<String> list,
@Nullable final Player player) {
List<String> 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<String> translateList(@NotNull final List<String> list) {
return translateList(list, null);
public List<String> formatList(@NotNull final List<String> 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) {