FS-326 & quick formatting fix

The formatting of DiscordToMinecraft was adjusted in addition to make it look nicer

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

@@ -46,7 +46,7 @@ public class SavedFlags extends FreedomService
         return flags;
     }
 
-    public boolean getSavedFlag(String flag) throws Exception
+    public boolean getSavedFlag(String flag) throws IllegalStateException
     {
         Boolean flagValue = null;
 
@@ -66,7 +66,7 @@ public class SavedFlags extends FreedomService
         }
         else
         {
-            throw new Exception();
+            throw new IllegalStateException("Attempt to get non-existent flag " + flag);
         }
     }
 

src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java

@@ -146,12 +146,9 @@ public class EventBlocker extends FreedomService
         if (ConfigEntry.ENABLE_PET_PROTECT.getBoolean())
         {
             Entity entity = event.getEntity();
-            if (entity instanceof Tameable)
+            if (entity instanceof Tameable && ((Tameable) entity).isTamed())
             {
-                if (((Tameable)entity).isTamed())
+                event.setCancelled(true);
-                {
-                    event.setCancelled(true);
-                }
             }
         }
     }

src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java

@@ -101,12 +101,9 @@ public class BukkitTelnetBridge extends FreedomService
             try
             {
                 final Plugin bukkitTelnet = server.getPluginManager().getPlugin("BukkitTelnet");
-                if (bukkitTelnet != null)
+                if (bukkitTelnet instanceof BukkitTelnet)
                 {
-                    if (bukkitTelnet instanceof BukkitTelnet)
+                    bukkitTelnetPlugin = (BukkitTelnet) bukkitTelnet;
-                    {
-                        bukkitTelnetPlugin = (BukkitTelnet)bukkitTelnet;
-                    }
                 }
             }
             catch (Exception ex)

src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java

@@ -362,93 +362,90 @@ public class CoreProtectBridge extends FreedomService
             }
             else if (event.getAction() == Action.RIGHT_CLICK_BLOCK)
             {
-                if (block != null)
+                if (block != null && data.hasInspection())
                 {
-                    if (data.hasInspection())
+                    BlockState blockState = block.getRelative(event.getBlockFace()).getState();
-                    {
+                    Block placedBlock = blockState.getBlock();
-                        BlockState blockState = block.getRelative(event.getBlockFace()).getState();
+                    event.setCancelled(true);
-                        Block placedBlock = blockState.getBlock();
+                    List<String[]> lookup = coreProtect.blockLookup(placedBlock, -1);
-                        event.setCancelled(true);
-                        List<String[]> lookup = coreProtect.blockLookup(placedBlock, -1);
 
+                    if (lookup.isEmpty())
+                    {
+                        lookup = coreProtect.blockLookup(block, -1);
+                    }
+
+                    int cooldownTime = 3;
+
+                    if (cooldown.containsKey(player.getName()))
+                    {
+                        long secondsLeft = getSecondsLeft(cooldown.get(player.getName()), cooldownTime);
+                        if (secondsLeft > 0L)
+                        {
+                            event.setCancelled(true);
+                            player.sendMessage(ChatColor.RED + String.valueOf(secondsLeft) + " seconds left before next query.");
+                            return;
+                        }
+                    }
+
+                    if (!plugin.al.isAdmin(player))
+                    {
+                        cooldown.put(player.getName(), System.currentTimeMillis());
+                    }
+
+                    if (lookup != null)
+                    {
                         if (lookup.isEmpty())
                         {
-                            lookup = coreProtect.blockLookup(block, -1);
+                            player.sendMessage(net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector " + ChatColor.WHITE + "- " + "No block data found for this location");
+                            return;
                         }
 
-                        int cooldownTime = 3;
+                        HISTORY_MAP.remove(event.getPlayer());
+                        HISTORY_MAP.put(event.getPlayer(), new FUtil.PaginationList<>(10));
+                        FUtil.PaginationList<String> paged = HISTORY_MAP.get(event.getPlayer());
 
-                        if (cooldown.containsKey(player.getName()))
+                        player.sendMessage("---- " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector" + ChatColor.WHITE + " ---- " +
+                                ChatColor.GRAY + "(x" + block.getX() + "/" + "y" + block.getY() + "/" + "z" + block.getZ() + ")");
+
+                        for (String[] value : lookup)
                         {
-                            long secondsLeft = getSecondsLeft(cooldown.get(player.getName()), cooldownTime);
+                            CoreProtectAPI.ParseResult result = coreProtect.parseResult(value);
-                            if (secondsLeft > 0L)
+                            BlockData bl = result.getBlockData();
+
+                            String s;
+                            String st = "";
+
+                            if (result.getActionString().equals("Placement"))
                             {
-                                event.setCancelled(true);
+                                s = " placed ";
-                                player.sendMessage(ChatColor.RED + String.valueOf(secondsLeft) + " seconds left before next query.");
-                                return;
                             }
+                            else if (result.getActionString().equals("Removal"))
+                            {
+                                s = " broke ";
+                            }
+                            else
+                            {
+                                s = " interacted with ";
+                            }
+
+                            if (result.isRolledBack())
+                            {
+                                st += "§m";
+                            }
+
+                            int time = (int)(System.currentTimeMillis() / 1000L);
+
+                            paged.add(ChatColor.GRAY + getTimeAgo(result.getTime(), time) + ChatColor.WHITE + " - " + net.md_5.bungee.api.ChatColor.of("#30ade4") +
+                                    st + result.getPlayer() + ChatColor.WHITE + st + s + net.md_5.bungee.api.ChatColor.of("#30ade4") + st + bl.getMaterial().toString().toLowerCase());
                         }
 
-                        if (!plugin.al.isAdmin(player))
+                        List<String> page = paged.getPage(1);
+                        for (String entries : page)
                         {
-                            cooldown.put(player.getName(), System.currentTimeMillis());
+                            player.sendMessage(entries);
                         }
 
-                        if (lookup != null)
+                        player.sendMessage("Page 1/" + paged.getPageCount() + " | To index through the pages, type " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "/ins history <page>");
-                        {
-                            if (lookup.isEmpty())
-                            {
-                                player.sendMessage(net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector " + ChatColor.WHITE + "- " + "No block data found for this location");
-                                return;
-                            }
-
-                            HISTORY_MAP.remove(event.getPlayer());
-                            HISTORY_MAP.put(event.getPlayer(), new FUtil.PaginationList<>(10));
-                            FUtil.PaginationList<String> paged = HISTORY_MAP.get(event.getPlayer());
-
-                            player.sendMessage("---- " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector" + ChatColor.WHITE + " ---- " +
-                                    ChatColor.GRAY + "(x" + block.getX() + "/" + "y" + block.getY() + "/" + "z" + block.getZ() + ")");
-
-                            for (String[] value : lookup)
-                            {
-                                CoreProtectAPI.ParseResult result = coreProtect.parseResult(value);
-                                BlockData bl = result.getBlockData();
-
-                                String s;
-                                String st = "";
-
-                                if (result.getActionString().equals("Placement"))
-                                {
-                                    s = " placed ";
-                                }
-                                else if (result.getActionString().equals("Removal"))
-                                {
-                                    s = " broke ";
-                                }
-                                else
-                                {
-                                    s = " interacted with ";
-                                }
-
-                                if (result.isRolledBack())
-                                {
-                                    st += "§m";
-                                }
-
-                                int time = (int)(System.currentTimeMillis() / 1000L);
-
-                                paged.add(ChatColor.GRAY + getTimeAgo(result.getTime(), time) + ChatColor.WHITE + " - " + net.md_5.bungee.api.ChatColor.of("#30ade4") +
-                                        st + result.getPlayer() + ChatColor.WHITE + st + s + net.md_5.bungee.api.ChatColor.of("#30ade4") + st + bl.getMaterial().toString().toLowerCase());
-                            }
-
-                            List<String> page = paged.getPage(1);
-                            for (String entries : page)
-                            {
-                                player.sendMessage(entries);
-                            }
-
-                            player.sendMessage("Page 1/" + paged.getPageCount() + " | To index through the pages, type " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "/ins history <page>");
-                        }
                     }
                 }
             }

src/main/java/me/totalfreedom/totalfreedommod/bridge/TFGuildsBridge.java

@@ -30,13 +30,10 @@ public class TFGuildsBridge extends FreedomService
         try
         {
             final Plugin tfGuilds = server.getPluginManager().getPlugin("TFGuilds");
-            if (tfGuilds != null && tfGuilds.isEnabled())
+            if (tfGuilds != null && tfGuilds.isEnabled() && tfGuilds instanceof TFGuilds)
             {
-                if (tfGuilds instanceof TFGuilds)
+                enabled = true;
-                {
+                return true;
-                    enabled = true;
-                    return true;
-                }
             }
         }
         catch (NoClassDefFoundError ex)

src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java

@@ -32,16 +32,14 @@ public class Command_deop extends FreedomCommand
         final List<String> matchedPlayerNames = new ArrayList<>();
         for (Player player : server.getOnlinePlayers())
         {
-            if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName)
+            if ((player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName)
                     || player.getName().contains(targetName) || player.getDisplayName().contains(targetName))
+                    && player.isOp() && !plugin.al.isVanished(player.getName()))
             {
-                if (player.isOp() && !plugin.al.isVanished(player.getName()))
+                matchedPlayerNames.add(player.getName());
-                {
+                player.setOp(false);
-                    matchedPlayerNames.add(player.getName());
+                msg(player, YOU_ARE_NOT_OP);
-                    player.setOp(false);
+                plugin.rm.updateDisplay(player);
-                    msg(player, YOU_ARE_NOT_OP);
-                    plugin.rm.updateDisplay(player);
-                }
             }
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_enchant.java

@@ -251,21 +251,18 @@ public class Command_enchant extends FreedomCommand
                 return getEnchantments(item);
             }
         }
-        else if (args.length == 3)
+        else if (args.length == 3 && args[0].equalsIgnoreCase("add"))
         {
-            if (args[0].equals("add"))
+            Enchantment enchantment = Enchantment.getByName(args[1].toUpperCase());
+            if (enchantment != null)
             {
-                Enchantment enchantment = Enchantment.getByName(args[1].toUpperCase());
+                if (!unsafe)
-                if (enchantment != null)
                 {
-                    if (!unsafe)
+                    return stringNumberRange(1, enchantment.getMaxLevel());
-                    {
+                }
-                        return stringNumberRange(1, enchantment.getMaxLevel());
+                else
-                    }
+                {
-                    else
+                    return Collections.singletonList("[level]");
-                    {
-                        return Collections.singletonList("[level]");
-                    }
                 }
             }
         }

src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToMinecraftListener.java

@@ -22,46 +22,47 @@ public class DiscordToMinecraftListener extends ListenerAdapter
     public void onMessageReceived(MessageReceivedEvent event)
     {
         String chat_channel_id = ConfigEntry.DISCORD_CHAT_CHANNEL_ID.getString();
-        if (event.getMember() != null && !chat_channel_id.isEmpty() && event.getChannel().getId().equals(chat_channel_id))
+        if (event.getMember() != null && !chat_channel_id.isEmpty()
+                && event.getChannel().getId().equals(chat_channel_id)
+                && !event.getAuthor().getId().equals(Discord.bot.getSelfUser().getId()))
         {
-            if (!event.getAuthor().getId().equals(Discord.bot.getSelfUser().getId()))
+            Member member = event.getMember();
+            String tag = getDisplay(member);
+            StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "Discord"
+                    + ChatColor.DARK_GRAY + "]");
+            Message msg = event.getMessage();
+            if (tag != null)
             {
-                Member member = event.getMember();
+                message.append(" ").append(tag);
-                String tag = getDisplay(member);
-                StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "Discord" + ChatColor.DARK_GRAY + "]");
-                Message msg = event.getMessage();
-                if (tag != null)
-                {
-                    message.append(" ").append(tag);
-                }
-                message.append(" ").append(ChatColor.RED).append(ChatColor.stripColor(member.getEffectiveName())).append(ChatColor.DARK_GRAY).append(":").append(ChatColor.RESET);
-                ComponentBuilder builder = new ComponentBuilder(message.toString());
-                if (!msg.getContentDisplay().isEmpty())
-                {
-                    builder.append(" ").append(ChatColor.stripColor(msg.getContentDisplay()));
-                    message.append(" ").append(ChatColor.stripColor(msg.getContentDisplay())); // for logging
-                }
-                if (!msg.getAttachments().isEmpty())
-                {
-                    for (Message.Attachment attachment : msg.getAttachments())
-                    {
-                        attachment.getUrl();
-                        builder.append(" ");
-                        TextComponent text = new TextComponent(ChatColor.YELLOW + "[Media]");
-                        text.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl()));
-                        builder.append(text);
-                        message.append(" [Media]"); // for logging
-                    }
-                }
-                for (Player player : Bukkit.getOnlinePlayers())
-                {
-                    if (TotalFreedomMod.getPlugin().pl.getData(player).doesDisplayDiscord())
-                    {
-                        player.spigot().sendMessage(builder.create());
-                    }
-                }
-                FLog.info(message.toString());
             }
+            message.append(" ").append(ChatColor.RED).append(ChatColor.stripColor(member.getEffectiveName()))
+                    .append(ChatColor.DARK_GRAY).append(":").append(ChatColor.RESET);
+            ComponentBuilder builder = new ComponentBuilder(message.toString());
+            if (!msg.getContentDisplay().isEmpty())
+            {
+                builder.append(" ").append(ChatColor.stripColor(msg.getContentDisplay()));
+                message.append(" ").append(ChatColor.stripColor(msg.getContentDisplay())); // for logging
+            }
+            if (!msg.getAttachments().isEmpty())
+            {
+                for (Message.Attachment attachment : msg.getAttachments())
+                {
+                    attachment.getUrl();
+                    builder.append(" ");
+                    TextComponent text = new TextComponent(ChatColor.YELLOW + "[Media]");
+                    text.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl()));
+                    builder.append(text);
+                    message.append(" [Media]"); // for logging
+                }
+            }
+            for (Player player : Bukkit.getOnlinePlayers())
+            {
+                if (TotalFreedomMod.getPlugin().pl.getData(player).doesDisplayDiscord())
+                {
+                    player.spigot().sendMessage(builder.create());
+                }
+            }
+            FLog.info(message.toString());
         }
     }