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

Revert "Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development"

Browse Source 
This reverts commit 4407e9e6ec, reversing
changes made to e4c9ea656e.
This commit is contained in:
Telesphoreo
2020-08-15 17:41:23 -05:00
parent 4407e9e6ec
commit da80f1b69e
186 changed files with 1828 additions and 1275 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

@ -12,7 +12,7 @@ import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD.Response;
import me.totalfreedom.totalfreedommod.httpd.module.HTTPDModule;
import me.totalfreedom.totalfreedommod.httpd.module.Module_activitylog;
import me.totalfreedom.totalfreedommod.httpd.module.Module_staff;
import me.totalfreedom.totalfreedommod.httpd.module.Module_admins;
import me.totalfreedom.totalfreedommod.httpd.module.Module_bans;
import me.totalfreedom.totalfreedommod.httpd.module.Module_file;
import me.totalfreedom.totalfreedommod.httpd.module.Module_help;
@ -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

@ -2,8 +2,8 @@ package me.totalfreedom.totalfreedommod.httpd.module;
import java.io.File;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.staff.ActivityLog;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.ActivityLog;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
@ -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

@ -1,13 +1,13 @@
package me.totalfreedom.totalfreedommod.httpd.module;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
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

@ -1,7 +1,7 @@
package me.totalfreedom.totalfreedommod.httpd.module;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
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

@ -2,7 +2,7 @@ package me.totalfreedom.totalfreedommod.httpd.module;
import java.io.File;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.banning.IndefiniteBanList;
import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
@ -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();
}
}

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

@ -2,7 +2,7 @@ package me.totalfreedom.totalfreedommod.httpd.module;
import java.util.Collection;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.util.FUtil;
@ -29,9 +29,9 @@ public class Module_list extends HTTPDModule
final JSONArray operators = new JSONArray();
final JSONArray imposters = new JSONArray();
final JSONArray masterbuilders = new JSONArray();
final JSONArray trialmods = new JSONArray();
final JSONArray mods = new JSONArray();
final JSONArray admins = new JSONArray();
final JSONArray superadmins = new JSONArray();
final JSONArray telnetadmins = new JSONArray();
final JSONArray senioradmins = new JSONArray();
final JSONArray developers = new JSONArray();
final JSONArray assistant_executives = new JSONArray();
final JSONArray executives = new JSONArray();
@ -40,7 +40,7 @@ public class Module_list extends HTTPDModule
for (Player player : Bukkit.getOnlinePlayers())
{
if (plugin.sl.isVanished(player))
if (plugin.al.isVanished(player))
{
continue;
}
@ -75,24 +75,24 @@ 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))
if (!hasSpecialTitle(player) && plugin.al.isAdmin(player))
{
StaffMember staffMember = plugin.sl.getAdmin(player);
switch (staffMember.getRank())
Admin admin = plugin.al.getAdmin(player);
switch (admin.getRank())
{
case TRIAL_MOD:
trialmods.add(player.getName());
case SUPER_ADMIN:
superadmins.add(player.getName());
break;
case MOD:
mods.add(player.getName());
case TELNET_ADMIN:
telnetadmins.add(player.getName());
break;
case ADMIN:
admins.add(player.getName());
case SENIOR_ADMIN:
senioradmins.add(player.getName());
break;
}
}
@ -102,9 +102,9 @@ public class Module_list extends HTTPDModule
responseObject.put("operators", operators);
responseObject.put("imposters", imposters);
responseObject.put("masterbuilders", masterbuilders);
responseObject.put("trialmods", trialmods);
responseObject.put("mods", mods);
responseObject.put("admins", admins);
responseObject.put("superadmins", superadmins);
responseObject.put("telnetadmins", telnetadmins);
responseObject.put("senioradmins", senioradmins);
responseObject.put("developers", developers);
responseObject.put("assistant_executives", assistant_executives);
responseObject.put("executives", executives);
@ -128,7 +128,7 @@ public class Module_list extends HTTPDModule
for (Player player : onlinePlayers)
{
if (plugin.sl.isVanished(player))
if (plugin.al.isVanished(player))
{
continue;
}
@ -146,7 +146,7 @@ public class Module_list extends HTTPDModule
public boolean isImposter(Player player)
{
if (plugin.sl.isAdminImpostor(player) || plugin.pl.isPlayerImpostor(player))
if (plugin.al.isAdminImpostor(player) || plugin.pl.isPlayerImpostor(player))
{
return true;
}
@ -165,6 +165,6 @@ public class Module_list extends HTTPDModule
@Override
public String getTitle()
{
return "TotalFreedom - Online Players";
return "Total Freedom - Online Players";
}
}

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

@ -7,7 +7,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.httpd.HTMLGenerationTools;
import me.totalfreedom.totalfreedommod.httpd.HTTPDPageBuilder;
import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
@ -158,7 +158,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();
}

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

@ -1,7 +1,7 @@
package me.totalfreedom.totalfreedommod.httpd.module;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.util.FUtil;
@ -36,10 +36,10 @@ public class Module_players extends HTTPDModule
// All online players
for (Player player : Bukkit.getOnlinePlayers())
{
if (!plugin.sl.isVanished(player))
if (!plugin.al.isVanished(player))
{
players.add(player.getName());
if (plugin.sl.isStaff(player) && !plugin.sl.isAdminImpostor(player))
if (plugin.al.isAdmin(player) && !plugin.al.isAdminImpostor(player))
{
onlineadmins.add(player.getName());
}
@ -47,19 +47,19 @@ public class Module_players extends HTTPDModule
}
// Admins
for (StaffMember staffMember : plugin.sl.getActiveStaffMembers())
for (Admin admin : plugin.al.getActiveAdmins())
{
final String username = staffMember.getName();
final String username = admin.getName();
switch (staffMember.getRank())
switch (admin.getRank())
{
case TRIAL_MOD:
case SUPER_ADMIN:
superadmins.add(username);
break;
case MOD:
case TELNET_ADMIN:
telnetadmins.add(username);
break;
case ADMIN:
case SENIOR_ADMIN:
senioradmins.add(username);
break;
}

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

@ -2,7 +2,7 @@ package me.totalfreedom.totalfreedommod.httpd.module;
import java.io.File;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
import me.totalfreedom.totalfreedommod.punishments.PunishmentList;
@ -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();
}
}

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

@ -14,7 +14,7 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.httpd.HTMLGenerationTools;
import me.totalfreedom.totalfreedommod.httpd.HTTPDPageBuilder;
import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
@ -270,9 +270,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