Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod into RELEASE-2021.06

# Conflicts:
#	pom.xml

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2021.05</version>
+    <version>2021.06-RC01</version>
     <packaging>jar</packaging>
 
     <properties>

src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java

@@ -18,28 +18,35 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
-
 import static me.totalfreedom.totalfreedommod.util.FUtil.playerMsg;
 
-public class ChatManager extends FreedomService {
+public class ChatManager extends FreedomService
+{
     @Override
-    public void onStart() {
+    public void onStart()
+    {
     }
 
     @Override
-    public void onStop() {
+    public void onStop()
+    {
     }
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onPlayerChatFormat(AsyncPlayerChatEvent event) {
-        try {
+    public void onPlayerChatFormat(AsyncPlayerChatEvent event)
+    {
+        try
+        {
             handleChatEvent(event);
-        } catch (Exception ex) {
+        }
+        catch (Exception ex)
+        {
             FLog.severe(ex);
         }
     }
 
-    private void handleChatEvent(AsyncPlayerChatEvent event) {
+    private void handleChatEvent(AsyncPlayerChatEvent event)
+    {
         final Player player = event.getPlayer();
         String message = event.getMessage().trim();
 
@@ -47,7 +54,8 @@ public class ChatManager extends FreedomService {
         message = FUtil.colorize(message);
         message = message.replaceAll(ChatColor.MAGIC.toString(), "&k");
 
-        if (ConfigEntry.SHOP_ENABLED.getBoolean() && ConfigEntry.SHOP_REACTIONS_ENABLED.getBoolean() && !plugin.sh.reactionString.isEmpty() && message.equals(plugin.sh.reactionString)) {
+        if (ConfigEntry.SHOP_ENABLED.getBoolean() && ConfigEntry.SHOP_REACTIONS_ENABLED.getBoolean() && !plugin.sh.reactionString.isEmpty() && message.equals(plugin.sh.reactionString))
+        {
             event.setCancelled(true);
             PlayerData data = plugin.pl.getData(player);
             data.setCoins(data.getCoins() + plugin.sh.coinsPerReactionWin);
@@ -57,27 +65,31 @@ public class ChatManager extends FreedomService {
             return;
         }
 
-        if (!ConfigEntry.TOGGLE_CHAT.getBoolean() && !plugin.al.isAdmin(player)) {
+        if (!ConfigEntry.TOGGLE_CHAT.getBoolean() && !plugin.al.isAdmin(player))
+        {
             event.setCancelled(true);
             playerMsg(player, "Chat is currently disabled.", org.bukkit.ChatColor.RED);
             return;
         }
 
         // Truncate messages that are too long - 256 characters is vanilla client max
-        if (message.length() > 256) {
+        if (message.length() > 256)
+        {
             message = message.substring(0, 256);
             FSync.playerMsg(player, "Message was shortened because it was too long to send.");
         }
 
         final FPlayer fPlayer = plugin.pl.getPlayerSync(player);
-        if (fPlayer.isLockedUp()) {
+        if (fPlayer.isLockedUp())
+        {
             FSync.playerMsg(player, "You're locked up and cannot talk.");
             event.setCancelled(true);
             return;
         }
 
         // Check for adminchat
-        if (fPlayer.inAdminChat()) {
+        if (fPlayer.inAdminChat())
+        {
             FSync.adminChatMessage(player, message);
             event.setCancelled(true);
             return;
@@ -86,10 +98,14 @@ public class ChatManager extends FreedomService {
         // Check for 4chan trigger
         boolean green = ChatColor.stripColor(message).toLowerCase().startsWith(">");
         boolean orange = ChatColor.stripColor(message).toLowerCase().endsWith("<");
-        if (ConfigEntry.FOURCHAN_ENABLED.getBoolean()) {
-            if (green) {
+        if (ConfigEntry.FOURCHAN_ENABLED.getBoolean())
+        {
+            if (green)
+            {
                 message = ChatColor.GREEN + message;
-            } else if (orange) {
+            }
+            else if (orange)
+            {
                 message = ChatColor.GOLD + message;
             }
         }
@@ -101,39 +117,44 @@ public class ChatManager extends FreedomService {
         String format = "%1$s §8\u00BB §f%2$s";
 
         String tag = fPlayer.getTag();
-        if (tag != null && !tag.isEmpty()) {
+        if (tag != null && !tag.isEmpty())
+        {
             format = tag.replace("%", "%%") + " " + format;
         }
 
         // Check for mentions
-        if (!event.isCancelled()) {
         boolean mentionEveryone = ChatColor.stripColor(message).toLowerCase().contains("@everyone") && plugin.al.isAdmin(player);
-            for (Player p : server.getOnlinePlayers()) {
-                if (ChatColor.stripColor(message).toLowerCase().contains("@" + p.getName().toLowerCase()) || mentionEveryone) {
+        for (Player p : server.getOnlinePlayers())
+        {
+            if (ChatColor.stripColor(message).toLowerCase().contains("@" + p.getName().toLowerCase()) || mentionEveryone)
+            {
                 p.playSound(p.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, SoundCategory.MASTER, 1337F, 0.9F);
             }
         }
-        }
 
         // Set format
         event.setFormat(format);
 
         // Send to discord
-        if (!ConfigEntry.ADMIN_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist() && !plugin.pl.getPlayer(player).isMuted() && !plugin.tfg.inGuildChat(player)) {
+        if (!ConfigEntry.ADMIN_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist() && !plugin.pl.getPlayer(player).isMuted() && !plugin.tfg.inGuildChat(player))
+        {
             plugin.dc.messageChatChannel(player.getName() + " \u00BB " + ChatColor.stripColor(message));
         }
     }
 
-    public ChatColor getColor(Displayable display) {
+    public ChatColor getColor(Displayable display)
+    {
         return display.getColor();
     }
 
-    public String getColoredTag(Displayable display) {
+    public String getColoredTag(Displayable display)
+    {
         ChatColor color = display.getColor();
         return color + display.getAbbr();
     }
 
-    public void adminChat(CommandSender sender, String message) {
+    public void adminChat(CommandSender sender, String message)
+    {
         Displayable display = plugin.rm.getDisplay(sender);
         FLog.info("[ADMIN] " + sender.getName() + " " + display.getTag() + ": " + message, true);
         plugin.dc.messageAdminChatChannel(sender.getName() + " \u00BB " + message);
@@ -146,15 +167,20 @@ public class ChatManager extends FreedomService {
                 ChatColor color = getColor(display);
                 String msg = format.replace("%name%", sender.getName()).replace("%rank%", display.getAbbr()).replace("%rankcolor%", color.toString()).replace("%msg%", message);
                 player.sendMessage(FUtil.colorize(msg));
-            } else {
+            }
+            else
+            {
                 player.sendMessage("[" + ChatColor.AQUA + "ADMIN" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + sender.getName() + ChatColor.DARK_GRAY + " [" + getColoredTag(display) + ChatColor.DARK_GRAY + "]" + ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(message));
             }
         });
     }
 
-    public void reportAction(Player reporter, Player reported, String report) {
-        for (Player player : server.getOnlinePlayers()) {
-            if (plugin.al.isAdmin(player)) {
+    public void reportAction(Player reporter, Player reported, String report)
+    {
+        for (Player player : server.getOnlinePlayers())
+        {
+            if (plugin.al.isAdmin(player))
+            {
                 playerMsg(player, ChatColor.RED + "[REPORTS] " + ChatColor.GOLD + reporter.getName() + " has reported " + reported.getName() + " for " + report);
             }
         }