Skip to content

Commit 30a0bbf

Browse files
RefracRefrac
committed
3rd Attempt at fixing #34 
1 parent 6ed13f5 commit 30a0bbf

File tree

9 files changed

+81
-32
lines changed

9 files changed

+81
-32
lines changed

‎SimpleStaffChat-Bungee/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>me.refracdevelopment</groupId>
88
<artifactId>SimpleStaffChat</artifactId>
9-
<version>4.3.2</version>
9+
<version>4.3.2-beta</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎SimpleStaffChat-Bungee/src/main/java/me/refracdevelopment/simplestaffchat/utilities/chat/RyMessageUtils.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,14 @@ public static Component adventureTranslate(String message) {
134134
return component;
135135
}
136136

137+
/**
138+
* Translate a string from legacy to Adventure API.
139+
*
140+
* @param input The string that needs translating.
141+
* @return String which is in an adventure format.
142+
*
143+
* @Author: EternalCodeTeam (https://github.com/EternalCodeTeam/ChatFormatter/)
144+
*/
137145
private static String legacyToAdventure(String input) {
138146
String result = HEX_PATTERN.matcher(input).replaceAll(matchResult -> {
139147
String hex = matchResult.group(1);

‎SimpleStaffChat-Spigot/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>me.refracdevelopment</groupId>
88
<artifactId>SimpleStaffChat</artifactId>
9-
<version>4.3.2</version>
9+
<version>4.3.2-beta</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎SimpleStaffChat-Spigot/src/main/java/me/refracdevelopment/simplestaffchat/listeners/JoinListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void onJoin(PlayerJoinEvent event) {
3939
if (!player.hasPermission(Permissions.STAFFCHAT_JOIN))
4040
return;
4141

42-
RyMessageUtils.broadcast(player, Permissions.STAFFCHAT_SEE, this.plugin.getSettings().JOIN_FORMAT);
42+
RyMessageUtils.sendStaffChat(player, Permissions.STAFFCHAT_SEE, this.plugin.getSettings().JOIN_FORMAT);
4343

4444
RyMessageUtils.sendConsole(true, this.plugin.getSettings().JOIN_FORMAT);
4545
DiscordImpl.sendJoin(JoinType.JOIN, player);
@@ -52,7 +52,7 @@ public void onQuit(PlayerQuitEvent event) {
5252
if (!player.hasPermission(Permissions.STAFFCHAT_QUIT))
5353
return;
5454

55-
RyMessageUtils.broadcast(player, Permissions.STAFFCHAT_SEE, this.plugin.getSettings().QUIT_FORMAT);
55+
RyMessageUtils.sendStaffChat(player, Permissions.STAFFCHAT_SEE, this.plugin.getSettings().QUIT_FORMAT);
5656

5757
RyMessageUtils.sendConsole(true, this.plugin.getSettings().QUIT_FORMAT);
5858
DiscordImpl.sendJoin(JoinType.LEAVE, player);

‎SimpleStaffChat-Spigot/src/main/java/me/refracdevelopment/simplestaffchat/utilities/Methods.java‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,10 @@ public void sendStaffChat(CommandSender commandSender, String format, String mes
3434
return;
3535
}
3636

37-
SimpleStaffChat.getInstance().getServer().getOnlinePlayers().forEach(onlinePlayer -> {
38-
if (onlinePlayer.hasPermission(Permissions.STAFFCHAT_SEE) && !staffChatMuted.contains(onlinePlayer.getUniqueId())) {
39-
RyMessageUtils.sendPlayer(onlinePlayer, format
40-
.replace("%server%", SimpleStaffChat.getInstance().getSettings().SERVER_NAME)
41-
.replace("%player%", player.getName())
42-
);
43-
}
44-
});
37+
RyMessageUtils.sendStaffChat(player, Permissions.STAFFCHAT_SEE, format
38+
.replace("%server%", SimpleStaffChat.getInstance().getSettings().SERVER_NAME)
39+
.replace("%player%", player.getName())
40+
);
4541

4642
RyMessageUtils.sendConsole(true, format
4743
.replace("%server%", SimpleStaffChat.getInstance().getSettings().SERVER_NAME)
@@ -80,14 +76,10 @@ public void sendDevChat(CommandSender commandSender, String format, String messa
8076
return;
8177
}
8278

83-
SimpleStaffChat.getInstance().getServer().getOnlinePlayers().forEach(onlinePlayer -> {
84-
if (onlinePlayer.hasPermission(Permissions.DEVCHAT_SEE) && !devChatMuted.contains(onlinePlayer.getUniqueId())) {
85-
RyMessageUtils.sendPlayer(onlinePlayer, format
86-
.replace("%server%", SimpleStaffChat.getInstance().getSettings().SERVER_NAME)
87-
.replace("%player%", player.getName())
88-
);
89-
}
90-
});
79+
RyMessageUtils.sendDevChat(player, Permissions.DEVCHAT_SEE, format
80+
.replace("%server%", SimpleStaffChat.getInstance().getSettings().SERVER_NAME)
81+
.replace("%player%", player.getName())
82+
);
9183

9284
RyMessageUtils.sendConsole(true, format
9385
.replace("%server%", SimpleStaffChat.getInstance().getSettings().SERVER_NAME)
@@ -127,14 +119,10 @@ public void sendAdminChat(CommandSender commandSender, String format, String mes
127119
return;
128120
}
129121

130-
SimpleStaffChat.getInstance().getServer().getOnlinePlayers().forEach(onlinePlayer -> {
131-
if (onlinePlayer.hasPermission(Permissions.ADMINCHAT_SEE) && !adminChatMuted.contains(onlinePlayer.getUniqueId())) {
132-
RyMessageUtils.sendPlayer(onlinePlayer, format
133-
.replace("%server%", SimpleStaffChat.getInstance().getSettings().SERVER_NAME)
134-
.replace("%player%", player.getName())
135-
);
136-
}
137-
});
122+
RyMessageUtils.sendAdminChat(player, Permissions.ADMINCHAT_SEE, format
123+
.replace("%server%", SimpleStaffChat.getInstance().getSettings().SERVER_NAME)
124+
.replace("%player%", player.getName())
125+
);
138126

139127
RyMessageUtils.sendConsole(true, format
140128
.replace("%server%", SimpleStaffChat.getInstance().getSettings().SERVER_NAME)

‎SimpleStaffChat-Spigot/src/main/java/me/refracdevelopment/simplestaffchat/utilities/chat/RyMessageUtils.java‎

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import lombok.Setter;
77
import me.clip.placeholderapi.PlaceholderAPI;
88
import me.refracdevelopment.simplestaffchat.SimpleStaffChat;
9+
import me.refracdevelopment.simplestaffchat.utilities.Methods;
910
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
1011
import net.kyori.adventure.text.Component;
1112
import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -206,6 +207,8 @@ public static void sendPlayer(Player player, @NotNull List<String> messages) {
206207
* @param message The message you wish to send to the sender.
207208
*/
208209
public static void sendSender(@NotNull CommandSender sender, @NotNull String message) {
210+
message = Placeholders.setPlaceholders(sender, message);
211+
209212
if (getAudiences() != null) {
210213
getAudiences().sender(sender).sendMessage(translate(message));
211214
} else {
@@ -221,6 +224,8 @@ public static void sendSender(@NotNull CommandSender sender, @NotNull String mes
221224
*/
222225
public static void sendSender(@NotNull CommandSender sender, @NotNull String... messages) {
223226
for (String message : messages) {
227+
message = Placeholders.setPlaceholders(sender, message);
228+
224229
if (getAudiences() != null) {
225230
getAudiences().sender(sender).sendMessage(translate(message));
226231
} else {
@@ -237,6 +242,8 @@ public static void sendSender(@NotNull CommandSender sender, @NotNull String...
237242
*/
238243
public static void sendSender(@NotNull CommandSender sender, @NotNull List<String> messages) {
239244
for (String message : messages) {
245+
message = Placeholders.setPlaceholders(sender, message);
246+
240247
if (getAudiences() != null) {
241248
getAudiences().sender(sender).sendMessage(translate(message));
242249
} else {
@@ -304,9 +311,47 @@ public static void sendConsole(boolean prefix, List<String> messages) {
304311
* @param permission The permission the players require to see the broadcast.
305312
* @param message The message you wish to be broadcast.
306313
*/
307-
public static void broadcast(Player player, String permission, String message) {
314+
public static void sendStaffChat(Player player, String permission, String message) {
308315
for (Player online : Bukkit.getOnlinePlayers()) {
309-
if (online.hasPermission(permission)) {
316+
if (online.hasPermission(permission) && !Methods.getStaffChatMuted().contains(online.getUniqueId())) {
317+
if (getAudiences() != null) {
318+
getAudiences().player(online).sendMessage(translate(player, message));
319+
} else {
320+
online.sendMessage(translate(player, message));
321+
}
322+
}
323+
}
324+
}
325+
326+
/**
327+
* Send a permission based broadcast to all online players.
328+
*
329+
* @param player The player who is making the broadcast.
330+
* @param permission The permission the players require to see the broadcast.
331+
* @param message The message you wish to be broadcast.
332+
*/
333+
public static void sendDevChat(Player player, String permission, String message) {
334+
for (Player online : Bukkit.getOnlinePlayers()) {
335+
if (online.hasPermission(permission) && !Methods.getDevChatMuted().contains(online.getUniqueId())) {
336+
if (getAudiences() != null) {
337+
getAudiences().player(online).sendMessage(translate(player, message));
338+
} else {
339+
online.sendMessage(translate(player, message));
340+
}
341+
}
342+
}
343+
}
344+
345+
/**
346+
* Send a permission based broadcast to all online players.
347+
*
348+
* @param player The player who is making the broadcast.
349+
* @param permission The permission the players require to see the broadcast.
350+
* @param message The message you wish to be broadcast.
351+
*/
352+
public static void sendAdminChat(Player player, String permission, String message) {
353+
for (Player online : Bukkit.getOnlinePlayers()) {
354+
if (online.hasPermission(permission) && !Methods.getAdminChatMuted().contains(online.getUniqueId())) {
310355
if (getAudiences() != null) {
311356
getAudiences().player(online).sendMessage(translate(player, message));
312357
} else {

‎SimpleStaffChat-Velocity/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>me.refracdevelopment</groupId>
88
<artifactId>SimpleStaffChat</artifactId>
9-
<version>4.3.2</version>
9+
<version>4.3.2-beta</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎SimpleStaffChat-Velocity/src/main/java/me/refracdevelopment/simplestaffchat/utilities/chat/RyMessageUtils.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,14 @@ public static Component translate(String message) {
9797
return component;
9898
}
9999

100+
/**
101+
* Translate a string from legacy to Adventure API.
102+
*
103+
* @param input The string that needs translating.
104+
* @return String which is in an adventure format.
105+
*
106+
* @Author: EternalCodeTeam (https://github.com/EternalCodeTeam/ChatFormatter/)
107+
*/
100108
private static String legacyToAdventure(String input) {
101109
String result = HEX_PATTERN.matcher(input).replaceAll(matchResult -> {
102110
String hex = matchResult.group(1);

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>me.refracdevelopment</groupId>
88
<artifactId>SimpleStaffChat</artifactId>
9-
<version>4.3.2</version>
9+
<version>4.3.2-beta</version>
1010
<packaging>pom</packaging>
1111

1212
<name>SimpleStaffChat</name>

0 commit comments

Comments
 (0)