Skip to content

Commit 3e0d201

Browse files
committed
remove Colorize StringReplacer
only colorize in message action and item name & lore
1 parent afe16ed commit 3e0d201

4 files changed

Lines changed: 20 additions & 23 deletions

File tree

src/main/java/me/hsgamer/bettergui/builder/ActionBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import me.hsgamer.hscore.action.common.Action;
99
import me.hsgamer.hscore.bukkit.action.PlayerAction;
1010
import me.hsgamer.hscore.bukkit.action.builder.BukkitActionBuilder;
11+
import me.hsgamer.hscore.bukkit.utils.ColorUtils;
1112
import me.hsgamer.hscore.common.CollectionUtils;
1213

1314
import java.util.List;
@@ -25,7 +26,7 @@ public ActionBuilder(BetterGUI plugin) {
2526

2627
@Override
2728
public void load() {
28-
BukkitActionBuilder.register(this, plugin);
29+
BukkitActionBuilder.register(this, plugin, ColorUtils::colorize);
2930
register(OpenMenuAction::new, "open-menu", "open", "menu", "open-menu");
3031
register(BackAction::new, "back-menu", "backmenu");
3132
register(input -> new CloseMenuAction(input.getMenuElement().getMenu()), "close-menu", "closemenu");

src/main/java/me/hsgamer/bettergui/builder/ItemModifierBuilder.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.github.projectunified.craftitem.spigot.skull.SkullModifier;
99
import io.github.projectunified.minelib.plugin.base.Loadable;
1010
import me.hsgamer.hscore.builder.FunctionalMassBuilder;
11+
import me.hsgamer.hscore.bukkit.utils.ColorUtils;
1112
import me.hsgamer.hscore.bukkit.utils.VersionUtils;
1213
import me.hsgamer.hscore.common.CollectionUtils;
1314

@@ -26,8 +27,16 @@ public ItemModifierBuilder() {
2627

2728
@Override
2829
public void load() {
29-
register(entry -> new NameModifier(Objects.toString(entry.getValue())), "name");
30-
register(entry -> new LoreModifier(CollectionUtils.createStringListFromObject(entry.getValue())), "lore");
30+
register(entry -> {
31+
NameModifier nameModifier = new NameModifier(Objects.toString(entry.getValue()));
32+
nameModifier.setTransformer(ColorUtils::colorize);
33+
return nameModifier;
34+
}, "name");
35+
register(entry -> {
36+
LoreModifier loreModifier = new LoreModifier(CollectionUtils.createStringListFromObject(entry.getValue()));
37+
loreModifier.setTransformer(ColorUtils::colorize);
38+
return loreModifier;
39+
}, "lore");
3140
register(entry -> new AmountModifier(Objects.toString(entry.getValue())), "amount");
3241
register(entry -> new DurabilityModifier(Objects.toString(entry.getValue())), "durability", "damage");
3342
register(entry -> new MaterialModifier(CollectionUtils.createStringListFromObject(entry.getValue(), true)), "material", "id", "mat", "raw-material", "raw-id", "raw-mat");

src/main/java/me/hsgamer/bettergui/menu/AddonMenu.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import me.hsgamer.bettergui.downloader.AdditionalInfoKeys;
1010
import me.hsgamer.bettergui.downloader.AddonDownloader;
1111
import me.hsgamer.bettergui.manager.AddonManager;
12-
import me.hsgamer.bettergui.util.StringReplacerApplier;
1312
import me.hsgamer.hscore.bukkit.utils.MessageUtils;
1413
import me.hsgamer.hscore.common.MapUtils;
1514
import me.hsgamer.hscore.config.Config;
@@ -91,15 +90,12 @@ private class AddonButton implements Button, Element {
9190

9291
AddonButton(DownloadInfo downloadInfo) {
9392
this.downloadInfo = downloadInfo;
94-
this.translator = s -> {
95-
s = s
96-
.replace("{status}", status)
97-
.replace("{name}", downloadInfo.getName())
98-
.replace("{version}", downloadInfo.getVersion())
99-
.replace("{description}", AdditionalInfoKeys.DESCRIPTION.get(downloadInfo))
100-
.replace("{author}", AdditionalInfoKeys.AUTHORS.get(downloadInfo).toString());
101-
return StringReplacerApplier.COLORIZE.replace(s);
102-
};
93+
this.translator = s -> s
94+
.replace("{status}", status)
95+
.replace("{name}", downloadInfo.getName())
96+
.replace("{version}", downloadInfo.getVersion())
97+
.replace("{description}", AdditionalInfoKeys.DESCRIPTION.get(downloadInfo))
98+
.replace("{author}", AdditionalInfoKeys.AUTHORS.get(downloadInfo).toString());
10399
}
104100

105101
private void updateStatus() {

src/main/java/me/hsgamer/bettergui/util/StringReplacerApplier.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import io.github.projectunified.maptemplate.MapTemplate;
44
import me.hsgamer.bettergui.BetterGUI;
55
import me.hsgamer.bettergui.api.element.MenuElement;
6-
import me.hsgamer.hscore.bukkit.utils.ColorUtils;
76
import me.hsgamer.hscore.common.StringReplacer;
87
import me.hsgamer.hscore.variable.VariableManager;
98

@@ -17,10 +16,6 @@
1716
* A utility class to apply StringReplacer
1817
*/
1918
public final class StringReplacerApplier {
20-
/**
21-
* A replacer to colorize the string
22-
*/
23-
public static final StringReplacer COLORIZE = ColorUtils::colorize;
2419
private static final List<StringReplacer> STRING_REPLACERS = new ArrayList<>();
2520

2621
private StringReplacerApplier() {
@@ -73,10 +68,7 @@ public static MapTemplate createMapTemplate(UUID uuid, MenuElement menuElement)
7368
*/
7469
public static UnaryOperator<String> getReplaceOperator(UUID uuid, MenuElement menuElement) {
7570
MapTemplate mapTemplate = createMapTemplate(uuid, menuElement);
76-
77-
List<StringReplacer> replacers = new ArrayList<>(STRING_REPLACERS);
78-
replacers.add(COLORIZE);
79-
StringReplacer combined = StringReplacer.combine(replacers);
71+
StringReplacer combined = StringReplacer.combine(STRING_REPLACERS);
8072

8173
return s -> {
8274
s = Objects.toString(mapTemplate.apply(s));
@@ -115,7 +107,6 @@ public static String replace(String string, UUID uuid, MenuElement menuElement)
115107
string = newString;
116108
}
117109
}
118-
string = COLORIZE.tryReplace(string, uuid);
119110
return string;
120111
}
121112

0 commit comments

Comments
 (0)