Retired support for 2021.02 fully. (#72)

* Use long instead of int and use offset to check time (FS-181)

* Remove star import

README.md

@@ -1,4 +1,4 @@
-# TotalFreedomMod [![Maven-Build](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/maven.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/maven.yml) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade) [![CodeQL](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml)
+# TotalFreedomMod [![Build Status](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod.svg?branch=development)](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade)
 
 TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](https://totalfreedom.me/). However, you are more than welcome to adapt the source for your own server.
 
@@ -14,4 +14,4 @@ For information on our security policy and reporting an issue, please see [SECUR
 
 ### Compiling
 
-You need Maven to build. You'd also need to set the JDK version to Java 11 as that is the current standard as of now.
+You need Maven to build. You'd also need to set the JDK version to Java 8 as that is the current standard as of now.

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

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

@@ -146,12 +146,15 @@ public class EventBlocker extends FreedomService
         if (ConfigEntry.ENABLE_PET_PROTECT.getBoolean())
         {
             Entity entity = event.getEntity();
-            if (entity instanceof Tameable && ((Tameable) entity).isTamed())
+            if (entity instanceof Tameable)
+            {
+                if (((Tameable)entity).isTamed())
                 {
                     event.setCancelled(true);
                 }
             }
         }
+    }
 
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerDropItem(PlayerDropItemEvent event)

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

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

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

@@ -362,7 +362,9 @@ public class CoreProtectBridge extends FreedomService
             }
             else if (event.getAction() == Action.RIGHT_CLICK_BLOCK)
             {
-                if (block != null && data.hasInspection())
+                if (block != null)
+                {
+                    if (data.hasInspection())
                     {
                         BlockState blockState = block.getRelative(event.getBlockFace()).getState();
                         Block placedBlock = blockState.getBlock();
@@ -452,3 +454,4 @@ public class CoreProtectBridge extends FreedomService
             }
         }
     }
+}

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

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

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

@@ -32,9 +32,10 @@ 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);
@@ -42,6 +43,7 @@ public class Command_deop extends FreedomCommand
                     plugin.rm.updateDisplay(player);
                 }
             }
+        }
 
         if (!matchedPlayerNames.isEmpty())
         {

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

@@ -251,7 +251,9 @@ public class Command_enchant extends FreedomCommand
                 return getEnchantments(item);
             }
         }
-        else if (args.length == 3 && args[0].equalsIgnoreCase("add"))
+        else if (args.length == 3)
+        {
+            if (args[0].equals("add"))
             {
                 Enchantment enchantment = Enchantment.getByName(args[1].toUpperCase());
                 if (enchantment != null)
@@ -266,6 +268,7 @@ public class Command_enchant extends FreedomCommand
                     }
                 }
             }
+        }
 
         return Collections.emptyList();
     }

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

@@ -22,21 +22,19 @@ 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)
-                && !event.getAuthor().getId().equals(Discord.bot.getSelfUser().getId()))
+        if (event.getMember() != null && !chat_channel_id.isEmpty() && event.getChannel().getId().equals(chat_channel_id))
+        {
+            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 + "]");
+                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);
+                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())
                 {
@@ -65,6 +63,7 @@ public class DiscordToMinecraftListener extends ListenerAdapter
                 FLog.info(message.toString());
             }
         }
+    }
 
     public String getDisplay(Member member)
     {