From b2008d00714a48b9966beac54ed68539ab2d7a6b Mon Sep 17 00:00:00 2001 From: ceze88 Date: Wed, 2 Aug 2023 18:57:10 +0200 Subject: [PATCH] Updates database to new system --- .../UltimateModeration.java | 135 +++++++----------- .../commands/CommandBan.java | 10 +- .../commands/CommandClearChat.java | 4 +- .../commands/CommandHelp.java | 4 +- .../commands/CommandKick.java | 8 +- .../commands/CommandMute.java | 10 +- .../commands/CommandRandomPlayer.java | 4 +- .../commands/CommandReload.java | 4 +- .../commands/CommandRunTemplate.java | 6 +- .../commands/CommandSettings.java | 4 +- .../commands/CommandSlowMode.java | 6 +- .../commands/CommandStaffChat.java | 6 +- .../commands/CommandTicket.java | 6 +- .../commands/CommandToggleChat.java | 6 +- .../commands/CommandUltimateModeration.java | 6 +- .../commands/CommandUnBan.java | 8 +- .../commands/CommandUnMute.java | 8 +- .../commands/CommandVanish.java | 6 +- .../commands/CommandWarn.java | 10 +- .../database/DataHelper.java} | 63 +++++--- .../migrations/_1_InitialMigration.java | 7 +- .../ultimatemoderation/gui/MainGui.java | 12 +- .../ultimatemoderation/gui/ModerateGui.java | 8 +- .../gui/NotesManagerGui.java | 12 +- .../ultimatemoderation/gui/PlayerGui.java | 6 +- .../ultimatemoderation/gui/PunishGui.java | 18 +-- .../gui/PunishmentsGui.java | 14 +- .../gui/TemplateManagerGui.java | 12 +- .../gui/TemplateSelectorGui.java | 6 +- .../ultimatemoderation/gui/TicketGui.java | 18 +-- .../gui/TicketManagerGui.java | 10 +- .../ultimatemoderation/gui/TicketTypeGui.java | 14 +- .../listeners/BlockListener.java | 6 +- .../listeners/ChatListener.java | 12 +- .../listeners/CommandListener.java | 12 +- .../listeners/DeathListener.java | 2 +- .../listeners/DropListener.java | 6 +- .../listeners/InventoryListener.java | 6 +- .../listeners/LoginListener.java | 12 +- .../listeners/MobTargetLister.java | 4 +- .../listeners/MoveListener.java | 6 +- .../listeners/SkyBlockListener.java | 2 +- .../listeners/SpyingDismountListener.java | 6 +- .../moderate/AbstractModeration.java | 6 +- .../moderate/GenericModerationCommand.java | 4 +- .../moderate/ModerationManager.java | 14 +- .../moderate/ModerationType.java | 2 +- .../moderations/FreezeModeration.java | 8 +- .../moderations/InvSeeModeration.java | 8 +- .../moderations/ReviveModeration.java | 10 +- .../moderate/moderations/SpyModeration.java | 12 +- .../moderations/ViewEnderChestModeration.java | 8 +- .../punish/AppliedPunishment.java | 2 +- .../ultimatemoderation/punish/Punishment.java | 8 +- .../punish/PunishmentNote.java | 2 +- .../punish/PunishmentType.java | 4 +- .../punish/player/PlayerPunishData.java | 12 +- .../punish/player/PunishmentManager.java | 2 +- .../punish/template/Template.java | 6 +- .../punish/template/TemplateManager.java | 2 +- .../ultimatemoderation/settings/Settings.java | 4 +- .../staffchat/StaffChannel.java | 6 +- .../staffchat/StaffChatManager.java | 2 +- .../tasks/SlowModeTask.java | 8 +- .../ultimatemoderation/tickets/Ticket.java | 2 +- .../tickets/TicketManager.java | 2 +- .../tickets/TicketResponse.java | 2 +- .../tickets/TicketStatus.java | 2 +- .../utils/VaultPermissions.java | 2 +- src/main/resources/plugin.yml | 2 +- 70 files changed, 333 insertions(+), 334 deletions(-) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/UltimateModeration.java (57%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandBan.java (92%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandClearChat.java (94%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandHelp.java (94%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandKick.java (90%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandMute.java (91%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandRandomPlayer.java (93%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandReload.java (90%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandRunTemplate.java (92%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandSettings.java (91%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandSlowMode.java (92%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandStaffChat.java (92%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandTicket.java (87%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandToggleChat.java (91%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandUltimateModeration.java (86%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandUnBan.java (89%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandUnMute.java (89%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandVanish.java (96%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/commands/CommandWarn.java (90%) rename src/main/java/com/{songoda/ultimatemoderation/database/DataManager.java => craftaro/ultimatemoderation/database/DataHelper.java} (91%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/database/migrations/_1_InitialMigration.java (93%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/gui/MainGui.java (96%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/gui/ModerateGui.java (91%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/gui/NotesManagerGui.java (94%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/gui/PlayerGui.java (96%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/gui/PunishGui.java (96%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/gui/PunishmentsGui.java (94%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/gui/TemplateManagerGui.java (93%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/gui/TemplateSelectorGui.java (92%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/gui/TicketGui.java (92%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/gui/TicketManagerGui.java (96%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/gui/TicketTypeGui.java (83%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/listeners/BlockListener.java (90%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/listeners/ChatListener.java (91%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/listeners/CommandListener.java (85%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/listeners/DeathListener.java (93%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/listeners/DropListener.java (78%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/listeners/InventoryListener.java (80%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/listeners/LoginListener.java (80%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/listeners/MobTargetLister.java (86%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/listeners/MoveListener.java (78%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/listeners/SkyBlockListener.java (88%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/listeners/SpyingDismountListener.java (91%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/moderate/AbstractModeration.java (92%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/moderate/GenericModerationCommand.java (94%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/moderate/ModerationManager.java (67%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/moderate/ModerationType.java (60%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/moderate/moderations/FreezeModeration.java (88%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/moderate/moderations/InvSeeModeration.java (80%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/moderate/moderations/ReviveModeration.java (84%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/moderate/moderations/SpyModeration.java (91%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/moderate/moderations/ViewEnderChestModeration.java (80%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/punish/AppliedPunishment.java (96%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/punish/Punishment.java (95%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/punish/PunishmentNote.java (95%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/punish/PunishmentType.java (86%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/punish/player/PlayerPunishData.java (90%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/punish/player/PunishmentManager.java (92%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/punish/template/Template.java (85%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/punish/template/TemplateManager.java (94%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/settings/Settings.java (97%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/staffchat/StaffChannel.java (94%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/staffchat/StaffChatManager.java (93%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/tasks/SlowModeTask.java (90%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/tickets/Ticket.java (97%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/tickets/TicketManager.java (97%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/tickets/TicketResponse.java (94%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/tickets/TicketStatus.java (82%) rename src/main/java/com/{songoda => craftaro}/ultimatemoderation/utils/VaultPermissions.java (94%) diff --git a/src/main/java/com/songoda/ultimatemoderation/UltimateModeration.java b/src/main/java/com/craftaro/ultimatemoderation/UltimateModeration.java similarity index 57% rename from src/main/java/com/songoda/ultimatemoderation/UltimateModeration.java rename to src/main/java/com/craftaro/ultimatemoderation/UltimateModeration.java index 8b515bd..5a27226 100644 --- a/src/main/java/com/songoda/ultimatemoderation/UltimateModeration.java +++ b/src/main/java/com/craftaro/ultimatemoderation/UltimateModeration.java @@ -1,62 +1,60 @@ -package com.songoda.ultimatemoderation; +package com.craftaro.ultimatemoderation; import com.craftaro.core.SongodaCore; import com.craftaro.core.SongodaPlugin; import com.craftaro.core.commands.CommandManager; import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.core.configuration.Config; -import com.craftaro.core.database.DataMigrationManager; import com.craftaro.core.database.DatabaseConnector; -import com.craftaro.core.database.MySQLConnector; -import com.craftaro.core.database.SQLiteConnector; import com.craftaro.core.gui.GuiManager; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; -import com.songoda.ultimatemoderation.commands.CommandBan; -import com.songoda.ultimatemoderation.commands.CommandClearChat; -import com.songoda.ultimatemoderation.commands.CommandHelp; -import com.songoda.ultimatemoderation.commands.CommandKick; -import com.songoda.ultimatemoderation.commands.CommandMute; -import com.songoda.ultimatemoderation.commands.CommandRandomPlayer; -import com.songoda.ultimatemoderation.commands.CommandReload; -import com.songoda.ultimatemoderation.commands.CommandRunTemplate; -import com.songoda.ultimatemoderation.commands.CommandSettings; -import com.songoda.ultimatemoderation.commands.CommandSlowMode; -import com.songoda.ultimatemoderation.commands.CommandStaffChat; -import com.songoda.ultimatemoderation.commands.CommandTicket; -import com.songoda.ultimatemoderation.commands.CommandToggleChat; -import com.songoda.ultimatemoderation.commands.CommandUltimateModeration; -import com.songoda.ultimatemoderation.commands.CommandUnBan; -import com.songoda.ultimatemoderation.commands.CommandUnMute; -import com.songoda.ultimatemoderation.commands.CommandVanish; -import com.songoda.ultimatemoderation.commands.CommandWarn; -import com.songoda.ultimatemoderation.database.DataManager; -import com.songoda.ultimatemoderation.database.migrations._1_InitialMigration; -import com.songoda.ultimatemoderation.listeners.BlockListener; -import com.songoda.ultimatemoderation.listeners.ChatListener; -import com.songoda.ultimatemoderation.listeners.CommandListener; -import com.songoda.ultimatemoderation.listeners.DeathListener; -import com.songoda.ultimatemoderation.listeners.DropListener; -import com.songoda.ultimatemoderation.listeners.InventoryListener; -import com.songoda.ultimatemoderation.listeners.LoginListener; -import com.songoda.ultimatemoderation.listeners.MobTargetLister; -import com.songoda.ultimatemoderation.listeners.MoveListener; -import com.songoda.ultimatemoderation.listeners.SkyBlockListener; -import com.songoda.ultimatemoderation.listeners.SpyingDismountListener; -import com.songoda.ultimatemoderation.moderate.ModerationManager; -import com.songoda.ultimatemoderation.punish.AppliedPunishment; -import com.songoda.ultimatemoderation.punish.PunishmentNote; -import com.songoda.ultimatemoderation.punish.player.PunishmentManager; -import com.songoda.ultimatemoderation.punish.template.Template; -import com.songoda.ultimatemoderation.punish.template.TemplateManager; -import com.songoda.ultimatemoderation.settings.Settings; -import com.songoda.ultimatemoderation.staffchat.StaffChatManager; -import com.songoda.ultimatemoderation.tasks.SlowModeTask; -import com.songoda.ultimatemoderation.tickets.Ticket; -import com.songoda.ultimatemoderation.tickets.TicketManager; +import com.craftaro.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.commands.CommandBan; +import com.craftaro.ultimatemoderation.commands.CommandClearChat; +import com.craftaro.ultimatemoderation.commands.CommandHelp; +import com.craftaro.ultimatemoderation.commands.CommandKick; +import com.craftaro.ultimatemoderation.commands.CommandMute; +import com.craftaro.ultimatemoderation.commands.CommandRandomPlayer; +import com.craftaro.ultimatemoderation.commands.CommandReload; +import com.craftaro.ultimatemoderation.commands.CommandRunTemplate; +import com.craftaro.ultimatemoderation.commands.CommandSettings; +import com.craftaro.ultimatemoderation.commands.CommandSlowMode; +import com.craftaro.ultimatemoderation.commands.CommandStaffChat; +import com.craftaro.ultimatemoderation.commands.CommandTicket; +import com.craftaro.ultimatemoderation.commands.CommandToggleChat; +import com.craftaro.ultimatemoderation.commands.CommandUltimateModeration; +import com.craftaro.ultimatemoderation.commands.CommandUnBan; +import com.craftaro.ultimatemoderation.commands.CommandUnMute; +import com.craftaro.ultimatemoderation.commands.CommandVanish; +import com.craftaro.ultimatemoderation.commands.CommandWarn; +import com.craftaro.ultimatemoderation.database.DataHelper; +import com.craftaro.ultimatemoderation.database.migrations._1_InitialMigration; +import com.craftaro.ultimatemoderation.listeners.BlockListener; +import com.craftaro.ultimatemoderation.listeners.ChatListener; +import com.craftaro.ultimatemoderation.listeners.CommandListener; +import com.craftaro.ultimatemoderation.listeners.DeathListener; +import com.craftaro.ultimatemoderation.listeners.DropListener; +import com.craftaro.ultimatemoderation.listeners.InventoryListener; +import com.craftaro.ultimatemoderation.listeners.LoginListener; +import com.craftaro.ultimatemoderation.listeners.MobTargetLister; +import com.craftaro.ultimatemoderation.listeners.MoveListener; +import com.craftaro.ultimatemoderation.listeners.SkyBlockListener; +import com.craftaro.ultimatemoderation.listeners.SpyingDismountListener; +import com.craftaro.ultimatemoderation.moderate.ModerationManager; +import com.craftaro.ultimatemoderation.punish.AppliedPunishment; +import com.craftaro.ultimatemoderation.punish.PunishmentNote; +import com.craftaro.ultimatemoderation.punish.player.PunishmentManager; +import com.craftaro.ultimatemoderation.punish.template.Template; +import com.craftaro.ultimatemoderation.punish.template.TemplateManager; +import com.craftaro.ultimatemoderation.staffchat.StaffChatManager; +import com.craftaro.ultimatemoderation.tasks.SlowModeTask; +import com.craftaro.ultimatemoderation.tickets.Ticket; +import com.craftaro.ultimatemoderation.tickets.TicketManager; import org.bukkit.Bukkit; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; +import java.util.Arrays; import java.util.List; public class UltimateModeration extends SongodaPlugin { @@ -67,9 +65,7 @@ public class UltimateModeration extends SongodaPlugin { private PunishmentManager punishmentManager; private StaffChatManager staffChatManager; private ModerationManager moderationManager; - - private DatabaseConnector databaseConnector; - private DataManager dataManager; + private DataHelper dataHelper; /** * @deprecated Use {@link JavaPlugin#getPlugin(Class)} instead. @@ -128,25 +124,8 @@ public class UltimateModeration extends SongodaPlugin { try { - if (Settings.MYSQL_ENABLED.getBoolean()) { - String hostname = Settings.MYSQL_HOSTNAME.getString(); - int port = Settings.MYSQL_PORT.getInt(); - String database = Settings.MYSQL_DATABASE.getString(); - String username = Settings.MYSQL_USERNAME.getString(); - String password = Settings.MYSQL_PASSWORD.getString(); - boolean useSSL = Settings.MYSQL_USE_SSL.getBoolean(); - int poolSize = Settings.MYSQL_POOL_SIZE.getInt(); + initDatabase(Arrays.asList(new _1_InitialMigration(this))); - this.databaseConnector = new MySQLConnector(this, hostname, port, database, username, password, useSSL, poolSize); - this.getLogger().info("Data handler connected using MySQL."); - } else { - this.databaseConnector = new SQLiteConnector(this); - this.getLogger().info("Data handler connected using SQLite."); - } - - this.dataManager = new DataManager(this.databaseConnector, this); - DataMigrationManager dataMigrationManager = new DataMigrationManager(this.databaseConnector, this.dataManager, new _1_InitialMigration(this)); - dataMigrationManager.runMigrations(); } catch (Exception ex) { this.getLogger().severe("Fatal error trying to connect to database. " + @@ -181,24 +160,24 @@ public class UltimateModeration extends SongodaPlugin { @Override public void onDataLoad() { - getDataManager().runAsync(() -> { + getDataManager().getAsyncPool().execute(() -> { // Load data from DB - this.dataManager.getTemplates((templates) -> { + this.dataHelper.getTemplates((templates) -> { for (Template template : templates) { this.templateManager.addTemplate(template); } }); - this.dataManager.getAppliedPunishments((appliedPunishments) -> { + this.dataHelper.getAppliedPunishments((appliedPunishments) -> { for (AppliedPunishment punishment : appliedPunishments) { this.punishmentManager.getPlayer(punishment.getVictim()).addPunishment(punishment); } }); - this.dataManager.getNotes((notes) -> { + this.dataHelper.getNotes((notes) -> { for (PunishmentNote note : notes) { this.punishmentManager.getPlayer(note.getSubject()).addNotes(note); } }); - this.dataManager.getTickets((tickets) -> { + this.dataHelper.getTickets((tickets) -> { for (Ticket ticket : tickets.values()) { this.ticketManager.addTicket(ticket); } @@ -237,14 +216,6 @@ public class UltimateModeration extends SongodaPlugin { return this.staffChatManager; } - public DataManager getDataManager() { - return this.dataManager; - } - - public DatabaseConnector getDatabaseConnector() { - return this.databaseConnector; - } - public GuiManager getGuiManager() { return this.guiManager; } @@ -252,4 +223,8 @@ public class UltimateModeration extends SongodaPlugin { public ModerationManager getModerationManager() { return this.moderationManager; } + + public DataHelper getDataHelper() { + return dataHelper; + } } diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandBan.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandBan.java similarity index 92% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandBan.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandBan.java index 406f293..37839f9 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandBan.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandBan.java @@ -1,11 +1,11 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; import com.craftaro.core.utils.TimeUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.Punishment; -import com.songoda.ultimatemoderation.punish.PunishmentType; -import com.songoda.ultimatemoderation.utils.VaultPermissions; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.Punishment; +import com.craftaro.ultimatemoderation.punish.PunishmentType; +import com.craftaro.ultimatemoderation.utils.VaultPermissions; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandClearChat.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandClearChat.java similarity index 94% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandClearChat.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandClearChat.java index 11d0481..a083b94 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandClearChat.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandClearChat.java @@ -1,7 +1,7 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.UltimateModeration; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandHelp.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandHelp.java similarity index 94% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandHelp.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandHelp.java index 88d71cd..cb5e947 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandHelp.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandHelp.java @@ -1,8 +1,8 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; import com.craftaro.core.utils.TextUtils; -import com.songoda.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.UltimateModeration; import org.bukkit.command.CommandSender; import java.util.List; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandKick.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandKick.java similarity index 90% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandKick.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandKick.java index 05bf6e4..1e762a3 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandKick.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandKick.java @@ -1,9 +1,9 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.Punishment; -import com.songoda.ultimatemoderation.punish.PunishmentType; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.Punishment; +import com.craftaro.ultimatemoderation.punish.PunishmentType; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandMute.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandMute.java similarity index 91% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandMute.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandMute.java index 89655c9..be4dc9f 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandMute.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandMute.java @@ -1,11 +1,11 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; import com.craftaro.core.utils.TimeUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.Punishment; -import com.songoda.ultimatemoderation.punish.PunishmentType; -import com.songoda.ultimatemoderation.utils.VaultPermissions; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.Punishment; +import com.craftaro.ultimatemoderation.punish.PunishmentType; +import com.craftaro.ultimatemoderation.utils.VaultPermissions; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandRandomPlayer.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandRandomPlayer.java similarity index 93% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandRandomPlayer.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandRandomPlayer.java index 8a3340c..be98500 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandRandomPlayer.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandRandomPlayer.java @@ -1,7 +1,7 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.UltimateModeration; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandReload.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandReload.java similarity index 90% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandReload.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandReload.java index 4c77a27..48af560 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandReload.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandReload.java @@ -1,7 +1,7 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.UltimateModeration; import org.bukkit.command.CommandSender; import java.util.List; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandRunTemplate.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandRunTemplate.java similarity index 92% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandRunTemplate.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandRunTemplate.java index bd6ae6a..9ab2e33 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandRunTemplate.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandRunTemplate.java @@ -1,8 +1,8 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.template.Template; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.template.Template; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandSettings.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandSettings.java similarity index 91% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandSettings.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandSettings.java index 7adc2e1..4d4c31f 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandSettings.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandSettings.java @@ -1,9 +1,9 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; import com.craftaro.core.configuration.editor.PluginConfigGui; import com.craftaro.core.gui.GuiManager; -import com.songoda.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.UltimateModeration; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandSlowMode.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandSlowMode.java similarity index 92% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandSlowMode.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandSlowMode.java index 9eb2841..ff866d0 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandSlowMode.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandSlowMode.java @@ -1,9 +1,9 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; import com.craftaro.core.utils.TimeUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.listeners.ChatListener; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.listeners.ChatListener; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandStaffChat.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandStaffChat.java similarity index 92% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandStaffChat.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandStaffChat.java index 4393803..8dd7c4d 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandStaffChat.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandStaffChat.java @@ -1,8 +1,8 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.staffchat.StaffChannel; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.staffchat.StaffChannel; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandTicket.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandTicket.java similarity index 87% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandTicket.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandTicket.java index 349749f..e1cecf4 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandTicket.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandTicket.java @@ -1,9 +1,9 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; import com.craftaro.core.gui.GuiManager; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.gui.TicketManagerGui; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.gui.TicketManagerGui; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandToggleChat.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandToggleChat.java similarity index 91% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandToggleChat.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandToggleChat.java index b291763..4299a10 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandToggleChat.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandToggleChat.java @@ -1,9 +1,9 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; import com.craftaro.core.locale.Message; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.listeners.ChatListener; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.listeners.ChatListener; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandUltimateModeration.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandUltimateModeration.java similarity index 86% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandUltimateModeration.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandUltimateModeration.java index 1bfe336..1f3b921 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandUltimateModeration.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandUltimateModeration.java @@ -1,8 +1,8 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.gui.MainGui; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.gui.MainGui; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandUnBan.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandUnBan.java similarity index 89% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandUnBan.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandUnBan.java index c1bab85..e79b99a 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandUnBan.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandUnBan.java @@ -1,9 +1,9 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.PunishmentType; -import com.songoda.ultimatemoderation.punish.player.PlayerPunishData; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.PunishmentType; +import com.craftaro.ultimatemoderation.punish.player.PlayerPunishData; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandUnMute.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandUnMute.java similarity index 89% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandUnMute.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandUnMute.java index 1563763..39491fa 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandUnMute.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandUnMute.java @@ -1,9 +1,9 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.PunishmentType; -import com.songoda.ultimatemoderation.punish.player.PlayerPunishData; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.PunishmentType; +import com.craftaro.ultimatemoderation.punish.player.PlayerPunishData; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandVanish.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandVanish.java similarity index 96% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandVanish.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandVanish.java index fe5bdb2..bd061ed 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandVanish.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandVanish.java @@ -1,10 +1,10 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.settings.Settings; import org.bukkit.Bukkit; import org.bukkit.Particle; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandWarn.java b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandWarn.java similarity index 90% rename from src/main/java/com/songoda/ultimatemoderation/commands/CommandWarn.java rename to src/main/java/com/craftaro/ultimatemoderation/commands/CommandWarn.java index 2e862e2..f187a54 100644 --- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandWarn.java +++ b/src/main/java/com/craftaro/ultimatemoderation/commands/CommandWarn.java @@ -1,11 +1,11 @@ -package com.songoda.ultimatemoderation.commands; +package com.craftaro.ultimatemoderation.commands; import com.craftaro.core.commands.AbstractCommand; import com.craftaro.core.utils.TimeUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.Punishment; -import com.songoda.ultimatemoderation.punish.PunishmentType; -import com.songoda.ultimatemoderation.utils.VaultPermissions; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.Punishment; +import com.craftaro.ultimatemoderation.punish.PunishmentType; +import com.craftaro.ultimatemoderation.utils.VaultPermissions; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/ultimatemoderation/database/DataManager.java b/src/main/java/com/craftaro/ultimatemoderation/database/DataHelper.java similarity index 91% rename from src/main/java/com/songoda/ultimatemoderation/database/DataManager.java rename to src/main/java/com/craftaro/ultimatemoderation/database/DataHelper.java index d359b7a..d3e5dbf 100644 --- a/src/main/java/com/songoda/ultimatemoderation/database/DataManager.java +++ b/src/main/java/com/craftaro/ultimatemoderation/database/DataHelper.java @@ -1,14 +1,14 @@ -package com.songoda.ultimatemoderation.database; +package com.craftaro.ultimatemoderation.database; -import com.craftaro.core.database.DataManagerAbstract; +import com.craftaro.core.database.DataManager; import com.craftaro.core.database.DatabaseConnector; -import com.songoda.ultimatemoderation.punish.AppliedPunishment; -import com.songoda.ultimatemoderation.punish.PunishmentNote; -import com.songoda.ultimatemoderation.punish.PunishmentType; -import com.songoda.ultimatemoderation.punish.template.Template; -import com.songoda.ultimatemoderation.tickets.Ticket; -import com.songoda.ultimatemoderation.tickets.TicketResponse; -import com.songoda.ultimatemoderation.tickets.TicketStatus; +import com.craftaro.ultimatemoderation.punish.AppliedPunishment; +import com.craftaro.ultimatemoderation.punish.PunishmentNote; +import com.craftaro.ultimatemoderation.punish.PunishmentType; +import com.craftaro.ultimatemoderation.punish.template.Template; +import com.craftaro.ultimatemoderation.tickets.Ticket; +import com.craftaro.ultimatemoderation.tickets.TicketResponse; +import com.craftaro.ultimatemoderation.tickets.TicketStatus; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.plugin.Plugin; @@ -24,14 +24,35 @@ import java.util.TreeMap; import java.util.UUID; import java.util.function.Consumer; -public class DataManager extends DataManagerAbstract { - public DataManager(DatabaseConnector databaseConnector, Plugin plugin) { - super(databaseConnector, plugin); +public class DataHelper { + private final DatabaseConnector databaseConnector; + private final DataManager dataManager; + private final Plugin plugin; + + public DataHelper(DataManager dataManager, Plugin plugin) { + this.dataManager = dataManager; + this.databaseConnector = dataManager.getDatabaseConnector(); + this.plugin = plugin; + + } + + private void runAsync(Runnable runnable) { + dataManager.getAsyncPool().execute(runnable); + } + + private void sync(Runnable runnable) { + Bukkit.getScheduler().runTask(plugin, runnable); + } + + private String getTablePrefix() { + return this.dataManager.getTablePrefix(); } public void createTemplate(Template template) { this.runAsync(() -> { try (Connection connection = this.databaseConnector.getConnection()) { + int nextId = dataManager.getNextId("templates"); + String createTemplate = "INSERT INTO " + this.getTablePrefix() + "templates (punishment_type, duration, reason, name, creator) VALUES (?, ?, ?, ?, ?)"; PreparedStatement statement = connection.prepareStatement(createTemplate); statement.setString(1, template.getPunishmentType().name()); @@ -41,8 +62,7 @@ public class DataManager extends DataManagerAbstract { statement.setString(5, template.getCreator().toString()); statement.executeUpdate(); - int templateId = this.lastInsertedId(connection, "templates"); - template.setId(templateId); + template.setId(nextId); } catch (Exception ex) { ex.printStackTrace(); } @@ -91,6 +111,8 @@ public class DataManager extends DataManagerAbstract { public void createAppliedPunishment(AppliedPunishment punishment) { this.runAsync(() -> { try (Connection connection = this.databaseConnector.getConnection()) { + int nextId = dataManager.getNextId("punishments"); + String createPunishment = "INSERT INTO " + this.getTablePrefix() + "punishments (type, duration, reason, victim, punisher, expiration) VALUES (?, ?, ?, ?, ?, ?)"; PreparedStatement statement = connection.prepareStatement(createPunishment); statement.setString(1, punishment.getPunishmentType().name()); @@ -101,8 +123,7 @@ public class DataManager extends DataManagerAbstract { statement.setLong(6, punishment.getExpiration()); statement.executeUpdate(); - int punishmentId = this.lastInsertedId(connection, "punishments"); - punishment.setId(punishmentId); + punishment.setId(nextId); } catch (Exception ex) { ex.printStackTrace(); } @@ -169,6 +190,8 @@ public class DataManager extends DataManagerAbstract { public void createNote(PunishmentNote note) { this.runAsync(() -> { try (Connection connection = this.databaseConnector.getConnection()) { + int nextId = dataManager.getNextId("notes"); + String createNote = "INSERT INTO " + this.getTablePrefix() + "notes (note, author, subject, creation) VALUES (?, ?, ?, ?)"; PreparedStatement statement = connection.prepareStatement(createNote); statement.setString(1, note.getNote()); @@ -177,8 +200,7 @@ public class DataManager extends DataManagerAbstract { statement.setLong(4, note.getCreationDate()); statement.executeUpdate(); - int noteId = this.lastInsertedId(connection, "notes"); - note.setId(noteId); + note.setId(nextId); } catch (Exception ex) { ex.printStackTrace(); } @@ -224,6 +246,8 @@ public class DataManager extends DataManagerAbstract { public void createTicket(Ticket ticket) { this.runAsync(() -> { try (Connection connection = this.databaseConnector.getConnection()) { + int nextId = dataManager.getNextId("tickets"); + String createTicket = "INSERT INTO " + this.getTablePrefix() + "tickets (victim, subject, type, status, world, x, y, z, pitch, yaw) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; PreparedStatement statement = connection.prepareStatement(createTicket); statement.setString(1, ticket.getVictim().toString()); @@ -245,8 +269,7 @@ public class DataManager extends DataManagerAbstract { createTicketResponse(response); } - int ticketId = this.lastInsertedId(connection, "tickets"); - ticket.setId(ticketId); + ticket.setId(nextId); } catch (Exception ex) { ex.printStackTrace(); } diff --git a/src/main/java/com/songoda/ultimatemoderation/database/migrations/_1_InitialMigration.java b/src/main/java/com/craftaro/ultimatemoderation/database/migrations/_1_InitialMigration.java similarity index 93% rename from src/main/java/com/songoda/ultimatemoderation/database/migrations/_1_InitialMigration.java rename to src/main/java/com/craftaro/ultimatemoderation/database/migrations/_1_InitialMigration.java index 635fec5..2e694d4 100644 --- a/src/main/java/com/songoda/ultimatemoderation/database/migrations/_1_InitialMigration.java +++ b/src/main/java/com/craftaro/ultimatemoderation/database/migrations/_1_InitialMigration.java @@ -1,8 +1,9 @@ -package com.songoda.ultimatemoderation.database.migrations; +package com.craftaro.ultimatemoderation.database.migrations; import com.craftaro.core.database.DataMigration; +import com.craftaro.core.database.DatabaseConnector; import com.craftaro.core.database.MySQLConnector; -import com.songoda.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.UltimateModeration; import java.sql.Connection; import java.sql.SQLException; @@ -18,7 +19,7 @@ public class _1_InitialMigration extends DataMigration { @Override public void migrate(Connection connection, String tablePrefix) throws SQLException { - String autoIncrement = this.plugin.getDatabaseConnector() instanceof MySQLConnector ? " AUTO_INCREMENT" : ""; + String autoIncrement = " AUTO_INCREMENT"; // Create templates table try (Statement statement = connection.createStatement()) { diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/MainGui.java b/src/main/java/com/craftaro/ultimatemoderation/gui/MainGui.java similarity index 96% rename from src/main/java/com/songoda/ultimatemoderation/gui/MainGui.java rename to src/main/java/com/craftaro/ultimatemoderation/gui/MainGui.java index 60b1f3b..daea3e3 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/MainGui.java +++ b/src/main/java/com/craftaro/ultimatemoderation/gui/MainGui.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.gui; +package com.craftaro.ultimatemoderation.gui; import com.craftaro.core.gui.AnvilGui; import com.craftaro.core.gui.Gui; @@ -6,11 +6,11 @@ import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.ItemUtils; import com.craftaro.core.utils.TextUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.PunishmentType; -import com.songoda.ultimatemoderation.punish.player.PlayerPunishData; -import com.songoda.ultimatemoderation.settings.Settings; -import com.songoda.ultimatemoderation.tickets.TicketStatus; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.PunishmentType; +import com.craftaro.ultimatemoderation.punish.player.PlayerPunishData; +import com.craftaro.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.tickets.TicketStatus; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.OfflinePlayer; diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/ModerateGui.java b/src/main/java/com/craftaro/ultimatemoderation/gui/ModerateGui.java similarity index 91% rename from src/main/java/com/songoda/ultimatemoderation/gui/ModerateGui.java rename to src/main/java/com/craftaro/ultimatemoderation/gui/ModerateGui.java index 4b68f60..65dde30 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/ModerateGui.java +++ b/src/main/java/com/craftaro/ultimatemoderation/gui/ModerateGui.java @@ -1,12 +1,12 @@ -package com.songoda.ultimatemoderation.gui; +package com.craftaro.ultimatemoderation.gui; import com.craftaro.core.gui.Gui; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.TextUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.moderate.AbstractModeration; -import com.songoda.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.moderate.AbstractModeration; +import com.craftaro.ultimatemoderation.settings.Settings; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/NotesManagerGui.java b/src/main/java/com/craftaro/ultimatemoderation/gui/NotesManagerGui.java similarity index 94% rename from src/main/java/com/songoda/ultimatemoderation/gui/NotesManagerGui.java rename to src/main/java/com/craftaro/ultimatemoderation/gui/NotesManagerGui.java index 95e33d8..f021a57 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/NotesManagerGui.java +++ b/src/main/java/com/craftaro/ultimatemoderation/gui/NotesManagerGui.java @@ -1,13 +1,13 @@ -package com.songoda.ultimatemoderation.gui; +package com.craftaro.ultimatemoderation.gui; import com.craftaro.core.gui.Gui; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.input.ChatPrompt; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.TextUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.PunishmentNote; -import com.songoda.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.PunishmentNote; +import com.craftaro.ultimatemoderation.settings.Settings; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; @@ -85,7 +85,7 @@ public class NotesManagerGui extends Gui { event.player.getUniqueId(), this.toModerate.getUniqueId(), System.currentTimeMillis()); this.plugin.getPunishmentManager().getPlayer(this.toModerate).addNotes(note); - this.plugin.getDataManager().createNote(note); + this.plugin.getDataHelper().createNote(note); showPage(); }).setOnClose(() -> this.guiManager.showGUI(event.player, new NotesManagerGui(this.plugin, this.toModerate, event.player))); @@ -137,7 +137,7 @@ public class NotesManagerGui extends Gui { (event) -> { if (this.delete) { this.plugin.getPunishmentManager().getPlayer(this.toModerate).removeNotes(note); - this.plugin.getDataManager().deleteNote(note); + this.plugin.getDataHelper().deleteNote(note); showPage(); } }); diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/PlayerGui.java b/src/main/java/com/craftaro/ultimatemoderation/gui/PlayerGui.java similarity index 96% rename from src/main/java/com/songoda/ultimatemoderation/gui/PlayerGui.java rename to src/main/java/com/craftaro/ultimatemoderation/gui/PlayerGui.java index 8269e6b..b5655d7 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/PlayerGui.java +++ b/src/main/java/com/craftaro/ultimatemoderation/gui/PlayerGui.java @@ -1,12 +1,12 @@ -package com.songoda.ultimatemoderation.gui; +package com.craftaro.ultimatemoderation.gui; import com.craftaro.core.gui.Gui; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.ItemUtils; import com.craftaro.core.utils.TextUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.settings.Settings; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/PunishGui.java b/src/main/java/com/craftaro/ultimatemoderation/gui/PunishGui.java similarity index 96% rename from src/main/java/com/songoda/ultimatemoderation/gui/PunishGui.java rename to src/main/java/com/craftaro/ultimatemoderation/gui/PunishGui.java index 20fe185..cd75834 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/PunishGui.java +++ b/src/main/java/com/craftaro/ultimatemoderation/gui/PunishGui.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.gui; +package com.craftaro.ultimatemoderation.gui; import com.craftaro.core.gui.AnvilGui; import com.craftaro.core.gui.Gui; @@ -7,11 +7,11 @@ import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.ItemUtils; import com.craftaro.core.utils.TextUtils; import com.craftaro.core.utils.TimeUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.Punishment; -import com.songoda.ultimatemoderation.punish.PunishmentType; -import com.songoda.ultimatemoderation.punish.template.Template; -import com.songoda.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.Punishment; +import com.craftaro.ultimatemoderation.punish.PunishmentType; +import com.craftaro.ultimatemoderation.punish.template.Template; +import com.craftaro.ultimatemoderation.settings.Settings; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.OfflinePlayer; @@ -314,8 +314,8 @@ public class PunishGui extends Gui { Template template = new Template(this.type, this.duration, this.reason, this.template.getCreator(), this.templateName); this.plugin.getTemplateManager().removeTemplate(this.template); this.plugin.getTemplateManager().addTemplate(template); - this.plugin.getDataManager().deleteTemplate(this.template); - this.plugin.getDataManager().createTemplate(template); + this.plugin.getDataHelper().deleteTemplate(this.template); + this.plugin.getDataHelper().createTemplate(template); this.justSaved = true; if (this.toModerate == null) { this.guiManager.showGUI(this.player, new TemplateManagerGui(this.plugin, this.player)); @@ -325,7 +325,7 @@ public class PunishGui extends Gui { private void finishTemplate() { Template template = new Template(this.type, this.duration, this.reason, this.player, this.templateName); this.plugin.getTemplateManager().addTemplate(template); - this.plugin.getDataManager().createTemplate(template); + this.plugin.getDataHelper().createTemplate(template); this.template = template; if (this.toModerate == null) { this.guiManager.showGUI(this.player, new TemplateManagerGui(this.plugin, this.player)); diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/PunishmentsGui.java b/src/main/java/com/craftaro/ultimatemoderation/gui/PunishmentsGui.java similarity index 94% rename from src/main/java/com/songoda/ultimatemoderation/gui/PunishmentsGui.java rename to src/main/java/com/craftaro/ultimatemoderation/gui/PunishmentsGui.java index b7f424f..ab30c57 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/PunishmentsGui.java +++ b/src/main/java/com/craftaro/ultimatemoderation/gui/PunishmentsGui.java @@ -1,15 +1,15 @@ -package com.songoda.ultimatemoderation.gui; +package com.craftaro.ultimatemoderation.gui; import com.craftaro.core.gui.Gui; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.TextUtils; import com.craftaro.core.utils.TimeUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.AppliedPunishment; -import com.songoda.ultimatemoderation.punish.PunishmentType; -import com.songoda.ultimatemoderation.punish.player.PlayerPunishData; -import com.songoda.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.AppliedPunishment; +import com.craftaro.ultimatemoderation.punish.PunishmentType; +import com.craftaro.ultimatemoderation.punish.player.PlayerPunishData; +import com.craftaro.ultimatemoderation.settings.Settings; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.inventory.ItemStack; @@ -150,7 +150,7 @@ public class PunishmentsGui extends Gui { if (appliedPunishment.getPunishmentType() != PunishmentType.KICK && activity == Activity.ACTIVE) { appliedPunishment.expire(); - this.plugin.getDataManager().updateAppliedPunishment(appliedPunishment); + this.plugin.getDataHelper().updateAppliedPunishment(appliedPunishment); showPage(); } }); diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/TemplateManagerGui.java b/src/main/java/com/craftaro/ultimatemoderation/gui/TemplateManagerGui.java similarity index 93% rename from src/main/java/com/songoda/ultimatemoderation/gui/TemplateManagerGui.java rename to src/main/java/com/craftaro/ultimatemoderation/gui/TemplateManagerGui.java index 520c4a5..5c953ac 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/TemplateManagerGui.java +++ b/src/main/java/com/craftaro/ultimatemoderation/gui/TemplateManagerGui.java @@ -1,13 +1,13 @@ -package com.songoda.ultimatemoderation.gui; +package com.craftaro.ultimatemoderation.gui; import com.craftaro.core.gui.Gui; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.TextUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.PunishmentType; -import com.songoda.ultimatemoderation.punish.template.Template; -import com.songoda.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.PunishmentType; +import com.craftaro.ultimatemoderation.punish.template.Template; +import com.craftaro.ultimatemoderation.settings.Settings; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.ItemStack; @@ -107,7 +107,7 @@ public class TemplateManagerGui extends Gui { } else if (event.clickType == ClickType.RIGHT) { if (this.player.hasPermission("um.templates.destroy")) { this.plugin.getTemplateManager().removeTemplate(template); - this.plugin.getDataManager().deleteTemplate(template); + this.plugin.getDataHelper().deleteTemplate(template); } toCurrentPage(); diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/TemplateSelectorGui.java b/src/main/java/com/craftaro/ultimatemoderation/gui/TemplateSelectorGui.java similarity index 92% rename from src/main/java/com/songoda/ultimatemoderation/gui/TemplateSelectorGui.java rename to src/main/java/com/craftaro/ultimatemoderation/gui/TemplateSelectorGui.java index 5c19ea0..c7bfeca 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/TemplateSelectorGui.java +++ b/src/main/java/com/craftaro/ultimatemoderation/gui/TemplateSelectorGui.java @@ -1,11 +1,11 @@ -package com.songoda.ultimatemoderation.gui; +package com.craftaro.ultimatemoderation.gui; import com.craftaro.core.gui.Gui; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.TextUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.template.Template; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.template.Template; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/TicketGui.java b/src/main/java/com/craftaro/ultimatemoderation/gui/TicketGui.java similarity index 92% rename from src/main/java/com/songoda/ultimatemoderation/gui/TicketGui.java rename to src/main/java/com/craftaro/ultimatemoderation/gui/TicketGui.java index f7c4c85..96074a0 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/TicketGui.java +++ b/src/main/java/com/craftaro/ultimatemoderation/gui/TicketGui.java @@ -1,16 +1,16 @@ -package com.songoda.ultimatemoderation.gui; +package com.craftaro.ultimatemoderation.gui; import com.craftaro.core.gui.Gui; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.input.ChatPrompt; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.TextUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.settings.Settings; -import com.songoda.ultimatemoderation.staffchat.StaffChatManager; -import com.songoda.ultimatemoderation.tickets.Ticket; -import com.songoda.ultimatemoderation.tickets.TicketResponse; -import com.songoda.ultimatemoderation.tickets.TicketStatus; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.staffchat.StaffChatManager; +import com.craftaro.ultimatemoderation.tickets.Ticket; +import com.craftaro.ultimatemoderation.tickets.TicketResponse; +import com.craftaro.ultimatemoderation.tickets.TicketStatus; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; @@ -82,7 +82,7 @@ public class TicketGui extends Gui { setButton(5, 3, GuiUtils.createButtonItem(XMaterial.LEVER, TextUtils.formatText("&6" + this.ticket.getStatus().getStatus())), (event) -> { this.ticket.setStatus(this.ticket.getStatus() == TicketStatus.OPEN ? TicketStatus.CLOSED : TicketStatus.OPEN); - this.plugin.getDataManager().updateTicket(this.ticket); + this.plugin.getDataHelper().updateTicket(this.ticket); // Notify staff of ticket status this.chatManager.getChat("ticket").messageAll(this.plugin.getLocale().getMessage("notify.ticket.status").getMessage().replace("%tid%", String.valueOf(this.ticket.getId())).replace("%type%", this.ticket.getType()).replace("%player%", Bukkit.getPlayer(this.ticket.getVictim()).getDisplayName()).replace("%status%", this.ticket.getStatus().toString())); showPage(); @@ -106,7 +106,7 @@ public class TicketGui extends Gui { (event) -> { ChatPrompt.showPrompt(this.plugin, this.player, this.plugin.getLocale().getMessage("gui.ticket.what").getMessage(), (evnt) -> { TicketResponse response = this.ticket.addResponse(new TicketResponse(this.player, evnt.getMessage(), System.currentTimeMillis())); - this.plugin.getDataManager().createTicketResponse(response); + this.plugin.getDataHelper().createTicketResponse(response); // Notify staff of ticket response. this.chatManager.getChat("ticket").messageAll(this.plugin.getLocale().getMessage("notify.ticket.response").getMessage().replace("%tid%", "" + this.ticket.getId()).replace("%type%", this.ticket.getType()).replace("%player%", Bukkit.getPlayer(this.ticket.getVictim()).getDisplayName())); showPage(); diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/TicketManagerGui.java b/src/main/java/com/craftaro/ultimatemoderation/gui/TicketManagerGui.java similarity index 96% rename from src/main/java/com/songoda/ultimatemoderation/gui/TicketManagerGui.java rename to src/main/java/com/craftaro/ultimatemoderation/gui/TicketManagerGui.java index 4b77a92..c0b32ae 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/TicketManagerGui.java +++ b/src/main/java/com/craftaro/ultimatemoderation/gui/TicketManagerGui.java @@ -1,14 +1,14 @@ -package com.songoda.ultimatemoderation.gui; +package com.craftaro.ultimatemoderation.gui; import com.craftaro.core.gui.AnvilGui; import com.craftaro.core.gui.Gui; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.TextUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.settings.Settings; -import com.songoda.ultimatemoderation.tickets.Ticket; -import com.songoda.ultimatemoderation.tickets.TicketStatus; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.tickets.Ticket; +import com.craftaro.ultimatemoderation.tickets.TicketStatus; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/TicketTypeGui.java b/src/main/java/com/craftaro/ultimatemoderation/gui/TicketTypeGui.java similarity index 83% rename from src/main/java/com/songoda/ultimatemoderation/gui/TicketTypeGui.java rename to src/main/java/com/craftaro/ultimatemoderation/gui/TicketTypeGui.java index 88687ba..4deda62 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/TicketTypeGui.java +++ b/src/main/java/com/craftaro/ultimatemoderation/gui/TicketTypeGui.java @@ -1,14 +1,14 @@ -package com.songoda.ultimatemoderation.gui; +package com.craftaro.ultimatemoderation.gui; import com.craftaro.core.gui.Gui; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.input.ChatPrompt; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.settings.Settings; -import com.songoda.ultimatemoderation.staffchat.StaffChatManager; -import com.songoda.ultimatemoderation.tickets.Ticket; -import com.songoda.ultimatemoderation.tickets.TicketResponse; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.staffchat.StaffChatManager; +import com.craftaro.ultimatemoderation.tickets.Ticket; +import com.craftaro.ultimatemoderation.tickets.TicketResponse; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; @@ -43,7 +43,7 @@ public class TicketTypeGui extends Gui { ticket.setLocation(player.getLocation()); } ticket.addResponse(new TicketResponse(player, event2.getMessage(), System.currentTimeMillis())); - plugin.getDataManager().createTicket(ticket); + plugin.getDataHelper().createTicket(ticket); }).setOnClose(() -> this.guiManager.showGUI(event.player, new TicketGui(plugin, ticket, toModerate, player))); }); diff --git a/src/main/java/com/songoda/ultimatemoderation/listeners/BlockListener.java b/src/main/java/com/craftaro/ultimatemoderation/listeners/BlockListener.java similarity index 90% rename from src/main/java/com/songoda/ultimatemoderation/listeners/BlockListener.java rename to src/main/java/com/craftaro/ultimatemoderation/listeners/BlockListener.java index acc25f3..8aeb0d6 100644 --- a/src/main/java/com/songoda/ultimatemoderation/listeners/BlockListener.java +++ b/src/main/java/com/craftaro/ultimatemoderation/listeners/BlockListener.java @@ -1,7 +1,7 @@ -package com.songoda.ultimatemoderation.listeners; +package com.craftaro.ultimatemoderation.listeners; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.staffchat.StaffChatManager; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.staffchat.StaffChatManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/main/java/com/songoda/ultimatemoderation/listeners/ChatListener.java b/src/main/java/com/craftaro/ultimatemoderation/listeners/ChatListener.java similarity index 91% rename from src/main/java/com/songoda/ultimatemoderation/listeners/ChatListener.java rename to src/main/java/com/craftaro/ultimatemoderation/listeners/ChatListener.java index 3a0a0d9..b5b8b10 100644 --- a/src/main/java/com/songoda/ultimatemoderation/listeners/ChatListener.java +++ b/src/main/java/com/craftaro/ultimatemoderation/listeners/ChatListener.java @@ -1,11 +1,11 @@ -package com.songoda.ultimatemoderation.listeners; +package com.craftaro.ultimatemoderation.listeners; import com.craftaro.core.utils.TimeUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.AppliedPunishment; -import com.songoda.ultimatemoderation.punish.PunishmentType; -import com.songoda.ultimatemoderation.settings.Settings; -import com.songoda.ultimatemoderation.staffchat.StaffChannel; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.staffchat.StaffChannel; +import com.craftaro.ultimatemoderation.punish.AppliedPunishment; +import com.craftaro.ultimatemoderation.punish.PunishmentType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/main/java/com/songoda/ultimatemoderation/listeners/CommandListener.java b/src/main/java/com/craftaro/ultimatemoderation/listeners/CommandListener.java similarity index 85% rename from src/main/java/com/songoda/ultimatemoderation/listeners/CommandListener.java rename to src/main/java/com/craftaro/ultimatemoderation/listeners/CommandListener.java index 97aede2..6f3f096 100644 --- a/src/main/java/com/songoda/ultimatemoderation/listeners/CommandListener.java +++ b/src/main/java/com/craftaro/ultimatemoderation/listeners/CommandListener.java @@ -1,10 +1,10 @@ -package com.songoda.ultimatemoderation.listeners; +package com.craftaro.ultimatemoderation.listeners; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.moderate.moderations.SpyModeration; -import com.songoda.ultimatemoderation.punish.AppliedPunishment; -import com.songoda.ultimatemoderation.punish.PunishmentType; -import com.songoda.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.moderate.moderations.SpyModeration; +import com.craftaro.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.punish.AppliedPunishment; +import com.craftaro.ultimatemoderation.punish.PunishmentType; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/songoda/ultimatemoderation/listeners/DeathListener.java b/src/main/java/com/craftaro/ultimatemoderation/listeners/DeathListener.java similarity index 93% rename from src/main/java/com/songoda/ultimatemoderation/listeners/DeathListener.java rename to src/main/java/com/craftaro/ultimatemoderation/listeners/DeathListener.java index d3ec0b5..d133c1c 100644 --- a/src/main/java/com/songoda/ultimatemoderation/listeners/DeathListener.java +++ b/src/main/java/com/craftaro/ultimatemoderation/listeners/DeathListener.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.listeners; +package com.craftaro.ultimatemoderation.listeners; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/songoda/ultimatemoderation/listeners/DropListener.java b/src/main/java/com/craftaro/ultimatemoderation/listeners/DropListener.java similarity index 78% rename from src/main/java/com/songoda/ultimatemoderation/listeners/DropListener.java rename to src/main/java/com/craftaro/ultimatemoderation/listeners/DropListener.java index 28529d4..3105933 100644 --- a/src/main/java/com/songoda/ultimatemoderation/listeners/DropListener.java +++ b/src/main/java/com/craftaro/ultimatemoderation/listeners/DropListener.java @@ -1,7 +1,7 @@ -package com.songoda.ultimatemoderation.listeners; +package com.craftaro.ultimatemoderation.listeners; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.moderate.moderations.FreezeModeration; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.moderate.moderations.FreezeModeration; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/com/songoda/ultimatemoderation/listeners/InventoryListener.java b/src/main/java/com/craftaro/ultimatemoderation/listeners/InventoryListener.java similarity index 80% rename from src/main/java/com/songoda/ultimatemoderation/listeners/InventoryListener.java rename to src/main/java/com/craftaro/ultimatemoderation/listeners/InventoryListener.java index b52c806..6770c53 100644 --- a/src/main/java/com/songoda/ultimatemoderation/listeners/InventoryListener.java +++ b/src/main/java/com/craftaro/ultimatemoderation/listeners/InventoryListener.java @@ -1,7 +1,7 @@ -package com.songoda.ultimatemoderation.listeners; +package com.craftaro.ultimatemoderation.listeners; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.moderate.moderations.FreezeModeration; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.moderate.moderations.FreezeModeration; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/com/songoda/ultimatemoderation/listeners/LoginListener.java b/src/main/java/com/craftaro/ultimatemoderation/listeners/LoginListener.java similarity index 80% rename from src/main/java/com/songoda/ultimatemoderation/listeners/LoginListener.java rename to src/main/java/com/craftaro/ultimatemoderation/listeners/LoginListener.java index 1d35905..a99a33f 100644 --- a/src/main/java/com/songoda/ultimatemoderation/listeners/LoginListener.java +++ b/src/main/java/com/craftaro/ultimatemoderation/listeners/LoginListener.java @@ -1,11 +1,11 @@ -package com.songoda.ultimatemoderation.listeners; +package com.craftaro.ultimatemoderation.listeners; import com.craftaro.core.utils.TimeUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.commands.CommandVanish; -import com.songoda.ultimatemoderation.punish.AppliedPunishment; -import com.songoda.ultimatemoderation.punish.PunishmentType; -import com.songoda.ultimatemoderation.punish.player.PlayerPunishData; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.commands.CommandVanish; +import com.craftaro.ultimatemoderation.punish.AppliedPunishment; +import com.craftaro.ultimatemoderation.punish.PunishmentType; +import com.craftaro.ultimatemoderation.punish.player.PlayerPunishData; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/com/songoda/ultimatemoderation/listeners/MobTargetLister.java b/src/main/java/com/craftaro/ultimatemoderation/listeners/MobTargetLister.java similarity index 86% rename from src/main/java/com/songoda/ultimatemoderation/listeners/MobTargetLister.java rename to src/main/java/com/craftaro/ultimatemoderation/listeners/MobTargetLister.java index a0dc8a5..dcc539f 100644 --- a/src/main/java/com/songoda/ultimatemoderation/listeners/MobTargetLister.java +++ b/src/main/java/com/craftaro/ultimatemoderation/listeners/MobTargetLister.java @@ -1,6 +1,6 @@ -package com.songoda.ultimatemoderation.listeners; +package com.craftaro.ultimatemoderation.listeners; -import com.songoda.ultimatemoderation.commands.CommandVanish; +import com.craftaro.ultimatemoderation.commands.CommandVanish; import org.bukkit.entity.Monster; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/songoda/ultimatemoderation/listeners/MoveListener.java b/src/main/java/com/craftaro/ultimatemoderation/listeners/MoveListener.java similarity index 78% rename from src/main/java/com/songoda/ultimatemoderation/listeners/MoveListener.java rename to src/main/java/com/craftaro/ultimatemoderation/listeners/MoveListener.java index 13aaf4e..d45083e 100644 --- a/src/main/java/com/songoda/ultimatemoderation/listeners/MoveListener.java +++ b/src/main/java/com/craftaro/ultimatemoderation/listeners/MoveListener.java @@ -1,7 +1,7 @@ -package com.songoda.ultimatemoderation.listeners; +package com.craftaro.ultimatemoderation.listeners; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.moderate.moderations.FreezeModeration; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.moderate.moderations.FreezeModeration; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/com/songoda/ultimatemoderation/listeners/SkyBlockListener.java b/src/main/java/com/craftaro/ultimatemoderation/listeners/SkyBlockListener.java similarity index 88% rename from src/main/java/com/songoda/ultimatemoderation/listeners/SkyBlockListener.java rename to src/main/java/com/craftaro/ultimatemoderation/listeners/SkyBlockListener.java index 19c5a35..dd5e6fe 100644 --- a/src/main/java/com/songoda/ultimatemoderation/listeners/SkyBlockListener.java +++ b/src/main/java/com/craftaro/ultimatemoderation/listeners/SkyBlockListener.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.listeners; +package com.craftaro.ultimatemoderation.listeners; import com.songoda.skyblock.api.event.player.PlayerIslandChatEvent; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/songoda/ultimatemoderation/listeners/SpyingDismountListener.java b/src/main/java/com/craftaro/ultimatemoderation/listeners/SpyingDismountListener.java similarity index 91% rename from src/main/java/com/songoda/ultimatemoderation/listeners/SpyingDismountListener.java rename to src/main/java/com/craftaro/ultimatemoderation/listeners/SpyingDismountListener.java index d12b0d4..a9218a6 100644 --- a/src/main/java/com/songoda/ultimatemoderation/listeners/SpyingDismountListener.java +++ b/src/main/java/com/craftaro/ultimatemoderation/listeners/SpyingDismountListener.java @@ -1,7 +1,7 @@ -package com.songoda.ultimatemoderation.listeners; +package com.craftaro.ultimatemoderation.listeners; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.moderate.moderations.SpyModeration; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.moderate.moderations.SpyModeration; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/moderate/AbstractModeration.java b/src/main/java/com/craftaro/ultimatemoderation/moderate/AbstractModeration.java similarity index 92% rename from src/main/java/com/songoda/ultimatemoderation/moderate/AbstractModeration.java rename to src/main/java/com/craftaro/ultimatemoderation/moderate/AbstractModeration.java index 897a669..893337e 100644 --- a/src/main/java/com/songoda/ultimatemoderation/moderate/AbstractModeration.java +++ b/src/main/java/com/craftaro/ultimatemoderation/moderate/AbstractModeration.java @@ -1,8 +1,8 @@ -package com.songoda.ultimatemoderation.moderate; +package com.craftaro.ultimatemoderation.moderate; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.utils.VaultPermissions; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.utils.VaultPermissions; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/moderate/GenericModerationCommand.java b/src/main/java/com/craftaro/ultimatemoderation/moderate/GenericModerationCommand.java similarity index 94% rename from src/main/java/com/songoda/ultimatemoderation/moderate/GenericModerationCommand.java rename to src/main/java/com/craftaro/ultimatemoderation/moderate/GenericModerationCommand.java index 54b2e25..3b4f583 100644 --- a/src/main/java/com/songoda/ultimatemoderation/moderate/GenericModerationCommand.java +++ b/src/main/java/com/craftaro/ultimatemoderation/moderate/GenericModerationCommand.java @@ -1,7 +1,7 @@ -package com.songoda.ultimatemoderation.moderate; +package com.craftaro.ultimatemoderation.moderate; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.UltimateModeration; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/ultimatemoderation/moderate/ModerationManager.java b/src/main/java/com/craftaro/ultimatemoderation/moderate/ModerationManager.java similarity index 67% rename from src/main/java/com/songoda/ultimatemoderation/moderate/ModerationManager.java rename to src/main/java/com/craftaro/ultimatemoderation/moderate/ModerationManager.java index 54d01e6..0ca79b8 100644 --- a/src/main/java/com/songoda/ultimatemoderation/moderate/ModerationManager.java +++ b/src/main/java/com/craftaro/ultimatemoderation/moderate/ModerationManager.java @@ -1,11 +1,11 @@ -package com.songoda.ultimatemoderation.moderate; +package com.craftaro.ultimatemoderation.moderate; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.moderate.moderations.FreezeModeration; -import com.songoda.ultimatemoderation.moderate.moderations.InvSeeModeration; -import com.songoda.ultimatemoderation.moderate.moderations.ReviveModeration; -import com.songoda.ultimatemoderation.moderate.moderations.SpyModeration; -import com.songoda.ultimatemoderation.moderate.moderations.ViewEnderChestModeration; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.moderate.moderations.FreezeModeration; +import com.craftaro.ultimatemoderation.moderate.moderations.InvSeeModeration; +import com.craftaro.ultimatemoderation.moderate.moderations.ReviveModeration; +import com.craftaro.ultimatemoderation.moderate.moderations.SpyModeration; +import com.craftaro.ultimatemoderation.moderate.moderations.ViewEnderChestModeration; import java.util.Collections; import java.util.Map; diff --git a/src/main/java/com/songoda/ultimatemoderation/moderate/ModerationType.java b/src/main/java/com/craftaro/ultimatemoderation/moderate/ModerationType.java similarity index 60% rename from src/main/java/com/songoda/ultimatemoderation/moderate/ModerationType.java rename to src/main/java/com/craftaro/ultimatemoderation/moderate/ModerationType.java index 0d89726..c94f47d 100644 --- a/src/main/java/com/songoda/ultimatemoderation/moderate/ModerationType.java +++ b/src/main/java/com/craftaro/ultimatemoderation/moderate/ModerationType.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.moderate; +package com.craftaro.ultimatemoderation.moderate; public enum ModerationType { FREEZE, SPY, INV_SEE, ENDER_VIEW, REVIVE diff --git a/src/main/java/com/songoda/ultimatemoderation/moderate/moderations/FreezeModeration.java b/src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/FreezeModeration.java similarity index 88% rename from src/main/java/com/songoda/ultimatemoderation/moderate/moderations/FreezeModeration.java rename to src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/FreezeModeration.java index 21dcd3f..27bb2bd 100644 --- a/src/main/java/com/songoda/ultimatemoderation/moderate/moderations/FreezeModeration.java +++ b/src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/FreezeModeration.java @@ -1,9 +1,9 @@ -package com.songoda.ultimatemoderation.moderate.moderations; +package com.craftaro.ultimatemoderation.moderate.moderations; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.moderate.AbstractModeration; -import com.songoda.ultimatemoderation.moderate.ModerationType; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.moderate.AbstractModeration; +import com.craftaro.ultimatemoderation.moderate.ModerationType; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/ultimatemoderation/moderate/moderations/InvSeeModeration.java b/src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/InvSeeModeration.java similarity index 80% rename from src/main/java/com/songoda/ultimatemoderation/moderate/moderations/InvSeeModeration.java rename to src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/InvSeeModeration.java index 966beb6..1c767cd 100644 --- a/src/main/java/com/songoda/ultimatemoderation/moderate/moderations/InvSeeModeration.java +++ b/src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/InvSeeModeration.java @@ -1,9 +1,9 @@ -package com.songoda.ultimatemoderation.moderate.moderations; +package com.craftaro.ultimatemoderation.moderate.moderations; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.moderate.AbstractModeration; -import com.songoda.ultimatemoderation.moderate.ModerationType; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.moderate.AbstractModeration; +import com.craftaro.ultimatemoderation.moderate.ModerationType; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/moderate/moderations/ReviveModeration.java b/src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/ReviveModeration.java similarity index 84% rename from src/main/java/com/songoda/ultimatemoderation/moderate/moderations/ReviveModeration.java rename to src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/ReviveModeration.java index 39a9413..f599019 100644 --- a/src/main/java/com/songoda/ultimatemoderation/moderate/moderations/ReviveModeration.java +++ b/src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/ReviveModeration.java @@ -1,11 +1,11 @@ -package com.songoda.ultimatemoderation.moderate.moderations; +package com.craftaro.ultimatemoderation.moderate.moderations; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.PlayerUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.listeners.DeathListener; -import com.songoda.ultimatemoderation.moderate.AbstractModeration; -import com.songoda.ultimatemoderation.moderate.ModerationType; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.listeners.DeathListener; +import com.craftaro.ultimatemoderation.moderate.AbstractModeration; +import com.craftaro.ultimatemoderation.moderate.ModerationType; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/moderate/moderations/SpyModeration.java b/src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/SpyModeration.java similarity index 91% rename from src/main/java/com/songoda/ultimatemoderation/moderate/moderations/SpyModeration.java rename to src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/SpyModeration.java index 2f54d00..b8669c0 100644 --- a/src/main/java/com/songoda/ultimatemoderation/moderate/moderations/SpyModeration.java +++ b/src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/SpyModeration.java @@ -1,12 +1,12 @@ -package com.songoda.ultimatemoderation.moderate.moderations; +package com.craftaro.ultimatemoderation.moderate.moderations; import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.commands.CommandVanish; -import com.songoda.ultimatemoderation.listeners.SpyingDismountListener; -import com.songoda.ultimatemoderation.moderate.AbstractModeration; -import com.songoda.ultimatemoderation.moderate.ModerationType; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.commands.CommandVanish; +import com.craftaro.ultimatemoderation.listeners.SpyingDismountListener; +import com.craftaro.ultimatemoderation.moderate.AbstractModeration; +import com.craftaro.ultimatemoderation.moderate.ModerationType; import org.bukkit.Location; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/ultimatemoderation/moderate/moderations/ViewEnderChestModeration.java b/src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/ViewEnderChestModeration.java similarity index 80% rename from src/main/java/com/songoda/ultimatemoderation/moderate/moderations/ViewEnderChestModeration.java rename to src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/ViewEnderChestModeration.java index af1873f..146dbfa 100644 --- a/src/main/java/com/songoda/ultimatemoderation/moderate/moderations/ViewEnderChestModeration.java +++ b/src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/ViewEnderChestModeration.java @@ -1,9 +1,9 @@ -package com.songoda.ultimatemoderation.moderate.moderations; +package com.craftaro.ultimatemoderation.moderate.moderations; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.moderate.AbstractModeration; -import com.songoda.ultimatemoderation.moderate.ModerationType; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.moderate.ModerationType; +import com.craftaro.ultimatemoderation.moderate.AbstractModeration; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/punish/AppliedPunishment.java b/src/main/java/com/craftaro/ultimatemoderation/punish/AppliedPunishment.java similarity index 96% rename from src/main/java/com/songoda/ultimatemoderation/punish/AppliedPunishment.java rename to src/main/java/com/craftaro/ultimatemoderation/punish/AppliedPunishment.java index 35b3bea..6407801 100644 --- a/src/main/java/com/songoda/ultimatemoderation/punish/AppliedPunishment.java +++ b/src/main/java/com/craftaro/ultimatemoderation/punish/AppliedPunishment.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.punish; +package com.craftaro.ultimatemoderation.punish; import java.util.UUID; diff --git a/src/main/java/com/songoda/ultimatemoderation/punish/Punishment.java b/src/main/java/com/craftaro/ultimatemoderation/punish/Punishment.java similarity index 95% rename from src/main/java/com/songoda/ultimatemoderation/punish/Punishment.java rename to src/main/java/com/craftaro/ultimatemoderation/punish/Punishment.java index 7b3ea28..152794c 100644 --- a/src/main/java/com/songoda/ultimatemoderation/punish/Punishment.java +++ b/src/main/java/com/craftaro/ultimatemoderation/punish/Punishment.java @@ -1,9 +1,9 @@ -package com.songoda.ultimatemoderation.punish; +package com.craftaro.ultimatemoderation.punish; import com.craftaro.core.utils.TextUtils; import com.craftaro.core.utils.TimeUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.player.PlayerPunishData; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.player.PlayerPunishData; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; @@ -106,7 +106,7 @@ public class Punishment { appliedPunishment.expire(); playerPunishData.addExpiredPunishment(appliedPunishment); } - plugin.getDataManager().createAppliedPunishment(appliedPunishment); + plugin.getDataHelper().createAppliedPunishment(appliedPunishment); } public void sendMessage(OfflinePlayer offlineVictim) { diff --git a/src/main/java/com/songoda/ultimatemoderation/punish/PunishmentNote.java b/src/main/java/com/craftaro/ultimatemoderation/punish/PunishmentNote.java similarity index 95% rename from src/main/java/com/songoda/ultimatemoderation/punish/PunishmentNote.java rename to src/main/java/com/craftaro/ultimatemoderation/punish/PunishmentNote.java index 86f93e5..8f34220 100644 --- a/src/main/java/com/songoda/ultimatemoderation/punish/PunishmentNote.java +++ b/src/main/java/com/craftaro/ultimatemoderation/punish/PunishmentNote.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.punish; +package com.craftaro.ultimatemoderation.punish; import java.util.UUID; diff --git a/src/main/java/com/songoda/ultimatemoderation/punish/PunishmentType.java b/src/main/java/com/craftaro/ultimatemoderation/punish/PunishmentType.java similarity index 86% rename from src/main/java/com/songoda/ultimatemoderation/punish/PunishmentType.java rename to src/main/java/com/craftaro/ultimatemoderation/punish/PunishmentType.java index ea41407..ce6d44f 100644 --- a/src/main/java/com/songoda/ultimatemoderation/punish/PunishmentType.java +++ b/src/main/java/com/craftaro/ultimatemoderation/punish/PunishmentType.java @@ -1,6 +1,6 @@ -package com.songoda.ultimatemoderation.punish; +package com.craftaro.ultimatemoderation.punish; -import com.songoda.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.UltimateModeration; public enum PunishmentType { ALL, BAN, KICK, WARNING, MUTE; diff --git a/src/main/java/com/songoda/ultimatemoderation/punish/player/PlayerPunishData.java b/src/main/java/com/craftaro/ultimatemoderation/punish/player/PlayerPunishData.java similarity index 90% rename from src/main/java/com/songoda/ultimatemoderation/punish/player/PlayerPunishData.java rename to src/main/java/com/craftaro/ultimatemoderation/punish/player/PlayerPunishData.java index 6a64e3c..ea6a4af 100644 --- a/src/main/java/com/songoda/ultimatemoderation/punish/player/PlayerPunishData.java +++ b/src/main/java/com/craftaro/ultimatemoderation/punish/player/PlayerPunishData.java @@ -1,9 +1,9 @@ -package com.songoda.ultimatemoderation.punish.player; +package com.craftaro.ultimatemoderation.punish.player; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.punish.AppliedPunishment; -import com.songoda.ultimatemoderation.punish.PunishmentNote; -import com.songoda.ultimatemoderation.punish.PunishmentType; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.punish.AppliedPunishment; +import com.craftaro.ultimatemoderation.punish.PunishmentNote; +import com.craftaro.ultimatemoderation.punish.PunishmentType; import java.util.ArrayList; import java.util.Arrays; @@ -105,7 +105,7 @@ public class PlayerPunishData { this.activePunishments.stream().filter(appliedPunishment -> type == appliedPunishment.getPunishmentType()).forEach(appliedPunishment -> { appliedPunishment.expire(); - UltimateModeration.getInstance().getDataManager().updateAppliedPunishment(appliedPunishment); + UltimateModeration.getInstance().getDataHelper().updateAppliedPunishment(appliedPunishment); toAudit.add(appliedPunishment); }); toAudit.forEach(appliedPunishment -> this.audit(true, type)); diff --git a/src/main/java/com/songoda/ultimatemoderation/punish/player/PunishmentManager.java b/src/main/java/com/craftaro/ultimatemoderation/punish/player/PunishmentManager.java similarity index 92% rename from src/main/java/com/songoda/ultimatemoderation/punish/player/PunishmentManager.java rename to src/main/java/com/craftaro/ultimatemoderation/punish/player/PunishmentManager.java index 14f57d1..c9b9bf9 100644 --- a/src/main/java/com/songoda/ultimatemoderation/punish/player/PunishmentManager.java +++ b/src/main/java/com/craftaro/ultimatemoderation/punish/player/PunishmentManager.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.punish.player; +package com.craftaro.ultimatemoderation.punish.player; import org.bukkit.OfflinePlayer; diff --git a/src/main/java/com/songoda/ultimatemoderation/punish/template/Template.java b/src/main/java/com/craftaro/ultimatemoderation/punish/template/Template.java similarity index 85% rename from src/main/java/com/songoda/ultimatemoderation/punish/template/Template.java rename to src/main/java/com/craftaro/ultimatemoderation/punish/template/Template.java index 0e72835..6686201 100644 --- a/src/main/java/com/songoda/ultimatemoderation/punish/template/Template.java +++ b/src/main/java/com/craftaro/ultimatemoderation/punish/template/Template.java @@ -1,7 +1,7 @@ -package com.songoda.ultimatemoderation.punish.template; +package com.craftaro.ultimatemoderation.punish.template; -import com.songoda.ultimatemoderation.punish.Punishment; -import com.songoda.ultimatemoderation.punish.PunishmentType; +import com.craftaro.ultimatemoderation.punish.Punishment; +import com.craftaro.ultimatemoderation.punish.PunishmentType; import org.bukkit.entity.Player; import java.util.UUID; diff --git a/src/main/java/com/songoda/ultimatemoderation/punish/template/TemplateManager.java b/src/main/java/com/craftaro/ultimatemoderation/punish/template/TemplateManager.java similarity index 94% rename from src/main/java/com/songoda/ultimatemoderation/punish/template/TemplateManager.java rename to src/main/java/com/craftaro/ultimatemoderation/punish/template/TemplateManager.java index f08da1e..d96f5f8 100644 --- a/src/main/java/com/songoda/ultimatemoderation/punish/template/TemplateManager.java +++ b/src/main/java/com/craftaro/ultimatemoderation/punish/template/TemplateManager.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.punish.template; +package com.craftaro.ultimatemoderation.punish.template; import java.util.Collections; import java.util.LinkedList; diff --git a/src/main/java/com/songoda/ultimatemoderation/settings/Settings.java b/src/main/java/com/craftaro/ultimatemoderation/settings/Settings.java similarity index 97% rename from src/main/java/com/songoda/ultimatemoderation/settings/Settings.java rename to src/main/java/com/craftaro/ultimatemoderation/settings/Settings.java index dc1327d..32bfa39 100644 --- a/src/main/java/com/songoda/ultimatemoderation/settings/Settings.java +++ b/src/main/java/com/craftaro/ultimatemoderation/settings/Settings.java @@ -1,9 +1,9 @@ -package com.songoda.ultimatemoderation.settings; +package com.craftaro.ultimatemoderation.settings; import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.configuration.Config; import com.craftaro.core.configuration.ConfigSetting; -import com.songoda.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.UltimateModeration; import java.util.Arrays; diff --git a/src/main/java/com/songoda/ultimatemoderation/staffchat/StaffChannel.java b/src/main/java/com/craftaro/ultimatemoderation/staffchat/StaffChannel.java similarity index 94% rename from src/main/java/com/songoda/ultimatemoderation/staffchat/StaffChannel.java rename to src/main/java/com/craftaro/ultimatemoderation/staffchat/StaffChannel.java index a7bd025..2f2acf5 100644 --- a/src/main/java/com/songoda/ultimatemoderation/staffchat/StaffChannel.java +++ b/src/main/java/com/craftaro/ultimatemoderation/staffchat/StaffChannel.java @@ -1,8 +1,8 @@ -package com.songoda.ultimatemoderation.staffchat; +package com.craftaro.ultimatemoderation.staffchat; import com.craftaro.core.utils.TextUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.settings.Settings; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/ultimatemoderation/staffchat/StaffChatManager.java b/src/main/java/com/craftaro/ultimatemoderation/staffchat/StaffChatManager.java similarity index 93% rename from src/main/java/com/songoda/ultimatemoderation/staffchat/StaffChatManager.java rename to src/main/java/com/craftaro/ultimatemoderation/staffchat/StaffChatManager.java index 09046c3..6907699 100644 --- a/src/main/java/com/songoda/ultimatemoderation/staffchat/StaffChatManager.java +++ b/src/main/java/com/craftaro/ultimatemoderation/staffchat/StaffChatManager.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.staffchat; +package com.craftaro.ultimatemoderation.staffchat; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/com/songoda/ultimatemoderation/tasks/SlowModeTask.java b/src/main/java/com/craftaro/ultimatemoderation/tasks/SlowModeTask.java similarity index 90% rename from src/main/java/com/songoda/ultimatemoderation/tasks/SlowModeTask.java rename to src/main/java/com/craftaro/ultimatemoderation/tasks/SlowModeTask.java index e30219b..f70e629 100644 --- a/src/main/java/com/songoda/ultimatemoderation/tasks/SlowModeTask.java +++ b/src/main/java/com/craftaro/ultimatemoderation/tasks/SlowModeTask.java @@ -1,10 +1,10 @@ -package com.songoda.ultimatemoderation.tasks; +package com.craftaro.ultimatemoderation.tasks; import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.core.utils.TimeUtils; -import com.songoda.ultimatemoderation.UltimateModeration; -import com.songoda.ultimatemoderation.listeners.ChatListener; -import com.songoda.ultimatemoderation.settings.Settings; +import com.craftaro.ultimatemoderation.UltimateModeration; +import com.craftaro.ultimatemoderation.listeners.ChatListener; +import com.craftaro.ultimatemoderation.settings.Settings; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.Bukkit; diff --git a/src/main/java/com/songoda/ultimatemoderation/tickets/Ticket.java b/src/main/java/com/craftaro/ultimatemoderation/tickets/Ticket.java similarity index 97% rename from src/main/java/com/songoda/ultimatemoderation/tickets/Ticket.java rename to src/main/java/com/craftaro/ultimatemoderation/tickets/Ticket.java index c50ebeb..be6902d 100644 --- a/src/main/java/com/songoda/ultimatemoderation/tickets/Ticket.java +++ b/src/main/java/com/craftaro/ultimatemoderation/tickets/Ticket.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.tickets; +package com.craftaro.ultimatemoderation.tickets; import org.bukkit.Location; import org.bukkit.OfflinePlayer; diff --git a/src/main/java/com/songoda/ultimatemoderation/tickets/TicketManager.java b/src/main/java/com/craftaro/ultimatemoderation/tickets/TicketManager.java similarity index 97% rename from src/main/java/com/songoda/ultimatemoderation/tickets/TicketManager.java rename to src/main/java/com/craftaro/ultimatemoderation/tickets/TicketManager.java index baf1b28..c013290 100644 --- a/src/main/java/com/songoda/ultimatemoderation/tickets/TicketManager.java +++ b/src/main/java/com/craftaro/ultimatemoderation/tickets/TicketManager.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.tickets; +package com.craftaro.ultimatemoderation.tickets; import org.bukkit.OfflinePlayer; diff --git a/src/main/java/com/songoda/ultimatemoderation/tickets/TicketResponse.java b/src/main/java/com/craftaro/ultimatemoderation/tickets/TicketResponse.java similarity index 94% rename from src/main/java/com/songoda/ultimatemoderation/tickets/TicketResponse.java rename to src/main/java/com/craftaro/ultimatemoderation/tickets/TicketResponse.java index a187176..fea1114 100644 --- a/src/main/java/com/songoda/ultimatemoderation/tickets/TicketResponse.java +++ b/src/main/java/com/craftaro/ultimatemoderation/tickets/TicketResponse.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.tickets; +package com.craftaro.ultimatemoderation.tickets; import org.bukkit.OfflinePlayer; diff --git a/src/main/java/com/songoda/ultimatemoderation/tickets/TicketStatus.java b/src/main/java/com/craftaro/ultimatemoderation/tickets/TicketStatus.java similarity index 82% rename from src/main/java/com/songoda/ultimatemoderation/tickets/TicketStatus.java rename to src/main/java/com/craftaro/ultimatemoderation/tickets/TicketStatus.java index 2f15f3f..9e79ca3 100644 --- a/src/main/java/com/songoda/ultimatemoderation/tickets/TicketStatus.java +++ b/src/main/java/com/craftaro/ultimatemoderation/tickets/TicketStatus.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.tickets; +package com.craftaro.ultimatemoderation.tickets; public enum TicketStatus { OPEN("Open"), diff --git a/src/main/java/com/songoda/ultimatemoderation/utils/VaultPermissions.java b/src/main/java/com/craftaro/ultimatemoderation/utils/VaultPermissions.java similarity index 94% rename from src/main/java/com/songoda/ultimatemoderation/utils/VaultPermissions.java rename to src/main/java/com/craftaro/ultimatemoderation/utils/VaultPermissions.java index 7123f53..05f2fbe 100644 --- a/src/main/java/com/songoda/ultimatemoderation/utils/VaultPermissions.java +++ b/src/main/java/com/craftaro/ultimatemoderation/utils/VaultPermissions.java @@ -1,4 +1,4 @@ -package com.songoda.ultimatemoderation.utils; +package com.craftaro.ultimatemoderation.utils; import net.milkbowl.vault.permission.Permission; import org.bukkit.Bukkit; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 9829e7d..2d6e9eb 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,7 +3,7 @@ description: ${project.description} version: ${project.version} api-version: 1.13 -main: com.songoda.ultimatemoderation.UltimateModeration +main: com.craftaro.ultimatemoderation.UltimateModeration softdepend: - Vault - FabledSkyBlock