Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

Commit

Permalink
[ci-skip] Add back all uncommented code and invert some booleans
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryderbelserion
ryderbelserion committed Apr 6, 2023
1 parent a5301ef commit c5ff165
Show file tree
Hide file tree
Showing 12 changed files with 172 additions and 184 deletions.
12 changes: 9 additions & 3 deletions paper/src/main/java/me/h1dd3nxn1nja/chatmanager/Methods.java
View file
Expand Up @@ -48,9 +48,15 @@ public static String getPrefix() {
public static String noPermission() {
return color(settingsManager.getMessages().getString("Message.No_Permission").replace("{Prefix}", getPrefix()));
}

public static boolean getMuted() {
return CommandMuteChat.muted;

private static boolean isMuted;

public static boolean isMuted() {
return isMuted;
}

public static void setMuted() {
isMuted = !isMuted;
}

public static void tellConsole(String message, boolean prefix) {
Expand Down
14 changes: 6 additions & 8 deletions paper/src/main/java/me/h1dd3nxn1nja/chatmanager/commands/CommandMuteChat.java
View file
Expand Up @@ -19,8 +19,6 @@ public class CommandMuteChat implements CommandExecutor {

private final PlaceholderManager placeholderManager = plugin.getCrazyManager().getPlaceholderManager();

public static boolean muted;

public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
FileConfiguration messages = settingsManager.getMessages();

Expand All @@ -32,11 +30,11 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
if (cmd.getName().equalsIgnoreCase("MuteChat")) {
if (player.hasPermission("chatmanager.mutechat")) {
if (args.length == 0) {
if (muted) {
muted = false;
if (Methods.isMuted()) {
Methods.setMuted();
Methods.broadcast(placeholderManager.setPlaceholders(player, messages.getString("Mute_Chat.Broadcast_Messages.Enabled").replace("{player}", player.getName())));
} else {
muted = true;
Methods.setMuted();
Methods.broadcast(placeholderManager.setPlaceholders(player, messages.getString("Mute_Chat.Broadcast_Messages.Disabled").replace("{player}", player.getName())));
}

Expand All @@ -50,8 +48,8 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
if (args[0].equalsIgnoreCase("-s")) {
if (player.hasPermission("chatmanager.mutechat.silent")) {
if (args.length == 1) {
if (muted) {
muted = false;
if (Methods.isMuted()) {
Methods.setMuted();
for (Player staff : plugin.getServer().getOnlinePlayers()) {
if (staff.hasPermission("chatmanager.bypass.mutechat")) {
Methods.sendMessage(player, placeholderManager.setPlaceholders(player, messages.getString("Mute_Chat.Broadcast_Messages.Enabled").replace("{player}", player.getName())), true);
Expand All @@ -60,7 +58,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
}

} else {
muted = true;
Methods.setMuted();
for (Player staff : plugin.getServer().getOnlinePlayers()) {
if (staff.hasPermission("chatmanager.bypass.mutechat")) {
Methods.sendMessage(player, placeholderManager.setPlaceholders(player, messages.getString("Mute_Chat.Broadcast_Messages.Disabled").replace("{player}", player.getName())), true);
Expand Down
7 changes: 4 additions & 3 deletions paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerAntiAdvertising.java
View file
Expand Up @@ -32,7 +32,7 @@ public void onChat(AsyncPlayerChatEvent event) {
FileConfiguration messages = settingsManager.getMessages();

Player player = event.getPlayer();
String playername = event.getPlayer().getName();
String playerName = event.getPlayer().getName();
String message = event.getMessage();
Date time = Calendar.getInstance().getTime();

Expand All @@ -58,11 +58,11 @@ public void onChat(AsyncPlayerChatEvent event) {
}

if (config.getBoolean("Anti_Advertising.Chat.Increase_Sensitivity")) {
chatMatch(event, config, messages, player, playername, message, time, firstMatchIncrease, secondMatchIncrease);
chatMatch(event, config, messages, player, playerName, message, time, firstMatchIncrease, secondMatchIncrease);
return;
}

chatMatch(event, config, messages, player, playername, message, time, firstMatch, secondMatch);
chatMatch(event, config, messages, player, playerName, message, time, firstMatch, secondMatch);
}

private void chatMatch(AsyncPlayerChatEvent event, FileConfiguration config, FileConfiguration messages, Player player, String playername, String message, Date time, Matcher firstMatch, Matcher secondMatch) {
Expand Down Expand Up @@ -250,6 +250,7 @@ public void onSign(SignChangeEvent event) {

private boolean findMatches(SignChangeEvent event, FileConfiguration config, FileConfiguration messages, Player player, String message, String str, Matcher firstMatch, Matcher secondMatch) {
if (!firstMatch.find() || !secondMatch.find()) return false;

event.setCancelled(true);
Methods.sendMessage(player, messages.getString("Anti_Advertising.Signs.Message"), true);

Expand Down
3 changes: 1 addition & 2 deletions paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerAntiUnicode.java
View file
Expand Up @@ -33,8 +33,7 @@ public void onChat(AsyncPlayerChatEvent event) {
Pattern pattern = Pattern.compile("^[A-Za-z0-9-~!@#$%^&*()<>_+=-{}|';:.,\\[\"\"]|';:.,/?><_.]+$");
Matcher matcher = pattern.matcher(event.getMessage().toLowerCase().replaceAll("\\s+", ""));

if (!config.getBoolean("Anti_Unicode.Enable") || plugin.api().getStaffChatData().containsUser(player.getUniqueId()))
return;
if (!config.getBoolean("Anti_Unicode.Enable") || plugin.api().getStaffChatData().containsUser(player.getUniqueId())) return;

if (player.hasPermission("chatmanager.bypass.antiunicode")) return;

Expand Down
114 changes: 57 additions & 57 deletions paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerBannedCommand.java
View file
Expand Up @@ -20,46 +20,46 @@ public class ListenerBannedCommand implements Listener {
@EventHandler
public void onCommand(PlayerCommandPreprocessEvent event) {
FileConfiguration config = settingsManager.getConfig();
FileConfiguration bannedcommands = settingsManager.getBannedCommands();
FileConfiguration bannedCommands = settingsManager.getBannedCommands();
FileConfiguration messages = settingsManager.getMessages();

Player player = event.getPlayer();

List<String> cmd = bannedcommands.getStringList("Banned-Commands");

if (config.getBoolean("Banned_Commands.Enable")) {
if (!player.hasPermission("chatmanager.bypass.bannedcommands")) {
if (!config.getBoolean("Banned_Commands.Increase_Sensitivity")) {
for (String command : cmd) {
if (event.getMessage().toLowerCase().equals("/" + command)) {
event.setCancelled(true);
Methods.sendMessage(player, messages.getString("Banned_Commands.Message").replace("{command}", command), true);
NotifyStaff(player, command);
TellConsole(player, command);
ExecuteCommand(player);
}
List<String> cmd = bannedCommands.getStringList("Banned-Commands");

if (config.getBoolean("Banned_Commands.Enable")) return;

if (!player.hasPermission("chatmanager.bypass.bannedcommands")) {
if (!config.getBoolean("Banned_Commands.Increase_Sensitivity")) {
for (String command : cmd) {
if (event.getMessage().toLowerCase().equals("/" + command)) {
event.setCancelled(true);
Methods.sendMessage(player, messages.getString("Banned_Commands.Message").replace("{command}", command), true);
NotifyStaff(player, command);
TellConsole(player, command);
ExecuteCommand(player);
}
} else {
for (String command : cmd) {
if (event.getMessage().toLowerCase().contains("/" + command)) {
event.setCancelled(true);
Methods.sendMessage(player, messages.getString("Banned_Commands.Message").replace("{command}", command), true);
NotifyStaff(player, command);
TellConsole(player, command);
ExecuteCommand(player);
}
}
} else {
for (String command : cmd) {
if (event.getMessage().toLowerCase().contains("/" + command)) {
event.setCancelled(true);
Methods.sendMessage(player, messages.getString("Banned_Commands.Message").replace("{command}", command), true);
NotifyStaff(player, command);
TellConsole(player, command);
ExecuteCommand(player);
}
}
}
}

if (!player.hasPermission("chatmanager.bypass.coloncommands")) {
if (event.getMessage().split(" ")[0].contains(":")) {
event.setCancelled(true);
Methods.sendMessage(player, messages.getString("Banned_Commands.Message").replace("{command}", event.getMessage().replace("/", "")), true);
NotifyStaff(player, event.getMessage().replace("/", ""));
TellConsole(player, event.getMessage().replace("/", ""));
ExecuteCommand(player);
}
if (!player.hasPermission("chatmanager.bypass.coloncommands")) {
if (event.getMessage().split(" ")[0].contains(":")) {
event.setCancelled(true);
Methods.sendMessage(player, messages.getString("Banned_Commands.Message").replace("{command}", event.getMessage().replace("/", "")), true);
NotifyStaff(player, event.getMessage().replace("/", ""));
TellConsole(player, event.getMessage().replace("/", ""));
ExecuteCommand(player);
}
}
}
Expand All @@ -68,42 +68,42 @@ public void NotifyStaff(Player player, String message) {
FileConfiguration config = settingsManager.getConfig();
FileConfiguration messages = settingsManager.getMessages();

if (config.getBoolean("Banned_Commands.Notify_Staff")) {
for (Player staff : plugin.getServer().getOnlinePlayers()) {
if (staff.hasPermission("chatmanager.notify.bannedcommands")) {
Methods.sendMessage(staff, messages.getString("Banned_Commands.Message").replace("{player}", player.getName()).replace("{command}", message), true);
}
if (!config.getBoolean("Banned_Commands.Notify_Staff")) return;

for (Player staff : plugin.getServer().getOnlinePlayers()) {
if (staff.hasPermission("chatmanager.notify.bannedcommands")) {
Methods.sendMessage(staff, messages.getString("Banned_Commands.Message").replace("{player}", player.getName()).replace("{command}", message), true);
}
}
}

public void TellConsole(Player player, String message) {
FileConfiguration config = settingsManager.getConfig();
FileConfiguration messages = settingsManager.getMessages();
if (config.getBoolean("Banned_Commands.Notify_Staff")) {
Methods.tellConsole(messages.getString("Banned_Commands.Notify_Staff_Format").replace("{player}", player.getName()).replace("{command}", message), true);
}

if (!config.getBoolean("Banned_Commands.Notify_Staff")) return;

Methods.tellConsole(messages.getString("Banned_Commands.Notify_Staff_Format").replace("{player}", player.getName()).replace("{command}", message), true);
}

public void ExecuteCommand(Player player) {
FileConfiguration config = settingsManager.getConfig();
if (config.getBoolean("Banned_Commands.Execute_Command")) {
if (config.contains("Banned_Commands.Executed_Command")) {
String command = config.getString("Banned_Commands.Executed_Command").replace("{player}", player.getName());
List<String> commands = config.getStringList("Banned_Commands.Executed_Command");

new BukkitRunnable() {
public void run() {
plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), command);

for (String cmd : commands) {
plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), cmd.replace("{player}", player.getName()));
}
}
}.runTask(plugin);

if (!config.getBoolean("Banned_Commands.Execute_Command")) return;

if (!config.contains("Banned_Commands.Executed_Command")) return;

String command = config.getString("Banned_Commands.Executed_Command").replace("{player}", player.getName());
List<String> commands = config.getStringList("Banned_Commands.Executed_Command");

new BukkitRunnable() {
public void run() {
plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), command);

for (String cmd : commands) {
plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), cmd.replace("{player}", player.getName()));
}
}
}
}.runTask(plugin);
}
}
3 changes: 1 addition & 2 deletions paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerCaps.java
View file
Expand Up @@ -26,8 +26,7 @@ public void onChat(AsyncPlayerChatEvent event) {
Player player = event.getPlayer();
String message = event.getMessage();

if (!config.getBoolean("Anti_Caps.Enable") || plugin.api().getStaffChatData().containsUser(player.getUniqueId()))
return;
if (!config.getBoolean("Anti_Caps.Enable") || plugin.api().getStaffChatData().containsUser(player.getUniqueId())) return;

if (player.hasPermission("chatmanager.bypass.caps")) return;

Expand Down
36 changes: 16 additions & 20 deletions paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerChatFormat.java
View file
Expand Up @@ -31,31 +31,27 @@ public void onChatFormat(AsyncPlayerChatEvent event) {
Player player = event.getPlayer();
String message = event.getMessage();
String key = vaultSupport.getPermission().getPrimaryGroup(player);
String format = "";

if (config.getBoolean("Chat_Format.Enable")) {
if (config.getConfigurationSection("Chat_Format.Groups." + key) != null) {
format = config.getString("Chat_Format.Groups." + key + ".Format");
} else {
format = config.getString("Chat_Format.Default_Format");
}

format = setupPlaceholderAPI(player, format);
format = placeholderManager.setPlaceholders(player, format);
format = setupChatRadius(player, format);
format = Methods.color(format);
format = format.replace("{message}", message);
format = format.replaceAll("%", "%%");

event.setFormat(format);
event.setMessage(message);
}
String format;

if (!config.getBoolean("Chat_Format.Enable")) return;

format = config.getConfigurationSection("Chat_Format.Groups." + key) != null ? config.getString("Chat_Format.Groups." + key + ".Format") : config.getString("Chat_Format.Default_Format");

format = setupPlaceholderAPI(player, format);
format = placeholderManager.setPlaceholders(player, format);
format = setupChatRadius(player, format);
format = Methods.color(format);
format = format.replace("{message}", message);
format = format.replaceAll("%", "%%");

event.setFormat(format);
event.setMessage(message);
}

public String setupChatRadius(Player player, String message) {
FileConfiguration config = settingsManager.getConfig();
String placeholders = message;

if (config.getBoolean("Chat_Radius.Enable")) {
if (plugin.api().getGlobalChatData().containsUser(player.getUniqueId())) placeholders = placeholders.replace("{radius}", config.getString("Chat_Radius.Global_Chat.Prefix"));

Expand Down
11 changes: 5 additions & 6 deletions paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerColor.java
View file
Expand Up @@ -20,14 +20,13 @@ public class ListenerColor implements Listener {

@EventHandler(priority = EventPriority.HIGHEST)
public void onColorChat(AsyncPlayerChatEvent event) {

Player player = event.getPlayer();
String message = event.getMessage();
if (settingsManager.getConfig().getBoolean("Formatted_Messages.Enable")) {
String format = formatChat(player, message);
event.setMessage(format);
}

if (!settingsManager.getConfig().getBoolean("Formatted_Messages.Enable")) return;

String format = formatChat(player, message);
event.setMessage(format);
}

@EventHandler
Expand Down

0 comments on commit c5ff165

Please sign in to comment.