Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-08 03:29:41 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1509 from Maxetto/patch-1

Browse Source 
Be able to replace sender name in every message
This commit is contained in:
Gabriele C 2018-03-02 03:32:05 +01:00 committed by GitHub
commit 2281c16344
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -345,7 +345,7 @@
<!-- Our Repo (Many libs) --> <!-- Our Repo (Many libs) -->
<repository> <repository>
<id>codemc-repo</id> <id>codemc-repo</id>
<url>http://ci.codemc.org/plugin/repository/maven-public/</url> <url>https://repo.codemc.org/repository/maven-public/</url>
</repository> </repository>
<!-- bStats Repo --> <!-- bStats Repo -->

6
src/main/java/fr/xephi/authme/message/Messages.java
View File

@ -18,6 +18,8 @@ public class Messages {
// Custom Authme tag replaced to new line // Custom Authme tag replaced to new line
private static final String NEWLINE_TAG = "%nl%"; private static final String NEWLINE_TAG = "%nl%";
private static final String PLAYER_TAG = "%username%";
/** Contains the keys of the singular messages for time units. */ /** Contains the keys of the singular messages for time units. */
private static final Map<TimeUnit, MessageKey> TIME_UNIT_SINGULARS = ImmutableMap.<TimeUnit, MessageKey>builder() private static final Map<TimeUnit, MessageKey> TIME_UNIT_SINGULARS = ImmutableMap.<TimeUnit, MessageKey>builder()
.put(TimeUnit.SECONDS, MessageKey.SECOND) .put(TimeUnit.SECONDS, MessageKey.SECOND)
@ -51,7 +53,7 @@ public class Messages {
public void send(CommandSender sender, MessageKey key) { public void send(CommandSender sender, MessageKey key) {
String[] lines = retrieve(key); String[] lines = retrieve(key);
for (String line : lines) { for (String line : lines) {
sender.sendMessage(line); sender.sendMessage(line.replaceAll(PLAYER_TAG, sender.getName()));
} }
} }
@ -65,7 +67,7 @@ public class Messages {
* @param replacements The replacements to apply for the tags * @param replacements The replacements to apply for the tags
*/ */
public void send(CommandSender sender, MessageKey key, String... replacements) { public void send(CommandSender sender, MessageKey key, String... replacements) {
String message = retrieveSingle(key, replacements); String message = retrieveSingle(key, replacements).replaceAll(PLAYER_TAG, sender.getName());
for (String line : message.split("\n")) { for (String line : message.split("\n")) {
sender.sendMessage(line); sender.sendMessage(line);
} }