Skip to content

Commit 5ac65a9

Browse files
committed
allow Component as message in class Message
1 parent ada24aa commit 5ac65a9

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

src/main/java/pro/cloudnode/smp/cloudnodemsg/PluginConfig.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ public PluginConfig(final @NotNull FileConfiguration config) {
2828
* @param recipient The username of the message recipient
2929
* @param message The message text
3030
*/
31-
public @NotNull Component incoming(final @NotNull String sender, final @NotNull String recipient, final @NotNull String message) {
31+
public @NotNull Component incoming(final @NotNull String sender, final @NotNull String recipient, final @NotNull Component message) {
3232
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("incoming"))
3333
.replace("<sender>", sender)
3434
.replace("<recipient>", recipient),
35-
Placeholder.unparsed("message", message)
35+
Placeholder.component("message", message)
3636
);
3737
}
3838

@@ -49,11 +49,11 @@ public PluginConfig(final @NotNull FileConfiguration config) {
4949
* @param recipient The username of the message recipient
5050
* @param message The message text
5151
*/
52-
public @NotNull Component outgoing(final @NotNull String sender, final @NotNull String recipient, final @NotNull String message) {
52+
public @NotNull Component outgoing(final @NotNull String sender, final @NotNull String recipient, final @NotNull Component message) {
5353
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("outgoing"))
5454
.replace("<sender>", sender)
5555
.replace("<recipient>", recipient),
56-
Placeholder.unparsed("message", message)
56+
Placeholder.component("message", message)
5757
);
5858
}
5959

src/main/java/pro/cloudnode/smp/cloudnodemsg/message/Message.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,20 @@
1818
import java.util.Optional;
1919
import java.util.UUID;
2020

21-
public record Message(@NotNull OfflinePlayer sender, @NotNull OfflinePlayer recipient, @NotNull String message) {
21+
public final class Message {
22+
private final @NotNull OfflinePlayer sender;
23+
private final @NotNull OfflinePlayer recipient;
24+
private final @NotNull Component message;
25+
26+
public Message(@NotNull OfflinePlayer sender, @NotNull OfflinePlayer recipient, @NotNull Component message) {
27+
this.sender = sender;
28+
this.recipient = recipient;
29+
this.message = message;
30+
}
31+
32+
public Message(@NotNull OfflinePlayer sender, @NotNull OfflinePlayer recipient, @NotNull String message) {
33+
this(sender, recipient, Component.text(message));
34+
}
2235

2336
private @NotNull String playerOrServerUsername(final @NotNull OfflinePlayer player) throws InvalidPlayerError {
2437
if (player.getUniqueId().equals(console.getUniqueId()))

0 commit comments

Comments
 (0)