Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2026-06-04 21:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

More modernization for the database

Browse Source
This commit is contained in:
Telesphoreo
2026-05-19 02:30:16 -04:00
parent a980e26cc7
commit 64c691bb58
68 changed files with 588 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/main/java/dev/plex/command/impl/AdminChatCMD.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class AdminChatCMD extends PlexCommand
PlexLog.debug("admin chat prefix: {0}", prefix);
String message = StringUtils.join(args, " ");
plugin.getServer().getConsoleSender().sendMessage(messageComponent("adminChatFormat", sender.getName(), prefix, message));
MessageUtil.sendStaffChat(sender, SafeMiniMessage.mmDeserialize(message), PlexUtils.adminChat(sender.getName(), prefix, message).toArray(UUID[]::new));
MessageUtil.sendStaffChat(plugin, sender, SafeMiniMessage.mmDeserialize(message), PlexUtils.adminChat(sender.getName(), prefix, message).toArray(UUID[]::new));
return null;
}
server/src/main/java/dev/plex/command/impl/BanCMD.java
+3 -3
View File
@@ -1,6 +1,6 @@
package dev.plex.command.impl;
import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
@@ -45,7 +45,7 @@ public class BanCMD extends PlexCommand
return usage();
}
final PlexPlayer plexPlayer = DataUtils.getPlayer(args[0]);
final PlexPlayer plexPlayer = plugin.getPlayerService().getPlayer(args[0]);
if (plexPlayer == null)
{
@@ -88,7 +88,7 @@ public class BanCMD extends PlexCommand
{
if (player != null)
{
BungeeUtil.kickPlayer(player, Punishment.generateBanMessage(punishment));
BungeeUtil.kickPlayer(plugin, player, Punishment.generateBanMessage(punishment, plugin.config.getString("banning.ban_url"), plugin.getPlayerService()));
}
});
PlexLog.debug("(From /ban command) PunishedPlayer UUID: " + plexPlayer.getUuid());
server/src/main/java/dev/plex/command/impl/BcastLoginMessageCMD.java
+2 -2
View File
@@ -1,7 +1,7 @@
package dev.plex.command.impl;
import com.google.common.collect.ImmutableList;
import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
@@ -31,7 +31,7 @@ public class BcastLoginMessageCMD extends PlexCommand
return usage();
}
PlexPlayer plexPlayer = DataUtils.getPlayer(args[0]);
PlexPlayer plexPlayer = plugin.getPlayerService().getPlayer(args[0]);
if (plexPlayer == null)
{
server/src/main/java/dev/plex/command/impl/CommandSpyCMD.java
+2 -2
View File
@@ -1,6 +1,6 @@
package dev.plex.command.impl;
import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
@@ -27,7 +27,7 @@ public class CommandSpyCMD extends PlexCommand
{
PlexPlayer plexPlayer = plugin.getPlayerCache().getPlexPlayer(playerSender.getUniqueId());
plexPlayer.setCommandSpy(!plexPlayer.isCommandSpy());
DataUtils.update(plexPlayer);
plugin.getPlayerService().update(plexPlayer);
send(sender, messageComponent("toggleCommandSpy")
.append(Component.space())
.append(plexPlayer.isCommandSpy() ? messageComponent("enabled") : messageComponent("disabled")));
server/src/main/java/dev/plex/command/impl/DebugCMD.java
+4 -4
View File
@@ -38,9 +38,9 @@ public class DebugCMD extends PlexCommand
if (args.length == 2)
{
Player player = getNonNullPlayer(args[1]);
if (plugin.getRedisConnection().getJedis().exists(player.getUniqueId().toString()))
if (plugin.getRedisConnection().query(jedis -> jedis.exists(player.getUniqueId().toString())))
{
plugin.getRedisConnection().getJedis().del(player.getUniqueId().toString());
plugin.getRedisConnection().execute(jedis -> jedis.del(player.getUniqueId().toString()));
return messageComponent("redisResetSuccessful", player.getName());
}
return messageComponent("redisResetPlayerNotFound");
@@ -50,7 +50,7 @@ public class DebugCMD extends PlexCommand
{
for (World world : Bukkit.getWorlds())
{
GameRuleUtil.commitGlobalGameRules(world);
GameRuleUtil.commitGlobalGameRules(plugin, world);
PlexLog.log("Set global gamerules for world: " + world.getName());
}
for (String world : plugin.config.getConfigurationSection("worlds").getKeys(false))
@@ -58,7 +58,7 @@ public class DebugCMD extends PlexCommand
World bukkitWorld = Bukkit.getWorld(world);
if (bukkitWorld != null)
{
GameRuleUtil.commitSpecificGameRules(bukkitWorld);
GameRuleUtil.commitSpecificGameRules(plugin, bukkitWorld);
PlexLog.log("Set specific gamerules for world: " + world.toLowerCase(Locale.ROOT));
}
}
server/src/main/java/dev/plex/command/impl/KickCMD.java
+3 -3
View File
@@ -1,7 +1,7 @@
package dev.plex.command.impl;
import com.google.common.collect.ImmutableList;
import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
@@ -38,7 +38,7 @@ public class KickCMD extends PlexCommand
return usage();
}
PlexPlayer plexPlayer = DataUtils.getPlayer(args[0]);
PlexPlayer plexPlayer = plugin.getPlayerService().getPlayer(args[0]);
String reason = messageString("noReasonProvided");
if (plexPlayer == null)
@@ -66,7 +66,7 @@ public class KickCMD extends PlexCommand
punishment.setIp(player.getAddress().getAddress().getHostAddress().trim());
plugin.getPunishmentManager().punish(plexPlayer, punishment);
PlexUtils.broadcast(messageComponent("kickedPlayer", sender.getName(), plexPlayer.getName()));
BungeeUtil.kickPlayer(player, Punishment.generateKickMessage(punishment));
BungeeUtil.kickPlayer(plugin, player, Punishment.generateKickMessage(punishment, plugin.getPlayerService()));
return null;
}
server/src/main/java/dev/plex/command/impl/NotesCMD.java
+8 -8
View File
@@ -1,6 +1,6 @@
package dev.plex.command.impl;
import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
@@ -36,7 +36,7 @@ public class NotesCMD extends PlexCommand
return usage();
}
PlexPlayer plexPlayer = DataUtils.getPlayer(args[0]);
PlexPlayer plexPlayer = plugin.getPlayerService().getPlayer(args[0]);
if (plexPlayer == null)
{
@@ -47,7 +47,7 @@ public class NotesCMD extends PlexCommand
{
case "list":
{
plugin.getSqlNotes().getNotes(plexPlayer.getUuid()).whenComplete((notes, ex) ->
plugin.getNoteRepository().getNotes(plexPlayer.getUuid()).whenComplete((notes, ex) ->
{
if (notes.isEmpty())
{
@@ -69,7 +69,7 @@ public class NotesCMD extends PlexCommand
{
Note note = new Note(plexPlayer.getUuid(), content, playerSender.getUniqueId(), ZonedDateTime.now(ZoneId.of(TimeUtils.TIMEZONE)));
plexPlayer.getNotes().add(note);
plugin.getSqlNotes().addNote(note);
plugin.getNoteRepository().addNote(note);
return messageComponent("noteAdded");
}
}
@@ -88,14 +88,14 @@ public class NotesCMD extends PlexCommand
{
return messageComponent("unableToParseNumber", args[2]);
}
plugin.getSqlNotes().getNotes(plexPlayer.getUuid()).whenComplete((notes, ex) ->
plugin.getNoteRepository().getNotes(plexPlayer.getUuid()).whenComplete((notes, ex) ->
{
boolean deleted = false;
for (Note note : notes)
{
if (note.getId() == id)
{
plugin.getSqlNotes().deleteNote(id, plexPlayer.getUuid()).whenComplete((notes1, ex1) ->
plugin.getNoteRepository().deleteNote(id, plexPlayer.getUuid()).whenComplete((notes1, ex1) ->
send(sender, messageComponent("removedNote", id)));
deleted = true;
}
@@ -112,7 +112,7 @@ public class NotesCMD extends PlexCommand
{
int count = plexPlayer.getNotes().size();
plexPlayer.getNotes().clear();
DataUtils.update(plexPlayer);
plugin.getPlayerService().update(plexPlayer);
return messageComponent("clearedNotes", count);
}
default:
@@ -127,7 +127,7 @@ public class NotesCMD extends PlexCommand
AtomicReference<Component> noteList = new AtomicReference<>(messageComponent("notesHeader", plexPlayer.getName()));
for (Note note : notes)
{
Component noteLine = messageComponent("notePrefix", note.getId(), DataUtils.getPlayer(note.getWrittenBy()).getName(), TimeUtils.useTimezone(note.getTimestamp()));
Component noteLine = messageComponent("notePrefix", note.getId(), plugin.getPlayerService().getPlayer(note.getWrittenBy()).getName(), TimeUtils.useTimezone(note.getTimestamp()));
noteLine = noteLine.append(messageComponent("noteLine", note.getNote()));
noteList.set(noteList.get().append(Component.newline()));
noteList.set(noteList.get().append(noteLine));
server/src/main/java/dev/plex/command/impl/PlexCMD.java
+6 -3
View File
@@ -8,6 +8,7 @@ import dev.plex.command.source.RequiredCommandSource;
import dev.plex.module.PlexModule;
import dev.plex.module.PlexModuleFile;
import dev.plex.util.BuildInfo;
import dev.plex.util.PlexLog;
import dev.plex.util.PlexUtils;
import dev.plex.util.TimeUtils;
@@ -47,8 +48,10 @@ public class PlexCMD extends PlexCommand
{
checkPermission(sender, "plex.reload");
plugin.config.load();
PlexLog.setDebugEnabled(plugin.config.getBoolean("debug"));
send(sender, "Reloaded config file");
plugin.messages.load();
PlexUtils.configure(plugin.config, plugin.messages);
send(sender, "Reloaded messages file");
plugin.indefBans.load(false);
plugin.getPunishmentManager().mergeIndefiniteBans();
@@ -72,10 +75,10 @@ public class PlexCMD extends PlexCommand
{
throw new CommandFailException("&cRedis is not enabled.");
}
plugin.getRedisConnection().getJedis().set("test", "123");
plugin.getRedisConnection().execute(jedis -> jedis.set("test", "123"));
send(sender, "Set test to 123. Now outputting key test...");
send(sender, plugin.getRedisConnection().getJedis().get("test"));
plugin.getRedisConnection().getJedis().close();
String test = plugin.getRedisConnection().query(jedis -> jedis.get("test"));
send(sender, test);
return null;
}
else if (args[0].equalsIgnoreCase("modules"))
server/src/main/java/dev/plex/command/impl/PunishmentsCMD.java
+4 -4
View File
@@ -1,7 +1,7 @@
package dev.plex.command.impl;
import com.google.common.collect.ImmutableList;
import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
@@ -31,11 +31,11 @@ public class PunishmentsCMD extends PlexCommand
{
if (args.length == 0)
{
new PunishmentMenu().open(playerSender);
new PunishmentMenu(plugin.getPlayerService()).open(playerSender);
}
else
{
if (!DataUtils.hasPlayedBefore(args[0]))
if (!plugin.getPlayerService().hasPlayedBefore(args[0]))
{
throw new PlayerNotFoundException();
}
@@ -43,7 +43,7 @@ public class PunishmentsCMD extends PlexCommand
final OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(args[0]);
final PlexPlayer player = offlinePlayer.isOnline() ? getOnlinePlexPlayer(args[0]) : getOfflinePlexPlayer(offlinePlayer.getUniqueId());
new PunishedPlayerMenu(player).open(playerSender);
new PunishedPlayerMenu(player, plugin.getPlayerService()).open(playerSender);
}
return null;
server/src/main/java/dev/plex/command/impl/RemoveLoginMessageCMD.java
+2 -2
View File
@@ -1,7 +1,7 @@
package dev.plex.command.impl;
import com.google.common.collect.ImmutableList;
import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
@@ -42,7 +42,7 @@ public class RemoveLoginMessageCMD extends PlexCommand
return messageComponent("specifyPlayer");
}
PlexPlayer plexPlayer = DataUtils.getPlayer(args[1]);
PlexPlayer plexPlayer = plugin.getPlayerService().getPlayer(args[1]);
if (plexPlayer == null)
{
return messageComponent("playerNotFound");
server/src/main/java/dev/plex/command/impl/SetLoginMessageCMD.java
+2 -2
View File
@@ -1,7 +1,7 @@
package dev.plex.command.impl;
import com.google.common.collect.ImmutableList;
import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
@@ -48,7 +48,7 @@ public class SetLoginMessageCMD extends PlexCommand
{
return messageComponent("specifyLoginMessage");
}
PlexPlayer plexPlayer = DataUtils.getPlayer(args[1]);
PlexPlayer plexPlayer = plugin.getPlayerService().getPlayer(args[1]);
if (plexPlayer == null)
{
return messageComponent("playerNotFound");
server/src/main/java/dev/plex/command/impl/TagCMD.java
+7 -7
View File
@@ -1,6 +1,6 @@
package dev.plex.command.impl;
import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
@@ -45,7 +45,7 @@ public class TagCMD extends PlexCommand
return messageComponent("noPermissionConsole");
}
assert playerSender != null;
PlexPlayer player = DataUtils.getPlayer(playerSender.getUniqueId());
PlexPlayer player = plugin.getPlayerService().getPlayer(playerSender.getUniqueId());
if (args.length < 2)
{
return usage("/tag set <prefix>");
@@ -59,7 +59,7 @@ public class TagCMD extends PlexCommand
}
player.setPrefix(MiniMessage.miniMessage().serialize(convertedComponent));
DataUtils.update(player);
plugin.getPlayerService().update(player);
return messageComponent("prefixSetTo", MiniMessage.miniMessage().serialize(convertedComponent));
}
@@ -77,16 +77,16 @@ public class TagCMD extends PlexCommand
return null;
}
PlexPlayer player = DataUtils.getPlayer(playerSender.getUniqueId());
PlexPlayer player = plugin.getPlayerService().getPlayer(playerSender.getUniqueId());
player.setPrefix(null);
DataUtils.update(player);
plugin.getPlayerService().update(player);
return messageComponent("prefixCleared");
}
checkPermission(sender, "plex.tag.clear.others");
Player target = getNonNullPlayer(args[1]);
PlexPlayer plexTarget = DataUtils.getPlayer(target.getUniqueId());
PlexPlayer plexTarget = plugin.getPlayerService().getPlayer(target.getUniqueId());
plexTarget.setPrefix(null);
DataUtils.update(plexTarget);
plugin.getPlayerService().update(plexTarget);
return messageComponent("otherPrefixCleared", target.getName());
}
return usage();
server/src/main/java/dev/plex/command/impl/TempbanCMD.java
+3 -3
View File
@@ -1,7 +1,7 @@
package dev.plex.command.impl;
import com.google.common.collect.ImmutableList;
import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
@@ -39,7 +39,7 @@ public class TempbanCMD extends PlexCommand
return usage();
}
PlexPlayer target = DataUtils.getPlayer(args[0]);
PlexPlayer target = plugin.getPlayerService().getPlayer(args[0]);
String reason;
if (target == null)
@@ -78,7 +78,7 @@ public class TempbanCMD extends PlexCommand
PlexUtils.broadcast(messageComponent("banningPlayer", sender.getName(), target.getName()));
if (player != null)
{
BungeeUtil.kickPlayer(player, Punishment.generateBanMessage(punishment));
BungeeUtil.kickPlayer(plugin, player, Punishment.generateBanMessage(punishment, plugin.config.getString("banning.ban_url"), plugin.getPlayerService()));
}
if (rollBack)
{
server/src/main/java/dev/plex/command/impl/ToggleCMD.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class ToggleCMD extends PlexCommand
}
}
}
new ToggleMenu().open(playerSender);
new ToggleMenu(plugin).open(playerSender);
return null;
}
server/src/main/java/dev/plex/command/impl/UnbanCMD.java
+2 -2
View File
@@ -1,7 +1,7 @@
package dev.plex.command.impl;
import com.google.common.collect.ImmutableList;
import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
@@ -34,7 +34,7 @@ public class UnbanCMD extends PlexCommand
if (args.length == 1)
{
PlexPlayer target = DataUtils.getPlayer(args[0]);
PlexPlayer target = plugin.getPlayerService().getPlayer(args[0]);
if (target == null)
{
server/src/main/java/dev/plex/command/impl/UnfreezeCMD.java
+3 -3
View File
@@ -1,7 +1,7 @@
package dev.plex.command.impl;
import com.google.common.collect.ImmutableList;
import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
@@ -30,7 +30,7 @@ public class UnfreezeCMD extends PlexCommand
{
return usage();
}
PlexPlayer punishedPlayer = DataUtils.getPlayer(args[0]);
PlexPlayer punishedPlayer = plugin.getPlayerService().getPlayer(args[0]);
if (punishedPlayer == null)
{
throw new PlayerNotFoundException();
@@ -44,7 +44,7 @@ public class UnfreezeCMD extends PlexCommand
punishedPlayer.getPunishments().stream().filter(punishment -> punishment.getType() == PunishmentType.FREEZE && punishment.isActive()).forEach(punishment ->
{
punishment.setActive(false);
plugin.getSqlPunishment().updatePunishment(punishment.getType(), false, punishment.getPunished());
plugin.getPunishmentRepository().updatePunishment(punishment.getType(), false, punishment.getPunished());
});
PlexUtils.broadcast(messageComponent("unfrozePlayer", sender.getName(), punishedPlayer.getName()));
return null;
server/src/main/java/dev/plex/command/impl/UnmuteCMD.java
+3 -3
View File
@@ -1,7 +1,7 @@
package dev.plex.command.impl;
import com.google.common.collect.ImmutableList;
import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
@@ -30,7 +30,7 @@ public class UnmuteCMD extends PlexCommand
{
return usage();
}
PlexPlayer punishedPlayer = DataUtils.getPlayer(args[0]);
PlexPlayer punishedPlayer = plugin.getPlayerService().getPlayer(args[0]);
if (punishedPlayer == null)
{
throw new PlayerNotFoundException();
@@ -44,7 +44,7 @@ public class UnmuteCMD extends PlexCommand
punishedPlayer.getPunishments().stream().filter(punishment -> punishment.getType() == PunishmentType.MUTE && punishment.isActive()).forEach(punishment ->
{
punishment.setActive(false);
plugin.getSqlPunishment().updatePunishment(punishment.getType(), false, punishment.getPunished());
plugin.getPunishmentRepository().updatePunishment(punishment.getType(), false, punishment.getPunished());
});
PlexUtils.broadcast(messageComponent("unmutedPlayer", sender.getName(), punishedPlayer.getName()));
return null;
server/src/main/java/dev/plex/command/impl/WorldCMD.java
+1 -2
View File
@@ -1,7 +1,6 @@
package dev.plex.command.impl;
import com.google.common.collect.Lists;
import dev.plex.Plex;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
@@ -36,7 +35,7 @@ public class WorldCMD extends PlexCommand
World world = getNonNullWorld(args[0]);
boolean playerWorld = args[0].matches("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}");
if (playerWorld && Plex.get().getModuleManager().getModules().stream().anyMatch(plexModule -> plexModule.getPlexModuleFile().getName().equalsIgnoreCase("Module-TFMExtras")))
if (playerWorld && plugin.getModuleManager().getModules().stream().anyMatch(plexModule -> plexModule.getPlexModuleFile().getName().equalsIgnoreCase("Module-TFMExtras")))
{
checkPermission(playerSender, "plex.world.playerworlds");
}