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

revert shop to names, next up mysql

Browse Source
This commit is contained in:
ZeroEpoch1969
2020-04-29 16:29:43 -07:00
parent a2a4a8a0b8
commit abbadb55ee
20 changed files with 169 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/main/java/me/totalfreedom/totalfreedommod/shop/Shop.java
View File

@ -16,6 +16,7 @@ import me.rayzr522.jsonmessage.JSONMessage;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
import me.totalfreedom.totalfreedommod.util.FLog;
import me.totalfreedom.totalfreedommod.util.FUtil;
import net.pravian.aero.config.YamlConfig;
@ -37,7 +38,7 @@ import org.bukkit.scheduler.BukkitTask;
public class Shop extends FreedomService
{
@Getter
public final Map<UUID, ShopData> dataMap = Maps.newHashMap();
public final Map<String, ShopData> dataMap = Maps.newHashMap();
@Getter
private final File configFolder;
private BukkitTask reactions;
@ -102,8 +103,8 @@ public class Shop extends FreedomService
YamlConfig config = getConfig(data);
data.saveTo(config);
config.save();
dataMap.remove(data.getUUID());
dataMap.put(data.getUUID(), data);
dataMap.remove(data.getUsername());
dataMap.put(data.getUsername(), data);
}
public String getShopPrefix()
@ -119,30 +120,29 @@ public class Shop extends FreedomService
// May not return null
public ShopData getData(Player player)
{
// Check already loaded
ShopData data = dataMap.get(player.getUniqueId());
// Check for existing data
ShopData data = dataMap.get(player.getName());
if (data != null)
{
return data;
}
// Load data
data = getData(player.getUniqueId());
data = getData(player.getName());
// Create data if nonexistent
String ip = Ips.getIp(player);
// Create new data if nonexistent
if (data == null)
{
FLog.info("Creating new shop data entry for " + player.getName());
FLog.info("Creating new player verification entry for " + player.getName());
// Create new player
data = new ShopData(player);
data.setUsername(player.getName());
// Set defaults
data.setCoins(0);
data.addIp(Ips.getIp(player));
// Store player
dataMap.put(player.getUniqueId(), data);
dataMap.put(player.getName(), data);
// Save player
YamlConfig config = getConfig(data);
@ -150,34 +150,46 @@ public class Shop extends FreedomService
config.save();
}
dataMap.put(player.getUniqueId(), data);
if (!data.getsIps().contains(ip))
{
data.addIp(ip);
save(data);
}
return data;
}
public ShopData getData(String username)
{
UUID uuid = FUtil.nameToUUID(username);
if (uuid != null)
{
return getData(uuid);
}
return null;
}
username = username.toLowerCase();
public ShopData getData(UUID uuid)
{
// Check if the player is a known player
final File configFile = getConfigFile(uuid);
final File configFile = getConfigFile(username);
if (!configFile.exists())
{
return null;
}
// Load entry
final ShopData data = new ShopData(uuid);
data.loadFrom(getConfig(data));
return data;
final ShopData shopData = new ShopData(username);
shopData.loadFrom(getConfig(shopData));
if (!shopData.isValid())
{
FLog.warning("Could not load player verification entry for " + username + ". Entry is not valid!");
configFile.delete();
return null;
}
// Only store data in map if the player is online
for (Player players : server.getOnlinePlayers())
{
if (players.getName().equals(username))
{
dataMap.put(username, shopData);
return shopData;
}
}
return shopData;
}
public Inventory generateShopGUI(ShopData shopData)
@ -329,7 +341,7 @@ public class Shop extends FreedomService
}
Player player = (Player) event.getWhoClicked();
ShopData shopData = plugin.sh.getData(player);
ShopData shopData = getData(player);
int price = shopItem.getCost();
int coins = shopData.getCoins();
@ -420,14 +432,14 @@ public class Shop extends FreedomService
return dataMap.values();
}
protected File getConfigFile(UUID uuid)
protected File getConfigFile(String name)
{
return new File(getConfigFolder(), uuid + ".yml");
return new File(getConfigFolder(), name.toLowerCase() + ".yml");
}
protected YamlConfig getConfig(ShopData data)
{
final YamlConfig config = new YamlConfig(plugin, getConfigFile(data.getUUID()), false);
final YamlConfig config = new YamlConfig(plugin, getConfigFile(data.getUsername()), false);
config.load();
return config;
}

36
src/main/java/me/totalfreedom/totalfreedommod/shop/ShopData.java
View File

@ -16,6 +16,7 @@ import org.bukkit.entity.Player;
public class ShopData implements ConfigLoadable, ConfigSavable, Validatable
{
private final List<String> ips = Lists.newArrayList();
@Getter
@Setter
private String username;
@ -30,19 +31,19 @@ public class ShopData implements ConfigLoadable, ConfigSavable, Validatable
public ShopData(Player player)
{
this(player.getUniqueId());
this(player.getName());
}
public ShopData(UUID uuid)
public ShopData(String name)
{
this.uuid = uuid.toString();
this.username = name;
}
@Override
public void loadFrom(ConfigurationSection cs)
{
this.username = cs.getString("username", username);
this.uuid = cs.getString("uuid", uuid);
this.ips.addAll(cs.getStringList("ips"));
this.coins = cs.getInt("coins", coins);
this.items.addAll(cs.getStringList("items"));
this.totalVotes = cs.getInt("totalVotes");
@ -53,7 +54,7 @@ public class ShopData implements ConfigLoadable, ConfigSavable, Validatable
{
Validate.isTrue(isValid(), "Could not save shop entry: " + username + ". Entry not valid!");
cs.set("username", username);
cs.set("uuid", uuid);
cs.set("ips", ips);
cs.set("coins", coins);
cs.set("items", items);
cs.set("totalVotes", totalVotes);
@ -64,16 +65,6 @@ public class ShopData implements ConfigLoadable, ConfigSavable, Validatable
return Collections.unmodifiableList(items);
}
public void setUUID(UUID id)
{
uuid = id.toString();
}
public UUID getUUID()
{
return UUID.fromString(uuid);
}
public void giveItem(ShopItem item)
{
items.add(item.getDataName());
@ -88,6 +79,21 @@ public class ShopData implements ConfigLoadable, ConfigSavable, Validatable
return false;
}
public boolean addIp(String ip)
{
return !ips.contains(ip) && ips.add(ip);
}
public void removeIp(String ip)
{
ips.remove(ip);
}
public List<String> getsIps()
{
return Collections.unmodifiableList(ips);
}
public void removeItem(ShopItem item)
{
items.remove(item.getDataName());