mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2025-07-01 04:26:42 +00:00
Compare commits
7 Commits
RELEASE-20
...
proper-res
Author | SHA1 | Date | |
---|---|---|---|
1f9a36cbfb | |||
55f8c29036 | |||
d6c68adb41 | |||
a3530ad143 | |||
8b48408870 | |||
0d0fbf2c04 | |||
997210a16f |
@ -4,15 +4,13 @@ import me.totalfreedom.totalfreedommod.TotalFreedomMod;
|
||||
import me.totalfreedom.totalfreedommod.player.FPlayer;
|
||||
import me.totalfreedom.totalfreedommod.rank.DisplayableGroup;
|
||||
import me.totalfreedom.totalfreedommod.rank.GroupProvider;
|
||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||
import me.totalfreedom.totalfreedommod.sql.ResultSetProvider;
|
||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Server;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.*;
|
||||
|
||||
public class Admin
|
||||
@ -32,23 +30,22 @@ public class Admin
|
||||
this.ips.add(FUtil.getIp(player));
|
||||
}
|
||||
|
||||
public Admin(ResultSet resultSet)
|
||||
public Admin(ResultSetProvider resultSet)
|
||||
{
|
||||
try
|
||||
if (resultSet.getString("uuid") == null)
|
||||
{
|
||||
this.uuid = UUID.fromString(resultSet.getString("uuid"));
|
||||
this.active = resultSet.getBoolean("active");
|
||||
this.rank = GroupProvider.fromString(resultSet.getString("rank")).getGroup();
|
||||
this.ips.clear();
|
||||
this.ips.addAll(FUtil.stringToList(resultSet.getString("ips")));
|
||||
this.lastLogin = new Date(resultSet.getLong("last_login"));
|
||||
this.commandSpy = resultSet.getBoolean("command_spy");
|
||||
this.potionSpy = resultSet.getBoolean("potion_spy");
|
||||
this.acFormat = resultSet.getString("ac_format");
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to load admin: " + e.getMessage());
|
||||
throw new IllegalArgumentException("Failed to load admin, as the UUID is null.");
|
||||
}
|
||||
|
||||
this.uuid = UUID.fromString(resultSet.getString("uuid"));
|
||||
this.active = resultSet.getBoolean("active");
|
||||
this.rank = GroupProvider.fromString(resultSet.getString("rank")).getGroup();
|
||||
this.ips.clear();
|
||||
this.ips.addAll(FUtil.stringToList(resultSet.getString("ips")));
|
||||
this.lastLogin = new Date(resultSet.getLong("last_login"));
|
||||
this.commandSpy = resultSet.getBoolean("command_spy");
|
||||
this.potionSpy = resultSet.getBoolean("potion_spy");
|
||||
this.acFormat = resultSet.getString("ac_format");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -5,6 +5,7 @@ import com.google.common.collect.Sets;
|
||||
import me.totalfreedom.totalfreedommod.FreedomService;
|
||||
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
||||
import me.totalfreedom.totalfreedommod.rank.GroupProvider;
|
||||
import me.totalfreedom.totalfreedommod.sql.ResultSetProvider;
|
||||
import me.totalfreedom.totalfreedommod.rank.Hierarchy;
|
||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||
@ -13,14 +14,15 @@ import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.CompletionException;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
public class AdminList extends FreedomService
|
||||
{
|
||||
public static final List<UUID> vanished = new ArrayList<>();
|
||||
public static final String SQL_SAVE_FAILED = "Failed to save admin: ";
|
||||
private final Set<Admin> allAdmins = Sets.newHashSet(); // Includes disabled admins
|
||||
// Only active admins below
|
||||
private final Set<Admin> activeAdmins = Sets.newHashSet();
|
||||
@ -44,33 +46,37 @@ public class AdminList extends FreedomService
|
||||
public void load()
|
||||
{
|
||||
allAdmins.clear();
|
||||
try
|
||||
plugin.sql.getAdminList().thenAcceptAsync(provider ->
|
||||
{
|
||||
ResultSet adminSet = plugin.sql.getAdminList();
|
||||
while (adminSet.next())
|
||||
AtomicInteger row = new AtomicInteger(1);
|
||||
provider.getAllRowsResultSet().forEach(adminSet ->
|
||||
{
|
||||
tryAddAdmin(adminSet);
|
||||
}
|
||||
} catch (SQLException e)
|
||||
try
|
||||
{
|
||||
tryAddAdmin(ResultSetProvider.fromRow(adminSet));
|
||||
row.set(row.get() + 1);
|
||||
} catch (Throwable e)
|
||||
{
|
||||
FLog.warning("An error occurred whilst reading the admin entry at row #" + row.get());
|
||||
throw new CompletionException(e); // handle downstream.
|
||||
}
|
||||
});
|
||||
}).whenComplete((result, throwable) ->
|
||||
{
|
||||
FLog.severe("Failed to load admin list: " + e.getMessage());
|
||||
}
|
||||
|
||||
updateTables();
|
||||
FLog.info("Loaded " + allAdmins.size() + " admins (" + uuidTable.size() + " active, " + ipTable.size() + " IPs)");
|
||||
if (throwable != null)
|
||||
{
|
||||
FLog.severe(throwable.getMessage());
|
||||
return;
|
||||
}
|
||||
updateTables();
|
||||
FLog.info("Loaded " + allAdmins.size() + " admins (" + uuidTable.size() + " active, " + ipTable.size() + " IPs)");
|
||||
});
|
||||
}
|
||||
|
||||
private void tryAddAdmin(ResultSet adminSet) throws SQLException
|
||||
private void tryAddAdmin(ResultSetProvider adminSet)
|
||||
{
|
||||
try
|
||||
{
|
||||
Admin admin = new Admin(adminSet);
|
||||
allAdmins.add(admin);
|
||||
} catch (Throwable ex)
|
||||
{
|
||||
FLog.warning("An error occurred whilst reading the admin entry at row #" + adminSet.getRow());
|
||||
FLog.warning(ex);
|
||||
}
|
||||
Admin admin = new Admin(adminSet);
|
||||
allAdmins.add(admin);
|
||||
}
|
||||
|
||||
public void messageAllAdmins(Component message)
|
||||
@ -187,7 +193,13 @@ public class AdminList extends FreedomService
|
||||
updateTables();
|
||||
|
||||
// Save admin
|
||||
plugin.sql.addAdmin(admin);
|
||||
plugin.sql.addAdmin(admin).whenComplete((result, exception) ->
|
||||
{
|
||||
if (exception != null)
|
||||
{
|
||||
FLog.warning(SQL_SAVE_FAILED + admin.getName() + " to the database.\n" + exception.getMessage());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public boolean removeAdmin(Admin admin)
|
||||
@ -205,7 +217,13 @@ public class AdminList extends FreedomService
|
||||
updateTables();
|
||||
|
||||
// Unsave admin
|
||||
plugin.sql.removeAdmin(admin);
|
||||
plugin.sql.removeAdmin(admin).whenComplete((result, exception) ->
|
||||
{
|
||||
if (exception != null)
|
||||
{
|
||||
FLog.warning("Failed to remove admin: " + admin.getName() + " from the database.\n" + exception.getMessage());
|
||||
}
|
||||
});
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -250,21 +268,30 @@ public class AdminList extends FreedomService
|
||||
|
||||
public void save(Admin admin)
|
||||
{
|
||||
try
|
||||
plugin.sql.getAdminByUuid(admin.getUuid()).thenApplyAsync(result ->
|
||||
{
|
||||
ResultSet currentSave = plugin.sql.getAdminByUuid(admin.getUuid());
|
||||
for (Map.Entry<String, Object> entry : admin.toSQLStorable().entrySet())
|
||||
{
|
||||
Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
|
||||
Object storedValue = plugin.sql.getValue(result, entry.getKey(), entry.getValue());
|
||||
if (storedValue != null && !storedValue.equals(entry.getValue()) || storedValue == null && entry.getValue() != null || entry.getValue() == null)
|
||||
{
|
||||
plugin.sql.setAdminValue(admin, entry.getKey(), entry.getValue());
|
||||
plugin.sql.setAdminValue(admin, entry.getKey(), entry.getValue()).whenComplete((result2, exception) ->
|
||||
{
|
||||
if (exception != null)
|
||||
{
|
||||
throw new CompletionException(exception); // We want to handle downstream in #whenComplete()
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
} catch (SQLException e)
|
||||
return null;
|
||||
}).whenComplete((result, exception) ->
|
||||
{
|
||||
FLog.severe("Failed to save admin: " + e.getMessage());
|
||||
}
|
||||
if (exception != null)
|
||||
{
|
||||
FLog.severe(SQL_SAVE_FAILED + exception.getMessage());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void deactivateOldEntries(boolean verbose)
|
||||
|
@ -2,17 +2,8 @@ package me.totalfreedom.totalfreedommod.banning;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import com.google.common.collect.Sets;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import me.totalfreedom.totalfreedommod.FreedomService;
|
||||
import me.totalfreedom.totalfreedommod.sql.ResultSetProvider;
|
||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||
import org.bukkit.entity.Player;
|
||||
@ -21,6 +12,8 @@ import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
import org.bukkit.event.player.PlayerLoginEvent;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public class BanManager extends FreedomService
|
||||
{
|
||||
|
||||
@ -34,38 +27,38 @@ public class BanManager extends FreedomService
|
||||
public void onStart()
|
||||
{
|
||||
bans.clear();
|
||||
try
|
||||
|
||||
plugin.sql.getBanList().whenComplete((result, throwable) ->
|
||||
{
|
||||
ResultSet banSet = plugin.sql.getBanList();
|
||||
if (throwable != null)
|
||||
{
|
||||
while (banSet.next())
|
||||
{
|
||||
String name = banSet.getString("name");
|
||||
UUID uuid = null;
|
||||
String strUUID = banSet.getString("uuid");
|
||||
if (strUUID != null)
|
||||
{
|
||||
uuid = UUID.fromString(strUUID);
|
||||
}
|
||||
List<String> ips = FUtil.stringToList(banSet.getString("ips"));
|
||||
String by = banSet.getString("by");
|
||||
Date at = new Date(banSet.getLong("at"));
|
||||
Date expires = new Date(banSet.getLong("expires"));
|
||||
String reason = banSet.getString("reason");
|
||||
Ban ban = new Ban(name, uuid, ips, by, at, expires, reason);
|
||||
bans.add(ban);
|
||||
}
|
||||
FLog.severe("Failed to load ban list: " + throwable.getMessage());
|
||||
return;
|
||||
}
|
||||
}
|
||||
catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to load ban list: " + e.getMessage());
|
||||
}
|
||||
|
||||
result.getAllRowsResultSet().forEach(row ->
|
||||
{
|
||||
ResultSetProvider banSet = ResultSetProvider.fromRow(row);
|
||||
String name = banSet.getString("name");
|
||||
UUID uuid = null;
|
||||
String strUUID = banSet.getString("uuid");
|
||||
if (strUUID != null)
|
||||
{
|
||||
uuid = UUID.fromString(strUUID);
|
||||
}
|
||||
List<String> ips = FUtil.stringToList(banSet.getString("ips"));
|
||||
String by = banSet.getString("by");
|
||||
Date at = new Date(banSet.getLong("at"));
|
||||
Date expires = new Date(banSet.getLong("expires"));
|
||||
String reason = banSet.getString("reason");
|
||||
Ban ban = new Ban(name, uuid, ips, by, at, expires, reason);
|
||||
bans.add(ban);
|
||||
// Remove expired bans, repopulate ipBans and nameBans,
|
||||
updateViews();
|
||||
|
||||
// Remove expired bans, repopulate ipBans and nameBans,
|
||||
updateViews();
|
||||
|
||||
FLog.info("Loaded " + ipBans.size() + " IP bans and " + nameBans.size() + " username bans.");
|
||||
FLog.info("Loaded " + ipBans.size() + " IP bans and " + nameBans.size() + " username bans.");
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -186,8 +179,7 @@ public class BanManager extends FreedomService
|
||||
if (ban.getUsername() != null && getByUsername(ban.getUsername()) != null)
|
||||
{
|
||||
removeBan(ban);
|
||||
}
|
||||
else
|
||||
} else
|
||||
{
|
||||
|
||||
for (String ip : ban.getIps())
|
||||
@ -202,8 +194,16 @@ public class BanManager extends FreedomService
|
||||
|
||||
if (bans.add(ban))
|
||||
{
|
||||
plugin.sql.addBan(ban);
|
||||
updateViews();
|
||||
plugin.sql.addBan(ban).whenComplete((result, ex) ->
|
||||
{
|
||||
if (ex != null)
|
||||
{
|
||||
FLog.severe(ex.getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
updateViews();
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
@ -212,8 +212,16 @@ public class BanManager extends FreedomService
|
||||
{
|
||||
if (bans.remove(ban))
|
||||
{
|
||||
plugin.sql.removeBan(ban);
|
||||
updateViews();
|
||||
plugin.sql.removeBan(ban).whenComplete((result, ex) ->
|
||||
{
|
||||
if (ex != null)
|
||||
{
|
||||
FLog.severe(ex.getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
updateViews();
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
@ -223,7 +231,13 @@ public class BanManager extends FreedomService
|
||||
int size = bans.size();
|
||||
bans.clear();
|
||||
updateViews();
|
||||
plugin.sql.truncate("bans");
|
||||
plugin.sql.truncate("bans").whenComplete((result, ex) ->
|
||||
{
|
||||
if (ex != null)
|
||||
{
|
||||
FLog.severe(ex.getMessage());
|
||||
}
|
||||
});
|
||||
return size;
|
||||
}
|
||||
|
||||
@ -267,8 +281,7 @@ public class BanManager extends FreedomService
|
||||
if (ban != null)
|
||||
{
|
||||
removeBan(ban);
|
||||
}
|
||||
else
|
||||
} else
|
||||
{
|
||||
ban = getByIp(FUtil.getIp(player));
|
||||
if (ban != null)
|
||||
@ -286,7 +299,13 @@ public class BanManager extends FreedomService
|
||||
if (ban.isExpired())
|
||||
{
|
||||
bans.remove(ban);
|
||||
plugin.sql.removeBan(ban);
|
||||
plugin.sql.removeBan(ban).whenComplete((result, ex) ->
|
||||
{
|
||||
if (ex != null)
|
||||
{
|
||||
FLog.severe(ex.getMessage());
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -314,4 +333,4 @@ public class BanManager extends FreedomService
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -5,6 +5,7 @@ import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
|
||||
import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
|
||||
import me.totalfreedom.totalfreedommod.command.handling.SourceType;
|
||||
import me.totalfreedom.totalfreedommod.player.PlayerData;
|
||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||
import me.totalfreedom.totalfreedommod.rank.GroupProvider;
|
||||
import me.totalfreedom.totalfreedommod.rank.Hierarchy;
|
||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||
@ -32,13 +33,12 @@ public class Command_mbconfig extends FreedomCommand
|
||||
|
||||
switch (args[0])
|
||||
{
|
||||
case "list":
|
||||
case "list" ->
|
||||
{
|
||||
msg("Master Builders: " + StringUtils.join(plugin.pl.getMasterBuilderNames(), ", "), ChatColor.GOLD);
|
||||
return true;
|
||||
}
|
||||
|
||||
case "clearips":
|
||||
case "clearips" ->
|
||||
{
|
||||
if (args.length > 1)
|
||||
{
|
||||
@ -61,13 +61,23 @@ public class Command_mbconfig extends FreedomCommand
|
||||
int counter = data.getIps().size() - 1;
|
||||
data.clearIps();
|
||||
data.addIp(FUtil.getIp(playerSender));
|
||||
plugin.sql.addPlayer(data);
|
||||
msg(counter + " IPs removed.");
|
||||
msg(data.getIps().get(0) + " is now your only IP address");
|
||||
FUtil.adminAction(sender.getName(), "Clearing my IPs", true);
|
||||
plugin.sql.addPlayer(data).whenComplete((result, ex) ->
|
||||
{
|
||||
if (ex != null)
|
||||
{
|
||||
FLog.severe(ex.getMessage());
|
||||
msgNew("<red>Failed to clear IPs!");
|
||||
return;
|
||||
}
|
||||
|
||||
msg(counter + " IPs removed.");
|
||||
msg(data.getIps().get(0) + " is now your only IP address");
|
||||
FUtil.adminAction(sender.getName(), "Clearing my IPs", true);
|
||||
});
|
||||
|
||||
return true;
|
||||
}
|
||||
case "clearip":
|
||||
case "clearip" ->
|
||||
{
|
||||
if (args.length < 2)
|
||||
{
|
||||
@ -95,12 +105,21 @@ public class Command_mbconfig extends FreedomCommand
|
||||
return true;
|
||||
}
|
||||
data.removeIp(args[1]);
|
||||
plugin.sql.addPlayer(data);
|
||||
msg("Removed IP " + args[1]);
|
||||
msg("Current IPs: " + StringUtils.join(data.getIps(), ", "));
|
||||
plugin.sql.addPlayer(data).whenComplete((result, ex) ->
|
||||
{
|
||||
if (ex != null)
|
||||
{
|
||||
FLog.severe(ex.getMessage());
|
||||
msgNew("<red>Failed to remove IP!");
|
||||
return;
|
||||
}
|
||||
|
||||
msg("Removed IP " + args[1]);
|
||||
msg("Current IPs: " + StringUtils.join(data.getIps(), ", "));
|
||||
});
|
||||
return true;
|
||||
}
|
||||
case "add":
|
||||
case "add" ->
|
||||
{
|
||||
if (args.length < 2)
|
||||
{
|
||||
@ -135,7 +154,7 @@ public class Command_mbconfig extends FreedomCommand
|
||||
}
|
||||
return true;
|
||||
}
|
||||
case "remove":
|
||||
case "remove" ->
|
||||
{
|
||||
if (args.length < 2)
|
||||
{
|
||||
@ -164,7 +183,7 @@ public class Command_mbconfig extends FreedomCommand
|
||||
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
default ->
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
@ -4,6 +4,7 @@ import com.google.common.base.Strings;
|
||||
import com.google.common.collect.Lists;
|
||||
import me.totalfreedom.totalfreedommod.api.ShopItem;
|
||||
import me.totalfreedom.totalfreedommod.util.FConverter;
|
||||
import me.totalfreedom.totalfreedommod.sql.ResultSetProvider;
|
||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||
import net.kyori.adventure.text.Component;
|
||||
@ -42,7 +43,7 @@ public class PlayerData
|
||||
|
||||
private Boolean inspect = false;
|
||||
|
||||
public PlayerData(ResultSet resultSet)
|
||||
public PlayerData(ResultSetProvider resultSet)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -80,7 +81,7 @@ public class PlayerData
|
||||
loginMessage = tempLoginMessage;
|
||||
//--
|
||||
inspect = resultSet.getBoolean("inspect");
|
||||
} catch (SQLException e)
|
||||
} catch (Throwable e)
|
||||
{
|
||||
FLog.severe("Failed to load player: " + e.getMessage());
|
||||
e.printStackTrace();
|
||||
|
@ -5,14 +5,17 @@ import me.totalfreedom.totalfreedommod.FreedomService;
|
||||
import me.totalfreedom.totalfreedommod.admin.Admin;
|
||||
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
||||
import me.totalfreedom.totalfreedommod.rank.GroupProvider;
|
||||
import me.totalfreedom.totalfreedommod.sql.ResultSetProvider;
|
||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
|
||||
public class PlayerList extends FreedomService
|
||||
{
|
||||
@ -42,24 +45,18 @@ public class PlayerList extends FreedomService
|
||||
|
||||
public void loadMasterBuilders()
|
||||
{
|
||||
ResultSet resultSet = plugin.sql.getMasterBuilders();
|
||||
|
||||
if (resultSet == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
while (resultSet.next())
|
||||
{
|
||||
PlayerData playerData = load(resultSet);
|
||||
dataMap.put(playerData.getUuid(), playerData);
|
||||
plugin.sql.getMasterBuilders().whenComplete((result, throwable) -> {
|
||||
if (throwable != null) {
|
||||
FLog.severe("Failed to load master builders: " + throwable.getMessage());
|
||||
return;
|
||||
}
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to parse master builders: " + e.getMessage());
|
||||
}
|
||||
|
||||
result.getAllRowsResultSet().forEach(row ->
|
||||
{
|
||||
PlayerData playerData = load(ResultSetProvider.fromRow(row));
|
||||
dataMap.put(playerData.getUuid(), playerData);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
public String getIp(OfflinePlayer player)
|
||||
@ -91,10 +88,7 @@ public class PlayerList extends FreedomService
|
||||
{
|
||||
PlayerData data = getData(name);
|
||||
|
||||
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())
|
||||
&& !isTelnetMasterBuilder(data)
|
||||
&& !ConfigEntry.HOST_SENDER_NAMES.getStringList().contains(name.toLowerCase());
|
||||
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()) && !isTelnetMasterBuilder(data) && !ConfigEntry.HOST_SENDER_NAMES.getStringList().contains(name.toLowerCase());
|
||||
}
|
||||
|
||||
public boolean isTelnetMasterBuilder(PlayerData playerData)
|
||||
@ -120,20 +114,61 @@ public class PlayerList extends FreedomService
|
||||
|
||||
public PlayerData loadByUuid(UUID uuid)
|
||||
{
|
||||
return load(plugin.sql.getPlayerByUuid(uuid));
|
||||
AtomicReference<PlayerData> futureData = new AtomicReference<>(null);
|
||||
AtomicBoolean loaded = new AtomicBoolean(false);
|
||||
plugin.sql.getPlayerByUuid(uuid).thenApplyAsync(result -> {
|
||||
futureData.set(load(result));
|
||||
return futureData;
|
||||
}).whenComplete((result, throwable) -> {
|
||||
if (throwable != null) {
|
||||
FLog.severe("Failed to load player by UUID: " + throwable.getMessage());
|
||||
return;
|
||||
}
|
||||
loaded.set(true);
|
||||
});
|
||||
|
||||
while (!loaded.get()) // Wait for the future to complete.
|
||||
{
|
||||
if (futureData.get() != null) { // This will break the loop if the result is available before the boolean is updated.
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return futureData.get();
|
||||
}
|
||||
|
||||
public PlayerData loadByIp(String ip)
|
||||
{
|
||||
return load(plugin.sql.getPlayerByIp(ip));
|
||||
AtomicReference<PlayerData> futureData = new AtomicReference<>(null);
|
||||
AtomicBoolean loaded = new AtomicBoolean(false);
|
||||
plugin.sql.getPlayerByIp(ip).thenApplyAsync(result -> {
|
||||
futureData.set(load(result));
|
||||
return futureData;
|
||||
}).whenComplete((result, throwable) -> {
|
||||
if (throwable != null) {
|
||||
FLog.severe("Failed to load player by IP: " + throwable.getMessage());
|
||||
return;
|
||||
}
|
||||
loaded.set(true);
|
||||
});
|
||||
|
||||
while (!loaded.get())
|
||||
{
|
||||
if (futureData.get() != null) {
|
||||
break;
|
||||
}
|
||||
} // Wait for the future to complete.
|
||||
|
||||
return futureData.get();
|
||||
}
|
||||
|
||||
public PlayerData load(ResultSet resultSet)
|
||||
public PlayerData load(ResultSetProvider resultSet)
|
||||
{
|
||||
if (resultSet == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
return new PlayerData(resultSet);
|
||||
}
|
||||
|
||||
@ -147,21 +182,27 @@ public class PlayerList extends FreedomService
|
||||
|
||||
public void save(PlayerData player)
|
||||
{
|
||||
try
|
||||
{
|
||||
ResultSet currentSave = plugin.sql.getPlayerByUuid(player.getUuid());
|
||||
plugin.sql.getPlayerByUuid(player.getUuid()).whenComplete((result, throwable) -> {
|
||||
if (throwable != null) {
|
||||
FLog.severe("Failed to save player: " + throwable.getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
for (Map.Entry<String, Object> entry : player.toSQLStorable().entrySet())
|
||||
{
|
||||
Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
|
||||
Object storedValue = plugin.sql.getValue(result, entry.getKey(), entry.getValue());
|
||||
if (storedValue != null && !storedValue.equals(entry.getValue()) || storedValue == null && entry.getValue() != null || entry.getValue() == null)
|
||||
{
|
||||
plugin.sql.setPlayerValue(player, entry.getKey(), entry.getValue());
|
||||
plugin.sql.setPlayerValue(player, entry.getKey(), entry.getValue()).whenComplete((result1, ex) ->
|
||||
{
|
||||
if (ex != null)
|
||||
{
|
||||
FLog.severe("Failed to save player: " + ex.getMessage());
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to save player: " + e.getMessage());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public PlayerData getData(Player player)
|
||||
@ -189,7 +230,11 @@ public class PlayerList extends FreedomService
|
||||
dataMap.put(player.getUniqueId(), playerData);
|
||||
|
||||
// Send it to the SQL database.
|
||||
plugin.sql.addPlayer(playerData);
|
||||
plugin.sql.addPlayer(playerData).whenComplete((result, throwable) -> {
|
||||
if (throwable != null) {
|
||||
FLog.severe(throwable.getMessage());
|
||||
}
|
||||
});
|
||||
|
||||
// Returns it
|
||||
return playerData;
|
||||
|
@ -0,0 +1,93 @@
|
||||
package me.totalfreedom.totalfreedommod.sql;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class ResultSetProvider
|
||||
{
|
||||
List<Map<String, Object>> allRowsResultSet = new ArrayList<>();
|
||||
|
||||
Map<String, Object> singularResultMap = new HashMap<>();
|
||||
|
||||
private ResultSetProvider(Map<String, Object> singularResultMap)
|
||||
{
|
||||
this.singularResultMap = singularResultMap;
|
||||
}
|
||||
|
||||
private ResultSetProvider(ResultSet resultSet, boolean allRows) throws SQLException
|
||||
{
|
||||
if (allRows)
|
||||
{
|
||||
while (resultSet.next())
|
||||
{
|
||||
allRowsResultSet.add(mapResultSet(resultSet));
|
||||
}
|
||||
} else
|
||||
{
|
||||
if (resultSet.next())
|
||||
{
|
||||
this.singularResultMap = mapResultSet(resultSet);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static ResultSetProvider provideAllRows(ResultSet resultSet) throws SQLException
|
||||
{
|
||||
return new ResultSetProvider(resultSet, true);
|
||||
}
|
||||
|
||||
public static ResultSetProvider provideSpecificRow(ResultSet resultSet) throws SQLException
|
||||
{
|
||||
return new ResultSetProvider(resultSet, false);
|
||||
}
|
||||
|
||||
public static ResultSetProvider fromRow(Map<String, Object> row)
|
||||
{
|
||||
return new ResultSetProvider(row);
|
||||
}
|
||||
|
||||
public List<Map<String, Object>> getAllRowsResultSet()
|
||||
{
|
||||
return allRowsResultSet;
|
||||
}
|
||||
|
||||
private Map<String, Object> mapResultSet(ResultSet rs) throws SQLException
|
||||
{
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
while (rs.next())
|
||||
{
|
||||
int columns = rs.getMetaData().getColumnCount();
|
||||
for (int i = 1; i <= columns; i++)
|
||||
{
|
||||
String columnName = rs.getMetaData().getColumnName(i);
|
||||
Object columnValue = rs.getObject(i);
|
||||
result.put(columnName, columnValue);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public String getString(String key)
|
||||
{
|
||||
return (String) singularResultMap.get(key);
|
||||
}
|
||||
|
||||
public int getInt(String key)
|
||||
{
|
||||
return (int) singularResultMap.get(key);
|
||||
}
|
||||
|
||||
public boolean getBoolean(String key)
|
||||
{
|
||||
return (boolean) singularResultMap.get(key);
|
||||
}
|
||||
|
||||
public long getLong(String key)
|
||||
{
|
||||
return (long) singularResultMap.get(key);
|
||||
}
|
||||
}
|
@ -10,9 +10,12 @@ import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||
import java.sql.*;
|
||||
import java.text.MessageFormat;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.CompletionException;
|
||||
|
||||
public class SQLite extends FreedomService
|
||||
{
|
||||
public static final String TABLE_CHECK_FAILURE = "Failed to check tables on database: ";
|
||||
private final String FILE_NAME = "database.db";
|
||||
|
||||
private Connection connection;
|
||||
@ -21,7 +24,13 @@ public class SQLite extends FreedomService
|
||||
public void onStart()
|
||||
{
|
||||
connect();
|
||||
checkTables();
|
||||
checkTables().whenComplete((result, throwable) ->
|
||||
{
|
||||
if (throwable != null)
|
||||
{
|
||||
FLog.severe(TABLE_CHECK_FAILURE + throwable.getMessage());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -56,344 +65,528 @@ public class SQLite extends FreedomService
|
||||
}
|
||||
}
|
||||
|
||||
public void checkTables()
|
||||
public CompletableFuture<Void> checkTables()
|
||||
{
|
||||
try
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
DatabaseMetaData meta = connection.getMetaData();
|
||||
if (tableNotExists(meta, "bans"))
|
||||
try
|
||||
{
|
||||
createBanTable();
|
||||
return connection.getMetaData();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
throw new CompletionException(TABLE_CHECK_FAILURE, e);
|
||||
}
|
||||
}).thenAcceptAsync(meta ->
|
||||
{
|
||||
futureBansTable(meta);
|
||||
|
||||
futureAdminsTable(meta);
|
||||
|
||||
futurePlayersTable(meta);
|
||||
});
|
||||
}
|
||||
|
||||
private void futurePlayersTable(DatabaseMetaData meta)
|
||||
{
|
||||
tableNotExists(meta, "players").whenComplete((result, throwable) ->
|
||||
{
|
||||
if (throwable != null)
|
||||
{
|
||||
FLog.severe(throwable.getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
if (tableNotExists(meta, "admins"))
|
||||
if (result)
|
||||
{
|
||||
createAdminsTable();
|
||||
createPlayersTable().whenComplete((result2, throwable2) ->
|
||||
{
|
||||
if (throwable2 != null)
|
||||
{
|
||||
FLog.severe(throwable2.getMessage());
|
||||
}
|
||||
});
|
||||
}
|
||||
if (tableNotExists(meta, "players"))
|
||||
});
|
||||
}
|
||||
|
||||
private void futureAdminsTable(DatabaseMetaData meta)
|
||||
{
|
||||
tableNotExists(meta, "admins").whenComplete((result, throwable) ->
|
||||
{
|
||||
if (throwable != null)
|
||||
{
|
||||
createPlayersTable();
|
||||
FLog.severe(throwable.getMessage());
|
||||
return;
|
||||
}
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to check tables on database: " + e.getMessage());
|
||||
}
|
||||
|
||||
if (result)
|
||||
{
|
||||
createAdminsTable().whenComplete((result2, throwable2) ->
|
||||
{
|
||||
if (throwable2 != null)
|
||||
{
|
||||
FLog.severe(throwable2.getMessage());
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void createPlayersTable()
|
||||
private void futureBansTable(DatabaseMetaData meta)
|
||||
{
|
||||
try (PreparedStatement statement = connection.prepareStatement("CREATE TABLE `players` (`uuid` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `notes` VARCHAR, `tag` VARCHAR, `discord_id` VARCHAR, `master_builder` 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);"))
|
||||
tableNotExists(meta, "bans").whenComplete((result, throwable) ->
|
||||
{
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to create the players table: " + e.getMessage());
|
||||
}
|
||||
if (throwable != null)
|
||||
{
|
||||
FLog.severe(throwable.getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
if (Boolean.TRUE.equals(result)) // using primitive for some reason... ask SonarLint.
|
||||
{
|
||||
createBanTable().whenComplete((result2, throwable2) ->
|
||||
{
|
||||
if (throwable2 != null)
|
||||
{
|
||||
FLog.severe(throwable2.getMessage());
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void createAdminsTable()
|
||||
private CompletableFuture<Void> createPlayersTable()
|
||||
{
|
||||
try (PreparedStatement statement = connection.prepareStatement("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);"))
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to create the admins table: " + e.getMessage());
|
||||
}
|
||||
try (PreparedStatement statement = connection.prepareStatement("CREATE TABLE `players` (`uuid` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `notes` VARCHAR, `tag` VARCHAR, `discord_id` VARCHAR, `master_builder` 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);"))
|
||||
{
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
throw new CompletionException("Failed to create the players table.", e);
|
||||
}
|
||||
return null;
|
||||
});
|
||||
}
|
||||
|
||||
private void createBanTable()
|
||||
private CompletableFuture<Void> createAdminsTable()
|
||||
{
|
||||
try (PreparedStatement statement = connection.prepareStatement("CREATE TABLE `bans` (`name` VARCHAR, `uuid` VARCHAR, `ips` VARCHAR, `by` VARCHAR NOT NULL, `at` LONG NOT NULL, `expires` LONG, `reason` VARCHAR);"))
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to create the bans table: " + e.getMessage());
|
||||
}
|
||||
try (PreparedStatement statement = connection.prepareStatement("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);"))
|
||||
{
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
throw new CompletionException("Failed to create the admins table.", e);
|
||||
}
|
||||
return null;
|
||||
});
|
||||
}
|
||||
|
||||
public void truncate(String table)
|
||||
private CompletableFuture<Void> createBanTable()
|
||||
{
|
||||
try (PreparedStatement statement = connection.prepareStatement("DELETE FROM ?"))
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
statement.setString(1, table);
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to truncate " + table + ": " + e.getMessage());
|
||||
}
|
||||
try (PreparedStatement statement = connection.prepareStatement("CREATE TABLE `bans` (`name` VARCHAR, `uuid` VARCHAR, `ips` VARCHAR, `by` VARCHAR NOT NULL, `at` LONG NOT NULL, `expires` LONG, `reason` VARCHAR);"))
|
||||
{
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
throw new CompletionException("Failed to create the bans table.", e);
|
||||
}
|
||||
return null;
|
||||
});
|
||||
}
|
||||
|
||||
public ResultSet getBanList() throws SQLException
|
||||
public CompletableFuture<Void> truncate(String table)
|
||||
{
|
||||
return connection.prepareStatement("SELECT * FROM bans").executeQuery();
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
try (PreparedStatement statement = connection.prepareStatement("DELETE FROM ?"))
|
||||
{
|
||||
statement.setString(1, table);
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to truncate " + table + ": " + e.getMessage());
|
||||
}
|
||||
return null;
|
||||
});
|
||||
}
|
||||
|
||||
public ResultSet getAdminList() throws SQLException
|
||||
public CompletableFuture<ResultSetProvider> getBanList()
|
||||
{
|
||||
return connection.prepareStatement("SELECT * FROM admins").executeQuery();
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
ResultSetProvider provider;
|
||||
try (PreparedStatement statement = connection.prepareStatement("SELECT * FROM bans"))
|
||||
{
|
||||
try (ResultSet result = statement.executeQuery())
|
||||
{
|
||||
provider = ResultSetProvider.provideAllRows(result);
|
||||
}
|
||||
} catch (SQLException e)
|
||||
{
|
||||
throw new CompletionException("Failed to get ban list.", e);
|
||||
}
|
||||
return provider;
|
||||
});
|
||||
}
|
||||
|
||||
public void setAdminValue(Admin admin, String key, Object value)
|
||||
public CompletableFuture<ResultSetProvider> getAdminList()
|
||||
{
|
||||
try
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
Object[] data = {key, admin.getUuid()};
|
||||
PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET {0}=? WHERE uuid=''{1}''", data));
|
||||
statement = setUnknownType(statement, 1, value);
|
||||
statement.executeUpdate();
|
||||
ResultSetProvider provider;
|
||||
try (PreparedStatement statement = connection.prepareStatement("SELECT * FROM bans"))
|
||||
{
|
||||
try (ResultSet result = statement.executeQuery())
|
||||
{
|
||||
provider = ResultSetProvider.provideAllRows(result);
|
||||
}
|
||||
} catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException("Failed to get admin list.", ex);
|
||||
}
|
||||
return provider;
|
||||
});
|
||||
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to update admin value:");
|
||||
FLog.severe(e);
|
||||
}
|
||||
}
|
||||
|
||||
public void setPlayerValue(PlayerData player, String key, Object value)
|
||||
public CompletableFuture<Void> setAdminValue(Admin admin, String key, Object value)
|
||||
{
|
||||
try
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
Object[] data = {key, player.getUuid()};
|
||||
PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE players SET {0}=? WHERE uuid=''{1}''", data));
|
||||
statement = setUnknownType(statement, 1, value);
|
||||
statement.executeUpdate();
|
||||
try
|
||||
{
|
||||
Object[] data = {key, admin.getUuid()};
|
||||
PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET {0}=? WHERE uuid=''{1}''", data));
|
||||
setUnknownType(statement, 1, value).whenComplete((result, throwable) ->
|
||||
{
|
||||
if (throwable != null)
|
||||
{
|
||||
FLog.severe(throwable.getMessage());
|
||||
}
|
||||
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to update player value: " + e.getMessage());
|
||||
}
|
||||
try
|
||||
{
|
||||
result.executeUpdate();
|
||||
} catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException("Failed to update admin value.", ex);
|
||||
}
|
||||
});
|
||||
} catch (SQLException e)
|
||||
{
|
||||
throw new CompletionException("Failed to update admin value.", e);
|
||||
}
|
||||
return null;
|
||||
});
|
||||
}
|
||||
|
||||
public PreparedStatement setUnknownType(PreparedStatement statement, int index, Object value) throws SQLException
|
||||
public CompletableFuture<Void> setPlayerValue(PlayerData player, String key, Object value)
|
||||
{
|
||||
if (value == null)
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
statement.setString(index, null);
|
||||
} else if (value.getClass().equals(String.class))
|
||||
{
|
||||
String v = (String) value;
|
||||
statement.setString(index, v);
|
||||
} else if (value.getClass().equals(Integer.class))
|
||||
{
|
||||
int v = (int) value;
|
||||
statement.setInt(index, v);
|
||||
} else if (value.getClass().equals(Boolean.class))
|
||||
{
|
||||
boolean v = (boolean) value;
|
||||
statement.setBoolean(index, v);
|
||||
} else if (value.getClass().equals(Long.class))
|
||||
{
|
||||
long v = (long) value;
|
||||
statement.setLong(index, v);
|
||||
}
|
||||
return statement;
|
||||
try
|
||||
{
|
||||
Object[] data = {key, player.getUuid()};
|
||||
PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE players SET {0}=? WHERE uuid=''{1}''", data));
|
||||
setUnknownType(statement, 1, value).whenComplete((result, throwable) ->
|
||||
{
|
||||
if (throwable != null)
|
||||
{
|
||||
FLog.severe(throwable.getMessage());
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
result.executeUpdate();
|
||||
} catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException("Failed to update player value.", ex);
|
||||
}
|
||||
});
|
||||
} catch (SQLException e)
|
||||
{
|
||||
throw new CompletionException("Failed to update player value.", e);
|
||||
}
|
||||
return null;
|
||||
});
|
||||
}
|
||||
|
||||
public Object getValue(ResultSet resultSet, String key, Object value) throws SQLException
|
||||
public CompletableFuture<PreparedStatement> setUnknownType(PreparedStatement statement, int index, Object value)
|
||||
{
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
try
|
||||
{
|
||||
if (value == null)
|
||||
{
|
||||
statement.setString(index, null);
|
||||
} else if (value.getClass().equals(String.class))
|
||||
{
|
||||
String v = (String) value;
|
||||
statement.setString(index, v);
|
||||
} else if (value.getClass().equals(Integer.class))
|
||||
{
|
||||
int v = (int) value;
|
||||
statement.setInt(index, v);
|
||||
} else if (value.getClass().equals(Boolean.class))
|
||||
{
|
||||
boolean v = (boolean) value;
|
||||
statement.setBoolean(index, v);
|
||||
} else if (value.getClass().equals(Long.class))
|
||||
{
|
||||
long v = (long) value;
|
||||
statement.setLong(index, v);
|
||||
}
|
||||
return statement;
|
||||
} catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException("Failed to set unknown type.", ex);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public Object getValue(ResultSetProvider provider, String key, Object value)
|
||||
{
|
||||
Object result = null;
|
||||
if (value instanceof String)
|
||||
{
|
||||
result = resultSet.getString(key);
|
||||
result = provider.getString(key);
|
||||
} else if (value instanceof Integer)
|
||||
{
|
||||
result = resultSet.getInt(key);
|
||||
result = provider.getInt(key);
|
||||
} else if (value instanceof Boolean)
|
||||
{
|
||||
result = resultSet.getObject(key);
|
||||
result = provider.getBoolean(key);
|
||||
} else if (value instanceof Long)
|
||||
{
|
||||
result = resultSet.getLong(key);
|
||||
result = provider.getLong(key);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public void addAdmin(Admin admin)
|
||||
public CompletableFuture<Void> addAdmin(Admin admin)
|
||||
{
|
||||
|
||||
try (PreparedStatement statement = connection.prepareStatement("INSERT INTO admins VALUES (?, ?, ?, ?, ?, ?, ?, ?)"))
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
statement.setString(1, admin.getUuid().toString());
|
||||
statement.setString(2, FUtil.listToString(admin.getIps()));
|
||||
statement.setString(3, admin.getRank().toString());
|
||||
statement.setBoolean(4, admin.isActive());
|
||||
statement.setLong(5, admin.getLastLogin().getTime());
|
||||
statement.setBoolean(6, admin.getCommandSpy());
|
||||
statement.setBoolean(7, admin.getPotionSpy());
|
||||
statement.setString(8, admin.getAcFormat());
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to add admin:");
|
||||
FLog.severe(e);
|
||||
}
|
||||
}
|
||||
|
||||
public void addPlayer(PlayerData player)
|
||||
{
|
||||
try (PreparedStatement statement = connection.prepareStatement("INSERT INTO players VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"))
|
||||
{
|
||||
statement.setString(1, player.getUuid().toString());
|
||||
statement.setString(2, FUtil.listToString(player.getIps()));
|
||||
statement.setString(3, FUtil.listToString(player.getNotes()));
|
||||
statement.setString(4, FUtil.miniMessage(player.getTag()));
|
||||
statement.setString(5, player.getDiscordID());
|
||||
statement.setBoolean(6, player.isMasterBuilder());
|
||||
statement.setString(7, player.getRideMode().name());
|
||||
statement.setInt(8, player.getCoins());
|
||||
statement.setString(9, FUtil.listToString(player.getItems()));
|
||||
statement.setInt(10, player.getTotalVotes());
|
||||
statement.setBoolean(11, player.doesDisplayDiscord());
|
||||
statement.setString(12, player.getLoginMessage());
|
||||
statement.setBoolean(13, player.hasInspection());
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to add player:");
|
||||
FLog.severe(e);
|
||||
}
|
||||
}
|
||||
|
||||
public ResultSet getAdminByUuid(UUID uuid)
|
||||
{
|
||||
try
|
||||
{
|
||||
PreparedStatement statement = connection.prepareStatement("SELECT * FROM admins WHERE uuid=?");
|
||||
statement.setString(1, uuid.toString());
|
||||
ResultSet resultSet = statement.executeQuery();
|
||||
if (resultSet.next())
|
||||
try (PreparedStatement statement = connection.prepareStatement("INSERT INTO admins VALUES (?, ?, ?, ?, ?, ?, ?, ?)"))
|
||||
{
|
||||
return resultSet;
|
||||
}
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to get admin by name:");
|
||||
FLog.severe(e);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public ResultSet getPlayerByUuid(UUID uuid)
|
||||
{
|
||||
try
|
||||
{
|
||||
PreparedStatement statement = connection.prepareStatement("SELECT * FROM players WHERE uuid=?");
|
||||
statement.setString(1, uuid.toString());
|
||||
ResultSet resultSet = statement.executeQuery();
|
||||
|
||||
if (resultSet.next())
|
||||
statement.setString(1, admin.getUuid().toString());
|
||||
statement.setString(2, FUtil.listToString(admin.getIps()));
|
||||
statement.setString(3, admin.getRank().toString());
|
||||
statement.setBoolean(4, admin.isActive());
|
||||
statement.setLong(5, admin.getLastLogin().getTime());
|
||||
statement.setBoolean(6, admin.getCommandSpy());
|
||||
statement.setBoolean(7, admin.getPotionSpy());
|
||||
statement.setString(8, admin.getAcFormat());
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
return resultSet;
|
||||
throw new CompletionException("Failed to add admin.", e);
|
||||
}
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to get player by UUID:");
|
||||
FLog.severe(e);
|
||||
}
|
||||
return null;
|
||||
});
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public ResultSet getMasterBuilders()
|
||||
public CompletableFuture<Void> addPlayer(PlayerData player)
|
||||
{
|
||||
try
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
return connection.prepareStatement("SELECT * FROM players WHERE master_builder=true").executeQuery();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to get Master Builders:");
|
||||
FLog.severe(e);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public ResultSet getPlayerByIp(String ip)
|
||||
{
|
||||
try
|
||||
{
|
||||
PreparedStatement statement = connection.prepareStatement("SELECT * FROM players WHERE ips LIKE %?%");
|
||||
statement.setString(1, ip);
|
||||
ResultSet resultSet = statement.executeQuery();
|
||||
if (resultSet.next())
|
||||
try (PreparedStatement statement = connection.prepareStatement("INSERT INTO players VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"))
|
||||
{
|
||||
return resultSet;
|
||||
}
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to get player by ip:");
|
||||
FLog.severe(e);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public void removeAdmin(Admin admin)
|
||||
{
|
||||
try (PreparedStatement statement = connection.prepareStatement("DELETE FROM admins where name=?"))
|
||||
{
|
||||
statement.setString(1, admin.getName());
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to remove admin:");
|
||||
FLog.severe(e);
|
||||
}
|
||||
}
|
||||
|
||||
public void addBan(Ban ban)
|
||||
{
|
||||
try (PreparedStatement statement = connection.prepareStatement("INSERT INTO bans VALUES (?, ?, ?, ?, ?, ?, ?)"))
|
||||
{
|
||||
statement.setString(1, ban.getUsername());
|
||||
String uuid = null;
|
||||
if (ban.hasUUID())
|
||||
statement.setString(1, player.getUuid().toString());
|
||||
statement.setString(2, FUtil.listToString(player.getIps()));
|
||||
statement.setString(3, FUtil.listToString(player.getNotes()));
|
||||
statement.setString(4, FUtil.miniMessage(player.getTag()));
|
||||
statement.setString(5, player.getDiscordID());
|
||||
statement.setBoolean(6, player.isMasterBuilder());
|
||||
statement.setString(7, player.getRideMode().name());
|
||||
statement.setInt(8, player.getCoins());
|
||||
statement.setString(9, FUtil.listToString(player.getItems()));
|
||||
statement.setInt(10, player.getTotalVotes());
|
||||
statement.setBoolean(11, player.doesDisplayDiscord());
|
||||
statement.setString(12, player.getLoginMessage());
|
||||
statement.setBoolean(13, player.hasInspection());
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
uuid = ban.getUuid().toString();
|
||||
throw new CompletionException("Failed to add player.", e);
|
||||
}
|
||||
statement.setString(2, uuid);
|
||||
statement.setString(3, FUtil.listToString(ban.getIps()));
|
||||
statement.setString(4, ban.getBy());
|
||||
statement.setLong(5, ban.getAt().getTime());
|
||||
statement.setLong(6, ban.getExpiryUnix());
|
||||
statement.setString(7, ban.getReason());
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to add ban: " + e.getMessage());
|
||||
}
|
||||
return null;
|
||||
});
|
||||
}
|
||||
|
||||
public void removeBan(Ban ban)
|
||||
public CompletableFuture<ResultSetProvider> getAdminByUuid(UUID uuid)
|
||||
{
|
||||
try
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
try (PreparedStatement statement = connection.prepareStatement("DELETE FROM bans WHERE name=?"))
|
||||
ResultSetProvider provider;
|
||||
try (PreparedStatement statement = connection.prepareStatement("SELECT * FROM admins WHERE uuid=?"))
|
||||
{
|
||||
statement.setString(1, uuid.toString());
|
||||
try (ResultSet set = statement.executeQuery())
|
||||
{
|
||||
provider = ResultSetProvider.provideSpecificRow(set);
|
||||
}
|
||||
} catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException(ex);
|
||||
}
|
||||
return provider;
|
||||
});
|
||||
}
|
||||
|
||||
public CompletableFuture<ResultSetProvider> getPlayerByUuid(UUID uuid)
|
||||
{
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
ResultSetProvider provider;
|
||||
try (PreparedStatement statement = connection.prepareStatement("SELECT * FROM players WHERE uuid=?"))
|
||||
{
|
||||
statement.setString(1, uuid.toString());
|
||||
try (ResultSet set = statement.executeQuery())
|
||||
{
|
||||
provider = ResultSetProvider.provideSpecificRow(set);
|
||||
}
|
||||
} catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException(ex);
|
||||
}
|
||||
|
||||
return provider;
|
||||
});
|
||||
}
|
||||
|
||||
public CompletableFuture<ResultSetProvider> getMasterBuilders()
|
||||
{
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
ResultSetProvider provider;
|
||||
try (PreparedStatement statement = connection.prepareStatement("SELECT * FROM players WHERE master_builder=true"))
|
||||
{
|
||||
try (ResultSet result = statement.executeQuery())
|
||||
{
|
||||
provider = ResultSetProvider.provideAllRows(result);
|
||||
}
|
||||
} catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException(ex);
|
||||
}
|
||||
return provider;
|
||||
});
|
||||
}
|
||||
|
||||
public CompletableFuture<ResultSetProvider> getPlayerByIp(String ip)
|
||||
{
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
ResultSetProvider provider;
|
||||
try (PreparedStatement statement = connection.prepareStatement("SELECT * FROM players WHERE ips LIKE %?%"))
|
||||
{
|
||||
statement.setString(1, ip);
|
||||
try (ResultSet set = statement.executeQuery())
|
||||
{
|
||||
provider = ResultSetProvider.provideSpecificRow(set);
|
||||
}
|
||||
} catch (SQLException e)
|
||||
{
|
||||
throw new CompletionException(e);
|
||||
}
|
||||
|
||||
return provider;
|
||||
});
|
||||
}
|
||||
|
||||
public CompletableFuture<Void> removeAdmin(Admin admin)
|
||||
{
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
try (PreparedStatement statement = connection.prepareStatement("DELETE FROM admins where name=?"))
|
||||
{
|
||||
statement.setString(1, admin.getName());
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
throw new CompletionException("Failed to remove admin.", e);
|
||||
}
|
||||
return null;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
public CompletableFuture<Void> addBan(Ban ban)
|
||||
{
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
try (PreparedStatement statement = connection.prepareStatement("INSERT INTO bans VALUES (?, ?, ?, ?, ?, ?, ?)"))
|
||||
{
|
||||
statement.setString(1, ban.getUsername());
|
||||
statement.executeUpdate();
|
||||
}
|
||||
|
||||
for (String ip : ban.getIps())
|
||||
{
|
||||
try (PreparedStatement statement = connection.prepareStatement("DELETE FROM bans WHERE ips LIKE %?%"))
|
||||
String uuid = null;
|
||||
if (ban.hasUUID())
|
||||
{
|
||||
statement.setString(1, ip);
|
||||
uuid = ban.getUuid().toString();
|
||||
}
|
||||
statement.setString(2, uuid);
|
||||
statement.setString(3, FUtil.listToString(ban.getIps()));
|
||||
statement.setString(4, ban.getBy());
|
||||
statement.setLong(5, ban.getAt().getTime());
|
||||
statement.setLong(6, ban.getExpiryUnix());
|
||||
statement.setString(7, ban.getReason());
|
||||
statement.executeUpdate();
|
||||
} catch (SQLException e)
|
||||
{
|
||||
throw new CompletionException("Failed to add ban.", e);
|
||||
}
|
||||
return null;
|
||||
});
|
||||
}
|
||||
|
||||
public CompletableFuture<Void> removeBan(Ban ban)
|
||||
{
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
try
|
||||
{
|
||||
try (PreparedStatement statement = connection.prepareStatement("DELETE FROM bans WHERE name=?"))
|
||||
{
|
||||
statement.setString(1, ban.getUsername());
|
||||
statement.executeUpdate();
|
||||
}
|
||||
|
||||
for (String ip : ban.getIps())
|
||||
{
|
||||
try (PreparedStatement statement = connection.prepareStatement("DELETE FROM bans WHERE ips LIKE %?%"))
|
||||
{
|
||||
statement.setString(1, ip);
|
||||
statement.executeUpdate();
|
||||
}
|
||||
}
|
||||
} catch (SQLException e)
|
||||
{
|
||||
throw new CompletionException("Failed to remove ban.", e);
|
||||
}
|
||||
} catch (SQLException e)
|
||||
{
|
||||
FLog.severe("Failed to remove ban: " + e.getMessage());
|
||||
}
|
||||
return null;
|
||||
});
|
||||
}
|
||||
|
||||
// We've changed this to read tableNotExists because it's more accurate in context.
|
||||
public boolean tableNotExists(DatabaseMetaData meta, String name) throws SQLException
|
||||
public CompletableFuture<Boolean> tableNotExists(DatabaseMetaData meta, String name)
|
||||
{
|
||||
return !meta.getTables(null, null, name, null).next();
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
try
|
||||
{
|
||||
return !meta.getTables(null, null, name, null).next();
|
||||
} catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException(TABLE_CHECK_FAILURE, ex);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user