github is a love hate relationship

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

@@ -6,7 +6,7 @@ import java.util.Properties;
 import me.totalfreedom.totalfreedommod.admin.ActivityLog;
 import me.totalfreedom.totalfreedommod.admin.AdminList;
 import me.totalfreedom.totalfreedommod.banning.BanManager;
-import me.totalfreedom.totalfreedommod.banning.PermbanList;
+import me.totalfreedom.totalfreedommod.banning.IndefiniteBanList;
 import me.totalfreedom.totalfreedommod.blocking.BlockBlocker;
 import me.totalfreedom.totalfreedommod.blocking.EditBlocker;
 import me.totalfreedom.totalfreedommod.blocking.EventBlocker;
@@ -108,7 +108,7 @@ public class TotalFreedomMod extends JavaPlugin
     public Discord dc;
     public PunishmentList pul;
     public BanManager bm;
-    public PermbanList pm;
+    public IndefiniteBanList im;
     public PermissionManager pem;
     public ProtectArea pa;
     public Reddit rd;
@@ -228,7 +228,7 @@ public class TotalFreedomMod extends JavaPlugin
         dc = new Discord();
         pul = new PunishmentList();
         bm = new BanManager();
-        pm = new PermbanList();
+        im = new IndefiniteBanList();
         pem = new PermissionManager();
         pa = new ProtectArea();
         rd = new Reddit();

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

@@ -18,10 +18,11 @@ public class Command_serverstats extends FreedomCommand
         msg("-==" + ConfigEntry.SERVER_NAME.getString() + " server stats==-", ChatColor.GOLD);
         msg("Total opped players: " + server.getOperators().size(), ChatColor.RED);
         msg("Total staff: " + plugin.al.getAllAdmins().size() + " (" + plugin.al.getActiveAdmins().size() + " active)", ChatColor.BLUE);
-        int tpbips = plugin.pm.getPermbannedIps().size();
-        int tpbns = plugin.pm.getPermbannedNames().size();
-        int tpbs = tpbips + tpbns;
-        msg("Total perm bans: " + tpbs + " (" + tpbips + " ips " + tpbns + " names)", ChatColor.GREEN);
+        int bans = plugin.im.getIndefBans().size();
+        int nameBans = plugin.im.getNameBanCount();
+        int uuidBans = plugin.im.getUuidBanCount();
+        int ipBans = plugin.im.getIpBanCount();
+        msg("Total indefinite ban entries: " + bans + " (" + nameBans + " name bans, " + uuidBans + " UUID bans, and " + ipBans + " IP bans)", ChatColor.GREEN);
         return true;
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java

@@ -59,7 +59,7 @@ public enum ConfigEntry
     SERVER_ASSISTANT_EXECUTIVES(List.class, "server.assistant_executives"),
     SERVER_MASTER_BUILDER_MANAGEMENT(List.class, "server.master_builder_management"),
     SERVER_BAN_URL(String.class, "server.ban_url"),
-    SERVER_PERMBAN_URL(String.class, "server.permban_url"),
+    SERVER_INDEFBAN_URL(String.class, "server.indefban_url"),
     SERVER_TABLIST_HEADER(String.class, "server.tablist_header"),
     SERVER_TABLIST_FOOTER(String.class, "server.tablist_footer"),
     //

src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java

@@ -19,7 +19,7 @@ import me.totalfreedom.totalfreedommod.httpd.module.Module_help;
 import me.totalfreedom.totalfreedommod.httpd.module.Module_list;
 import me.totalfreedom.totalfreedommod.httpd.module.Module_logfile;
 import me.totalfreedom.totalfreedommod.httpd.module.Module_logs;
-import me.totalfreedom.totalfreedommod.httpd.module.Module_permbans;
+import me.totalfreedom.totalfreedommod.httpd.module.Module_indefbans;
 import me.totalfreedom.totalfreedommod.httpd.module.Module_players;
 import me.totalfreedom.totalfreedommod.httpd.module.Module_punishments;
 import me.totalfreedom.totalfreedommod.httpd.module.Module_schematic;
@@ -59,7 +59,7 @@ public class HTTPDaemon extends FreedomService
         module("list", Module_list.class, false);
         module("logfile", Module_logfile.class, true);
         module("logs", Module_logs.class, true);
-        module("permbans", Module_permbans.class, true);
+        module("indefbans", Module_indefbans.class, true);
         module("players", Module_players.class, false);
         module("punishments", Module_punishments.class, true);
         module("schematic", Module_schematic.class, true);

src/main/resources/activitylog.yml

@@ -1,3 +1,3 @@
 #
-# TotalFreedomMod 5.5 Activity Log
+# TotalFreedomMod Activity Log
 #

src/main/resources/config.yml

@@ -1,6 +1,5 @@
 #
-# TotalFreedomMod 5.5 Configuration
-# by Madgeek1450 and Prozza
+# TotalFreedomMod Configuration
 #
 
 # Generic server information
@@ -44,10 +43,10 @@ server:
   master_builder_management: []
 
   # URL players should appeal for bans at
-  ban_url: http://totalfreedom.boards.net/
+  ban_url: ''
 
   # URL players should appeal for permanent bans at
-  permban_url: http://bit.ly/TF_PermBan
+  indefban_url: ''
 
   # What to display at the top of the tab list
   tablist_header: ''
@@ -425,7 +424,7 @@ announcer:
   - 'Player vs player while in creative or god mode is forbidden!'
   - 'Spawn killing is forbidden!'
   - 'Invisible potions are allowed!'
-  - 'Serial griefing and trolling will result in a permanent ban!'
+  - 'Serial griefing and trolling will result in an indefinite ban!'
   - 'Racism, nazism, and sexism are strictly forbidden!'
   - 'Join our Discord server! Link: https://discordapp.com/invite/XXjmAmV/'
 

src/main/resources/permissions.yml

@@ -1,6 +1,5 @@
 #
-# TotalFreedomMod 2020.9 Permissions
-# by ZeroEpoch1969
+# TotalFreedomMod Permissions
 #
 
 # Note that every group inherits the previous groups' permissions

src/main/resources/punishments.yml

@@ -1,3 +1,3 @@
 #
-# TotalFreedomMod 5.5 Player Punishments
+# TotalFreedomMod Player Punishments
 #