Upstream
/
UltimateModeration
mirror of https://github.com/songoda/UltimateModeration.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: Upstream:e89fab45b64a877a811f6d1ccae586064ca73b1e
Branches Tags
Upstream:master
Upstream:development
Upstream:v3.0.0
Upstream:v2.0.7
Upstream:v2.0.6
Upstream:v2.0.5
Upstream:v2.0.4b
Upstream:v2.0.4
Upstream:v2.0.3
Upstream:v2.0.2b
Upstream:v2.0.2
Upstream:v2.0.1
Upstream:v2
Upstream:v1.2.9
Upstream:v1.2.8
Upstream:v1.2.7
Upstream:v1.2.6
Upstream:v1.2.5
Upstream:v1.2.4
Upstream:v1.2.3
Upstream:v1.2.2
Upstream:v1.2.1
Upstream:v1.2
Upstream:v1.1.15
Upstream:v1.1.14
Upstream:v1.1.11
Upstream:v1.1.10
Upstream:v1.1.9
Upstream:v1.1.8
Upstream:v1.1.7
Upstream:v1.1.6
Upstream:v1.1.5
Upstream:v1.1.4
Upstream:v1.1.3
Upstream:v1.1.2
Upstream:v1.1.1
Upstream:v1.1
Upstream:v1.0.2
Upstream:v1.0.1
Upstream:v1
...
compare: Upstream:fa62c5e522d4ae796e1a3ffcb4578361c0aea137
Branches Tags
Upstream:development
Upstream:master
Upstream:v3.0.0
Upstream:v2.0.7
Upstream:v2.0.6
Upstream:v2.0.5
Upstream:v2.0.4b
Upstream:v2.0.4
Upstream:v2.0.3
Upstream:v2.0.2b
Upstream:v2.0.2
Upstream:v2.0.1
Upstream:v2
Upstream:v1.2.9
Upstream:v1.2.8
Upstream:v1.2.7
Upstream:v1.2.6
Upstream:v1.2.5
Upstream:v1.2.4
Upstream:v1.2.3
Upstream:v1.2.2
Upstream:v1.2.1
Upstream:v1.2
Upstream:v1.1.15
Upstream:v1.1.14
Upstream:v1.1.11
Upstream:v1.1.10
Upstream:v1.1.9
Upstream:v1.1.8
Upstream:v1.1.7
Upstream:v1.1.6
Upstream:v1.1.5
Upstream:v1.1.4
Upstream:v1.1.3
Upstream:v1.1.2
Upstream:v1.1.1
Upstream:v1.1
Upstream:v1.0.2
Upstream:v1.0.1
Upstream:v1

3 Commits
e89fab45b6 ... fa62c5e522

Author SHA1 Message Date
ceze88 fa62c5e522 Release v3.0.0-SNAPSHOT 2023-08-02 19:00:34 +02:00
ceze88 6ce4674d0e Add missing initialization 2023-08-02 18:58:48 +02:00
ceze88 b2008d0071 Updates database to new system 2023-08-02 18:57:10 +02:00
71 changed files with 338 additions and 338 deletions
Show Stats Expand all files Collapse all files

7
pom.xml
View File

@ -4,9 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.songoda</groupId>
<groupId>com.craftaro</groupId>
<artifactId>UltimateModeration</artifactId>
<version>2.0.15</version>
<version>3.0.0-SNAPSHOT</version>
<name>UltimateModeration</name>
<description>Take complete control over your server with punishment templates via a simplified yet powerful moderation system</description>
@ -54,7 +54,7 @@
<relocations>
<relocation>
<pattern>com.craftaro.core</pattern>
<shadedPattern>com.songoda.ultimatemoderation.core</shadedPattern>
<shadedPattern>com.craftaro.ultimatemoderation.core</shadedPattern>
</relocation>
</relocations>
@ -74,6 +74,7 @@
<excludeDefaults>false</excludeDefaults>
<includes>
<include>**/nms/v*/**</include>
<include>**/third_party/**</include>
</includes>
</filter>
</filters>

137
src/main/java/com/songoda/ultimatemoderation/UltimateModeration.java → src/main/java/com/craftaro/ultimatemoderation/UltimateModeration.java
View File

@ -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();
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();
initDatabase(Arrays.asList(new _1_InitialMigration(this)));
this.dataHelper = new DataHelper(getDataManager(), this);
} 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;
}
}

10
src/main/java/com/songoda/ultimatemoderation/commands/CommandBan.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandBan.java
View File

@ -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;

4
src/main/java/com/songoda/ultimatemoderation/commands/CommandClearChat.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandClearChat.java
View File

@ -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;

4
src/main/java/com/songoda/ultimatemoderation/commands/CommandHelp.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandHelp.java
View File

@ -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;

8
src/main/java/com/songoda/ultimatemoderation/commands/CommandKick.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandKick.java
View File

@ -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;

10
src/main/java/com/songoda/ultimatemoderation/commands/CommandMute.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandMute.java
View File

@ -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;

4
src/main/java/com/songoda/ultimatemoderation/commands/CommandRandomPlayer.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandRandomPlayer.java
View File

@ -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;

4
src/main/java/com/songoda/ultimatemoderation/commands/CommandReload.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandReload.java
View File

@ -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;

6
src/main/java/com/songoda/ultimatemoderation/commands/CommandRunTemplate.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandRunTemplate.java
View File

@ -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;

4
src/main/java/com/songoda/ultimatemoderation/commands/CommandSettings.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandSettings.java
View File

@ -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;

6
src/main/java/com/songoda/ultimatemoderation/commands/CommandSlowMode.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandSlowMode.java
View File

@ -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;

6
src/main/java/com/songoda/ultimatemoderation/commands/CommandStaffChat.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandStaffChat.java
View File

@ -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;

6
src/main/java/com/songoda/ultimatemoderation/commands/CommandTicket.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandTicket.java
View File

@ -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;

6
src/main/java/com/songoda/ultimatemoderation/commands/CommandToggleChat.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandToggleChat.java
View File

@ -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;

6
src/main/java/com/songoda/ultimatemoderation/commands/CommandUltimateModeration.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandUltimateModeration.java
View File

@ -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;

8
src/main/java/com/songoda/ultimatemoderation/commands/CommandUnBan.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandUnBan.java
View File

@ -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;

8
src/main/java/com/songoda/ultimatemoderation/commands/CommandUnMute.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandUnMute.java
View File

@ -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;

6
src/main/java/com/songoda/ultimatemoderation/commands/CommandVanish.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandVanish.java
View File

@ -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;

10
src/main/java/com/songoda/ultimatemoderation/commands/CommandWarn.java → src/main/java/com/craftaro/ultimatemoderation/commands/CommandWarn.java
View File

@ -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;

63
src/main/java/com/songoda/ultimatemoderation/database/DataManager.java → src/main/java/com/craftaro/ultimatemoderation/database/DataHelper.java
View File

@ -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();
}

7
src/main/java/com/songoda/ultimatemoderation/database/migrations/_1_InitialMigration.java → src/main/java/com/craftaro/ultimatemoderation/database/migrations/_1_InitialMigration.java
View File

@ -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()) {

12
src/main/java/com/songoda/ultimatemoderation/gui/MainGui.java → src/main/java/com/craftaro/ultimatemoderation/gui/MainGui.java
View File

@ -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;

8
src/main/java/com/songoda/ultimatemoderation/gui/ModerateGui.java → src/main/java/com/craftaro/ultimatemoderation/gui/ModerateGui.java
View File

@ -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;

12
src/main/java/com/songoda/ultimatemoderation/gui/NotesManagerGui.java → src/main/java/com/craftaro/ultimatemoderation/gui/NotesManagerGui.java
View File

@ -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();
}
});

6
src/main/java/com/songoda/ultimatemoderation/gui/PlayerGui.java → src/main/java/com/craftaro/ultimatemoderation/gui/PlayerGui.java
View File

@ -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;

18
src/main/java/com/songoda/ultimatemoderation/gui/PunishGui.java → src/main/java/com/craftaro/ultimatemoderation/gui/PunishGui.java
View File

@ -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));

14
src/main/java/com/songoda/ultimatemoderation/gui/PunishmentsGui.java → src/main/java/com/craftaro/ultimatemoderation/gui/PunishmentsGui.java
View File

@ -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();
}
});

12
src/main/java/com/songoda/ultimatemoderation/gui/TemplateManagerGui.java → src/main/java/com/craftaro/ultimatemoderation/gui/TemplateManagerGui.java
View File

@ -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();

6
src/main/java/com/songoda/ultimatemoderation/gui/TemplateSelectorGui.java → src/main/java/com/craftaro/ultimatemoderation/gui/TemplateSelectorGui.java
View File

@ -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;

18
src/main/java/com/songoda/ultimatemoderation/gui/TicketGui.java → src/main/java/com/craftaro/ultimatemoderation/gui/TicketGui.java
View File

@ -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();

10
src/main/java/com/songoda/ultimatemoderation/gui/TicketManagerGui.java → src/main/java/com/craftaro/ultimatemoderation/gui/TicketManagerGui.java
View File

@ -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;

14
src/main/java/com/songoda/ultimatemoderation/gui/TicketTypeGui.java → src/main/java/com/craftaro/ultimatemoderation/gui/TicketTypeGui.java
View File

@ -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)));
});

6
src/main/java/com/songoda/ultimatemoderation/listeners/BlockListener.java → src/main/java/com/craftaro/ultimatemoderation/listeners/BlockListener.java
View File

@ -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;

12
src/main/java/com/songoda/ultimatemoderation/listeners/ChatListener.java → src/main/java/com/craftaro/ultimatemoderation/listeners/ChatListener.java
View File

@ -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;

12
src/main/java/com/songoda/ultimatemoderation/listeners/CommandListener.java → src/main/java/com/craftaro/ultimatemoderation/listeners/CommandListener.java
View File

@ -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;

2
src/main/java/com/songoda/ultimatemoderation/listeners/DeathListener.java → src/main/java/com/craftaro/ultimatemoderation/listeners/DeathListener.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimatemoderation.listeners;
package com.craftaro.ultimatemoderation.listeners;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;

6
src/main/java/com/songoda/ultimatemoderation/listeners/DropListener.java → src/main/java/com/craftaro/ultimatemoderation/listeners/DropListener.java
View File

@ -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;

6
src/main/java/com/songoda/ultimatemoderation/listeners/InventoryListener.java → src/main/java/com/craftaro/ultimatemoderation/listeners/InventoryListener.java
View File

@ -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;

12
src/main/java/com/songoda/ultimatemoderation/listeners/LoginListener.java → src/main/java/com/craftaro/ultimatemoderation/listeners/LoginListener.java
View File

@ -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;

4
src/main/java/com/songoda/ultimatemoderation/listeners/MobTargetLister.java → src/main/java/com/craftaro/ultimatemoderation/listeners/MobTargetLister.java
View File

@ -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;

6
src/main/java/com/songoda/ultimatemoderation/listeners/MoveListener.java → src/main/java/com/craftaro/ultimatemoderation/listeners/MoveListener.java
View File

@ -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;

2
src/main/java/com/songoda/ultimatemoderation/listeners/SkyBlockListener.java → src/main/java/com/craftaro/ultimatemoderation/listeners/SkyBlockListener.java
View File

@ -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;

6
src/main/java/com/songoda/ultimatemoderation/listeners/SpyingDismountListener.java → src/main/java/com/craftaro/ultimatemoderation/listeners/SpyingDismountListener.java
View File

@ -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;

6
src/main/java/com/songoda/ultimatemoderation/moderate/AbstractModeration.java → src/main/java/com/craftaro/ultimatemoderation/moderate/AbstractModeration.java
View File

@ -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;

4
src/main/java/com/songoda/ultimatemoderation/moderate/GenericModerationCommand.java → src/main/java/com/craftaro/ultimatemoderation/moderate/GenericModerationCommand.java
View File

@ -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;

14
src/main/java/com/songoda/ultimatemoderation/moderate/ModerationManager.java → src/main/java/com/craftaro/ultimatemoderation/moderate/ModerationManager.java
View File

@ -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;

2
src/main/java/com/songoda/ultimatemoderation/moderate/ModerationType.java → src/main/java/com/craftaro/ultimatemoderation/moderate/ModerationType.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimatemoderation.moderate;
package com.craftaro.ultimatemoderation.moderate;
public enum ModerationType {
FREEZE, SPY, INV_SEE, ENDER_VIEW, REVIVE

8
src/main/java/com/songoda/ultimatemoderation/moderate/moderations/FreezeModeration.java → src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/FreezeModeration.java
View File

@ -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;

8
src/main/java/com/songoda/ultimatemoderation/moderate/moderations/InvSeeModeration.java → src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/InvSeeModeration.java
View File

@ -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;

10
src/main/java/com/songoda/ultimatemoderation/moderate/moderations/ReviveModeration.java → src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/ReviveModeration.java
View File

@ -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;

12
src/main/java/com/songoda/ultimatemoderation/moderate/moderations/SpyModeration.java → src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/SpyModeration.java
View File

@ -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;

8
src/main/java/com/songoda/ultimatemoderation/moderate/moderations/ViewEnderChestModeration.java → src/main/java/com/craftaro/ultimatemoderation/moderate/moderations/ViewEnderChestModeration.java
View File

@ -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;

2
src/main/java/com/songoda/ultimatemoderation/punish/AppliedPunishment.java → src/main/java/com/craftaro/ultimatemoderation/punish/AppliedPunishment.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimatemoderation.punish;
package com.craftaro.ultimatemoderation.punish;
import java.util.UUID;

8
src/main/java/com/songoda/ultimatemoderation/punish/Punishment.java → src/main/java/com/craftaro/ultimatemoderation/punish/Punishment.java
View File

@ -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) {

2
src/main/java/com/songoda/ultimatemoderation/punish/PunishmentNote.java → src/main/java/com/craftaro/ultimatemoderation/punish/PunishmentNote.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimatemoderation.punish;
package com.craftaro.ultimatemoderation.punish;
import java.util.UUID;

4
src/main/java/com/songoda/ultimatemoderation/punish/PunishmentType.java → src/main/java/com/craftaro/ultimatemoderation/punish/PunishmentType.java
View File

@ -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;

12
src/main/java/com/songoda/ultimatemoderation/punish/player/PlayerPunishData.java → src/main/java/com/craftaro/ultimatemoderation/punish/player/PlayerPunishData.java
View File

@ -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));

2
src/main/java/com/songoda/ultimatemoderation/punish/player/PunishmentManager.java → src/main/java/com/craftaro/ultimatemoderation/punish/player/PunishmentManager.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimatemoderation.punish.player;
package com.craftaro.ultimatemoderation.punish.player;
import org.bukkit.OfflinePlayer;

6
src/main/java/com/songoda/ultimatemoderation/punish/template/Template.java → src/main/java/com/craftaro/ultimatemoderation/punish/template/Template.java
View File

@ -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;

2
src/main/java/com/songoda/ultimatemoderation/punish/template/TemplateManager.java → src/main/java/com/craftaro/ultimatemoderation/punish/template/TemplateManager.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimatemoderation.punish.template;
package com.craftaro.ultimatemoderation.punish.template;
import java.util.Collections;
import java.util.LinkedList;

4
src/main/java/com/songoda/ultimatemoderation/settings/Settings.java → src/main/java/com/craftaro/ultimatemoderation/settings/Settings.java
View File

@ -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;

6
src/main/java/com/songoda/ultimatemoderation/staffchat/StaffChannel.java → src/main/java/com/craftaro/ultimatemoderation/staffchat/StaffChannel.java
View File

@ -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;

2
src/main/java/com/songoda/ultimatemoderation/staffchat/StaffChatManager.java → src/main/java/com/craftaro/ultimatemoderation/staffchat/StaffChatManager.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimatemoderation.staffchat;
package com.craftaro.ultimatemoderation.staffchat;
import java.util.Collections;
import java.util.HashMap;

8
src/main/java/com/songoda/ultimatemoderation/tasks/SlowModeTask.java → src/main/java/com/craftaro/ultimatemoderation/tasks/SlowModeTask.java
View File

@ -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;

2
src/main/java/com/songoda/ultimatemoderation/tickets/Ticket.java → src/main/java/com/craftaro/ultimatemoderation/tickets/Ticket.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimatemoderation.tickets;
package com.craftaro.ultimatemoderation.tickets;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;

2
src/main/java/com/songoda/ultimatemoderation/tickets/TicketManager.java → src/main/java/com/craftaro/ultimatemoderation/tickets/TicketManager.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimatemoderation.tickets;
package com.craftaro.ultimatemoderation.tickets;
import org.bukkit.OfflinePlayer;

2
src/main/java/com/songoda/ultimatemoderation/tickets/TicketResponse.java → src/main/java/com/craftaro/ultimatemoderation/tickets/TicketResponse.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimatemoderation.tickets;
package com.craftaro.ultimatemoderation.tickets;
import org.bukkit.OfflinePlayer;

2
src/main/java/com/songoda/ultimatemoderation/tickets/TicketStatus.java → src/main/java/com/craftaro/ultimatemoderation/tickets/TicketStatus.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimatemoderation.tickets;
package com.craftaro.ultimatemoderation.tickets;
public enum TicketStatus {
OPEN("Open"),

2
src/main/java/com/songoda/ultimatemoderation/utils/VaultPermissions.java → src/main/java/com/craftaro/ultimatemoderation/utils/VaultPermissions.java
View File

@ -1,4 +1,4 @@
package com.songoda.ultimatemoderation.utils;
package com.craftaro.ultimatemoderation.utils;
import net.milkbowl.vault.permission.Permission;
import org.bukkit.Bukkit;

2
src/main/resources/plugin.yml
View File

@ -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