From 653395c152244d0933bf6e388ac5a3be204bc8dd Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Tue, 15 Aug 2023 23:24:07 +0200 Subject: [PATCH] code clean up (style) --- .../ultimatemoderation/UltimateModeration.java | 8 +++----- .../ultimatemoderation/database/DataHelper.java | 13 ++++++------- .../database/migrations/_1_InitialMigration.java | 8 +------- .../craftaro/ultimatemoderation/gui/MainGui.java | 2 +- .../craftaro/ultimatemoderation/gui/TicketGui.java | 1 - 5 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/craftaro/ultimatemoderation/UltimateModeration.java b/src/main/java/com/craftaro/ultimatemoderation/UltimateModeration.java index b558828..89f01c8 100644 --- a/src/main/java/com/craftaro/ultimatemoderation/UltimateModeration.java +++ b/src/main/java/com/craftaro/ultimatemoderation/UltimateModeration.java @@ -5,10 +5,8 @@ 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.DatabaseConnector; import com.craftaro.core.gui.GuiManager; 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.CommandClearChat; 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.template.Template; import com.craftaro.ultimatemoderation.punish.template.TemplateManager; +import com.craftaro.ultimatemoderation.settings.Settings; import com.craftaro.ultimatemoderation.staffchat.StaffChatManager; import com.craftaro.ultimatemoderation.tasks.SlowModeTask; import com.craftaro.ultimatemoderation.tickets.Ticket; @@ -122,9 +121,8 @@ public class UltimateModeration extends SongodaPlugin { this.staffChatManager = new StaffChatManager(); this.moderationManager = new ModerationManager(this); - try { - initDatabase(Arrays.asList(new _1_InitialMigration(this))); + initDatabase(Arrays.asList(new _1_InitialMigration())); this.dataHelper = new DataHelper(getDataManager(), this); } catch (Exception ex) { @@ -225,6 +223,6 @@ public class UltimateModeration extends SongodaPlugin { } public DataHelper getDataHelper() { - return dataHelper; + return this.dataHelper; } } diff --git a/src/main/java/com/craftaro/ultimatemoderation/database/DataHelper.java b/src/main/java/com/craftaro/ultimatemoderation/database/DataHelper.java index d3e5dbf..64a40ab 100644 --- a/src/main/java/com/craftaro/ultimatemoderation/database/DataHelper.java +++ b/src/main/java/com/craftaro/ultimatemoderation/database/DataHelper.java @@ -33,15 +33,14 @@ public class DataHelper { this.dataManager = dataManager; this.databaseConnector = dataManager.getDatabaseConnector(); this.plugin = plugin; - } private void runAsync(Runnable runnable) { - dataManager.getAsyncPool().execute(runnable); + this.dataManager.getAsyncPool().execute(runnable); } private void sync(Runnable runnable) { - Bukkit.getScheduler().runTask(plugin, runnable); + Bukkit.getScheduler().runTask(this.plugin, runnable); } private String getTablePrefix() { @@ -51,7 +50,7 @@ public class DataHelper { public void createTemplate(Template template) { this.runAsync(() -> { 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 (?, ?, ?, ?, ?)"; PreparedStatement statement = connection.prepareStatement(createTemplate); @@ -111,7 +110,7 @@ public class DataHelper { public void createAppliedPunishment(AppliedPunishment punishment) { this.runAsync(() -> { 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 (?, ?, ?, ?, ?, ?)"; PreparedStatement statement = connection.prepareStatement(createPunishment); @@ -190,7 +189,7 @@ public class DataHelper { public void createNote(PunishmentNote note) { this.runAsync(() -> { 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 (?, ?, ?, ?)"; PreparedStatement statement = connection.prepareStatement(createNote); @@ -246,7 +245,7 @@ public class DataHelper { public void createTicket(Ticket ticket) { this.runAsync(() -> { 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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; PreparedStatement statement = connection.prepareStatement(createTicket); diff --git a/src/main/java/com/craftaro/ultimatemoderation/database/migrations/_1_InitialMigration.java b/src/main/java/com/craftaro/ultimatemoderation/database/migrations/_1_InitialMigration.java index 2e694d4..99104e7 100644 --- a/src/main/java/com/craftaro/ultimatemoderation/database/migrations/_1_InitialMigration.java +++ b/src/main/java/com/craftaro/ultimatemoderation/database/migrations/_1_InitialMigration.java @@ -1,8 +1,6 @@ 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.craftaro.ultimatemoderation.UltimateModeration; import java.sql.Connection; @@ -10,11 +8,8 @@ import java.sql.SQLException; import java.sql.Statement; public class _1_InitialMigration extends DataMigration { - private final UltimateModeration plugin; - - public _1_InitialMigration(UltimateModeration plugin) { + public _1_InitialMigration() { super(1); - this.plugin = plugin; } @Override @@ -84,5 +79,4 @@ public class _1_InitialMigration extends DataMigration { ")"); } } - } diff --git a/src/main/java/com/craftaro/ultimatemoderation/gui/MainGui.java b/src/main/java/com/craftaro/ultimatemoderation/gui/MainGui.java index daea3e3..d5f6a6f 100644 --- a/src/main/java/com/craftaro/ultimatemoderation/gui/MainGui.java +++ b/src/main/java/com/craftaro/ultimatemoderation/gui/MainGui.java @@ -87,7 +87,7 @@ public class MainGui extends Gui { List 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.addAll(found); showPage(); diff --git a/src/main/java/com/craftaro/ultimatemoderation/gui/TicketGui.java b/src/main/java/com/craftaro/ultimatemoderation/gui/TicketGui.java index 96074a0..c4b200a 100644 --- a/src/main/java/com/craftaro/ultimatemoderation/gui/TicketGui.java +++ b/src/main/java/com/craftaro/ultimatemoderation/gui/TicketGui.java @@ -147,7 +147,6 @@ public class TicketGui extends Gui { SimpleDateFormat format = new SimpleDateFormat("MM-dd-yyyy"); - lore.add(this.plugin.getLocale().getMessage("gui.ticket.postedby") .processPlaceholder("player", Bukkit.getOfflinePlayer(ticketResponse.getAuthor()).getName()).getMessage()); lore.add(this.plugin.getLocale().getMessage("gui.ticket.createdon")