Moved subStatNameComponent method in MessageFactory up to be more consistent

This commit is contained in:
Artemis-the-gr8 2022-06-27 19:12:45 +02:00
parent 54c2f73e76
commit 6ddc543bd0

View File

@ -296,6 +296,25 @@ public class MessageFactory {
.build();
}
protected @Nullable TextComponent subStatNameComponent(Target selection, @Nullable String subStatName) {
if (subStatName != null) {
TextDecoration style = getStyleFromString(config.getSubStatNameFormatting(selection, true));
TextComponent.Builder subStat = text()
.append(text("("))
.append(translatable()
.key(subStatName))
.append(text(")"))
.color(getColorFromString(config.getSubStatNameFormatting(selection, false)));
subStat.decorations(TextDecoration.NAMES.values(), false);
if (style != null) subStat.decoration(style, TextDecoration.State.TRUE);
return subStat.build();
}
else {
return null;
}
}
/** Construct a custom translation for kill_entity with the language key for commands.kill.success.single ("Killed %s").
@return a TranslatableComponent Builder with the subStat Component as args.*/
private TranslatableComponent.Builder killEntityComponent(@NotNull TextComponent subStat) {
@ -317,25 +336,6 @@ public class MessageFactory {
.args(subStat));
}
protected @Nullable TextComponent subStatNameComponent(Target selection, @Nullable String subStatName) {
if (subStatName != null) {
TextDecoration style = getStyleFromString(config.getSubStatNameFormatting(selection, true));
TextComponent.Builder subStat = text()
.append(text("("))
.append(translatable()
.key(subStatName))
.append(text(")"))
.color(getColorFromString(config.getSubStatNameFormatting(selection, false)));
subStat.decorations(TextDecoration.NAMES.values(), false);
if (style != null) subStat.decoration(style, TextDecoration.State.TRUE);
return subStat.build();
}
else {
return null;
}
}
protected TextComponent statNumberComponent(Target selection, long number) {
return getComponent(NumberFormatter.format(number),
getColorFromString(config.getStatNumberFormatting(selection, false)),
@ -374,7 +374,7 @@ public class MessageFactory {
getStyleFromString(config.getDotsFormatting(true)));
}
protected TextComponent getComponent(String content, TextColor color, @Nullable TextDecoration style) {
private TextComponent getComponent(String content, TextColor color, @Nullable TextDecoration style) {
return style == null ? text(content).color(color) : text(content).color(color).decoration(style, TextDecoration.State.TRUE);
}