From 2dbd5340a87fc804dd2faaab7cfb1a7ae2a362c0 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 17 Apr 2026 11:42:17 +0200 Subject: [PATCH] modified: consent-plugin/src/main/java/de/simolzimol/mclogger/consent/ConsentConfig.java modified: consent-plugin/src/main/java/de/simolzimol/mclogger/consent/ConsentPlugin.java modified: consent-plugin/src/main/java/de/simolzimol/mclogger/consent/database/ConsentDatabase.java modified: consent-plugin/src/main/java/de/simolzimol/mclogger/consent/listeners/ConsentListener.java --- .../mclogger/consent/ConsentConfig.java | 4 ++-- .../mclogger/consent/ConsentPlugin.java | 13 +++++----- .../consent/database/ConsentDatabase.java | 17 ++++++++----- .../consent/listeners/ConsentListener.java | 24 ++++++++++++------- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/ConsentConfig.java b/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/ConsentConfig.java index 2b1344a..a521da1 100644 --- a/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/ConsentConfig.java +++ b/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/ConsentConfig.java @@ -1,9 +1,9 @@ package de.simolzimol.mclogger.consent; -import org.bukkit.configuration.file.FileConfiguration; - import java.util.List; +import org.bukkit.configuration.file.FileConfiguration; + /** * Strongly-typed wrapper around the plugin's {@code config.yml}. * Call {@link #reload()} after {@link ConsentPlugin#reloadConfig()} to diff --git a/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/ConsentPlugin.java b/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/ConsentPlugin.java index 2c2f584..1873e37 100644 --- a/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/ConsentPlugin.java +++ b/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/ConsentPlugin.java @@ -1,15 +1,16 @@ package de.simolzimol.mclogger.consent; -import de.simolzimol.mclogger.consent.commands.ConsentCommand; -import de.simolzimol.mclogger.consent.database.ConsentDatabase; -import de.simolzimol.mclogger.consent.listeners.ConsentListener; -import org.bukkit.command.PluginCommand; -import org.bukkit.plugin.java.JavaPlugin; - import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import org.bukkit.command.PluginCommand; +import org.bukkit.plugin.java.JavaPlugin; + +import de.simolzimol.mclogger.consent.commands.ConsentCommand; +import de.simolzimol.mclogger.consent.database.ConsentDatabase; +import de.simolzimol.mclogger.consent.listeners.ConsentListener; + /** * MCConsent – Privacy Policy consent enforcement for Paper servers. * diff --git a/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/database/ConsentDatabase.java b/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/database/ConsentDatabase.java index 91c05b2..1665075 100644 --- a/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/database/ConsentDatabase.java +++ b/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/database/ConsentDatabase.java @@ -1,15 +1,20 @@ package de.simolzimol.mclogger.consent.database; -import com.zaxxer.hikari.HikariConfig; -import com.zaxxer.hikari.HikariDataSource; -import de.simolzimol.mclogger.consent.ConsentConfig; -import de.simolzimol.mclogger.consent.ConsentPlugin; - -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; + +import de.simolzimol.mclogger.consent.ConsentConfig; +import de.simolzimol.mclogger.consent.ConsentPlugin; + /** * HikariCP-backed database client for MCConsent. * diff --git a/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/listeners/ConsentListener.java b/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/listeners/ConsentListener.java index c9c5ee8..e517eba 100644 --- a/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/listeners/ConsentListener.java +++ b/consent-plugin/src/main/java/de/simolzimol/mclogger/consent/listeners/ConsentListener.java @@ -1,18 +1,26 @@ package de.simolzimol.mclogger.consent.listeners; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.player.AsyncPlayerChatEvent; +import org.bukkit.event.player.PlayerCommandPreprocessEvent; +import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.event.player.PlayerLoginEvent; +import org.bukkit.event.player.PlayerMoveEvent; +import org.bukkit.event.player.PlayerQuitEvent; + import de.simolzimol.mclogger.consent.ConsentConfig; import de.simolzimol.mclogger.consent.ConsentConfig.EnforcementMode; import de.simolzimol.mclogger.consent.ConsentPlugin; import de.simolzimol.mclogger.consent.util.MessageUtil; import net.kyori.adventure.text.minimessage.MiniMessage; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.event.*; -import org.bukkit.event.player.*; - -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; /** * Listens to player lifecycle events and enforces the configured consent mode.