Removal of Lombok

Lombok implementation removal.

I have also gone through and replaced things with inline methods and variables, lambdas, and simplified loops down, removed unnecessary guard clauses, and overall cleaned up every single class. This took a long time, please do remember to follow proper naming conventions, don't include unnecessary guard clauses, follow exception rules and comment rules, and please PLEASE remember to use the DIAMOND OPERATOR rather than just inferring RAW TYPES!!!

Thank you!!

src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLog.java

@@ -2,7 +2,6 @@ package me.totalfreedom.totalfreedommod.admin;
 
 import com.google.common.collect.Maps;
 import java.util.Map;
-import lombok.Getter;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.YamlConfig;
 import me.totalfreedom.totalfreedommod.util.FLog;
@@ -20,7 +19,6 @@ public class ActivityLog extends FreedomService
 
     public static final String FILENAME = "activitylog.yml";
 
-    @Getter
     private final Map<String, ActivityLogEntry> allActivityLogs = Maps.newHashMap();
     private final Map<String, ActivityLogEntry> nameTable = Maps.newHashMap();
     private final Map<String, ActivityLogEntry> ipTable = Maps.newHashMap();
@@ -32,6 +30,11 @@ public class ActivityLog extends FreedomService
         this.config = new YamlConfig(plugin, FILENAME, true);
     }
 
+    public static String getFILENAME()
+    {
+        return FILENAME;
+    }
+
     @Override
     public void onStart()
     {
@@ -56,7 +59,7 @@ public class ActivityLog extends FreedomService
             ConfigurationSection section = config.getConfigurationSection(key);
             if (section == null)
             {
-                logger.warning("Invalid activity log format: " + key);
+                FLog.warning("Invalid activity log format: " + key);
                 continue;
             }
 
@@ -186,4 +189,24 @@ public class ActivityLog extends FreedomService
             plugin.acl.updateTables();
         }
     }
+
+    public Map<String, ActivityLogEntry> getAllActivityLogs()
+    {
+        return allActivityLogs;
+    }
+
+    public Map<String, ActivityLogEntry> getNameTable()
+    {
+        return nameTable;
+    }
+
+    public Map<String, ActivityLogEntry> getIpTable()
+    {
+        return ipTable;
+    }
+
+    public YamlConfig getConfig()
+    {
+        return config;
+    }
 }

src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLogEntry.java

@@ -4,8 +4,6 @@ import com.google.common.collect.Lists;
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
 import me.totalfreedom.totalfreedommod.config.IConfig;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.Validate;
@@ -14,21 +12,13 @@ import org.bukkit.entity.Player;
 
 public class ActivityLogEntry implements IConfig
 {
-    @Getter
-    private String configKey;
-    @Getter
-    @Setter
-    private String name;
-    @Getter
-    private final List<String> ips = Lists.newArrayList();
-    @Getter
-    @Setter
-    private List<String> timestamps = Lists.newArrayList();
-    @Getter
-    @Setter
-    private List<String> durations = Lists.newArrayList();
 
     public static final String FILENAME = "activitylog.yml";
+    private final List<String> ips = Lists.newArrayList();
+    private final List<String> timestamps = Lists.newArrayList();
+    private final List<String> durations = Lists.newArrayList();
+    private String configKey;
+    private String name;
 
     public ActivityLogEntry(Player player)
     {
@@ -41,6 +31,11 @@ public class ActivityLogEntry implements IConfig
         this.configKey = configKey;
     }
 
+    public static String getFILENAME()
+    {
+        return FILENAME;
+    }
+
     public void loadFrom(Player player)
     {
         configKey = player.getName().toLowerCase();
@@ -108,10 +103,7 @@ public class ActivityLogEntry implements IConfig
 
     public void removeIp(String ip)
     {
-        if (ips.contains(ip))
-        {
-            ips.remove(ip);
-        }
+        ips.remove(ip);
     }
 
     public void clearIPs()
@@ -138,4 +130,39 @@ public class ActivityLogEntry implements IConfig
         return configKey != null
                 && name != null;
     }
+
+    public String getConfigKey()
+    {
+        return configKey;
+    }
+
+    public void setConfigKey(String configKey)
+    {
+        this.configKey = configKey;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public List<String> getIps()
+    {
+        return ips;
+    }
+
+    public List<String> getTimestamps()
+    {
+        return timestamps;
+    }
+
+    public List<String> getDurations()
+    {
+        return durations;
+    }
 }

src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java

@@ -7,42 +7,35 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import lombok.Getter;
-import lombok.Setter;
 import me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 public class Admin
 {
-    @Getter
-    @Setter
-    private String name;
-    @Getter
-    private boolean active = true;
-    @Getter
-    @Setter
-    private Rank rank = Rank.ADMIN;
-    @Getter
+
+
     private final List<String> ips = new ArrayList<>();
-    @Getter
-    @Setter
+    private String name;
+    private boolean active = true;
+    private Rank rank = Rank.ADMIN;
     private Date lastLogin = new Date();
-    @Getter
-    @Setter
+
+
     private Boolean commandSpy = false;
-    @Getter
-    @Setter
+
+
     private Boolean potionSpy = false;
-    @Getter
-    @Setter
+
+
     private String acFormat = null;
-    @Getter
-    @Setter
+
+
     private String pteroID = null;
 
     public Admin(Player player)
@@ -125,10 +118,7 @@ public class Admin
 
     public void removeIp(String ip)
     {
-        if (ips.contains(ip))
-        {
-            ips.remove(ip);
-        }
+        ips.remove(ip);
     }
 
     public void clearIPs()
@@ -136,12 +126,42 @@ public class Admin
         ips.clear();
     }
 
+    public boolean isValid()
+    {
+        return name != null
+                && rank != null
+                && !ips.isEmpty()
+                && lastLogin != null;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public boolean isActive()
+    {
+        return active;
+    }
+
     public void setActive(boolean active)
     {
         this.active = active;
 
         final TotalFreedomMod plugin = TotalFreedomMod.plugin();
 
+        // Avoiding stupid NPE compiler warnings
+        if (plugin == null)
+        {
+            Bukkit.getLogger().severe("The plugin is null!! This is a major issue and WILL break the plugin!");
+            return;
+        }
+
         if (!active)
         {
             if (getRank().isAtLeast(Rank.ADMIN))
@@ -156,11 +176,68 @@ public class Admin
         }
     }
 
-    public boolean isValid()
+    public Rank getRank()
     {
-        return name != null
-                && rank != null
-                && !ips.isEmpty()
-                && lastLogin != null;
+        return rank;
+    }
+
+    public void setRank(Rank rank)
+    {
+        this.rank = rank;
+    }
+
+    public List<String> getIps()
+    {
+        return ips;
+    }
+
+    public Date getLastLogin()
+    {
+        return lastLogin;
+    }
+
+    public void setLastLogin(Date lastLogin)
+    {
+        this.lastLogin = lastLogin;
+    }
+
+    public Boolean getCommandSpy()
+    {
+        return commandSpy;
+    }
+
+    public void setCommandSpy(Boolean commandSpy)
+    {
+        this.commandSpy = commandSpy;
+    }
+
+    public Boolean getPotionSpy()
+    {
+        return potionSpy;
+    }
+
+    public void setPotionSpy(Boolean potionSpy)
+    {
+        this.potionSpy = potionSpy;
+    }
+
+    public String getAcFormat()
+    {
+        return acFormat;
+    }
+
+    public void setAcFormat(String acFormat)
+    {
+        this.acFormat = acFormat;
+    }
+
+    public String getPteroID()
+    {
+        return pteroID;
+    }
+
+    public void setPteroID(String pteroID)
+    {
+        this.pteroID = pteroID;
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java

@@ -10,7 +10,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
-import lombok.Getter;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.rank.Rank;
@@ -22,16 +21,19 @@ import org.bukkit.entity.Player;
 
 public class AdminList extends FreedomService
 {
-    @Getter
+    public static final List<String> vanished = new ArrayList<>();
+    public final List<String> verifiedNoAdmin = new ArrayList<>();
+    public final Map<String, List<String>> verifiedNoAdminIps = Maps.newHashMap();
     private final Set<Admin> allAdmins = Sets.newHashSet(); // Includes disabled admins
     // Only active admins below
-    @Getter
     private final Set<Admin> activeAdmins = Sets.newHashSet();
     private final Map<String, Admin> nameTable = Maps.newHashMap();
     private final Map<String, Admin> ipTable = Maps.newHashMap();
-    public final List<String> verifiedNoAdmin = new ArrayList<>();
-    public final Map<String, List<String>> verifiedNoAdminIps = Maps.newHashMap();
-    public static final List<String> vanished = new ArrayList<>();
+
+    public static List<String> getVanished()
+    {
+        return vanished;
+    }
 
     @Override
     public void onStart()
@@ -249,14 +251,14 @@ public class AdminList extends FreedomService
         }
 
         Admin admin = getAdmin(player);
-        return admin == null ? false : admin.getName().equalsIgnoreCase(player.getName());
+        return admin != null && admin.getName().equalsIgnoreCase(player.getName());
     }
 
     public boolean addAdmin(Admin admin)
     {
         if (!admin.isValid())
         {
-            logger.warning("Could not add admin: " + admin.getName() + ". Admin is missing details!");
+            FLog.warning("Could not add admin: " + admin.getName() + ". Admin is missing details!");
             return false;
         }
 
@@ -380,4 +382,34 @@ public class AdminList extends FreedomService
     {
         return vanished.contains(player);
     }
+
+    public Set<Admin> getAllAdmins()
+    {
+        return allAdmins;
+    }
+
+    public Set<Admin> getActiveAdmins()
+    {
+        return activeAdmins;
+    }
+
+    public Map<String, Admin> getNameTable()
+    {
+        return nameTable;
+    }
+
+    public Map<String, Admin> getIpTable()
+    {
+        return ipTable;
+    }
+
+    public List<String> getVerifiedNoAdmin()
+    {
+        return verifiedNoAdmin;
+    }
+
+    public Map<String, List<String>> getVerifiedNoAdminIps()
+    {
+        return verifiedNoAdminIps;
+    }
 }