Skip to content

Commit 822615d

Browse files
committed
Support formated console message
1 parent 8ede896 commit 822615d

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

bukkit/src/main/java/io/github/rothes/protocolstringreplacer/console/PsrMessage.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,18 @@ public class PsrMessage implements Message, CharSequence{
2121
private static ProtocolStringReplacer plugin;
2222

2323
private String message;
24+
private Object[] params;
2425
private transient CharSequence charSequence;
2526

2627
/**
2728
* Constructor that includes the message.
2829
* @param message The String message.
2930
*/
3031
public PsrMessage(final String message) {
32+
this(message, null);
33+
}
34+
35+
public PsrMessage(final String message, final Object[] params) {
3136
if (plugin.hasStarted()) {
3237
SimpleTextContainer container = new SimpleTextContainer(message);
3338
container.createTexts(container);
@@ -46,6 +51,7 @@ public PsrMessage(final String message) {
4651
this.message = message;
4752
this.charSequence = message;
4853
}
54+
this.params = params;
4955
}
5056

5157
/**
@@ -81,7 +87,10 @@ public static void initialize(ProtocolStringReplacer plugin) {
8187
*/
8288
@Override
8389
public String getFormattedMessage() {
84-
return message = message == null ? String.valueOf(charSequence) : message ;
90+
if (message == null) {
91+
message = params == null ? String.valueOf(charSequence) : String.format(charSequence.toString(), params);
92+
}
93+
return message;
8594
}
8695

8796
/**
@@ -99,7 +108,7 @@ public String getFormat() {
99108
*/
100109
@Override
101110
public Object[] getParameters() {
102-
return null;
111+
return params;
103112
}
104113

105114
@Override

bukkit/src/main/java/io/github/rothes/protocolstringreplacer/console/PsrMessageFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public Message newMessage(CharSequence message) {
1717

1818
@Override
1919
public Message newMessage(String message, Object... params) {
20-
return new PsrMessage(message);
20+
return new PsrMessage(message, params);
2121
}
2222

2323
}

0 commit comments

Comments
 (0)