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

FS-177:

Browse Source 
Part 1: This completely revamps the admin and player saving system, as well as removed multiple methods which involved getting data via player name. Most of the data is now UUID based and only thing that should be IP based is imposter system
This commit is contained in:
spacerocket62 2021-07-29 15:50:04 -07:00
parent 62529a6171
commit b99520b491
31 changed files with 507 additions and 483 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@ -14,6 +14,8 @@
<jar.finalName>${project.name}</jar.finalName> <jar.finalName>${project.name}</jar.finalName>
<timestamp>${maven.build.timestamp}</timestamp> <timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>MM/dd/yyyy HH:mm</maven.build.timestamp.format> <maven.build.timestamp.format>MM/dd/yyyy HH:mm</maven.build.timestamp.format>
<tfguilds.version>master-4ec00d977c-1</tfguilds.version>
</properties> </properties>
<name>TotalFreedomMod</name> <name>TotalFreedomMod</name>
@ -242,7 +244,7 @@
<dependency> <dependency>
<groupId>com.github.AtlasMediaGroup</groupId> <groupId>com.github.AtlasMediaGroup</groupId>
<artifactId>TFGuilds</artifactId> <artifactId>TFGuilds</artifactId>
<version>master-SNAPSHOT</version> <version>${tfguilds.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -270,6 +272,18 @@
<artifactId>org.eclipse.sisu.inject</artifactId> <artifactId>org.eclipse.sisu.inject</artifactId>
<version>0.3.4</version> <version>0.3.4</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20210307</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -446,6 +460,8 @@
<include>com.github.speedxx:Mojangson</include> <include>com.github.speedxx:Mojangson</include>
<include>org.bstats:bstats-bukkit</include> <include>org.bstats:bstats-bukkit</include>
<include>org.jetbrains:annotations</include> <include>org.jetbrains:annotations</include>
<includes>org.apache.httpcomponents.client5:httpclient5</includes>
<includes>org.apache.httpcomponents.core5:httpcore5</includes>
</includes> </includes>
</artifactSet> </artifactSet>
</configuration> </configuration>

2
src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java
View File

@ -126,7 +126,7 @@ public class ChatManager extends FreedomService
boolean mentionEveryone = ChatColor.stripColor(message).toLowerCase().contains("@everyone") && plugin.al.isAdmin(player); boolean mentionEveryone = ChatColor.stripColor(message).toLowerCase().contains("@everyone") && plugin.al.isAdmin(player);
for (Player p : server.getOnlinePlayers()) for (Player p : server.getOnlinePlayers())
{ {
if (ChatColor.stripColor(message).toLowerCase().contains("@" + p.getName().toLowerCase()) || mentionEveryone) if ((ChatColor.stripColor(message).toLowerCase().contains("@" + p.getName().toLowerCase()) || mentionEveryone) && !event.isCancelled())
{ {
p.playSound(p.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, SoundCategory.MASTER, 1337F, 0.9F); p.playSound(p.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, SoundCategory.MASTER, 1337F, 0.9F);
} }

8
src/main/java/me/totalfreedom/totalfreedommod/Muter.java
View File

@ -2,6 +2,8 @@ package me.totalfreedom.totalfreedommod;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID;
import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.player.FPlayer; import me.totalfreedom.totalfreedommod.player.FPlayer;
import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FLog;
@ -18,7 +20,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
public class Muter extends FreedomService public class Muter extends FreedomService
{ {
public final List<String> MUTED_PLAYERS = new ArrayList<>(); public final List<UUID> MUTED_PLAYERS = new ArrayList<>();
@Override @Override
public void onStart() public void onStart()
@ -45,7 +47,7 @@ public class Muter extends FreedomService
if (plugin.al.isAdminSync(player)) if (plugin.al.isAdminSync(player))
{ {
fPlayer.setMuted(false); fPlayer.setMuted(false);
MUTED_PLAYERS.remove(player.getName()); MUTED_PLAYERS.remove(player.getUniqueId());
return; return;
} }
@ -105,7 +107,7 @@ public class Muter extends FreedomService
Player player = event.getPlayer(); Player player = event.getPlayer();
FPlayer playerdata = plugin.pl.getPlayer(player); FPlayer playerdata = plugin.pl.getPlayer(player);
if (MUTED_PLAYERS.contains(player.getName())) if (MUTED_PLAYERS.contains(player.getUniqueId()))
{ {
playerdata.setMuted(true); playerdata.setMuted(true);
} }

32
src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLog.java
View File

@ -2,6 +2,8 @@ package me.totalfreedom.totalfreedommod.admin;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import java.util.Map; import java.util.Map;
import java.util.UUID;
import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.config.YamlConfig; import me.totalfreedom.totalfreedommod.config.YamlConfig;
import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FLog;
@ -14,13 +16,14 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
//TODO: convert to uuids
public class ActivityLog extends FreedomService public class ActivityLog extends FreedomService
{ {
public static final String FILENAME = "activitylog.yml"; public static final String FILENAME = "activitylog.yml";
private final Map<String, ActivityLogEntry> allActivityLogs = Maps.newHashMap(); private final Map<UUID, ActivityLogEntry> allActivityLogs = Maps.newHashMap();
private final Map<String, ActivityLogEntry> nameTable = Maps.newHashMap(); private final Map<UUID, ActivityLogEntry> activityLogs = Maps.newHashMap();
private final Map<String, ActivityLogEntry> ipTable = Maps.newHashMap(); private final Map<String, ActivityLogEntry> ipTable = Maps.newHashMap();
private final YamlConfig config; private final YamlConfig config;
@ -52,7 +55,7 @@ public class ActivityLog extends FreedomService
config.load(); config.load();
allActivityLogs.clear(); allActivityLogs.clear();
nameTable.clear(); activityLogs.clear();
ipTable.clear(); ipTable.clear();
for (String key : config.getKeys(false)) for (String key : config.getKeys(false))
{ {
@ -72,7 +75,7 @@ public class ActivityLog extends FreedomService
continue; continue;
} }
allActivityLogs.put(key, activityLogEntry); allActivityLogs.put(UUID.fromString(key), activityLogEntry);
} }
updateTables(); updateTables();
@ -102,12 +105,12 @@ public class ActivityLog extends FreedomService
return getActivityLog((Player)sender); return getActivityLog((Player)sender);
} }
return getEntryByName(sender.getName()); return getEntryByUUID(FUtil.getUUIDFromName(sender.getName()));
} }
public ActivityLogEntry getActivityLog(Player player) public ActivityLogEntry getActivityLog(Player player)
{ {
ActivityLogEntry activityLog = getEntryByName(player.getName()); ActivityLogEntry activityLog = getEntryByUUID(player.getUniqueId());
if (activityLog == null) if (activityLog == null)
{ {
String ip = FUtil.getIp(player); String ip = FUtil.getIp(player);
@ -115,14 +118,13 @@ public class ActivityLog extends FreedomService
if (activityLog != null) if (activityLog != null)
{ {
// Set the new username // Set the new username
activityLog.setName(player.getName());
save(); save();
updateTables(); updateTables();
} }
else else
{ {
activityLog = new ActivityLogEntry(player); activityLog = new ActivityLogEntry(player);
allActivityLogs.put(activityLog.getConfigKey(), activityLog); allActivityLogs.put(activityLog.getUUID(), activityLog);
updateTables(); updateTables();
activityLog.saveTo(config.createSection(activityLog.getConfigKey())); activityLog.saveTo(config.createSection(activityLog.getConfigKey()));
@ -139,9 +141,9 @@ public class ActivityLog extends FreedomService
return activityLog; return activityLog;
} }
public ActivityLogEntry getEntryByName(String name) public ActivityLogEntry getEntryByUUID(UUID uuid)
{ {
return nameTable.get(name.toLowerCase()); return activityLogs.get(uuid);
} }
public ActivityLogEntry getEntryByIp(String ip) public ActivityLogEntry getEntryByIp(String ip)
@ -151,12 +153,12 @@ public class ActivityLog extends FreedomService
public void updateTables() public void updateTables()
{ {
nameTable.clear(); activityLogs.clear();
ipTable.clear(); ipTable.clear();
for (ActivityLogEntry activityLog : allActivityLogs.values()) for (ActivityLogEntry activityLog : allActivityLogs.values())
{ {
nameTable.put(activityLog.getName().toLowerCase(), activityLog); activityLogs.put(activityLog.getUUID(), activityLog);
for (String ip : activityLog.getIps()) for (String ip : activityLog.getIps())
{ {
@ -190,14 +192,14 @@ public class ActivityLog extends FreedomService
} }
} }
public Map<String, ActivityLogEntry> getAllActivityLogs() public Map<UUID, ActivityLogEntry> getAllActivityLogs()
{ {
return allActivityLogs; return allActivityLogs;
} }
public Map<String, ActivityLogEntry> getNameTable() public Map<UUID, ActivityLogEntry> getActivityLogs()
{ {
return nameTable; return activityLogs;
} }
public Map<String, ActivityLogEntry> getIpTable() public Map<String, ActivityLogEntry> getIpTable()

45
src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLogEntry.java
View File

@ -4,6 +4,8 @@ import com.google.common.collect.Lists;
import java.time.Instant; import java.time.Instant;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.UUID;
import me.totalfreedom.totalfreedommod.config.IConfig; import me.totalfreedom.totalfreedommod.config.IConfig;
import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.FUtil;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
@ -18,17 +20,20 @@ public class ActivityLogEntry implements IConfig
private final List<String> timestamps = Lists.newArrayList(); private final List<String> timestamps = Lists.newArrayList();
private final List<String> durations = Lists.newArrayList(); private final List<String> durations = Lists.newArrayList();
private String configKey; private String configKey;
private String name;
public ActivityLogEntry(Player player) public ActivityLogEntry(Player player)
{ {
this.configKey = player.getName().toLowerCase(); this.configKey = player.getUniqueId().toString();
this.name = player.getName();
} }
public ActivityLogEntry(String configKey) public ActivityLogEntry(UUID uuid)
{ {
this.configKey = configKey; this.configKey = uuid.toString();
}
public ActivityLogEntry(String uuid)
{
this.configKey = uuid;
} }
public static String getFILENAME() public static String getFILENAME()
@ -39,13 +44,11 @@ public class ActivityLogEntry implements IConfig
public void loadFrom(Player player) public void loadFrom(Player player)
{ {
configKey = player.getName().toLowerCase(); configKey = player.getName().toLowerCase();
name = player.getName();
} }
@Override @Override
public void loadFrom(ConfigurationSection cs) public void loadFrom(ConfigurationSection cs)
{ {
name = cs.getString("username", configKey);
ips.clear(); ips.clear();
ips.addAll(cs.getStringList("ips")); ips.addAll(cs.getStringList("ips"));
timestamps.clear(); timestamps.clear();
@ -57,8 +60,8 @@ public class ActivityLogEntry implements IConfig
@Override @Override
public void saveTo(ConfigurationSection cs) public void saveTo(ConfigurationSection cs)
{ {
Validate.isTrue(isValid(), "Could not save activity entry: " + name + ". Entry not valid!"); Validate.isTrue(isValid(), "Could not save activity entry: " + getUUID() + ". Entry not valid!");
cs.set("username", name); cs.set("uuid", getUUID().toString());
cs.set("ips", Lists.newArrayList(ips)); cs.set("ips", Lists.newArrayList(ips));
cs.set("timestamps", Lists.newArrayList(timestamps)); cs.set("timestamps", Lists.newArrayList(timestamps));
cs.set("durations", Lists.newArrayList(durations)); cs.set("durations", Lists.newArrayList(durations));
@ -73,11 +76,11 @@ public class ActivityLogEntry implements IConfig
public void addLogout() public void addLogout()
{ {
// Fix of Array index out of bonds issue: FS-131 // Fix of Array index out of bonds issue: FS-131
String lastLoginString; String lastLoginString = "";
if(timestamps.size() > 1) if(timestamps.size() > 1)
{ {
lastLoginString = timestamps.get(timestamps.size() - 1); lastLoginString = timestamps.get(timestamps.size() - 1);
}else } else if (timestamps.size() == 1)
{ {
lastLoginString = timestamps.get(0); lastLoginString = timestamps.get(0);
} }
@ -136,7 +139,7 @@ public class ActivityLogEntry implements IConfig
public boolean isValid() public boolean isValid()
{ {
return configKey != null return configKey != null
&& name != null; && getUUID() != null;
} }
public String getConfigKey() public String getConfigKey()
@ -149,16 +152,6 @@ public class ActivityLogEntry implements IConfig
this.configKey = configKey; this.configKey = configKey;
} }
public String getName()
{
return name;
}
public void setName(String name)
{
this.name = name;
}
public List<String> getIps() public List<String> getIps()
{ {
return ips; return ips;
@ -173,4 +166,12 @@ public class ActivityLogEntry implements IConfig
{ {
return durations; return durations;
} }
public UUID getUUID() {
return UUID.fromString(configKey);
}
public String getName() {
return FUtil.getNameFromUUID(getUUID());
}
} }

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

@ -2,11 +2,8 @@ package me.totalfreedom.totalfreedommod.admin;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.*;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode; import me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode;
import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
@ -21,7 +18,7 @@ public class Admin
private final List<String> ips = new ArrayList<>(); private final List<String> ips = new ArrayList<>();
private String name; private UUID uuid;
private boolean active = true; private boolean active = true;
private Rank rank = Rank.ADMIN; private Rank rank = Rank.ADMIN;
private Date lastLogin = new Date(); private Date lastLogin = new Date();
@ -32,7 +29,7 @@ public class Admin
public Admin(Player player) public Admin(Player player)
{ {
this.name = player.getName(); this.uuid = player.getUniqueId();
this.ips.add(FUtil.getIp(player)); this.ips.add(FUtil.getIp(player));
} }
@ -40,7 +37,7 @@ public class Admin
{ {
try try
{ {
this.name = resultSet.getString("username"); this.uuid = UUID.fromString(resultSet.getString("uuid"));
this.active = resultSet.getBoolean("active"); this.active = resultSet.getBoolean("active");
this.rank = Rank.findRank(resultSet.getString("rank")); this.rank = Rank.findRank(resultSet.getString("rank"));
this.ips.clear(); this.ips.clear();
@ -62,7 +59,7 @@ public class Admin
{ {
final StringBuilder output = new StringBuilder(); final StringBuilder output = new StringBuilder();
output.append("Admin: ").append(name).append("\n") output.append("Admin: ").append(uuid.toString()).append("\n")
.append("- IPs: ").append(StringUtils.join(ips, ", ")).append("\n") .append("- IPs: ").append(StringUtils.join(ips, ", ")).append("\n")
.append("- Last Login: ").append(FUtil.dateToString(lastLogin)).append("\n") .append("- Last Login: ").append(FUtil.dateToString(lastLogin)).append("\n")
.append("- Rank: ").append(rank.getName()).append("\n") .append("- Rank: ").append(rank.getName()).append("\n")
@ -78,7 +75,7 @@ public class Admin
{ {
Map<String, Object> map = new HashMap<String, Object>() Map<String, Object> map = new HashMap<String, Object>()
{{ {{
put("username", name); put("uuid", uuid.toString());
put("active", active); put("active", active);
put("rank", rank.toString()); put("rank", rank.toString());
put("ips", FUtil.listToString(ips)); put("ips", FUtil.listToString(ips));
@ -120,20 +117,20 @@ public class Admin
public boolean isValid() public boolean isValid()
{ {
return name != null return uuid != null
&& rank != null && rank != null
&& !ips.isEmpty() && !ips.isEmpty()
&& lastLogin != null; && lastLogin != null;
} }
public String getName() public UUID getUniqueId()
{ {
return name; return uuid;
} }
public void setName(String name) public void setUniqueId(UUID uuid)
{ {
this.name = name; this.uuid = uuid;
} }
public boolean isActive() public boolean isActive()
@ -168,6 +165,7 @@ public class Admin
} }
} }
public Rank getRank() public Rank getRank()
{ {
return rank; return rank;
@ -232,4 +230,9 @@ public class Admin
{ {
this.pteroID = pteroID; this.pteroID = pteroID;
} }
public String getName()
{
return FUtil.getNameFromUUID(uuid);
}
} }

49
src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java
View File

@ -4,11 +4,7 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@ -26,7 +22,7 @@ public class AdminList extends FreedomService
private final Set<Admin> allAdmins = Sets.newHashSet(); // Includes disabled admins private final Set<Admin> allAdmins = Sets.newHashSet(); // Includes disabled admins
// Only active admins below // Only active admins below
private final Set<Admin> activeAdmins = Sets.newHashSet(); private final Set<Admin> activeAdmins = Sets.newHashSet();
private final Map<String, Admin> nameTable = Maps.newHashMap(); private final Map<UUID, Admin> adminTable = Maps.newHashMap();
private final Map<String, Admin> ipTable = Maps.newHashMap(); private final Map<String, Admin> ipTable = Maps.newHashMap();
public static List<String> getVanished() public static List<String> getVanished()
@ -66,7 +62,7 @@ public class AdminList extends FreedomService
} }
updateTables(); updateTables();
FLog.info("Loaded " + allAdmins.size() + " admins (" + nameTable.size() + " active, " + ipTable.size() + " IPs)"); FLog.info("Loaded " + allAdmins.size() + " admins (" + adminTable.size() + " active, " + ipTable.size() + " IPs)");
} }
public void messageAllAdmins(String message) public void messageAllAdmins(String message)
@ -97,14 +93,16 @@ public class AdminList extends FreedomService
return isAdmin(sender); return isAdmin(sender);
} }
@Deprecated
public List<String> getActiveAdminNames() public List<String> getActiveAdminNames()
{ {
List<String> names = new ArrayList(); /*List<String> names = new ArrayList();
for (Admin admin : activeAdmins) for (Admin admin : activeAdmins)
{ {
names.add(admin.getName()); names.add(admin.getName());
} }
return names; return names;*/
throw new UnsupportedOperationException("Admin no longer stores names in the object, may be changed in a future update");
} }
public boolean isAdmin(CommandSender sender) public boolean isAdmin(CommandSender sender)
@ -142,21 +140,21 @@ public class AdminList extends FreedomService
return admin.getRank().ordinal() >= Rank.SENIOR_ADMIN.ordinal(); return admin.getRank().ordinal() >= Rank.SENIOR_ADMIN.ordinal();
} }
public Admin getAdmin(CommandSender sender) public Admin getAdmin(CommandSender sender) //TODO: Fix
{ {
if (sender instanceof Player) if (sender instanceof Player)
{ {
return getAdmin((Player)sender); return getAdmin((Player)sender);
} }
return getEntryByName(sender.getName()); return getEntryByUUID(FUtil.getUUIDFromName(sender.getName()));
} }
public Admin getAdmin(Player player) public Admin getAdmin(Player player)
{ {
// Find admin // Find admin
String ip = FUtil.getIp(player); String ip = FUtil.getIp(player);
Admin admin = getEntryByName(player.getName()); Admin admin = getEntryByUUID(player.getUniqueId());
// Admin by name // Admin by name
if (admin != null) if (admin != null)
@ -181,18 +179,16 @@ public class AdminList extends FreedomService
if (admin != null) if (admin != null)
{ {
// Set the new username // Set the new username
String oldName = admin.getName(); //plugin.sql.updateAdminName(oldName, admin.getName());
admin.setName(player.getName());
plugin.sql.updateAdminName(oldName, admin.getName());
updateTables(); updateTables();
} }
return null; return null;
} }
public Admin getEntryByName(String name) public Admin getEntryByUUID(UUID uuid)
{ {
return nameTable.get(name.toLowerCase()); return adminTable.get(uuid);
} }
public Admin getEntryByIp(String ip) public Admin getEntryByIp(String ip)
@ -200,6 +196,7 @@ public class AdminList extends FreedomService
return ipTable.get(ip); return ipTable.get(ip);
} }
@Deprecated // TODO: no ips maybe ? idk soontm
public Admin getEntryByIpFuzzy(String needleIp) public Admin getEntryByIpFuzzy(String needleIp)
{ {
final Admin directAdmin = getEntryByIp(needleIp); final Admin directAdmin = getEntryByIp(needleIp);
@ -228,13 +225,12 @@ public class AdminList extends FreedomService
} }
admin.setLastLogin(new Date()); admin.setLastLogin(new Date());
admin.setName(player.getName());
save(admin); save(admin);
} }
public boolean isAdminImpostor(Player player) public boolean isAdminImpostor(Player player)
{ {
return getEntryByName(player.getName()) != null && !isAdmin(player) && !isVerifiedAdmin(player); return getEntryByUUID(player.getUniqueId()) != null && !isAdmin(player) && !isVerifiedAdmin(player);
} }
public boolean isVerifiedAdmin(Player player) public boolean isVerifiedAdmin(Player player)
@ -297,7 +293,7 @@ public class AdminList extends FreedomService
public void updateTables() public void updateTables()
{ {
activeAdmins.clear(); activeAdmins.clear();
nameTable.clear(); adminTable.clear();
ipTable.clear(); ipTable.clear();
for (Admin admin : allAdmins) for (Admin admin : allAdmins)
@ -308,7 +304,7 @@ public class AdminList extends FreedomService
} }
activeAdmins.add(admin); activeAdmins.add(admin);
nameTable.put(admin.getName().toLowerCase(), admin); adminTable.put(admin.getUniqueId(), admin);
for (String ip : admin.getIps()) for (String ip : admin.getIps())
{ {
@ -318,9 +314,9 @@ public class AdminList extends FreedomService
} }
} }
public Set<String> getAdminNames() public Set<UUID> getAdminUUIDs()
{ {
return nameTable.keySet(); return adminTable.keySet();
} }
public Set<String> getAdminIps() public Set<String> getAdminIps()
@ -332,7 +328,7 @@ public class AdminList extends FreedomService
{ {
try try
{ {
ResultSet currentSave = plugin.sql.getAdminByName(admin.getName()); ResultSet currentSave = plugin.sql.getAdminByUUID(admin.getUniqueId());
for (Map.Entry<String, Object> entry : admin.toSQLStorable().entrySet()) for (Map.Entry<String, Object> entry : admin.toSQLStorable().entrySet())
{ {
Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue()); Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
@ -392,11 +388,6 @@ public class AdminList extends FreedomService
return activeAdmins; return activeAdmins;
} }
public Map<String, Admin> getNameTable()
{
return nameTable;
}
public Map<String, Admin> getIpTable() public Map<String, Admin> getIpTable()
{ {
return ipTable; return ipTable;

2
src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java
View File

@ -19,6 +19,8 @@ import org.bukkit.entity.Player;
public class Ban public class Ban
{ {
//TODO: fuck your usernames and getting by ips, bans will be in uuid maybe soon tm idk
public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z"); public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z");
private final List<String> ips = Lists.newArrayList(); private final List<String> ips = Lists.newArrayList();
private String username = null; private String username = null;

3
src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java
View File

@ -12,6 +12,7 @@ import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FLog;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -126,7 +127,7 @@ public class BukkitTelnetBridge extends FreedomService
{ {
for (ClientSession session : telnet.appender.getSessions()) for (ClientSession session : telnet.appender.getSessions())
{ {
Admin admin = plugin.al.getEntryByName(session.getUserName().toLowerCase()); Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(session.getUserName()));
if (admin != null && !admins.contains(admin)) if (admin != null && !admins.contains(admin))
{ {
admins.add(admin); admins.add(admin);

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

@ -65,7 +65,7 @@ public class Command_ban extends FreedomCommand
final Player player = getPlayer(args[0]); final Player player = getPlayer(args[0]);
if (player == null) if (player == null)
{ {
final PlayerData entry = plugin.pl.getData(args[0]); final PlayerData entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
if (entry == null) if (entry == null)
{ {

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

@ -56,7 +56,7 @@ public class Command_doom extends FreedomCommand
plugin.ptero.updateAccountStatus(admin); plugin.ptero.updateAccountStatus(admin);
if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean()) if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean())
{ {
Discord.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID()); Discord.syncRoles(admin, plugin.pl.getData(admin.getUniqueId()).getDiscordID());
} }
} }

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

@ -3,6 +3,7 @@ package me.totalfreedom.totalfreedommod.command;
import me.totalfreedom.totalfreedommod.discord.Discord; import me.totalfreedom.totalfreedommod.discord.Discord;
import me.totalfreedom.totalfreedommod.player.PlayerData; import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -24,7 +25,7 @@ public class Command_linkdiscord extends FreedomCommand
if (args.length > 1 && plugin.al.isAdmin(playerSender)) if (args.length > 1 && plugin.al.isAdmin(playerSender))
{ {
PlayerData playerData = plugin.pl.getData(args[0]); PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
if (playerData == null) if (playerData == null)
{ {
msg(PLAYER_NOT_FOUND); msg(PLAYER_NOT_FOUND);

10
src/main/java/me/totalfreedom/totalfreedommod/command/Command_manageshop.java
View File

@ -42,7 +42,7 @@ public class Command_manageshop extends FreedomCommand
int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2]))); int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2])));
if (!args[3].equals("all")) if (!args[3].equals("all"))
{ {
PlayerData playerData = plugin.pl.getData(args[3]); PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
if (playerData == null) if (playerData == null)
{ {
msg(PLAYER_NOT_FOUND); msg(PLAYER_NOT_FOUND);
@ -83,7 +83,7 @@ public class Command_manageshop extends FreedomCommand
int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2]))); int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2])));
if (!args[3].equals("all")) if (!args[3].equals("all"))
{ {
PlayerData playerData = plugin.pl.getData(args[3]); PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
if (playerData == null) if (playerData == null)
{ {
msg(PLAYER_NOT_FOUND); msg(PLAYER_NOT_FOUND);
@ -130,7 +130,7 @@ public class Command_manageshop extends FreedomCommand
try try
{ {
int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2]))); int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2])));
PlayerData playerData = plugin.pl.getData(args[3]); PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
if (playerData == null) if (playerData == null)
{ {
msg(PLAYER_NOT_FOUND); msg(PLAYER_NOT_FOUND);
@ -180,7 +180,7 @@ public class Command_manageshop extends FreedomCommand
return true; return true;
} }
PlayerData playerData = plugin.pl.getData(args[3]); PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
if (playerData == null) if (playerData == null)
{ {
msg(PLAYER_NOT_FOUND); msg(PLAYER_NOT_FOUND);
@ -205,7 +205,7 @@ public class Command_manageshop extends FreedomCommand
return true; return true;
} }
PlayerData playerData = plugin.pl.getData(args[3]); PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
if (playerData == null) if (playerData == null)
{ {
msg(PLAYER_NOT_FOUND); msg(PLAYER_NOT_FOUND);

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

@ -45,7 +45,7 @@ public class Command_mbconfig extends FreedomCommand
return true; return true;
} }
PlayerData data = plugin.pl.getData(sender.getName()); PlayerData data = plugin.pl.getData(FUtil.getUUIDFromName(sender.getName()));
if (!data.isMasterBuilder()) if (!data.isMasterBuilder())
{ {
msg("You are not a master builder!", ChatColor.RED); msg("You are not a master builder!", ChatColor.RED);
@ -74,7 +74,7 @@ public class Command_mbconfig extends FreedomCommand
return true; return true;
} }
PlayerData data = plugin.pl.getData(sender.getName()); PlayerData data = plugin.pl.getData(FUtil.getUUIDFromName(sender.getName()));
final String targetIp = FUtil.getIp(playerSender); final String targetIp = FUtil.getIp(playerSender);
if (!data.isMasterBuilder()) if (!data.isMasterBuilder())
@ -101,14 +101,14 @@ public class Command_mbconfig extends FreedomCommand
return false; return false;
} }
if (plugin.pl.canManageMasterBuilders(sender.getName())) if (plugin.pl.canManageMasterBuilders(FUtil.getUUIDFromName(sender.getName())))
{ {
return noPerms(); return noPerms();
} }
final Player player = getPlayer(args[1]); final Player player = getPlayer(args[1]);
PlayerData data = player != null ? plugin.pl.getData(player) : plugin.pl.getData(args[1]); PlayerData data = player != null ? plugin.pl.getData(player) : plugin.pl.getData(FUtil.getUUIDFromName(args[1]));
if (data == null) if (data == null)
{ {
@ -157,13 +157,13 @@ public class Command_mbconfig extends FreedomCommand
return false; return false;
} }
if (plugin.pl.canManageMasterBuilders(sender.getName())) if (plugin.pl.canManageMasterBuilders(FUtil.getUUIDFromName(sender.getName())))
{ {
return noPerms(); return noPerms();
} }
Player player = getPlayer(args[1]); Player player = getPlayer(args[1]);
PlayerData data = player != null ? plugin.pl.getData(player) : plugin.pl.getData(args[1]); PlayerData data = player != null ? plugin.pl.getData(player) : plugin.pl.getData(FUtil.getUUIDFromName(args[1]));
if (data == null || !data.isMasterBuilder()) if (data == null || !data.isMasterBuilder())
{ {
@ -210,7 +210,7 @@ public class Command_mbconfig extends FreedomCommand
} }
else if (args[0].equalsIgnoreCase("clearip")) else if (args[0].equalsIgnoreCase("clearip"))
{ {
PlayerData data = plugin.pl.getData(sender.getName()); PlayerData data = plugin.pl.getData(FUtil.getUUIDFromName(sender.getName()));
if (data.isMasterBuilder()) if (data.isMasterBuilder())
{ {
return data.getIps(); return data.getIps();

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

@ -170,7 +170,7 @@ public class Command_myadmin extends FreedomCommand
msg("Role syncing is not enabled.", ChatColor.RED); msg("Role syncing is not enabled.", ChatColor.RED);
return true; return true;
} }
PlayerData playerData = plugin.pl.getData(target.getName()); PlayerData playerData = plugin.pl.getData(target.getUniqueId());
if (playerData.getDiscordID() == null) if (playerData.getDiscordID() == null)
{ {
msg("Please run /linkdiscord first!", ChatColor.RED); msg("Please run /linkdiscord first!", ChatColor.RED);
@ -248,7 +248,7 @@ public class Command_myadmin extends FreedomCommand
{ {
if (args[0].equals("-o") && args[2].equals("clearip")) if (args[0].equals("-o") && args[2].equals("clearip"))
{ {
Admin admin = plugin.al.getEntryByName(args[1]); Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(args[1]));
if (admin != null) if (admin != null)
{ {
return admin.getIps(); return admin.getIps();

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

@ -31,7 +31,7 @@ public class Command_notes extends FreedomCommand
final Player player = getPlayer(args[0]); final Player player = getPlayer(args[0]);
if (player == null) if (player == null)
{ {
final PlayerData entry = plugin.pl.getData(args[0]); final PlayerData entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
if (entry == null) if (entry == null)
{ {
@ -39,7 +39,7 @@ public class Command_notes extends FreedomCommand
return true; return true;
} }
playerData = plugin.pl.getData(entry.getName()); playerData = entry;
} }
else else
{ {

20
src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java
View File

@ -5,6 +5,8 @@ import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
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.discord.Discord;
@ -34,7 +36,7 @@ public class Command_saconfig extends FreedomCommand
{ {
case "list": case "list":
{ {
msg("Admins: " + StringUtils.join(plugin.al.getAdminNames(), ", "), ChatColor.GOLD); msg("Admins: " + StringUtils.join(plugin.al.getAdminUUIDs().stream().map(FUtil::getNameFromUUID).collect(Collectors.toList()), ", "), ChatColor.GOLD);
return true; return true;
} }
@ -45,7 +47,7 @@ public class Command_saconfig extends FreedomCommand
FUtil.adminAction(sender.getName(), "Cleaning the admin list", true); FUtil.adminAction(sender.getName(), "Cleaning the admin list", true);
plugin.al.deactivateOldEntries(true); plugin.al.deactivateOldEntries(true);
msg("Admins: " + StringUtils.join(plugin.al.getAdminNames(), ", "), ChatColor.GOLD); msg("Admins: " + StringUtils.join(plugin.al.getAdminUUIDs().stream().map(FUtil::getNameFromUUID).collect(Collectors.toList()), ", "), ChatColor.GOLD);
return true; return true;
} }
@ -89,7 +91,7 @@ public class Command_saconfig extends FreedomCommand
return true; return true;
} }
Admin admin = plugin.al.getEntryByName(args[1]); Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(args[1]));
if (admin == null) if (admin == null)
{ {
msg("Unknown admin: " + args[1]); msg("Unknown admin: " + args[1]);
@ -109,7 +111,7 @@ public class Command_saconfig extends FreedomCommand
if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean()) if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean())
{ {
Discord.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID()); Discord.syncRoles(admin, plugin.pl.getData(admin.getUniqueId()).getDiscordID());
} }
plugin.ptero.updateAccountStatus(admin); plugin.ptero.updateAccountStatus(admin);
@ -127,7 +129,7 @@ public class Command_saconfig extends FreedomCommand
checkRank(Rank.ADMIN); checkRank(Rank.ADMIN);
Admin admin = plugin.al.getEntryByName(args[1]); Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(args[1]));
if (admin == null) if (admin == null)
{ {
@ -206,12 +208,12 @@ public class Command_saconfig extends FreedomCommand
{ {
FUtil.adminAction(sender.getName(), "Re-adding " + player.getName() + " to the admin list", true); FUtil.adminAction(sender.getName(), "Re-adding " + player.getName() + " to the admin list", true);
String oldName = admin.getName(); /*String oldName = admin.getName();
if (!oldName.equals(player.getName())) if (!oldName.equals(player.getName()))
{ {
admin.setName(player.getName()); admin.setName(player.getName());
plugin.sql.updateAdminName(oldName, admin.getName()); plugin.sql.updateAdminName(oldName, admin.getName());
} }*/
admin.addIp(FUtil.getIp(player)); admin.addIp(FUtil.getIp(player));
admin.setActive(true); admin.setActive(true);
@ -259,7 +261,7 @@ public class Command_saconfig extends FreedomCommand
checkRank(Rank.ADMIN); checkRank(Rank.ADMIN);
Player player = getPlayer(args[1]); Player player = getPlayer(args[1]);
Admin admin = player != null ? plugin.al.getAdmin(player) : plugin.al.getEntryByName(args[1]); Admin admin = player != null ? plugin.al.getAdmin(player) : plugin.al.getEntryByUUID(FUtil.getUUIDFromName(args[1]));
if (admin == null) if (admin == null)
{ {
@ -280,7 +282,7 @@ public class Command_saconfig extends FreedomCommand
if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean()) if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean())
{ {
Discord.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID()); Discord.syncRoles(admin, plugin.pl.getData(admin.getUniqueId()).getDiscordID());
} }
plugin.ptero.updateAccountStatus(admin); plugin.ptero.updateAccountStatus(admin);

3
src/main/java/me/totalfreedom/totalfreedommod/command/Command_settotalvotes.java
View File

@ -3,6 +3,7 @@ package me.totalfreedom.totalfreedommod.command;
import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.player.PlayerData; import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -38,7 +39,7 @@ public class Command_settotalvotes extends FreedomCommand
return true; return true;
} }
PlayerData playerData = plugin.pl.getData(args[1]); PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[1]));
if (playerData == null) if (playerData == null)
{ {

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

@ -46,7 +46,7 @@ public class Command_tban extends FreedomCommand
final PlayerData entry; final PlayerData entry;
if (player == null) if (player == null)
{ {
entry = plugin.pl.getData(args[0]); entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
if (entry == null) if (entry == null)
{ {

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

@ -53,7 +53,7 @@ public class Command_tempban extends FreedomCommand
final PlayerData entry; final PlayerData entry;
if (player == null) if (player == null)
{ {
entry = plugin.pl.getData(args[0]); entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
if (entry == null) if (entry == null)
{ {

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

@ -22,7 +22,7 @@ public class Command_unban extends FreedomCommand
if (args.length > 0) if (args.length > 0)
{ {
String username; String username;
final PlayerData entry = plugin.pl.getData(args[0]); final PlayerData entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
if (entry == null) if (entry == null)
{ {

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

@ -2,6 +2,7 @@ package me.totalfreedom.totalfreedommod.command;
import me.totalfreedom.totalfreedommod.player.PlayerData; import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -23,7 +24,7 @@ public class Command_unlinkdiscord extends FreedomCommand
if (args.length != 0 && plugin.al.isAdmin(playerSender)) if (args.length != 0 && plugin.al.isAdmin(playerSender))
{ {
PlayerData playerData = plugin.pl.getData(args[0]); PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
if (playerData == null) if (playerData == null)
{ {
msg(PLAYER_NOT_FOUND); msg(PLAYER_NOT_FOUND);

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

@ -24,7 +24,7 @@ public class PrivateMessageListener extends ListenerAdapter
player.setDiscordID(event.getMessage().getAuthor().getId()); player.setDiscordID(event.getMessage().getAuthor().getId());
player.setVerification(true); player.setVerification(true);
Admin admin = TotalFreedomMod.getPlugin().al.getEntryByName(name); Admin admin = TotalFreedomMod.getPlugin().al.getEntryByUUID(player.getUniqueId());
if (admin != null) if (admin != null)
{ {
Discord.syncRoles(admin, player.getDiscordID()); Discord.syncRoles(admin, player.getDiscordID());

424
src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java
View File

@ -16,23 +16,22 @@ import org.bukkit.scheduler.BukkitTask;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID;
public class FPlayer public class FPlayer {
{
public static final long AUTO_PURGE_TICKS = 5L * 60L * 20L; public static final long AUTO_PURGE_TICKS = 5L * 60L * 20L;
private final TotalFreedomMod plugin; private final TotalFreedomMod plugin;
private final String name; private final UUID uuid;
private final String ip;
// //
private final FreezeData freezeData = new FreezeData(this); private final FreezeData freezeData = new FreezeData(this);
private final CageData cageData = new CageData(this); private final CageData cageData = new CageData(this);
private final List<LivingEntity> mobThrowerQueue = new ArrayList<>(); private final List<LivingEntity> mobThrowerQueue = new ArrayList<>();
private Player player; private Player player;
private PlayerData playerData;
// //
private BukkitTask unmuteTask; private BukkitTask unmuteTask;
private double fuckoffRadius = 0; private double fuckoffRadius = 0;
@ -71,376 +70,295 @@ public class FPlayer
private boolean invSee = false; private boolean invSee = false;
public FPlayer(TotalFreedomMod plugin, Player player)
{ public FPlayer(TotalFreedomMod plugin, Player player) {
this(plugin, player.getName(), FUtil.getIp(player)); this(plugin, player.getUniqueId());
} }
private FPlayer(TotalFreedomMod plugin, String name, String ip) private FPlayer(TotalFreedomMod plugin, UUID uuid) {
{
this.plugin = plugin; this.plugin = plugin;
this.name = name; this.uuid = uuid;
this.ip = ip;
} }
public static long getAutoPurgeTicks() public static long getAutoPurgeTicks() {
{
return AUTO_PURGE_TICKS; return AUTO_PURGE_TICKS;
} }
public Player getPlayer() public Player getPlayer() {
{ if (this.player == null) {
if (player != null && !player.isOnline()) for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
{ if (onlinePlayer.getUniqueId().equals(this.uuid)) {
player = null; this.player = onlinePlayer;
}
if (player == null)
{
for (Player onlinePlayer : Bukkit.getOnlinePlayers())
{
if (FUtil.getIp(onlinePlayer).equals(ip))
{
player = onlinePlayer;
break;
} }
} }
} }
return player; return this.player;
} }
public void setPlayer(Player player) public void setPlayer(Player player) {
{
this.player = player; this.player = player;
} }
public boolean isOrbiting() public boolean isOrbiting() {
{
return isOrbiting; return isOrbiting;
} }
public void setOrbiting(boolean orbiting) public void setOrbiting(boolean orbiting) {
{
isOrbiting = orbiting; isOrbiting = orbiting;
} }
public void startOrbiting(double strength) public void startOrbiting(double strength) {
{
this.isOrbiting = true; this.isOrbiting = true;
this.orbitStrength = strength; this.orbitStrength = strength;
} }
public void stopOrbiting() public void stopOrbiting() {
{
this.isOrbiting = false; this.isOrbiting = false;
} }
public double orbitStrength() public double orbitStrength() {
{
return orbitStrength; return orbitStrength;
} }
public boolean isFuckOff() public boolean isFuckOff() {
{
return fuckoffRadius > 0; return fuckoffRadius > 0;
} }
public void setFuckoff(double radius) public void setFuckoff(double radius) {
{
this.fuckoffRadius = radius; this.fuckoffRadius = radius;
} }
public void disableFuckoff() public void disableFuckoff() {
{
this.fuckoffRadius = 0; this.fuckoffRadius = 0;
} }
public void resetMsgCount() public void resetMsgCount() {
{
this.messageCount = 0; this.messageCount = 0;
} }
public int incrementAndGetMsgCount() public int incrementAndGetMsgCount() {
{
return this.messageCount++; return this.messageCount++;
} }
public int incrementAndGetBlockDestroyCount() public int incrementAndGetBlockDestroyCount() {
{
return this.totalBlockDestroy++; return this.totalBlockDestroy++;
} }
public void resetBlockDestroyCount() public void resetBlockDestroyCount() {
{
this.totalBlockDestroy = 0; this.totalBlockDestroy = 0;
} }
public int incrementAndGetBlockPlaceCount() public int incrementAndGetBlockPlaceCount() {
{
return this.totalBlockPlace++; return this.totalBlockPlace++;
} }
public void resetBlockPlaceCount() public void resetBlockPlaceCount() {
{
this.totalBlockPlace = 0; this.totalBlockPlace = 0;
} }
public int incrementAndGetFreecamDestroyCount() public int incrementAndGetFreecamDestroyCount() {
{
return this.freecamDestroyCount++; return this.freecamDestroyCount++;
} }
public void resetFreecamDestroyCount() public void resetFreecamDestroyCount() {
{
this.freecamDestroyCount = 0; this.freecamDestroyCount = 0;
} }
public int incrementAndGetFreecamPlaceCount() public int incrementAndGetFreecamPlaceCount() {
{
return this.freecamPlaceCount++; return this.freecamPlaceCount++;
} }
public void resetFreecamPlaceCount() public void resetFreecamPlaceCount() {
{
this.freecamPlaceCount = 0; this.freecamPlaceCount = 0;
} }
public void enableMobThrower(EntityType mobThrowerCreature, double mobThrowerSpeed) public void enableMobThrower(EntityType mobThrowerCreature, double mobThrowerSpeed) {
{
this.mobThrowerEnabled = true; this.mobThrowerEnabled = true;
this.mobThrowerEntity = mobThrowerCreature; this.mobThrowerEntity = mobThrowerCreature;
this.mobThrowerSpeed = mobThrowerSpeed; this.mobThrowerSpeed = mobThrowerSpeed;
} }
public void disableMobThrower() public void disableMobThrower() {
{
this.mobThrowerEnabled = false; this.mobThrowerEnabled = false;
} }
public EntityType mobThrowerCreature() public EntityType mobThrowerCreature() {
{
return this.mobThrowerEntity; return this.mobThrowerEntity;
} }
public double mobThrowerSpeed() public double mobThrowerSpeed() {
{
return this.mobThrowerSpeed; return this.mobThrowerSpeed;
} }
public boolean mobThrowerEnabled() public boolean mobThrowerEnabled() {
{
return this.mobThrowerEnabled; return this.mobThrowerEnabled;
} }
public void enqueueMob(LivingEntity mob) public void enqueueMob(LivingEntity mob) {
{
mobThrowerQueue.add(mob); mobThrowerQueue.add(mob);
if (mobThrowerQueue.size() > 4) if (mobThrowerQueue.size() > 4) {
{
LivingEntity oldmob = mobThrowerQueue.remove(0); LivingEntity oldmob = mobThrowerQueue.remove(0);
if (oldmob != null) if (oldmob != null) {
{
oldmob.damage(500.0); oldmob.damage(500.0);
} }
} }
} }
public void startArrowShooter(TotalFreedomMod plugin) public void startArrowShooter(TotalFreedomMod plugin) {
{
this.stopArrowShooter(); this.stopArrowShooter();
this.mp44ScheduleTask = new ArrowShooter(getPlayer()).runTaskTimer(plugin, 1L, 1L); this.mp44ScheduleTask = new ArrowShooter(getPlayer()).runTaskTimer(plugin, 1L, 1L);
this.mp44Firing = true; this.mp44Firing = true;
} }
public void stopArrowShooter() public void stopArrowShooter() {
{ if (this.mp44ScheduleTask != null) {
if (this.mp44ScheduleTask != null)
{
this.mp44ScheduleTask.cancel(); this.mp44ScheduleTask.cancel();
this.mp44ScheduleTask = null; this.mp44ScheduleTask = null;
} }
this.mp44Firing = false; this.mp44Firing = false;
} }
public void armMP44() public void armMP44() {
{
this.mp44Armed = true; this.mp44Armed = true;
this.stopArrowShooter(); this.stopArrowShooter();
} }
public void disarmMP44() public void disarmMP44() {
{
this.mp44Armed = false; this.mp44Armed = false;
this.stopArrowShooter(); this.stopArrowShooter();
} }
public boolean isMP44Armed() public boolean isMP44Armed() {
{
return this.mp44Armed; return this.mp44Armed;
} }
public boolean toggleMP44Firing() public boolean toggleMP44Firing() {
{
this.mp44Firing = !this.mp44Firing; this.mp44Firing = !this.mp44Firing;
return mp44Firing; return mp44Firing;
} }
public boolean isMuted() public boolean isMuted() {
{
return unmuteTask != null; return unmuteTask != null;
} }
public void setMuted(boolean muted, int minutes) public void setMuted(boolean muted, int minutes) {
{
FUtil.cancel(unmuteTask); FUtil.cancel(unmuteTask);
plugin.mu.MUTED_PLAYERS.remove(getPlayer().getName()); plugin.mu.MUTED_PLAYERS.remove(getPlayer().getUniqueId());
unmuteTask = null; unmuteTask = null;
if (!muted) if (!muted) {
{
return; return;
} }
if (getPlayer() == null) if (getPlayer() == null) {
{
return; return;
} }
plugin.mu.MUTED_PLAYERS.add(getPlayer().getName()); plugin.mu.MUTED_PLAYERS.add(getPlayer().getUniqueId());
// TODO: Simplify this into a Consumer<BukkitTask> lambda? // TODO: Simplify this into a Consumer<BukkitTask> lambda?
unmuteTask = new BukkitRunnable() unmuteTask = new BukkitRunnable() {
{
@Override @Override
public void run() public void run() {
{ if (getPlayer() != null) {
if (getPlayer() != null)
{
FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getPlayer().getName(), false); FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getPlayer().getName(), false);
setMuted(false); setMuted(false);
} } else {
else FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + Bukkit.getOfflinePlayer(uuid).getName(), false);
{ plugin.mu.MUTED_PLAYERS.remove(uuid);
FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getName(), false);
plugin.mu.MUTED_PLAYERS.remove(getName());
} }
} }
}.runTaskLater(plugin, minutes * (60L * 20L)); }.runTaskLater(plugin, minutes * (60L * 20L));
} }
public void setMuted(boolean muted) public void setMuted(boolean muted) {
{
setMuted(muted, 5); setMuted(muted, 5);
} }
public BukkitTask getLockupScheduleID() public BukkitTask getLockupScheduleID() {
{
return this.lockupScheduleTask; return this.lockupScheduleTask;
} }
public void setLockupScheduleId(BukkitTask id) public void setLockupScheduleId(BukkitTask id) {
{
this.lockupScheduleTask = id; this.lockupScheduleTask = id;
} }
public boolean isLockedUp() public boolean isLockedUp() {
{
return this.lockedUp; return this.lockedUp;
} }
public void setLockedUp(boolean lockedUp) public void setLockedUp(boolean lockedUp) {
{
this.lockedUp = lockedUp; this.lockedUp = lockedUp;
} }
public String getLastMessage() public String getLastMessage() {
{
return lastMessage; return lastMessage;
} }
public void setLastMessage(String message) public void setLastMessage(String message) {
{
this.lastMessage = message; this.lastMessage = message;
} }
public void setAdminChat(boolean inAdminchat) public void setAdminChat(boolean inAdminchat) {
{
this.inAdminchat = inAdminchat; this.inAdminchat = inAdminchat;
} }
public boolean inAdminChat() public boolean inAdminChat() {
{
return this.inAdminchat; return this.inAdminchat;
} }
public boolean allCommandsBlocked() public boolean allCommandsBlocked() {
{
return this.allCommandsBlocked; return this.allCommandsBlocked;
} }
public void setCommandsBlocked(boolean commandsBlocked) public void setCommandsBlocked(boolean commandsBlocked) {
{
this.allCommandsBlocked = commandsBlocked; this.allCommandsBlocked = commandsBlocked;
} }
public String getLastCommand() public String getLastCommand() {
{
return lastCommand; return lastCommand;
} }
public void setLastCommand(String lastCommand) public void setLastCommand(String lastCommand) {
{
this.lastCommand = lastCommand; this.lastCommand = lastCommand;
} }
public void setCommandSpy(boolean enabled) public void setCommandSpy(boolean enabled) {
{
this.cmdspyEnabled = enabled; this.cmdspyEnabled = enabled;
} }
public boolean cmdspyEnabled() public boolean cmdspyEnabled() {
{
return cmdspyEnabled; return cmdspyEnabled;
} }
public String getTag() public String getTag() {
{
return this.tag; return this.tag;
} }
public void setTag(String tag) public void setTag(String tag) {
{ if (tag == null) {
if (tag == null)
{
this.tag = null; this.tag = null;
} } else {
else
{
this.tag = FUtil.colorize(tag) + ChatColor.WHITE; this.tag = FUtil.colorize(tag) + ChatColor.WHITE;
} }
} }
public int getWarningCount() public int getWarningCount() {
{
return this.warningCount; return this.warningCount;
} }
public void setWarningCount(int warningCount) public void setWarningCount(int warningCount) {
{
this.warningCount = warningCount; this.warningCount = warningCount;
} }
public void incrementWarnings(boolean quiet) public void incrementWarnings(boolean quiet) {
{
this.warningCount++; this.warningCount++;
if (this.warningCount % 2 == 0) if (this.warningCount % 2 == 0) {
{
Player p = getPlayer(); Player p = getPlayer();
if (!quiet) if (!quiet) {
{
p.getWorld().strikeLightning(p.getLocation()); p.getWorld().strikeLightning(p.getLocation());
} }
@ -448,271 +366,221 @@ public class FPlayer
} }
} }
public TotalFreedomMod getPlugin() public TotalFreedomMod getPlugin() {
{
return plugin; return plugin;
} }
public String getName() public UUID getUniqueId() {
{ return uuid;
return name;
} }
public String getIp() public PlayerData getPlayerData() {
{ return playerData;
return ip;
} }
public BukkitTask getUnmuteTask() public BukkitTask getUnmuteTask() {
{
return unmuteTask; return unmuteTask;
} }
public void setUnmuteTask(BukkitTask unmuteTask) public void setUnmuteTask(BukkitTask unmuteTask) {
{
this.unmuteTask = unmuteTask; this.unmuteTask = unmuteTask;
} }
public FreezeData getFreezeData() public FreezeData getFreezeData() {
{
return freezeData; return freezeData;
} }
public double getFuckoffRadius() public double getFuckoffRadius() {
{
return fuckoffRadius; return fuckoffRadius;
} }
public void setFuckoffRadius(double fuckoffRadius) public void setFuckoffRadius(double fuckoffRadius) {
{
this.fuckoffRadius = fuckoffRadius; this.fuckoffRadius = fuckoffRadius;
} }
public int getMessageCount() public int getMessageCount() {
{
return messageCount; return messageCount;
} }
public void setMessageCount(int messageCount) public void setMessageCount(int messageCount) {
{
this.messageCount = messageCount; this.messageCount = messageCount;
} }
public int getTotalBlockDestroy() public int getTotalBlockDestroy() {
{
return totalBlockDestroy; return totalBlockDestroy;
} }
public void setTotalBlockDestroy(int totalBlockDestroy) public void setTotalBlockDestroy(int totalBlockDestroy) {
{
this.totalBlockDestroy = totalBlockDestroy; this.totalBlockDestroy = totalBlockDestroy;
} }
public int getTotalBlockPlace() public int getTotalBlockPlace() {
{
return totalBlockPlace; return totalBlockPlace;
} }
public void setTotalBlockPlace(int totalBlockPlace) public void setTotalBlockPlace(int totalBlockPlace) {
{
this.totalBlockPlace = totalBlockPlace; this.totalBlockPlace = totalBlockPlace;
} }
public int getFreecamDestroyCount() public int getFreecamDestroyCount() {
{
return freecamDestroyCount; return freecamDestroyCount;
} }
public void setFreecamDestroyCount(int freecamDestroyCount) public void setFreecamDestroyCount(int freecamDestroyCount) {
{
this.freecamDestroyCount = freecamDestroyCount; this.freecamDestroyCount = freecamDestroyCount;
} }
public int getFreecamPlaceCount() public int getFreecamPlaceCount() {
{
return freecamPlaceCount; return freecamPlaceCount;
} }
public void setFreecamPlaceCount(int freecamPlaceCount) public void setFreecamPlaceCount(int freecamPlaceCount) {
{
this.freecamPlaceCount = freecamPlaceCount; this.freecamPlaceCount = freecamPlaceCount;
} }
public CageData getCageData() public CageData getCageData() {
{
return cageData; return cageData;
} }
public double getOrbitStrength() public double getOrbitStrength() {
{
return orbitStrength; return orbitStrength;
} }
public void setOrbitStrength(double orbitStrength) public void setOrbitStrength(double orbitStrength) {
{
this.orbitStrength = orbitStrength; this.orbitStrength = orbitStrength;
} }
public boolean isMobThrowerEnabled() public boolean isMobThrowerEnabled() {
{
return mobThrowerEnabled; return mobThrowerEnabled;
} }
public void setMobThrowerEnabled(boolean mobThrowerEnabled) public void setMobThrowerEnabled(boolean mobThrowerEnabled) {
{
this.mobThrowerEnabled = mobThrowerEnabled; this.mobThrowerEnabled = mobThrowerEnabled;
} }
public EntityType getMobThrowerEntity() public EntityType getMobThrowerEntity() {
{
return mobThrowerEntity; return mobThrowerEntity;
} }
public void setMobThrowerEntity(EntityType mobThrowerEntity) public void setMobThrowerEntity(EntityType mobThrowerEntity) {
{
this.mobThrowerEntity = mobThrowerEntity; this.mobThrowerEntity = mobThrowerEntity;
} }
public double getMobThrowerSpeed() public double getMobThrowerSpeed() {
{
return mobThrowerSpeed; return mobThrowerSpeed;
} }
public void setMobThrowerSpeed(double mobThrowerSpeed) public void setPlayerData(PlayerData playerData) {
{ this.playerData = playerData;
}
public void setMobThrowerSpeed(double mobThrowerSpeed) {
this.mobThrowerSpeed = mobThrowerSpeed; this.mobThrowerSpeed = mobThrowerSpeed;
} }
public List<LivingEntity> getMobThrowerQueue() public List<LivingEntity> getMobThrowerQueue() {
{
return mobThrowerQueue; return mobThrowerQueue;
} }
public BukkitTask getMp44ScheduleTask() public BukkitTask getMp44ScheduleTask() {
{
return mp44ScheduleTask; return mp44ScheduleTask;
} }
public void setMp44ScheduleTask(BukkitTask mp44ScheduleTask) public void setMp44ScheduleTask(BukkitTask mp44ScheduleTask) {
{
this.mp44ScheduleTask = mp44ScheduleTask; this.mp44ScheduleTask = mp44ScheduleTask;
} }
public boolean isMp44Armed() public boolean isMp44Armed() {
{
return mp44Armed; return mp44Armed;
} }
public void setMp44Armed(boolean mp44Armed) public void setMp44Armed(boolean mp44Armed) {
{
this.mp44Armed = mp44Armed; this.mp44Armed = mp44Armed;
} }
public boolean isMp44Firing() public boolean isMp44Firing() {
{
return mp44Firing; return mp44Firing;
} }
public void setMp44Firing(boolean mp44Firing) public void setMp44Firing(boolean mp44Firing) {
{
this.mp44Firing = mp44Firing; this.mp44Firing = mp44Firing;
} }
public BukkitTask getLockupScheduleTask() public BukkitTask getLockupScheduleTask() {
{
return lockupScheduleTask; return lockupScheduleTask;
} }
public void setLockupScheduleTask(BukkitTask lockupScheduleTask) public void setLockupScheduleTask(BukkitTask lockupScheduleTask) {
{
this.lockupScheduleTask = lockupScheduleTask; this.lockupScheduleTask = lockupScheduleTask;
} }
public boolean isInAdminchat() public boolean isInAdminchat() {
{
return inAdminchat; return inAdminchat;
} }
public void setInAdminchat(boolean inAdminchat) public void setInAdminchat(boolean inAdminchat) {
{
this.inAdminchat = inAdminchat; this.inAdminchat = inAdminchat;
} }
public boolean isAllCommandsBlocked() public boolean isAllCommandsBlocked() {
{
return allCommandsBlocked; return allCommandsBlocked;
} }
public void setAllCommandsBlocked(boolean allCommandsBlocked) public void setAllCommandsBlocked(boolean allCommandsBlocked) {
{
this.allCommandsBlocked = allCommandsBlocked; this.allCommandsBlocked = allCommandsBlocked;
} }
public boolean isSuperadminIdVerified() public boolean isSuperadminIdVerified() {
{
return superadminIdVerified; return superadminIdVerified;
} }
public void setSuperadminIdVerified(boolean superadminIdVerified) public void setSuperadminIdVerified(boolean superadminIdVerified) {
{
this.superadminIdVerified = superadminIdVerified; this.superadminIdVerified = superadminIdVerified;
} }
public boolean isCmdspyEnabled() public boolean isCmdspyEnabled() {
{
return cmdspyEnabled; return cmdspyEnabled;
} }
public void setCmdspyEnabled(boolean cmdspyEnabled) public void setCmdspyEnabled(boolean cmdspyEnabled) {
{
this.cmdspyEnabled = cmdspyEnabled; this.cmdspyEnabled = cmdspyEnabled;
} }
public boolean isEditBlocked() public boolean isEditBlocked() {
{
return editBlocked; return editBlocked;
} }
public void setEditBlocked(boolean editBlocked) public void setEditBlocked(boolean editBlocked) {
{
this.editBlocked = editBlocked; this.editBlocked = editBlocked;
} }
public boolean isPvpBlocked() public boolean isPvpBlocked() {
{
return pvpBlocked; return pvpBlocked;
} }
public void setPvpBlocked(boolean pvpBlocked) public void setPvpBlocked(boolean pvpBlocked) {
{
this.pvpBlocked = pvpBlocked; this.pvpBlocked = pvpBlocked;
} }
public boolean isInvSee() public boolean isInvSee() {
{
return invSee; return invSee;
} }
public void setInvSee(boolean invSee) public void setInvSee(boolean invSee) {
{
this.invSee = invSee; this.invSee = invSee;
} }
private static class ArrowShooter extends BukkitRunnable private static class ArrowShooter extends BukkitRunnable {
{
private final Player player; private final Player player;
private ArrowShooter(Player player) private ArrowShooter(Player player) {
{
this.player = player; this.player = player;
} }
@Override @Override
public void run() public void run() {
{ if (player != null) {
if (player != null)
{
Arrow shot = player.launchProjectile(Arrow.class); Arrow shot = player.launchProjectile(Arrow.class);
shot.setVelocity(shot.getVelocity().multiply(2.0)); shot.setVelocity(shot.getVelocity().multiply(2.0));
} }

30
src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java
View File

@ -3,10 +3,8 @@ package me.totalfreedom.totalfreedommod.player;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Collections; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.shop.ShopItem; import me.totalfreedom.totalfreedommod.shop.ShopItem;
import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FLog;
@ -20,7 +18,7 @@ public class PlayerData
private final List<String> ips = Lists.newArrayList(); private final List<String> ips = Lists.newArrayList();
private final List<String> notes = Lists.newArrayList(); private final List<String> notes = Lists.newArrayList();
private final List<String> backupCodes = Lists.newArrayList(); private final List<String> backupCodes = Lists.newArrayList();
private String name; private UUID uuid;
private String tag = null; private String tag = null;
private String discordID = null; private String discordID = null;
private Boolean masterBuilder = false; private Boolean masterBuilder = false;
@ -48,7 +46,7 @@ public class PlayerData
{ {
try try
{ {
name = resultSet.getString("username"); uuid = UUID.fromString(resultSet.getString("uuid"));
ips.clear(); ips.clear();
ips.addAll(FUtil.stringToList(resultSet.getString("ips"))); ips.addAll(FUtil.stringToList(resultSet.getString("ips")));
notes.clear(); notes.clear();
@ -88,14 +86,13 @@ public class PlayerData
public PlayerData(Player player) public PlayerData(Player player)
{ {
this.name = player.getName(); this.uuid = player.getUniqueId();
} }
@Override @Override
public String toString() public String toString()
{ {
return "Player: " + uuid.toString() + "\n" +
return "Player: " + name + "\n" +
"- IPs: " + StringUtils.join(ips, ", ") + "\n" + "- IPs: " + StringUtils.join(ips, ", ") + "\n" +
"- Discord ID: " + discordID + "\n" + "- Discord ID: " + discordID + "\n" +
"- Master Builder: " + masterBuilder + "\n" + "- Master Builder: " + masterBuilder + "\n" +
@ -232,7 +229,7 @@ public class PlayerData
{ {
return new HashMap<String, Object>() return new HashMap<String, Object>()
{{ {{
put("username", name); put("uuid", uuid);
put("ips", FUtil.listToString(ips)); put("ips", FUtil.listToString(ips));
put("notes", FUtil.listToString(notes)); put("notes", FUtil.listToString(notes));
put("tag", tag); put("tag", tag);
@ -255,14 +252,14 @@ public class PlayerData
return displayDiscord; return displayDiscord;
} }
public String getName() public UUID getUniqueId()
{ {
return name; return uuid;
} }
public void setName(String name) public void setUniqueId(UUID uuid)
{ {
this.name = name; this.uuid = uuid;
} }
public String getTag() public String getTag()
@ -364,4 +361,9 @@ public class PlayerData
{ {
this.inspect = inspect; this.inspect = inspect;
} }
public String getName()
{
return FUtil.getNameFromUUID(uuid);
}
} }

118
src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java
View File

@ -3,11 +3,9 @@ package me.totalfreedom.totalfreedommod.player;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.*;
import java.util.Date; import java.util.stream.Collectors;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@ -20,13 +18,12 @@ import org.bukkit.entity.Player;
public class PlayerList extends FreedomService public class PlayerList extends FreedomService
{ {
public final Map<String, FPlayer> playerMap = Maps.newHashMap(); // ip,dataMap public final Map<UUID, FPlayer> playerMap = Maps.newHashMap(); // uuid,dataMap
public final Map<String, PlayerData> dataMap = Maps.newHashMap(); // username, data //public final Map<String, PlayerData> dataMap = Maps.newHashMap(); // username, data
@Override @Override
public void onStart() public void onStart()
{ {
dataMap.clear();
loadMasterBuilders(); loadMasterBuilders();
} }
@ -57,7 +54,6 @@ public class PlayerList extends FreedomService
while (resultSet.next()) while (resultSet.next())
{ {
PlayerData playerData = load(resultSet); PlayerData playerData = load(resultSet);
dataMap.put(playerData.getName(), playerData);
} }
} }
catch (SQLException e) catch (SQLException e)
@ -73,27 +69,20 @@ public class PlayerList extends FreedomService
return FUtil.getIp(Objects.requireNonNull(player.getPlayer())); return FUtil.getIp(Objects.requireNonNull(player.getPlayer()));
} }
final PlayerData entry = getData(player.getName()); final PlayerData entry = getData(player.getUniqueId());
return (entry == null ? null : entry.getIps().iterator().next()); return (entry == null ? null : entry.getIps().iterator().next());
} }
public List<String> getMasterBuilderNames() public List<String> getMasterBuilderNames()
{ {
List<String> masterBuilders = new ArrayList<>(); return playerMap.values().stream().map(FPlayer::getPlayerData).filter(PlayerData::isMasterBuilder).map(p -> FUtil.getNameFromUUID(p.getUniqueId())).collect(Collectors.toList());
for (PlayerData playerData : plugin.pl.dataMap.values())
{
if (playerData.isMasterBuilder())
{
masterBuilders.add(playerData.getName());
}
}
return masterBuilders;
} }
public boolean canManageMasterBuilders(String name) public boolean canManageMasterBuilders(UUID uuid)
{ {
PlayerData data = getData(name); PlayerData data = getData(uuid);
String name = FUtil.getNameFromUUID(uuid);
return (!ConfigEntry.HOST_SENDER_NAMES.getStringList().contains(name.toLowerCase()) && data != null && !ConfigEntry.SERVER_OWNERS.getStringList().contains(data.getName())) return (!ConfigEntry.HOST_SENDER_NAMES.getStringList().contains(name.toLowerCase()) && data != null && !ConfigEntry.SERVER_OWNERS.getStringList().contains(data.getName()))
&& !ConfigEntry.SERVER_EXECUTIVES.getStringList().contains(data.getName()) && !ConfigEntry.SERVER_EXECUTIVES.getStringList().contains(data.getName())
@ -103,31 +92,41 @@ public class PlayerList extends FreedomService
public boolean isTelnetMasterBuilder(PlayerData playerData) public boolean isTelnetMasterBuilder(PlayerData playerData)
{ {
Admin admin = plugin.al.getEntryByName(playerData.getName()); Admin admin = plugin.al.getEntryByUUID(playerData.getUniqueId());
return admin != null && admin.getRank().isAtLeast(Rank.ADMIN) && playerData.isMasterBuilder(); return admin != null && admin.getRank().isAtLeast(Rank.ADMIN) && playerData.isMasterBuilder();
} }
// May not return null // May not return null
public FPlayer getPlayer(Player player) public FPlayer getPlayer(Player player)
{ {
FPlayer tPlayer = playerMap.get(FUtil.getIp(player)); FPlayer tPlayer = playerMap.get(player.getUniqueId());
if (tPlayer != null) if (tPlayer != null)
{ {
return tPlayer; return tPlayer;
} }
tPlayer = new FPlayer(plugin, player); tPlayer = new FPlayer(plugin, player);
playerMap.put(FUtil.getIp(player), tPlayer); playerMap.put(player.getUniqueId(), tPlayer);
return tPlayer; return tPlayer;
} }
public PlayerData loadByName(String name) /*public PlayerData loadByName(String name)
{ {
return load(plugin.sql.getPlayerByName(name)); return load(plugin.sql.getPlayerByName(name));
} }
public PlayerData loadByIp(String ip) public PlayerData loadByIp(String ip)
{
return load(plugin.sql.getPlayerByIp(ip));
}*/
public PlayerData loadByUUID(UUID uuid)
{
return load(plugin.sql.getPlayerByUUID(uuid));
}
private PlayerData loadByIp(String ip)
{ {
return load(plugin.sql.getPlayerByIp(ip)); return load(plugin.sql.getPlayerByIp(ip));
} }
@ -168,7 +167,7 @@ public class PlayerList extends FreedomService
if (plugin.al.isAdminImpostor(player)) if (plugin.al.isAdminImpostor(player))
{ {
Admin admin = plugin.al.getEntryByName(player.getName()); Admin admin = plugin.al.getEntryByUUID(player.getUniqueId());
admin.setLastLogin(new Date()); admin.setLastLogin(new Date());
admin.addIp(FUtil.getIp(player)); admin.addIp(FUtil.getIp(player));
plugin.al.updateTables(); plugin.al.updateTables();
@ -180,7 +179,7 @@ public class PlayerList extends FreedomService
public void syncIps(Admin admin) public void syncIps(Admin admin)
{ {
PlayerData playerData = getData(admin.getName()); PlayerData playerData = getData(admin.getUniqueId());
playerData.clearIps(); playerData.clearIps();
playerData.addIps(admin.getIps()); playerData.addIps(admin.getIps());
plugin.pl.save(playerData); plugin.pl.save(playerData);
@ -188,7 +187,7 @@ public class PlayerList extends FreedomService
public void syncIps(PlayerData playerData) public void syncIps(PlayerData playerData)
{ {
Admin admin = plugin.al.getEntryByName(playerData.getName()); Admin admin = plugin.al.getEntryByUUID(playerData.getUniqueId());
if (admin != null && admin.isActive()) if (admin != null && admin.isActive())
{ {
@ -204,7 +203,7 @@ public class PlayerList extends FreedomService
{ {
try try
{ {
ResultSet currentSave = plugin.sql.getPlayerByName(player.getName()); ResultSet currentSave = plugin.sql.getPlayerByUUID(player.getUniqueId());
for (Map.Entry<String, Object> entry : player.toSQLStorable().entrySet()) for (Map.Entry<String, Object> entry : player.toSQLStorable().entrySet())
{ {
Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue()); Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
@ -223,31 +222,32 @@ public class PlayerList extends FreedomService
public PlayerData getData(Player player) public PlayerData getData(Player player)
{ {
// Check for existing data // Check for existing data
PlayerData playerData = dataMap.get(player.getName()); PlayerData playerData = playerMap.get(player.getUniqueId()).getPlayerData();
if (playerData != null) if (playerData != null)
{ {
return playerData; return playerData;
} }
// Load data // Load data
playerData = loadByName(player.getName()); playerData = loadByUUID(player.getUniqueId());
if (playerData == null) /*if (playerData == null)
{ {
playerData = loadByIp(FUtil.getIp(player)); playerData = loadByIp(FUtil.getIp(player));
if (playerData != null) if (playerData != null)
{ {
plugin.sql.updatePlayerName(playerData.getName(), player.getName()); plugin.sql.updatePlayerName(playerData.getName(), player.getName());
playerData.setName(player.getName()); playerMap.get(player.getUniqueId()).setPlayerData(playerData);
dataMap.put(player.getName(), playerData);
return playerData; return playerData;
} }
} }
else else
{ {
dataMap.put(player.getName(), playerData); playerMap.get(player.getUniqueId()).setPlayerData(playerData);
return playerData; return playerData;
} }*/
playerMap.get(player.getUniqueId()).setPlayerData(playerData);
// Create new data if nonexistent // Create new data if nonexistent
FLog.info("Creating new player verification entry for " + player.getName()); FLog.info("Creating new player verification entry for " + player.getName());
@ -257,7 +257,7 @@ public class PlayerList extends FreedomService
playerData.addIp(FUtil.getIp(player)); playerData.addIp(FUtil.getIp(player));
// Store player // Store player
dataMap.put(player.getName(), playerData); playerMap.get(player.getUniqueId()).setPlayerData(playerData);
// Save player // Save player
plugin.sql.addPlayer(playerData); plugin.sql.addPlayer(playerData);
@ -265,8 +265,10 @@ public class PlayerList extends FreedomService
} }
/*@Deprecated
public PlayerData getData(String username) public PlayerData getData(String username)
{ {
throw new UnsupportedOperationException();
// Check for existing data // Check for existing data
PlayerData playerData = dataMap.get(username); PlayerData playerData = dataMap.get(username);
if (playerData != null) if (playerData != null)
@ -286,6 +288,40 @@ public class PlayerList extends FreedomService
} }
return playerData; return playerData;
}*/
public PlayerData getData(UUID uuid)
{
PlayerData playerData = playerMap.get(uuid).getPlayerData();
if (playerData != null)
{
return playerData;
}
playerData = loadByUUID(uuid);
if (playerData != null)
{
playerMap.get(uuid).setPlayerData(playerData);
}
else
{
return null;
}
return playerData;
}
public PlayerData getDataByUUID(UUID uuid)
{
PlayerData player = loadByUUID(uuid);
if (player != null)
{
playerMap.get(uuid).setPlayerData(player);
}
return player;
} }
public PlayerData getDataByIp(String ip) public PlayerData getDataByIp(String ip)
@ -294,19 +330,15 @@ public class PlayerList extends FreedomService
if (player != null) if (player != null)
{ {
dataMap.put(player.getName(), player); playerMap.get(player.getUniqueId()).setPlayerData(player);
} }
return player; return player;
} }
public Map<String, FPlayer> getPlayerMap() public Map<UUID, FPlayer> getPlayerMap()
{ {
return playerMap; return playerMap;
} }
public Map<String, PlayerData> getDataMap()
{
return dataMap;
}
} }

2
src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
View File

@ -117,7 +117,7 @@ public class RankManager extends FreedomService
} }
// Console admin, get by name // Console admin, get by name
Admin admin = plugin.al.getEntryByName(sender.getName()); Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(sender.getName()));
// Unknown console: RCON? // Unknown console: RCON?
if (admin == null) if (admin == null)

2
src/main/java/me/totalfreedom/totalfreedommod/shop/Votifier.java
View File

@ -37,7 +37,7 @@ public class Votifier extends FreedomService
} }
else else
{ {
data = plugin.pl.getData(name); data = plugin.pl.getData(FUtil.getUUIDFromName(name));
} }
if (data != null) if (data != null)

77
src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java
View File

@ -7,6 +7,8 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.UUID;
import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.banning.Ban; import me.totalfreedom.totalfreedommod.banning.Ban;
@ -70,6 +72,7 @@ public class SQLite extends FreedomService
{ {
try try
{ {
//TODO: move bans to uuid
connection.createStatement().execute("CREATE TABLE `bans` (`name` VARCHAR, `uuid` VARCHAR, `ips` VARCHAR, `by` VARCHAR NOT NULL, `at` LONG NOT NULL, `expires` LONG, `reason` VARCHAR);"); connection.createStatement().execute("CREATE TABLE `bans` (`name` VARCHAR, `uuid` VARCHAR, `ips` VARCHAR, `by` VARCHAR NOT NULL, `at` LONG NOT NULL, `expires` LONG, `reason` VARCHAR);");
} }
catch (SQLException e) catch (SQLException e)
@ -82,7 +85,7 @@ public class SQLite extends FreedomService
{ {
try try
{ {
connection.createStatement().execute("CREATE TABLE `admins` (`username` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `rank` VARCHAR NOT NULL, `active` BOOLEAN NOT NULL, `last_login` LONG NOT NULL, `command_spy` BOOLEAN NOT NULL, `potion_spy` BOOLEAN NOT NULL, `ac_format` VARCHAR, `ptero_id` VARCHAR);"); connection.createStatement().execute("CREATE TABLE `admins` (`uuid` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `rank` VARCHAR NOT NULL, `active` BOOLEAN NOT NULL, `last_login` LONG NOT NULL, `command_spy` BOOLEAN NOT NULL, `potion_spy` BOOLEAN NOT NULL, `ac_format` VARCHAR, `ptero_id` VARCHAR);");
} }
catch (SQLException e) catch (SQLException e)
{ {
@ -93,7 +96,7 @@ public class SQLite extends FreedomService
{ {
try try
{ {
connection.createStatement().execute("CREATE TABLE `players` (`username` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `notes` VARCHAR, `tag` VARCHAR, `discord_id` VARCHAR, `backup_codes` VARCHAR, `master_builder` BOOLEAN NOT NULL,`verification` BOOLEAN NOT NULL, `ride_mode` VARCHAR NOT NULL, `coins` INT, `items` VARCHAR, `total_votes` INT NOT NULL, `display_discord` BOOLEAN NOT NULL, `login_message` VARCHAR, `inspect` BOOLEAN NOT NULL);"); connection.createStatement().execute("CREATE TABLE `players` (`uuid` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `notes` VARCHAR, `tag` VARCHAR, `discord_id` VARCHAR, `backup_codes` VARCHAR, `master_builder` BOOLEAN NOT NULL,`verification` BOOLEAN NOT NULL, `ride_mode` VARCHAR NOT NULL, `coins` INT, `items` VARCHAR, `total_votes` INT NOT NULL, `display_discord` BOOLEAN NOT NULL, `login_message` VARCHAR, `inspect` BOOLEAN NOT NULL);");
} }
catch (SQLException e) catch (SQLException e)
{ {
@ -133,8 +136,8 @@ public class SQLite extends FreedomService
{ {
try try
{ {
Object[] data = {key, admin.getName()}; Object[] data = {key, admin.getUniqueId().toString()};
PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET {0}=? WHERE username=''{1}''", data)); PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET {0}=? WHERE uuid=''{1}''", data));
statement = setUnknownType(statement, 1, value); statement = setUnknownType(statement, 1, value);
statement.executeUpdate(); statement.executeUpdate();
@ -150,8 +153,8 @@ public class SQLite extends FreedomService
{ {
try try
{ {
Object[] data = {key, player.getName()}; Object[] data = {key, player.getUniqueId().toString()};
PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE players SET {0}=? WHERE username=''{1}''", data)); PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE players SET {0}=? WHERE uuid=''{1}''", data));
statement = setUnknownType(statement, 1, value); statement = setUnknownType(statement, 1, value);
statement.executeUpdate(); statement.executeUpdate();
@ -162,9 +165,11 @@ public class SQLite extends FreedomService
} }
} }
public void updateAdminName(String oldName, String newName) @Deprecated
public void oldUpdateAdminName(String oldName, String newName)
{ {
try throw new UnsupportedOperationException("Admin no longer stores names in the object, may be changed in a future update");
/*try
{ {
PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET username=? WHERE username=''{0}''", oldName)); PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET username=? WHERE username=''{0}''", oldName));
statement = setUnknownType(statement, 1, newName); statement = setUnknownType(statement, 1, newName);
@ -174,10 +179,10 @@ public class SQLite extends FreedomService
catch (SQLException e) catch (SQLException e)
{ {
FLog.severe("Failed to update admin name: " + e.getMessage()); FLog.severe("Failed to update admin name: " + e.getMessage());
} }*/
} }
public void updatePlayerName(String oldName, String newName) /*public void updatePlayerName(String oldName, String newName)
{ {
try try
{ {
@ -190,7 +195,7 @@ public class SQLite extends FreedomService
{ {
FLog.severe("Failed to update player name: " + e.getMessage()); FLog.severe("Failed to update player name: " + e.getMessage());
} }
} }*/
public PreparedStatement setUnknownType(PreparedStatement statement, int index, Object value) throws SQLException public PreparedStatement setUnknownType(PreparedStatement statement, int index, Object value) throws SQLException
{ {
@ -248,7 +253,7 @@ public class SQLite extends FreedomService
try try
{ {
PreparedStatement statement = connection.prepareStatement("INSERT INTO admins VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"); PreparedStatement statement = connection.prepareStatement("INSERT INTO admins VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
statement.setString(1, admin.getName()); statement.setString(1, admin.getUniqueId().toString());
statement.setString(2, FUtil.listToString(admin.getIps())); statement.setString(2, FUtil.listToString(admin.getIps()));
statement.setString(3, admin.getRank().toString()); statement.setString(3, admin.getRank().toString());
statement.setBoolean(4, admin.isActive()); statement.setBoolean(4, admin.isActive());
@ -271,7 +276,7 @@ public class SQLite extends FreedomService
try try
{ {
PreparedStatement statement = connection.prepareStatement("INSERT INTO players VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); PreparedStatement statement = connection.prepareStatement("INSERT INTO players VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
statement.setString(1, player.getName()); statement.setString(1, player.getUniqueId().toString());
statement.setString(2, FUtil.listToString(player.getIps())); statement.setString(2, FUtil.listToString(player.getIps()));
statement.setString(3, FUtil.listToString(player.getNotes())); statement.setString(3, FUtil.listToString(player.getNotes()));
statement.setString(4, player.getTag()); statement.setString(4, player.getTag());
@ -295,7 +300,7 @@ public class SQLite extends FreedomService
} }
} }
public ResultSet getAdminByName(String name) /*public ResultSet getAdminByName(String name)
{ {
try try
{ {
@ -312,9 +317,28 @@ public class SQLite extends FreedomService
} }
return null; return null;
}*/
public ResultSet getAdminByUUID(UUID uuid)
{
try
{
ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM admins WHERE uuid=''{0}''", uuid.toString()));
if (resultSet.next())
{
return resultSet;
}
}
catch (SQLException e)
{
FLog.severe("Failed to get admin by name:");
FLog.severe(e);
} }
public ResultSet getPlayerByName(String name) return null;
}
/*public ResultSet getPlayerByName(String name)
{ {
try try
{ {
@ -332,6 +356,8 @@ public class SQLite extends FreedomService
return null; return null;
} }
*/
public ResultSet getMasterBuilders() public ResultSet getMasterBuilders()
{ {
@ -348,6 +374,25 @@ public class SQLite extends FreedomService
return null; return null;
} }
public ResultSet getPlayerByUUID(UUID uuid)
{
try
{
ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM players WHERE uuid LIKE ''%{0}%''", uuid.toString()));
if (resultSet.next())
{
return resultSet;
}
}
catch (SQLException e)
{
FLog.severe("Failed to get player by uuid:");
FLog.severe(e);
}
return null;
}
public ResultSet getPlayerByIp(String ip) public ResultSet getPlayerByIp(String ip)
{ {
try try
@ -371,7 +416,7 @@ public class SQLite extends FreedomService
{ {
try try
{ {
connection.createStatement().executeUpdate(MessageFormat.format("DELETE FROM admins where name=''{0}''", admin.getName())); connection.createStatement().executeUpdate(MessageFormat.format("DELETE FROM admins where uuid=''{0}''", admin.getUniqueId()));
} }
catch (SQLException e) catch (SQLException e)
{ {

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

@ -1,16 +1,18 @@
package me.totalfreedom.totalfreedommod.util; package me.totalfreedom.totalfreedommod.util;
import com.google.common.collect.Maps;
import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.config.ConfigEntry;
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.apache.commons.lang.WordUtils;
import org.bukkit.Bukkit; import org.apache.hc.client5.http.classic.methods.HttpGet;
import org.bukkit.ChatColor; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.bukkit.Color; import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.bukkit.Location; import org.apache.hc.client5.http.impl.classic.HttpClients;
import org.bukkit.Material; import org.apache.hc.core5.http.HttpResponse;
import org.bukkit.OfflinePlayer; import org.apache.hc.core5.http.io.entity.EntityUtils;
import org.bukkit.*;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -19,12 +21,14 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scheduler.BukkitTask; import org.bukkit.scheduler.BukkitTask;
import org.json.JSONObject;
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
import java.io.*; import java.io.*;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.Instant; import java.time.Instant;
@ -37,6 +41,8 @@ import static org.bukkit.Bukkit.getServer;
public class FUtil public class FUtil
{ {
private static final Map<UUID, String> NAME_CACHE = Maps.newHashMap();
public static final String SAVED_FLAGS_FILENAME = "savedflags.dat"; public static final String SAVED_FLAGS_FILENAME = "savedflags.dat";
/* See https://github.com/TotalFreedom/License - None of the listed names may be removed. /* See https://github.com/TotalFreedom/License - None of the listed names may be removed.
Leaving this list here for anyone running TFM on a cracked server: Leaving this list here for anyone running TFM on a cracked server:
@ -883,4 +889,52 @@ public class FUtil
return subList(startIndex, endIndex + 1); return subList(startIndex, endIndex + 1);
} }
} }
public static String getNameFromUUID(UUID uuid) {
OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
if (player.hasPlayedBefore()) return player.getName();
if (NAME_CACHE.containsKey(uuid)) return NAME_CACHE.get(uuid);
CloseableHttpClient client = HttpClients.createDefault();
HttpGet get = new HttpGet("https://api.ashcon.app/mojang/v2/user/" + uuid.toString().replace("-", ""));
try {
CloseableHttpResponse response = client.execute(get);
String json = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
JSONObject obj = new JSONObject(json);
response.close();
if (response.getCode() == 200) {
String name = NAME_CACHE.put(uuid, obj.getString("username"));
Bukkit.getScheduler().runTaskLaterAsynchronously(TotalFreedomMod.getPlugin(), () -> NAME_CACHE.remove(uuid), 20 * 60L * 5); // remove the uuid from cache as names can be changed
return name;
}
client.close();
} catch (IOException | org.apache.hc.core5.http.ParseException e) {
e.printStackTrace();
}
return "";
}
public static UUID getUUIDFromName(String name) {
//get offline player is deprecated so we'll just see if they're online to get their uuid
Player player = Bukkit.getPlayer(name);
if (player != null) return player.getUniqueId();
CloseableHttpClient client = HttpClients.createDefault();
HttpGet get = new HttpGet("https://api.ashcon.app/mojang/v2/user/" + name);
try {
CloseableHttpResponse response = client.execute(get);
String json = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
JSONObject obj = new JSONObject(json);
response.close();
if (response.getCode() == 200) {
return UUID.fromString(obj.getString("uuid"));
}
client.close();
} catch (IOException | org.apache.hc.core5.http.ParseException e) {
e.printStackTrace();
}
return null;
}
} }

2
src/main/java/me/totalfreedom/totalfreedommod/world/WorldRestrictions.java
View File

@ -52,7 +52,7 @@ public class WorldRestrictions extends FreedomService
public boolean doRestrict(Player player) public boolean doRestrict(Player player)
{ {
if (!plugin.pl.getData(player).isMasterBuilder() && plugin.pl.canManageMasterBuilders(player.getName())) if (!plugin.pl.getData(player).isMasterBuilder() && plugin.pl.canManageMasterBuilders(player.getUniqueId()))
{ {
if (player.getWorld().equals(plugin.wm.masterBuilderWorld.getWorld())) if (player.getWorld().equals(plugin.wm.masterBuilderWorld.getWorld()))
{ {