AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-29 19:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

staff -> admins

Browse Source 
* rename everything containing staff back to admin (as requested by ryan i've renamed commands like slconfig to saconfig but left "slconfig" as an alias)
* format almost every file correctly
* a few other improvements
This commit is contained in:
speed
2020-12-03 19:28:53 -05:00
parent aae1f524ea
commit 293ea04c56
205 changed files with 1667 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/totalfreedom/totalfreedommod/httpd/HTTPDaemon.java
View File

@ -23,7 +23,7 @@ import me.totalfreedom.totalfreedommod.httpd.module.Module_logs;
import me.totalfreedom.totalfreedommod.httpd.module.Module_players;
import me.totalfreedom.totalfreedommod.httpd.module.Module_punishments;
import me.totalfreedom.totalfreedommod.httpd.module.Module_schematic;
import me.totalfreedom.totalfreedommod.httpd.module.Module_staff;
import me.totalfreedom.totalfreedommod.httpd.module.Module_admins;
import me.totalfreedom.totalfreedommod.util.FLog;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
@ -53,7 +53,7 @@ public class HTTPDaemon extends FreedomService
// Modules
modules.clear();
module("activitylog", Module_activitylog.class, true);
module("staff", Module_staff.class, true);
module("admins", Module_admins.class, true);
module("bans", Module_bans.class, true);
module("help", Module_help.class, false);
module("list", Module_list.class, false);

6
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_activitylog.java
View File

@ -4,8 +4,8 @@ import java.io.File;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.staff.ActivityLog;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.ActivityLog;
import me.totalfreedom.totalfreedommod.admin.Admin;
public class Module_activitylog extends HTTPDModule
{
@ -39,7 +39,7 @@ public class Module_activitylog extends HTTPDModule
private boolean isAuthorized(String remoteAddress)
{
StaffMember entry = plugin.sl.getEntryByIp(remoteAddress);
Admin entry = plugin.al.getEntryByIp(remoteAddress);
return entry != null && entry.isActive();
}
}

8
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_staff.java → src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_admins.java
View File

@ -2,12 +2,12 @@ package me.totalfreedom.totalfreedommod.httpd.module;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
public class Module_staff extends HTTPDModule
public class Module_admins extends HTTPDModule
{
public Module_staff(TotalFreedomMod plugin, NanoHTTPD.HTTPSession session)
public Module_admins(TotalFreedomMod plugin, NanoHTTPD.HTTPSession session)
{
super(plugin, session);
}
@ -42,7 +42,7 @@ public class Module_staff extends HTTPDModule
private boolean isAuthorized(String remoteAddress)
{
StaffMember entry = plugin.sl.getEntryByIp(remoteAddress);
Admin entry = plugin.al.getEntryByIp(remoteAddress);
return entry != null && entry.isActive();
}
}

4
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_bans.java
View File

@ -2,7 +2,7 @@ package me.totalfreedom.totalfreedommod.httpd.module;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
public class Module_bans extends HTTPDModule
{
@ -41,7 +41,7 @@ public class Module_bans extends HTTPDModule
private boolean isAuthorized(String remoteAddress)
{
StaffMember entry = plugin.sl.getEntryByIp(remoteAddress);
Admin entry = plugin.al.getEntryByIp(remoteAddress);
return entry != null && entry.isActive();
}
}

4
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_indefbans.java
View File

@ -5,7 +5,7 @@ import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.banning.IndefiniteBanList;
import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
public class Module_indefbans extends HTTPDModule
{
@ -39,7 +39,7 @@ public class Module_indefbans extends HTTPDModule
private boolean isAuthorized(String remoteAddress)
{
StaffMember entry = plugin.sl.getEntryByIp(remoteAddress);
Admin entry = plugin.al.getEntryByIp(remoteAddress);
return entry != null && entry.isActive();
}
}

30
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_list.java
View File

@ -4,7 +4,7 @@ import java.util.Collection;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
@ -38,7 +38,7 @@ public class Module_list extends HTTPDModule
for (Player player : Bukkit.getOnlinePlayers())
{
if (plugin.sl.isVanished(player.getName()))
if (plugin.al.isVanished(player.getName()))
{
continue;
}
@ -68,15 +68,15 @@ public class Module_list extends HTTPDModule
owners.add(player.getName());
}
if (!plugin.sl.isStaff(player) && !hasSpecialTitle(player))
if (!plugin.al.isAdmin(player) && !hasSpecialTitle(player))
{
operators.add(player.getName());
}
if (!hasSpecialTitle(player) && plugin.sl.isStaff(player) && !plugin.sl.isVanished(player.getName()))
if (!hasSpecialTitle(player) && plugin.al.isAdmin(player) && !plugin.al.isVanished(player.getName()))
{
StaffMember staffMember = plugin.sl.getAdmin(player);
switch (staffMember.getRank())
Admin admin = plugin.al.getAdmin(player);
switch (admin.getRank())
{
case ADMIN:
admins.add(player.getName());
@ -87,7 +87,7 @@ public class Module_list extends HTTPDModule
}
}
}
// for future refernce - any multi-worded ranks are to be delimited by underscores in the json; eg. senior_admins
responseObject.put("owners", owners);
responseObject.put("executives", executives);
@ -116,7 +116,7 @@ public class Module_list extends HTTPDModule
for (Player player : onlinePlayers)
{
if (plugin.sl.isVanished(player.getName()))
if (plugin.al.isVanished(player.getName()))
{
continue;
}
@ -134,20 +134,12 @@ public class Module_list extends HTTPDModule
public boolean isImposter(Player player)
{
if (plugin.sl.isStaffImpostor(player) || plugin.pl.isPlayerImpostor(player))
{
return true;
}
return false;
return plugin.al.isAdminImpostor(player) || plugin.pl.isPlayerImpostor(player);
}
public boolean hasSpecialTitle(Player player)
{
if (FUtil.DEVELOPERS.contains(player.getUniqueId().toString()) || ConfigEntry.SERVER_EXECUTIVES.getList().contains(player.getName()) || ConfigEntry.SERVER_OWNERS.getList().contains(player.getName()))
{
return true;
}
return false;
return FUtil.DEVELOPERS.contains(player.getUniqueId().toString()) || ConfigEntry.SERVER_EXECUTIVES.getList().contains(player.getName()) || ConfigEntry.SERVER_OWNERS.getList().contains(player.getName());
}
@Override
@ -155,4 +147,4 @@ public class Module_list extends HTTPDModule
{
return "TotalFreedom - Online Players";
}
}
}

4
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_logfile.java
View File

@ -13,7 +13,7 @@ import me.totalfreedom.totalfreedommod.httpd.HTTPDPageBuilder;
import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD.Response;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.util.FLog;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringEscapeUtils;
@ -165,7 +165,7 @@ public class Module_logfile extends HTTPDModule
private boolean isAuthorized(String remoteAddress)
{
StaffMember entry = plugin.sl.getEntryByIp(remoteAddress);
Admin entry = plugin.al.getEntryByIp(remoteAddress);
return entry != null && entry.isActive();
}

19
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java
View File

@ -3,7 +3,7 @@ package me.totalfreedom.totalfreedommod.httpd.module;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
@ -25,7 +25,7 @@ public class Module_players extends HTTPDModule
final JSONObject responseObject = new JSONObject();
final JSONArray players = new JSONArray();
final JSONArray onlinestaff = new JSONArray();
final JSONArray onlineadmins = new JSONArray();
final JSONArray masterbuilders = new JSONArray();
final JSONArray admins = new JSONArray();
final JSONArray senioradmins = new JSONArray();
@ -35,22 +35,21 @@ public class Module_players extends HTTPDModule
// All online players
for (Player player : Bukkit.getOnlinePlayers())
{
if (!plugin.sl.isVanished(player.getName()))
if (!plugin.al.isVanished(player.getName()))
{
players.add(player.getName());
if (plugin.sl.isStaff(player) && !plugin.sl.isStaffImpostor(player))
if (plugin.al.isAdmin(player) && !plugin.al.isAdminImpostor(player))
{
onlinestaff.add(player.getName());
onlineadmins.add(player.getName());
}
}
}
// Staff
for (StaffMember staffMember : plugin.sl.getActiveStaffMembers())
// Admins
for (Admin admin : plugin.al.getActiveAdmins())
{
final String username = staffMember.getName();
switch (staffMember.getRank())
final String username = admin.getName();
switch (admin.getRank())
{
case ADMIN:
admins.add(username);

4
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_punishments.java
View File

@ -5,7 +5,7 @@ import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.punishments.PunishmentList;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
public class Module_punishments extends HTTPDModule
{
@ -42,7 +42,7 @@ public class Module_punishments extends HTTPDModule
private boolean isAuthorized(String remoteAddress)
{
StaffMember entry = plugin.sl.getEntryByIp(remoteAddress);
Admin entry = plugin.al.getEntryByIp(remoteAddress);
return entry != null && entry.isActive();
}
}

8
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_schematic.java
View File

@ -22,7 +22,7 @@ import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD.Method;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD.Response;
import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.util.FLog;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringEscapeUtils;
@ -280,9 +280,9 @@ public class Module_schematic extends HTTPDModule
private boolean isAuthorized(String remoteAddress)
{
StaffMember staffMemberEntry = plugin.sl.getEntryByIp(remoteAddress);
Admin adminEntry = plugin.al.getEntryByIp(remoteAddress);
PlayerData data = plugin.pl.getDataByIp(remoteAddress);
return ((staffMemberEntry != null && staffMemberEntry.isActive()) || data != null && data.isMasterBuilder());
return ((adminEntry != null && adminEntry.isActive()) || data != null && data.isMasterBuilder());
}
private static class SchematicTransferException extends Exception
@ -330,7 +330,7 @@ public class Module_schematic extends HTTPDModule
//
private final String modeName;
private ModuleMode(String modeName)
ModuleMode(String modeName)
{
this.modeName = modeName;
}