From b45c544f5d2846578617074152416dbff30c629a Mon Sep 17 00:00:00 2001 From: xxneox <29680081+xxneox@users.noreply.github.com> Date: Wed, 18 Aug 2021 16:47:52 +0200 Subject: [PATCH] Fix data directory, handle PreLogin async on Velocity --- VERSION.txt | 2 +- build.gradle | 5 ++--- .../java/me/xneox/epicguard/core/EpicGuard.java | 13 +++++-------- .../main/java/me/xneox/epicguard/core/Platform.java | 8 ++++---- .../xneox/epicguard/core/handler/JoinHandler.java | 2 +- .../me/xneox/epicguard/core/manager/GeoManager.java | 5 ++++- .../me/xneox/epicguard/core/proxy/ProxyManager.java | 7 +++---- .../epicguard/core/storage/StorageManager.java | 4 ++-- .../me/xneox/epicguard/core/task/MonitorTask.java | 2 +- .../me/xneox/epicguard/core/util/FileUtils.java | 2 -- .../me/xneox/epicguard/paper/EpicGuardPaper.java | 11 ++++++----- .../xneox/epicguard/velocity/EpicGuardVelocity.java | 10 ++++++---- .../velocity/listener/PreLoginListener.java | 7 ++++--- .../epicguard/waterfall/EpicGuardWaterfall.java | 10 +++++----- 14 files changed, 44 insertions(+), 44 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index f4965a31..41225218 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -6.0.0 \ No newline at end of file +7.0.0 \ No newline at end of file diff --git a/build.gradle b/build.gradle index baa9bf8f..3c199929 100644 --- a/build.gradle +++ b/build.gradle @@ -5,12 +5,11 @@ plugins { allprojects { group = "me.xneox" - version = "6.0.0" + version = "7.0.0" } subprojects { - // IF I TOUCH THIS THEN BUILD FAILS. WHAT THE FUCK - // PLEASE SOMEONE JUST REWRITE THIS FOR ME I WASTED TOO MUCH TIME ON THIS + // TODO: REWRITE EVERYTHING HERE sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 diff --git a/core/src/main/java/me/xneox/epicguard/core/EpicGuard.java b/core/src/main/java/me/xneox/epicguard/core/EpicGuard.java index e7bda744..b3517977 100644 --- a/core/src/main/java/me/xneox/epicguard/core/EpicGuard.java +++ b/core/src/main/java/me/xneox/epicguard/core/EpicGuard.java @@ -61,11 +61,11 @@ private void startup() { this.loadConfigurations(); logger().info("Initializing managers..."); + this.geoManager = new GeoManager(this); this.storageManager = new StorageManager(this); + this.proxyManager = new ProxyManager(this); this.attackManager = new AttackManager(); this.userManager = new UserManager(); - this.proxyManager = new ProxyManager(this); - this.geoManager = new GeoManager(this); this.commandHandler = new CommandHandler(this); @@ -75,14 +75,11 @@ private void startup() { logger().info("Scheduling tasks..."); this.platform.scheduleRepeatingTask(new MonitorTask(this), 1L); this.platform.scheduleRepeatingTask(new UpdateCheckerTask(this), 1800L); - this.platform.scheduleRepeatingTask( - new AttackResetTask(this), this.config.misc().attackResetInterval()); - this.platform.scheduleRepeatingTask( - new DataSaveTask(this), TimeUnit.MINUTES.toSeconds(this.config.misc().autoSaveInterval())); + this.platform.scheduleRepeatingTask(new AttackResetTask(this), this.config.misc().attackResetInterval()); + this.platform.scheduleRepeatingTask(new DataSaveTask(this), TimeUnit.MINUTES.toSeconds(this.config.misc().autoSaveInterval())); EpicGuardAPI.INSTANCE.setInstance(this); - logger() - .info("Startup completed successfully. Welcome to EpicGuard v" + this.platform.version()); + logger().info("Startup completed successfully. Welcome to EpicGuard v" + this.platform.version()); } public void loadConfigurations() { diff --git a/core/src/main/java/me/xneox/epicguard/core/Platform.java b/core/src/main/java/me/xneox/epicguard/core/Platform.java index 406fe39c..ab8b12d4 100644 --- a/core/src/main/java/me/xneox/epicguard/core/Platform.java +++ b/core/src/main/java/me/xneox/epicguard/core/Platform.java @@ -15,7 +15,7 @@ package me.xneox.epicguard.core; -import me.xneox.epicguard.core.user.OnlineUser; +import java.util.UUID; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; @@ -30,15 +30,15 @@ public interface Platform { /** Returns an audience for the provided user. */ @Nullable - Audience audience(@NotNull OnlineUser user); + Audience audience(@NotNull UUID uuid); /** * Kicks the user from the server with a specified message (find the player using User#getUUID). * - * @param onlineUser The user to be kicked. + * @param uuid The UUID of user to be kicked. * @param message The kick message. */ - void disconnectUser(@NotNull OnlineUser onlineUser, @NotNull Component message); + void disconnectUser(@NotNull UUID uuid, @NotNull Component message); /** * Schedules a task to be run asynchronously after the specified time (in seconds). diff --git a/core/src/main/java/me/xneox/epicguard/core/handler/JoinHandler.java b/core/src/main/java/me/xneox/epicguard/core/handler/JoinHandler.java index e4ff0bf3..1057ccf0 100644 --- a/core/src/main/java/me/xneox/epicguard/core/handler/JoinHandler.java +++ b/core/src/main/java/me/xneox/epicguard/core/handler/JoinHandler.java @@ -60,7 +60,7 @@ public void handle(@NotNull UUID uuid, @NotNull String address) { if (this.epicGuard.config().settingsCheck().enabled()) { this.epicGuard.platform().runTaskLater(() -> { if (user != null && !user.settingsChanged()) { - this.epicGuard.platform().disconnectUser(user, MessageUtils.multilineComponent(this.epicGuard.messages().disconnect().settingsPacket())); + this.epicGuard.platform().disconnectUser(uuid, MessageUtils.multilineComponent(this.epicGuard.messages().disconnect().settingsPacket())); } }, this.epicGuard.config().settingsCheck().delay()); } diff --git a/core/src/main/java/me/xneox/epicguard/core/manager/GeoManager.java b/core/src/main/java/me/xneox/epicguard/core/manager/GeoManager.java index abbe0f4b..1a0b456a 100644 --- a/core/src/main/java/me/xneox/epicguard/core/manager/GeoManager.java +++ b/core/src/main/java/me/xneox/epicguard/core/manager/GeoManager.java @@ -49,7 +49,10 @@ public GeoManager(EpicGuard epicGuard) { this.epicGuard = epicGuard; epicGuard.logger().info("This product includes GeoLite2 data created by MaxMind, available from https://www.maxmind.com"); - String parent = FileUtils.EPICGUARD_DIR + "/data"; + File parent = new File(FileUtils.EPICGUARD_DIR, "/data"); + //noinspection ResultOfMethodCallIgnored + parent.mkdirs(); + File countryDatabase = new File(parent, "GeoLite2-Country.mmdb"); File cityDatabase = new File(parent, "GeoLite2-City.mmdb"); File countryArchive = new File(parent, "GeoLite2-Country.tar.gz"); diff --git a/core/src/main/java/me/xneox/epicguard/core/proxy/ProxyManager.java b/core/src/main/java/me/xneox/epicguard/core/proxy/ProxyManager.java index e1765c51..0b90c3d5 100644 --- a/core/src/main/java/me/xneox/epicguard/core/proxy/ProxyManager.java +++ b/core/src/main/java/me/xneox/epicguard/core/proxy/ProxyManager.java @@ -29,10 +29,9 @@ public class ProxyManager { public ProxyManager(EpicGuard epicGuard) { this.epicGuard = epicGuard; - this.resultCache = - CacheBuilder.newBuilder() - .expireAfterWrite(epicGuard.config().proxyCheck().cacheDuration(), TimeUnit.SECONDS) - .build(); + this.resultCache = CacheBuilder.newBuilder() + .expireAfterWrite(epicGuard.config().proxyCheck().cacheDuration(), TimeUnit.SECONDS) + .build(); } /** diff --git a/core/src/main/java/me/xneox/epicguard/core/storage/StorageManager.java b/core/src/main/java/me/xneox/epicguard/core/storage/StorageManager.java index dede455e..3420c1ae 100644 --- a/core/src/main/java/me/xneox/epicguard/core/storage/StorageManager.java +++ b/core/src/main/java/me/xneox/epicguard/core/storage/StorageManager.java @@ -101,7 +101,8 @@ public void updateAccounts(@NotNull ConnectingUser user) { * *
Returned list is immutable, used only for statistics and command suggestions.
*/
- public List