Skip to content

Replace temporary placeholders back to actual values for MiniMessage tags #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SrBedrock merged 3 commits into from
Feb 26, 2026
Merged

Replace temporary placeholders back to actual values for MiniMessage tags #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de0df4f
Fix non-breaking space handling and placeholders
SrBedrock Feb 26, 2026
b4d0348
Include requester name in tpa messages
SrBedrock Feb 26, 2026
88dc3da
Include player names in tpa messages
SrBedrock Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions Essentials/src/main/java/com/earth2me/essentials/I18n.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ public void blockingLoadBundle(final Locale locale) {
ResourceBundle bundle;
try {
bundle = ResourceBundle.getBundle(MESSAGES, locale, new FileResClassLoader(I18n.class.getClassLoader(), ess), new UTF8PropertiesControl());
} catch (MissingResourceException ex) {
} catch (final MissingResourceException ex) {
try {
bundle = ResourceBundle.getBundle(MESSAGES, locale, new UTF8PropertiesControl());
} catch (MissingResourceException ex2) {
} catch (final MissingResourceException ex2) {
bundle = NULL_BUNDLE;
}
}
Expand Down Expand Up @@ -190,7 +190,14 @@ private String format(final Locale locale, final String string, final Object...
return ess.getAdventureFacet().legacyToMini(ess.getAdventureFacet().escapeTags(arg.toString()));
});

return messageFormat.format(processedArgs).replace(' ', ' '); // replace nbsp with a space
String result = messageFormat.format(processedArgs).replace('\u00A0', ' '); // replace nbsp with a spaceeplace(' ', ' '); // replace nbsp with a space

// Replace temporary placeholders back to actual values for MiniMessage tags
for (int i = 0; i < processedArgs.length; i++) {
result = result.replace("{" + i + "}", processedArgs[i].toString());
}

return result;
}

public static Object[] mutateArgs(final Object[] objects, final Function<Object, String> mutator) {
Expand Down Expand Up @@ -312,7 +319,7 @@ public ResourceBundle newBundle(final String baseName, final Locale locale, fina
}

@Override
public Locale getFallbackLocale(String baseName, Locale locale) {
public Locale getFallbackLocale(final String baseName, final Locale locale) {
if (baseName == null || locale == null) {
throw new NullPointerException();
}
Expand Down
16 changes: 8 additions & 8 deletions Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpa.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ public void run(final Server server, final User user, final String commandLabel,
teleport.teleport(player.getBase(), charge, PlayerTeleportEvent.TeleportCause.COMMAND, future);
future.thenAccept(success -> {
if (success) {
player.sendTl("requestAcceptedAuto", user.getDisplayName());
user.sendTl("requestAcceptedFromAuto", player.getDisplayName());
player.sendTl("requestAcceptedAuto", user.getDisplayName(), user.getName());
user.sendTl("requestAcceptedFromAuto", player.getDisplayName(), player.getName());
}
});
throw new NoChargeException();
Expand All @@ -61,20 +61,20 @@ public void run(final Server server, final User user, final String commandLabel,
final TPARequestEvent tpaEvent = new TPARequestEvent(user.getSource(), player, false);
ess.getServer().getPluginManager().callEvent(tpaEvent);
if (tpaEvent.isCancelled()) {
throw new TranslatableException("teleportRequestCancelled", player.getDisplayName());
throw new TranslatableException("teleportRequestCancelled", player.getDisplayName(), player.getName());
}
player.requestTeleport(user, false);
player.sendTl("teleportRequest", user.getDisplayName());
player.sendTl("typeTpaccept");
player.sendTl("typeTpdeny");
player.sendTl("teleportRequest", user.getDisplayName(), user.getName());
player.sendTl("typeTpaccept", user.getDisplayName(), user.getName());
player.sendTl("typeTpdeny", user.getDisplayName(), user.getName());
if (ess.getSettings().getTpaAcceptCancellation() != 0) {
player.sendTl("teleportRequestTimeoutInfo", ess.getSettings().getTpaAcceptCancellation());
}
}

user.sendTl("requestSent", player.getDisplayName());
user.sendTl("requestSent", player.getDisplayName(), player.getName());
if (user.isAuthorized("essentials.tpacancel")) {
user.sendTl("typeTpacancel");
user.sendTl("typeTpacancel", player.getDisplayName(), player.getName());
}
}

Expand Down