TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-06-23 14:31:01 +00:00
Code Issues Projects Releases Wiki Activity

TFM refactor

Browse source
This commit is contained in:
Telesphoreo 2020-11-22 23:47:46 -06:00
parent ab32000b3a
commit c645f4c655
No known key found for this signature in database
GPG key ID: 50B67E055A6F167C
25 changed files with 52 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Essentials/src/com/earth2me/essentials/TFMHandler.java
View file

@ -1,7 +1,7 @@
package com.earth2me.essentials;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.staff.StaffList;
import me.totalfreedom.totalfreedommod.admin.AdminList;
import me.totalfreedom.totalfreedommod.util.FLog;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@ -38,19 +38,19 @@ public class TFMHandler
return tfmPlugin;
}
public boolean isStaff(User user)
public boolean isAdmin(User user)
{
return getTFM().sl.isStaff(user.getBase());
return getTFM().al.isAdmin(user.getBase());
}
public boolean isStaff(CommandSender sender)
public boolean isAdmin(CommandSender sender)
{
return getTFM().sl.isStaff(sender);
return getTFM().al.isAdmin(sender);
}
public boolean isStaff(Player player)
public boolean isAdmin(Player player)
{
return getTFM().sl.isStaff(player);
return getTFM().al.isAdmin(player);
}
public boolean isVanished(User user)
@ -64,7 +64,7 @@ public class TFMHandler
{
getTFM();
}
return StaffList.vanished.contains(player.getName());
return AdminList.vanished.contains(player.getName());
}
public void warning(String warning)

4
Essentials/src/com/earth2me/essentials/commands/Commandafk.java
View file

@ -18,7 +18,7 @@ public class Commandafk extends EssentialsCommand {
@Override
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
if (args.length > 0 && getTFMHandler().isStaff(user)) {
if (args.length > 0 && getTFMHandler().isAdmin(user)) {
User afkUser = user; // if no player found, but message specified, set command executor to target user
String message;
try {
@ -91,7 +91,7 @@ public class Commandafk extends EssentialsCommand {
@Override
protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
if (args.length == 1 && getTFMHandler().isStaff(sender.getPlayer())) {
if (args.length == 1 && getTFMHandler().isAdmin(sender.getPlayer())) {
return getPlayers(server, sender);
} else {
return Collections.emptyList();

4
Essentials/src/com/earth2me/essentials/commands/Commandback.java
View file

@ -18,7 +18,7 @@ public class Commandback extends EssentialsCommand {
@Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
final CommandSource sender = user.getSource();
if (args.length > 0 && getTFMHandler().isStaff(user)) {
if (args.length > 0 && getTFMHandler().isAdmin(user)) {
parseOthers(server, sender, args, commandLabel);
return;
}
@ -77,7 +77,7 @@ public class Commandback extends EssentialsCommand {
@Override
protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
if (getTFMHandler().isStaff(user) && args.length == 1) {
if (getTFMHandler().isAdmin(user) && args.length == 1) {
return getPlayers(server, user);
} else {
return Collections.emptyList();

2
Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java
View file

@ -35,7 +35,7 @@ public class Commanddelhome extends EssentialsCommand {
expandedArg = args;
}
if (expandedArg.length > 1 && (user == null || getTFMHandler().isStaff(user))) {
if (expandedArg.length > 1 && (user == null || getTFMHandler().isAdmin(user))) {
user = getPlayer(server, expandedArg, 0, true, true);
name = expandedArg[1];
} else if (user == null) {

4
Essentials/src/com/earth2me/essentials/commands/Commandenderchest.java
View file

@ -14,7 +14,7 @@ public class Commandenderchest extends EssentialsCommand {
@Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
User target = user;
if (args.length > 0 && getTFMHandler().isStaff(user)) {
if (args.length > 0 && getTFMHandler().isAdmin(user)) {
target = getPlayer(server, user, args, 0);
}
@ -25,7 +25,7 @@ public class Commandenderchest extends EssentialsCommand {
@Override
protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
if (args.length == 1 && getTFMHandler().isStaff(user)) {
if (args.length == 1 && getTFMHandler().isAdmin(user)) {
return getPlayers(server, user);
} else {
return Collections.emptyList();

2
Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java
View file

@ -35,7 +35,7 @@ public class Commandgetpos extends EssentialsCommand {
}
private void outputPosition(final CommandSource sender, final User user, final Location coords, final Location distance) {
if (!sender.isPlayer()|| getTFMHandler().isStaff(sender.getPlayer()) || user.getSource() == sender) {
if (!sender.isPlayer()|| getTFMHandler().isAdmin(sender.getPlayer()) || user.getSource() == sender) {
sender.sendMessage(tl("posX", coords.getBlockX()));
sender.sendMessage(tl("posY", coords.getBlockY()));
sender.sendMessage(tl("posZ", coords.getBlockZ()));

5
Essentials/src/com/earth2me/essentials/commands/Commandhome.java
View file

@ -1,7 +1,6 @@
package com.earth2me.essentials.commands;
import com.earth2me.essentials.OfflinePlayer;
import com.earth2me.essentials.TFMHandler;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.StringUtil;
@ -32,7 +31,7 @@ public class Commandhome extends EssentialsCommand {
final String[] nameParts;
if (args.length > 0) {
nameParts = args[0].split(":");
if (nameParts[0].length() == args[0].length() || !getTFMHandler().isStaff(user)) {
if (nameParts[0].length() == args[0].length() || !getTFMHandler().isAdmin(user)) {
homeName = nameParts[0];
} else {
player = getPlayer(server, nameParts, 0, true, true);
@ -146,7 +145,7 @@ public class Commandhome extends EssentialsCommand {
@Override
protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
final boolean canVisitOthers = getTFMHandler().isStaff(user);
final boolean canVisitOthers = getTFMHandler().isAdmin(user);
final boolean canVisitBed = user.isAuthorized("essentials.home.bed");
if (args.length == 1) {
final List<String> homes = user.getHomes();

2
Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java
View file

@ -23,7 +23,7 @@ public class Commandinvsee extends EssentialsCommand {
final User invUser = getPlayer(server, user, args, 0);
final Inventory inv;
if (getTFMHandler().isStaff(invUser) && !getTFMHandler().isStaff(user)) {
if (getTFMHandler().isAdmin(invUser) && !getTFMHandler().isAdmin(user)) {
throw new Exception("You cannot see inside admins' inventories!");
}

4
Essentials/src/com/earth2me/essentials/commands/Commandmail.java
View file

@ -83,7 +83,7 @@ public class Commandmail extends EssentialsCommand {
return;
}
if (args.length > 1 && "sendall".equalsIgnoreCase(args[0])) {
if (!getTFMHandler().isStaff(user)) {
if (!getTFMHandler().isAdmin(user)) {
throw new Exception(tl("noPerm", "essentials.mail.sendall"));
}
ess.runTaskAsynchronously(new SendAll(tl("mailFormat", user.getName(),
@ -146,7 +146,7 @@ public class Commandmail extends EssentialsCommand {
if (user.isAuthorized("essentials.mail.send")) {
options.add("send");
}
if (getTFMHandler().isStaff(user)) {
if (getTFMHandler().isAdmin(user)) {
options.add("sendall");
}
return options;

2
Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
View file

@ -24,7 +24,7 @@ public class Commandmsg extends EssentialsLoopCommand {
}
String message = getFinalArg(args, 1);
boolean canWildcard = getTFMHandler().isStaff(sender.getPlayer());
boolean canWildcard = getTFMHandler().isAdmin(sender.getPlayer());
if (sender.isPlayer()) {
final User user = ess.getUser(sender.getPlayer());
if (user.isMuted()) {

4
Essentials/src/com/earth2me/essentials/commands/Commandnick.java
View file

@ -29,7 +29,7 @@ public class Commandnick extends EssentialsLoopCommand {
throw new Exception(tl("nickDisplayName"));
}
if (args.length > 1 && getTFMHandler().isStaff(user)) {
if (args.length > 1 && getTFMHandler().isAdmin(user)) {
loopOfflinePlayers(server, user.getSource(), false, true, args[0], formatNickname(user, args[1]).split(" "));
user.sendMessage(tl("nickChanged"));
} else {
@ -123,7 +123,7 @@ public class Commandnick extends EssentialsLoopCommand {
@Override
protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
if (args.length == 1 && getTFMHandler().isStaff(sender.getPlayer())) {
if (args.length == 1 && getTFMHandler().isAdmin(sender.getPlayer())) {
return getPlayers(server, sender);
} else {
return Collections.emptyList();

4
Essentials/src/com/earth2me/essentials/commands/Commandptime.java
View file

@ -50,7 +50,7 @@ public class Commandptime extends EssentialsLoopCommand {
}
}
if (args.length > 1 && !getTFMHandler().isStaff(sender.getPlayer()) && !args[1].equalsIgnoreCase(sender.getSelfSelector())) {
if (args.length > 1 && !getTFMHandler().isAdmin(sender.getPlayer()) && !args[1].equalsIgnoreCase(sender.getSelfSelector())) {
sender.sendMessage(tl("pTimeOthersPermission"));
return;
}
@ -122,7 +122,7 @@ public class Commandptime extends EssentialsLoopCommand {
if (args.length == 1) {
return Lists.newArrayList("get", "reset", "sunrise", "day", "morning", "noon", "afternoon", "sunset", "night", "midnight");
} else if (args.length == 2 && (getAliases.contains(args[0]) || user == null || getTFMHandler().isStaff(user))) {
} else if (args.length == 2 && (getAliases.contains(args[0]) || user == null || getTFMHandler().isAdmin(user))) {
return getPlayers(server, sender);
} else {
return Collections.emptyList();

4
Essentials/src/com/earth2me/essentials/commands/Commandpweather.java
View file

@ -60,7 +60,7 @@ public class Commandpweather extends EssentialsLoopCommand {
}
}
if (args.length > 1 && !getTFMHandler().isStaff(sender.getPlayer()) && !args[1].equalsIgnoreCase(sender.getSelfSelector())) {
if (args.length > 1 && !getTFMHandler().isAdmin(sender.getPlayer()) && !args[1].equalsIgnoreCase(sender.getSelfSelector())) {
sender.sendMessage(tl("pWeatherOthersPermission"));
return;
}
@ -108,7 +108,7 @@ public class Commandpweather extends EssentialsLoopCommand {
protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
if (args.length == 1) {
return Lists.newArrayList("get", "reset", "storm", "sun");
} else if (args.length == 2 && (getAliases.contains(args[0]) || user == null || getTFMHandler().isStaff(user))) {
} else if (args.length == 2 && (getAliases.contains(args[0]) || user == null || getTFMHandler().isAdmin(user))) {
return getPlayers(server, user);
} else {
return Collections.emptyList();

6
Essentials/src/com/earth2me/essentials/commands/Commandseen.java
View file

@ -27,9 +27,9 @@ public class Commandseen extends EssentialsCommand {
@Override
protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
final boolean showBan = getTFMHandler().isStaff(sender.getPlayer());
final boolean showIp = getTFMHandler().isStaff(sender.getPlayer());
final boolean showLocation = getTFMHandler().isStaff(sender.getPlayer());
final boolean showBan = getTFMHandler().isAdmin(sender.getPlayer());
final boolean showIp = getTFMHandler().isAdmin(sender.getPlayer());
final boolean showLocation = getTFMHandler().isAdmin(sender.getPlayer());
if (args.length < 1) {
throw new NotEnoughArgumentsException();
}

4
Essentials/src/com/earth2me/essentials/commands/Commandspeed.java
View file

@ -43,7 +43,7 @@ public class Commandspeed extends EssentialsCommand {
} else {
isFly = flyPermCheck(user, isFlyMode(args[0]));
speed = getMoveSpeed(args[1]);
if (args.length > 2 && getTFMHandler().isStaff(user)) {
if (args.length > 2 && getTFMHandler().isAdmin(user)) {
if (args[2].trim().length() < 2) {
throw new PlayerNotFoundException();
}
@ -140,7 +140,7 @@ public class Commandspeed extends EssentialsCommand {
return types;
} else if (args.length == 2) {
return speeds;
} else if (args.length == 3 && getTFMHandler().isStaff(sender.getPlayer())) {
} else if (args.length == 3 && getTFMHandler().isAdmin(sender.getPlayer())) {
return getPlayers(server, sender);
} else {
return Collections.emptyList();

8
Essentials/src/com/earth2me/essentials/commands/Commandtp.java
View file

@ -29,7 +29,7 @@ public class Commandtp extends EssentialsCommand {
case 1:
final User player = getPlayer(server, user, args, 0, false, true);
if (getTFMHandler().isVanished(player) && !getTFMHandler().isStaff(user)) {
if (getTFMHandler().isVanished(player) && !getTFMHandler().isAdmin(user)) {
throw new PlayerNotFoundException();
}
@ -67,7 +67,7 @@ public class Commandtp extends EssentialsCommand {
});
break;
case 4:
if (!getTFMHandler().isStaff(user)) {
if (!getTFMHandler().isAdmin(user)) {
throw new Exception(tl("noPerm", "essentials.tp.others"));
}
if (!user.isAuthorized("essentials.tp.position")) {
@ -94,7 +94,7 @@ public class Commandtp extends EssentialsCommand {
break;
case 2:
default:
if (!getTFMHandler().isStaff(user)) {
if (!getTFMHandler().isAdmin(user)) {
throw new Exception(tl("noPerm", "essentials.tp.others"));
}
final User target = getPlayer(server, user, args, 0);
@ -149,7 +149,7 @@ public class Commandtp extends EssentialsCommand {
@Override
protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
// Don't handle coords
if (args.length == 1 || (args.length == 2 && getTFMHandler().isStaff(user))) {
if (args.length == 1 || (args.length == 2 && getTFMHandler().isAdmin(user))) {
return getPlayers(server, user);
} else {
return Collections.emptyList();

2
Essentials/src/com/earth2me/essentials/commands/Commandtpa.java
View file

@ -28,7 +28,7 @@ public class Commandtpa extends EssentialsCommand {
if (user.getName().equalsIgnoreCase(player.getName())) {
throw new NotEnoughArgumentsException();
}
if (getTFMHandler().isVanished(player) && !getTFMHandler().isStaff(user)) {
if (getTFMHandler().isVanished(player) && !getTFMHandler().isAdmin(user)) {
throw new PlayerNotFoundException();
}
if (!player.isAuthorized("essentials.tpaccept")) {

2
Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java
View file

@ -24,7 +24,7 @@ public class Commandtpahere extends EssentialsCommand {
if (user.getName().equalsIgnoreCase(player.getName())) {
throw new NotEnoughArgumentsException();
}
if (getTFMHandler().isVanished(player) && !getTFMHandler().isStaff(user)) {
if (getTFMHandler().isVanished(player) && !getTFMHandler().isAdmin(user)) {
throw new PlayerNotFoundException();
}
if (!player.isAuthorized("essentials.tpaccept")) {

2
Essentials/src/com/earth2me/essentials/commands/Commandtphere.java
View file

@ -18,7 +18,7 @@ public class Commandtphere extends EssentialsCommand {
@Override
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
final User player = getPlayer(server, user, args, 0);
if (getTFMHandler().isVanished(player) && !getTFMHandler().isStaff(user)) {
if (getTFMHandler().isVanished(player) && !getTFMHandler().isAdmin(user)) {
throw new PlayerNotFoundException();
}
if (!player.isTeleportEnabled()) {

4
Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
View file

@ -38,7 +38,7 @@ public class Commandwarp extends EssentialsCommand {
if (args.length > 0) {
//TODO: Remove 'otherplayers' permission.
User otherUser = null;
if (args.length == 2 && getTFMHandler().isStaff(user)) {
if (args.length == 2 && getTFMHandler().isAdmin(user)) {
otherUser = getPlayer(server, user, args, 1);
warpUser(user, otherUser, args[0], commandLabel);
throw new NoChargeException();
@ -115,7 +115,7 @@ public class Commandwarp extends EssentialsCommand {
protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
if (args.length == 1 && user.isAuthorized("essentials.warp.list")) {
return getAvailableWarpsFor(user);
} else if (args.length == 2 && getTFMHandler().isStaff(user)) {
} else if (args.length == 2 && getTFMHandler().isAdmin(user)) {
//TODO: Remove 'otherplayers' permission.
return getPlayers(server, user);
} else {

4
Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
View file

@ -39,7 +39,7 @@ public class Commandwhois extends EssentialsCommand {
sender.sendMessage(tl("whoisHealth", user.getBase().getHealth()));
sender.sendMessage(tl("whoisHunger", user.getBase().getFoodLevel(), user.getBase().getSaturation()));
sender.sendMessage(tl("whoisExp", SetExpFix.getTotalExperience(user.getBase()), user.getBase().getLevel()));
if (!sender.isPlayer() || getTFMHandler().isStaff(sender.getPlayer())) {
if (!sender.isPlayer() || getTFMHandler().isAdmin(sender.getPlayer())) {
sender.sendMessage(tl("whoisLocation", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ()));
}
long playtimeMs = System.currentTimeMillis() - (user.getBase().getStatistic(PLAY_ONE_TICK) * 50);
@ -47,7 +47,7 @@ public class Commandwhois extends EssentialsCommand {
if (!ess.getSettings().isEcoDisabled()) {
sender.sendMessage(tl("whoisMoney", NumberUtil.displayCurrency(user.getMoney(), ess)));
}
if (!sender.isPlayer() || getTFMHandler().isStaff(sender.getPlayer())) {
if (!sender.isPlayer() || getTFMHandler().isAdmin(sender.getPlayer())) {
sender.sendMessage(tl("whoisIPAddress", user.getBase().getAddress().getAddress().toString()));
}
final String location = user.getGeoLocation();

2
Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java
View file

@ -27,7 +27,7 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand {
throw new PlayerNotFoundException();
}
matchWildcards = getTFMHandler().isStaff(sender.getPlayer());
matchWildcards = getTFMHandler().isAdmin(sender.getPlayer());
final UUID uuid = StringUtil.toUUID(searchTerm);
if (uuid != null) {

10
Essentials/src/com/earth2me/essentials/commands/EssentialsToggleCommand.java
View file

@ -20,12 +20,12 @@ public abstract class EssentialsToggleCommand extends EssentialsCommand {
protected void handleToggleWithArgs(final Server server, final User user, final String[] args) throws Exception {
if (args.length == 1) {
final Boolean toggle = matchToggleArgument(args[0]);
if (toggle == null && getTFMHandler().isStaff(user)) {
if (toggle == null && getTFMHandler().isAdmin(user)) {
toggleOtherPlayers(server, user.getSource(), args);
} else {
togglePlayer(user.getSource(), user, toggle);
}
} else if (args.length == 2 && getTFMHandler().isStaff(user)) {
} else if (args.length == 2 && getTFMHandler().isAdmin(user)) {
toggleOtherPlayers(server, user.getSource(), args);
} else {
togglePlayer(user.getSource(), user, null);
@ -59,7 +59,7 @@ public abstract class EssentialsToggleCommand extends EssentialsCommand {
final Boolean toggle = matchToggleArgument(args[1]);
togglePlayer(sender, player, toggle);
} else {
if (!getTFMHandler().isStaff(sender.getPlayer())) {
if (!getTFMHandler().isAdmin(sender.getPlayer())) {
player = ess.getUser(sender.getPlayer());
}
togglePlayer(sender, player, null);
@ -76,12 +76,12 @@ public abstract class EssentialsToggleCommand extends EssentialsCommand {
@Override
protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
if (args.length == 1) {
if (getTFMHandler().isStaff(user)) {
if (getTFMHandler().isAdmin(user)) {
return getPlayers(server, user);
} else {
return Lists.newArrayList("enable", "disable");
}
} else if (args.length == 2 && getTFMHandler().isStaff(user)) {
} else if (args.length == 2 && getTFMHandler().isAdmin(user)) {
return Lists.newArrayList("enable", "disable");
} else {
return Collections.emptyList();

2
EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
View file

@ -26,7 +26,7 @@ public class Commandspawn extends EssentialsCommand {
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
final Trade charge = new Trade(this.getName(), ess);
charge.isAffordableFor(user);
if (args.length > 0 && getTFMHandler().isStaff(user)) {
if (args.length > 0 && getTFMHandler().isAdmin(user)) {
final User otherUser = getPlayer(server, user, args, 0);
final CompletableFuture<Boolean> future = new CompletableFuture<>();
future.thenAccept(success -> {

2
pom.xml
View file

@ -76,7 +76,7 @@
<dependency>
<groupId>me.totalfreedom</groupId>
<artifactId>TotalFreedomMod</artifactId>
<version>2020.9</version>
<version>2020.11.5</version>
<scope>provided</scope>
</dependency>
</dependencies>