AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-07-01 20:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stage 1 of IP -> UUID migration: changing player data to use UUIDs instead

Browse Source
This commit is contained in:
Video
2022-04-15 06:27:32 -06:00
parent b656925e4f
commit 98388d0d23
3 changed files with 58 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,24 +3,23 @@ package me.totalfreedom.totalfreedommod.player;
import com.google.common.collect.Lists;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.shop.ShopItem;
import me.totalfreedom.totalfreedommod.util.FLog;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
public class PlayerData
{
private UUID uuid;
private final List<String> ips = Lists.newArrayList();
private final List<String> notes = Lists.newArrayList();
private final List<String> backupCodes = Lists.newArrayList();
private String name;
private String tag = null;
private String discordID = null;
private Boolean masterBuilder = false;
@ -48,7 +47,7 @@ public class PlayerData
{
try
{
name = resultSet.getString("username");
uuid = UUID.fromString(resultSet.getString("uuid"));
ips.clear();
ips.addAll(FUtil.stringToList(resultSet.getString("ips")));
notes.clear();
@ -88,14 +87,13 @@ public class PlayerData
public PlayerData(Player player)
{
this.name = player.getName();
this.uuid = player.getUniqueId();
}
@Override
public String toString()
{
return "Player: " + name + "\n" +
return "Player: " + getName() + "\n" +
"- IPs: " + StringUtils.join(ips, ", ") + "\n" +
"- Discord ID: " + discordID + "\n" +
"- Master Builder: " + masterBuilder + "\n" +
@ -232,7 +230,7 @@ public class PlayerData
{
return new HashMap<String, Object>()
{{
put("username", name);
put("uuid", uuid.toString());
put("ips", FUtil.listToString(ips));
put("notes", FUtil.listToString(notes));
put("tag", tag);
@ -255,14 +253,14 @@ public class PlayerData
return displayDiscord;
}
public String getName()
public UUID getUuid()
{
return name;
return uuid;
}
public void setName(String name)
public String getName()
{
this.name = name;
return Bukkit.getOfflinePlayer(uuid).getName();
}
public String getTag()