AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

yeah

Browse Source
This commit is contained in:
ZeroEpoch1969 2020-01-24 23:27:16 -07:00
parent 47a62753d1
commit a37d8ecb31
No known key found for this signature in database
GPG Key ID: A7BAB4E14F089CF3
23 changed files with 1243 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TotalFreedomMod.iml
View File

@ -49,7 +49,7 @@
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13-R0.1-SNAPSHOT" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.0" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.0" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.15-R0.1-SNAPSHOT" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.15-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.Pravian:Aero:5f82926" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.Pravian:Aero:5f82926" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.12-R0.1-SNAPSHOT" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.12-R0.1-SNAPSHOT" level="project" />
@ -82,7 +82,6 @@
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.4.12" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.4.12" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.11" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:jcl-over-slf4j:1.7.28" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:jcl-over-slf4j:1.7.28" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-driver-odf:0.12.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-driver-odf:0.12.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-comp-zipdriver:0.12.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-comp-zipdriver:0.12.1" level="project" />
@ -163,5 +162,6 @@
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-commons:7.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-commons:7.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-tree:7.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-tree:7.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-analysis:7.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-analysis:7.1" level="project" />
<orderEntry type="library" name="Maven: me.rayzr522:jsonmessage:1.0.0" level="project" />
</component> </component>
</module> </module>

19
pom.xml
View File

@ -94,6 +94,11 @@
<id>papermc</id> <id>papermc</id>
<url>https://papermc.io/repo/repository/maven-public/</url> <url>https://papermc.io/repo/repository/maven-public/</url>
</repository> </repository>
<repository>
<id>rayzr-repo</id>
<url>https://cdn.rawgit.com/Rayzr522/maven-repo/master/</url>
</repository>
</repositories> </repositories>
<dependencies> <dependencies>
@ -118,6 +123,13 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
@ -187,6 +199,12 @@
<version>1.15.1-R0.1-SNAPSHOT</version> <version>1.15.1-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>me.rayzr522</groupId>
<artifactId>jsonmessage</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -344,6 +362,7 @@
<includes> <includes>
<include>commons-io:commons-io</include> <include>commons-io:commons-io</include>
<include>org.apache.commons:commons-lang3</include> <include>org.apache.commons:commons-lang3</include>
<include>commons-codec:commons-codec</include>
</includes> </includes>
</artifactSet> </artifactSet>
</configuration> </configuration>

55
src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java
View File

@ -7,6 +7,8 @@ import org.bukkit.Bukkit;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scheduler.BukkitTask; import org.bukkit.scheduler.BukkitTask;
@ -23,7 +25,6 @@ public class EntityWiper extends FreedomService
EntityType.ARMOR_STAND, EntityType.ARMOR_STAND,
EntityType.PAINTING, EntityType.PAINTING,
EntityType.BOAT, EntityType.BOAT,
EntityType.PLAYER,
EntityType.LEASH_HITCH, EntityType.LEASH_HITCH,
EntityType.ITEM_FRAME EntityType.ITEM_FRAME
); );
@ -37,9 +38,9 @@ public class EntityWiper extends FreedomService
@Override @Override
public void run() public void run()
{ {
wipe(); wipeEntities(false);
} }
}.runTaskTimer(plugin, 1L, 300 * 5); // 5 minutes }.runTaskTimer(plugin, 600L, 600L); // 30 second delay after startup + run every 30 seconds
} }
@Override @Override
@ -51,15 +52,19 @@ public class EntityWiper extends FreedomService
// Methods for wiping // Methods for wiping
public int wipe() public int wipeEntities(boolean bypassBlacklist)
{ {
int removed = 0; int removed = 0;
for (World world : Bukkit.getWorlds()) for (World world : Bukkit.getWorlds())
{ {
for (Entity entity : world.getEntities()) for (Entity entity : world.getEntities())
{ {
if (!BLACKLIST.contains(entity.getType()) || !Groups.MOB_TYPES.contains(entity.getType())) if (!(entity instanceof Player))
{ {
if (!bypassBlacklist && (BLACKLIST.contains(entity.getType()) || Groups.MOB_TYPES.contains(entity.getType())))
{
continue;
}
entity.remove(); entity.remove();
removed++; removed++;
} }
@ -67,4 +72,44 @@ public class EntityWiper extends FreedomService
} }
return removed; return removed;
} }
public int wipeEntities(EntityType entityType)
{
int removed = 0;
for (World world : Bukkit.getWorlds())
{
for (Entity entity : world.getEntities())
{
if (!entity.getType().equals(entityType))
{
continue;
}
entity.remove();
removed++;
}
}
return removed;
}
public int purgeMobs(EntityType type)
{
int removed = 0;
for (World world : Bukkit.getWorlds())
{
for (Entity entity : world.getLivingEntities())
{
if (entity instanceof LivingEntity && !(entity instanceof Player))
{
if (type != null && !entity.getType().equals(type))
{
continue;
}
entity.remove();
removed++;
}
}
}
return removed;
}
} }

18
src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java
View File

@ -8,6 +8,7 @@ import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder; import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
import me.totalfreedom.totalfreedommod.player.FPlayer; import me.totalfreedom.totalfreedommod.player.FPlayer;
import me.totalfreedom.totalfreedommod.playerverification.VPlayer; import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
import me.totalfreedom.totalfreedommod.util.FLog;
import me.totalfreedom.totalfreedommod.util.FSync; import me.totalfreedom.totalfreedommod.util.FSync;
import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -19,6 +20,7 @@ import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerLoginEvent;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import me.rayzr522.jsonmessage.JSONMessage;
public class LoginProcess extends FreedomService public class LoginProcess extends FreedomService
{ {
@ -246,6 +248,22 @@ public class LoginProcess extends FreedomService
{ {
fPlayer.setTag(FUtil.colorize(vPlayer.getTag())); fPlayer.setTag(FUtil.colorize(vPlayer.getTag()));
} }
int noteCount = vPlayer.getNotes().size();
if (noteCount != 0)
{
String noteMessage = "This player has " + noteCount + " staff note" + (noteCount > 1 ? "s" : "") + ".";
JSONMessage notice = JSONMessage.create(ChatColor.GOLD + noteMessage + " Click here to view them.")
.tooltip("Click here to view them.")
.runCommand("/notes " + player.getName() + " list");
FLog.info(noteMessage);
for (Player p : server.getOnlinePlayers())
{
if (plugin.al.isAdminImpostor(p))
{
notice.send(p);
}
}
}
} }
} }

24
src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java
View File

@ -1,6 +1,7 @@
package me.totalfreedom.totalfreedommod.admin; package me.totalfreedom.totalfreedommod.admin;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import lombok.Getter; import lombok.Getter;
@ -34,6 +35,7 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
private Rank rank = Rank.SUPER_ADMIN; private Rank rank = Rank.SUPER_ADMIN;
@Getter @Getter
private final List<String> ips = Lists.newArrayList(); private final List<String> ips = Lists.newArrayList();
private final List<String> backupCodes = Lists.newArrayList();
@Getter @Getter
@Setter @Setter
private Date lastLogin = new Date(); private Date lastLogin = new Date();
@ -92,7 +94,8 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
.append("- Potion Spy: ").append(potionSpy).append("\n") .append("- Potion Spy: ").append(potionSpy).append("\n")
.append("- Admin Chat Format: ").append(acFormat).append("\n") .append("- Admin Chat Format: ").append(acFormat).append("\n")
.append("- Old Tags: ").append(oldTags).append("\n") .append("- Old Tags: ").append(oldTags).append("\n")
.append("- Log Stick: ").append(logStick); .append("- Log Stick: ").append(logStick)
.append("- Backup Codes: ").append(backupCodes.size()).append("/10").append("\n");
return output.toString(); return output.toString();
} }
@ -113,6 +116,8 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
rank = Rank.findRank(cs.getString("rank")); rank = Rank.findRank(cs.getString("rank"));
ips.clear(); ips.clear();
ips.addAll(cs.getStringList("ips")); ips.addAll(cs.getStringList("ips"));
backupCodes.clear();
backupCodes.addAll(cs.getStringList("backupCodes"));
lastLogin = FUtil.stringToDate(cs.getString("last_login")); lastLogin = FUtil.stringToDate(cs.getString("last_login"));
loginMessage = cs.getString("login_message", null); loginMessage = cs.getString("login_message", null);
discordID = cs.getString("discord_id", null); discordID = cs.getString("discord_id", null);
@ -132,6 +137,7 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
cs.set("active", active); cs.set("active", active);
cs.set("rank", rank.toString()); cs.set("rank", rank.toString());
cs.set("ips", Lists.newArrayList(ips)); cs.set("ips", Lists.newArrayList(ips));
cs.set("backupCodes", Lists.newArrayList(backupCodes));
cs.set("last_login", FUtil.dateToString(lastLogin)); cs.set("last_login", FUtil.dateToString(lastLogin));
cs.set("login_message", loginMessage); cs.set("login_message", loginMessage);
cs.set("discord_id", discordID); cs.set("discord_id", discordID);
@ -183,6 +189,22 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
ips.clear(); ips.clear();
} }
public List<String> getBackupCodes()
{
return Collections.unmodifiableList(backupCodes);
}
public void setBackupCodes(List<String> codes)
{
backupCodes.clear();
backupCodes.addAll(codes);
}
public void removeBackupCode(String code)
{
backupCodes.remove(code);
}
public void setActive(boolean active) public void setActive(boolean active)
{ {
this.active = active; this.active = active;

53
src/main/java/me/totalfreedom/totalfreedommod/command/Command_chatcolor.java
View File

@ -1,53 +0,0 @@
package me.totalfreedom.totalfreedommod.command;
import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.apache.commons.lang.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 = "Change your default chat color.", usage = "/<command> <color>")
public class Command_chatcolor extends FreedomCommand
{
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
if (args.length != 1)
{
return false;
}
VPlayer vPlayer = plugin.pv.getVerificationPlayer(playerSender);
if (args[0].equals("clear"))
{
vPlayer.setColor(null);
msg("Default chat color cleared.");
return true;
}
if (args[0].equalsIgnoreCase("k")
|| args[0].equalsIgnoreCase("0")
|| args[0].equalsIgnoreCase("m"))
{
msg("You are not allowed to use that color as default.");
return true;
}
ChatColor color = ChatColor.getByChar(args[0]);
if (color == null)
{
msg("Please enter a valid color. Example: a, 2, e");
return true;
}
vPlayer.setColor(color);
msg("Default chat color set to \"" + args[0] + ".\"");
return true;
}
}

20
src/main/java/me/totalfreedom/totalfreedommod/command/Command_cleardiscordqueue.java Normal file
View File

@ -0,0 +1,20 @@
package me.totalfreedom.totalfreedommod.command;
import me.totalfreedom.totalfreedommod.rank.Rank;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_CONSOLE)
@CommandParameters(description = "Clear the discord message queue", usage = "/<command>")
public class Command_cleardiscordqueue extends FreedomCommand
{
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
plugin.dc.clearQueue();
msg("Cleared the discord message queue.");
return true;
}
}

94
src/main/java/me/totalfreedom/totalfreedommod/command/Command_entitywipe.java
View File

@ -1,26 +1,106 @@
package me.totalfreedom.totalfreedommod.command; package me.totalfreedom.totalfreedommod.command;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.Bukkit; import me.totalfreedom.totalfreedommod.util.Groups;
import org.bukkit.World; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Remove various server entities that may cause lag, such as dropped items, minecarts, and boats.", usage = "/<command>", aliases = "ew,rd") @CommandParameters(description = "Remove various server entities that may cause lag, such as dropped items, minecarts, and boats.", usage = "/<command> [name | -a]", aliases = "ew,rd")
public class Command_entitywipe extends FreedomCommand public class Command_entitywipe extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
FUtil.adminAction(sender.getName(), "Removing all server entities", true); EntityType type = null;
int removed = plugin.ew.wipe(); String entityName = null;
msg(removed + " entities removed."); boolean bypassBlacklist = false;
if (args.length > 0)
{
if (args[0].equals("-a"))
{
bypassBlacklist = true;
}
else
{
try
{
type = EntityType.valueOf(args[0].toUpperCase());
}
catch (Exception e)
{
msg(args[0] + " is not a valid entity type.", ChatColor.RED);
return true;
}
if (!getAllEntities().contains(type))
{
msg(FUtil.formatName(type.name()) + " is an entity, however: it is a mob.", ChatColor.RED);
return true; return true;
} }
} }
}
if (type != null)
{
entityName = FUtil.formatName(type.name());
}
FUtil.adminAction(sender.getName(), "Purging all " + (type != null ? entityName + "s" : "entities"), true);
int count;
if (type != null)
{
count = plugin.ew.wipeEntities(type);
}
else
{
count = plugin.ew.wipeEntities(bypassBlacklist);
}
msg(count + " " + (type != null ? entityName : "entities") + FUtil.showS(count) + " removed.");
return true;
}
public static List<EntityType> getAllEntities()
{
List<EntityType> entityTypes = new ArrayList<>();
for (EntityType entityType : EntityType.values())
{
if (!Groups.MOB_TYPES.contains(entityType))
{
entityTypes.add(entityType);
}
}
return entityTypes;
}
public static List<String> getAllEntityNames()
{
List<String> names = new ArrayList<>();
for (EntityType entityType : getAllEntities())
{
names.add(entityType.name());
}
return names;
}
@Override
public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
{
List<String> names = getAllEntityNames();
names.add("-a");
if (args.length == 1)
{
return names;
}
return Collections.emptyList();
}
}

48
src/main/java/me/totalfreedom/totalfreedommod/command/Command_linkdiscord.java
View File

@ -1,8 +1,8 @@
package me.totalfreedom.totalfreedommod.command; package me.totalfreedom.totalfreedommod.command;
import java.util.Random;
import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.discord.Discord; import me.totalfreedom.totalfreedommod.discord.Discord;
import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
import me.totalfreedom.totalfreedommod.playerverification.VPlayer; import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -24,6 +24,8 @@ public class Command_linkdiscord extends FreedomCommand
return true; return true;
} }
String code;
if (plugin.al.isAdmin(playerSender)) if (plugin.al.isAdmin(playerSender))
{ {
Admin admin = plugin.al.getAdmin(playerSender); Admin admin = plugin.al.getAdmin(playerSender);
@ -33,20 +35,33 @@ public class Command_linkdiscord extends FreedomCommand
return true; return true;
} }
if (Discord.LINK_CODES.containsValue(admin)) if (Discord.ADMIN_LINK_CODES.containsValue(admin))
{ {
msg("Your linking code is " + ChatColor.GREEN + Discord.getCodeForAdmin(admin), ChatColor.AQUA); code = Discord.getCodeForAdmin(admin);
} }
else else
{ {
String code = ""; code = plugin.dc.generateCode(5);
Random random = new Random(); Discord.ADMIN_LINK_CODES.put(code, admin);
for (int i = 0; i < 5; i++)
{
code += random.nextInt(10);
} }
Discord.LINK_CODES.put(code, admin); }
msg("Your linking code is " + ChatColor.GREEN + code, ChatColor.AQUA); else if (plugin.mbl.isMasterBuilder(playerSender))
{
MasterBuilder masterBuilder = plugin.mbl.getMasterBuilder(playerSender);
if (masterBuilder.getDiscordID() != null)
{
msg("Your Minecraft account is already linked to a Discord account.", ChatColor.RED);
return true;
}
if (Discord.MASTER_BUILDER_LINK_CODES.containsValue(masterBuilder))
{
code = Discord.getCodeForMasterBuilder(masterBuilder);
}
else
{
code = plugin.dc.generateCode(5);
Discord.MASTER_BUILDER_LINK_CODES.put(code, masterBuilder);
} }
} }
else else
@ -60,21 +75,16 @@ public class Command_linkdiscord extends FreedomCommand
if (Discord.PLAYER_LINK_CODES.containsValue(data)) if (Discord.PLAYER_LINK_CODES.containsValue(data))
{ {
msg("Your linking code is " + ChatColor.GREEN + Discord.getCodeForPlayer(data), ChatColor.AQUA); code = Discord.getCodeForPlayer(data);
msg("Take this code and DM the server bot (" + plugin.dc.formatBotTag() + ") the code (do not put anything else in the message, only the code)");
} }
else else
{ {
String code = ""; code = plugin.dc.generateCode(5);
Random random = new Random();
for (int i = 0; i < 5; i++)
{
code += random.nextInt(10);
}
Discord.PLAYER_LINK_CODES.put(code, data); Discord.PLAYER_LINK_CODES.put(code, data);
msg("Your linking code is " + ChatColor.GREEN + code, ChatColor.AQUA);
} }
} }
msg("Your linking code is " + ChatColor.AQUA + code, ChatColor.GREEN);
msg("Take this code and DM the server bot (" + plugin.dc.formatBotTag() + ") the code (do not put anything else in the message, only the code)");
return true; return true;
} }
} }

34
src/main/java/me/totalfreedom/totalfreedommod/command/Command_mobpurge.java
View File

@ -6,15 +6,10 @@ import java.util.List;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.FUtil;
import me.totalfreedom.totalfreedommod.util.Groups; import me.totalfreedom.totalfreedommod.util.Groups;
import org.apache.commons.lang.WordUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.World;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
@ -41,43 +36,22 @@ public class Command_mobpurge extends FreedomCommand
if (!Groups.MOB_TYPES.contains(type)) if (!Groups.MOB_TYPES.contains(type))
{ {
msg(WordUtils.capitalizeFully(type.name().replace("_", " ")) + " is an entity, however it is not a mob.", ChatColor.RED); msg(FUtil.formatName(type.name()) + " is an entity, however it is not a mob.", ChatColor.RED);
return true; return true;
} }
} }
if (type != null) if (type != null)
{ {
mobName = WordUtils.capitalizeFully(type.name().replace("_", " ")); mobName = FUtil.formatName(type.name());
} }
FUtil.adminAction(sender.getName(), "Purging all " + (type != null ? mobName + "s" : "mobs"), true); FUtil.adminAction(sender.getName(), "Purging all " + (type != null ? mobName + "s" : "mobs"), true);
msg(purgeMobs(type) + " " + (type != null ? mobName : "mob") + "s removed."); int count = plugin.ew.purgeMobs(type);
msg(count + " " + (type != null ? mobName : "mob") + FUtil.showS(count) + " removed.");
return true; return true;
} }
public static int purgeMobs(EntityType type)
{
int removed = 0;
for (World world : Bukkit.getWorlds())
{
for (Entity ent : world.getLivingEntities())
{
if (ent instanceof LivingEntity && !(ent instanceof Player))
{
if (type != null && !ent.getType().equals(type))
{
continue;
}
ent.remove();
removed++;
}
}
}
return removed;
}
public static List<String> getAllMobNames() public static List<String> getAllMobNames()
{ {
List<String> names = new ArrayList<>(); List<String> names = new ArrayList<>();

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

@ -1,6 +1,9 @@
package me.totalfreedom.totalfreedommod.command; package me.totalfreedom.totalfreedommod.command;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
@ -12,17 +15,14 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.OP, source = SourceType.BOTH) @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Manage my admin entry", usage = "/<command> [-o <admin>] <clearips | clearip <ip> | setlogin <message> | clearlogin | setacformat <format> | clearacformat> | oldtags | logstick | syncroles>") @CommandParameters(description = "Manage my admin entry", usage = "/<command> [-o <admin>] <clearips | clearip <ip> | setlogin <message> | clearlogin | setacformat <format> | clearacformat> | oldtags | logstick | syncroles | genbackupcodes>")
public class Command_myadmin extends FreedomCommand public class Command_myadmin extends FreedomCommand
{ {
@Override @Override
protected boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) protected boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
checkPlayer();
checkRank(Rank.SUPER_ADMIN);
if (args.length < 1) if (args.length < 1)
{ {
return false; return false;
@ -47,7 +47,7 @@ public class Command_myadmin extends FreedomCommand
target = getAdmin(targetPlayer); target = getAdmin(targetPlayer);
if (target == null) if (target == null)
{ {
msg("That player is not admin", ChatColor.RED); msg("That player is not an admin", ChatColor.RED);
return true; return true;
} }
@ -84,6 +84,7 @@ public class Command_myadmin extends FreedomCommand
target.addIp(targetIp); target.addIp(targetIp);
plugin.al.save(); plugin.al.save();
plugin.al.updateTables();
msg(counter + " IPs removed."); msg(counter + " IPs removed.");
msg(targetPlayer, target.getIps().get(0) + " is now your only IP address"); msg(targetPlayer, target.getIps().get(0) + " is now your only IP address");
@ -240,10 +241,97 @@ public class Command_myadmin extends FreedomCommand
return true; return true;
} }
case "genbackupcodes":
if (!plugin.dc.enabled)
{
msg("The Discord verification system is currently disabled.", ChatColor.RED);
return true;
}
else if (target.getDiscordID() == null || target.getDiscordID().isEmpty())
{
msg("Discord verification is not enabled for you.", ChatColor.RED);
return true;
}
msg("Generating backup codes...", ChatColor.GREEN);
boolean generated = plugin.dc.sendBackupCodes(target);
if (generated)
{
msg("Your backup codes have been sent to your discord account. They can be re-generated at anytime.", ChatColor.GREEN);
}
else
{
msg("Failed to generate backup codes, please contact a developer (preferably Seth)", ChatColor.RED);
}
return true;
default: default:
{ {
return false; return false;
} }
} }
} }
@Override
public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
{
if (!plugin.al.isAdmin(sender))
{
return Collections.emptyList();
}
List<String> singleArguments = Arrays.asList("clearips", "setlogin", "setacformat");
List<String> doubleArguments = Arrays.asList("clearip", "clearlogin", "clearacformat", "oldtags", "logstick", "syncroles", "genbackupcodes");
if (args.length == 1)
{
List<String> options = new ArrayList<>();
options.add("-o");
options.addAll(singleArguments);
options.addAll(doubleArguments);
return options;
}
else if (args.length == 2)
{
if (args[0].equals("-o"))
{
return FUtil.getPlayerList();
}
else
{
if (doubleArguments.contains(args[0]))
{
if (args[0].equals("clearip"))
{
List<String> ips = plugin.al.getAdmin(sender).getIps();
ips.remove(Ips.getIp(playerSender));
return ips;
}
}
}
}
else if (args.length == 3)
{
if (args[0].equals("-o"))
{
List<String> options = new ArrayList<>();
options.addAll(singleArguments);
options.addAll(doubleArguments);
return options;
}
}
else if (args.length == 4)
{
if (args[0].equals("-o") && args[2].equals("clearip"))
{
Admin admin = plugin.al.getEntryByName(args[1]);
if (admin != null)
{
return admin.getIps();
}
}
}
return FUtil.getPlayerList();
}
} }

237
src/main/java/me/totalfreedom/totalfreedommod/command/Command_mymasterbuilder.java Normal file
View File

@ -0,0 +1,237 @@
package me.totalfreedom.totalfreedommod.command;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import net.pravian.aero.util.Ips;
import org.apache.commons.lang.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 my Master Builder entry", usage = "/<command> [-o <masterbuilder>] <clearips | clearip <ip> | genbackupcodes>", aliases = "mymb")
public class Command_mymasterbuilder extends FreedomCommand
{
@Override
protected boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
if (args.length < 1)
{
return false;
}
Player init = null;
MasterBuilder target = plugin.mbl.getMasterBuilder(playerSender);
Player targetPlayer = playerSender;
// -o switch
if (args[0].equals("-o"))
{
if (!FUtil.canManageMasterBuilders(playerSender.getName()))
{
return noPerms();
}
init = playerSender;
targetPlayer = getPlayer(args[1]);
if (targetPlayer == null)
{
msg(FreedomCommand.PLAYER_NOT_FOUND);
return true;
}
target = plugin.mbl.getMasterBuilder(playerSender);
if (target == null)
{
msg("That player is not a Master Builder", ChatColor.RED);
return true;
}
// Shift 2
args = Arrays.copyOfRange(args, 2, args.length);
if (args.length < 1)
{
return false;
}
}
final String targetIp = Ips.getIp(targetPlayer);
switch (args[0])
{
case "clearips":
{
if (args.length != 1)
{
return false; // Double check: the player might mean "clearip"
}
if (init == null)
{
FUtil.adminAction(sender.getName(), "Clearing my IPs", false);
}
else
{
FUtil.adminAction(sender.getName(), "Clearing " + target.getName() + "' IPs", true);
}
int counter = target.getIps().size() - 1;
target.clearIPs();
target.addIp(targetIp);
plugin.mbl.save();
plugin.mbl.updateTables();
msg(counter + " IPs removed.");
msg(targetPlayer, target.getIps().get(0) + " is now your only IP address");
return true;
}
case "clearip":
{
if (args.length != 2)
{
return false; // Double check: the player might mean "clearips"
}
if (!target.getIps().contains(args[1]))
{
if (init == null)
{
msg("That IP is not registered to you.");
}
else
{
msg("That IP does not belong to that player.");
}
return true;
}
if (targetIp.equals(args[1]))
{
if (init == null)
{
msg("You cannot remove your current IP.");
}
else
{
msg("You cannot remove that Master Builders's current IP.");
}
return true;
}
FUtil.adminAction(sender.getName(), "Removing an IP" + (init == null ? "" : " from " + targetPlayer.getName() + "'s IPs"), true);
target.removeIp(args[1]);
plugin.mbl.save();
plugin.mbl.updateTables();
msg("Removed IP " + args[1]);
msg("Current IPs: " + StringUtils.join(target.getIps(), ", "));
return true;
}
case "genbackupcodes":
if (!plugin.dc.enabled)
{
msg("The Discord verification system is currently disabled.", ChatColor.RED);
return true;
}
else if (target.getDiscordID() == null || target.getDiscordID().isEmpty())
{
msg("Discord verification is not enabled for you.", ChatColor.RED);
return true;
}
msg("Generating backup codes...", ChatColor.GREEN);
boolean generated = plugin.dc.sendBackupCodes(target);
if (generated)
{
msg("Your backup codes have been sent to your discord account. They can be re-generated at anytime.", ChatColor.GREEN);
}
else
{
msg("Failed to generate backup codes, please contact a developer (preferably Seth)", ChatColor.RED);
}
return true;
default:
{
return false;
}
}
}
@Override
public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
{
if (!plugin.mbl.isMasterBuilder(playerSender) && !FUtil.canManageMasterBuilders(playerSender.getName()))
{
return Collections.emptyList();
}
List<String> singleArguments = Arrays.asList("clearips");
List<String> doubleArguments = Arrays.asList("clearip", "genbackupcodes");
if (args.length == 1)
{
List<String> options = new ArrayList<>();
options.add("-o");
options.addAll(singleArguments);
options.addAll(doubleArguments);
return options;
}
else if (args.length == 2)
{
if (args[0].equals("-o"))
{
return FUtil.getPlayerList();
}
else
{
if (doubleArguments.contains(args[0]))
{
if (args[0].equals("clearip"))
{
if (args[0].equals("clearip"))
{
List<String> ips = plugin.mbl.getMasterBuilder(sender).getIps();
ips.remove(Ips.getIp(playerSender));
return ips;
}
}
}
}
}
else if (args.length == 3)
{
if (args[0].equals("-o"))
{
List<String> options = new ArrayList<>();
options.addAll(singleArguments);
options.addAll(doubleArguments);
return options;
}
}
else if (args.length == 4)
{
if (args[0].equals("-o") && args[2].equals("clearip"))
{
MasterBuilder masterBuilder = plugin.mbl.getEntryByName(args[1]);
if (masterBuilder != null)
{
return masterBuilder.getIps();
}
}
}
return FUtil.getPlayerList();
}
}

135
src/main/java/me/totalfreedom/totalfreedommod/command/Command_notes.java Normal file
View File

@ -0,0 +1,135 @@
package me.totalfreedom.totalfreedommod.command;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.ArrayUtils;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Manage notes for a player", usage = "/<command> <name> <list | add <note> | remove <id> | clear>")
public class Command_notes extends FreedomCommand
{
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
if (args.length < 2)
{
return false;
}
VPlayer vPlayer;
final Player player = getPlayer(args[0]);
if (player == null)
{
final PlayerData entry = plugin.pl.getData(args[0]);
if (entry == null)
{
msg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
return true;
}
vPlayer = plugin.pv.getVerificationPlayer(entry.getUsername());
}
else
{
vPlayer = plugin.pv.getVerificationPlayer(player);
}
if (args[1].equals("list"))
{
final StringBuilder noteList = new StringBuilder();
noteList.append(ChatColor.GREEN + "Player notes for " + vPlayer.getName() + ":");
int id = 1;
for (Map<?, ?> noteMap : vPlayer.getNotes())
{
String admin = String.valueOf(noteMap.keySet().toArray()[0]);
String note = String.valueOf(noteMap.get(admin));
String noteLine = id + ". " + admin + ": " + note;
noteList.append("\n" + ChatColor.GOLD + noteLine);
id++;
}
msg(noteList.toString());
return true;
}
else if (args[1].equals("add"))
{
if (args.length < 3)
{
return false;
}
String note = StringUtils.join(ArrayUtils.subarray(args, 2, args.length), " ");
vPlayer.addNote(sender.getName(), note);
plugin.pv.saveVerificationData(vPlayer);
msg("Note added.", ChatColor.GREEN);
return true;
}
else if (args[1].equals("remove"))
{
if (args.length < 3)
{
return false;
}
int id;
try
{
id = Integer.valueOf(args[2]);
}
catch (NumberFormatException e)
{
msg("Invalid number: " + args[2], ChatColor.RED);
return true;
}
id--;
if (vPlayer.removeNote(id))
{
plugin.pv.saveVerificationData(vPlayer);
msg("Note removed.");
}
else
{
msg("No note with the ID of " + args[2] + "exists.", ChatColor.RED);
}
return true;
}
else if (args[1].equals("clear"))
{
int count = vPlayer.getNotes().size();
vPlayer.clearNotes();
plugin.pv.saveVerificationData(vPlayer);
msg("Cleared " + count + " notes.", ChatColor.GREEN);
return true;
}
return false;
}
@Override
public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
{
if (args.length == 1)
{
return FUtil.getPlayerList();
}
else if (args.length == 2)
{
return Arrays.asList("list", "add", "remove", "clear");
}
else if (args.length > 2 && (args[1].equals("add")))
{
return FUtil.getPlayerList();
}
return Collections.emptyList();
}
}

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

@ -13,7 +13,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Manage your verification", usage = "/<command> <<enable | disable | clearips | status>", aliases = "playerverification,pv") @CommandParameters(description = "Manage your verification", usage = "/<command> <enable | disable | clearips | status | genbackupcodes>", aliases = "playerverification,pv")
public class Command_playerverify extends FreedomCommand public class Command_playerverify extends FreedomCommand
{ {
@Override @Override
@ -66,21 +66,19 @@ public class Command_playerverify extends FreedomCommand
msg("The Discord verification system is currently disabled.", ChatColor.RED); msg("The Discord verification system is currently disabled.", ChatColor.RED);
return true; return true;
} }
if (data.getEnabled()) else if (data.getEnabled())
{ {
msg("Discord verification is already enabled for you.", ChatColor.RED); msg("Discord verification is already enabled for you.", ChatColor.RED);
return true; return true;
} }
else if (data.getDiscordId() == null)
{
msg("Please link a discord account with /linkdiscord.", ChatColor.RED);
return true;
}
data.setEnabled(true); data.setEnabled(true);
plugin.pv.saveVerificationData(data); plugin.pv.saveVerificationData(data);
if (data.getDiscordId() != null)
{
msg("Re-enabled Discord verification.", ChatColor.GREEN); msg("Re-enabled Discord verification.", ChatColor.GREEN);
}
else
{
msg("Enabled Discord verification. Please type /linkdiscord to link a Discord account.", ChatColor.GREEN);
}
return true; return true;
case "disable": case "disable":
@ -99,7 +97,33 @@ public class Command_playerverify extends FreedomCommand
boolean specified = target.getDiscordId() != null; boolean specified = target.getDiscordId() != null;
msg(ChatColor.GRAY + "Discord Verification Enabled: " + (enabled ? ChatColor.GREEN + "true" : ChatColor.RED + "false")); 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")); msg(ChatColor.GRAY + "Discord ID: " + (specified ? ChatColor.GREEN + target.getDiscordId() : ChatColor.RED + "not set"));
msg(ChatColor.GRAY + "Backup Codes: " + data.getBackupCodes().size() + "/" + "10");
return true; return true;
case "genbackupcodes":
if (!plugin.dc.enabled)
{
msg("The Discord verification system is currently disabled.", ChatColor.RED);
return true;
}
else if (!data.getEnabled())
{
msg("Discord verification is not enabled for you.", ChatColor.RED);
return true;
}
boolean generated = plugin.dc.sendBackupCodes(data);
if (generated)
{
msg("Your backup codes have been sent to your discord account. They can be re-generated at anytime.", ChatColor.GREEN);
}
else
{
msg("Failed to generate backup codes, please contact a developer (preferably Seth)", ChatColor.RED);
}
return true;
default: default:
return false; return false;
} }
@ -109,7 +133,7 @@ public class Command_playerverify extends FreedomCommand
{ {
if (args.length == 1) if (args.length == 1)
{ {
return Arrays.asList("enable", "disable", "status", "clearips"); return Arrays.asList("enable", "disable", "status", "clearips", "genbackupcodes");
} }
return Collections.emptyList(); return Collections.emptyList();

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

@ -78,7 +78,7 @@ public class Command_purgeall extends FreedomCommand
plugin.fm.setGlobalFreeze(false); plugin.fm.setGlobalFreeze(false);
// Remove all mobs // Remove all mobs
Command_mobpurge.purgeMobs(null); plugin.ew.purgeMobs(null);
return true; return true;
} }

4
src/main/java/me/totalfreedom/totalfreedommod/command/Command_realtime.java
View File

@ -41,7 +41,7 @@ public class Command_realtime extends FreedomCommand
player.setUtcOffset(tz); player.setUtcOffset(tz);
player.setRealTime(true); player.setRealTime(true);
plugin.rt.enable(playerSender); plugin.rt.enable(playerSender);
plugin.pv.save(); plugin.pv.saveVerificationData(player);
msg("Your in-game time is now synced with real time."); msg("Your in-game time is now synced with real time.");
return true; return true;
} }
@ -56,7 +56,7 @@ public class Command_realtime extends FreedomCommand
player.setRealTime(false); player.setRealTime(false);
msg("Your in-game time is no longer synced with real time."); msg("Your in-game time is no longer synced with real time.");
plugin.rt.disable(playerSender); plugin.rt.disable(playerSender);
plugin.pv.save(); plugin.pv.saveVerificationData(player);
return true; return true;
} }
return true; return true;

138
src/main/java/me/totalfreedom/totalfreedommod/command/Command_verify.java
View File

@ -1,12 +1,11 @@
package me.totalfreedom.totalfreedommod.command; package me.totalfreedom.totalfreedommod.command;
import java.util.Date; import java.util.Date;
import java.util.Random;
import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.discord.Discord;
import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder; import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
import me.totalfreedom.totalfreedommod.player.FPlayer; import me.totalfreedom.totalfreedommod.player.FPlayer;
import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.FUtil;
import net.pravian.aero.util.Ips; import net.pravian.aero.util.Ips;
@ -44,7 +43,7 @@ public class Command_verify extends FreedomCommand
plugin.pl.getPlayer(player).getFreezeData().setFrozen(false); plugin.pl.getPlayer(player).getFreezeData().setFrozen(false);
player.sendMessage(ChatColor.GRAY + "You have been unfrozen."); player.sendMessage(ChatColor.GRAY + "You have been unfrozen.");
} }
plugin.pv.verifyPlayer(player); plugin.pv.verifyPlayer(player, null);
plugin.rm.updateDisplay(player); plugin.rm.updateDisplay(player);
return true; return true;
} }
@ -62,7 +61,7 @@ public class Command_verify extends FreedomCommand
return true; return true;
} }
if (!plugin.pv.isPlayerImpostor(playerSender) && !plugin.al.isAdminImpostor(playerSender)) if (!plugin.pv.isPlayerImpostor(playerSender) && !plugin.al.isAdminImpostor(playerSender) && !plugin.mbl.isMasterBuilderImpostor(playerSender))
{ {
msg("You are not an impostor, therefore you do not need to verify.", ChatColor.RED); msg("You are not an impostor, therefore you do not need to verify.", ChatColor.RED);
return true; return true;
@ -70,7 +69,17 @@ public class Command_verify extends FreedomCommand
String discordId = ""; String discordId = "";
if (plugin.al.isAdminImpostor(playerSender)) if (plugin.pv.isPlayerImpostor(playerSender))
{
VPlayer vPlayer = plugin.pv.getVerificationPlayer(playerSender);
if (vPlayer.getDiscordId() == null)
{
msg("You do not have a Discord account linked to your Minecraft account, please verify the manual way.", ChatColor.RED);
return true;
}
discordId = vPlayer.getDiscordId();
}
else if (plugin.al.isAdminImpostor(playerSender))
{ {
Admin admin = plugin.al.getEntryByName(playerSender.getName()); Admin admin = plugin.al.getEntryByName(playerSender.getName());
if (admin.getDiscordID() == null) if (admin.getDiscordID() == null)
@ -80,48 +89,109 @@ public class Command_verify extends FreedomCommand
} }
discordId = admin.getDiscordID(); discordId = admin.getDiscordID();
} }
else if (plugin.mbl.isMasterBuilderImpostor(playerSender))
if (plugin.pv.isPlayerImpostor(playerSender))
{ {
if (plugin.pv.getVerificationPlayer(playerSender).getDiscordId() == null) MasterBuilder masterBuilder = plugin.mbl.getEntryByName(playerSender.getName());
if (masterBuilder.getDiscordID() == null)
{ {
msg("You do not have a Discord account linked to your Minecraft account, please verify the manual way.", ChatColor.RED); msg("You do not have a Discord account linked to your Minecraft account, please verify the manual way.", ChatColor.RED);
return true; return true;
} }
discordId = plugin.pv.getVerificationPlayer(playerSender).getDiscordId(); discordId = masterBuilder.getDiscordID();
} }
if (args.length < 1) if (args.length < 1)
{ {
String code = ""; String code = plugin.dc.generateCode(10);
Random random = new Random(); if (plugin.pv.isPlayerImpostor(playerSender))
for (int i = 0; i < 10; i++)
{ {
code += random.nextInt(10); VPlayer vPlayer = plugin.pv.getVerificationPlayer(playerSender);
plugin.dc.addPlayerVerificationCode(code, vPlayer);
} }
Discord.VERIFY_CODES.add(code); else if (plugin.al.isAdminImpostor(playerSender))
Discord.bot.getUserById(discordId).openPrivateChannel().complete().sendMessage("A user with the IP `" + Ips.getIp(playerSender) + "` has sent a verification request. Please run the following in-game command: `/verify " + code + "`").complete(); {
Admin admin = plugin.al.getEntryByName(playerSender.getName());
plugin.dc.addAdminVerificationCode(code, admin);
}
else if (plugin.mbl.isMasterBuilderImpostor(playerSender))
{
MasterBuilder masterBuilder = plugin.mbl.getEntryByName(playerSender.getName());
plugin.dc.addMasterBuilderVerificationCode(code, masterBuilder);
}
plugin.dc.bot.getUserById(discordId).openPrivateChannel().complete().sendMessage("A user with the IP `" + Ips.getIp(playerSender) + "` has sent a verification request. Please run the following in-game command: `/verify " + code + "`").complete();
msg("A verification code has been sent to your account, please copy the code and run /verify <code>", ChatColor.GREEN); msg("A verification code has been sent to your account, please copy the code and run /verify <code>", ChatColor.GREEN);
} }
else else
{ {
String code = args[0]; String code = args[0];
if (!Discord.VERIFY_CODES.contains(code)) String backupCode = null;
if (plugin.pv.isPlayerImpostor(playerSender))
{
VPlayer vPlayer = plugin.pv.getVerificationPlayer(playerSender);
VPlayer mapPlayer = plugin.dc.getPlayerVerificationCodes().get(code);
if (mapPlayer == null)
{
if (!vPlayer.getBackupCodes().contains(plugin.dc.getMD5(code)))
{ {
msg("You have entered an invalid verification code", ChatColor.RED); msg("You have entered an invalid verification code", ChatColor.RED);
return true; return true;
} }
else
{
backupCode = plugin.dc.getMD5(code);
}
}
else
{
plugin.dc.removePlayerVerificationCode(code);
}
if (plugin.al.isAdminImpostor(playerSender)) final FPlayer fPlayer = plugin.pl.getPlayer(playerSender);
FUtil.bcastMsg(playerSender.getName() + " has verified!", ChatColor.GOLD);
plugin.rm.updateDisplay(playerSender);
playerSender.setOp(true);
msg(YOU_ARE_OP);
if (fPlayer.getFreezeData().isFrozen())
{
fPlayer.getFreezeData().setFrozen(false);
msg("You have been unfrozen.");
}
plugin.pv.verifyPlayer(playerSender, backupCode);
return true;
}
else if (plugin.al.isAdminImpostor(playerSender))
{ {
Admin admin = plugin.al.getEntryByName(playerSender.getName()); Admin admin = plugin.al.getEntryByName(playerSender.getName());
Discord.VERIFY_CODES.remove(code); Admin mapAdmin = plugin.dc.getAdminVerificationCodes().get(code);
if (mapAdmin == null)
{
if (!admin.getBackupCodes().contains(plugin.dc.getMD5(code)))
{
msg("You have entered an invalid verification code", ChatColor.RED);
return true;
}
else
{
backupCode = plugin.dc.getMD5(code);
}
}
else
{
plugin.dc.removeAdminVerificationCode(code);
}
FUtil.bcastMsg(playerSender.getName() + " has verified!", ChatColor.GOLD); FUtil.bcastMsg(playerSender.getName() + " has verified!", ChatColor.GOLD);
FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Re-adding " + admin.getName() + " to the admin list", true); FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Re-adding " + admin.getName() + " to the admin list", true);
admin.setName(playerSender.getName()); admin.setName(playerSender.getName());
admin.addIp(Ips.getIp(playerSender)); admin.addIp(Ips.getIp(playerSender));
if (backupCode != null)
{
admin.removeBackupCode(backupCode);
}
if (!plugin.mbl.isMasterBuilder(playerSender)) if (!plugin.mbl.isMasterBuilder(playerSender))
{ {
MasterBuilder masterBuilder = null; MasterBuilder masterBuilder = null;
@ -161,11 +231,38 @@ public class Command_verify extends FreedomCommand
} }
return true; return true;
} }
else if (plugin.mbl.isMasterBuilderImpostor(playerSender))
if (plugin.pv.isPlayerImpostor(playerSender))
{ {
MasterBuilder masterBuilder = plugin.mbl.getEntryByName(playerSender.getName());
MasterBuilder mapMasterBuilder = plugin.dc.getMasterBuilderVerificationCodes().get(code);
if (mapMasterBuilder == null)
{
if (!masterBuilder.getBackupCodes().contains(plugin.dc.getMD5(code)))
{
msg("You have entered an invalid verification code", ChatColor.RED);
return true;
}
else
{
backupCode = plugin.dc.getMD5(code);
}
}
else
{
plugin.dc.removeMasterBuilderVerificationCode(code);
}
if (backupCode != null)
{
masterBuilder.removeBackupCode(backupCode);
}
final FPlayer fPlayer = plugin.pl.getPlayer(playerSender); final FPlayer fPlayer = plugin.pl.getPlayer(playerSender);
FUtil.bcastMsg(playerSender.getName() + " has verified!", ChatColor.GOLD); FUtil.bcastMsg(playerSender.getName() + " has verified!", ChatColor.GOLD);
masterBuilder.setLastLogin(new Date());
masterBuilder.addIp(Ips.getIp(playerSender));
plugin.mbl.save();
plugin.mbl.updateTables();
plugin.rm.updateDisplay(playerSender); plugin.rm.updateDisplay(playerSender);
playerSender.setOp(true); playerSender.setOp(true);
msg(YOU_ARE_OP); msg(YOU_ARE_OP);
@ -174,7 +271,6 @@ public class Command_verify extends FreedomCommand
fPlayer.getFreezeData().setFrozen(false); fPlayer.getFreezeData().setFrozen(false);
msg("You have been unfrozen."); msg("You have been unfrozen.");
} }
plugin.pv.verifyPlayer(playerSender);
return true; return true;
} }
} }

248
src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
View File

@ -2,17 +2,24 @@ package me.totalfreedom.totalfreedommod.discord;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.time.Instant; import java.time.Instant;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Random;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import javax.security.auth.login.LoginException; import javax.security.auth.login.LoginException;
import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.GameRuleHandler;
import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
import me.totalfreedom.totalfreedommod.playerverification.VPlayer; import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FLog;
@ -22,13 +29,17 @@ import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.JDABuilder;
import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.entities.MessageEmbed;
import net.dv8tion.jda.api.entities.PrivateChannel;
import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.entities.Role;
import net.dv8tion.jda.api.entities.TextChannel; import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.SelfUser; import net.dv8tion.jda.api.entities.SelfUser;
import net.dv8tion.jda.api.events.ReadyEvent; import net.dv8tion.jda.api.events.ReadyEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.dv8tion.jda.internal.utils.concurrent.CountingThreadFactory;
import net.pravian.aero.util.StringUtils; import net.pravian.aero.util.StringUtils;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang.WordUtils; import org.apache.commons.lang.WordUtils;
import org.bukkit.GameRule; import org.bukkit.GameRule;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -40,12 +51,20 @@ import org.bukkit.event.player.PlayerQuitEvent;
public class Discord extends FreedomService public class Discord extends FreedomService
{ {
public static HashMap<String, Admin> LINK_CODES = new HashMap<>(); public static HashMap<String, VPlayer> PLAYER_LINK_CODES = new HashMap<>();
public static HashMap<String, VPlayer> PLAYER_LINK_CODES = new HashMap<String, VPlayer>(); public static HashMap<String, VPlayer> PLAYER_VERIFICATION_CODES = new HashMap<>();
public static List<String> VERIFY_CODES = new ArrayList(); public static HashMap<String, Admin> ADMIN_LINK_CODES = new HashMap<>();
public static HashMap<String, Admin> ADMIN_VERIFICATION_CODES = new HashMap<>();
public static HashMap<String, MasterBuilder> MASTER_BUILDER_LINK_CODES = new HashMap<>();
public static HashMap<String, MasterBuilder> MASTER_BUILDER_VERIFICATION_CODES = new HashMap<>();
public ScheduledThreadPoolExecutor RATELIMIT_EXECUTOR = new ScheduledThreadPoolExecutor(5, new CountingThreadFactory(this::poolIdentifier, "RateLimit"));
public List<CompletableFuture<Message>> sentMessages = new ArrayList<>();
public static JDA bot = null; public static JDA bot = null;
public Boolean enabled = false; public Boolean enabled = false;
Random random = new Random();
public Discord(TotalFreedomMod plugin) public Discord(TotalFreedomMod plugin)
{ {
super(plugin); super(plugin);
@ -67,12 +86,13 @@ public class Discord extends FreedomService
} }
try try
{ {
RATELIMIT_EXECUTOR.setRemoveOnCancelPolicy(true);
bot = new JDABuilder(AccountType.BOT) bot = new JDABuilder(AccountType.BOT)
.setToken(ConfigEntry.DISCORD_TOKEN.getString()) .setToken(ConfigEntry.DISCORD_TOKEN.getString())
.addEventListeners(new PrivateMessageListener()) .addEventListeners(new PrivateMessageListener())
.addEventListeners(new DiscordToMinecraftListener()) .addEventListeners(new DiscordToMinecraftListener())
.setAutoReconnect(true) .setAutoReconnect(true)
.setRateLimitPool(RATELIMIT_EXECUTOR)
.addEventListeners(new ListenerAdapter() .addEventListeners(new ListenerAdapter()
{ {
@Override @Override
@ -99,11 +119,31 @@ public class Discord extends FreedomService
} }
public String poolIdentifier()
{
return "JDA";
}
public void clearQueue()
{
for (CompletableFuture<Message> messages : sentMessages)
{
if (!messages.isDone())
{
messages.cancel(true);
}
}
sentMessages.clear();
messageChatChannel("**Message queue cleared**");
}
// Do no ask why this is here. I spent two hours trying to make a simple thing work // Do no ask why this is here. I spent two hours trying to make a simple thing work
public class StartEvent { public class StartEvent
{
private final JDA api; private final JDA api;
public StartEvent(JDA api) { public StartEvent(JDA api)
{
this.api = api; this.api = api;
} }
@ -113,6 +153,181 @@ public class Discord extends FreedomService
} }
} }
public boolean sendBackupCodes(VPlayer vPlayer)
{
List<String> codes = generateBackupCodes();
List<String> encryptedCodes = generateEncryptedBackupCodes(codes);
net.dv8tion.jda.api.entities.User user = bot.getUserById(vPlayer.getDiscordId());
File file = generateBackupCodesFile(vPlayer.getName(), codes);
if (file == null)
{
return false;
}
PrivateChannel privateChannel = user.openPrivateChannel().complete();
privateChannel.sendMessage("Do not share these codes with anyone as they can be used to impose as you.").addFile(file).complete();
vPlayer.setBackupCodes(encryptedCodes);
plugin.pv.saveVerificationData(vPlayer);
file.delete();
return true;
}
public boolean sendBackupCodes(Admin admin)
{
List<String> codes = generateBackupCodes();
List<String> encryptedCodes = generateEncryptedBackupCodes(codes);
net.dv8tion.jda.api.entities.User user = bot.getUserById(admin.getDiscordID());
File file = generateBackupCodesFile(admin.getName(), codes);
if (file == null)
{
return false;
}
PrivateChannel privateChannel = user.openPrivateChannel().complete();
privateChannel.sendMessage("Do not share these codes with anyone as they can be used to impose as you.").addFile(file).complete();
admin.setBackupCodes(encryptedCodes);
plugin.al.save();
plugin.al.updateTables();
file.delete();
return true;
}
public boolean sendBackupCodes(MasterBuilder masterBuilder)
{
List<String> codes = generateBackupCodes();
List<String> encryptedCodes = generateEncryptedBackupCodes(codes);
net.dv8tion.jda.api.entities.User user = bot.getUserById(masterBuilder.getDiscordID());
File file = generateBackupCodesFile(masterBuilder.getName(), codes);
if (file == null)
{
return false;
}
PrivateChannel privateChannel = user.openPrivateChannel().complete();
privateChannel.sendMessage("Do not share these codes with anyone as they can be used to impose as you.").addFile(file).complete();
masterBuilder.setBackupCodes(encryptedCodes);
plugin.mbl.save();
plugin.mbl.updateTables();
file.delete();
return true;
}
public List<String> generateBackupCodes()
{
List<String> codes = new ArrayList<>();
for (int i = 0; i < 10; i++)
{
codes.add(randomString(10));
}
return codes;
}
public String randomString(int size)
{
List<String> chars = Arrays.asList("ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890abcdefghijklmnopqrstuvwxyz".split("(?!^)"));
StringBuilder stringBuilder = new StringBuilder();
for (int i = 0; i < size; i++)
{
stringBuilder.append(chars.get(random.nextInt(chars.size())));
}
return stringBuilder.toString();
}
public String generateCode(int size)
{
String code = "";
Random random = new Random();
for (int i = 0; i < size; i++)
{
code += random.nextInt(10);
}
return code;
}
public List<String> generateEncryptedBackupCodes(List<String> codes)
{
List<String> encryptedCodes = new ArrayList<>();
for (String code : codes)
{
encryptedCodes.add(getMD5(code));
}
return encryptedCodes;
}
public File generateBackupCodesFile(String name, List<String> codes)
{
StringBuilder text = new StringBuilder();
text.append("Below are your backup codes for use on TotalFreedom in the event you lose access to your discord account.\n")
.append("Simply pick a code, and run /verify <code> on the server. Each code is one use, so be sure to cross it off once you use it.\n")
.append("To generate new codes, simply run /generatebackupcodes\n\n");
for (String code : codes)
{
text.append(code + "\n");
}
String fileUrl = plugin.getDataFolder().getAbsolutePath() + "/TF-Backup-Codes-" + name + ".txt";
try
{
FileWriter fileWriter = new FileWriter(fileUrl);
fileWriter.write(text.toString());
fileWriter.close();
}
catch (IOException e)
{
FLog.severe("Failed to generate backup codes file: " + e.toString());
return null;
}
return new File(fileUrl);
}
public static String getMD5(String string)
{
return DigestUtils.md5Hex(string);
}
public void addPlayerVerificationCode(String code, VPlayer vPlayer)
{
PLAYER_VERIFICATION_CODES.put(code, vPlayer);
}
public void removePlayerVerificationCode(String code)
{
PLAYER_VERIFICATION_CODES.remove(code);
}
public HashMap<String, VPlayer> getPlayerVerificationCodes()
{
return PLAYER_VERIFICATION_CODES;
}
public void addAdminVerificationCode(String code, Admin admin)
{
ADMIN_VERIFICATION_CODES.put(code, admin);
}
public void removeAdminVerificationCode(String code)
{
ADMIN_VERIFICATION_CODES.remove(code);
}
public HashMap<String, Admin> getAdminVerificationCodes()
{
return ADMIN_VERIFICATION_CODES;
}
public void addMasterBuilderVerificationCode(String code, MasterBuilder masterBuilder)
{
MASTER_BUILDER_VERIFICATION_CODES.put(code, masterBuilder);
}
public void removeMasterBuilderVerificationCode(String code)
{
MASTER_BUILDER_VERIFICATION_CODES.remove(code);
}
public HashMap<String, MasterBuilder> getMasterBuilderVerificationCodes()
{
return MASTER_BUILDER_VERIFICATION_CODES;
}
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPlayerJoin(PlayerJoinEvent event) public void onPlayerJoin(PlayerJoinEvent event)
{ {
@ -157,7 +372,8 @@ public class Discord extends FreedomService
} }
if (enabled && !chat_channel_id.isEmpty()) if (enabled && !chat_channel_id.isEmpty())
{ {
bot.getTextChannelById(chat_channel_id).sendMessage(message).queue(); CompletableFuture<Message> sentMessage = bot.getTextChannelById(chat_channel_id).sendMessage(message).submit(true);
sentMessages.add(sentMessage);
} }
} }
@ -169,9 +385,9 @@ public class Discord extends FreedomService
public static String getCodeForAdmin(Admin admin) public static String getCodeForAdmin(Admin admin)
{ {
for (String code : LINK_CODES.keySet()) for (String code : ADMIN_LINK_CODES.keySet())
{ {
if (LINK_CODES.get(code).equals(admin)) if (ADMIN_LINK_CODES.get(code).equals(admin))
{ {
return code; return code;
} }
@ -191,6 +407,18 @@ public class Discord extends FreedomService
return null; return null;
} }
public static String getCodeForMasterBuilder(MasterBuilder masterBuilder)
{
for (String code : MASTER_BUILDER_LINK_CODES.keySet())
{
if (MASTER_BUILDER_LINK_CODES.get(code).equals(masterBuilder))
{
return code;
}
}
return null;
}
@Override @Override
protected void onStop() protected void onStop()
{ {

33
src/main/java/me/totalfreedom/totalfreedommod/discord/PrivateMessageListener.java
View File

@ -2,6 +2,7 @@ package me.totalfreedom.totalfreedommod.discord;
import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
import me.totalfreedom.totalfreedommod.playerverification.VPlayer; import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
import net.dv8tion.jda.api.events.message.priv.PrivateMessageReceivedEvent; import net.dv8tion.jda.api.events.message.priv.PrivateMessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.dv8tion.jda.api.hooks.ListenerAdapter;
@ -16,27 +17,43 @@ public class PrivateMessageListener extends ListenerAdapter
if (event.getMessage().getContentRaw().matches("[0-9][0-9][0-9][0-9][0-9]")) if (event.getMessage().getContentRaw().matches("[0-9][0-9][0-9][0-9][0-9]"))
{ {
String code = event.getMessage().getContentRaw(); String code = event.getMessage().getContentRaw();
if (Discord.LINK_CODES.get(code) != null) String name;
if (Discord.ADMIN_LINK_CODES.get(code) != null)
{ {
Admin admin = Discord.LINK_CODES.get(code); Admin admin = Discord.ADMIN_LINK_CODES.get(code);
name = admin.getName();
admin.setDiscordID(event.getMessage().getAuthor().getId()); admin.setDiscordID(event.getMessage().getAuthor().getId());
Discord.LINK_CODES.remove(code); TotalFreedomMod.plugin().al.save();
event.getChannel().sendMessage("Link successful. Now this Discord account is linked with your Minecraft account `" + admin.getName() + "`.\n" TotalFreedomMod.plugin().al.updateTables();
+ "Now when you are an impostor on the server, you may use `/verify` to verify.").complete(); Discord.ADMIN_LINK_CODES.remove(code);
Discord.syncRoles(admin); Discord.syncRoles(admin);
} }
if (Discord.PLAYER_LINK_CODES.get(code) != null) else if (Discord.PLAYER_LINK_CODES.get(code) != null)
{ {
VPlayer player = Discord.PLAYER_LINK_CODES.get(code); VPlayer player = Discord.PLAYER_LINK_CODES.get(code);
name = player.getName();
player.setDiscordId(event.getMessage().getAuthor().getId()); player.setDiscordId(event.getMessage().getAuthor().getId());
player.setEnabled(true); player.setEnabled(true);
TotalFreedomMod.plugin().pv.saveVerificationData(player); TotalFreedomMod.plugin().pv.saveVerificationData(player);
Discord.PLAYER_LINK_CODES.remove(code); Discord.PLAYER_LINK_CODES.remove(code);
event.getChannel().sendMessage("Link successful. Now this Discord account is linked with your Minecraft account `" + player.getName() + "`.\n" }
else if (Discord.MASTER_BUILDER_LINK_CODES.get(code) != null)
{
MasterBuilder masterBuilder = Discord.MASTER_BUILDER_LINK_CODES.get(code);
name = masterBuilder.getName();
masterBuilder.setDiscordID(event.getMessage().getAuthor().getId());
TotalFreedomMod.plugin().mbl.save();
TotalFreedomMod.plugin().mbl.updateTables();
Discord.MASTER_BUILDER_LINK_CODES.remove(code);
}
else
{
return;
}
event.getChannel().sendMessage("Link successful. Now this Discord account is linked with your Minecraft account **" + name + "**.\n"
+ "Now when you are an impostor on the server, you may use `/verify` to verify.").complete(); + "Now when you are an impostor on the server, you may use `/verify` to verify.").complete();
} }
} }
} }
} }
}

24
src/main/java/me/totalfreedom/totalfreedommod/masterbuilder/MasterBuilder.java
View File

@ -1,6 +1,7 @@
package me.totalfreedom.totalfreedommod.masterbuilder; package me.totalfreedom.totalfreedommod.masterbuilder;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import lombok.Getter; import lombok.Getter;
@ -25,6 +26,7 @@ public class MasterBuilder implements ConfigLoadable, ConfigSavable, Validatable
private String name; private String name;
@Getter @Getter
private final List<String> ips = Lists.newArrayList(); private final List<String> ips = Lists.newArrayList();
private final List<String> backupCodes = Lists.newArrayList();
@Getter @Getter
@Setter @Setter
private Date lastLogin = new Date(); private Date lastLogin = new Date();
@ -62,7 +64,8 @@ public class MasterBuilder implements ConfigLoadable, ConfigSavable, Validatable
.append("- Last Login: ").append(FUtil.dateToString(lastLogin)).append("\n") .append("- Last Login: ").append(FUtil.dateToString(lastLogin)).append("\n")
.append("- Discord ID: ").append(discordID).append("\n") .append("- Discord ID: ").append(discordID).append("\n")
.append("- Tag: ").append(tag).append("\n") .append("- Tag: ").append(tag).append("\n")
.append("- Clear Chat Opt Out: ").append(clearChatOptOut); .append("- Clear Chat Opt Out: ").append(clearChatOptOut)
.append("- Backup Codes: ").append(backupCodes.size()).append("/10").append("\n");
return output.toString(); return output.toString();
} }
@ -81,6 +84,8 @@ public class MasterBuilder implements ConfigLoadable, ConfigSavable, Validatable
name = cs.getString("username", configKey); name = cs.getString("username", configKey);
ips.clear(); ips.clear();
ips.addAll(cs.getStringList("ips")); ips.addAll(cs.getStringList("ips"));
backupCodes.clear();
backupCodes.addAll(cs.getStringList("backupCodes"));
lastLogin = FUtil.stringToDate(cs.getString("last_login")); lastLogin = FUtil.stringToDate(cs.getString("last_login"));
discordID = cs.getString("discord_id", null); discordID = cs.getString("discord_id", null);
tag = cs.getString("tag", null); tag = cs.getString("tag", null);
@ -93,6 +98,7 @@ public class MasterBuilder implements ConfigLoadable, ConfigSavable, Validatable
Validate.isTrue(isValid(), "Could not save master builder entry: " + name + ". Entry not valid!"); Validate.isTrue(isValid(), "Could not save master builder entry: " + name + ". Entry not valid!");
cs.set("username", name); cs.set("username", name);
cs.set("ips", Lists.newArrayList(ips)); cs.set("ips", Lists.newArrayList(ips));
cs.set("backupCodes", Lists.newArrayList(backupCodes));
cs.set("last_login", FUtil.dateToString(lastLogin)); cs.set("last_login", FUtil.dateToString(lastLogin));
cs.set("discord_id", discordID); cs.set("discord_id", discordID);
cs.set("tag", tag); cs.set("tag", tag);
@ -125,6 +131,22 @@ public class MasterBuilder implements ConfigLoadable, ConfigSavable, Validatable
ips.clear(); ips.clear();
} }
public List<String> getBackupCodes()
{
return Collections.unmodifiableList(backupCodes);
}
public void setBackupCodes(List<String> codes)
{
backupCodes.clear();
backupCodes.addAll(codes);
}
public void removeBackupCode(String code)
{
backupCodes.remove(code);
}
@Override @Override
public boolean isValid() public boolean isValid()
{ {

6
src/main/java/me/totalfreedom/totalfreedommod/playerverification/PlayerVerification.java
View File

@ -51,7 +51,7 @@ public class PlayerVerification extends FreedomService
&& !vPlayer.getIps().contains(Ips.getIp(player)); && !vPlayer.getIps().contains(Ips.getIp(player));
} }
public void verifyPlayer(Player player) public void verifyPlayer(Player player, String backupCode)
{ {
if (!isPlayerImpostor(player)) if (!isPlayerImpostor(player))
{ {
@ -59,6 +59,10 @@ public class PlayerVerification extends FreedomService
} }
VPlayer vPlayer = getVerificationPlayer(player); VPlayer vPlayer = getVerificationPlayer(player);
if (backupCode != null)
{
vPlayer.removeBackupCode(backupCode);
}
vPlayer.addIp(Ips.getIp(player)); vPlayer.addIp(Ips.getIp(player));
dataMap.put(player.getName(), vPlayer); dataMap.put(player.getName(), vPlayer);
YamlConfig config = getConfig(vPlayer); YamlConfig config = getConfig(vPlayer);

67
src/main/java/me/totalfreedom/totalfreedommod/playerverification/VPlayer.java
View File

@ -2,14 +2,16 @@ package me.totalfreedom.totalfreedommod.playerverification;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import me.totalfreedom.totalfreedommod.util.FLog;
import net.pravian.aero.base.ConfigLoadable; import net.pravian.aero.base.ConfigLoadable;
import net.pravian.aero.base.ConfigSavable; import net.pravian.aero.base.ConfigSavable;
import net.pravian.aero.base.Validatable; import net.pravian.aero.base.Validatable;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.ChatColor;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -17,6 +19,8 @@ public class VPlayer implements ConfigLoadable, ConfigSavable, Validatable
{ {
private final List<String> ips = Lists.newArrayList(); private final List<String> ips = Lists.newArrayList();
private final List<Map<?, ?>> notes = Lists.newArrayList();
private final List<String> backupCodes = Lists.newArrayList();
@Getter @Getter
@Setter @Setter
private String name; private String name;
@ -40,9 +44,6 @@ public class VPlayer implements ConfigLoadable, ConfigSavable, Validatable
private String rideMode = "ask"; private String rideMode = "ask";
@Getter @Getter
@Setter @Setter
private ChatColor color = null;
@Getter
@Setter
private int utcOffset = 0; private int utcOffset = 0;
@Getter @Getter
@Setter @Setter
@ -61,15 +62,18 @@ public class VPlayer implements ConfigLoadable, ConfigSavable, Validatable
@Override @Override
public void loadFrom(ConfigurationSection cs) public void loadFrom(ConfigurationSection cs)
{ {
name = cs.getString("username", name); name = cs.getString("name", name);
ips.clear(); ips.clear();
ips.addAll(cs.getStringList("ips")); ips.addAll(cs.getStringList("ips"));
notes.clear();
notes.addAll(cs.getMapList("notes"));
backupCodes.clear();
backupCodes.addAll(cs.getStringList("backupCodes"));
discordId = cs.getString("discordId", null); discordId = cs.getString("discordId", null);
enabled = cs.getBoolean("enabled", false); enabled = cs.getBoolean("enabled", false);
tag = cs.getString("tag", null); tag = cs.getString("tag", null);
clearChatOptOut = cs.getBoolean("clearChatOptOut", false); clearChatOptOut = cs.getBoolean("clearChatOptOut", false);
rideMode = cs.getString("rideMode", rideMode); rideMode = cs.getString("rideMode", rideMode);
color = ChatColor.getByChar(String.valueOf(cs.get("color")));
utcOffset = cs.getInt("utcOffset", 0); utcOffset = cs.getInt("utcOffset", 0);
realTime = cs.getBoolean("realTime", false); realTime = cs.getBoolean("realTime", false);
} }
@ -83,9 +87,10 @@ public class VPlayer implements ConfigLoadable, ConfigSavable, Validatable
cs.set("enabled", enabled); cs.set("enabled", enabled);
cs.set("tag", tag); cs.set("tag", tag);
cs.set("ips", Lists.newArrayList(ips)); cs.set("ips", Lists.newArrayList(ips));
cs.set("notes", Lists.newArrayList(notes));
cs.set("backupCodes", Lists.newArrayList(backupCodes));
cs.set("clearChatOptOut", clearChatOptOut); cs.set("clearChatOptOut", clearChatOptOut);
cs.set("rideMode", rideMode); cs.set("rideMode", rideMode);
cs.set("color", color == null ? null : color.getChar());
cs.set("utcOffset", utcOffset); cs.set("utcOffset", utcOffset);
cs.set("realTime", realTime); cs.set("realTime", realTime);
} }
@ -105,6 +110,54 @@ public class VPlayer implements ConfigLoadable, ConfigSavable, Validatable
ips.remove(ip); ips.remove(ip);
} }
public List<Map<?, ?>> getNotes()
{
return Collections.unmodifiableList(notes);
}
public void clearNotes()
{
notes.clear();
}
public List<String> getBackupCodes()
{
return Collections.unmodifiableList(backupCodes);
}
public void setBackupCodes(List<String> codes)
{
backupCodes.clear();
backupCodes.addAll(codes);
}
public void removeBackupCode(String code)
{
FLog.info("fuck");
backupCodes.remove(code);
}
public void addNote(String adder, String note)
{
Map<String, String> noteMap = new HashMap<>();
noteMap.put(adder, note);
notes.add(noteMap);
}
public boolean removeNote(int id) throws IndexOutOfBoundsException
{
try
{
notes.remove(id);
}
catch (IndexOutOfBoundsException e)
{
return false;
}
return true;
}
@Override @Override
public boolean isValid() public boolean isValid()
{ {

15
src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java
View File

@ -26,6 +26,7 @@ import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.shop.ShopItem; import me.totalfreedom.totalfreedommod.shop.ShopItem;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.WordUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
@ -124,6 +125,20 @@ public class FUtil
return ConfigEntry.SERVER_OWNERS.getStringList().contains(name) || ConfigEntry.SERVER_EXECUTIVES.getStringList().contains(name) || ConfigEntry.SERVER_MASTER_BUILDER_MANAGEMENT.getStringList().contains(name); return ConfigEntry.SERVER_OWNERS.getStringList().contains(name) || ConfigEntry.SERVER_EXECUTIVES.getStringList().contains(name) || ConfigEntry.SERVER_MASTER_BUILDER_MANAGEMENT.getStringList().contains(name);
} }
public static String formatName(String name)
{
return WordUtils.capitalizeFully(name.replace("_", " "));
}
public static String showS(int count)
{
if (count == 1)
{
return "";
}
return "s";
}
public static List<String> getPlayerList() public static List<String> getPlayerList()
{ {
List<String> names = new ArrayList<>(); List<String> names = new ArrayList<>();