AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-11 21:43:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

I think I have a better solution to #109

Browse Source
This commit is contained in:
ZeroEpoch1969
2018-07-30 22:58:50 -07:00
parent b702c1cec5
commit 12f023196a
11 changed files with 132 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java
View File

@ -13,7 +13,7 @@ import org.bukkit.entity.Player;
import java.util.Arrays;
@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
@CommandParameters(description = "Manage my admin entry", usage = "/<command> [-o <admin>] <clearips | clearip <ip> | setlogin <message> | clearlogin | settag <tag> | cleartag | setacformat <format> | clearacformat> | oldtags | logstick>")
@CommandParameters(description = "Manage my admin entry", usage = "/<command> [-o <admin>] <clearips | clearip <ip> | setlogin <message> | clearlogin | setacformat <format> | clearacformat> | oldtags | logstick>")
public class Command_myadmin extends FreedomCommand
{
@ -162,21 +162,13 @@ public class Command_myadmin extends FreedomCommand
case "settag":
{
FUtil.adminAction(sender.getName(), "Setting personal default tag" + (init == null ? "" : " for " + targetPlayer.getName()), false);
String tag = StringUtils.join(args, " ", 1, args.length);
target.setTag(tag);
msg((init == null ? "Your" : targetPlayer.getName() + "'s") + " default tag is now: " + FUtil.colorize(target.getTag()));
plugin.al.save();
plugin.al.updateTables();
msg("Please use /tag set to set your tag.", ChatColor.RED);
return true;
}
case "cleartag":
{
FUtil.adminAction(sender.getName(), "Clearing personal default tag" + (init == null ? "" : " for " + targetPlayer.getName()), false);
target.setTag(null);
plugin.al.save();
plugin.al.updateTables();
msg("Please use /tag off to remove your tag.", ChatColor.RED);
return true;
}
case "setacformat":

105
src/main/java/me/totalfreedom/totalfreedommod/command/Command_playerverify.java
View File

@ -2,16 +2,14 @@ package me.totalfreedom.totalfreedommod.command;
import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import net.pravian.aero.util.Ips;
import org.apache.commons.lang3.StringUtils;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Manage your verification", usage = "/<command> <<enable | disable | clearips | status> <discord | forum> | settag <tag> | cleartag>", aliases = "playerverification,pv")
@CommandParameters(description = "Manage your verification", usage = "/<command> <<enable | disable | clearips | status>", aliases = "playerverification,pv")
public class Command_playerverify extends FreedomCommand
{
@Override
@ -51,96 +49,43 @@ public class Command_playerverify extends FreedomCommand
return true;
}
switch (args[0])
{
case "cleartag":
{
msg("Cleared personal default tag");
target.setTag(null);
plugin.pv.saveVerificationData(target);
return true;
}
}
if (args.length < 2)
{
return false;
}
VPlayer data = plugin.pv.getVerificationPlayer(playerSender);
switch (args[0].toLowerCase())
{
case "enable":
switch (args[1].toLowerCase())
if (!plugin.dc.enabled)
{
case "discord":
if (!plugin.dc.enabled)
{
msg("The Discord verification system is currently disabled.", ChatColor.RED);
return true;
}
VPlayer data = plugin.pv.getVerificationPlayer(playerSender);
if (data.getDiscordEnabled())
{
msg("Discord verification is already enabled for you.", ChatColor.RED);
return true;
}
data.setDiscordEnabled(true);
plugin.pv.saveVerificationData(data);
msg("Enabled Discord verification. Please type /linkdiscord to link a Discord account.", ChatColor.GREEN);
return true;
case "forum":
msg("TODO. This will be enabled in a later update. Please use Discord verification instead.");
return true;
default:
return false;
msg("The Discord verification system is currently disabled.", ChatColor.RED);
return true;
}
if (data.getEnabled())
{
msg("Discord verification is already enabled for you.", ChatColor.RED);
return true;
}
data.setEnabled(true);
plugin.pv.saveVerificationData(data);
msg("Enabled Discord verification. Please type /linkdiscord to link a Discord account.", ChatColor.GREEN);
return true;
case "disable":
switch (args[1].toLowerCase())
if (!data.getEnabled())
{
case "discord":
VPlayer data = plugin.pv.getVerificationPlayer(playerSender);
if (!data.getDiscordEnabled())
{
msg("Discord verification is already disabled for you.", ChatColor.RED);
return true;
}
data.setDiscordEnabled(false);
plugin.pv.saveVerificationData(data);
msg("Disabled Discord verification.", ChatColor.GREEN);
return true;
case "forum":
msg("TODO. Forum verification will be enabled in a later update.");
return true;
default:
return false;
msg("Discord verification is already disabled for you.", ChatColor.RED);
return true;
}
data.setEnabled(false);
plugin.pv.saveVerificationData(data);
msg("Disabled Discord verification.", ChatColor.GREEN);
return true;
case "status":
switch (args[1].toLowerCase())
{
case "discord":
boolean enabled = target.getDiscordEnabled();
boolean specified = target.getDiscordId() != null;
msg(ChatColor.GRAY + "Discord Verification Enabled: " + (enabled ? ChatColor.GREEN + "true" : ChatColor.RED + "false"));
msg(ChatColor.GRAY + "Discord ID: " + (specified ? ChatColor.GREEN + target.getDiscordId() : ChatColor.RED + "not set"));
return true;
case "forum":
msg("TODO. Forum verification will be enabled in a later update.");
return true;
default:
return false;
}
case "settag":
{
String tag = StringUtils.join(args, " ", 1, args.length);
target.setTag(tag);
msg("Your default tag is now: " + FUtil.colorize(target.getTag()));
plugin.pv.saveVerificationData(target);
boolean enabled = target.getEnabled();
boolean specified = target.getDiscordId() != null;
msg(ChatColor.GRAY + "Discord Verification Enabled: " + (enabled ? ChatColor.GREEN + "true" : ChatColor.RED + "false"));
msg(ChatColor.GRAY + "Discord ID: " + (specified ? ChatColor.GREEN + target.getDiscordId() : ChatColor.RED + "not set"));
return true;
}
default:
return false;
}

44
src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
View File

@ -2,7 +2,11 @@ package me.totalfreedom.totalfreedommod.command;
import java.util.Arrays;
import java.util.List;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
import me.totalfreedom.totalfreedommod.player.FPlayer;
import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.apache.commons.lang3.StringUtils;
@ -16,10 +20,8 @@ import org.bukkit.entity.Player;
public class Command_tag extends FreedomCommand
{
public static final List<String> FORBIDDEN_WORDS = Arrays.asList(new String[]
{
"admin", "owner", "moderator", "developer", "console", "SRA", "TCA", "SA"
});
public static final List<String> FORBIDDEN_WORDS = Arrays.asList(
"admin", "owner", "moderator", "developer", "console", "dev", "staff", "mod", "sra", "tca", "sta", "sa");
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
@ -75,6 +77,7 @@ public class Command_tag extends FreedomCommand
else
{
plugin.pl.getPlayer(playerSender).setTag(null);
save(playerSender, null);
msg("Your tag has been removed.");
}
@ -104,6 +107,7 @@ public class Command_tag extends FreedomCommand
}
plugin.pl.getPlayer(player).setTag(null);
save(player, null);
msg("Removed " + player.getName() + "'s tag.");
return true;
@ -111,7 +115,7 @@ public class Command_tag extends FreedomCommand
else if ("set".equalsIgnoreCase(args[0]))
{
final String inputTag = StringUtils.join(args, " ", 1, args.length);
final String outputTag = FUtil.colorize(StringUtils.replaceEachRepeatedly(StringUtils.strip(inputTag),
final String strippedTag = StringUtils.replaceEachRepeatedly(StringUtils.strip(inputTag),
new String[]
{
"" + ChatColor.COLOR_CHAR, "&k"
@ -119,7 +123,8 @@ public class Command_tag extends FreedomCommand
new String[]
{
"", ""
})) + ChatColor.RESET;
});
final String outputTag = FUtil.colorize(strippedTag);
if (!plugin.al.isAdmin(sender))
{
@ -142,7 +147,8 @@ public class Command_tag extends FreedomCommand
}
plugin.pl.getPlayer(playerSender).setTag(outputTag);
msg("Tag set to '" + outputTag + "'.");
save(playerSender, strippedTag);
msg("Tag set to '" + outputTag + ChatColor.GRAY + "'.");
return true;
}
@ -156,4 +162,28 @@ public class Command_tag extends FreedomCommand
return false;
}
}
public void save(Player player, String tag)
{
if (plugin.al.isAdmin(playerSender))
{
Admin admin = plugin.al.getAdmin(player);
admin.setTag(tag);
plugin.al.save();
plugin.al.updateTables();
}
else if (plugin.mbl.isMasterBuilder(playerSender))
{
MasterBuilder masterBuilder = plugin.mbl.getMasterBuilder(player);
masterBuilder.setTag(tag);
plugin.mbl.save();
plugin.mbl.updateTables();
}
else if (plugin.pv.getVerificationPlayer(player).getEnabled())
{
VPlayer vPlayer = plugin.pv.getVerificationPlayer(player);
vPlayer.setTag(tag);
plugin.pv.saveVerificationData(vPlayer);
}
}
}

2
src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java
View File

@ -43,7 +43,7 @@ public class Command_unlinkdiscord extends FreedomCommand
return true;
}
data.setDiscordId(null);
data.setDiscordEnabled(false);
data.setEnabled(false);
msg("Your Minecraft account has been successfully unlinked from the Discord account.", ChatColor.GREEN);
return true;
}

7
src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java
View File

@ -57,7 +57,7 @@ public class Command_vanish extends FreedomCommand
FLog.info(playerSender.getName() + " is no longer vanished.");
for (Player player : server.getOnlinePlayers())
{
player.showPlayer(playerSender);
player.showPlayer(plugin, playerSender);
}
plugin.esb.setVanished(playerSender.getName(), false);
playerSender.removePotionEffect(PotionEffectType.INVISIBILITY);
@ -74,7 +74,10 @@ public class Command_vanish extends FreedomCommand
FLog.info(playerSender.getName() + " is now vanished.");
for (Player player : server.getOnlinePlayers())
{
player.hidePlayer(playerSender);
if (!plugin.al.isAdmin(player))
{
player.hidePlayer(plugin, playerSender);
}
}
plugin.esb.setVanished(playerSender.getName(), true);
playerSender.addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, 1000000, 1, false, true));