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

code clean up (style)

This commit is contained in:
Christian Koop 2023-08-15 23:24:07 +02:00
parent fa62c5e522
commit 653395c152
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
5 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/craftaro/ultimatemoderation/UltimateModeration.java
View File

@ -5,10 +5,8 @@ import com.craftaro.core.SongodaPlugin;
import com.craftaro.core.commands.CommandManager; import com.craftaro.core.commands.CommandManager;
import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.core.compatibility.ServerVersion;
import com.craftaro.core.configuration.Config; import com.craftaro.core.configuration.Config;
import com.craftaro.core.database.DatabaseConnector;
import com.craftaro.core.gui.GuiManager; import com.craftaro.core.gui.GuiManager;
import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.ultimatemoderation.settings.Settings;
import com.craftaro.ultimatemoderation.commands.CommandBan; import com.craftaro.ultimatemoderation.commands.CommandBan;
import com.craftaro.ultimatemoderation.commands.CommandClearChat; import com.craftaro.ultimatemoderation.commands.CommandClearChat;
import com.craftaro.ultimatemoderation.commands.CommandHelp; import com.craftaro.ultimatemoderation.commands.CommandHelp;
@ -46,6 +44,7 @@ import com.craftaro.ultimatemoderation.punish.PunishmentNote;
import com.craftaro.ultimatemoderation.punish.player.PunishmentManager; import com.craftaro.ultimatemoderation.punish.player.PunishmentManager;
import com.craftaro.ultimatemoderation.punish.template.Template; import com.craftaro.ultimatemoderation.punish.template.Template;
import com.craftaro.ultimatemoderation.punish.template.TemplateManager; import com.craftaro.ultimatemoderation.punish.template.TemplateManager;
import com.craftaro.ultimatemoderation.settings.Settings;
import com.craftaro.ultimatemoderation.staffchat.StaffChatManager; import com.craftaro.ultimatemoderation.staffchat.StaffChatManager;
import com.craftaro.ultimatemoderation.tasks.SlowModeTask; import com.craftaro.ultimatemoderation.tasks.SlowModeTask;
import com.craftaro.ultimatemoderation.tickets.Ticket; import com.craftaro.ultimatemoderation.tickets.Ticket;
@ -122,9 +121,8 @@ public class UltimateModeration extends SongodaPlugin {
this.staffChatManager = new StaffChatManager(); this.staffChatManager = new StaffChatManager();
this.moderationManager = new ModerationManager(this); this.moderationManager = new ModerationManager(this);
try { try {
initDatabase(Arrays.asList(new _1_InitialMigration(this))); initDatabase(Arrays.asList(new _1_InitialMigration()));
this.dataHelper = new DataHelper(getDataManager(), this); this.dataHelper = new DataHelper(getDataManager(), this);
} catch (Exception ex) { } catch (Exception ex) {
@ -225,6 +223,6 @@ public class UltimateModeration extends SongodaPlugin {
} }
public DataHelper getDataHelper() { public DataHelper getDataHelper() {
return dataHelper; return this.dataHelper;
} }
} }

13
src/main/java/com/craftaro/ultimatemoderation/database/DataHelper.java
View File

@ -33,15 +33,14 @@ public class DataHelper {
this.dataManager = dataManager; this.dataManager = dataManager;
this.databaseConnector = dataManager.getDatabaseConnector(); this.databaseConnector = dataManager.getDatabaseConnector();
this.plugin = plugin; this.plugin = plugin;
} }
private void runAsync(Runnable runnable) { private void runAsync(Runnable runnable) {
dataManager.getAsyncPool().execute(runnable); this.dataManager.getAsyncPool().execute(runnable);
} }
private void sync(Runnable runnable) { private void sync(Runnable runnable) {
Bukkit.getScheduler().runTask(plugin, runnable); Bukkit.getScheduler().runTask(this.plugin, runnable);
} }
private String getTablePrefix() { private String getTablePrefix() {
@ -51,7 +50,7 @@ public class DataHelper {
public void createTemplate(Template template) { public void createTemplate(Template template) {
this.runAsync(() -> { this.runAsync(() -> {
try (Connection connection = this.databaseConnector.getConnection()) { try (Connection connection = this.databaseConnector.getConnection()) {
int nextId = dataManager.getNextId("templates"); int nextId = this.dataManager.getNextId("templates");
String createTemplate = "INSERT INTO " + this.getTablePrefix() + "templates (punishment_type, duration, reason, name, creator) VALUES (?, ?, ?, ?, ?)"; String createTemplate = "INSERT INTO " + this.getTablePrefix() + "templates (punishment_type, duration, reason, name, creator) VALUES (?, ?, ?, ?, ?)";
PreparedStatement statement = connection.prepareStatement(createTemplate); PreparedStatement statement = connection.prepareStatement(createTemplate);
@ -111,7 +110,7 @@ public class DataHelper {
public void createAppliedPunishment(AppliedPunishment punishment) { public void createAppliedPunishment(AppliedPunishment punishment) {
this.runAsync(() -> { this.runAsync(() -> {
try (Connection connection = this.databaseConnector.getConnection()) { try (Connection connection = this.databaseConnector.getConnection()) {
int nextId = dataManager.getNextId("punishments"); int nextId = this.dataManager.getNextId("punishments");
String createPunishment = "INSERT INTO " + this.getTablePrefix() + "punishments (type, duration, reason, victim, punisher, expiration) VALUES (?, ?, ?, ?, ?, ?)"; String createPunishment = "INSERT INTO " + this.getTablePrefix() + "punishments (type, duration, reason, victim, punisher, expiration) VALUES (?, ?, ?, ?, ?, ?)";
PreparedStatement statement = connection.prepareStatement(createPunishment); PreparedStatement statement = connection.prepareStatement(createPunishment);
@ -190,7 +189,7 @@ public class DataHelper {
public void createNote(PunishmentNote note) { public void createNote(PunishmentNote note) {
this.runAsync(() -> { this.runAsync(() -> {
try (Connection connection = this.databaseConnector.getConnection()) { try (Connection connection = this.databaseConnector.getConnection()) {
int nextId = dataManager.getNextId("notes"); int nextId = this.dataManager.getNextId("notes");
String createNote = "INSERT INTO " + this.getTablePrefix() + "notes (note, author, subject, creation) VALUES (?, ?, ?, ?)"; String createNote = "INSERT INTO " + this.getTablePrefix() + "notes (note, author, subject, creation) VALUES (?, ?, ?, ?)";
PreparedStatement statement = connection.prepareStatement(createNote); PreparedStatement statement = connection.prepareStatement(createNote);
@ -246,7 +245,7 @@ public class DataHelper {
public void createTicket(Ticket ticket) { public void createTicket(Ticket ticket) {
this.runAsync(() -> { this.runAsync(() -> {
try (Connection connection = this.databaseConnector.getConnection()) { try (Connection connection = this.databaseConnector.getConnection()) {
int nextId = dataManager.getNextId("tickets"); int nextId = this.dataManager.getNextId("tickets");
String createTicket = "INSERT INTO " + this.getTablePrefix() + "tickets (victim, subject, type, status, world, x, y, z, pitch, yaw) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; String createTicket = "INSERT INTO " + this.getTablePrefix() + "tickets (victim, subject, type, status, world, x, y, z, pitch, yaw) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
PreparedStatement statement = connection.prepareStatement(createTicket); PreparedStatement statement = connection.prepareStatement(createTicket);

8
src/main/java/com/craftaro/ultimatemoderation/database/migrations/_1_InitialMigration.java
View File

@ -1,8 +1,6 @@
package com.craftaro.ultimatemoderation.database.migrations; package com.craftaro.ultimatemoderation.database.migrations;
import com.craftaro.core.database.DataMigration; import com.craftaro.core.database.DataMigration;
import com.craftaro.core.database.DatabaseConnector;
import com.craftaro.core.database.MySQLConnector;
import com.craftaro.ultimatemoderation.UltimateModeration; import com.craftaro.ultimatemoderation.UltimateModeration;
import java.sql.Connection; import java.sql.Connection;
@ -10,11 +8,8 @@ import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
public class _1_InitialMigration extends DataMigration { public class _1_InitialMigration extends DataMigration {
private final UltimateModeration plugin; public _1_InitialMigration() {
public _1_InitialMigration(UltimateModeration plugin) {
super(1); super(1);
this.plugin = plugin;
} }
@Override @Override
@ -84,5 +79,4 @@ public class _1_InitialMigration extends DataMigration {
")"); ")");
} }
} }
} }

2
src/main/java/com/craftaro/ultimatemoderation/gui/MainGui.java
View File

@ -87,7 +87,7 @@ public class MainGui extends Gui {
List<UUID> found = players.stream().filter(uuid -> Bukkit.getOfflinePlayer(uuid).getName().toLowerCase().contains(gui.getInputText().toLowerCase())).collect(Collectors.toList()); List<UUID> found = players.stream().filter(uuid -> Bukkit.getOfflinePlayer(uuid).getName().toLowerCase().contains(gui.getInputText().toLowerCase())).collect(Collectors.toList());
if (found.size() >= 1) { if (!found.isEmpty()) {
this.players.clear(); this.players.clear();
this.players.addAll(found); this.players.addAll(found);
showPage(); showPage();

1
src/main/java/com/craftaro/ultimatemoderation/gui/TicketGui.java
View File

@ -147,7 +147,6 @@ public class TicketGui extends Gui {
SimpleDateFormat format = new SimpleDateFormat("MM-dd-yyyy"); SimpleDateFormat format = new SimpleDateFormat("MM-dd-yyyy");
lore.add(this.plugin.getLocale().getMessage("gui.ticket.postedby") lore.add(this.plugin.getLocale().getMessage("gui.ticket.postedby")
.processPlaceholder("player", Bukkit.getOfflinePlayer(ticketResponse.getAuthor()).getName()).getMessage()); .processPlaceholder("player", Bukkit.getOfflinePlayer(ticketResponse.getAuthor()).getName()).getMessage());
lore.add(this.plugin.getLocale().getMessage("gui.ticket.createdon") lore.add(this.plugin.getLocale().getMessage("gui.ticket.createdon")