AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-07-01 20:46:41 +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

26
src/main/java/me/totalfreedom/totalfreedommod/command/FreedomCommand.java
View File

@ -12,7 +12,7 @@ import lombok.Getter;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
@ -166,7 +166,7 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
return true;
}
if (perms.cooldown() != 0 && !isStaff(sender))
if (perms.cooldown() != 0 && !isAdmin(sender))
{
COOLDOWN_TIMERS.put(sender, cmd);
timer.schedule(new TimerTask()
@ -224,14 +224,14 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
msg(color + message);
}
protected boolean isStaff(Player player)
protected boolean isAdmin(Player player)
{
return plugin.sl.isStaff(player);
return plugin.al.isAdmin(player);
}
protected boolean isStaff(CommandSender sender)
protected boolean isAdmin(CommandSender sender)
{
return plugin.sl.isStaff(sender);
return plugin.al.isAdmin(sender);
}
protected void checkConsole()
@ -270,7 +270,7 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
{
try
{
boolean run = run(sender, sender instanceof ConsoleCommandSender ? null : (Player) sender, cmd, commandLabel, args, sender instanceof ConsoleCommandSender);
boolean run = run(sender, sender instanceof ConsoleCommandSender ? null : (Player)sender, cmd, commandLabel, args, sender instanceof ConsoleCommandSender);
if (!run)
{
msg(ChatColor.WHITE + cmd.getUsage().replace("<command>", cmd.getLabel()));
@ -316,7 +316,7 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
Player player = Bukkit.getPlayer(name);
if (player != null)
{
if (nullVanished && plugin.sl.isVanished(player.getName()) && !plugin.sl.isStaff(sender))
if (nullVanished && plugin.al.isVanished(player.getName()) && !plugin.al.isAdmin(sender))
{
return null;
}
@ -324,14 +324,14 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
return player;
}
protected StaffMember getStaffMember(CommandSender sender)
protected Admin getAdmin(CommandSender sender)
{
return plugin.sl.getAdmin(sender);
return plugin.al.getAdmin(sender);
}
protected StaffMember getStaffMember(Player player)
protected Admin getAdmin(Player player)
{
return plugin.sl.getAdmin(player);
return plugin.al.getAdmin(player);
}
protected PlayerData getData(Player player)
@ -348,7 +348,7 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
{
try
{
return (FreedomCommand) (((PluginCommand) command).getExecutor());
return (FreedomCommand)(((PluginCommand)command).getExecutor());
}
catch (Exception ex)
{