Skip to content

Commit

Permalink
fix: close all tags inserted in messages
Browse files Browse the repository at this point in the history
  • Loading branch information
broccolai committed Nov 1, 2023
1 parent 9e0a1d3 commit 78dd9d0
Showing 1 changed file with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ public MiniMessageService(

@Override
public TagResolver prefix() {
return TagResolver.resolver("prefix", Tag.inserting(this.locale.prefix.asComponent()));
return TagResolver.resolver("prefix", Tag.selfClosingInserting(this.locale.prefix.asComponent()));
}

@Override
public Component commandSelect(final @NonNull ConstructedTag tag) {
TagResolver tagComponent = TagResolver.resolver("tag", Tag.inserting(tag.component()));
TagResolver tagComponent = TagResolver.resolver("tag", Tag.selfClosingInserting(tag.component()));

return this.locale.commands.player.select.asComponent(this.prefix(), tagComponent);
}
Expand All @@ -46,7 +46,7 @@ public Component commandList(final @NonNull Collection<ConstructedTag> tags) {

for (ConstructedTag tag : tags) {
TagResolver nameTemplate = TagResolver.resolver("name", Tag.preProcessParsed(tag.name()));
TagResolver tagComponent = TagResolver.resolver("tag", Tag.inserting(tag.component()));
TagResolver tagComponent = TagResolver.resolver("tag", Tag.selfClosingInserting(tag.component()));

component = component.append(this.locale.commands.player.listEntry.asComponent(nameTemplate, tagComponent));
}
Expand All @@ -57,7 +57,7 @@ public Component commandList(final @NonNull Collection<ConstructedTag> tags) {
@Override
public Component commandInfo(final @NonNull ConstructedTag tag) {
TagResolver nameTemplate = TagResolver.resolver("name", Tag.preProcessParsed(tag.name()));
TagResolver tagTemplate = TagResolver.resolver("tag", Tag.inserting(tag.component()));
TagResolver tagTemplate = TagResolver.resolver("tag", Tag.selfClosingInserting(tag.component()));
TagResolver reasonTemplate = TagResolver.resolver("reason", Tag.preProcessParsed(tag.reason()));

return this.locale.commands.player.info.asComponent(this.prefix(), nameTemplate, tagTemplate, reasonTemplate);
Expand All @@ -68,7 +68,7 @@ public Component commandAdminGive(
final @NonNull ConstructedTag tag,
final @NonNull TagsUser target
) {
TagResolver tagComponent = TagResolver.resolver("tag", Tag.inserting(tag.component()));
TagResolver tagComponent = TagResolver.resolver("tag", Tag.selfClosingInserting(tag.component()));
TagResolver targetComponent = TagResolver.resolver("target", Tag.preProcessParsed(this.nameFromUser(target)));

return this.locale.commands.admin.give.asComponent(this.prefix(), tagComponent, targetComponent);
Expand All @@ -79,7 +79,7 @@ public Component commandAdminRemove(
final @NonNull ConstructedTag tag,
final @NonNull TagsUser target
) {
TagResolver tagComponent = TagResolver.resolver("tag", Tag.inserting(tag.component()));
TagResolver tagComponent = TagResolver.resolver("tag", Tag.selfClosingInserting(tag.component()));
TagResolver targetComponent = TagResolver.resolver("target", Tag.preProcessParsed(this.nameFromUser(target)));

return this.locale.commands.admin.remove.asComponent(this.prefix(), tagComponent, targetComponent);
Expand All @@ -91,7 +91,7 @@ public Component commandAdminList(final @NonNull Collection<ConstructedTag> tags

for (ConstructedTag tag : tags) {
TagResolver nameTemplate = TagResolver.resolver("name", Tag.preProcessParsed(tag.name()));
TagResolver tagTemplate = TagResolver.resolver("tag", Tag.inserting(tag.component()));
TagResolver tagTemplate = TagResolver.resolver("tag", Tag.selfClosingInserting(tag.component()));

component = component.append(this.locale.commands.admin.listEntry.asComponent(nameTemplate, tagTemplate));
}
Expand All @@ -101,7 +101,7 @@ public Component commandAdminList(final @NonNull Collection<ConstructedTag> tags

@Override
public Component commandAdminSet(@NonNull final ConstructedTag tag, @NonNull final TagsUser target) {
TagResolver tagTemplate = TagResolver.resolver("tag", Tag.inserting(tag.component()));
TagResolver tagTemplate = TagResolver.resolver("tag", Tag.selfClosingInserting(tag.component()));
TagResolver targetTemplate = TagResolver.resolver("target", Tag.preProcessParsed(this.nameFromUser(target)));

return this.locale.commands.admin.set.asComponent(this.prefix(), tagTemplate, targetTemplate);
Expand Down

0 comments on commit 78dd9d0

Please sign in to comment.