From a401655551239be95ffdaea7b526797b41d13616 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Thu, 4 Aug 2022 22:57:11 +0000 Subject: [PATCH 01/30] refactor: Migrate to gradle --- .gitignore | 7 +- build.gradle.kts | 38 +++++++ .../authmevelocity/common}/MessageType.java | 2 +- .../common/configuration/Loader.java | 5 + .../configuration/PaperConfiguration.java | 5 + .../configuration/ProxyConfiguration.java | 5 + gradle.properties | 9 ++ paper/build.gradle.kts | 50 ++++++++++ .../paper}/AuthMeVelocityPlugin.java | 7 +- .../paper}/AuthmePlaceholders.java | 2 +- .../paper}/events/PreSendLoginEvent.java | 2 +- .../paper}/listeners/AuthMeListener.java | 8 +- .../paper}/listeners/MessageListener.java | 2 +- pom.xml | 49 --------- proxy/pom.xml | 63 ------------ proxy/src/main/resources/velocity-plugin.json | 19 ---- settings.gradle.kts | 6 ++ spigot/pom.xml | 66 ------------- spigot/src/main/resources/plugin.yml | 8 -- velocity/build.gradle.kts | 26 +++++ .../velocity/AuthMePlaceholders.java | 14 +-- .../velocity/AuthMeVelocityAPI.java | 48 +++------ .../velocity}/AuthMeVelocityPlugin.java | 99 +++++++++++++++---- .../velocity}/commands/AuthmeCommand.java | 4 +- .../velocity}/config/AuthMeConfig.java | 2 +- .../velocity}/config/ConfigUtils.java | 2 +- .../velocity}/event/PreSendOnLoginEvent.java | 2 +- .../event/ProxyForcedUnregisterEvent.java | 2 +- .../velocity}/event/ProxyLoginEvent.java | 2 +- .../velocity}/event/ProxyLogoutEvent.java | 2 +- .../velocity}/event/ProxyRegisterEvent.java | 2 +- .../velocity}/event/ProxyUnregisterEvent.java | 2 +- .../velocity}/listener/ConnectListener.java | 13 +-- .../velocity}/listener/FastLoginListener.java | 9 +- .../listener/PluginMessageListener.java | 25 ++--- .../velocity}/listener/ProxyListener.java | 15 +-- .../velocity}/utils/AuthmeUtils.java | 2 +- .../src/main/resources/config.toml | 0 38 files changed, 305 insertions(+), 319 deletions(-) create mode 100644 build.gradle.kts rename {spigot/src/main/java/com/glyart/authmevelocity/spigot => common/src/main/java/me/adrianed/authmevelocity/common}/MessageType.java (67%) create mode 100644 common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java create mode 100644 common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java create mode 100644 common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java create mode 100644 gradle.properties create mode 100644 paper/build.gradle.kts rename {spigot/src/main/java/com/glyart/authmevelocity/spigot => paper/src/main/java/me/adrianed/authmevelocity/paper}/AuthMeVelocityPlugin.java (88%) rename {spigot/src/main/java/com/glyart/authmevelocity/spigot => paper/src/main/java/me/adrianed/authmevelocity/paper}/AuthmePlaceholders.java (96%) rename {spigot/src/main/java/com/glyart/authmevelocity/spigot => paper/src/main/java/me/adrianed/authmevelocity/paper}/events/PreSendLoginEvent.java (94%) rename {spigot/src/main/java/com/glyart/authmevelocity/spigot => paper/src/main/java/me/adrianed/authmevelocity/paper}/listeners/AuthMeListener.java (87%) rename {spigot/src/main/java/com/glyart/authmevelocity/spigot => paper/src/main/java/me/adrianed/authmevelocity/paper}/listeners/MessageListener.java (94%) delete mode 100644 pom.xml delete mode 100644 proxy/pom.xml delete mode 100644 proxy/src/main/resources/velocity-plugin.json create mode 100644 settings.gradle.kts delete mode 100644 spigot/pom.xml delete mode 100644 spigot/src/main/resources/plugin.yml create mode 100644 velocity/build.gradle.kts rename proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthmePlaceholders.java => velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMePlaceholders.java (74%) rename proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthmeVelocityAPI.java => velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityAPI.java (50%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/AuthMeVelocityPlugin.java (59%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/commands/AuthmeCommand.java (93%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/config/AuthMeConfig.java (98%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/config/ConfigUtils.java (96%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/event/PreSendOnLoginEvent.java (97%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/event/ProxyForcedUnregisterEvent.java (87%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/event/ProxyLoginEvent.java (88%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/event/ProxyLogoutEvent.java (86%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/event/ProxyRegisterEvent.java (86%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/event/ProxyUnregisterEvent.java (86%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/listener/ConnectListener.java (89%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/listener/FastLoginListener.java (69%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/listener/PluginMessageListener.java (85%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/listener/ProxyListener.java (86%) rename {proxy/src/main/java/com/glyart/authmevelocity/proxy => velocity/src/main/java/me/adrianed/authmevelocity/velocity}/utils/AuthmeUtils.java (92%) rename {proxy => velocity}/src/main/resources/config.toml (100%) diff --git a/.gitignore b/.gitignore index 7dfc5e9..c9507cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,9 @@ - + +.gradle/ +/.idea/ +build/ +bin/ + target/ pom.xml.tag pom.xml.releaseBackup diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..6c4b5fd --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,38 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +plugins { + java + id("com.github.johnrengelman.shadow") version "7.1.2" +} + +allprojects { + apply(plugin = "java") + repositories { + mavenCentral() + maven("https://repo.papermc.io/repository/maven-public/") + } +} + +dependencies { + shadow(project(":authmevelocity-common")) + shadow(project(":authmevelocity-velocity")) + shadow(project(":authmevelocity-paper")) +} + +tasks { + shadowJar { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + archiveFileName.set("AuthMeVelocity.jar") + configurations = listOf(project.configurations.shadow.get()) + } + + build { + dependsOn(shadowJar) + } + + compileJava { + options.encoding = Charsets.UTF_8.name() + + options.release.set(17) + } +} \ No newline at end of file diff --git a/spigot/src/main/java/com/glyart/authmevelocity/spigot/MessageType.java b/common/src/main/java/me/adrianed/authmevelocity/common/MessageType.java similarity index 67% rename from spigot/src/main/java/com/glyart/authmevelocity/spigot/MessageType.java rename to common/src/main/java/me/adrianed/authmevelocity/common/MessageType.java index 52c054d..ffcec61 100644 --- a/spigot/src/main/java/com/glyart/authmevelocity/spigot/MessageType.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/MessageType.java @@ -1,4 +1,4 @@ -package com.glyart.authmevelocity.spigot; +package me.adrianed.authmevelocity.common; public enum MessageType { LOGIN, REGISTER, LOGOUT, FORCE_UNREGISTER, UNREGISTER; diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java new file mode 100644 index 0000000..3d4161b --- /dev/null +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java @@ -0,0 +1,5 @@ +package me.adrianed.authmevelocity.common.configuration; + +public class Loader { + +} diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java new file mode 100644 index 0000000..94e32b3 --- /dev/null +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java @@ -0,0 +1,5 @@ +package me.adrianed.authmevelocity.common.configuration; + +public class PaperConfiguration { + +} diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java new file mode 100644 index 0000000..7c2390f --- /dev/null +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java @@ -0,0 +1,5 @@ +package me.adrianed.authmevelocity.common.configuration; + +public class ProxyConfiguration { + +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..8b4950a --- /dev/null +++ b/gradle.properties @@ -0,0 +1,9 @@ +group = me.adrianed.authmevelocity +version = 3.0.0-SNAPSHOT +description = A global chat regulator for you Velocity network +url = https://forums.velocitypowered.com/t/chatregulator-a-global-chat-regulator-for-velocity/962 +id = chatregulator + +caffeine-version = 3.1.1 +configurate-version = 4.1.2 +geantyref-version = 1.3.13 \ No newline at end of file diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts new file mode 100644 index 0000000..fa90cc6 --- /dev/null +++ b/paper/build.gradle.kts @@ -0,0 +1,50 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +plugins { + id("net.minecrell.plugin-yml.bukkit") version "0.5.2" + id("com.github.johnrengelman.shadow") version "7.1.2" +} + +repositories { + maven("https://jitpack.io") + maven("https://repo.codemc.org/repository/maven-public/") + maven("https://repo.alessiodp.com/releases/") +} + +dependencies { + compileOnly("io.papermc.paper:paper-api:1.19.1-R0.1-SNAPSHOT") + compileOnly("fr.xephi:authme:5.6.0-SNAPSHOT") + compileOnly("com.github.4drian3d:MiniPlaceholders:1.1.1") + shadow("net.byteflux:libby-bukkit:1.1.5") + compileOnly(project(":authmevelocity-common")) +} + +bukkit { + name = "AuthMeVelocity" + main = "me.adrianed.authmevelocity.paper.AuthMeVelocityPaper" + apiVersion = "1.13" + website = "https://github.com/4drian3d/AuthMeVelocity" + authors = listOf("xQuickGlare", "4drian3d") + softDepend = listOf("MiniPlaceholders") + depend = listOf("AuthMe") + version = "4.0.0" +} +tasks { + shadowJar { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby") + configurations = listOf(project.configurations.shadow.get()) + } + + build { + dependsOn(shadowJar) + } + + compileJava { + options.encoding = Charsets.UTF_8.name() + + options.release.set(17) + } +} + +java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) diff --git a/spigot/src/main/java/com/glyart/authmevelocity/spigot/AuthMeVelocityPlugin.java b/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMeVelocityPlugin.java similarity index 88% rename from spigot/src/main/java/com/glyart/authmevelocity/spigot/AuthMeVelocityPlugin.java rename to paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMeVelocityPlugin.java index 10e1f7a..b52df81 100644 --- a/spigot/src/main/java/com/glyart/authmevelocity/spigot/AuthMeVelocityPlugin.java +++ b/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMeVelocityPlugin.java @@ -1,7 +1,8 @@ -package com.glyart.authmevelocity.spigot; +package me.adrianed.authmevelocity.paper; -import com.glyart.authmevelocity.spigot.listeners.AuthMeListener; -import com.glyart.authmevelocity.spigot.listeners.MessageListener; +import me.adrianed.authmevelocity.paper.listeners.AuthMeListener; +import me.adrianed.authmevelocity.paper.listeners.MessageListener; +import me.adrianed.authmevelocity.common.MessageType; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; diff --git a/spigot/src/main/java/com/glyart/authmevelocity/spigot/AuthmePlaceholders.java b/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthmePlaceholders.java similarity index 96% rename from spigot/src/main/java/com/glyart/authmevelocity/spigot/AuthmePlaceholders.java rename to paper/src/main/java/me/adrianed/authmevelocity/paper/AuthmePlaceholders.java index 50761b4..bb7ebdd 100644 --- a/spigot/src/main/java/com/glyart/authmevelocity/spigot/AuthmePlaceholders.java +++ b/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthmePlaceholders.java @@ -1,4 +1,4 @@ -package com.glyart.authmevelocity.spigot; +package me.adrianed.authmevelocity.paper; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/spigot/src/main/java/com/glyart/authmevelocity/spigot/events/PreSendLoginEvent.java b/paper/src/main/java/me/adrianed/authmevelocity/paper/events/PreSendLoginEvent.java similarity index 94% rename from spigot/src/main/java/com/glyart/authmevelocity/spigot/events/PreSendLoginEvent.java rename to paper/src/main/java/me/adrianed/authmevelocity/paper/events/PreSendLoginEvent.java index 1ea44c8..6472b87 100644 --- a/spigot/src/main/java/com/glyart/authmevelocity/spigot/events/PreSendLoginEvent.java +++ b/paper/src/main/java/me/adrianed/authmevelocity/paper/events/PreSendLoginEvent.java @@ -1,4 +1,4 @@ -package com.glyart.authmevelocity.spigot.events; +package me.adrianed.authmevelocity.paper.events; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/AuthMeListener.java b/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/AuthMeListener.java similarity index 87% rename from spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/AuthMeListener.java rename to paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/AuthMeListener.java index 4e579c1..d2856a5 100644 --- a/spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/AuthMeListener.java +++ b/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/AuthMeListener.java @@ -1,8 +1,8 @@ -package com.glyart.authmevelocity.spigot.listeners; +package me.adrianed.authmevelocity.paper.listeners; -import com.glyart.authmevelocity.spigot.AuthMeVelocityPlugin; -import com.glyart.authmevelocity.spigot.MessageType; -import com.glyart.authmevelocity.spigot.events.PreSendLoginEvent; +import me.adrianed.authmevelocity.paper.AuthMeVelocityPlugin; +import me.adrianed.authmevelocity.common.MessageType; +import me.adrianed.authmevelocity.paper.events.PreSendLoginEvent; import fr.xephi.authme.events.LoginEvent; import fr.xephi.authme.events.LogoutEvent; diff --git a/spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/MessageListener.java b/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/MessageListener.java similarity index 94% rename from spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/MessageListener.java rename to paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/MessageListener.java index c2629ff..f713562 100644 --- a/spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/MessageListener.java +++ b/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/MessageListener.java @@ -1,4 +1,4 @@ -package com.glyart.authmevelocity.spigot.listeners; +package me.adrianed.authmevelocity.paper.listeners; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 86528c6..0000000 --- a/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - 4.0.0 - - com.glyart.authmevelocity - parent - pom - 2.2.2 - - - 11 - 11 - - - - - apache.snapshots - https://repository.apache.org/snapshots/ - - - - - spigot - proxy - - - - AuthMeVelocity-${project.name} - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 11 - 11 - - - - - - src/main/resources - true - - - - diff --git a/proxy/pom.xml b/proxy/pom.xml deleted file mode 100644 index 72f6851..0000000 --- a/proxy/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - parent - com.glyart.authmevelocity - 2.2.2 - - 4.0.0 - - - 11 - 11 - - - proxy - - - - papermc - https://repo.papermc.io/repository/maven-public/ - - - codemc-snapshots - https://repo.codemc.io/repository/maven-snapshots/ - - - jitpack.io - https://jitpack.io - - - - - - com.velocitypowered - velocity-api - 3.1.2-SNAPSHOT - provided - - - com.github.games647 - fastlogin.velocity - 1.11-SNAPSHOT - provided - - - com.github.4drian3d - MiniPlaceholders - 1.1.1 - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.2 - - - - diff --git a/proxy/src/main/resources/velocity-plugin.json b/proxy/src/main/resources/velocity-plugin.json deleted file mode 100644 index 0743eea..0000000 --- a/proxy/src/main/resources/velocity-plugin.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id":"authmevelocity", - "name":"AuthMeVelocity", - "version":"${project.version}", - "url":"https://github.com/4drian3d/AuthMeVelocity", - "description":"This plugin adds the support for AuthMeReloaded to Velocity.", - "authors":["xQuickGlare", "4drian3d"], - "dependencies":[ - { - "id":"fastlogin", - "optional":true - }, - { - "id":"miniplaceholders", - "optional":true - } - ], - "main":"com.glyart.authmevelocity.proxy.AuthMeVelocityPlugin" -} diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..ca8070f --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,6 @@ +rootProject.name = "authmevelocity-parent" + +listOf("common", "paper", "velocity").forEach { + include("authmevelocity-$it") + project(":authmevelocity-$it").projectDir = file(it) +} \ No newline at end of file diff --git a/spigot/pom.xml b/spigot/pom.xml deleted file mode 100644 index 76fb522..0000000 --- a/spigot/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - parent - com.glyart.authmevelocity - 2.2.2 - - 4.0.0 - - spigot - - - 11 - 11 - - - - - papermc - https://repo.papermc.io/repository/maven-public/ - - - - codemc-repo - https://repo.codemc.org/repository/maven-public/ - - - - jitpack.io - https://jitpack.io - - - - - - io.papermc.paper - paper-api - 1.18.2-R0.1-SNAPSHOT - provided - - - fr.xephi - authme - 5.6.0-SNAPSHOT - provided - - - - com.github.4drian3d - MiniPlaceholders - 1.1.1 - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.2 - - - - diff --git a/spigot/src/main/resources/plugin.yml b/spigot/src/main/resources/plugin.yml deleted file mode 100644 index ad850ab..0000000 --- a/spigot/src/main/resources/plugin.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: AuthMeVelocity -authors: [xQuickGlare, 4drian3d] -version: ${project.version} -main: com.glyart.authmevelocity.spigot.AuthMeVelocityPlugin -depend: [AuthMe] -soft-depend: [MiniPlaceholders] -# pls, dont use outdated versions, use 1.16.5+ -api-version: 1.13 \ No newline at end of file diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts new file mode 100644 index 0000000..a900d80 --- /dev/null +++ b/velocity/build.gradle.kts @@ -0,0 +1,26 @@ +plugins { + id("com.github.johnrengelman.shadow") version "7.1.2" +} + +repositories { + maven("https://jitpack.io") + maven("https://repo.codemc.org/repository/maven-public/") + maven("https://repo.alessiodp.com/releases/") +} + +dependencies { + compileOnly("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") + annotationProcessor("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") + compileOnly("com.github.4drian3d:MiniPlaceholders:1.1.1") + compileOnly("com.github.games647:fastlogin.velocity:1.11-SNAPSHOT") + shadow("net.byteflux:libby-velocity:1.1.5") + compileOnly(project(":authmevelocity-common")) +} + +tasks.compileJava { + options.encoding = Charsets.UTF_8.name() + + options.release.set(17) +} + +java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthmePlaceholders.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMePlaceholders.java similarity index 74% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthmePlaceholders.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMePlaceholders.java index 47d63fa..02e66de 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthmePlaceholders.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMePlaceholders.java @@ -1,4 +1,4 @@ -package com.glyart.authmevelocity.proxy; +package me.adrianed.authmevelocity.velocity; import com.velocitypowered.api.proxy.Player; @@ -7,31 +7,31 @@ import net.kyori.adventure.text.minimessage.tag.Tag; import static me.dreamerzero.miniplaceholders.api.utils.Components.*; -final class AuthmePlaceholders { - private AuthmePlaceholders(){} +final class AuthMePlaceholders { + private AuthMePlaceholders() {} static Expansion getExpansion(AuthMeVelocityPlugin plugin){ return Expansion.builder("authme") .filter(Player.class) // Logged Placeholders .audiencePlaceholder("is_logged", (aud, queue, ctx) -> - Tag.selfClosingInserting(plugin.getAPI().isLogged((Player)aud) ? TRUE_COMPONENT : FALSE_COMPONENT)) + Tag.selfClosingInserting(plugin.isLogged((Player)aud) ? TRUE_COMPONENT : FALSE_COMPONENT)) .globalPlaceholder("is_player_logged", (queue, ctx) -> { String playerName = queue.popOr(() -> "you need to provide a player").value(); return Tag.selfClosingInserting( plugin.getProxy().getPlayer(playerName) - .map(plugin.getAPI()::isLogged) + .map(plugin::isLogged) .orElse(false) ? TRUE_COMPONENT : FALSE_COMPONENT ); }) // In Auth Server placeholders .audiencePlaceholder("in_auth_server", (aud, queue, ctx) -> - Tag.selfClosingInserting(plugin.getAPI().isInAuthServer((Player)aud) ? TRUE_COMPONENT : FALSE_COMPONENT)) + Tag.selfClosingInserting(plugin.isInAuthServer((Player)aud) ? TRUE_COMPONENT : FALSE_COMPONENT)) .globalPlaceholder("player_in_auth_server", (queue, ctx) -> { String playerName = queue.popOr(() -> "you need to provide a player").value(); return Tag.selfClosingInserting( plugin.getProxy().getPlayer(playerName) - .map(plugin.getAPI()::isInAuthServer) + .map(plugin::isInAuthServer) .orElse(false) ? TRUE_COMPONENT : FALSE_COMPONENT ); }) diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthmeVelocityAPI.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityAPI.java similarity index 50% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthmeVelocityAPI.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityAPI.java index 6e8f869..2de20d8 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthmeVelocityAPI.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityAPI.java @@ -1,8 +1,8 @@ -package com.glyart.authmevelocity.proxy; +package me.adrianed.authmevelocity.velocity; import java.util.function.Predicate; -import com.glyart.authmevelocity.proxy.config.AuthMeConfig; +import me.adrianed.authmevelocity.velocity.config.AuthMeConfig; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.server.RegisteredServer; @@ -12,91 +12,67 @@ import org.jetbrains.annotations.NotNull; /** * API provided to interact with logged players */ -public final class AuthmeVelocityAPI { - private final AuthMeVelocityPlugin plugin; - private final AuthMeConfig config; - AuthmeVelocityAPI(AuthMeVelocityPlugin plugin, AuthMeConfig config){ - this.plugin = plugin; - this.config = config; - } +public sealed interface AuthMeVelocityAPI permits AuthMeVelocityPlugin { /** * Check if the player is logged in or not * @param player the player * @return if the player is logged in or not */ - public boolean isLogged(@NotNull Player player){ - return plugin.loggedPlayers.contains(player.getUniqueId()); - } + boolean isLogged(@NotNull Player player); /** * Check if the player is not logged * @param player the player * @return if the player is not logged */ - public boolean isNotLogged(@NotNull Player player){ - return !plugin.loggedPlayers.contains(player.getUniqueId()); - } + boolean isNotLogged(@NotNull Player player); /** * Adds a player to the list of logged in players * @param player the new logged player * @return if the player was succesfully added */ - public boolean addPlayer(@NotNull Player player){ - return plugin.loggedPlayers.add(player.getUniqueId()); - } + boolean addPlayer(@NotNull Player player); /** * Removes a player from the list of logged-in players * @param player the unlogged player * @return if the player was succesfully removed */ - public boolean removePlayer(@NotNull Player player){ - return plugin.loggedPlayers.remove(player.getUniqueId()); - } + boolean removePlayer(@NotNull Player player); /** * Removes players who meet the established condition * @param predicate the condition */ - public void removePlayerIf(@NotNull Predicate predicate){ - plugin.loggedPlayers.removeIf(uuid -> predicate.test(plugin.getProxy().getPlayer(uuid).orElse(null))); - } + void removePlayerIf(@NotNull Predicate predicate); /** * Check if the player is on a login server * @param player the player * @return if the player is on a login server */ - public boolean isInAuthServer(@NotNull Player player){ - return player.getCurrentServer().map(this::isAuthServer).orElse(false); - } + boolean isInAuthServer(@NotNull Player player); /** * Check if a server is intended to be a logging server * @param server the server * @return if the server is a login server */ - public boolean isAuthServer(@NotNull RegisteredServer server){ - return config.getAuthServers().contains(server.getServerInfo().getName()); - } + boolean isAuthServer(@NotNull RegisteredServer server); /** * Checks if a connection is made from a login server * @param connection the connection * @return if the connection is made from a login server */ - public boolean isAuthServer(@NotNull ServerConnection connection){ - return config.getAuthServers().contains(connection.getServerInfo().getName()); - } + boolean isAuthServer(@NotNull ServerConnection connection); /** * Checks if a string is an name of an auth server * @param server the server name * @return if the server is an auth serverr */ - public boolean isAuthServer(@NotNull String server){ - return config.getAuthServers().contains(server); - } + boolean isAuthServer(@NotNull String server); } diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthMeVelocityPlugin.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java similarity index 59% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthMeVelocityPlugin.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java index 9ab15b2..bfcd35c 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthMeVelocityPlugin.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java @@ -1,18 +1,23 @@ -package com.glyart.authmevelocity.proxy; +package me.adrianed.authmevelocity.velocity; -import com.glyart.authmevelocity.proxy.commands.AuthmeCommand; -import com.glyart.authmevelocity.proxy.config.AuthMeConfig; -import com.glyart.authmevelocity.proxy.listener.ConnectListener; -import com.glyart.authmevelocity.proxy.listener.FastLoginListener; -import com.glyart.authmevelocity.proxy.listener.PluginMessageListener; -import com.glyart.authmevelocity.proxy.listener.ProxyListener; +import me.adrianed.authmevelocity.velocity.commands.AuthmeCommand; +import me.adrianed.authmevelocity.velocity.config.AuthMeConfig; +import me.adrianed.authmevelocity.velocity.listener.ConnectListener; +import me.adrianed.authmevelocity.velocity.listener.FastLoginListener; +import me.adrianed.authmevelocity.velocity.listener.PluginMessageListener; +import me.adrianed.authmevelocity.velocity.listener.ProxyListener; import com.google.inject.Inject; import com.moandjiezana.toml.Toml; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; import com.velocitypowered.api.plugin.annotation.DataDirectory; +import com.velocitypowered.api.plugin.Plugin; +import com.velocitypowered.api.plugin.Dependency; import com.velocitypowered.api.proxy.ProxyServer; +import com.velocitypowered.api.proxy.Player; +import com.velocitypowered.api.proxy.ServerConnection; +import com.velocitypowered.api.proxy.server.RegisteredServer; import com.velocitypowered.api.proxy.messages.ChannelIdentifier; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; @@ -20,6 +25,7 @@ import net.kyori.adventure.text.minimessage.MiniMessage; import org.slf4j.Logger; +import java.util.function.Predicate; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; @@ -32,13 +38,28 @@ import java.util.Objects; import java.util.Set; import java.util.UUID; -public class AuthMeVelocityPlugin { +@Plugin( + id = "authmevelocity", + name = "AuthMeVelocity", + url = "https://github.com/4drian3d/AuthMeVelocity", + description = "This plugin adds the support for AuthMeReloaded to Velocity", + dependencies = { + @Dependency( + id = "miniplaceholders", + optional = true + ), + @Dependency( + id = "fastlogin", + optional = true + ) + } +) +public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { public static final ChannelIdentifier AUTHMEVELOCITY_CHANNEL = MinecraftChannelIdentifier.create("authmevelocity", "main"); private final ProxyServer proxy; private final Logger logger; private final Path pluginDirectory; - private AuthmeVelocityAPI api; private AuthMeConfig config; private final List listeners = new ArrayList<>(3); @@ -61,7 +82,7 @@ public class AuthMeVelocityPlugin { proxy.getChannelRegistrar().register(AUTHMEVELOCITY_CHANNEL); if (proxy.getPluginManager().isLoaded("miniplaceholders")) { - AuthmePlaceholders.getExpansion(this).register(); + AuthMePlaceholders.getExpansion(this).register(); } AuthmeCommand.register(this, proxy.getCommandManager()); @@ -73,10 +94,6 @@ public class AuthMeVelocityPlugin { return this.proxy; } - public AuthmeVelocityAPI getAPI(){ - return this.api; - } - private Toml loadConfig(Path path){ try { if (Files.notExists(path)) { @@ -107,17 +124,16 @@ public class AuthMeVelocityPlugin { } this.config = new AuthMeConfig(toml); - this.api = new AuthmeVelocityAPI(this, config); listeners.forEach(listener -> proxy.getEventManager().unregisterListener(this, listener)); listeners.clear(); - listeners.add(new ProxyListener(config, api)); - listeners.add(new ConnectListener(config, api, proxy, logger)); - listeners.add(new PluginMessageListener(proxy, logger, config, api)); + listeners.add(new ProxyListener(config, this)); + listeners.add(new ConnectListener(config, this, proxy, logger)); + listeners.add(new PluginMessageListener(proxy, logger, config, this)); if (proxy.getPluginManager().isLoaded("fastlogin")) { - listeners.add(new FastLoginListener(proxy, api)); + listeners.add(new FastLoginListener(proxy, this)); } listeners.forEach(listener -> proxy.getEventManager().register(this, listener)); @@ -135,4 +151,49 @@ public class AuthMeVelocityPlugin { "LobbyServers: " + config.getToServerOptions().getTeleportServers())); } } + + @Override + public boolean isLogged(Player player){ + return loggedPlayers.contains(player.getUniqueId()); + } + + @Override + public boolean isNotLogged(Player player){ + return !loggedPlayers.contains(player.getUniqueId()); + } + + @Override + public boolean addPlayer(Player player){ + return loggedPlayers.add(player.getUniqueId()); + } + + @Override + public boolean removePlayer(Player player){ + return loggedPlayers.remove(player.getUniqueId()); + } + + @Override + public void removePlayerIf(Predicate predicate){ + loggedPlayers.removeIf(uuid -> predicate.test(getProxy().getPlayer(uuid).orElse(null))); + } + + @Override + public boolean isInAuthServer(Player player){ + return player.getCurrentServer().map(this::isAuthServer).orElse(false); + } + + @Override + public boolean isAuthServer(RegisteredServer server){ + return config.getAuthServers().contains(server.getServerInfo().getName()); + } + + @Override + public boolean isAuthServer(ServerConnection connection){ + return config.getAuthServers().contains(connection.getServerInfo().getName()); + } + + @Override + public boolean isAuthServer(String server){ + return config.getAuthServers().contains(server); + } } diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/commands/AuthmeCommand.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/commands/AuthmeCommand.java similarity index 93% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/commands/AuthmeCommand.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/commands/AuthmeCommand.java index 676225a..cf7914b 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/commands/AuthmeCommand.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/commands/AuthmeCommand.java @@ -1,6 +1,5 @@ -package com.glyart.authmevelocity.proxy.commands; +package me.adrianed.authmevelocity.velocity.commands; -import com.glyart.authmevelocity.proxy.AuthMeVelocityPlugin; import com.mojang.brigadier.Command; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.tree.LiteralCommandNode; @@ -9,6 +8,7 @@ import com.velocitypowered.api.command.CommandManager; import com.velocitypowered.api.command.CommandMeta; import com.velocitypowered.api.command.CommandSource; +import me.adrianed.authmevelocity.velocity.AuthMeVelocityPlugin; import net.kyori.adventure.text.minimessage.MiniMessage; public class AuthmeCommand { diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/config/AuthMeConfig.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/config/AuthMeConfig.java similarity index 98% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/config/AuthMeConfig.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/config/AuthMeConfig.java index c39e811..abfee8e 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/config/AuthMeConfig.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/config/AuthMeConfig.java @@ -1,4 +1,4 @@ -package com.glyart.authmevelocity.proxy.config; +package me.adrianed.authmevelocity.velocity.config; import java.util.List; import java.util.Set; diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/config/ConfigUtils.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/config/ConfigUtils.java similarity index 96% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/config/ConfigUtils.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/config/ConfigUtils.java index b5097ff..8875aec 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/config/ConfigUtils.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/config/ConfigUtils.java @@ -1,4 +1,4 @@ -package com.glyart.authmevelocity.proxy.config; +package me.adrianed.authmevelocity.velocity.config; import java.util.List; import java.util.function.Supplier; diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/event/PreSendOnLoginEvent.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/PreSendOnLoginEvent.java similarity index 97% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/event/PreSendOnLoginEvent.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/PreSendOnLoginEvent.java index 90521e2..0d103dc 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/event/PreSendOnLoginEvent.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/PreSendOnLoginEvent.java @@ -1,4 +1,4 @@ -package com.glyart.authmevelocity.proxy.event; +package me.adrianed.authmevelocity.velocity.event; import java.util.Objects; diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyForcedUnregisterEvent.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyForcedUnregisterEvent.java similarity index 87% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyForcedUnregisterEvent.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyForcedUnregisterEvent.java index 6ac6c9f..b216a20 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyForcedUnregisterEvent.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyForcedUnregisterEvent.java @@ -1,4 +1,4 @@ -package com.glyart.authmevelocity.proxy.event; +package me.adrianed.authmevelocity.velocity.event; import com.velocitypowered.api.proxy.Player; diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyLoginEvent.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyLoginEvent.java similarity index 88% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyLoginEvent.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyLoginEvent.java index ea41248..cd8b3df 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyLoginEvent.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyLoginEvent.java @@ -1,4 +1,4 @@ -package com.glyart.authmevelocity.proxy.event; +package me.adrianed.authmevelocity.velocity.event; import com.velocitypowered.api.proxy.Player; diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyLogoutEvent.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyLogoutEvent.java similarity index 86% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyLogoutEvent.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyLogoutEvent.java index e9975ad..2fa3c52 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyLogoutEvent.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyLogoutEvent.java @@ -1,4 +1,4 @@ -package com.glyart.authmevelocity.proxy.event; +package me.adrianed.authmevelocity.velocity.event; import com.velocitypowered.api.proxy.Player; diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyRegisterEvent.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyRegisterEvent.java similarity index 86% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyRegisterEvent.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyRegisterEvent.java index 8dd59b9..0d060d8 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyRegisterEvent.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyRegisterEvent.java @@ -1,4 +1,4 @@ -package com.glyart.authmevelocity.proxy.event; +package me.adrianed.authmevelocity.velocity.event; import com.velocitypowered.api.proxy.Player; diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyUnregisterEvent.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyUnregisterEvent.java similarity index 86% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyUnregisterEvent.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyUnregisterEvent.java index beede3a..2467d00 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/event/ProxyUnregisterEvent.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyUnregisterEvent.java @@ -1,4 +1,4 @@ -package com.glyart.authmevelocity.proxy.event; +package me.adrianed.authmevelocity.velocity.event; import com.velocitypowered.api.proxy.Player; diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ConnectListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java similarity index 89% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ConnectListener.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java index 14cc42e..db0c452 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ConnectListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java @@ -1,13 +1,11 @@ -package com.glyart.authmevelocity.proxy.listener; +package me.adrianed.authmevelocity.velocity.listener; import java.util.Optional; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; -import com.glyart.authmevelocity.proxy.AuthMeVelocityPlugin; -import com.glyart.authmevelocity.proxy.AuthmeVelocityAPI; -import com.glyart.authmevelocity.proxy.config.AuthMeConfig; +import me.adrianed.authmevelocity.velocity.config.AuthMeConfig; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import com.velocitypowered.api.event.Continuation; @@ -20,13 +18,16 @@ import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.server.RegisteredServer; +import me.adrianed.authmevelocity.velocity.AuthMeVelocityPlugin; +import me.adrianed.authmevelocity.velocity.AuthMeVelocityAPI; + public class ConnectListener { private final ProxyServer proxy; private final Logger logger; private final AuthMeConfig config; - private final AuthmeVelocityAPI api; + private final AuthMeVelocityAPI api; - public ConnectListener(AuthMeConfig config, AuthmeVelocityAPI api, ProxyServer proxy, Logger logger) { + public ConnectListener(AuthMeConfig config, AuthMeVelocityAPI api, ProxyServer proxy, Logger logger) { this.config = config; this.api = api; this.logger = logger; diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/FastLoginListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java similarity index 69% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/FastLoginListener.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java index 70679c7..d2322ee 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/FastLoginListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java @@ -1,14 +1,15 @@ -package com.glyart.authmevelocity.proxy.listener; +package me.adrianed.authmevelocity.velocity.listener; import com.github.games647.fastlogin.velocity.event.VelocityFastLoginAutoLoginEvent; -import com.glyart.authmevelocity.proxy.AuthmeVelocityAPI; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.proxy.ProxyServer; +import me.adrianed.authmevelocity.velocity.AuthMeVelocityAPI; + public class FastLoginListener { private final ProxyServer server; - private final AuthmeVelocityAPI api; - public FastLoginListener(ProxyServer server, AuthmeVelocityAPI api){ + private final AuthMeVelocityAPI api; + public FastLoginListener(ProxyServer server, AuthMeVelocityAPI api){ this.server = server; this.api = api; } diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/PluginMessageListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java similarity index 85% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/PluginMessageListener.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java index 07349fd..c38d483 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/PluginMessageListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java @@ -1,17 +1,15 @@ -package com.glyart.authmevelocity.proxy.listener; +package me.adrianed.authmevelocity.velocity.listener; import java.util.List; import java.util.Random; -import com.glyart.authmevelocity.proxy.AuthMeVelocityPlugin; -import com.glyart.authmevelocity.proxy.AuthmeVelocityAPI; -import com.glyart.authmevelocity.proxy.config.AuthMeConfig; -import com.glyart.authmevelocity.proxy.event.PreSendOnLoginEvent; -import com.glyart.authmevelocity.proxy.event.ProxyForcedUnregisterEvent; -import com.glyart.authmevelocity.proxy.event.ProxyLoginEvent; -import com.glyart.authmevelocity.proxy.event.ProxyLogoutEvent; -import com.glyart.authmevelocity.proxy.event.ProxyRegisterEvent; -import com.glyart.authmevelocity.proxy.event.ProxyUnregisterEvent; +import me.adrianed.authmevelocity.velocity.config.AuthMeConfig; +import me.adrianed.authmevelocity.velocity.event.PreSendOnLoginEvent; +import me.adrianed.authmevelocity.velocity.event.ProxyForcedUnregisterEvent; +import me.adrianed.authmevelocity.velocity.event.ProxyLoginEvent; +import me.adrianed.authmevelocity.velocity.event.ProxyLogoutEvent; +import me.adrianed.authmevelocity.velocity.event.ProxyRegisterEvent; +import me.adrianed.authmevelocity.velocity.event.ProxyUnregisterEvent; import com.google.common.io.ByteArrayDataInput; import com.velocitypowered.api.event.Continuation; import com.velocitypowered.api.event.Subscribe; @@ -23,6 +21,9 @@ import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.server.RegisteredServer; +import me.adrianed.authmevelocity.velocity.AuthMeVelocityPlugin; +import me.adrianed.authmevelocity.velocity.AuthMeVelocityAPI; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -32,9 +33,9 @@ public class PluginMessageListener { private final Logger logger; private final Random rm; private final AuthMeConfig config; - private final AuthmeVelocityAPI api; + private final AuthMeVelocityAPI api; - public PluginMessageListener(@NotNull ProxyServer proxy, @NotNull Logger logger, @NotNull AuthMeConfig config, AuthmeVelocityAPI api) { + public PluginMessageListener(@NotNull ProxyServer proxy, @NotNull Logger logger, @NotNull AuthMeConfig config, AuthMeVelocityAPI api) { this.proxy = proxy; this.logger = logger; this.rm = new Random(); diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ProxyListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java similarity index 86% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ProxyListener.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java index 4041ad5..ee7a537 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ProxyListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java @@ -1,9 +1,8 @@ -package com.glyart.authmevelocity.proxy.listener; +package me.adrianed.authmevelocity.velocity.listener; -import com.glyart.authmevelocity.proxy.AuthmeVelocityAPI; -import com.glyart.authmevelocity.proxy.config.AuthMeConfig; -import com.glyart.authmevelocity.proxy.config.ConfigUtils; -import com.glyart.authmevelocity.proxy.utils.AuthmeUtils; +import me.adrianed.authmevelocity.velocity.config.AuthMeConfig; +import me.adrianed.authmevelocity.velocity.config.ConfigUtils; +import me.adrianed.authmevelocity.velocity.utils.AuthmeUtils; import com.velocitypowered.api.event.Continuation; import com.velocitypowered.api.event.EventTask; import com.velocitypowered.api.event.PostOrder; @@ -14,13 +13,15 @@ import com.velocitypowered.api.event.player.PlayerChatEvent; import com.velocitypowered.api.event.player.TabCompleteEvent; import com.velocitypowered.api.proxy.Player; +import me.adrianed.authmevelocity.velocity.AuthMeVelocityAPI; + import org.jetbrains.annotations.NotNull; public final class ProxyListener { private final AuthMeConfig config; - private final AuthmeVelocityAPI api; + private final AuthMeVelocityAPI api; - public ProxyListener(@NotNull AuthMeConfig config, AuthmeVelocityAPI api) { + public ProxyListener(@NotNull AuthMeConfig config, AuthMeVelocityAPI api) { this.config = config; this.api = api; } diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/utils/AuthmeUtils.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java similarity index 92% rename from proxy/src/main/java/com/glyart/authmevelocity/proxy/utils/AuthmeUtils.java rename to velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java index 2f329ad..f2ebaae 100644 --- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/utils/AuthmeUtils.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java @@ -1,4 +1,4 @@ -package com.glyart.authmevelocity.proxy.utils; +package me.adrianed.authmevelocity.velocity.utils; import java.util.Objects; diff --git a/proxy/src/main/resources/config.toml b/velocity/src/main/resources/config.toml similarity index 100% rename from proxy/src/main/resources/config.toml rename to velocity/src/main/resources/config.toml From 07c6bc99ebb055ad0e42892b4017b649d17277b9 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Thu, 4 Aug 2022 23:00:25 +0000 Subject: [PATCH 02/30] fix(build): Fixed workflows --- .github/workflows/{maven.yml => gradle.yml} | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) rename .github/workflows/{maven.yml => gradle.yml} (66%) diff --git a/.github/workflows/maven.yml b/.github/workflows/gradle.yml similarity index 66% rename from .github/workflows/maven.yml rename to .github/workflows/gradle.yml index 9f85b74..5ce6c6e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/gradle.yml @@ -15,19 +15,17 @@ jobs: with: java-version: 17 distribution: 'temurin' - cache: 'maven' + cache: 'gradle' - - name: Build with Maven + - name: Build with Gradle uses: nick-invision/retry@v2 with: timeout_minutes: 5 max_attempts: 2 - command: mvn -B package --file pom.xml + command: gradle clean build - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: AuthmeVelocity - path: | - proxy/target/AuthMeVelocity-proxy.jar - spigot/target/AuthMeVelocity-spigot.jar \ No newline at end of file + name: AuthMeVelocity + path: build/libs/AuthMeVelocity.jar \ No newline at end of file From 23faeb5ab4bff17fa3b2e90097756bb1e0eb866d Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Fri, 5 Aug 2022 02:03:48 +0000 Subject: [PATCH 03/30] refactor(api): Implement API modules --- api/paper/build.gradle.kts | 3 +++ .../api/paper/event}/PreSendLoginEvent.java | 2 +- api/paper/src/main/java/module-info.java | 5 +++++ api/velocity/build.gradle.kts | 3 +++ .../api}/velocity/AuthMeVelocityAPI.java | 5 ++--- .../api}/velocity/event/PreSendOnLoginEvent.java | 2 +- .../velocity/event/ProxyForcedUnregisterEvent.java | 2 +- .../api}/velocity/event/ProxyLoginEvent.java | 2 +- .../api}/velocity/event/ProxyLogoutEvent.java | 2 +- .../api}/velocity/event/ProxyRegisterEvent.java | 2 +- .../api}/velocity/event/ProxyUnregisterEvent.java | 2 +- api/velocity/src/main/java/module-info.java | 6 ++++++ build.gradle.kts | 2 ++ common/src/main/java/module-info.java | 4 ++++ paper/build.gradle.kts | 3 ++- .../authmevelocity/paper/AuthmePlaceholders.java | 4 ++-- .../paper/listeners/AuthMeListener.java | 2 +- settings.gradle.kts | 5 +++++ velocity/build.gradle.kts | 1 + .../velocity/AuthMeVelocityPlugin.java | 1 + .../velocity/listener/ConnectListener.java | 2 +- .../velocity/listener/FastLoginListener.java | 2 +- .../velocity/listener/PluginMessageListener.java | 14 +++++++------- .../velocity/listener/ProxyListener.java | 2 +- 24 files changed, 54 insertions(+), 24 deletions(-) create mode 100644 api/paper/build.gradle.kts rename {paper/src/main/java/me/adrianed/authmevelocity/paper/events => api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event}/PreSendLoginEvent.java (94%) create mode 100644 api/paper/src/main/java/module-info.java create mode 100644 api/velocity/build.gradle.kts rename {velocity/src/main/java/me/adrianed/authmevelocity => api/velocity/src/main/java/me/adrianed/authmevelocity/api}/velocity/AuthMeVelocityAPI.java (92%) rename {velocity/src/main/java/me/adrianed/authmevelocity => api/velocity/src/main/java/me/adrianed/authmevelocity/api}/velocity/event/PreSendOnLoginEvent.java (97%) rename {velocity/src/main/java/me/adrianed/authmevelocity => api/velocity/src/main/java/me/adrianed/authmevelocity/api}/velocity/event/ProxyForcedUnregisterEvent.java (86%) rename {velocity/src/main/java/me/adrianed/authmevelocity => api/velocity/src/main/java/me/adrianed/authmevelocity/api}/velocity/event/ProxyLoginEvent.java (87%) rename {velocity/src/main/java/me/adrianed/authmevelocity => api/velocity/src/main/java/me/adrianed/authmevelocity/api}/velocity/event/ProxyLogoutEvent.java (85%) rename {velocity/src/main/java/me/adrianed/authmevelocity => api/velocity/src/main/java/me/adrianed/authmevelocity/api}/velocity/event/ProxyRegisterEvent.java (85%) rename {velocity/src/main/java/me/adrianed/authmevelocity => api/velocity/src/main/java/me/adrianed/authmevelocity/api}/velocity/event/ProxyUnregisterEvent.java (85%) create mode 100644 api/velocity/src/main/java/module-info.java create mode 100644 common/src/main/java/module-info.java diff --git a/api/paper/build.gradle.kts b/api/paper/build.gradle.kts new file mode 100644 index 0000000..d0d7da0 --- /dev/null +++ b/api/paper/build.gradle.kts @@ -0,0 +1,3 @@ +dependencies { + compileOnly("io.papermc.paper:paper-api:1.19.1-R0.1-SNAPSHOT") +} \ No newline at end of file diff --git a/paper/src/main/java/me/adrianed/authmevelocity/paper/events/PreSendLoginEvent.java b/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/PreSendLoginEvent.java similarity index 94% rename from paper/src/main/java/me/adrianed/authmevelocity/paper/events/PreSendLoginEvent.java rename to api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/PreSendLoginEvent.java index 6472b87..431b96f 100644 --- a/paper/src/main/java/me/adrianed/authmevelocity/paper/events/PreSendLoginEvent.java +++ b/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/PreSendLoginEvent.java @@ -1,4 +1,4 @@ -package me.adrianed.authmevelocity.paper.events; +package me.adrianed.authmevelocity.api.paper.event; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/api/paper/src/main/java/module-info.java b/api/paper/src/main/java/module-info.java new file mode 100644 index 0000000..64b7e65 --- /dev/null +++ b/api/paper/src/main/java/module-info.java @@ -0,0 +1,5 @@ +module me.adrianed.authmevelocity.api.paper { + requires static transitive org.bukkit; + requires static org.jetbrains.annotations; + exports me.adrianed.authmevelocity.api.paper.event; +} diff --git a/api/velocity/build.gradle.kts b/api/velocity/build.gradle.kts new file mode 100644 index 0000000..5e5ae5e --- /dev/null +++ b/api/velocity/build.gradle.kts @@ -0,0 +1,3 @@ +dependencies { + compileOnly("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") +} \ No newline at end of file diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityAPI.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/AuthMeVelocityAPI.java similarity index 92% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityAPI.java rename to api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/AuthMeVelocityAPI.java index 2de20d8..5c0bb10 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityAPI.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/AuthMeVelocityAPI.java @@ -1,8 +1,7 @@ -package me.adrianed.authmevelocity.velocity; +package me.adrianed.authmevelocity.api.velocity; import java.util.function.Predicate; -import me.adrianed.authmevelocity.velocity.config.AuthMeConfig; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.server.RegisteredServer; @@ -12,7 +11,7 @@ import org.jetbrains.annotations.NotNull; /** * API provided to interact with logged players */ -public sealed interface AuthMeVelocityAPI permits AuthMeVelocityPlugin { +public interface AuthMeVelocityAPI { /** * Check if the player is logged in or not diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/PreSendOnLoginEvent.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java similarity index 97% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/PreSendOnLoginEvent.java rename to api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java index 0d103dc..e5bceb1 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/PreSendOnLoginEvent.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java @@ -1,4 +1,4 @@ -package me.adrianed.authmevelocity.velocity.event; +package me.adrianed.authmevelocity.api.velocity.event; import java.util.Objects; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyForcedUnregisterEvent.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyForcedUnregisterEvent.java similarity index 86% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyForcedUnregisterEvent.java rename to api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyForcedUnregisterEvent.java index b216a20..81301fb 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyForcedUnregisterEvent.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyForcedUnregisterEvent.java @@ -1,4 +1,4 @@ -package me.adrianed.authmevelocity.velocity.event; +package me.adrianed.authmevelocity.api.velocity.event; import com.velocitypowered.api.proxy.Player; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyLoginEvent.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLoginEvent.java similarity index 87% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyLoginEvent.java rename to api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLoginEvent.java index cd8b3df..6ed50ca 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyLoginEvent.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLoginEvent.java @@ -1,4 +1,4 @@ -package me.adrianed.authmevelocity.velocity.event; +package me.adrianed.authmevelocity.api.velocity.event; import com.velocitypowered.api.proxy.Player; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyLogoutEvent.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLogoutEvent.java similarity index 85% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyLogoutEvent.java rename to api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLogoutEvent.java index 2fa3c52..7c4ff23 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyLogoutEvent.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLogoutEvent.java @@ -1,4 +1,4 @@ -package me.adrianed.authmevelocity.velocity.event; +package me.adrianed.authmevelocity.api.velocity.event; import com.velocitypowered.api.proxy.Player; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyRegisterEvent.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyRegisterEvent.java similarity index 85% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyRegisterEvent.java rename to api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyRegisterEvent.java index 0d060d8..9d0899e 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyRegisterEvent.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyRegisterEvent.java @@ -1,4 +1,4 @@ -package me.adrianed.authmevelocity.velocity.event; +package me.adrianed.authmevelocity.api.velocity.event; import com.velocitypowered.api.proxy.Player; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyUnregisterEvent.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyUnregisterEvent.java similarity index 85% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyUnregisterEvent.java rename to api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyUnregisterEvent.java index 2467d00..4510ac6 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/event/ProxyUnregisterEvent.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyUnregisterEvent.java @@ -1,4 +1,4 @@ -package me.adrianed.authmevelocity.velocity.event; +package me.adrianed.authmevelocity.api.velocity.event; import com.velocitypowered.api.proxy.Player; diff --git a/api/velocity/src/main/java/module-info.java b/api/velocity/src/main/java/module-info.java new file mode 100644 index 0000000..a2a1150 --- /dev/null +++ b/api/velocity/src/main/java/module-info.java @@ -0,0 +1,6 @@ +module me.adrianed.authmevelocity.api.velocity { + requires static transitive com.velocitypowered.api; + requires static org.jetbrains.annotations; + exports me.adrianed.authmevelocity.api.velocity; + exports me.adrianed.authmevelocity.api.velocity.event; +} diff --git a/build.gradle.kts b/build.gradle.kts index 6c4b5fd..73ebd29 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,6 +15,8 @@ allprojects { dependencies { shadow(project(":authmevelocity-common")) + shadow(project(":authmevelocity-api-paper")) + shadow(project(":authmevelocity-api-velocity")) shadow(project(":authmevelocity-velocity")) shadow(project(":authmevelocity-paper")) } diff --git a/common/src/main/java/module-info.java b/common/src/main/java/module-info.java new file mode 100644 index 0000000..1cb9444 --- /dev/null +++ b/common/src/main/java/module-info.java @@ -0,0 +1,4 @@ +module me.adrianed.authmevelocity.common { + exports me.adrianed.authmevelocity.common; + exports me.adrianed.authmevelocity.common.configuration; +} diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index fa90cc6..227ff15 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -12,11 +12,12 @@ repositories { } dependencies { + compileOnly(project(":authmevelocity-common")) + compileOnly(project(":authmevelocity-api-paper")) compileOnly("io.papermc.paper:paper-api:1.19.1-R0.1-SNAPSHOT") compileOnly("fr.xephi:authme:5.6.0-SNAPSHOT") compileOnly("com.github.4drian3d:MiniPlaceholders:1.1.1") shadow("net.byteflux:libby-bukkit:1.1.5") - compileOnly(project(":authmevelocity-common")) } bukkit { diff --git a/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthmePlaceholders.java b/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthmePlaceholders.java index bb7ebdd..48f4d1f 100644 --- a/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthmePlaceholders.java +++ b/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthmePlaceholders.java @@ -10,7 +10,7 @@ import net.kyori.adventure.text.minimessage.tag.Tag; import static me.dreamerzero.miniplaceholders.api.utils.Components.*; final class AuthmePlaceholders { - private AuthmePlaceholders(){} + private AuthmePlaceholders() {} static Expansion getExpansion(){ return Expansion.builder("authme") @@ -23,7 +23,7 @@ final class AuthmePlaceholders { .globalPlaceholder("is_player_logged", (queue, ctx) -> { String playerName = queue.popOr("you need to provide a player name").value(); Player player = Bukkit.getPlayer(playerName); - if(player == null) return Tag.selfClosingInserting(FALSE_COMPONENT); + if (player == null) return Tag.selfClosingInserting(FALSE_COMPONENT); return Tag.selfClosingInserting(AuthMeApi.getInstance().isAuthenticated(player) ? TRUE_COMPONENT : FALSE_COMPONENT); diff --git a/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/AuthMeListener.java b/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/AuthMeListener.java index d2856a5..1453ef5 100644 --- a/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/AuthMeListener.java +++ b/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/AuthMeListener.java @@ -2,7 +2,7 @@ package me.adrianed.authmevelocity.paper.listeners; import me.adrianed.authmevelocity.paper.AuthMeVelocityPlugin; import me.adrianed.authmevelocity.common.MessageType; -import me.adrianed.authmevelocity.paper.events.PreSendLoginEvent; +import me.adrianed.authmevelocity.api.paper.event.PreSendLoginEvent; import fr.xephi.authme.events.LoginEvent; import fr.xephi.authme.events.LogoutEvent; diff --git a/settings.gradle.kts b/settings.gradle.kts index ca8070f..ba8295d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,4 +3,9 @@ rootProject.name = "authmevelocity-parent" listOf("common", "paper", "velocity").forEach { include("authmevelocity-$it") project(":authmevelocity-$it").projectDir = file(it) +} + +listOf("paper", "velocity").forEach { + include("authmevelocity-api-$it") + project(":authmevelocity-api-$it").projectDir = file("api/$it") } \ No newline at end of file diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index a900d80..99fd428 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -15,6 +15,7 @@ dependencies { compileOnly("com.github.games647:fastlogin.velocity:1.11-SNAPSHOT") shadow("net.byteflux:libby-velocity:1.1.5") compileOnly(project(":authmevelocity-common")) + compileOnly(project(":authmevelocity-api-velocity")) } tasks.compileJava { diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java index bfcd35c..2123c07 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java @@ -6,6 +6,7 @@ import me.adrianed.authmevelocity.velocity.listener.ConnectListener; import me.adrianed.authmevelocity.velocity.listener.FastLoginListener; import me.adrianed.authmevelocity.velocity.listener.PluginMessageListener; import me.adrianed.authmevelocity.velocity.listener.ProxyListener; +import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; import com.google.inject.Inject; import com.moandjiezana.toml.Toml; import com.velocitypowered.api.command.CommandSource; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java index db0c452..78dddd6 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java @@ -19,7 +19,7 @@ import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.server.RegisteredServer; import me.adrianed.authmevelocity.velocity.AuthMeVelocityPlugin; -import me.adrianed.authmevelocity.velocity.AuthMeVelocityAPI; +import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; public class ConnectListener { private final ProxyServer proxy; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java index d2322ee..b76c90e 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java @@ -4,7 +4,7 @@ import com.github.games647.fastlogin.velocity.event.VelocityFastLoginAutoLoginEv import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.proxy.ProxyServer; -import me.adrianed.authmevelocity.velocity.AuthMeVelocityAPI; +import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; public class FastLoginListener { private final ProxyServer server; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java index c38d483..d9aff27 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java @@ -4,12 +4,12 @@ import java.util.List; import java.util.Random; import me.adrianed.authmevelocity.velocity.config.AuthMeConfig; -import me.adrianed.authmevelocity.velocity.event.PreSendOnLoginEvent; -import me.adrianed.authmevelocity.velocity.event.ProxyForcedUnregisterEvent; -import me.adrianed.authmevelocity.velocity.event.ProxyLoginEvent; -import me.adrianed.authmevelocity.velocity.event.ProxyLogoutEvent; -import me.adrianed.authmevelocity.velocity.event.ProxyRegisterEvent; -import me.adrianed.authmevelocity.velocity.event.ProxyUnregisterEvent; +import me.adrianed.authmevelocity.api.velocity.event.PreSendOnLoginEvent; +import me.adrianed.authmevelocity.api.velocity.event.ProxyForcedUnregisterEvent; +import me.adrianed.authmevelocity.api.velocity.event.ProxyLoginEvent; +import me.adrianed.authmevelocity.api.velocity.event.ProxyLogoutEvent; +import me.adrianed.authmevelocity.api.velocity.event.ProxyRegisterEvent; +import me.adrianed.authmevelocity.api.velocity.event.ProxyUnregisterEvent; import com.google.common.io.ByteArrayDataInput; import com.velocitypowered.api.event.Continuation; import com.velocitypowered.api.event.Subscribe; @@ -22,7 +22,7 @@ import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.server.RegisteredServer; import me.adrianed.authmevelocity.velocity.AuthMeVelocityPlugin; -import me.adrianed.authmevelocity.velocity.AuthMeVelocityAPI; +import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java index ee7a537..6bf0294 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java @@ -13,7 +13,7 @@ import com.velocitypowered.api.event.player.PlayerChatEvent; import com.velocitypowered.api.event.player.TabCompleteEvent; import com.velocitypowered.api.proxy.Player; -import me.adrianed.authmevelocity.velocity.AuthMeVelocityAPI; +import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; import org.jetbrains.annotations.NotNull; From 9453b8a925782294cba8033a1581c992ff752b99 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Fri, 5 Aug 2022 22:27:09 +0000 Subject: [PATCH 04/30] feat: Implement Plugin Configuration --- api/paper/build.gradle.kts | 10 +- common/build.gradle.kts | 10 ++ .../authmevelocity/common/LibsManager.java | 7 ++ .../common/configuration/Loader.java | 64 ++++++++++++- .../configuration/PaperConfiguration.java | 4 +- .../configuration/ProxyConfiguration.java | 65 ++++++++++++- common/src/main/java/module-info.java | 1 + paper/build.gradle.kts | 1 + .../authmevelocity/paper/PaperLibraries.java | 51 ++++++++++ velocity/build.gradle.kts | 12 ++- .../velocity/AuthMeVelocityPlugin.java | 92 +++++++------------ .../velocity/VelocityLibraries.java | 57 ++++++++++++ .../velocity/commands/AuthmeCommand.java | 2 +- .../velocity/config/AuthMeConfig.java | 91 ------------------ .../velocity/config/ConfigUtils.java | 40 -------- .../velocity/listener/ConnectListener.java | 21 ++--- .../velocity/listener/FastLoginListener.java | 9 +- .../listener/PluginMessageListener.java | 18 ++-- .../velocity/listener/ProxyListener.java | 42 +++++---- 19 files changed, 349 insertions(+), 248 deletions(-) create mode 100644 common/build.gradle.kts create mode 100644 common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java create mode 100644 paper/src/main/java/me/adrianed/authmevelocity/paper/PaperLibraries.java create mode 100644 velocity/src/main/java/me/adrianed/authmevelocity/velocity/VelocityLibraries.java delete mode 100644 velocity/src/main/java/me/adrianed/authmevelocity/velocity/config/AuthMeConfig.java delete mode 100644 velocity/src/main/java/me/adrianed/authmevelocity/velocity/config/ConfigUtils.java diff --git a/api/paper/build.gradle.kts b/api/paper/build.gradle.kts index d0d7da0..6c6e1b1 100644 --- a/api/paper/build.gradle.kts +++ b/api/paper/build.gradle.kts @@ -1,3 +1,11 @@ dependencies { compileOnly("io.papermc.paper:paper-api:1.19.1-R0.1-SNAPSHOT") -} \ No newline at end of file +} + +tasks { + compileJava { + options.release.set(17) + } +} + +java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) \ No newline at end of file diff --git a/common/build.gradle.kts b/common/build.gradle.kts new file mode 100644 index 0000000..76986fd --- /dev/null +++ b/common/build.gradle.kts @@ -0,0 +1,10 @@ +repositories { + maven("https://repo.alessiodp.com/releases/") +} + +dependencies { + compileOnly("space.arim.dazzleconf:dazzleconf-core:1.3.0-M1") + compileOnly("space.arim.dazzleconf:dazzleconf-ext-snakeyaml:1.3.0-M1") + compileOnly("org.slf4j:slf4j-api:1.7.36") + compileOnly("net.byteflux:libby-core:1.1.5") +} \ No newline at end of file diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java b/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java new file mode 100644 index 0000000..5be73e6 --- /dev/null +++ b/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java @@ -0,0 +1,7 @@ +package me.adrianed.authmevelocity.common; + +//TODO: Abstract Class +public interface LibsManager { + void registerRepositories(); + void loadLibraries(); +} diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java index 3d4161b..2d32069 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java @@ -1,5 +1,65 @@ package me.adrianed.authmevelocity.common.configuration; -public class Loader { - +import org.slf4j.Logger; + +import space.arim.dazzleconf.ConfigurationFactory; +import space.arim.dazzleconf.ConfigurationOptions; +import space.arim.dazzleconf.error.ConfigFormatSyntaxException; +import space.arim.dazzleconf.error.InvalidConfigException; +import space.arim.dazzleconf.ext.snakeyaml.CommentMode; +import space.arim.dazzleconf.ext.snakeyaml.SnakeYamlConfigurationFactory; +import space.arim.dazzleconf.ext.snakeyaml.SnakeYamlOptions; +import space.arim.dazzleconf.helper.ConfigurationHelper; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.file.Path; + +public class Loader { + private final ConfigurationHelper configHelper; + private volatile C configData; + private final Logger logger; + + private Loader(ConfigurationHelper configHelper, Logger logger) { + this.configHelper = configHelper; + this.logger = logger; + } + + public static Loader create(Path configFolder, String fileName, Class configClass, Logger logger) { + SnakeYamlOptions yamlOptions = new SnakeYamlOptions.Builder() + .commentMode(CommentMode.alternativeWriter()) + .build(); + ConfigurationFactory configFactory = SnakeYamlConfigurationFactory.create( + configClass, + ConfigurationOptions.defaults(), + yamlOptions); + return new Loader<>(new ConfigurationHelper<>(configFolder, fileName, configFactory), logger); + } + + public boolean reloadConfig() { + try { + configData = configHelper.reloadConfigData(); + return true; + } catch (IOException ex) { + throw new UncheckedIOException(ex); + } catch (ConfigFormatSyntaxException ex) { + configData = configHelper.getFactory().loadDefaults(); + logger.error("The yaml syntax in your configuration is invalid. " + + "Check your YAML syntax with a tool such as https://yaml-online-parser.appspot.com/", ex); + return false; + } catch (InvalidConfigException ex) { + configData = configHelper.getFactory().loadDefaults(); + logger.error("One of the values in your configuration is not valid. " + + "Check to make sure you have specified the right data types.", ex); + return false; + } + } + + public C getConfig() { + C configData = this.configData; + if (configData == null) { + throw new IllegalStateException("Configuration has not been loaded yet"); + } + return configData; + } } diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java index 94e32b3..9f376cd 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java @@ -1,5 +1,5 @@ package me.adrianed.authmevelocity.common.configuration; -public class PaperConfiguration { - +public interface PaperConfiguration { + boolean debug(); } diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java index 7c2390f..7481245 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java @@ -1,5 +1,66 @@ package me.adrianed.authmevelocity.common.configuration; -public class ProxyConfiguration { - +import java.util.List; +import space.arim.dazzleconf.annote.ConfDefault; +import space.arim.dazzleconf.annote.ConfComments; + +public interface ProxyConfiguration { + @ConfDefault.DefaultStrings({ + "auth1", "auth2" + }) + @ConfComments({ + "List of login/registration servers" + }) + List authServers(); + + @ConfDefault.DefaultObject("defaultSendOnLogin") + SendOnLogin sendOnLogin(); + + @ConfDefault.DefaultObject("defaultCommands") + Commands commands(); + + @ConfDefault.DefaultObject("defaultEnsureAuth") + EnsureAuthServer ensureAuthServer(); + + public interface SendOnLogin { + @ConfComments({ + "Send logged in players to another server?" + }) + @ConfDefault.DefaultBoolean(false) + boolean sendToServerOnLogin(); + + @ConfComments({ + "List of servers to send", + "One of these servers will be chosen at random" + }) + @ConfDefault.DefaultStrings({ + "lobby1", "lobby2" + }) + List teleportServers(); + } + + public interface Commands { + @ConfComments({ + "Sets the commands that users who have not yet logged in can execute" + }) + @ConfDefault.DefaultStrings({ + "login", "register", "l", "reg", "email", "captcha" + }) + List allowedCommands(); + + @ConfComments({ + "Sets the message to send in case a non-logged-in player executes an unauthorized command", + "To deactivate the message, leave it empty" + }) + @ConfDefault.DefaultString("You cannot execute commands if you are not logged in yet") + String blockedCommandMessage(); + } + + public interface EnsureAuthServer { + @ConfComments({ + "Ensure that the first server to which players connect is an auth server" + }) + @ConfDefault.DefaultBoolean(false) + boolean ensureFirstServerIsAuthServer(); + } } diff --git a/common/src/main/java/module-info.java b/common/src/main/java/module-info.java index 1cb9444..2151432 100644 --- a/common/src/main/java/module-info.java +++ b/common/src/main/java/module-info.java @@ -1,4 +1,5 @@ module me.adrianed.authmevelocity.common { + requires transitive space.arim.dazzleconf.ext.snakeyaml; exports me.adrianed.authmevelocity.common; exports me.adrianed.authmevelocity.common.configuration; } diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index 227ff15..428bdab 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -30,6 +30,7 @@ bukkit { depend = listOf("AuthMe") version = "4.0.0" } + tasks { shadowJar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE diff --git a/paper/src/main/java/me/adrianed/authmevelocity/paper/PaperLibraries.java b/paper/src/main/java/me/adrianed/authmevelocity/paper/PaperLibraries.java new file mode 100644 index 0000000..1165cc3 --- /dev/null +++ b/paper/src/main/java/me/adrianed/authmevelocity/paper/PaperLibraries.java @@ -0,0 +1,51 @@ +package me.adrianed.authmevelocity.paper; + +import me.adrianed.authmevelocity.common.LibsManager; +import net.byteflux.libby.BukkitLibraryManager; +import net.byteflux.libby.Library; +import net.byteflux.libby.relocation.Relocation; + +public class PaperLibraries implements LibsManager { + private final BukkitLibraryManager manager; + + public PaperLibraries(AuthMeVelocityPlugin plugin) { + this.manager = new BukkitLibraryManager(plugin); + } + + @Override + public void registerRepositories() { + manager.addMavenCentral(); + } + + @Override + public void loadLibraries() { + final Relocation dazzleRelocation + = new Relocation("space.arim.dazzleconf", "me.adrianed.authmevelocity.libs.dazzleconf"); + final Relocation snakeYamlRelocation + = new Relocation("pattern", "me.adrianed.authmevelocity.libs.snake"); + final Library dazzleConf = Library.builder() + .groupId("space.arim.dazzleconf") + .artifactId("dazzleconf-ext-snakeyaml") + .version("1.3.0-M1") + .relocate(dazzleRelocation) + .build(); + final Library dazzleYaml = Library.builder() + .groupId("space.arim.dazzleconf") + .artifactId("dazzleconf-ext-snakeyaml") + .version("1.3.0-M1") + .relocate(dazzleRelocation) + .relocate(snakeYamlRelocation) + .build(); + final Library snakeYaml = Library.builder() + .groupId("org.yaml") + .artifactId("snakeyaml") + .version("1.30") + .relocate(dazzleRelocation) + .relocate(snakeYamlRelocation) + .build(); + + manager.loadLibrary(snakeYaml); + manager.loadLibrary(dazzleConf); + manager.loadLibrary(dazzleYaml); + } +} diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 99fd428..3d74e45 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -18,10 +18,16 @@ dependencies { compileOnly(project(":authmevelocity-api-velocity")) } -tasks.compileJava { - options.encoding = Charsets.UTF_8.name() +tasks { + compileJava { + options.encoding = Charsets.UTF_8.name() - options.release.set(17) + options.release.set(17) + } + + build { + dependsOn(shadowJar) + } } java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java index 2123c07..99ff981 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java @@ -1,12 +1,13 @@ package me.adrianed.authmevelocity.velocity; import me.adrianed.authmevelocity.velocity.commands.AuthmeCommand; -import me.adrianed.authmevelocity.velocity.config.AuthMeConfig; import me.adrianed.authmevelocity.velocity.listener.ConnectListener; import me.adrianed.authmevelocity.velocity.listener.FastLoginListener; import me.adrianed.authmevelocity.velocity.listener.PluginMessageListener; import me.adrianed.authmevelocity.velocity.listener.ProxyListener; import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; +import me.adrianed.authmevelocity.common.configuration.Loader; +import me.adrianed.authmevelocity.common.configuration.ProxyConfiguration; import com.google.inject.Inject; import com.moandjiezana.toml.Toml; import com.velocitypowered.api.command.CommandSource; @@ -33,7 +34,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; +import java.util.concurrent.ConcurrentHashMap; import java.util.List; import java.util.Objects; import java.util.Set; @@ -61,10 +62,10 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { private final ProxyServer proxy; private final Logger logger; private final Path pluginDirectory; - private AuthMeConfig config; + private Loader config; private final List listeners = new ArrayList<>(3); - protected final Set loggedPlayers = Collections.synchronizedSet(new HashSet<>()); + protected final Set loggedPlayers = ConcurrentHashMap.newKeySet(); @Inject public AuthMeVelocityPlugin(ProxyServer proxy, Logger logger, @DataDirectory Path dataDirectory) { @@ -75,13 +76,26 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { @Subscribe public void onProxyInitialization(ProxyInitializeEvent event) { - if (!this.reload()) { - logger.warn("Failed to load config.toml. Shutting down."); - return; - } + final VelocityLibraries libraries + = new VelocityLibraries(logger, pluginDirectory, proxy.getPluginManager(), this); + libraries.registerRepositories(); + libraries.loadLibraries(); + + this.config = Loader.create(pluginDirectory, "config.yml", ProxyConfiguration.class, logger); proxy.getChannelRegistrar().register(AUTHMEVELOCITY_CHANNEL); + List.of( + new ProxyListener(this), + new ConnectListener(this, proxy, logger), + new PluginMessageListener(proxy, logger, this) + ).forEach(listener -> + proxy.getEventManager().register(this, listener)); + + if (proxy.getPluginManager().isLoaded("fastlogin")) { + proxy.getEventManager().register(this, new FastLoginListener(proxy, this)); + } + if (proxy.getPluginManager().isLoaded("miniplaceholders")) { AuthMePlaceholders.getExpansion(this).register(); } @@ -95,64 +109,22 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { return this.proxy; } - private Toml loadConfig(Path path){ - try { - if (Files.notExists(path)) { - Files.createDirectory(path); - } - - Path configPath = path.resolve("config.toml"); - if (Files.notExists(configPath)) { - try (InputStream in = this.getClass().getClassLoader().getResourceAsStream("config.toml")) { - Files.copy(Objects.requireNonNull(in, "The configuration does not exists"), configPath); - } - } - - return new Toml().read(Files.newInputStream(configPath)); - } catch (IOException ex) { - logger.error("An error ocurred on configuration initialization", ex); - return null; - } catch(IllegalStateException ex) { - logger.error("Invalid configuration provided", ex); - return null; - } - } - - public boolean reload() { - Toml toml = this.loadConfig(pluginDirectory); - if (toml == null) { - return false; - } - - this.config = new AuthMeConfig(toml); - - listeners.forEach(listener -> proxy.getEventManager().unregisterListener(this, listener)); - listeners.clear(); - - listeners.add(new ProxyListener(config, this)); - listeners.add(new ConnectListener(config, this, proxy, logger)); - listeners.add(new PluginMessageListener(proxy, logger, config, this)); - - if (proxy.getPluginManager().isLoaded("fastlogin")) { - listeners.add(new FastLoginListener(proxy, this)); - } - - listeners.forEach(listener -> proxy.getEventManager().register(this, listener)); - return true; - } - public void sendInfoMessage() { CommandSource source = proxy.getConsoleCommandSource(); source.sendMessage(MiniMessage.miniMessage().deserialize( " --- AuthMeVelocity ---")); source.sendMessage(MiniMessage.miniMessage().deserialize( - "AuthServers: " + config.getAuthServers())); - if (config.getToServerOptions().sendToServer()) { + "AuthServers: " + config.getConfig().authServers())); + if (config.getConfig().sendOnLogin().sendToServerOnLogin()) { source.sendMessage(MiniMessage.miniMessage().deserialize( - "LobbyServers: " + config.getToServerOptions().getTeleportServers())); + "LobbyServers: " + config.getConfig().sendOnLogin().teleportServers())); } } + public Loader config() { + return this.config; + } + @Override public boolean isLogged(Player player){ return loggedPlayers.contains(player.getUniqueId()); @@ -185,16 +157,16 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { @Override public boolean isAuthServer(RegisteredServer server){ - return config.getAuthServers().contains(server.getServerInfo().getName()); + return config.getConfig().authServers().contains(server.getServerInfo().getName()); } @Override public boolean isAuthServer(ServerConnection connection){ - return config.getAuthServers().contains(connection.getServerInfo().getName()); + return config.getConfig().authServers().contains(connection.getServerInfo().getName()); } @Override public boolean isAuthServer(String server){ - return config.getAuthServers().contains(server); + return config.getConfig().authServers().contains(server); } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/VelocityLibraries.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/VelocityLibraries.java new file mode 100644 index 0000000..fffa8cb --- /dev/null +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/VelocityLibraries.java @@ -0,0 +1,57 @@ +package me.adrianed.authmevelocity.velocity; + +import java.nio.file.Path; + +import org.slf4j.Logger; + +import com.velocitypowered.api.plugin.PluginManager; + +import me.adrianed.authmevelocity.common.LibsManager; +import net.byteflux.libby.Library; +import net.byteflux.libby.VelocityLibraryManager; +import net.byteflux.libby.relocation.Relocation; + +public class VelocityLibraries implements LibsManager { + private final VelocityLibraryManager manager; + + public VelocityLibraries(Logger logger, Path dataDirectory, PluginManager pluginManager, AuthMeVelocityPlugin plugin) { + this.manager = new VelocityLibraryManager( + logger, dataDirectory, pluginManager, plugin); + } + @Override + public void registerRepositories() { + manager.addMavenCentral(); + } + + @Override + public void loadLibraries() { + final Relocation dazzleRelocation + = new Relocation("space.arim.dazzleconf", "me.adrianed.authmevelocity.libs.dazzleconf"); + final Relocation snakeYamlRelocation + = new Relocation("pattern", "me.adrianed.authmevelocity.libs.snake"); + final Library dazzleConf = Library.builder() + .groupId("space.arim.dazzleconf") + .artifactId("dazzleconf-ext-snakeyaml") + .version("1.3.0-M1") + .relocate(dazzleRelocation) + .build(); + final Library dazzleYaml = Library.builder() + .groupId("space.arim.dazzleconf") + .artifactId("dazzleconf-ext-snakeyaml") + .version("1.3.0-M1") + .relocate(dazzleRelocation) + .relocate(snakeYamlRelocation) + .build(); + final Library snakeYaml = Library.builder() + .groupId("org.yaml") + .artifactId("snakeyaml") + .version("1.30") + .relocate(dazzleRelocation) + .relocate(snakeYamlRelocation) + .build(); + + manager.loadLibrary(snakeYaml); + manager.loadLibrary(dazzleConf); + manager.loadLibrary(dazzleYaml); + } +} diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/commands/AuthmeCommand.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/commands/AuthmeCommand.java index cf7914b..2fc9f4a 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/commands/AuthmeCommand.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/commands/AuthmeCommand.java @@ -20,7 +20,7 @@ public class AuthmeCommand { .then(LiteralArgumentBuilder.literal("reload") .executes(cmd -> { CommandSource source = cmd.getSource(); - if (plugin.reload()) { + if (plugin.config().reloadConfig()) { plugin.sendInfoMessage(); source.sendMessage(MiniMessage.miniMessage().deserialize( "AuthmeVelocity has been successfully reloaded")); diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/config/AuthMeConfig.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/config/AuthMeConfig.java deleted file mode 100644 index abfee8e..0000000 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/config/AuthMeConfig.java +++ /dev/null @@ -1,91 +0,0 @@ -package me.adrianed.authmevelocity.velocity.config; - -import java.util.List; -import java.util.Set; - -import com.moandjiezana.toml.Toml; - -import org.jetbrains.annotations.NotNull; - -public final class AuthMeConfig { - private final List authServers; - private final ServerOnLogin serverOnLogin; - private final Commands commands; - private final EnsureAuthServer ensure; - - public AuthMeConfig(@NotNull Toml toml){ - this.authServers = ConfigUtils.listOrElse(toml, "authServers", - () -> List.of("auth1", "auth2")); - this.serverOnLogin = ConfigUtils.getObjectOrElse(toml, "SendOnLogin", ServerOnLogin.class, - () -> new ServerOnLogin(false, List.of("lobby1", "lobby2"))); - this.commands = ConfigUtils.getObjectOrElse(toml, "Commands", Commands.class, - () -> new Commands(Set.of("login", "register", "l", "reg", "email", "captcha"), "You cannot execute commands if you are not logged in yet")); - this.ensure = ConfigUtils.getObjectOrElse(toml, "EnsureAuthServer", EnsureAuthServer.class, - () -> new EnsureAuthServer(false)); - } - - public static class ServerOnLogin { - private final boolean sendToServerOnLogin; - private final List teleportServers; - - public ServerOnLogin(boolean sendToServerOnLogin, List teleportServers){ - this.sendToServerOnLogin = sendToServerOnLogin; - this.teleportServers = teleportServers; - } - - public boolean sendToServer(){ - return this.sendToServerOnLogin; - } - - public @NotNull List getTeleportServers(){ - return this.teleportServers; - } - } - - public static class Commands { - private final Set allowedCommands; - private final String blockedCommandMessage; - - public Commands(Set allowedCommands, String blockedCommandMessage){ - this.allowedCommands = allowedCommands; - this.blockedCommandMessage = blockedCommandMessage; - } - - public @NotNull Set getAllowedCommands(){ - return this.allowedCommands; - } - - public @NotNull String getBlockedMessage() { - return this.blockedCommandMessage; - } - } - - public static class EnsureAuthServer { - private final boolean ensureFirstServerIsAuthServer; - - public EnsureAuthServer(boolean ensureFirstServerIsAuthServer){ - this.ensureFirstServerIsAuthServer = ensureFirstServerIsAuthServer; - } - - public boolean ensureAuthServer(){ - return this.ensureFirstServerIsAuthServer; - } - - } - - public @NotNull Commands getCommandsConfig(){ - return this.commands; - } - - public @NotNull ServerOnLogin getToServerOptions(){ - return this.serverOnLogin; - } - - public @NotNull EnsureAuthServer getEnsureOptions(){ - return this.ensure; - } - - public @NotNull List getAuthServers(){ - return this.authServers; - } -} diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/config/ConfigUtils.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/config/ConfigUtils.java deleted file mode 100644 index 8875aec..0000000 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/config/ConfigUtils.java +++ /dev/null @@ -1,40 +0,0 @@ -package me.adrianed.authmevelocity.velocity.config; - -import java.util.List; -import java.util.function.Supplier; - -import java.lang.reflect.ParameterizedType; - -import com.moandjiezana.toml.Toml; -import com.velocitypowered.api.proxy.Player; - -import net.kyori.adventure.text.minimessage.MiniMessage; - -public final class ConfigUtils { - public static final MiniMessage MINIMESSAGE = MiniMessage.miniMessage(); - - public static void sendBlockedMessage(Player player, AuthMeConfig config){ - String blockedMessage = config.getCommandsConfig().getBlockedMessage(); - if(!blockedMessage.isBlank()){ - player.sendMessage(MINIMESSAGE.deserialize(blockedMessage)); - } - } - - @SuppressWarnings("unchecked") - static T getObjectOrElse(Toml config, String key, Supplier defaultValue){ - Toml configTable = config.getTable(key); - return configTable == null ? defaultValue.get() : (T)configTable.to((Class)((ParameterizedType)defaultValue.getClass() - .getGenericInterfaces()[0]).getActualTypeArguments()[0]); - } - - static T getObjectOrElse(Toml config, String key, Class clazz, Supplier defaultValue){ - Toml configTable = config.getTable(key); - return configTable == null ? defaultValue.get() : configTable.to(clazz); - } - - static List listOrElse(Toml config, String key, Supplier> defaultList){ - List list = config.getList(key); - return list != null ? list : defaultList.get(); - } - private ConfigUtils(){} -} diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java index 78dddd6..e6a1263 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java @@ -5,7 +5,6 @@ import java.util.Optional; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; -import me.adrianed.authmevelocity.velocity.config.AuthMeConfig; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import com.velocitypowered.api.event.Continuation; @@ -24,25 +23,23 @@ import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; public class ConnectListener { private final ProxyServer proxy; private final Logger logger; - private final AuthMeConfig config; - private final AuthMeVelocityAPI api; + private final AuthMeVelocityPlugin plugin; - public ConnectListener(AuthMeConfig config, AuthMeVelocityAPI api, ProxyServer proxy, Logger logger) { - this.config = config; - this.api = api; + public ConnectListener(AuthMeVelocityPlugin plugin, ProxyServer proxy, Logger logger) { + this.plugin = plugin; this.logger = logger; this.proxy = proxy; } @Subscribe(order = PostOrder.LATE) public void onInitialServer(PlayerChooseInitialServerEvent event, Continuation continuation){ - if(!config.getEnsureOptions().ensureAuthServer()) { + if(!plugin.config().getConfig().ensureAuthServer().ensureFirstServerIsAuthServer()) { continuation.resume(); return; } Optional optionalSV = event.getInitialServer(); - if(optionalSV.isPresent() && api.isAuthServer(optionalSV.get())){ + if(optionalSV.isPresent() && plugin.isAuthServer(optionalSV.get())){ continuation.resume(); return; } @@ -58,13 +55,13 @@ public class ConnectListener { @Subscribe public void onServerPreConnect(ServerPreConnectEvent event, Continuation continuation) { - if (!event.getResult().isAllowed() && api.isLogged(event.getPlayer())) { + if (!event.getResult().isAllowed() && plugin.isLogged(event.getPlayer())) { continuation.resume(); return; } // this should be present, "event.getResult().isAllowed()" is the "isPresent" check - if(!api.isAuthServer(event.getResult().getServer().get())) { + if(!plugin.isAuthServer(event.getResult().getServer().get())) { event.setResult(ServerPreConnectEvent.ServerResult.denied()); } continuation.resume(); @@ -73,7 +70,7 @@ public class ConnectListener { @Subscribe public void onServerPostConnect(ServerPostConnectEvent event) { final Player player = event.getPlayer(); - if (api.isLogged(player) && api.isInAuthServer(player)) { + if (plugin.isLogged(player) && plugin.isInAuthServer(player)) { ByteArrayDataOutput buf = ByteStreams.newDataOutput(); buf.writeUTF("LOGIN"); player.getCurrentServer().ifPresent(sv -> @@ -83,7 +80,7 @@ public class ConnectListener { // TODO: Implement #40 private @Nullable RegisteredServer getAvailableServer() { - for(String sv : config.getAuthServers()){ + for(String sv : plugin.config().getConfig().authServers()){ Optional opt = proxy.getServer(sv); if (opt.isPresent()) return opt.get(); } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java index b76c90e..ce64a57 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java @@ -7,14 +7,15 @@ import com.velocitypowered.api.proxy.ProxyServer; import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; public class FastLoginListener { - private final ProxyServer server; + private final ProxyServer proxy; private final AuthMeVelocityAPI api; - public FastLoginListener(ProxyServer server, AuthMeVelocityAPI api){ - this.server = server; + public FastLoginListener(ProxyServer proxy, AuthMeVelocityAPI api){ + this.proxy = proxy; this.api = api; } @Subscribe public void onAutoLogin(VelocityFastLoginAutoLoginEvent event){ - server.getPlayer(event.getProfile().getName()).ifPresent(api::addPlayer); + proxy.getPlayer(event.getProfile().getName()) + .ifPresent(api::addPlayer); } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java index d9aff27..ca89b6a 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java @@ -3,7 +3,6 @@ package me.adrianed.authmevelocity.velocity.listener; import java.util.List; import java.util.Random; -import me.adrianed.authmevelocity.velocity.config.AuthMeConfig; import me.adrianed.authmevelocity.api.velocity.event.PreSendOnLoginEvent; import me.adrianed.authmevelocity.api.velocity.event.ProxyForcedUnregisterEvent; import me.adrianed.authmevelocity.api.velocity.event.ProxyLoginEvent; @@ -22,7 +21,6 @@ import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.server.RegisteredServer; import me.adrianed.authmevelocity.velocity.AuthMeVelocityPlugin; -import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,15 +30,13 @@ public class PluginMessageListener { private final ProxyServer proxy; private final Logger logger; private final Random rm; - private final AuthMeConfig config; - private final AuthMeVelocityAPI api; + private final AuthMeVelocityPlugin plugin; - public PluginMessageListener(@NotNull ProxyServer proxy, @NotNull Logger logger, @NotNull AuthMeConfig config, AuthMeVelocityAPI api) { + public PluginMessageListener(@NotNull ProxyServer proxy, @NotNull Logger logger, AuthMeVelocityPlugin plugin) { this.proxy = proxy; this.logger = logger; this.rm = new Random(); - this.config = config; - this.api = api; + this.plugin = plugin; } @Subscribe @@ -62,13 +58,13 @@ public class PluginMessageListener { final @Nullable Player loggedPlayer = proxy.getPlayer(playername).orElse(null); switch (sChannel) { case "LOGIN" : - if (loggedPlayer != null && api.addPlayer(loggedPlayer)){ + if (loggedPlayer != null && plugin.addPlayer(loggedPlayer)){ proxy.getEventManager().fireAndForget(new ProxyLoginEvent(loggedPlayer)); this.createServerConnectionRequest(loggedPlayer, connection); } break; case "LOGOUT": - if (loggedPlayer != null && api.removePlayer(loggedPlayer)){ + if (loggedPlayer != null && plugin.removePlayer(loggedPlayer)){ proxy.getEventManager().fireAndForget(new ProxyLogoutEvent(loggedPlayer)); } break; @@ -89,7 +85,7 @@ public class PluginMessageListener { } private void createServerConnectionRequest(Player player, ServerConnection connection){ - if (!config.getToServerOptions().sendToServer()) { + if (!plugin.config().getConfig().sendOnLogin().sendToServerOnLogin()) { return; } @@ -119,7 +115,7 @@ public class PluginMessageListener { } private String getRandomServer() { - final List serverList = config.getToServerOptions().getTeleportServers(); + final List serverList = plugin.config().getConfig().sendOnLogin().teleportServers(); return serverList.get(rm.nextInt(serverList.size())); } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java index 6bf0294..560430b 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java @@ -1,8 +1,7 @@ package me.adrianed.authmevelocity.velocity.listener; -import me.adrianed.authmevelocity.velocity.config.AuthMeConfig; -import me.adrianed.authmevelocity.velocity.config.ConfigUtils; import me.adrianed.authmevelocity.velocity.utils.AuthmeUtils; +import me.adrianed.authmevelocity.velocity.AuthMeVelocityPlugin; import com.velocitypowered.api.event.Continuation; import com.velocitypowered.api.event.EventTask; import com.velocitypowered.api.event.PostOrder; @@ -13,22 +12,20 @@ import com.velocitypowered.api.event.player.PlayerChatEvent; import com.velocitypowered.api.event.player.TabCompleteEvent; import com.velocitypowered.api.proxy.Player; -import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; - import org.jetbrains.annotations.NotNull; -public final class ProxyListener { - private final AuthMeConfig config; - private final AuthMeVelocityAPI api; +import net.kyori.adventure.text.minimessage.MiniMessage; - public ProxyListener(@NotNull AuthMeConfig config, AuthMeVelocityAPI api) { - this.config = config; - this.api = api; +public final class ProxyListener { + private final AuthMeVelocityPlugin plugin; + + public ProxyListener(AuthMeVelocityPlugin plugin) { + this.plugin = plugin; } @Subscribe public EventTask onDisconnect(final DisconnectEvent event) { - return EventTask.async(() -> api.removePlayer(event.getPlayer())); + return EventTask.async(() -> plugin.removePlayer(event.getPlayer())); } @Subscribe(order = PostOrder.FIRST) @@ -40,19 +37,19 @@ public final class ProxyListener { Player player = (Player)event.getCommandSource(); - if (api.isLogged(player)) { + if (plugin.isLogged(player)) { continuation.resume(); return; } - if (api.isInAuthServer(player)) { + if (plugin.isInAuthServer(player)) { String command = AuthmeUtils.getFirstArgument(event.getCommand()); - if (!config.getCommandsConfig().getAllowedCommands().contains(command)) { - ConfigUtils.sendBlockedMessage(player, config); + if (!plugin.config().getConfig().commands().allowedCommands().contains(command)) { + sendBlockedMessage(player); event.setResult(CommandExecuteEvent.CommandResult.denied()); } } else { - ConfigUtils.sendBlockedMessage(player, config); + sendBlockedMessage(player); event.setResult(CommandExecuteEvent.CommandResult.denied()); } continuation.resume(); @@ -60,19 +57,19 @@ public final class ProxyListener { @Subscribe(order = PostOrder.FIRST) public void onPlayerChat(final PlayerChatEvent event) { - if (api.isNotLogged(event.getPlayer())) { + if (plugin.isNotLogged(event.getPlayer())) { event.setResult(PlayerChatEvent.ChatResult.denied()); } } @Subscribe(order = PostOrder.FIRST) public void onTabComplete(TabCompleteEvent event){ - if (api.isLogged(event.getPlayer())) { + if (plugin.isLogged(event.getPlayer())) { return; } final String command = event.getPartialMessage(); - for (final String allowed : config.getCommandsConfig().getAllowedCommands()) { + for (final String allowed : plugin.config().getConfig().commands().allowedCommands()) { if (allowed.startsWith(command)) { return; } @@ -80,5 +77,12 @@ public final class ProxyListener { event.getSuggestions().clear(); } + + void sendBlockedMessage(Player player){ + String blockedMessage = plugin.config().getConfig().commands().blockedCommandMessage(); + if (!blockedMessage.isBlank()){ + player.sendMessage(MiniMessage.miniMessage().deserialize(blockedMessage)); + } + } } From 638be7d180eb12004a5d75acf9c1b7a7031649e4 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Fri, 5 Aug 2022 22:59:30 +0000 Subject: [PATCH 05/30] fix: Fixed some relocation issues --- build.gradle.kts | 10 +++- common/build.gradle.kts | 11 ++++ .../authmevelocity/common/LibsManager.java | 49 ++++++++++++++-- common/src/main/java/module-info.java | 5 -- paper/build.gradle.kts | 5 +- .../authmevelocity/paper/PaperLibraries.java | 51 ----------------- velocity/build.gradle.kts | 9 ++- .../velocity/AuthMeVelocityPlugin.java | 18 +++--- .../velocity/VelocityLibraries.java | 57 ------------------- .../velocity/listener/ConnectListener.java | 1 - .../velocity/listener/ProxyListener.java | 2 - 11 files changed, 77 insertions(+), 141 deletions(-) delete mode 100644 common/src/main/java/module-info.java delete mode 100644 paper/src/main/java/me/adrianed/authmevelocity/paper/PaperLibraries.java delete mode 100644 velocity/src/main/java/me/adrianed/authmevelocity/velocity/VelocityLibraries.java diff --git a/build.gradle.kts b/build.gradle.kts index 73ebd29..a20e596 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,6 +5,10 @@ plugins { id("com.github.johnrengelman.shadow") version "7.1.2" } +repositories { + maven("https://repo.alessiodp.com/releases/") +} + allprojects { apply(plugin = "java") repositories { @@ -14,11 +18,11 @@ allprojects { } dependencies { - shadow(project(":authmevelocity-common")) + shadow(project(":authmevelocity-common", "shadow")) shadow(project(":authmevelocity-api-paper")) shadow(project(":authmevelocity-api-velocity")) - shadow(project(":authmevelocity-velocity")) - shadow(project(":authmevelocity-paper")) + shadow(project(":authmevelocity-velocity", "shadow")) + shadow(project(":authmevelocity-paper", "shadow")) } tasks { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 76986fd..def6d9e 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,3 +1,7 @@ +plugins { + id("com.github.johnrengelman.shadow") version "7.1.2" +} + repositories { maven("https://repo.alessiodp.com/releases/") } @@ -7,4 +11,11 @@ dependencies { compileOnly("space.arim.dazzleconf:dazzleconf-ext-snakeyaml:1.3.0-M1") compileOnly("org.slf4j:slf4j-api:1.7.36") compileOnly("net.byteflux:libby-core:1.1.5") +} + +tasks { + shadowJar { + relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby") + relocate("space.arim.dazzleconf", "me.adrianed.authmevelocity.libs.dazzleconf") + } } \ No newline at end of file diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java b/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java index 5be73e6..22f5f7b 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java @@ -1,7 +1,48 @@ package me.adrianed.authmevelocity.common; -//TODO: Abstract Class -public interface LibsManager { - void registerRepositories(); - void loadLibraries(); +import net.byteflux.libby.Library; +import net.byteflux.libby.LibraryManager; +import net.byteflux.libby.relocation.Relocation; + + +public final class LibsManager { + private final LibraryManager manager; + + public LibsManager(LibraryManager manager) { + this.manager = manager; + manager.addMavenCentral(); + } + + public void loadLibraries() { + final String dazzlePackage = new String(new char[] { + 's','p','a','c','e','.','a','r','i','m','.','d','a','z','z','l','e','c','o','n','f'}); + final Relocation dazzleRelocation + = new Relocation(dazzlePackage, "me.adrianed.authmevelocity.libs.dazzleconf"); + final Relocation snakeYamlRelocation + = new Relocation("org.yaml.snakeyaml", "me.adrianed.authmevelocity.libs.snakeyaml"); + final Library dazzleConf = Library.builder() + .groupId(dazzlePackage) + .artifactId("dazzleconf-core") + .version("1.3.0-M1") + .relocate(dazzleRelocation) + .build(); + final Library dazzleYaml = Library.builder() + .groupId(dazzlePackage) + .artifactId("dazzleconf-ext-snakeyaml") + .version("1.3.0-M1") + .relocate(dazzleRelocation) + .relocate(snakeYamlRelocation) + .build(); + final Library snakeYaml = Library.builder() + .groupId("org.yaml") + .artifactId("snakeyaml") + .version("1.30") + .relocate(dazzleRelocation) + .relocate(snakeYamlRelocation) + .build(); + + manager.loadLibrary(snakeYaml); + manager.loadLibrary(dazzleConf); + manager.loadLibrary(dazzleYaml); + } } diff --git a/common/src/main/java/module-info.java b/common/src/main/java/module-info.java deleted file mode 100644 index 2151432..0000000 --- a/common/src/main/java/module-info.java +++ /dev/null @@ -1,5 +0,0 @@ -module me.adrianed.authmevelocity.common { - requires transitive space.arim.dazzleconf.ext.snakeyaml; - exports me.adrianed.authmevelocity.common; - exports me.adrianed.authmevelocity.common.configuration; -} diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index 428bdab..2e9c852 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -35,13 +35,10 @@ tasks { shadowJar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby") + relocate("space.arim.dazzleconf", "me.adrianed.authmevelocity.libs.dazzleconf") configurations = listOf(project.configurations.shadow.get()) } - build { - dependsOn(shadowJar) - } - compileJava { options.encoding = Charsets.UTF_8.name() diff --git a/paper/src/main/java/me/adrianed/authmevelocity/paper/PaperLibraries.java b/paper/src/main/java/me/adrianed/authmevelocity/paper/PaperLibraries.java deleted file mode 100644 index 1165cc3..0000000 --- a/paper/src/main/java/me/adrianed/authmevelocity/paper/PaperLibraries.java +++ /dev/null @@ -1,51 +0,0 @@ -package me.adrianed.authmevelocity.paper; - -import me.adrianed.authmevelocity.common.LibsManager; -import net.byteflux.libby.BukkitLibraryManager; -import net.byteflux.libby.Library; -import net.byteflux.libby.relocation.Relocation; - -public class PaperLibraries implements LibsManager { - private final BukkitLibraryManager manager; - - public PaperLibraries(AuthMeVelocityPlugin plugin) { - this.manager = new BukkitLibraryManager(plugin); - } - - @Override - public void registerRepositories() { - manager.addMavenCentral(); - } - - @Override - public void loadLibraries() { - final Relocation dazzleRelocation - = new Relocation("space.arim.dazzleconf", "me.adrianed.authmevelocity.libs.dazzleconf"); - final Relocation snakeYamlRelocation - = new Relocation("pattern", "me.adrianed.authmevelocity.libs.snake"); - final Library dazzleConf = Library.builder() - .groupId("space.arim.dazzleconf") - .artifactId("dazzleconf-ext-snakeyaml") - .version("1.3.0-M1") - .relocate(dazzleRelocation) - .build(); - final Library dazzleYaml = Library.builder() - .groupId("space.arim.dazzleconf") - .artifactId("dazzleconf-ext-snakeyaml") - .version("1.3.0-M1") - .relocate(dazzleRelocation) - .relocate(snakeYamlRelocation) - .build(); - final Library snakeYaml = Library.builder() - .groupId("org.yaml") - .artifactId("snakeyaml") - .version("1.30") - .relocate(dazzleRelocation) - .relocate(snakeYamlRelocation) - .build(); - - manager.loadLibrary(snakeYaml); - manager.loadLibrary(dazzleConf); - manager.loadLibrary(dazzleYaml); - } -} diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 3d74e45..9319985 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -3,9 +3,9 @@ plugins { } repositories { + maven("https://repo.alessiodp.com/releases/") maven("https://jitpack.io") maven("https://repo.codemc.org/repository/maven-public/") - maven("https://repo.alessiodp.com/releases/") } dependencies { @@ -25,8 +25,11 @@ tasks { options.release.set(17) } - build { - dependsOn(shadowJar) + shadowJar { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby") + relocate("space.arim.dazzleconf", "me.adrianed.authmevelocity.libs.dazzleconf") + configurations = listOf(project.configurations.shadow.get()) } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java index 99ff981..7d47227 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java @@ -6,10 +6,10 @@ import me.adrianed.authmevelocity.velocity.listener.FastLoginListener; import me.adrianed.authmevelocity.velocity.listener.PluginMessageListener; import me.adrianed.authmevelocity.velocity.listener.ProxyListener; import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; +import me.adrianed.authmevelocity.common.LibsManager; import me.adrianed.authmevelocity.common.configuration.Loader; import me.adrianed.authmevelocity.common.configuration.ProxyConfiguration; import com.google.inject.Inject; -import com.moandjiezana.toml.Toml; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; @@ -23,20 +23,15 @@ import com.velocitypowered.api.proxy.server.RegisteredServer; import com.velocitypowered.api.proxy.messages.ChannelIdentifier; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; +import net.byteflux.libby.VelocityLibraryManager; import net.kyori.adventure.text.minimessage.MiniMessage; import org.slf4j.Logger; import java.util.function.Predicate; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collections; import java.util.concurrent.ConcurrentHashMap; import java.util.List; -import java.util.Objects; import java.util.Set; import java.util.UUID; @@ -45,6 +40,7 @@ import java.util.UUID; name = "AuthMeVelocity", url = "https://github.com/4drian3d/AuthMeVelocity", description = "This plugin adds the support for AuthMeReloaded to Velocity", + version = "3.0.0", dependencies = { @Dependency( id = "miniplaceholders", @@ -64,7 +60,6 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { private final Path pluginDirectory; private Loader config; - private final List listeners = new ArrayList<>(3); protected final Set loggedPlayers = ConcurrentHashMap.newKeySet(); @Inject @@ -76,9 +71,10 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { @Subscribe public void onProxyInitialization(ProxyInitializeEvent event) { - final VelocityLibraries libraries - = new VelocityLibraries(logger, pluginDirectory, proxy.getPluginManager(), this); - libraries.registerRepositories(); + final LibsManager libraries + = new LibsManager( + new VelocityLibraryManager<>( + logger, pluginDirectory, proxy.getPluginManager(), this)); libraries.loadLibraries(); this.config = Loader.create(pluginDirectory, "config.yml", ProxyConfiguration.class, logger); diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/VelocityLibraries.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/VelocityLibraries.java deleted file mode 100644 index fffa8cb..0000000 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/VelocityLibraries.java +++ /dev/null @@ -1,57 +0,0 @@ -package me.adrianed.authmevelocity.velocity; - -import java.nio.file.Path; - -import org.slf4j.Logger; - -import com.velocitypowered.api.plugin.PluginManager; - -import me.adrianed.authmevelocity.common.LibsManager; -import net.byteflux.libby.Library; -import net.byteflux.libby.VelocityLibraryManager; -import net.byteflux.libby.relocation.Relocation; - -public class VelocityLibraries implements LibsManager { - private final VelocityLibraryManager manager; - - public VelocityLibraries(Logger logger, Path dataDirectory, PluginManager pluginManager, AuthMeVelocityPlugin plugin) { - this.manager = new VelocityLibraryManager( - logger, dataDirectory, pluginManager, plugin); - } - @Override - public void registerRepositories() { - manager.addMavenCentral(); - } - - @Override - public void loadLibraries() { - final Relocation dazzleRelocation - = new Relocation("space.arim.dazzleconf", "me.adrianed.authmevelocity.libs.dazzleconf"); - final Relocation snakeYamlRelocation - = new Relocation("pattern", "me.adrianed.authmevelocity.libs.snake"); - final Library dazzleConf = Library.builder() - .groupId("space.arim.dazzleconf") - .artifactId("dazzleconf-ext-snakeyaml") - .version("1.3.0-M1") - .relocate(dazzleRelocation) - .build(); - final Library dazzleYaml = Library.builder() - .groupId("space.arim.dazzleconf") - .artifactId("dazzleconf-ext-snakeyaml") - .version("1.3.0-M1") - .relocate(dazzleRelocation) - .relocate(snakeYamlRelocation) - .build(); - final Library snakeYaml = Library.builder() - .groupId("org.yaml") - .artifactId("snakeyaml") - .version("1.30") - .relocate(dazzleRelocation) - .relocate(snakeYamlRelocation) - .build(); - - manager.loadLibrary(snakeYaml); - manager.loadLibrary(dazzleConf); - manager.loadLibrary(dazzleYaml); - } -} diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java index e6a1263..26944f8 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java @@ -18,7 +18,6 @@ import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.server.RegisteredServer; import me.adrianed.authmevelocity.velocity.AuthMeVelocityPlugin; -import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; public class ConnectListener { private final ProxyServer proxy; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java index 560430b..711ea05 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java @@ -12,8 +12,6 @@ import com.velocitypowered.api.event.player.PlayerChatEvent; import com.velocitypowered.api.event.player.TabCompleteEvent; import com.velocitypowered.api.proxy.Player; -import org.jetbrains.annotations.NotNull; - import net.kyori.adventure.text.minimessage.MiniMessage; public final class ProxyListener { From 6063375180d99f07ed1344da9520bd034b9a3b48 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Fri, 5 Aug 2022 23:46:51 +0000 Subject: [PATCH 06/30] feat: Migrate to configurate --- common/build.gradle.kts | 5 +- .../authmevelocity/common/Constants.java | 6 + .../authmevelocity/common/LibsManager.java | 53 ++++---- .../configuration/ConfigurationContainer.java | 61 +++++++++ .../common/configuration/Loader.java | 85 ++++-------- .../configuration/ProxyConfiguration.java | 123 ++++++++++-------- paper/build.gradle.kts | 1 - velocity/build.gradle.kts | 1 - .../velocity/AuthMeVelocityPlugin.java | 19 +-- .../velocity/commands/AuthmeCommand.java | 18 +-- .../velocity/listener/ConnectListener.java | 4 +- .../listener/PluginMessageListener.java | 4 +- .../velocity/listener/ProxyListener.java | 6 +- 13 files changed, 218 insertions(+), 168 deletions(-) create mode 100644 common/src/main/java/me/adrianed/authmevelocity/common/Constants.java create mode 100644 common/src/main/java/me/adrianed/authmevelocity/common/configuration/ConfigurationContainer.java diff --git a/common/build.gradle.kts b/common/build.gradle.kts index def6d9e..2b07cc9 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -7,8 +7,7 @@ repositories { } dependencies { - compileOnly("space.arim.dazzleconf:dazzleconf-core:1.3.0-M1") - compileOnly("space.arim.dazzleconf:dazzleconf-ext-snakeyaml:1.3.0-M1") + compileOnly("org.spongepowered:configurate-hocon:4.1.2") compileOnly("org.slf4j:slf4j-api:1.7.36") compileOnly("net.byteflux:libby-core:1.1.5") } @@ -16,6 +15,6 @@ dependencies { tasks { shadowJar { relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby") - relocate("space.arim.dazzleconf", "me.adrianed.authmevelocity.libs.dazzleconf") + relocate("org.spongepowered", "me.adrianed.authmevelocity.libs.sponge") } } \ No newline at end of file diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java b/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java new file mode 100644 index 0000000..7636857 --- /dev/null +++ b/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java @@ -0,0 +1,6 @@ +package me.adrianed.authmevelocity.common; + +public final class Constants { + public static final String CONFIGURATE = "4.1.2"; + public static final String GEANTYREF = "1.3.13"; +} diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java b/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java index 22f5f7b..d34c2f7 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java @@ -14,35 +14,36 @@ public final class LibsManager { } public void loadLibraries() { - final String dazzlePackage = new String(new char[] { - 's','p','a','c','e','.','a','r','i','m','.','d','a','z','z','l','e','c','o','n','f'}); - final Relocation dazzleRelocation - = new Relocation(dazzlePackage, "me.adrianed.authmevelocity.libs.dazzleconf"); - final Relocation snakeYamlRelocation - = new Relocation("org.yaml.snakeyaml", "me.adrianed.authmevelocity.libs.snakeyaml"); - final Library dazzleConf = Library.builder() - .groupId(dazzlePackage) - .artifactId("dazzleconf-core") - .version("1.3.0-M1") - .relocate(dazzleRelocation) + final Relocation configurateRelocation + = new Relocation("org{}spongepowered", "me.adrianed.authmevelocity.libs.sponge"); + final Relocation geantyrefRelocation = + new Relocation("io{}leangen{}geantyref", "me.adrianed.authmevelocity.libs.geantyref"); + final Library hocon = Library.builder() + .groupId("org{}spongepowered") + .artifactId("configurate-hocon") + .version(Constants.CONFIGURATE) + .id("configurate-hocon") + .relocate(configurateRelocation) + .relocate(geantyrefRelocation) .build(); - final Library dazzleYaml = Library.builder() - .groupId(dazzlePackage) - .artifactId("dazzleconf-ext-snakeyaml") - .version("1.3.0-M1") - .relocate(dazzleRelocation) - .relocate(snakeYamlRelocation) + final Library confCore = Library.builder() + .groupId("org{}spongepowered") + .artifactId("configurate-core") + .version(Constants.CONFIGURATE) + .id("configurate-core") + .relocate(configurateRelocation) + .relocate(geantyrefRelocation) .build(); - final Library snakeYaml = Library.builder() - .groupId("org.yaml") - .artifactId("snakeyaml") - .version("1.30") - .relocate(dazzleRelocation) - .relocate(snakeYamlRelocation) + final Library geantyref = Library.builder() + .groupId("io{}leangen{}geantyref") + .artifactId("geantyref") + .version(Constants.GEANTYREF) + .id("geantyref") + .relocate(geantyrefRelocation) .build(); - manager.loadLibrary(snakeYaml); - manager.loadLibrary(dazzleConf); - manager.loadLibrary(dazzleYaml); + manager.loadLibrary(confCore); + manager.loadLibrary(hocon); + manager.loadLibrary(geantyref); } } diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ConfigurationContainer.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ConfigurationContainer.java new file mode 100644 index 0000000..57a392d --- /dev/null +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ConfigurationContainer.java @@ -0,0 +1,61 @@ +package me.adrianed.authmevelocity.common.configuration; + +import java.util.concurrent.CompletableFuture; +import java.util.function.Consumer; + +import org.slf4j.Logger; +import org.spongepowered.configurate.CommentedConfigurationNode; +import org.spongepowered.configurate.ConfigurateException; +import org.spongepowered.configurate.hocon.HoconConfigurationLoader; + +public class ConfigurationContainer { + private C config; + private final HoconConfigurationLoader loader; + private final Class clazz; + private final Logger logger; + + public ConfigurationContainer( + final C config, + final Class clazz, + final HoconConfigurationLoader loader, + final Logger logger + ) { + this.config = config; + this.loader = loader; + this.clazz = clazz; + this.logger = logger; + } + + public CompletableFuture reload() { + return this.safeReload(); + } + + public void setValues(Consumer consumer) { + consumer.accept(this.config); + this.safeReload(); + } + + public C get() { + return this.config; + } + + private final CompletableFuture safeReload() { + return CompletableFuture.supplyAsync(() -> { + C newConfig = null; + try { + final CommentedConfigurationNode node = loader.load(); + newConfig = node.get(clazz); + node.set(clazz, config); + loader.save(node); + return true; + } catch (ConfigurateException exception) { + logger.error("Could not load config.conf file", exception); + return false; + } finally { + if (newConfig != null) { + config = newConfig; + } + } + }); + } +} diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java index 2d32069..a9ca594 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java @@ -1,65 +1,36 @@ package me.adrianed.authmevelocity.common.configuration; +import java.nio.file.Path; + import org.slf4j.Logger; -import space.arim.dazzleconf.ConfigurationFactory; -import space.arim.dazzleconf.ConfigurationOptions; -import space.arim.dazzleconf.error.ConfigFormatSyntaxException; -import space.arim.dazzleconf.error.InvalidConfigException; -import space.arim.dazzleconf.ext.snakeyaml.CommentMode; -import space.arim.dazzleconf.ext.snakeyaml.SnakeYamlConfigurationFactory; -import space.arim.dazzleconf.ext.snakeyaml.SnakeYamlOptions; -import space.arim.dazzleconf.helper.ConfigurationHelper; +import org.spongepowered.configurate.CommentedConfigurationNode; +import org.spongepowered.configurate.ConfigurateException; +import org.spongepowered.configurate.hocon.HoconConfigurationLoader; +import org.spongepowered.configurate.objectmapping.ConfigSerializable; +import org.spongepowered.configurate.objectmapping.meta.Comment; -import java.io.IOException; -import java.io.UncheckedIOException; -import java.nio.file.Path; -public class Loader { - private final ConfigurationHelper configHelper; - private volatile C configData; - private final Logger logger; +public class Loader { + public static ConfigurationContainer loadMainConfig(final Path path, Class clazz, Logger logger){ + final HoconConfigurationLoader loader = HoconConfigurationLoader.builder() + .defaultOptions(opts -> opts + .shouldCopyDefaults(true) + .header("AuthMeVelocity | by Glyart & 4drian3d\n") + ) + .path(path.resolve("config.conf")) + .build(); - private Loader(ConfigurationHelper configHelper, Logger logger) { - this.configHelper = configHelper; - this.logger = logger; - } - - public static Loader create(Path configFolder, String fileName, Class configClass, Logger logger) { - SnakeYamlOptions yamlOptions = new SnakeYamlOptions.Builder() - .commentMode(CommentMode.alternativeWriter()) - .build(); - ConfigurationFactory configFactory = SnakeYamlConfigurationFactory.create( - configClass, - ConfigurationOptions.defaults(), - yamlOptions); - return new Loader<>(new ConfigurationHelper<>(configFolder, fileName, configFactory), logger); - } - - public boolean reloadConfig() { - try { - configData = configHelper.reloadConfigData(); - return true; - } catch (IOException ex) { - throw new UncheckedIOException(ex); - } catch (ConfigFormatSyntaxException ex) { - configData = configHelper.getFactory().loadDefaults(); - logger.error("The yaml syntax in your configuration is invalid. " - + "Check your YAML syntax with a tool such as https://yaml-online-parser.appspot.com/", ex); - return false; - } catch (InvalidConfigException ex) { - configData = configHelper.getFactory().loadDefaults(); - logger.error("One of the values in your configuration is not valid. " - + "Check to make sure you have specified the right data types.", ex); - return false; - } - } - - public C getConfig() { - C configData = this.configData; - if (configData == null) { - throw new IllegalStateException("Configuration has not been loaded yet"); - } - return configData; - } + final C config; + try { + final CommentedConfigurationNode node = loader.load(); + config = node.get(clazz); + node.set(clazz, config); + loader.save(node); + } catch (ConfigurateException exception){ + logger.error("Could not load config.conf file", exception); + return null; + } + return new ConfigurationContainer<>(config, clazz, loader, logger); + } } diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java index 7481245..05f373e 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java @@ -1,66 +1,77 @@ package me.adrianed.authmevelocity.common.configuration; +import org.spongepowered.configurate.objectmapping.ConfigSerializable; +import org.spongepowered.configurate.objectmapping.meta.Comment; + import java.util.List; -import space.arim.dazzleconf.annote.ConfDefault; -import space.arim.dazzleconf.annote.ConfComments; -public interface ProxyConfiguration { - @ConfDefault.DefaultStrings({ - "auth1", "auth2" - }) - @ConfComments({ - "List of login/registration servers" - }) - List authServers(); - - @ConfDefault.DefaultObject("defaultSendOnLogin") - SendOnLogin sendOnLogin(); - - @ConfDefault.DefaultObject("defaultCommands") - Commands commands(); - - @ConfDefault.DefaultObject("defaultEnsureAuth") - EnsureAuthServer ensureAuthServer(); - - public interface SendOnLogin { - @ConfComments({ - "Send logged in players to another server?" - }) - @ConfDefault.DefaultBoolean(false) - boolean sendToServerOnLogin(); - - @ConfComments({ - "List of servers to send", - "One of these servers will be chosen at random" - }) - @ConfDefault.DefaultStrings({ - "lobby1", "lobby2" - }) - List teleportServers(); +@ConfigSerializable +public class ProxyConfiguration { + @Comment("List of login/registration servers") + private List authServers = List.of("auth1", "auth2"); + public List authServers() { + return this.authServers; + } + + private SendOnLogin sendOnLogin = new SendOnLogin(); + public SendOnLogin sendOnLogin() { + return this.sendOnLogin; } - public interface Commands { - @ConfComments({ - "Sets the commands that users who have not yet logged in can execute" - }) - @ConfDefault.DefaultStrings({ - "login", "register", "l", "reg", "email", "captcha" - }) - List allowedCommands(); - - @ConfComments({ - "Sets the message to send in case a non-logged-in player executes an unauthorized command", - "To deactivate the message, leave it empty" - }) - @ConfDefault.DefaultString("You cannot execute commands if you are not logged in yet") - String blockedCommandMessage(); + private Commands commands = new Commands(); + public Commands commands() { + return this.commands; } - public interface EnsureAuthServer { - @ConfComments({ - "Ensure that the first server to which players connect is an auth server" - }) - @ConfDefault.DefaultBoolean(false) - boolean ensureFirstServerIsAuthServer(); + private EnsureAuthServer ensureAuthServer = new EnsureAuthServer(); + public EnsureAuthServer ensureAuthServer() { + return this.ensureAuthServer; } + + @ConfigSerializable + public static class EnsureAuthServer { + @Comment("Ensure that the first server to which players connect is an auth server") + private boolean ensureAuthServer = false; + public boolean ensureFirstServerIsAuthServer() { + return this.ensureAuthServer; + } + } + + @ConfigSerializable + public static class SendOnLogin { + @Comment("Send logged in players to another server?") + private boolean sendOnLogin = false; + public boolean sendToServerOnLogin() { + return this.sendOnLogin; + } + + @Comment(""" + List of servers to send + One of these servers will be chosen at random + """) + private List teleportServers = List.of("lobby1", "lobby2"); + public List teleportServers() { + return this.teleportServers; + } + } + + @ConfigSerializable + public static class Commands { + @Comment("Sets the commands that users who have not yet logged in can execute") + private List allowedCommands = List.of("login", "register", "l", "reg", "email", "captcha"); + public List allowedCommands() { + return this.allowedCommands; + } + + @Comment(""" + Sets the message to send in case a non-logged-in player executes an unauthorized command + To deactivate the message, leave it empty + """) + private String blockedMessage = "You cannot execute commands if you are not logged in yet"; + public String blockedCommandMessage() { + return this.blockedMessage; + } + } + + } diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index 2e9c852..d39f731 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -35,7 +35,6 @@ tasks { shadowJar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby") - relocate("space.arim.dazzleconf", "me.adrianed.authmevelocity.libs.dazzleconf") configurations = listOf(project.configurations.shadow.get()) } diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 9319985..dcdbd4c 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -28,7 +28,6 @@ tasks { shadowJar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby") - relocate("space.arim.dazzleconf", "me.adrianed.authmevelocity.libs.dazzleconf") configurations = listOf(project.configurations.shadow.get()) } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java index 7d47227..baa5775 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java @@ -7,6 +7,7 @@ import me.adrianed.authmevelocity.velocity.listener.PluginMessageListener; import me.adrianed.authmevelocity.velocity.listener.ProxyListener; import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; import me.adrianed.authmevelocity.common.LibsManager; +import me.adrianed.authmevelocity.common.configuration.ConfigurationContainer; import me.adrianed.authmevelocity.common.configuration.Loader; import me.adrianed.authmevelocity.common.configuration.ProxyConfiguration; import com.google.inject.Inject; @@ -58,7 +59,7 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { private final ProxyServer proxy; private final Logger logger; private final Path pluginDirectory; - private Loader config; + private ConfigurationContainer config; protected final Set loggedPlayers = ConcurrentHashMap.newKeySet(); @@ -77,7 +78,7 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { logger, pluginDirectory, proxy.getPluginManager(), this)); libraries.loadLibraries(); - this.config = Loader.create(pluginDirectory, "config.yml", ProxyConfiguration.class, logger); + this.config = Loader.loadMainConfig(pluginDirectory, ProxyConfiguration.class, logger); proxy.getChannelRegistrar().register(AUTHMEVELOCITY_CHANNEL); @@ -110,14 +111,14 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { source.sendMessage(MiniMessage.miniMessage().deserialize( " --- AuthMeVelocity ---")); source.sendMessage(MiniMessage.miniMessage().deserialize( - "AuthServers: " + config.getConfig().authServers())); - if (config.getConfig().sendOnLogin().sendToServerOnLogin()) { + "AuthServers: " + config.get().authServers())); + if (config.get().sendOnLogin().sendToServerOnLogin()) { source.sendMessage(MiniMessage.miniMessage().deserialize( - "LobbyServers: " + config.getConfig().sendOnLogin().teleportServers())); + "LobbyServers: " + config.get().sendOnLogin().teleportServers())); } } - public Loader config() { + public ConfigurationContainer config() { return this.config; } @@ -153,16 +154,16 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { @Override public boolean isAuthServer(RegisteredServer server){ - return config.getConfig().authServers().contains(server.getServerInfo().getName()); + return config.get().authServers().contains(server.getServerInfo().getName()); } @Override public boolean isAuthServer(ServerConnection connection){ - return config.getConfig().authServers().contains(connection.getServerInfo().getName()); + return config.get().authServers().contains(connection.getServerInfo().getName()); } @Override public boolean isAuthServer(String server){ - return config.getConfig().authServers().contains(server); + return config.get().authServers().contains(server); } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/commands/AuthmeCommand.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/commands/AuthmeCommand.java index 2fc9f4a..00e9c91 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/commands/AuthmeCommand.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/commands/AuthmeCommand.java @@ -20,14 +20,16 @@ public class AuthmeCommand { .then(LiteralArgumentBuilder.literal("reload") .executes(cmd -> { CommandSource source = cmd.getSource(); - if (plugin.config().reloadConfig()) { - plugin.sendInfoMessage(); - source.sendMessage(MiniMessage.miniMessage().deserialize( - "AuthmeVelocity has been successfully reloaded")); - } else { - source.sendMessage(MiniMessage.miniMessage().deserialize( - "There was an error while reloading the configuration. Check the server console")); - } + plugin.config().reload().thenAcceptAsync(result -> { + if(result) { + plugin.sendInfoMessage(); + source.sendMessage(MiniMessage.miniMessage().deserialize( + "AuthmeVelocity has been successfully reloaded")); + } else { + source.sendMessage(MiniMessage.miniMessage().deserialize( + "There was an error while reloading the configuration. Check the server console")); + } + }); return Command.SINGLE_SUCCESS; }) ).build(); diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java index 26944f8..39e3602 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java @@ -32,7 +32,7 @@ public class ConnectListener { @Subscribe(order = PostOrder.LATE) public void onInitialServer(PlayerChooseInitialServerEvent event, Continuation continuation){ - if(!plugin.config().getConfig().ensureAuthServer().ensureFirstServerIsAuthServer()) { + if(!plugin.config().get().ensureAuthServer().ensureFirstServerIsAuthServer()) { continuation.resume(); return; } @@ -79,7 +79,7 @@ public class ConnectListener { // TODO: Implement #40 private @Nullable RegisteredServer getAvailableServer() { - for(String sv : plugin.config().getConfig().authServers()){ + for(String sv : plugin.config().get().authServers()){ Optional opt = proxy.getServer(sv); if (opt.isPresent()) return opt.get(); } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java index ca89b6a..ea137c0 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java @@ -85,7 +85,7 @@ public class PluginMessageListener { } private void createServerConnectionRequest(Player player, ServerConnection connection){ - if (!plugin.config().getConfig().sendOnLogin().sendToServerOnLogin()) { + if (!plugin.config().get().sendOnLogin().sendToServerOnLogin()) { return; } @@ -115,7 +115,7 @@ public class PluginMessageListener { } private String getRandomServer() { - final List serverList = plugin.config().getConfig().sendOnLogin().teleportServers(); + final List serverList = plugin.config().get().sendOnLogin().teleportServers(); return serverList.get(rm.nextInt(serverList.size())); } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java index 711ea05..dc6d2b7 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java @@ -42,7 +42,7 @@ public final class ProxyListener { if (plugin.isInAuthServer(player)) { String command = AuthmeUtils.getFirstArgument(event.getCommand()); - if (!plugin.config().getConfig().commands().allowedCommands().contains(command)) { + if (!plugin.config().get().commands().allowedCommands().contains(command)) { sendBlockedMessage(player); event.setResult(CommandExecuteEvent.CommandResult.denied()); } @@ -67,7 +67,7 @@ public final class ProxyListener { } final String command = event.getPartialMessage(); - for (final String allowed : plugin.config().getConfig().commands().allowedCommands()) { + for (final String allowed : plugin.config().get().commands().allowedCommands()) { if (allowed.startsWith(command)) { return; } @@ -77,7 +77,7 @@ public final class ProxyListener { } void sendBlockedMessage(Player player){ - String blockedMessage = plugin.config().getConfig().commands().blockedCommandMessage(); + String blockedMessage = plugin.config().get().commands().blockedCommandMessage(); if (!blockedMessage.isBlank()){ player.sendMessage(MiniMessage.miniMessage().deserialize(blockedMessage)); } From 315f6b043bb86980d8a4ec200ebf1ce59a07fc9e Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sat, 6 Aug 2022 03:30:48 +0000 Subject: [PATCH 07/30] feat(paper): Implement Paper Debug feat(velocity): improved PluginMessageListener --- build.gradle.kts | 4 +- common/build.gradle.kts | 1 + .../authmevelocity/common/MessageType.java | 4 ++ .../common/configuration/Loader.java | 3 +- .../configuration/PaperConfiguration.java | 12 ++++- .../configuration/ProxyConfiguration.java | 6 +++ gradle.properties | 6 +-- .../paper/AuthMeVelocityPlugin.java | 30 ++++++++++- .../paper/listeners/AuthMeListener.java | 14 +++-- .../paper/listeners/MessageListener.java | 19 +++++-- .../listener/PluginMessageListener.java | 53 ++++++++++--------- 11 files changed, 111 insertions(+), 41 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a20e596..8e8365c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,4 +41,6 @@ tasks { options.release.set(17) } -} \ No newline at end of file +} + +java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) \ No newline at end of file diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 2b07cc9..08b142e 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -10,6 +10,7 @@ dependencies { compileOnly("org.spongepowered:configurate-hocon:4.1.2") compileOnly("org.slf4j:slf4j-api:1.7.36") compileOnly("net.byteflux:libby-core:1.1.5") + compileOnly("net.kyori:adventure-api:4.11.0") } tasks { diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/MessageType.java b/common/src/main/java/me/adrianed/authmevelocity/common/MessageType.java index ffcec61..a37b41f 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/MessageType.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/MessageType.java @@ -1,5 +1,9 @@ package me.adrianed.authmevelocity.common; +import net.kyori.adventure.util.Index; + public enum MessageType { LOGIN, REGISTER, LOGOUT, FORCE_UNREGISTER, UNREGISTER; + + public static final Index INDEX = Index.create((value) -> value.toString(), MessageType.values()); } diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java index a9ca594..ebfc68f 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java @@ -11,7 +11,8 @@ import org.spongepowered.configurate.objectmapping.ConfigSerializable; import org.spongepowered.configurate.objectmapping.meta.Comment; -public class Loader { +public final class Loader { + private Loader() {} public static ConfigurationContainer loadMainConfig(final Path path, Class clazz, Logger logger){ final HoconConfigurationLoader loader = HoconConfigurationLoader.builder() .defaultOptions(opts -> opts diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java index 9f376cd..ca1f937 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java @@ -1,5 +1,13 @@ package me.adrianed.authmevelocity.common.configuration; -public interface PaperConfiguration { - boolean debug(); +import org.spongepowered.configurate.objectmapping.ConfigSerializable; +import org.spongepowered.configurate.objectmapping.meta.Comment; + +@ConfigSerializable +public class PaperConfiguration { + @Comment("Enable Debug Mode") + private boolean debug = false; + public boolean debug() { + return this.debug; + } } diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java index 05f373e..fdba18d 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java @@ -7,6 +7,12 @@ import java.util.List; @ConfigSerializable public class ProxyConfiguration { + @Comment("Enable debug mode") + private boolean debug = false; + public boolean debug() { + return this.debug; + } + @Comment("List of login/registration servers") private List authServers = List.of("auth1", "auth2"); public List authServers() { diff --git a/gradle.properties b/gradle.properties index 8b4950a..9c70bbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group = me.adrianed.authmevelocity version = 3.0.0-SNAPSHOT -description = A global chat regulator for you Velocity network -url = https://forums.velocitypowered.com/t/chatregulator-a-global-chat-regulator-for-velocity/962 -id = chatregulator +description = AuthMe Bridge with Velocity Proxy +url = https://github.com/4drian3d/AuthMeVelocity +id = authmevelocity caffeine-version = 3.1.1 configurate-version = 4.1.2 diff --git a/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMeVelocityPlugin.java b/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMeVelocityPlugin.java index b52df81..dc6ee22 100644 --- a/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMeVelocityPlugin.java +++ b/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMeVelocityPlugin.java @@ -2,7 +2,11 @@ package me.adrianed.authmevelocity.paper; import me.adrianed.authmevelocity.paper.listeners.AuthMeListener; import me.adrianed.authmevelocity.paper.listeners.MessageListener; +import me.adrianed.authmevelocity.common.configuration.ConfigurationContainer; +import me.adrianed.authmevelocity.common.configuration.Loader; +import me.adrianed.authmevelocity.common.configuration.PaperConfiguration; import me.adrianed.authmevelocity.common.MessageType; +import me.adrianed.authmevelocity.common.LibsManager; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; @@ -11,13 +15,23 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; -public class AuthMeVelocityPlugin extends JavaPlugin { +import net.byteflux.libby.BukkitLibraryManager; + +public final class AuthMeVelocityPlugin extends JavaPlugin { private static final String CHANNEL = "authmevelocity:main"; + private ConfigurationContainer config; + @Override public void onEnable() { + final LibsManager libraries + = new LibsManager(new BukkitLibraryManager(this)); + libraries.loadLibraries(); + + this.config = Loader.loadMainConfig(getDataFolder().toPath(), PaperConfiguration.class, getSLF4JLogger()); + this.getServer().getMessenger().registerOutgoingPluginChannel(this, CHANNEL); - this.getServer().getMessenger().registerIncomingPluginChannel(this, CHANNEL, new MessageListener()); + this.getServer().getMessenger().registerIncomingPluginChannel(this, CHANNEL, new MessageListener(this)); this.getServer().getPluginManager().registerEvents(new AuthMeListener(this), this); if (this.getServer().getPluginManager().isPluginEnabled("MiniPlaceholders")) { @@ -41,9 +55,21 @@ public class AuthMeVelocityPlugin extends JavaPlugin { out.writeUTF(playername); if (player == null) { + logDebug("MessageToProxy | Null Player, Player Name: "+playername); Bukkit.getServer().sendPluginMessage(this, CHANNEL, out.toByteArray()); } else { + logDebug("MessageToProxy | Player Present: "+player.getName()+", Player Name: "+playername); player.sendPluginMessage(this, CHANNEL, out.toByteArray()); } } + + public ConfigurationContainer config() { + return this.config; + } + + public void logDebug(String debug) { + if (config.get().debug()) { + getSLF4JLogger().info("[DEBUG] "+debug); + } + } } diff --git a/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/AuthMeListener.java b/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/AuthMeListener.java index 1453ef5..5539261 100644 --- a/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/AuthMeListener.java +++ b/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/AuthMeListener.java @@ -25,29 +25,35 @@ public final class AuthMeListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST) public void onLogin(LoginEvent event) { final Player player = event.getPlayer(); + plugin.logDebug("LoginEvent | Start"); if (new PreSendLoginEvent(player).callEvent()) { plugin.sendMessageToProxy(player, MessageType.LOGIN, player.getName()); + plugin.getSLF4JLogger().info("LoginEvent | PreSendLoginEvent allowed"); } } @EventHandler - public void onRegister(RegisterEvent event){ + public void onRegister(RegisterEvent event) { + plugin.logDebug("RegisterEvent | Executed"); plugin.sendMessageToProxy(event.getPlayer(), MessageType.REGISTER, event.getPlayer().getName()); } @EventHandler - public void onLogout(LogoutEvent event){ + public void onLogout(LogoutEvent event) { + plugin.logDebug("LogoutEvent | Executed"); plugin.sendMessageToProxy(event.getPlayer(), MessageType.LOGOUT, event.getPlayer().getName()); } @EventHandler - public void onUnRegister(UnregisterByPlayerEvent event){ + public void onUnRegister(UnregisterByPlayerEvent event) { + plugin.logDebug("UnregisterByPlayerEvent | Executed"); plugin.sendMessageToProxy(event.getPlayer(), MessageType.UNREGISTER, event.getPlayer().getName()); } @EventHandler - public void onAdminUnRegister(UnregisterByAdminEvent event){ + public void onAdminUnRegister(UnregisterByAdminEvent event) { + plugin.logDebug("UnregisterByAdminEvent | Executed"); plugin.sendMessageToProxy(event.getPlayer(), MessageType.FORCE_UNREGISTER, event.getPlayerName()); } } diff --git a/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/MessageListener.java b/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/MessageListener.java index f713562..3ba00ad 100644 --- a/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/MessageListener.java +++ b/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/MessageListener.java @@ -7,21 +7,34 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.messaging.PluginMessageListener; import org.jetbrains.annotations.NotNull; +import me.adrianed.authmevelocity.paper.AuthMeVelocityPlugin; + import fr.xephi.authme.api.v3.AuthMeApi; public class MessageListener implements PluginMessageListener { + private final AuthMeVelocityPlugin plugin; + + public MessageListener(AuthMeVelocityPlugin plugin) { + this.plugin = plugin; + } @Override public void onPluginMessageReceived(@NotNull String identifier, @NotNull Player player, @NotNull byte[] bytes) { if (!identifier.equals("authmevelocity")) { + plugin.logDebug("PluginMessage | Not AuthMeVelocity identifier"); return; } - ByteArrayDataInput input = ByteStreams.newDataInput(bytes); - String subchannel = input.readUTF(); + plugin.logDebug("PluginMessage | AuthMeVelocity identifier"); + + final ByteArrayDataInput input = ByteStreams.newDataInput(bytes); + final String subchannel = input.readUTF(); + if ("main".equals(subchannel)) { - String msg = input.readUTF(); + plugin.logDebug("PluginMessage | Main Subchannel"); + final String msg = input.readUTF(); if ("LOGIN".equals(msg)) { + plugin.logDebug("PluginMessage | Login Message"); AuthMeApi.getInstance().forceLogin(player); } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java index ea137c0..90e09ff 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java @@ -2,6 +2,7 @@ package me.adrianed.authmevelocity.velocity.listener; import java.util.List; import java.util.Random; +import java.util.Locale; import me.adrianed.authmevelocity.api.velocity.event.PreSendOnLoginEvent; import me.adrianed.authmevelocity.api.velocity.event.ProxyForcedUnregisterEvent; @@ -9,6 +10,7 @@ import me.adrianed.authmevelocity.api.velocity.event.ProxyLoginEvent; import me.adrianed.authmevelocity.api.velocity.event.ProxyLogoutEvent; import me.adrianed.authmevelocity.api.velocity.event.ProxyRegisterEvent; import me.adrianed.authmevelocity.api.velocity.event.ProxyUnregisterEvent; +import me.adrianed.authmevelocity.common.MessageType; import com.google.common.io.ByteArrayDataInput; import com.velocitypowered.api.event.Continuation; import com.velocitypowered.api.event.Subscribe; @@ -53,33 +55,34 @@ public class PluginMessageListener { event.setResult(PluginMessageEvent.ForwardResult.handled()); final ByteArrayDataInput input = event.dataAsDataStream(); - final String sChannel = input.readUTF(); - final String playername = input.readUTF(); - final @Nullable Player loggedPlayer = proxy.getPlayer(playername).orElse(null); - switch (sChannel) { - case "LOGIN" : - if (loggedPlayer != null && plugin.addPlayer(loggedPlayer)){ - proxy.getEventManager().fireAndForget(new ProxyLoginEvent(loggedPlayer)); - this.createServerConnectionRequest(loggedPlayer, connection); + final String message = input.readUTF(); + final MessageType type = MessageType.INDEX.value( + message.toUpperCase(Locale.ROOT)); + final String name = input.readUTF(); + final @Nullable Player player = proxy.getPlayer(name).orElse(null); + + switch (type) { + case LOGIN -> { + if (player != null && plugin.addPlayer(player)){ + proxy.getEventManager().fireAndForget(new ProxyLoginEvent(player)); + this.createServerConnectionRequest(player, connection); } - break; - case "LOGOUT": - if (loggedPlayer != null && plugin.removePlayer(loggedPlayer)){ - proxy.getEventManager().fireAndForget(new ProxyLogoutEvent(loggedPlayer)); + } + case LOGOUT -> { + if (player != null && plugin.removePlayer(player)){ + proxy.getEventManager().fireAndForget(new ProxyLogoutEvent(player)); } - break; - case "REGISTER": - if (loggedPlayer != null) - proxy.getEventManager().fireAndForget(new ProxyRegisterEvent(loggedPlayer)); - break; - case "UNREGISTER": - if(loggedPlayer != null) - proxy.getEventManager().fireAndForget(new ProxyUnregisterEvent(loggedPlayer)); - break; - case "FORCE_UNREGISTER": - proxy.getEventManager().fireAndForget(new ProxyForcedUnregisterEvent(loggedPlayer)); - break; - default: break; + } + case REGISTER -> { + if (player != null) + proxy.getEventManager().fireAndForget(new ProxyRegisterEvent(player)); + } + case UNREGISTER -> { + if(player != null) + proxy.getEventManager().fireAndForget(new ProxyUnregisterEvent(player)); + } + case FORCE_UNREGISTER -> + proxy.getEventManager().fireAndForget(new ProxyForcedUnregisterEvent(player)); } continuation.resume(); } From 1c7c50675ac5d56332a84ae7bf91f3c602a18cd0 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sat, 13 Aug 2022 14:25:02 +0000 Subject: [PATCH 08/30] feat(velocity): Implement Velocity debug mode --- .../common/configuration/Loader.java | 2 -- .../paper/AuthMeVelocityPlugin.java | 2 +- .../velocity/AuthMeVelocityPlugin.java | 9 ++++++ .../velocity/listener/ConnectListener.java | 12 ++++++-- .../velocity/listener/FastLoginListener.java | 12 ++++---- .../listener/PluginMessageListener.java | 29 ++++++++++++++----- .../velocity/listener/ProxyListener.java | 12 ++++++-- .../velocity/utils/AuthmeUtils.java | 6 ++-- 8 files changed, 59 insertions(+), 25 deletions(-) diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java index ebfc68f..e87cec3 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java @@ -7,8 +7,6 @@ import org.slf4j.Logger; import org.spongepowered.configurate.CommentedConfigurationNode; import org.spongepowered.configurate.ConfigurateException; import org.spongepowered.configurate.hocon.HoconConfigurationLoader; -import org.spongepowered.configurate.objectmapping.ConfigSerializable; -import org.spongepowered.configurate.objectmapping.meta.Comment; public final class Loader { diff --git a/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMeVelocityPlugin.java b/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMeVelocityPlugin.java index dc6ee22..2446e5d 100644 --- a/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMeVelocityPlugin.java +++ b/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMeVelocityPlugin.java @@ -69,7 +69,7 @@ public final class AuthMeVelocityPlugin extends JavaPlugin { public void logDebug(String debug) { if (config.get().debug()) { - getSLF4JLogger().info("[DEBUG] "+debug); + getSLF4JLogger().info("[DEBUG] {}", debug); } } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java index baa5775..73455d6 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java @@ -77,6 +77,7 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { new VelocityLibraryManager<>( logger, pluginDirectory, proxy.getPluginManager(), this)); libraries.loadLibraries(); + logDebug("Loaded plugin libraries"); this.config = Loader.loadMainConfig(pluginDirectory, ProxyConfiguration.class, logger); @@ -90,10 +91,12 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { proxy.getEventManager().register(this, listener)); if (proxy.getPluginManager().isLoaded("fastlogin")) { + logDebug("Register FastLogin compatibility"); proxy.getEventManager().register(this, new FastLoginListener(proxy, this)); } if (proxy.getPluginManager().isLoaded("miniplaceholders")) { + logDebug("Register MiniPlaceholders compatibility"); AuthMePlaceholders.getExpansion(this).register(); } @@ -166,4 +169,10 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { public boolean isAuthServer(String server){ return config.get().authServers().contains(server); } + + public void logDebug(String msg) { + if (config.get().debug()) { + logger.info("[DEBUG] {}", msg); + } + } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java index 39e3602..4837bae 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java @@ -34,12 +34,14 @@ public class ConnectListener { public void onInitialServer(PlayerChooseInitialServerEvent event, Continuation continuation){ if(!plugin.config().get().ensureAuthServer().ensureFirstServerIsAuthServer()) { continuation.resume(); + plugin.logDebug("PlayerChooseInitialServerEvent | Not enabled"); return; } Optional optionalSV = event.getInitialServer(); if(optionalSV.isPresent() && plugin.isAuthServer(optionalSV.get())){ continuation.resume(); + plugin.logDebug("PlayerChooseInitialServerEvent | Player is in auth server"); return; } @@ -48,19 +50,22 @@ public class ConnectListener { event.setInitialServer(server); continuation.resume(); if (server == null) { + plugin.logDebug("PlayerChooseInitialServerEvent | Null server"); logger.error("Cannot send the player {} to an auth server", event.getPlayer().getUsername()); } } @Subscribe public void onServerPreConnect(ServerPreConnectEvent event, Continuation continuation) { - if (!event.getResult().isAllowed() && plugin.isLogged(event.getPlayer())) { + if (!event.getResult().isAllowed() || plugin.isLogged(event.getPlayer())) { + plugin.logDebug("ServerPreConnectEvent | Not allowed or player not logged"); continuation.resume(); return; } // this should be present, "event.getResult().isAllowed()" is the "isPresent" check - if(!plugin.isAuthServer(event.getResult().getServer().get())) { + if(!plugin.isAuthServer(event.getResult().getServer().orElse(null))) { + plugin.logDebug("ServerPreConnectEvent | Server is not an auth server"); event.setResult(ServerPreConnectEvent.ServerResult.denied()); } continuation.resume(); @@ -70,7 +75,8 @@ public class ConnectListener { public void onServerPostConnect(ServerPostConnectEvent event) { final Player player = event.getPlayer(); if (plugin.isLogged(player) && plugin.isInAuthServer(player)) { - ByteArrayDataOutput buf = ByteStreams.newDataOutput(); + plugin.logDebug("ServerPostConnectEvent | Already logged player and connected to an Auth server"); + final ByteArrayDataOutput buf = ByteStreams.newDataOutput(); buf.writeUTF("LOGIN"); player.getCurrentServer().ifPresent(sv -> sv.sendPluginMessage(AuthMeVelocityPlugin.AUTHMEVELOCITY_CHANNEL, buf.toByteArray())); diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java index ce64a57..46b2fd9 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java @@ -4,18 +4,18 @@ import com.github.games647.fastlogin.velocity.event.VelocityFastLoginAutoLoginEv import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.proxy.ProxyServer; -import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; +import me.adrianed.authmevelocity.velocity.AuthMeVelocityPlugin; public class FastLoginListener { private final ProxyServer proxy; - private final AuthMeVelocityAPI api; - public FastLoginListener(ProxyServer proxy, AuthMeVelocityAPI api){ + private final AuthMeVelocityPlugin plugin; + public FastLoginListener(ProxyServer proxy, AuthMeVelocityPlugin plugin){ this.proxy = proxy; - this.api = api; + this.plugin = plugin; } @Subscribe public void onAutoLogin(VelocityFastLoginAutoLoginEvent event){ - proxy.getPlayer(event.getProfile().getName()) - .ifPresent(api::addPlayer); + plugin.logDebug("VelocityFastLoginAutoLoginEvent | Attempt to auto register player"); + proxy.getPlayer(event.getProfile().getName()).ifPresent(plugin::addPlayer); } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java index 90e09ff..8173f35 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java @@ -43,14 +43,16 @@ public class PluginMessageListener { @Subscribe public void onPluginMessage(final PluginMessageEvent event, Continuation continuation) { - final boolean cancelled = !(event.getSource() instanceof ServerConnection) + final boolean cancelled = !event.getResult().isAllowed() + ||!(event.getSource() instanceof ServerConnection) || !event.getIdentifier().equals(AuthMeVelocityPlugin.AUTHMEVELOCITY_CHANNEL); if (cancelled) { continuation.resume(); + plugin.logDebug("PluginMessageEvent | Not allowed"); return; } - ServerConnection connection = ((ServerConnection)event.getSource()); + final ServerConnection connection = ((ServerConnection)event.getSource()); event.setResult(PluginMessageEvent.ForwardResult.handled()); @@ -63,26 +65,39 @@ public class PluginMessageListener { switch (type) { case LOGIN -> { + plugin.logDebug("PluginMessageEvent | Login type"); if (player != null && plugin.addPlayer(player)){ proxy.getEventManager().fireAndForget(new ProxyLoginEvent(player)); this.createServerConnectionRequest(player, connection); + plugin.logDebug("PluginMessageEvent | Player not null"); } } case LOGOUT -> { + plugin.logDebug("PluginMessageEvent | Logout type"); if (player != null && plugin.removePlayer(player)){ proxy.getEventManager().fireAndForget(new ProxyLogoutEvent(player)); + plugin.logDebug("PluginMessageEvent | Player not null"); } } case REGISTER -> { - if (player != null) + plugin.logDebug("PluginMessageEvent | Register"); + if (player != null) { proxy.getEventManager().fireAndForget(new ProxyRegisterEvent(player)); + plugin.logDebug("PluginMessageEvent | Player not null"); + } } case UNREGISTER -> { - if(player != null) + plugin.logDebug("PluginMessageEvent | Unregister type"); + if(player != null) { + plugin.logDebug("PluginMessageEvent | Player not null"); proxy.getEventManager().fireAndForget(new ProxyUnregisterEvent(player)); + } } - case FORCE_UNREGISTER -> + case FORCE_UNREGISTER -> { proxy.getEventManager().fireAndForget(new ProxyForcedUnregisterEvent(player)); + plugin.logDebug("PluginMessageEvent | Forced Unregister type"); + } + } continuation.resume(); } @@ -100,14 +115,14 @@ public class PluginMessageListener { .thenApply(PreSendOnLoginEvent::getResult) .thenApply(GenericResult::isAllowed) .thenAcceptAsync(allowed -> { - if (!allowed) { + if (!allowed.booleanValue()) { return; } player.createConnectionRequest(server) .connect() .thenApply(Result::isSuccessful) .thenAcceptAsync(result -> { - if(!result) { + if(!result.booleanValue()) { logger.info("Unable to connect the player {} to the server {}", player.getUsername(), server.getServerInfo().getName()); diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java index dc6d2b7..e8aa8dc 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java @@ -28,25 +28,28 @@ public final class ProxyListener { @Subscribe(order = PostOrder.FIRST) public void onCommandExecute(final CommandExecuteEvent event, Continuation continuation) { - if (!(event.getCommandSource() instanceof Player)){ + if (!(event.getCommandSource() instanceof final Player player)){ + plugin.logDebug("CommandExecuteEvent | CommandSource is not a player"); continuation.resume(); return; } - Player player = (Player)event.getCommandSource(); - if (plugin.isLogged(player)) { + plugin.logDebug("CommandExecuteEvent | Player is not logged"); continuation.resume(); return; } if (plugin.isInAuthServer(player)) { + plugin.logDebug("CommandExecuteEvent | Player is in Auth Server"); String command = AuthmeUtils.getFirstArgument(event.getCommand()); if (!plugin.config().get().commands().allowedCommands().contains(command)) { + plugin.logDebug("CommandExecuteEvent | Player executed an blocked command"); sendBlockedMessage(player); event.setResult(CommandExecuteEvent.CommandResult.denied()); } } else { + plugin.logDebug("CommandExecuteEven | Player is not in auth server"); sendBlockedMessage(player); event.setResult(CommandExecuteEvent.CommandResult.denied()); } @@ -56,6 +59,7 @@ public final class ProxyListener { @Subscribe(order = PostOrder.FIRST) public void onPlayerChat(final PlayerChatEvent event) { if (plugin.isNotLogged(event.getPlayer())) { + plugin.logDebug("PlayerChatEvent | Player is not logged"); event.setResult(PlayerChatEvent.ChatResult.denied()); } } @@ -63,6 +67,7 @@ public final class ProxyListener { @Subscribe(order = PostOrder.FIRST) public void onTabComplete(TabCompleteEvent event){ if (plugin.isLogged(event.getPlayer())) { + plugin.logDebug("TabCompleteEvent | Player is already logged"); return; } @@ -73,6 +78,7 @@ public final class ProxyListener { } } + plugin.logDebug("TabCompleteEvent | Not allowed tabcompletion"); event.getSuggestions().clear(); } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java index f2ebaae..3cdb52b 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java @@ -11,12 +11,12 @@ public class AuthmeUtils { * @param string the string * @return the first argument */ - public static @NotNull String getFirstArgument(@NotNull String string){ - int index = Objects.requireNonNull(string).indexOf(" "); + public static @NotNull String getFirstArgument(final @NotNull String string){ + final int index = Objects.requireNonNull(string).indexOf(' '); if (index == -1) { return string; } return string.substring(0, index); } - private AuthmeUtils(){} + private AuthmeUtils() {} } From 327b3394f1c6a75ab1560c89768a8e3a1287fbe4 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sat, 13 Aug 2022 21:00:44 +0000 Subject: [PATCH 09/30] feat: Improved PreSendLoginEvent Result --- .../velocity/event/PreSendOnLoginEvent.java | 22 +++++-------------- .../api/velocity/event/ServerResult.java | 22 +++++++++++++++++++ 2 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java index e5bceb1..8bf6381 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java @@ -3,7 +3,6 @@ package me.adrianed.authmevelocity.api.velocity.event; import java.util.Objects; import com.velocitypowered.api.event.ResultedEvent; -import com.velocitypowered.api.event.ResultedEvent.GenericResult; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.server.RegisteredServer; @@ -13,12 +12,11 @@ import org.jetbrains.annotations.NotNull; * Event to be executed just before sending a player to another server after login/registration. * Here you have the ability to deny the event. */ -public final class PreSendOnLoginEvent implements ResultedEvent { +public final class PreSendOnLoginEvent implements ResultedEvent { - private GenericResult result = GenericResult.allowed(); + private ServerResult result; private final Player player; private final RegisteredServer actualserver; - private final RegisteredServer serverToSend; /** * Create a new PreSendOnLoginEvent @@ -29,7 +27,7 @@ public final class PreSendOnLoginEvent implements ResultedEvent { public PreSendOnLoginEvent(@NotNull Player player, @NotNull RegisteredServer actualServer, @NotNull RegisteredServer serverToSend){ this.player = player; this.actualserver = actualServer; - this.serverToSend = serverToSend; + result = ServerResult.allowed(serverToSend); } /** @@ -48,19 +46,11 @@ public final class PreSendOnLoginEvent implements ResultedEvent { return this.actualserver; } - /** - * Obtain the server to which the player will be sent - * @return the server to send the player - */ - public @NotNull RegisteredServer getSendServer(){ - return this.serverToSend; - } - /** * Get the result of the event */ @Override - public @NotNull GenericResult getResult() { + public @NotNull ServerResult getResult() { return this.result; } @@ -69,7 +59,7 @@ public final class PreSendOnLoginEvent implements ResultedEvent { * @param newresult the new result */ @Override - public void setResult(@NotNull GenericResult newresult) { - this.result = Objects.requireNonNull(newresult); + public void setResult(@NotNull ServerResult newResult) { + this.result = Objects.requireNonNull(newResult); } } diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java new file mode 100644 index 0000000..7b4537b --- /dev/null +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java @@ -0,0 +1,22 @@ +package me.adrianed.authmevelocity.api.velocity.event; + +import com.velocitypowered.api.event.ResultedEvent.Result; +import com.velocitypowered.api.proxy.server.RegisteredServer; + +public record ServerResult(boolean result, RegisteredServer server) implements Result { + private static final ServerResult DENIED = new ServerResult(false, null); + + @Override + public boolean isAllowed() { + return result; + } + + public static final ServerResult allowed(RegisteredServer server) { + return new ServerResult(true, server); + } + + public static final ServerResult denied() { + return DENIED; + } + +} From 6775b8080e561a0e5d541accc03137fdcda92503 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sat, 13 Aug 2022 21:03:34 +0000 Subject: [PATCH 10/30] feat: Improved server connection selection Now the selection mode of the server to send the player to is configurable resolves #40 --- .../configuration/ProxyConfiguration.java | 32 ++++++++++ .../authmevelocity/common/enums/SendMode.java | 7 +++ .../velocity/listener/ConnectListener.java | 19 ++---- .../listener/PluginMessageListener.java | 54 +++++++++-------- .../velocity/utils/AuthmeUtils.java | 58 +++++++++++++++++++ .../authmevelocity/velocity/utils/Pair.java | 15 +++++ 6 files changed, 144 insertions(+), 41 deletions(-) create mode 100644 common/src/main/java/me/adrianed/authmevelocity/common/enums/SendMode.java create mode 100644 velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/Pair.java diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java index fdba18d..ce50144 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java @@ -3,6 +3,8 @@ package me.adrianed.authmevelocity.common.configuration; import org.spongepowered.configurate.objectmapping.ConfigSerializable; import org.spongepowered.configurate.objectmapping.meta.Comment; +import me.adrianed.authmevelocity.common.enums.SendMode; + import java.util.List; @ConfigSerializable @@ -13,6 +15,12 @@ public class ProxyConfiguration { return this.debug; } + @Comment("") + private int randomAttempts = 5; + public int randomAttempts() { + return this.randomAttempts; + } + @Comment("List of login/registration servers") private List authServers = List.of("auth1", "auth2"); public List authServers() { @@ -41,6 +49,17 @@ public class ProxyConfiguration { public boolean ensureFirstServerIsAuthServer() { return this.ensureAuthServer; } + + @Comment(""" + SendMode + TO_FIRST | + TO_EMPTIEST_SERVE | + RANDOM | + """) + private SendMode sendMode = SendMode.RANDOM; + public SendMode sendMode() { + return this.sendMode; + } } @ConfigSerializable @@ -59,6 +78,18 @@ public class ProxyConfiguration { public List teleportServers() { return this.teleportServers; } + + // TODO: Improve comments + @Comment(""" + SendMode + TO_FIRST | + TO_EMPTIEST_SERVE | + RANDOM | + """) + private SendMode sendMode = SendMode.RANDOM; + public SendMode sendMode() { + return this.sendMode; + } } @ConfigSerializable @@ -80,4 +111,5 @@ public class ProxyConfiguration { } + } diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/enums/SendMode.java b/common/src/main/java/me/adrianed/authmevelocity/common/enums/SendMode.java new file mode 100644 index 0000000..ee77c16 --- /dev/null +++ b/common/src/main/java/me/adrianed/authmevelocity/common/enums/SendMode.java @@ -0,0 +1,7 @@ +package me.adrianed.authmevelocity.common.enums; + +public enum SendMode { + TO_FIRST, + TO_EMPTIEST_SERVER, + RANDOM; +} diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java index 4837bae..861b4ea 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java @@ -2,7 +2,6 @@ package me.adrianed.authmevelocity.velocity.listener; import java.util.Optional; -import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import com.google.common.io.ByteArrayDataOutput; @@ -18,6 +17,7 @@ import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.server.RegisteredServer; import me.adrianed.authmevelocity.velocity.AuthMeVelocityPlugin; +import me.adrianed.authmevelocity.velocity.utils.AuthmeUtils; public class ConnectListener { private final ProxyServer proxy; @@ -44,12 +44,14 @@ public class ConnectListener { plugin.logDebug("PlayerChooseInitialServerEvent | Player is in auth server"); return; } + var config = plugin.config().get(); + var server = AuthmeUtils.serverToSend( + config.ensureAuthServer().sendMode(), proxy, config.authServers(), config.randomAttempts()); - @Nullable RegisteredServer server = getAvailableServer(); // Velocity takes over in case the initial server is not present - event.setInitialServer(server); + event.setInitialServer(server.object()); continuation.resume(); - if (server == null) { + if (server.isEmpty()) { plugin.logDebug("PlayerChooseInitialServerEvent | Null server"); logger.error("Cannot send the player {} to an auth server", event.getPlayer().getUsername()); } @@ -82,13 +84,4 @@ public class ConnectListener { sv.sendPluginMessage(AuthMeVelocityPlugin.AUTHMEVELOCITY_CHANNEL, buf.toByteArray())); } } - - // TODO: Implement #40 - private @Nullable RegisteredServer getAvailableServer() { - for(String sv : plugin.config().get().authServers()){ - Optional opt = proxy.getServer(sv); - if (opt.isPresent()) return opt.get(); - } - return null; - } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java index 8173f35..aa0f5d0 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java @@ -1,7 +1,5 @@ package me.adrianed.authmevelocity.velocity.listener; -import java.util.List; -import java.util.Random; import java.util.Locale; import me.adrianed.authmevelocity.api.velocity.event.PreSendOnLoginEvent; @@ -14,8 +12,6 @@ import me.adrianed.authmevelocity.common.MessageType; import com.google.common.io.ByteArrayDataInput; import com.velocitypowered.api.event.Continuation; import com.velocitypowered.api.event.Subscribe; -import com.velocitypowered.api.event.ResultedEvent.GenericResult; -import com.velocitypowered.api.proxy.ConnectionRequestBuilder.Result; import com.velocitypowered.api.event.connection.PluginMessageEvent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; @@ -23,6 +19,7 @@ import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.server.RegisteredServer; import me.adrianed.authmevelocity.velocity.AuthMeVelocityPlugin; +import me.adrianed.authmevelocity.velocity.utils.AuthmeUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,20 +28,18 @@ import org.slf4j.Logger; public class PluginMessageListener { private final ProxyServer proxy; private final Logger logger; - private final Random rm; private final AuthMeVelocityPlugin plugin; public PluginMessageListener(@NotNull ProxyServer proxy, @NotNull Logger logger, AuthMeVelocityPlugin plugin) { this.proxy = proxy; this.logger = logger; - this.rm = new Random(); this.plugin = plugin; } @Subscribe public void onPluginMessage(final PluginMessageEvent event, Continuation continuation) { final boolean cancelled = !event.getResult().isAllowed() - ||!(event.getSource() instanceof ServerConnection) + || !(event.getSource() instanceof ServerConnection) || !event.getIdentifier().equals(AuthMeVelocityPlugin.AUTHMEVELOCITY_CHANNEL); if (cancelled) { continuation.resume(); @@ -52,7 +47,7 @@ public class PluginMessageListener { return; } - final ServerConnection connection = ((ServerConnection)event.getSource()); + final ServerConnection connection = (ServerConnection) event.getSource(); event.setResult(PluginMessageEvent.ForwardResult.handled()); @@ -66,7 +61,7 @@ public class PluginMessageListener { switch (type) { case LOGIN -> { plugin.logDebug("PluginMessageEvent | Login type"); - if (player != null && plugin.addPlayer(player)){ + if (player != null && plugin.addPlayer(player)) { proxy.getEventManager().fireAndForget(new ProxyLoginEvent(player)); this.createServerConnectionRequest(player, connection); plugin.logDebug("PluginMessageEvent | Player not null"); @@ -88,7 +83,7 @@ public class PluginMessageListener { } case UNREGISTER -> { plugin.logDebug("PluginMessageEvent | Unregister type"); - if(player != null) { + if (player != null) { plugin.logDebug("PluginMessageEvent | Player not null"); proxy.getEventManager().fireAndForget(new ProxyUnregisterEvent(player)); } @@ -108,32 +103,35 @@ public class PluginMessageListener { } final RegisteredServer loginServer = player.getCurrentServer().orElse(connection).getServer(); - final String randomServer = this.getRandomServer(); - proxy.getServer(randomServer).ifPresentOrElse(server -> - proxy.getEventManager().fire(new PreSendOnLoginEvent(player, loginServer, server)) - .thenApply(PreSendOnLoginEvent::getResult) - .thenApply(GenericResult::isAllowed) - .thenAcceptAsync(allowed -> { - if (!allowed.booleanValue()) { + var config = plugin.config().get(); + + var toSend = AuthmeUtils.serverToSend( + config.sendOnLogin().sendMode(), proxy, config.authServers(), config.randomAttempts()); + + if (toSend.isEmpty()) { + if (toSend.string() != null) { + logger.warn("The server {} does not exist", toSend.string()); + } else { + logger.warn("There is not valid server to send"); + } + return; + } + + proxy.getEventManager().fire(new PreSendOnLoginEvent(player, loginServer, toSend.object())) + .thenAccept(event -> { + if (!event.getResult().isAllowed()) { return; } - player.createConnectionRequest(server) + player.createConnectionRequest(event.getResult().server()) .connect() - .thenApply(Result::isSuccessful) .thenAcceptAsync(result -> { - if(!result.booleanValue()) { + if (!result.isSuccessful()) { logger.info("Unable to connect the player {} to the server {}", player.getUsername(), - server.getServerInfo().getName()); + result.getAttemptedConnection().getServerInfo().getName()); } }); - }) - , () -> logger.warn("The server {} does not exist", randomServer)); - } - - private String getRandomServer() { - final List serverList = plugin.config().get().sendOnLogin().teleportServers(); - return serverList.get(rm.nextInt(serverList.size())); + }); } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java index 3cdb52b..45a5dcf 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java @@ -1,9 +1,17 @@ package me.adrianed.authmevelocity.velocity.utils; +import java.util.List; import java.util.Objects; +import java.util.Optional; +import java.util.Random; import org.jetbrains.annotations.NotNull; +import com.velocitypowered.api.proxy.ProxyServer; +import com.velocitypowered.api.proxy.server.RegisteredServer; + +import me.adrianed.authmevelocity.common.enums.SendMode; + public class AuthmeUtils { //Origin: https://github.com/4drian3d/ChatRegulator/blob/main/src/main/java/me/dreamerzero/chatregulator/utils/CommandUtils.java#L71 /** @@ -18,5 +26,55 @@ public class AuthmeUtils { } return string.substring(0, index); } + + private static final Random RANDOM = new Random(); + + public static Pair serverToSend(SendMode sendMode, ProxyServer proxy, List servers, int attempts) { + return switch(sendMode) { + case TO_FIRST -> { + Optional sv; + for (final String st : servers) { + sv = proxy.getServer(st); + if (sv.isPresent()) yield Pair.of(st, sv.get()); + } + yield Pair.of(null, null); + } + case TO_EMPTIEST_SERVER -> { + RegisteredServer emptiest = null; + Optional optional = Optional.empty(); + for (final String st : servers) { + optional = proxy.getServer(st); + if (optional.isPresent()) { + RegisteredServer actualsv = optional.get(); + int actualConnected = actualsv.getPlayersConnected().size(); + if (actualConnected == 0) { + yield Pair.of(st, actualsv); + } + if (emptiest == null || actualConnected < emptiest.getPlayersConnected().size()) { + emptiest = actualsv; + } + } + } + yield Pair.of(optional.map(sv -> sv.getServerInfo().getName()).orElse(null), emptiest); + } + case RANDOM -> { + Optional server; + if (servers.size() == 1) { + server = proxy.getServer(servers.get(0)); + if (server.isPresent()) { + yield Pair.of(server.get().getServerInfo().getName(), server.get()); + } + } + for (int i = 0; i < attempts; i++) { + int value = RANDOM.nextInt(servers.size()); + server = proxy.getServer(servers.get(value)); + if (server.isPresent()) { + yield Pair.of(server.get().getServerInfo().getName(), server.get()); + } + } + yield Pair.of(null, null); + } + }; + } private AuthmeUtils() {} } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/Pair.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/Pair.java new file mode 100644 index 0000000..8ae66c8 --- /dev/null +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/Pair.java @@ -0,0 +1,15 @@ +package me.adrianed.authmevelocity.velocity.utils; + +public record Pair(String string, O object) { + public boolean isPresent() { + return this.object != null; + } + + public boolean isEmpty() { + return object == null; + } + + public static Pair of(String string, O object) { + return new Pair<>(string, object); + } +} From 97b9bcd87ac9f43f411ad9311ec1a60c45ae6079 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sat, 13 Aug 2022 21:12:23 +0000 Subject: [PATCH 11/30] misc(velocity): Implement Advanced config section --- .../configuration/ProxyConfiguration.java | 51 +++++++++++-------- .../velocity/AuthMeVelocityPlugin.java | 2 +- .../velocity/listener/ConnectListener.java | 2 +- .../listener/PluginMessageListener.java | 2 +- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java index ce50144..6220e08 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java @@ -9,18 +9,6 @@ import java.util.List; @ConfigSerializable public class ProxyConfiguration { - @Comment("Enable debug mode") - private boolean debug = false; - public boolean debug() { - return this.debug; - } - - @Comment("") - private int randomAttempts = 5; - public int randomAttempts() { - return this.randomAttempts; - } - @Comment("List of login/registration servers") private List authServers = List.of("auth1", "auth2"); public List authServers() { @@ -42,6 +30,11 @@ public class ProxyConfiguration { return this.ensureAuthServer; } + private Advanced advanced = new Advanced(); + public Advanced advanced() { + return this.advanced; + } + @ConfigSerializable public static class EnsureAuthServer { @Comment("Ensure that the first server to which players connect is an auth server") @@ -51,11 +44,11 @@ public class ProxyConfiguration { } @Comment(""" - SendMode - TO_FIRST | - TO_EMPTIEST_SERVE | - RANDOM | - """) + Selection Mode of the player's initial server + TO_FIRST | Send to the first valid server configured + TO_EMPTIEST_SERVER | Send to the server with the lowest number of players + RANDOM | Send to a random server + """) private SendMode sendMode = SendMode.RANDOM; public SendMode sendMode() { return this.sendMode; @@ -79,12 +72,11 @@ public class ProxyConfiguration { return this.teleportServers; } - // TODO: Improve comments @Comment(""" - SendMode - TO_FIRST | - TO_EMPTIEST_SERVE | - RANDOM | + Selection Mode of the server to which the player will be sent + TO_FIRST | Send to the first valid server configured + TO_EMPTIEST_SERVER | Send to the server with the lowest number of players + RANDOM | Send to a random server """) private SendMode sendMode = SendMode.RANDOM; public SendMode sendMode() { @@ -110,6 +102,21 @@ public class ProxyConfiguration { } } + @ConfigSerializable + public static class Advanced { + @Comment("Enable debug mode") + private boolean debug = false; + public boolean debug() { + return this.debug; + } + + @Comment("Attempts to get a valid server in SendMode Random") + private int randomAttempts = 5; + public int randomAttempts() { + return this.randomAttempts; + } + } + } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java index 73455d6..fc0de1c 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java @@ -171,7 +171,7 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { } public void logDebug(String msg) { - if (config.get().debug()) { + if (config.get().advanced().debug()) { logger.info("[DEBUG] {}", msg); } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java index 861b4ea..6eef772 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java @@ -46,7 +46,7 @@ public class ConnectListener { } var config = plugin.config().get(); var server = AuthmeUtils.serverToSend( - config.ensureAuthServer().sendMode(), proxy, config.authServers(), config.randomAttempts()); + config.ensureAuthServer().sendMode(), proxy, config.authServers(), config.advanced().randomAttempts()); // Velocity takes over in case the initial server is not present event.setInitialServer(server.object()); diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java index aa0f5d0..6c031e7 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java @@ -107,7 +107,7 @@ public class PluginMessageListener { var config = plugin.config().get(); var toSend = AuthmeUtils.serverToSend( - config.sendOnLogin().sendMode(), proxy, config.authServers(), config.randomAttempts()); + config.sendOnLogin().sendMode(), proxy, config.authServers(), config.advanced().randomAttempts()); if (toSend.isEmpty()) { if (toSend.string() != null) { From 0d8630452f3285b9280de9ac61ab10c8169dd8d9 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sat, 13 Aug 2022 21:47:26 +0000 Subject: [PATCH 12/30] fix(velocity): Implement ignoreSignedPlayer configuration Workaround for #48 --- .../configuration/ProxyConfiguration.java | 22 +++++++----- .../velocity/listener/ProxyListener.java | 35 ++++++++++++++++--- 2 files changed, 44 insertions(+), 13 deletions(-) diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java index 6220e08..09ae2be 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java @@ -47,8 +47,7 @@ public class ProxyConfiguration { Selection Mode of the player's initial server TO_FIRST | Send to the first valid server configured TO_EMPTIEST_SERVER | Send to the server with the lowest number of players - RANDOM | Send to a random server - """) + RANDOM | Send to a random server""") private SendMode sendMode = SendMode.RANDOM; public SendMode sendMode() { return this.sendMode; @@ -65,8 +64,7 @@ public class ProxyConfiguration { @Comment(""" List of servers to send - One of these servers will be chosen at random - """) + One of these servers will be chosen at random""") private List teleportServers = List.of("lobby1", "lobby2"); public List teleportServers() { return this.teleportServers; @@ -76,8 +74,7 @@ public class ProxyConfiguration { Selection Mode of the server to which the player will be sent TO_FIRST | Send to the first valid server configured TO_EMPTIEST_SERVER | Send to the server with the lowest number of players - RANDOM | Send to a random server - """) + RANDOM | Send to a random server""") private SendMode sendMode = SendMode.RANDOM; public SendMode sendMode() { return this.sendMode; @@ -94,8 +91,7 @@ public class ProxyConfiguration { @Comment(""" Sets the message to send in case a non-logged-in player executes an unauthorized command - To deactivate the message, leave it empty - """) + To deactivate the message, leave it empty""") private String blockedMessage = "You cannot execute commands if you are not logged in yet"; public String blockedCommandMessage() { return this.blockedMessage; @@ -115,6 +111,16 @@ public class ProxyConfiguration { public int randomAttempts() { return this.randomAttempts; } + + @Comment(""" + Ignore blocking of commands and chat messages to 1.19.1 clients with a valid signed key + When trying to block these executions, the proxy will kick the player out. + This option allows you to prevent the plugin from trying to block these executions, + avoiding the player to be kicked out""") + private boolean ignoreSignedPlayers = false; + public boolean ignoreSignedPlayers() { + return this.ignoreSignedPlayers; + } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java index e8aa8dc..fdebbd8 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java @@ -10,6 +10,7 @@ import com.velocitypowered.api.event.command.CommandExecuteEvent; import com.velocitypowered.api.event.connection.DisconnectEvent; import com.velocitypowered.api.event.player.PlayerChatEvent; import com.velocitypowered.api.event.player.TabCompleteEvent; +import com.velocitypowered.api.network.ProtocolVersion; import com.velocitypowered.api.proxy.Player; import net.kyori.adventure.text.minimessage.MiniMessage; @@ -35,7 +36,13 @@ public final class ProxyListener { } if (plugin.isLogged(player)) { - plugin.logDebug("CommandExecuteEvent | Player is not logged"); + plugin.logDebug("CommandExecuteEvent | Player is already logged"); + continuation.resume(); + return; + } + + if (canBeIgnored(player)) { + plugin.logDebug("CommandexecuteEvent | Ignored signed player"); continuation.resume(); return; } @@ -57,11 +64,23 @@ public final class ProxyListener { } @Subscribe(order = PostOrder.FIRST) - public void onPlayerChat(final PlayerChatEvent event) { - if (plugin.isNotLogged(event.getPlayer())) { - plugin.logDebug("PlayerChatEvent | Player is not logged"); - event.setResult(PlayerChatEvent.ChatResult.denied()); + public void onPlayerChat(final PlayerChatEvent event, Continuation continuation) { + if (plugin.isLogged(event.getPlayer())) { + plugin.logDebug("PlayerChatEvent | Player is already logged"); + continuation.resume(); + return; } + + plugin.logDebug("PlayerChatEvent | Player is not logged"); + + if (canBeIgnored(event.getPlayer())) { + plugin.logDebug("PlayerChatEvent | Ignored signed player"); + continuation.resume(); + return; + } + + event.setResult(PlayerChatEvent.ChatResult.denied()); + continuation.resume(); } @Subscribe(order = PostOrder.FIRST) @@ -88,5 +107,11 @@ public final class ProxyListener { player.sendMessage(MiniMessage.miniMessage().deserialize(blockedMessage)); } } + + boolean canBeIgnored(Player player) { + return player.getIdentifiedKey() != null + && player.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_19_1) >= 0 + && plugin.config().get().advanced().ignoreSignedPlayers(); + } } From 03630dadb07e5b2de64ffb9fb220537a1b424ff5 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sun, 14 Aug 2022 00:30:50 +0000 Subject: [PATCH 13/30] feat: Implement metrics --- api/velocity/build.gradle.kts | 10 ++++++++- common/build.gradle.kts | 9 +++++++- velocity/build.gradle.kts | 2 ++ .../velocity/AuthMeVelocityPlugin.java | 22 ++++++++++++++++--- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/api/velocity/build.gradle.kts b/api/velocity/build.gradle.kts index 5e5ae5e..4776056 100644 --- a/api/velocity/build.gradle.kts +++ b/api/velocity/build.gradle.kts @@ -1,3 +1,11 @@ dependencies { compileOnly("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") -} \ No newline at end of file +} + +tasks.compileJava { + options.encoding = Charsets.UTF_8.name() + + options.release.set(17) +} + +java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) \ No newline at end of file diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 08b142e..6e3c4a2 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -18,4 +18,11 @@ tasks { relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby") relocate("org.spongepowered", "me.adrianed.authmevelocity.libs.sponge") } -} \ No newline at end of file + compileJava { + options.encoding = Charsets.UTF_8.name() + + options.release.set(17) + } +} + +java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) \ No newline at end of file diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index dcdbd4c..168dc72 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -14,6 +14,7 @@ dependencies { compileOnly("com.github.4drian3d:MiniPlaceholders:1.1.1") compileOnly("com.github.games647:fastlogin.velocity:1.11-SNAPSHOT") shadow("net.byteflux:libby-velocity:1.1.5") + shadow("org.bstats:bstats-velocity:3.0.0") compileOnly(project(":authmevelocity-common")) compileOnly(project(":authmevelocity-api-velocity")) } @@ -28,6 +29,7 @@ tasks { shadowJar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby") + relocate("org.bstats", "me.adrianed.authmevelocity.libs.bstats") configurations = listOf(project.configurations.shadow.get()) } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java index fc0de1c..db9d48d 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java @@ -28,6 +28,8 @@ import net.byteflux.libby.VelocityLibraryManager; import net.kyori.adventure.text.minimessage.MiniMessage; import org.slf4j.Logger; +import org.bstats.charts.SimplePie; +import org.bstats.velocity.Metrics; import java.util.function.Predicate; import java.nio.file.Path; @@ -59,15 +61,22 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { private final ProxyServer proxy; private final Logger logger; private final Path pluginDirectory; + private final Metrics.Factory metricsFactory; private ConfigurationContainer config; protected final Set loggedPlayers = ConcurrentHashMap.newKeySet(); @Inject - public AuthMeVelocityPlugin(ProxyServer proxy, Logger logger, @DataDirectory Path dataDirectory) { + public AuthMeVelocityPlugin( + ProxyServer proxy, + Logger logger, + @DataDirectory Path dataDirectory, + Metrics.Factory factory + ) { this.proxy = proxy; this.logger = logger; this.pluginDirectory = dataDirectory; + this.metricsFactory = factory; } @Subscribe @@ -81,6 +90,9 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { this.config = Loader.loadMainConfig(pluginDirectory, ProxyConfiguration.class, logger); + final int pluginId = 16128; + Metrics metrics = metricsFactory.make(this, pluginId); + proxy.getChannelRegistrar().register(AUTHMEVELOCITY_CHANNEL); List.of( @@ -90,12 +102,16 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { ).forEach(listener -> proxy.getEventManager().register(this, listener)); - if (proxy.getPluginManager().isLoaded("fastlogin")) { + boolean fastlogin = proxy.getPluginManager().isLoaded("fastlogin"); + metrics.addCustomChart(new SimplePie("fastlogin_compatibility", () -> Boolean.toString(fastlogin))); + if (fastlogin) { logDebug("Register FastLogin compatibility"); proxy.getEventManager().register(this, new FastLoginListener(proxy, this)); } - if (proxy.getPluginManager().isLoaded("miniplaceholders")) { + boolean miniplaceholders = proxy.getPluginManager().isLoaded("miniplaceholders"); + metrics.addCustomChart(new SimplePie("miniplaceholders_compatibility", () -> Boolean.toString(miniplaceholders))); + if (miniplaceholders) { logDebug("Register MiniPlaceholders compatibility"); AuthMePlaceholders.getExpansion(this).register(); } From 4e191478f8027a1b00da81aba2d9515c045345da Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sun, 14 Aug 2022 01:01:40 +0000 Subject: [PATCH 14/30] fix: Fixed early config calling --- .../authmevelocity/velocity/AuthMeVelocityPlugin.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java index db9d48d..1b403a1 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java @@ -6,6 +6,7 @@ import me.adrianed.authmevelocity.velocity.listener.FastLoginListener; import me.adrianed.authmevelocity.velocity.listener.PluginMessageListener; import me.adrianed.authmevelocity.velocity.listener.ProxyListener; import me.adrianed.authmevelocity.api.velocity.AuthMeVelocityAPI; +import me.adrianed.authmevelocity.common.Constants; import me.adrianed.authmevelocity.common.LibsManager; import me.adrianed.authmevelocity.common.configuration.ConfigurationContainer; import me.adrianed.authmevelocity.common.configuration.Loader; @@ -43,7 +44,7 @@ import java.util.UUID; name = "AuthMeVelocity", url = "https://github.com/4drian3d/AuthMeVelocity", description = "This plugin adds the support for AuthMeReloaded to Velocity", - version = "3.0.0", + version = Constants.VERSION, dependencies = { @Dependency( id = "miniplaceholders", @@ -86,9 +87,9 @@ public final class AuthMeVelocityPlugin implements AuthMeVelocityAPI { new VelocityLibraryManager<>( logger, pluginDirectory, proxy.getPluginManager(), this)); libraries.loadLibraries(); - logDebug("Loaded plugin libraries"); this.config = Loader.loadMainConfig(pluginDirectory, ProxyConfiguration.class, logger); + logDebug("Loaded plugin libraries"); final int pluginId = 16128; Metrics metrics = metricsFactory.make(this, pluginId); From 1e7ae82bb79e31b3d40d1603e38a76c5f77fc031 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sun, 14 Aug 2022 01:02:23 +0000 Subject: [PATCH 15/30] feat: Implement blossom version replacement --- common/build.gradle.kts | 8 +++++++- .../java/me/adrianed/authmevelocity/common/Constants.java | 1 + paper/build.gradle.kts | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 6e3c4a2..3745a61 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,4 +1,5 @@ plugins { + id("net.kyori.blossom") version "1.3.1" id("com.github.johnrengelman.shadow") version "7.1.2" } @@ -25,4 +26,9 @@ tasks { } } -java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) \ No newline at end of file +java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + +blossom { + replaceTokenIn("src/main/java/me/adrianed/authmevelocity/common/Constants.java") + replaceToken("{version}", project.version) +} \ No newline at end of file diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java b/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java index 7636857..974dd52 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java @@ -1,6 +1,7 @@ package me.adrianed.authmevelocity.common; public final class Constants { + public static final String VERSION = "{version}"; public static final String CONFIGURATE = "4.1.2"; public static final String GEANTYREF = "1.3.13"; } diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index d39f731..7f6b42c 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -28,7 +28,7 @@ bukkit { authors = listOf("xQuickGlare", "4drian3d") softDepend = listOf("MiniPlaceholders") depend = listOf("AuthMe") - version = "4.0.0" + version = project.version as String } tasks { From 9737d0a44942a93cef91e6fa55b85c701f0ffc09 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sun, 14 Aug 2022 02:22:18 +0000 Subject: [PATCH 16/30] feat: Implement Javadocs tasks --- api/paper/build.gradle.kts | 25 +++++++++++- .../api/paper/event/PreSendLoginEvent.java | 12 ++++++ api/paper/src/main/java/module-info.java | 2 + api/velocity/build.gradle.kts | 38 ++++++++++++++++--- .../velocity/event/PreSendOnLoginEvent.java | 7 ++-- .../event/ProxyForcedUnregisterEvent.java | 13 +------ .../api/velocity/event/ProxyLoginEvent.java | 12 +----- .../api/velocity/event/ProxyLogoutEvent.java | 13 +------ .../velocity/event/ProxyRegisterEvent.java | 13 +------ .../velocity/event/ProxyUnregisterEvent.java | 13 +------ .../api/velocity/event/ServerResult.java | 11 ++++++ api/velocity/src/main/java/module-info.java | 2 + 12 files changed, 96 insertions(+), 65 deletions(-) diff --git a/api/paper/build.gradle.kts b/api/paper/build.gradle.kts index 6c6e1b1..d15f043 100644 --- a/api/paper/build.gradle.kts +++ b/api/paper/build.gradle.kts @@ -1,11 +1,34 @@ +plugins { + `maven-publish` +} + +java { + withSourcesJar() + withJavadocJar() + toolchain.languageVersion.set(JavaLanguageVersion.of(17)) +} + dependencies { compileOnly("io.papermc.paper:paper-api:1.19.1-R0.1-SNAPSHOT") } tasks { compileJava { + options.encoding = Charsets.UTF_8.name() options.release.set(17) } + javadoc { + options.encoding = Charsets.UTF_8.name() + } } -java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) \ No newline at end of file +publishing { + publications { + create("maven") { + groupId = project.group as String + artifactId = project.name + version = project.version as String + from(components["java"]) + } + } +} diff --git a/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/PreSendLoginEvent.java b/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/PreSendLoginEvent.java index 431b96f..44a8a2a 100644 --- a/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/PreSendLoginEvent.java +++ b/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/PreSendLoginEvent.java @@ -7,10 +7,18 @@ import org.bukkit.event.HandlerList; import org.bukkit.event.player.PlayerEvent; import org.jetbrains.annotations.NotNull; +/** + * Event executed before a player is sent to another server after being logged in + *

Here you have the possibility to cancel the player's sending +*/ public class PreSendLoginEvent extends PlayerEvent implements Cancellable { private static final HandlerList HANDLERS = new HandlerList(); private boolean isCancelled = false; + /** + * Creates a new PreSendLoginEvent + * @param player the player to be sended + */ public PreSendLoginEvent(@NotNull Player player) { super(player, !Bukkit.isPrimaryThread()); } @@ -30,6 +38,10 @@ public class PreSendLoginEvent extends PlayerEvent implements Cancellable { return HANDLERS; } + /** + * Obtain the handlerlist of this event + * @return the handlerlist + */ public static HandlerList getHandlerList() { return HANDLERS; } diff --git a/api/paper/src/main/java/module-info.java b/api/paper/src/main/java/module-info.java index 64b7e65..3c01847 100644 --- a/api/paper/src/main/java/module-info.java +++ b/api/paper/src/main/java/module-info.java @@ -1,3 +1,5 @@ +/**AuthMeVelocity Paper API Module */ +@SuppressWarnings({"requires-automatic", "requires-transitive-automatic"}) module me.adrianed.authmevelocity.api.paper { requires static transitive org.bukkit; requires static org.jetbrains.annotations; diff --git a/api/velocity/build.gradle.kts b/api/velocity/build.gradle.kts index 4776056..1844d31 100644 --- a/api/velocity/build.gradle.kts +++ b/api/velocity/build.gradle.kts @@ -1,11 +1,39 @@ +plugins { + `maven-publish` +} + dependencies { compileOnly("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") } -tasks.compileJava { - options.encoding = Charsets.UTF_8.name() - - options.release.set(17) +java { + withSourcesJar() + withJavadocJar() + toolchain.languageVersion.set(JavaLanguageVersion.of(17)) } -java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) \ No newline at end of file +tasks { + compileJava { + options.encoding = Charsets.UTF_8.name() + + options.release.set(17) + } + javadoc { + options.encoding = Charsets.UTF_8.name() + (options as StandardJavadocDocletOptions).links( + "https://jd.adventure.kyori.net/api/4.10.0/", + "https://jd.adventure.kyori.net/text-minimessage/4.11.0/" + ) + } +} + +publishing { + publications { + create("maven") { + groupId = project.group as String + artifactId = project.name + version = project.version as String + from(components["java"]) + } + } +} \ No newline at end of file diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java index 8bf6381..7c0c0b7 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java @@ -13,7 +13,6 @@ import org.jetbrains.annotations.NotNull; * Here you have the ability to deny the event. */ public final class PreSendOnLoginEvent implements ResultedEvent { - private ServerResult result; private final Player player; private final RegisteredServer actualserver; @@ -34,7 +33,7 @@ public final class PreSendOnLoginEvent implements ResultedEvent { * Obtain the logged player * @return the player */ - public @NotNull Player getPlayer(){ + public @NotNull Player player(){ return this.player; } @@ -42,7 +41,7 @@ public final class PreSendOnLoginEvent implements ResultedEvent { * Obtain the server on which the player is located * @return the actual server of the player */ - public @NotNull RegisteredServer getActualServer(){ + public @NotNull RegisteredServer actualServer(){ return this.actualserver; } @@ -56,7 +55,7 @@ public final class PreSendOnLoginEvent implements ResultedEvent { /** * Set the result of the event - * @param newresult the new result + * @param newResult the new result */ @Override public void setResult(@NotNull ServerResult newResult) { diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyForcedUnregisterEvent.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyForcedUnregisterEvent.java index 81301fb..2294e9f 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyForcedUnregisterEvent.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyForcedUnregisterEvent.java @@ -4,14 +4,5 @@ import com.velocitypowered.api.proxy.Player; import org.jetbrains.annotations.Nullable; -public class ProxyForcedUnregisterEvent { - private final Player player; - - public ProxyForcedUnregisterEvent(@Nullable Player player){ - this.player = player; - } - - public @Nullable Player getPlayer(){ - return this.player; - } -} +/**Event executed in case a player is forced unregister by a server operator*/ +public record ProxyForcedUnregisterEvent(@Nullable Player player) {} diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLoginEvent.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLoginEvent.java index 6ed50ca..c107eae 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLoginEvent.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLoginEvent.java @@ -7,14 +7,4 @@ import org.jetbrains.annotations.NotNull; /** * Event executed in case the player is successfully logged in */ -public final class ProxyLoginEvent { - private final Player player; - - public ProxyLoginEvent(@NotNull Player player){ - this.player = player; - } - - public @NotNull Player getPlayer(){ - return this.player; - } -} +public record ProxyLoginEvent(@NotNull Player player) {} diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLogoutEvent.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLogoutEvent.java index 7c4ff23..0c7a97e 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLogoutEvent.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLogoutEvent.java @@ -4,14 +4,5 @@ import com.velocitypowered.api.proxy.Player; import org.jetbrains.annotations.NotNull; -public final class ProxyLogoutEvent { - private final Player player; - - public ProxyLogoutEvent(@NotNull Player player){ - this.player = player; - } - - public @NotNull Player getPlayer(){ - return this.player; - } -} +/**Event executed in case the player has logout from the network */ +public record ProxyLogoutEvent(@NotNull Player player) {} diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyRegisterEvent.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyRegisterEvent.java index 9d0899e..ae5d007 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyRegisterEvent.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyRegisterEvent.java @@ -4,14 +4,5 @@ import com.velocitypowered.api.proxy.Player; import org.jetbrains.annotations.NotNull; -public final class ProxyRegisterEvent { - private final Player player; - - public ProxyRegisterEvent(@NotNull Player player){ - this.player = player; - } - - public @NotNull Player getPlayer(){ - return this.player; - } -} +/**Event executed in case the player has register itself*/ +public record ProxyRegisterEvent(@NotNull Player player) {} diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyUnregisterEvent.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyUnregisterEvent.java index 4510ac6..acbdab0 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyUnregisterEvent.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyUnregisterEvent.java @@ -4,14 +4,5 @@ import com.velocitypowered.api.proxy.Player; import org.jetbrains.annotations.NotNull; -public class ProxyUnregisterEvent { - private final Player player; - - public ProxyUnregisterEvent(@NotNull Player player){ - this.player = player; - } - - public @NotNull Player getPlayer(){ - return this.player; - } -} +/**Event executed in case the player has unregister itself*/ +public record ProxyUnregisterEvent(@NotNull Player player) {} diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java index 7b4537b..b9f7d16 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java @@ -3,6 +3,7 @@ package me.adrianed.authmevelocity.api.velocity.event; import com.velocitypowered.api.event.ResultedEvent.Result; import com.velocitypowered.api.proxy.server.RegisteredServer; +/**A result that produces a resulting server */ public record ServerResult(boolean result, RegisteredServer server) implements Result { private static final ServerResult DENIED = new ServerResult(false, null); @@ -11,10 +12,20 @@ public record ServerResult(boolean result, RegisteredServer server) implements R return result; } + /** + * Allowed ServerResult + * @param server the resulted server + * @return A ServerResult with allowed result and custom server result + */ public static final ServerResult allowed(RegisteredServer server) { return new ServerResult(true, server); } + /** + * Denied ServerResult + * + * @return A ServerResult with denied result and null server + */ public static final ServerResult denied() { return DENIED; } diff --git a/api/velocity/src/main/java/module-info.java b/api/velocity/src/main/java/module-info.java index a2a1150..864806e 100644 --- a/api/velocity/src/main/java/module-info.java +++ b/api/velocity/src/main/java/module-info.java @@ -1,3 +1,5 @@ +/**AuthMeVelocity Velocity API Module */ +@SuppressWarnings({"requires-automatic", "requires-transitive-automatic"}) module me.adrianed.authmevelocity.api.velocity { requires static transitive com.velocitypowered.api; requires static org.jetbrains.annotations; From 0b47b34f4a66a89c9039cf05c4a54a2e2b660765 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sun, 14 Aug 2022 02:31:33 +0000 Subject: [PATCH 17/30] chore: Implement Gradle Wrapper --- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 240 +++++++++++++++++++++++ gradlew.bat | 91 +++++++++ 4 files changed, 336 insertions(+) create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 zcmb5WV{~QRw(p$^Dz@00IL3?^hro$gg*4VI_WAaTyVM5Foj~O|-84 z$;06hMwt*rV;^8iB z1~&0XWpYJmG?Ts^K9PC62H*`G}xom%S%yq|xvG~FIfP=9*f zZoDRJBm*Y0aId=qJ?7dyb)6)JGWGwe)MHeNSzhi)Ko6J<-m@v=a%NsP537lHe0R* z`If4$aaBA#S=w!2z&m>{lpTy^Lm^mg*3?M&7HFv}7K6x*cukLIGX;bQG|QWdn{%_6 zHnwBKr84#B7Z+AnBXa16a?or^R?+>$4`}{*a_>IhbjvyTtWkHw)|ay)ahWUd-qq$~ zMbh6roVsj;_qnC-R{G+Cy6bApVOinSU-;(DxUEl!i2)1EeQ9`hrfqj(nKI7?Z>Xur zoJz-a`PxkYit1HEbv|jy%~DO^13J-ut986EEG=66S}D3!L}Efp;Bez~7tNq{QsUMm zh9~(HYg1pA*=37C0}n4g&bFbQ+?-h-W}onYeE{q;cIy%eZK9wZjSwGvT+&Cgv z?~{9p(;bY_1+k|wkt_|N!@J~aoY@|U_RGoWX<;p{Nu*D*&_phw`8jYkMNpRTWx1H* z>J-Mi_!`M468#5Aix$$u1M@rJEIOc?k^QBc?T(#=n&*5eS#u*Y)?L8Ha$9wRWdH^3D4|Ps)Y?m0q~SiKiSfEkJ!=^`lJ(%W3o|CZ zSrZL-Xxc{OrmsQD&s~zPfNJOpSZUl%V8tdG%ei}lQkM+z@-4etFPR>GOH9+Y_F<3=~SXln9Kb-o~f>2a6Xz@AS3cn^;c_>lUwlK(n>z?A>NbC z`Ud8^aQy>wy=$)w;JZzA)_*Y$Z5hU=KAG&htLw1Uh00yE!|Nu{EZkch zY9O6x7Y??>!7pUNME*d!=R#s)ghr|R#41l!c?~=3CS8&zr6*aA7n9*)*PWBV2w+&I zpW1-9fr3j{VTcls1>ua}F*bbju_Xq%^v;-W~paSqlf zolj*dt`BBjHI)H9{zrkBo=B%>8}4jeBO~kWqO!~Thi!I1H(in=n^fS%nuL=X2+s!p}HfTU#NBGiwEBF^^tKU zbhhv+0dE-sbK$>J#t-J!B$TMgN@Wh5wTtK2BG}4BGfsZOoRUS#G8Cxv|6EI*n&Xxq zt{&OxCC+BNqz$9b0WM7_PyBJEVObHFh%%`~!@MNZlo*oXDCwDcFwT~Rls!aApL<)^ zbBftGKKBRhB!{?fX@l2_y~%ygNFfF(XJzHh#?`WlSL{1lKT*gJM zs>bd^H9NCxqxn(IOky5k-wALFowQr(gw%|`0991u#9jXQh?4l|l>pd6a&rx|v=fPJ z1mutj{YzpJ_gsClbWFk(G}bSlFi-6@mwoQh-XeD*j@~huW4(8ub%^I|azA)h2t#yG z7e_V_<4jlM3D(I+qX}yEtqj)cpzN*oCdYHa!nm%0t^wHm)EmFP*|FMw!tb@&`G-u~ zK)=Sf6z+BiTAI}}i{*_Ac$ffr*Wrv$F7_0gJkjx;@)XjYSh`RjAgrCck`x!zP>Ifu z&%he4P|S)H*(9oB4uvH67^0}I-_ye_!w)u3v2+EY>eD3#8QR24<;7?*hj8k~rS)~7 zSXs5ww)T(0eHSp$hEIBnW|Iun<_i`}VE0Nc$|-R}wlSIs5pV{g_Dar(Zz<4X3`W?K z6&CAIl4U(Qk-tTcK{|zYF6QG5ArrEB!;5s?tW7 zrE3hcFY&k)+)e{+YOJ0X2uDE_hd2{|m_dC}kgEKqiE9Q^A-+>2UonB+L@v3$9?AYw zVQv?X*pK;X4Ovc6Ev5Gbg{{Eu*7{N3#0@9oMI~}KnObQE#Y{&3mM4`w%wN+xrKYgD zB-ay0Q}m{QI;iY`s1Z^NqIkjrTlf`B)B#MajZ#9u41oRBC1oM1vq0i|F59> z#StM@bHt|#`2)cpl_rWB($DNJ3Lap}QM-+A$3pe}NyP(@+i1>o^fe-oxX#Bt`mcQc zb?pD4W%#ep|3%CHAYnr*^M6Czg>~L4?l16H1OozM{P*en298b+`i4$|w$|4AHbzqB zHpYUsHZET$Z0ztC;U+0*+amF!@PI%^oUIZy{`L{%O^i{Xk}X0&nl)n~tVEpcAJSJ} zverw15zP1P-O8h9nd!&hj$zuwjg?DoxYIw{jWM zW5_pj+wFy8Tsa9g<7Qa21WaV&;ejoYflRKcz?#fSH_)@*QVlN2l4(QNk| z4aPnv&mrS&0|6NHq05XQw$J^RR9T{3SOcMKCXIR1iSf+xJ0E_Wv?jEc*I#ZPzyJN2 zUG0UOXHl+PikM*&g$U@g+KbG-RY>uaIl&DEtw_Q=FYq?etc!;hEC_}UX{eyh%dw2V zTTSlap&5>PY{6I#(6`j-9`D&I#|YPP8a;(sOzgeKDWsLa!i-$frD>zr-oid!Hf&yS z!i^cr&7tN}OOGmX2)`8k?Tn!!4=tz~3hCTq_9CdiV!NIblUDxHh(FJ$zs)B2(t5@u z-`^RA1ShrLCkg0)OhfoM;4Z{&oZmAec$qV@ zGQ(7(!CBk<5;Ar%DLJ0p0!ResC#U<+3i<|vib1?{5gCebG7$F7URKZXuX-2WgF>YJ^i zMhHDBsh9PDU8dlZ$yJKtc6JA#y!y$57%sE>4Nt+wF1lfNIWyA`=hF=9Gj%sRwi@vd z%2eVV3y&dvAgyuJ=eNJR+*080dbO_t@BFJO<@&#yqTK&+xc|FRR;p;KVk@J3$S{p` zGaMj6isho#%m)?pOG^G0mzOAw0z?!AEMsv=0T>WWcE>??WS=fII$t$(^PDPMU(P>o z_*0s^W#|x)%tx8jIgZY~A2yG;US0m2ZOQt6yJqW@XNY_>_R7(Nxb8Ged6BdYW6{prd!|zuX$@Q2o6Ona8zzYC1u!+2!Y$Jc9a;wy+pXt}o6~Bu1oF1c zp7Y|SBTNi@=I(K%A60PMjM#sfH$y*c{xUgeSpi#HB`?|`!Tb&-qJ3;vxS!TIzuTZs-&%#bAkAyw9m4PJgvey zM5?up*b}eDEY+#@tKec)-c(#QF0P?MRlD1+7%Yk*jW;)`f;0a-ZJ6CQA?E%>i2Dt7T9?s|9ZF|KP4;CNWvaVKZ+Qeut;Jith_y{v*Ny6Co6!8MZx;Wgo z=qAi%&S;8J{iyD&>3CLCQdTX*$+Rx1AwA*D_J^0>suTgBMBb=*hefV+Ars#mmr+YsI3#!F@Xc1t4F-gB@6aoyT+5O(qMz*zG<9Qq*f0w^V!03rpr*-WLH}; zfM{xSPJeu6D(%8HU%0GEa%waFHE$G?FH^kMS-&I3)ycx|iv{T6Wx}9$$D&6{%1N_8 z_CLw)_9+O4&u94##vI9b-HHm_95m)fa??q07`DniVjAy`t7;)4NpeyAY(aAk(+T_O z1om+b5K2g_B&b2DCTK<>SE$Ode1DopAi)xaJjU>**AJK3hZrnhEQ9E`2=|HHe<^tv z63e(bn#fMWuz>4erc47}!J>U58%<&N<6AOAewyzNTqi7hJc|X{782&cM zHZYclNbBwU6673=!ClmxMfkC$(CykGR@10F!zN1Se83LR&a~$Ht&>~43OX22mt7tcZUpa;9@q}KDX3O&Ugp6< zLZLfIMO5;pTee1vNyVC$FGxzK2f>0Z-6hM82zKg44nWo|n}$Zk6&;5ry3`(JFEX$q zK&KivAe${e^5ZGc3a9hOt|!UOE&OocpVryE$Y4sPcs4rJ>>Kbi2_subQ9($2VN(3o zb~tEzMsHaBmBtaHAyES+d3A(qURgiskSSwUc9CfJ@99&MKp2sooSYZu+-0t0+L*!I zYagjOlPgx|lep9tiU%ts&McF6b0VE57%E0Ho%2oi?=Ks+5%aj#au^OBwNwhec zta6QAeQI^V!dF1C)>RHAmB`HnxyqWx?td@4sd15zPd*Fc9hpDXP23kbBenBxGeD$k z;%0VBQEJ-C)&dTAw_yW@k0u?IUk*NrkJ)(XEeI z9Y>6Vel>#s_v@=@0<{4A{pl=9cQ&Iah0iD0H`q)7NeCIRz8zx;! z^OO;1+IqoQNak&pV`qKW+K0^Hqp!~gSohcyS)?^P`JNZXw@gc6{A3OLZ?@1Uc^I2v z+X!^R*HCm3{7JPq{8*Tn>5;B|X7n4QQ0Bs79uTU%nbqOJh`nX(BVj!#f;#J+WZxx4 z_yM&1Y`2XzhfqkIMO7tB3raJKQS+H5F%o83bM+hxbQ zeeJm=Dvix$2j|b4?mDacb67v-1^lTp${z=jc1=j~QD>7c*@+1?py>%Kj%Ejp7Y-!? z8iYRUlGVrQPandAaxFfks53@2EC#0)%mrnmGRn&>=$H$S8q|kE_iWko4`^vCS2aWg z#!`RHUGyOt*k?bBYu3*j3u0gB#v(3tsije zgIuNNWNtrOkx@Pzs;A9un+2LX!zw+p3_NX^Sh09HZAf>m8l@O*rXy_82aWT$Q>iyy zqO7Of)D=wcSn!0+467&!Hl))eff=$aneB?R!YykdKW@k^_uR!+Q1tR)+IJb`-6=jj zymzA>Sv4>Z&g&WWu#|~GcP7qP&m*w-S$)7Xr;(duqCTe7p8H3k5>Y-n8438+%^9~K z3r^LIT_K{i7DgEJjIocw_6d0!<;wKT`X;&vv+&msmhAAnIe!OTdybPctzcEzBy88_ zWO{6i4YT%e4^WQZB)KHCvA(0tS zHu_Bg+6Ko%a9~$EjRB90`P(2~6uI@SFibxct{H#o&y40MdiXblu@VFXbhz>Nko;7R z70Ntmm-FePqhb%9gL+7U8@(ch|JfH5Fm)5${8|`Lef>LttM_iww6LW2X61ldBmG0z zax3y)njFe>j*T{i0s8D4=L>X^j0)({R5lMGVS#7(2C9@AxL&C-lZQx~czI7Iv+{%1 z2hEG>RzX4S8x3v#9sgGAnPzptM)g&LB}@%E>fy0vGSa(&q0ch|=ncKjNrK z`jA~jObJhrJ^ri|-)J^HUyeZXz~XkBp$VhcTEcTdc#a2EUOGVX?@mYx#Vy*!qO$Jv zQ4rgOJ~M*o-_Wptam=~krnmG*p^j!JAqoQ%+YsDFW7Cc9M%YPiBOrVcD^RY>m9Pd< zu}#9M?K{+;UIO!D9qOpq9yxUquQRmQNMo0pT`@$pVt=rMvyX)ph(-CCJLvUJy71DI zBk7oc7)-%ngdj~s@76Yse3L^gV0 z2==qfp&Q~L(+%RHP0n}+xH#k(hPRx(!AdBM$JCfJ5*C=K3ts>P?@@SZ_+{U2qFZb>4kZ{Go37{# zSQc+-dq*a-Vy4?taS&{Ht|MLRiS)Sn14JOONyXqPNnpq&2y~)6wEG0oNy>qvod$FF z`9o&?&6uZjhZ4_*5qWVrEfu(>_n2Xi2{@Gz9MZ8!YmjYvIMasE9yVQL10NBrTCczq zcTY1q^PF2l!Eraguf{+PtHV3=2A?Cu&NN&a8V(y;q(^_mFc6)%Yfn&X&~Pq zU1?qCj^LF(EQB1F`8NxNjyV%fde}dEa(Hx=r7$~ts2dzDwyi6ByBAIx$NllB4%K=O z$AHz1<2bTUb>(MCVPpK(E9wlLElo(aSd(Os)^Raum`d(g9Vd_+Bf&V;l=@mM=cC>) z)9b0enb)u_7V!!E_bl>u5nf&Rl|2r=2F3rHMdb7y9E}}F82^$Rf+P8%dKnOeKh1vs zhH^P*4Ydr^$)$h@4KVzxrHyy#cKmWEa9P5DJ|- zG;!Qi35Tp7XNj60=$!S6U#!(${6hyh7d4q=pF{`0t|N^|L^d8pD{O9@tF~W;#Je*P z&ah%W!KOIN;SyAEhAeTafJ4uEL`(RtnovM+cb(O#>xQnk?dzAjG^~4$dFn^<@-Na3 z395;wBnS{t*H;Jef2eE!2}u5Ns{AHj>WYZDgQJt8v%x?9{MXqJsGP|l%OiZqQ1aB! z%E=*Ig`(!tHh>}4_z5IMpg{49UvD*Pp9!pxt_gdAW%sIf3k6CTycOT1McPl=_#0?8 zVjz8Hj*Vy9c5-krd-{BQ{6Xy|P$6LJvMuX$* zA+@I_66_ET5l2&gk9n4$1M3LN8(yEViRx&mtd#LD}AqEs?RW=xKC(OCWH;~>(X6h!uDxXIPH06xh z*`F4cVlbDP`A)-fzf>MuScYsmq&1LUMGaQ3bRm6i7OsJ|%uhTDT zlvZA1M}nz*SalJWNT|`dBm1$xlaA>CCiQ zK`xD-RuEn>-`Z?M{1%@wewf#8?F|(@1e0+T4>nmlSRrNK5f)BJ2H*$q(H>zGD0>eL zQ!tl_Wk)k*e6v^m*{~A;@6+JGeWU-q9>?+L_#UNT%G?4&BnOgvm9@o7l?ov~XL+et zbGT)|G7)KAeqb=wHSPk+J1bdg7N3$vp(ekjI1D9V$G5Cj!=R2w=3*4!z*J-r-cyeb zd(i2KmX!|Lhey!snRw z?#$Gu%S^SQEKt&kep)up#j&9}e+3=JJBS(s>MH+|=R(`8xK{mmndWo_r`-w1#SeRD&YtAJ#GiVI*TkQZ}&aq<+bU2+coU3!jCI6E+Ad_xFW*ghnZ$q zAoF*i&3n1j#?B8x;kjSJD${1jdRB;)R*)Ao!9bd|C7{;iqDo|T&>KSh6*hCD!rwv= zyK#F@2+cv3=|S1Kef(E6Niv8kyLVLX&e=U;{0x{$tDfShqkjUME>f8d(5nzSkY6@! z^-0>DM)wa&%m#UF1F?zR`8Y3X#tA!*7Q$P3lZJ%*KNlrk_uaPkxw~ zxZ1qlE;Zo;nb@!SMazSjM>;34ROOoygo%SF);LL>rRonWwR>bmSd1XD^~sGSu$Gg# zFZ`|yKU0%!v07dz^v(tY%;So(e`o{ZYTX`hm;@b0%8|H>VW`*cr8R%3n|ehw2`(9B+V72`>SY}9^8oh$En80mZK9T4abVG*to;E z1_S6bgDOW?!Oy1LwYy=w3q~KKdbNtyH#d24PFjX)KYMY93{3-mPP-H>@M-_>N~DDu zENh~reh?JBAK=TFN-SfDfT^=+{w4ea2KNWXq2Y<;?(gf(FgVp8Zp-oEjKzB%2Iqj;48GmY3h=bcdYJ}~&4tS`Q1sb=^emaW$IC$|R+r-8V- zf0$gGE(CS_n4s>oicVk)MfvVg#I>iDvf~Ov8bk}sSxluG!6#^Z_zhB&U^`eIi1@j( z^CK$z^stBHtaDDHxn+R;3u+>Lil^}fj?7eaGB z&5nl^STqcaBxI@v>%zG|j))G(rVa4aY=B@^2{TFkW~YP!8!9TG#(-nOf^^X-%m9{Z zCC?iC`G-^RcBSCuk=Z`(FaUUe?hf3{0C>>$?Vs z`2Uud9M+T&KB6o4o9kvdi^Q=Bw!asPdxbe#W-Oaa#_NP(qpyF@bVxv5D5))srkU#m zj_KA+#7sqDn*Ipf!F5Byco4HOSd!Ui$l94|IbW%Ny(s1>f4|Mv^#NfB31N~kya9!k zWCGL-$0ZQztBate^fd>R!hXY_N9ZjYp3V~4_V z#eB)Kjr8yW=+oG)BuNdZG?jaZlw+l_ma8aET(s+-x+=F-t#Qoiuu1i`^x8Sj>b^U} zs^z<()YMFP7CmjUC@M=&lA5W7t&cxTlzJAts*%PBDAPuqcV5o7HEnqjif_7xGt)F% zGx2b4w{@!tE)$p=l3&?Bf#`+!-RLOleeRk3 z7#pF|w@6_sBmn1nECqdunmG^}pr5(ZJQVvAt$6p3H(16~;vO>?sTE`Y+mq5YP&PBo zvq!7#W$Gewy`;%6o^!Dtjz~x)T}Bdk*BS#=EY=ODD&B=V6TD2z^hj1m5^d6s)D*wk zu$z~D7QuZ2b?5`p)E8e2_L38v3WE{V`bVk;6fl#o2`) z99JsWhh?$oVRn@$S#)uK&8DL8>An0&S<%V8hnGD7Z^;Y(%6;^9!7kDQ5bjR_V+~wp zfx4m3z6CWmmZ<8gDGUyg3>t8wgJ5NkkiEm^(sedCicP^&3D%}6LtIUq>mXCAt{9eF zNXL$kGcoUTf_Lhm`t;hD-SE)m=iBnxRU(NyL}f6~1uH)`K!hmYZjLI%H}AmEF5RZt z06$wn63GHnApHXZZJ}s^s)j9(BM6e*7IBK6Bq(!)d~zR#rbxK9NVIlgquoMq z=eGZ9NR!SEqP6=9UQg#@!rtbbSBUM#ynF);zKX+|!Zm}*{H z+j=d?aZ2!?@EL7C~%B?6ouCKLnO$uWn;Y6Xz zX8dSwj732u(o*U3F$F=7xwxm>E-B+SVZH;O-4XPuPkLSt_?S0)lb7EEg)Mglk0#eS z9@jl(OnH4juMxY+*r03VDfPx_IM!Lmc(5hOI;`?d37f>jPP$?9jQQIQU@i4vuG6MagEoJrQ=RD7xt@8E;c zeGV*+Pt+t$@pt!|McETOE$9k=_C!70uhwRS9X#b%ZK z%q(TIUXSS^F0`4Cx?Rk07C6wI4!UVPeI~-fxY6`YH$kABdOuiRtl73MqG|~AzZ@iL&^s?24iS;RK_pdlWkhcF z@Wv-Om(Aealfg)D^adlXh9Nvf~Uf@y;g3Y)i(YP zEXDnb1V}1pJT5ZWyw=1i+0fni9yINurD=EqH^ciOwLUGi)C%Da)tyt=zq2P7pV5-G zR7!oq28-Fgn5pW|nlu^b!S1Z#r7!Wtr{5J5PQ>pd+2P7RSD?>(U7-|Y z7ZQ5lhYIl_IF<9?T9^IPK<(Hp;l5bl5tF9>X-zG14_7PfsA>6<$~A338iYRT{a@r_ zuXBaT=`T5x3=s&3=RYx6NgG>No4?5KFBVjE(swfcivcIpPQFx5l+O;fiGsOrl5teR z_Cm+;PW}O0Dwe_(4Z@XZ)O0W-v2X><&L*<~*q3dg;bQW3g7)a#3KiQP>+qj|qo*Hk z?57>f2?f@`=Fj^nkDKeRkN2d$Z@2eNKpHo}ksj-$`QKb6n?*$^*%Fb3_Kbf1(*W9K>{L$mud2WHJ=j0^=g30Xhg8$#g^?36`p1fm;;1@0Lrx+8t`?vN0ZorM zSW?rhjCE8$C|@p^sXdx z|NOHHg+fL;HIlqyLp~SSdIF`TnSHehNCU9t89yr@)FY<~hu+X`tjg(aSVae$wDG*C zq$nY(Y494R)hD!i1|IIyP*&PD_c2FPgeY)&mX1qujB1VHPG9`yFQpLFVQ0>EKS@Bp zAfP5`C(sWGLI?AC{XEjLKR4FVNw(4+9b?kba95ukgR1H?w<8F7)G+6&(zUhIE5Ef% z=fFkL3QKA~M@h{nzjRq!Y_t!%U66#L8!(2-GgFxkD1=JRRqk=n%G(yHKn%^&$dW>; zSjAcjETMz1%205se$iH_)ZCpfg_LwvnsZQAUCS#^FExp8O4CrJb6>JquNV@qPq~3A zZ<6dOU#6|8+fcgiA#~MDmcpIEaUO02L5#T$HV0$EMD94HT_eXLZ2Zi&(! z&5E>%&|FZ`)CN10tM%tLSPD*~r#--K(H-CZqIOb99_;m|D5wdgJ<1iOJz@h2Zkq?} z%8_KXb&hf=2Wza(Wgc;3v3TN*;HTU*q2?#z&tLn_U0Nt!y>Oo>+2T)He6%XuP;fgn z-G!#h$Y2`9>Jtf}hbVrm6D70|ERzLAU>3zoWhJmjWfgM^))T+2u$~5>HF9jQDkrXR z=IzX36)V75PrFjkQ%TO+iqKGCQ-DDXbaE;C#}!-CoWQx&v*vHfyI>$HNRbpvm<`O( zlx9NBWD6_e&J%Ous4yp~s6)Ghni!I6)0W;9(9$y1wWu`$gs<$9Mcf$L*piP zPR0Av*2%ul`W;?-1_-5Zy0~}?`e@Y5A&0H!^ApyVTT}BiOm4GeFo$_oPlDEyeGBbh z1h3q&Dx~GmUS|3@4V36&$2uO8!Yp&^pD7J5&TN{?xphf*-js1fP?B|`>p_K>lh{ij zP(?H%e}AIP?_i^f&Li=FDSQ`2_NWxL+BB=nQr=$ zHojMlXNGauvvwPU>ZLq!`bX-5F4jBJ&So{kE5+ms9UEYD{66!|k~3vsP+mE}x!>%P za98bAU0!h0&ka4EoiDvBM#CP#dRNdXJcb*(%=<(g+M@<)DZ!@v1V>;54En?igcHR2 zhubQMq}VSOK)onqHfczM7YA@s=9*ow;k;8)&?J3@0JiGcP! zP#00KZ1t)GyZeRJ=f0^gc+58lc4Qh*S7RqPIC6GugG1gXe$LIQMRCo8cHf^qXgAa2 z`}t>u2Cq1CbSEpLr~E=c7~=Qkc9-vLE%(v9N*&HF`(d~(0`iukl5aQ9u4rUvc8%m) zr2GwZN4!s;{SB87lJB;veebPmqE}tSpT>+`t?<457Q9iV$th%i__Z1kOMAswFldD6 ztbOvO337S5o#ZZgN2G99_AVqPv!?Gmt3pzgD+Hp3QPQ`9qJ(g=kjvD+fUSS3upJn! zqoG7acIKEFRX~S}3|{EWT$kdz#zrDlJU(rPkxjws_iyLKU8+v|*oS_W*-guAb&Pj1 z35Z`3z<&Jb@2Mwz=KXucNYdY#SNO$tcVFr9KdKm|%^e-TXzs6M`PBper%ajkrIyUe zp$vVxVs9*>Vp4_1NC~Zg)WOCPmOxI1V34QlG4!aSFOH{QqSVq1^1)- z0P!Z?tT&E-ll(pwf0?=F=yOzik=@nh1Clxr9}Vij89z)ePDSCYAqw?lVI?v?+&*zH z)p$CScFI8rrwId~`}9YWPFu0cW1Sf@vRELs&cbntRU6QfPK-SO*mqu|u~}8AJ!Q$z znzu}50O=YbjwKCuSVBs6&CZR#0FTu)3{}qJJYX(>QPr4$RqWiwX3NT~;>cLn*_&1H zaKpIW)JVJ>b{uo2oq>oQt3y=zJjb%fU@wLqM{SyaC6x2snMx-}ivfU<1- znu1Lh;i$3Tf$Kh5Uk))G!D1UhE8pvx&nO~w^fG)BC&L!_hQk%^p`Kp@F{cz>80W&T ziOK=Sq3fdRu*V0=S53rcIfWFazI}Twj63CG(jOB;$*b`*#B9uEnBM`hDk*EwSRdwP8?5T?xGUKs=5N83XsR*)a4|ijz|c{4tIU+4j^A5C<#5 z*$c_d=5ml~%pGxw#?*q9N7aRwPux5EyqHVkdJO=5J>84!X6P>DS8PTTz>7C#FO?k#edkntG+fJk8ZMn?pmJSO@`x-QHq;7^h6GEXLXo1TCNhH z8ZDH{*NLAjo3WM`xeb=X{((uv3H(8&r8fJJg_uSs_%hOH%JDD?hu*2NvWGYD+j)&` zz#_1%O1wF^o5ryt?O0n;`lHbzp0wQ?rcbW(F1+h7_EZZ9{>rePvLAPVZ_R|n@;b$;UchU=0j<6k8G9QuQf@76oiE*4 zXOLQ&n3$NR#p4<5NJMVC*S);5x2)eRbaAM%VxWu9ohlT;pGEk7;002enCbQ>2r-us z3#bpXP9g|mE`65VrN`+3mC)M(eMj~~eOf)do<@l+fMiTR)XO}422*1SL{wyY(%oMpBgJagtiDf zz>O6(m;};>Hi=t8o{DVC@YigqS(Qh+ix3Rwa9aliH}a}IlOCW1@?%h_bRbq-W{KHF z%Vo?-j@{Xi@=~Lz5uZP27==UGE15|g^0gzD|3x)SCEXrx`*MP^FDLl%pOi~~Il;dc z^hrwp9sYeT7iZ)-ajKy@{a`kr0-5*_!XfBpXwEcFGJ;%kV$0Nx;apKrur zJN2J~CAv{Zjj%FolyurtW8RaFmpn&zKJWL>(0;;+q(%(Hx!GMW4AcfP0YJ*Vz!F4g z!ZhMyj$BdXL@MlF%KeInmPCt~9&A!;cRw)W!Hi@0DY(GD_f?jeV{=s=cJ6e}JktJw zQORnxxj3mBxfrH=x{`_^Z1ddDh}L#V7i}$njUFRVwOX?qOTKjfPMBO4y(WiU<)epb zvB9L=%jW#*SL|Nd_G?E*_h1^M-$PG6Pc_&QqF0O-FIOpa4)PAEPsyvB)GKasmBoEt z?_Q2~QCYGH+hW31x-B=@5_AN870vY#KB~3a*&{I=f);3Kv7q4Q7s)0)gVYx2#Iz9g(F2;=+Iy4 z6KI^8GJ6D@%tpS^8boU}zpi=+(5GfIR)35PzrbuXeL1Y1N%JK7PG|^2k3qIqHfX;G zQ}~JZ-UWx|60P5?d1e;AHx!_;#PG%d=^X(AR%i`l0jSpYOpXoKFW~7ip7|xvN;2^? zsYC9fanpO7rO=V7+KXqVc;Q5z%Bj})xHVrgoR04sA2 zl~DAwv=!(()DvH*=lyhIlU^hBkA0$e*7&fJpB0|oB7)rqGK#5##2T`@_I^|O2x4GO z;xh6ROcV<9>?e0)MI(y++$-ksV;G;Xe`lh76T#Htuia+(UrIXrf9?

L(tZ$0BqX1>24?V$S+&kLZ`AodQ4_)P#Q3*4xg8}lMV-FLwC*cN$< zt65Rf%7z41u^i=P*qO8>JqXPrinQFapR7qHAtp~&RZ85$>ob|Js;GS^y;S{XnGiBc zGa4IGvDl?x%gY`vNhv8wgZnP#UYI-w*^4YCZnxkF85@ldepk$&$#3EAhrJY0U)lR{F6sM3SONV^+$;Zx8BD&Eku3K zKNLZyBni3)pGzU0;n(X@1fX8wYGKYMpLmCu{N5-}epPDxClPFK#A@02WM3!myN%bkF z|GJ4GZ}3sL{3{qXemy+#Uk{4>Kf8v11;f8I&c76+B&AQ8udd<8gU7+BeWC`akUU~U zgXoxie>MS@rBoyY8O8Tc&8id!w+_ooxcr!1?#rc$-|SBBtH6S?)1e#P#S?jFZ8u-Bs&k`yLqW|{j+%c#A4AQ>+tj$Y z^CZajspu$F%73E68Lw5q7IVREED9r1Ijsg#@DzH>wKseye>hjsk^{n0g?3+gs@7`i zHx+-!sjLx^fS;fY!ERBU+Q zVJ!e0hJH%P)z!y%1^ZyG0>PN@5W~SV%f>}c?$H8r;Sy-ui>aruVTY=bHe}$e zi&Q4&XK!qT7-XjCrDaufT@>ieQ&4G(SShUob0Q>Gznep9fR783jGuUynAqc6$pYX; z7*O@@JW>O6lKIk0G00xsm|=*UVTQBB`u1f=6wGAj%nHK_;Aqmfa!eAykDmi-@u%6~ z;*c!pS1@V8r@IX9j&rW&d*}wpNs96O2Ute>%yt{yv>k!6zfT6pru{F1M3P z2WN1JDYqoTB#(`kE{H676QOoX`cnqHl1Yaru)>8Ky~VU{)r#{&s86Vz5X)v15ULHA zAZDb{99+s~qI6;-dQ5DBjHJP@GYTwn;Dv&9kE<0R!d z8tf1oq$kO`_sV(NHOSbMwr=To4r^X$`sBW4$gWUov|WY?xccQJN}1DOL|GEaD_!@& z15p?Pj+>7d`@LvNIu9*^hPN)pwcv|akvYYq)ks%`G>!+!pW{-iXPZsRp8 z35LR;DhseQKWYSD`%gO&k$Dj6_6q#vjWA}rZcWtQr=Xn*)kJ9kacA=esi*I<)1>w^ zO_+E>QvjP)qiSZg9M|GNeLtO2D7xT6vsj`88sd!94j^AqxFLi}@w9!Y*?nwWARE0P znuI_7A-saQ+%?MFA$gttMV-NAR^#tjl_e{R$N8t2NbOlX373>e7Ox=l=;y#;M7asp zRCz*CLnrm$esvSb5{T<$6CjY zmZ(i{Rs_<#pWW>(HPaaYj`%YqBra=Ey3R21O7vUbzOkJJO?V`4-D*u4$Me0Bx$K(lYo`JO}gnC zx`V}a7m-hLU9Xvb@K2ymioF)vj12<*^oAqRuG_4u%(ah?+go%$kOpfb`T96P+L$4> zQ#S+sA%VbH&mD1k5Ak7^^dZoC>`1L%i>ZXmooA!%GI)b+$D&ziKrb)a=-ds9xk#~& z7)3iem6I|r5+ZrTRe_W861x8JpD`DDIYZNm{$baw+$)X^Jtjnl0xlBgdnNY}x%5za zkQ8E6T<^$sKBPtL4(1zi_Rd(tVth*3Xs!ulflX+70?gb&jRTnI8l+*Aj9{|d%qLZ+ z>~V9Z;)`8-lds*Zgs~z1?Fg?Po7|FDl(Ce<*c^2=lFQ~ahwh6rqSjtM5+$GT>3WZW zj;u~w9xwAhOc<kF}~`CJ68 z?(S5vNJa;kriPlim33{N5`C{9?NWhzsna_~^|K2k4xz1`xcui*LXL-1#Y}Hi9`Oo!zQ>x-kgAX4LrPz63uZ+?uG*84@PKq-KgQlMNRwz=6Yes) zY}>YN+qP}nwr$(CZQFjUOI=-6J$2^XGvC~EZ+vrqWaOXB$k?%Suf5k=4>AveC1aJ! ziaW4IS%F$_Babi)kA8Y&u4F7E%99OPtm=vzw$$ zEz#9rvn`Iot_z-r3MtV>k)YvErZ<^Oa${`2>MYYODSr6?QZu+be-~MBjwPGdMvGd!b!elsdi4% z`37W*8+OGulab8YM?`KjJ8e+jM(tqLKSS@=jimq3)Ea2EB%88L8CaM+aG7;27b?5` z4zuUWBr)f)k2o&xg{iZ$IQkJ+SK>lpq4GEacu~eOW4yNFLU!Kgc{w4&D$4ecm0f}~ zTTzquRW@`f0}|IILl`!1P+;69g^upiPA6F{)U8)muWHzexRenBU$E^9X-uIY2%&1w z_=#5*(nmxJ9zF%styBwivi)?#KMG96-H@hD-H_&EZiRNsfk7mjBq{L%!E;Sqn!mVX*}kXhwH6eh;b42eD!*~upVG@ z#smUqz$ICm!Y8wY53gJeS|Iuard0=;k5i5Z_hSIs6tr)R4n*r*rE`>38Pw&lkv{_r!jNN=;#?WbMj|l>cU(9trCq; z%nN~r^y7!kH^GPOf3R}?dDhO=v^3BeP5hF|%4GNQYBSwz;x({21i4OQY->1G=KFyu z&6d`f2tT9Yl_Z8YACZaJ#v#-(gcyeqXMhYGXb=t>)M@fFa8tHp2x;ODX=Ap@a5I=U z0G80^$N0G4=U(>W%mrrThl0DjyQ-_I>+1Tdd_AuB3qpYAqY54upwa3}owa|x5iQ^1 zEf|iTZxKNGRpI>34EwkIQ2zHDEZ=(J@lRaOH>F|2Z%V_t56Km$PUYu^xA5#5Uj4I4RGqHD56xT%H{+P8Ag>e_3pN$4m8n>i%OyJFPNWaEnJ4McUZPa1QmOh?t8~n& z&RulPCors8wUaqMHECG=IhB(-tU2XvHP6#NrLVyKG%Ee*mQ5Ps%wW?mcnriTVRc4J`2YVM>$ixSF2Xi+Wn(RUZnV?mJ?GRdw%lhZ+t&3s7g!~g{%m&i<6 z5{ib-<==DYG93I(yhyv4jp*y3#*WNuDUf6`vTM%c&hiayf(%=x@4$kJ!W4MtYcE#1 zHM?3xw63;L%x3drtd?jot!8u3qeqctceX3m;tWetK+>~q7Be$h>n6riK(5@ujLgRS zvOym)k+VAtyV^mF)$29Y`nw&ijdg~jYpkx%*^ z8dz`C*g=I?;clyi5|!27e2AuSa$&%UyR(J3W!A=ZgHF9OuKA34I-1U~pyD!KuRkjA zbkN!?MfQOeN>DUPBxoy5IX}@vw`EEB->q!)8fRl_mqUVuRu|C@KD-;yl=yKc=ZT0% zB$fMwcC|HE*0f8+PVlWHi>M`zfsA(NQFET?LrM^pPcw`cK+Mo0%8*x8@65=CS_^$cG{GZQ#xv($7J z??R$P)nPLodI;P!IC3eEYEHh7TV@opr#*)6A-;EU2XuogHvC;;k1aI8asq7ovoP!* z?x%UoPrZjj<&&aWpsbr>J$Er-7!E(BmOyEv!-mbGQGeJm-U2J>74>o5x`1l;)+P&~ z>}f^=Rx(ZQ2bm+YE0u=ZYrAV@apyt=v1wb?R@`i_g64YyAwcOUl=C!i>=Lzb$`tjv zOO-P#A+)t-JbbotGMT}arNhJmmGl-lyUpMn=2UacVZxmiG!s!6H39@~&uVokS zG=5qWhfW-WOI9g4!R$n7!|ViL!|v3G?GN6HR0Pt_L5*>D#FEj5wM1DScz4Jv@Sxnl zB@MPPmdI{(2D?;*wd>3#tjAirmUnQoZrVv`xM3hARuJksF(Q)wd4P$88fGYOT1p6U z`AHSN!`St}}UMBT9o7i|G`r$ zrB=s$qV3d6$W9@?L!pl0lf%)xs%1ko^=QY$ty-57=55PvP(^6E7cc zGJ*>m2=;fOj?F~yBf@K@9qwX0hA803Xw+b0m}+#a(>RyR8}*Y<4b+kpp|OS+!whP( zH`v{%s>jsQI9rd$*vm)EkwOm#W_-rLTHcZRek)>AtF+~<(did)*oR1|&~1|e36d-d zgtm5cv1O0oqgWC%Et@P4Vhm}Ndl(Y#C^MD03g#PH-TFy+7!Osv1z^UWS9@%JhswEq~6kSr2DITo59+; ze=ZC}i2Q?CJ~Iyu?vn|=9iKV>4j8KbxhE4&!@SQ^dVa-gK@YfS9xT(0kpW*EDjYUkoj! zE49{7H&E}k%5(>sM4uGY)Q*&3>{aitqdNnRJkbOmD5Mp5rv-hxzOn80QsG=HJ_atI-EaP69cacR)Uvh{G5dTpYG7d zbtmRMq@Sexey)||UpnZ?;g_KMZq4IDCy5}@u!5&B^-=6yyY{}e4Hh3ee!ZWtL*s?G zxG(A!<9o!CL+q?u_utltPMk+hn?N2@?}xU0KlYg?Jco{Yf@|mSGC<(Zj^yHCvhmyx z?OxOYoxbptDK()tsJ42VzXdINAMWL$0Gcw?G(g8TMB)Khw_|v9`_ql#pRd2i*?CZl z7k1b!jQB=9-V@h%;Cnl7EKi;Y^&NhU0mWEcj8B|3L30Ku#-9389Q+(Yet0r$F=+3p z6AKOMAIi|OHyzlHZtOm73}|ntKtFaXF2Fy|M!gOh^L4^62kGUoWS1i{9gsds_GWBc zLw|TaLP64z3z9?=R2|T6Xh2W4_F*$cq>MtXMOy&=IPIJ`;!Tw?PqvI2b*U1)25^<2 zU_ZPoxg_V0tngA0J+mm?3;OYw{i2Zb4x}NedZug!>EoN3DC{1i)Z{Z4m*(y{ov2%- zk(w>+scOO}MN!exSc`TN)!B=NUX`zThWO~M*ohqq;J2hx9h9}|s#?@eR!=F{QTrq~ zTcY|>azkCe$|Q0XFUdpFT=lTcyW##i;-e{}ORB4D?t@SfqGo_cS z->?^rh$<&n9DL!CF+h?LMZRi)qju!meugvxX*&jfD!^1XB3?E?HnwHP8$;uX{Rvp# zh|)hM>XDv$ZGg=$1{+_bA~u-vXqlw6NH=nkpyWE0u}LQjF-3NhATL@9rRxMnpO%f7 z)EhZf{PF|mKIMFxnC?*78(}{Y)}iztV12}_OXffJ;ta!fcFIVjdchyHxH=t%ci`Xd zX2AUB?%?poD6Zv*&BA!6c5S#|xn~DK01#XvjT!w!;&`lDXSJT4_j$}!qSPrb37vc{ z9^NfC%QvPu@vlxaZ;mIbn-VHA6miwi8qJ~V;pTZkKqqOii<1Cs}0i?uUIss;hM4dKq^1O35y?Yp=l4i zf{M!@QHH~rJ&X~8uATV><23zZUbs-J^3}$IvV_ANLS08>k`Td7aU_S1sLsfi*C-m1 z-e#S%UGs4E!;CeBT@9}aaI)qR-6NU@kvS#0r`g&UWg?fC7|b^_HyCE!8}nyh^~o@< zpm7PDFs9yxp+byMS(JWm$NeL?DNrMCNE!I^ko-*csB+dsf4GAq{=6sfyf4wb>?v1v zmb`F*bN1KUx-`ra1+TJ37bXNP%`-Fd`vVQFTwWpX@;s(%nDQa#oWhgk#mYlY*!d>( zE&!|ySF!mIyfING+#%RDY3IBH_fW$}6~1%!G`suHub1kP@&DoAd5~7J55;5_noPI6eLf{t;@9Kf<{aO0`1WNKd?<)C-|?C?)3s z>wEq@8=I$Wc~Mt$o;g++5qR+(6wt9GI~pyrDJ%c?gPZe)owvy^J2S=+M^ z&WhIE`g;;J^xQLVeCtf7b%Dg#Z2gq9hp_%g)-%_`y*zb; zn9`f`mUPN-Ts&fFo(aNTsXPA|J!TJ{0hZp0^;MYHLOcD=r_~~^ymS8KLCSeU3;^QzJNqS z5{5rEAv#l(X?bvwxpU;2%pQftF`YFgrD1jt2^~Mt^~G>T*}A$yZc@(k9orlCGv&|1 zWWvVgiJsCAtamuAYT~nzs?TQFt<1LSEx!@e0~@yd6$b5!Zm(FpBl;(Cn>2vF?k zOm#TTjFwd2D-CyA!mqR^?#Uwm{NBemP>(pHmM}9;;8`c&+_o3#E5m)JzfwN?(f-a4 zyd%xZc^oQx3XT?vcCqCX&Qrk~nu;fxs@JUoyVoi5fqpi&bUhQ2y!Ok2pzsFR(M(|U zw3E+kH_zmTRQ9dUMZWRE%Zakiwc+lgv7Z%|YO9YxAy`y28`Aw;WU6HXBgU7fl@dnt z-fFBV)}H-gqP!1;V@Je$WcbYre|dRdp{xt!7sL3Eoa%IA`5CAA%;Wq8PktwPdULo! z8!sB}Qt8#jH9Sh}QiUtEPZ6H0b*7qEKGJ%ITZ|vH)5Q^2m<7o3#Z>AKc%z7_u`rXA zqrCy{-{8;9>dfllLu$^M5L z-hXs))h*qz%~ActwkIA(qOVBZl2v4lwbM>9l70Y`+T*elINFqt#>OaVWoja8RMsep z6Or3f=oBnA3vDbn*+HNZP?8LsH2MY)x%c13@(XfuGR}R?Nu<|07{$+Lc3$Uv^I!MQ z>6qWgd-=aG2Y^24g4{Bw9ueOR)(9h`scImD=86dD+MnSN4$6 z^U*o_mE-6Rk~Dp!ANp#5RE9n*LG(Vg`1)g6!(XtDzsov$Dvz|Gv1WU68J$CkshQhS zCrc|cdkW~UK}5NeaWj^F4MSgFM+@fJd{|LLM)}_O<{rj z+?*Lm?owq?IzC%U%9EBga~h-cJbIu=#C}XuWN>OLrc%M@Gu~kFEYUi4EC6l#PR2JS zQUkGKrrS#6H7}2l0F@S11DP`@pih0WRkRJl#F;u{c&ZC{^$Z+_*lB)r)-bPgRFE;* zl)@hK4`tEP=P=il02x7-C7p%l=B`vkYjw?YhdJU9!P!jcmY$OtC^12w?vy3<<=tlY zUwHJ_0lgWN9vf>1%WACBD{UT)1qHQSE2%z|JHvP{#INr13jM}oYv_5#xsnv9`)UAO zuwgyV4YZ;O)eSc3(mka6=aRohi!HH@I#xq7kng?Acdg7S4vDJb6cI5fw?2z%3yR+| zU5v@Hm}vy;${cBp&@D=HQ9j7NcFaOYL zj-wV=eYF{|XTkFNM2uz&T8uH~;)^Zo!=KP)EVyH6s9l1~4m}N%XzPpduPg|h-&lL` zAXspR0YMOKd2yO)eMFFJ4?sQ&!`dF&!|niH*!^*Ml##o0M(0*uK9&yzekFi$+mP9s z>W9d%Jb)PtVi&-Ha!o~Iyh@KRuKpQ@)I~L*d`{O8!kRObjO7=n+Gp36fe!66neh+7 zW*l^0tTKjLLzr`x4`_8&on?mjW-PzheTNox8Hg7Nt@*SbE-%kP2hWYmHu#Fn@Q^J(SsPUz*|EgOoZ6byg3ew88UGdZ>9B2Tq=jF72ZaR=4u%1A6Vm{O#?@dD!(#tmR;eP(Fu z{$0O%=Vmua7=Gjr8nY%>ul?w=FJ76O2js&17W_iq2*tb!i{pt#`qZB#im9Rl>?t?0c zicIC}et_4d+CpVPx)i4~$u6N-QX3H77ez z?ZdvXifFk|*F8~L(W$OWM~r`pSk5}#F?j_5u$Obu9lDWIknO^AGu+Blk7!9Sb;NjS zncZA?qtASdNtzQ>z7N871IsPAk^CC?iIL}+{K|F@BuG2>qQ;_RUYV#>hHO(HUPpk@ z(bn~4|F_jiZi}Sad;_7`#4}EmD<1EiIxa48QjUuR?rC}^HRocq`OQPM@aHVKP9E#q zy%6bmHygCpIddPjE}q_DPC`VH_2m;Eey&ZH)E6xGeStOK7H)#+9y!%-Hm|QF6w#A( zIC0Yw%9j$s-#odxG~C*^MZ?M<+&WJ+@?B_QPUyTg9DJGtQN#NIC&-XddRsf3n^AL6 zT@P|H;PvN;ZpL0iv$bRb7|J{0o!Hq+S>_NrH4@coZtBJu#g8#CbR7|#?6uxi8d+$g z87apN>EciJZ`%Zv2**_uiET9Vk{pny&My;+WfGDw4EVL#B!Wiw&M|A8f1A@ z(yFQS6jfbH{b8Z-S7D2?Ixl`j0{+ZnpT=;KzVMLW{B$`N?Gw^Fl0H6lT61%T2AU**!sX0u?|I(yoy&Xveg7XBL&+>n6jd1##6d>TxE*Vj=8lWiG$4=u{1UbAa5QD>5_ z;Te^42v7K6Mmu4IWT6Rnm>oxrl~b<~^e3vbj-GCdHLIB_>59}Ya+~OF68NiH=?}2o zP(X7EN=quQn&)fK>M&kqF|<_*H`}c zk=+x)GU>{Af#vx&s?`UKUsz})g^Pc&?Ka@t5$n$bqf6{r1>#mWx6Ep>9|A}VmWRnowVo`OyCr^fHsf# zQjQ3Ttp7y#iQY8l`zEUW)(@gGQdt(~rkxlkefskT(t%@i8=|p1Y9Dc5bc+z#n$s13 zGJk|V0+&Ekh(F};PJzQKKo+FG@KV8a<$gmNSD;7rd_nRdc%?9)p!|B-@P~kxQG}~B zi|{0}@}zKC(rlFUYp*dO1RuvPC^DQOkX4<+EwvBAC{IZQdYxoq1Za!MW7%p7gGr=j zzWnAq%)^O2$eItftC#TTSArUyL$U54-O7e|)4_7%Q^2tZ^0-d&3J1}qCzR4dWX!)4 zzIEKjgnYgMus^>6uw4Jm8ga6>GBtMjpNRJ6CP~W=37~||gMo_p@GA@#-3)+cVYnU> zE5=Y4kzl+EbEh%dhQokB{gqNDqx%5*qBusWV%!iprn$S!;oN_6E3?0+umADVs4ako z?P+t?m?};gev9JXQ#Q&KBpzkHPde_CGu-y z<{}RRAx=xlv#mVi+Ibrgx~ujW$h{?zPfhz)Kp7kmYS&_|97b&H&1;J-mzrBWAvY} zh8-I8hl_RK2+nnf&}!W0P+>5?#?7>npshe<1~&l_xqKd0_>dl_^RMRq@-Myz&|TKZBj1=Q()) zF{dBjv5)h=&Z)Aevx}+i|7=R9rG^Di!sa)sZCl&ctX4&LScQ-kMncgO(9o6W6)yd< z@Rk!vkja*X_N3H=BavGoR0@u0<}m-7|2v!0+2h~S2Q&a=lTH91OJsvms2MT~ zY=c@LO5i`mLpBd(vh|)I&^A3TQLtr>w=zoyzTd=^f@TPu&+*2MtqE$Avf>l>}V|3-8Fp2hzo3y<)hr_|NO(&oSD z!vEjTWBxbKTiShVl-U{n*B3#)3a8$`{~Pk}J@elZ=>Pqp|MQ}jrGv7KrNcjW%TN_< zZz8kG{#}XoeWf7qY?D)L)8?Q-b@Na&>i=)(@uNo zr;cH98T3$Iau8Hn*@vXi{A@YehxDE2zX~o+RY`)6-X{8~hMpc#C`|8y> zU8Mnv5A0dNCf{Ims*|l-^ z(MRp{qoGohB34|ggDI*p!Aw|MFyJ|v+<+E3brfrI)|+l3W~CQLPbnF@G0)P~Ly!1TJLp}xh8uW`Q+RB-v`MRYZ9Gam3cM%{ zb4Cb*f)0deR~wtNb*8w-LlIF>kc7DAv>T0D(a3@l`k4TFnrO+g9XH7;nYOHxjc4lq zMmaW6qpgAgy)MckYMhl?>sq;-1E)-1llUneeA!ya9KM$)DaNGu57Z5aE>=VST$#vb zFo=uRHr$0M{-ha>h(D_boS4zId;3B|Tpqo|?B?Z@I?G(?&Iei+-{9L_A9=h=Qfn-U z1wIUnQe9!z%_j$F_{rf&`ZFSott09gY~qrf@g3O=Y>vzAnXCyL!@(BqWa)Zqt!#_k zfZHuwS52|&&)aK;CHq9V-t9qt0au{$#6c*R#e5n3rje0hic7c7m{kW$p(_`wB=Gw7 z4k`1Hi;Mc@yA7dp@r~?@rfw)TkjAW++|pkfOG}0N|2guek}j8Zen(!+@7?qt_7ndX zB=BG6WJ31#F3#Vk3=aQr8T)3`{=p9nBHlKzE0I@v`{vJ}h8pd6vby&VgFhzH|q;=aonunAXL6G2y(X^CtAhWr*jI zGjpY@raZDQkg*aMq}Ni6cRF z{oWv}5`nhSAv>usX}m^GHt`f(t8@zHc?K|y5Zi=4G*UG1Sza{$Dpj%X8 zzEXaKT5N6F5j4J|w#qlZP!zS7BT)9b+!ZSJdToqJts1c!)fwih4d31vfb{}W)EgcA zH2pZ^8_k$9+WD2n`6q5XbOy8>3pcYH9 z07eUB+p}YD@AH!}p!iKv><2QF-Y^&xx^PAc1F13A{nUeCDg&{hnix#FiO!fe(^&%Qcux!h znu*S!s$&nnkeotYsDthh1dq(iQrE|#f_=xVgfiiL&-5eAcC-> z5L0l|DVEM$#ulf{bj+Y~7iD)j<~O8CYM8GW)dQGq)!mck)FqoL^X zwNdZb3->hFrbHFm?hLvut-*uK?zXn3q1z|UX{RZ;-WiLoOjnle!xs+W0-8D)kjU#R z+S|A^HkRg$Ij%N4v~k`jyHffKaC~=wg=9)V5h=|kLQ@;^W!o2^K+xG&2n`XCd>OY5Ydi= zgHH=lgy++erK8&+YeTl7VNyVm9-GfONlSlVb3)V9NW5tT!cJ8d7X)!b-$fb!s76{t z@d=Vg-5K_sqHA@Zx-L_}wVnc@L@GL9_K~Zl(h5@AR#FAiKad8~KeWCo@mgXIQ#~u{ zgYFwNz}2b6Vu@CP0XoqJ+dm8px(5W5-Jpis97F`+KM)TuP*X8H@zwiVKDKGVp59pI zifNHZr|B+PG|7|Y<*tqap0CvG7tbR1R>jn70t1X`XJixiMVcHf%Ez*=xm1(CrTSDt z0cle!+{8*Ja&EOZ4@$qhBuKQ$U95Q%rc7tg$VRhk?3=pE&n+T3upZg^ZJc9~c2es% zh7>+|mrmA-p&v}|OtxqmHIBgUxL~^0+cpfkSK2mhh+4b=^F1Xgd2)}U*Yp+H?ls#z zrLxWg_hm}AfK2XYWr!rzW4g;+^^&bW%LmbtRai9f3PjU${r@n`JThy-cphbcwn)rq9{A$Ht`lmYKxOacy z6v2R(?gHhD5@&kB-Eg?4!hAoD7~(h>(R!s1c1Hx#s9vGPePUR|of32bS`J5U5w{F) z>0<^ktO2UHg<0{oxkdOQ;}coZDQph8p6ruj*_?uqURCMTac;>T#v+l1Tc~%^k-Vd@ zkc5y35jVNc49vZpZx;gG$h{%yslDI%Lqga1&&;mN{Ush1c7p>7e-(zp}6E7f-XmJb4nhk zb8zS+{IVbL$QVF8pf8}~kQ|dHJAEATmmnrb_wLG}-yHe>W|A&Y|;muy-d^t^<&)g5SJfaTH@P1%euONny=mxo+C z4N&w#biWY41r8k~468tvuYVh&XN&d#%QtIf9;iVXfWY)#j=l`&B~lqDT@28+Y!0E+MkfC}}H*#(WKKdJJq=O$vNYCb(ZG@p{fJgu;h z21oHQ(14?LeT>n5)s;uD@5&ohU!@wX8w*lB6i@GEH0pM>YTG+RAIWZD;4#F1&F%Jp zXZUml2sH0!lYJT?&sA!qwez6cXzJEd(1ZC~kT5kZSp7(@=H2$Azb_*W&6aA|9iwCL zdX7Q=42;@dspHDwYE?miGX#L^3xD&%BI&fN9^;`v4OjQXPBaBmOF1;#C)8XA(WFlH zycro;DS2?(G&6wkr6rqC>rqDv3nfGw3hmN_9Al>TgvmGsL8_hXx09};l9Ow@)F5@y z#VH5WigLDwZE4nh^7&@g{1FV^UZ%_LJ-s<{HN*2R$OPg@R~Z`c-ET*2}XB@9xvAjrK&hS=f|R8Gr9 zr|0TGOsI7RD+4+2{ZiwdVD@2zmg~g@^D--YL;6UYGSM8i$NbQr4!c7T9rg!8;TM0E zT#@?&S=t>GQm)*ua|?TLT2ktj#`|R<_*FAkOu2Pz$wEc%-=Y9V*$&dg+wIei3b*O8 z2|m$!jJG!J!ZGbbIa!(Af~oSyZV+~M1qGvelMzPNE_%5?c2>;MeeG2^N?JDKjFYCy z7SbPWH-$cWF9~fX%9~v99L!G(wi!PFp>rB!9xj7=Cv|F+7CsGNwY0Q_J%FID%C^CBZQfJ9K(HK%k31j~e#&?hQ zNuD6gRkVckU)v+53-fc} z7ZCzYN-5RG4H7;>>Hg?LU9&5_aua?A0)0dpew1#MMlu)LHe(M;OHjHIUl7|%%)YPo z0cBk;AOY00%Fe6heoN*$(b<)Cd#^8Iu;-2v@>cE-OB$icUF9EEoaC&q8z9}jMTT2I z8`9;jT%z0;dy4!8U;GW{i`)3!c6&oWY`J3669C!tM<5nQFFrFRglU8f)5Op$GtR-3 zn!+SPCw|04sv?%YZ(a7#L?vsdr7ss@WKAw&A*}-1S|9~cL%uA+E~>N6QklFE>8W|% zyX-qAUGTY1hQ-+um`2|&ji0cY*(qN!zp{YpDO-r>jPk*yuVSay<)cUt`t@&FPF_&$ zcHwu1(SQ`I-l8~vYyUxm@D1UEdFJ$f5Sw^HPH7b!9 zzYT3gKMF((N(v0#4f_jPfVZ=ApN^jQJe-X$`A?X+vWjLn_%31KXE*}5_}d8 zw_B1+a#6T1?>M{ronLbHIlEsMf93muJ7AH5h%;i99<~JX^;EAgEB1uHralD*!aJ@F zV2ruuFe9i2Q1C?^^kmVy921eb=tLDD43@-AgL^rQ3IO9%+vi_&R2^dpr}x{bCVPej z7G0-0o64uyWNtr*loIvslyo0%)KSDDKjfThe0hcqs)(C-MH1>bNGBDRTW~scy_{w} zp^aq8Qb!h9Lwielq%C1b8=?Z=&U)ST&PHbS)8Xzjh2DF?d{iAv)Eh)wsUnf>UtXN( zL7=$%YrZ#|^c{MYmhn!zV#t*(jdmYdCpwqpZ{v&L8KIuKn`@IIZfp!uo}c;7J57N` zAxyZ-uA4=Gzl~Ovycz%MW9ZL7N+nRo&1cfNn9(1H5eM;V_4Z_qVann7F>5f>%{rf= zPBZFaV@_Sobl?Fy&KXyzFDV*FIdhS5`Uc~S^Gjo)aiTHgn#<0C=9o-a-}@}xDor;D zZyZ|fvf;+=3MZd>SR1F^F`RJEZo+|MdyJYQAEauKu%WDol~ayrGU3zzbHKsnHKZ*z zFiwUkL@DZ>!*x05ql&EBq@_Vqv83&?@~q5?lVmffQZ+V-=qL+!u4Xs2Z2zdCQ3U7B&QR9_Iggy} z(om{Y9eU;IPe`+p1ifLx-XWh?wI)xU9ik+m#g&pGdB5Bi<`PR*?92lE0+TkRuXI)z z5LP!N2+tTc%cB6B1F-!fj#}>S!vnpgVU~3!*U1ej^)vjUH4s-bd^%B=ItQqDCGbrEzNQi(dJ`J}-U=2{7-d zK8k^Rlq2N#0G?9&1?HSle2vlkj^KWSBYTwx`2?9TU_DX#J+f+qLiZCqY1TXHFxXZqYMuD@RU$TgcnCC{_(vwZ-*uX)~go#%PK z@}2Km_5aQ~(<3cXeJN6|F8X_1@L%@xTzs}$_*E|a^_URF_qcF;Pfhoe?FTFwvjm1o z8onf@OY@jC2tVcMaZS;|T!Ks(wOgPpRzRnFS-^RZ4E!9dsnj9sFt609a|jJbb1Dt@ z<=Gal2jDEupxUSwWu6zp<<&RnAA;d&4gKVG0iu6g(DsST(4)z6R)zDpfaQ}v{5ARt zyhwvMtF%b-YazR5XLz+oh=mn;y-Mf2a8>7?2v8qX;19y?b>Z5laGHvzH;Nu9S`B8} zI)qN$GbXIQ1VL3lnof^6TS~rvPVg4V?Dl2Bb*K2z4E{5vy<(@@K_cN@U>R!>aUIRnb zL*)=787*cs#zb31zBC49x$`=fkQbMAef)L2$dR{)6BAz!t5U_B#1zZG`^neKSS22oJ#5B=gl%U=WeqL9REF2g zZnfCb0?quf?Ztj$VXvDSWoK`0L=Zxem2q}!XWLoT-kYMOx)!7fcgT35uC~0pySEme z`{wGWTkGr7>+Kb^n;W?BZH6ZP(9tQX%-7zF>vc2}LuWDI(9kh1G#7B99r4x6;_-V+k&c{nPUrR zAXJGRiMe~aup{0qzmLNjS_BC4cB#sXjckx{%_c&^xy{M61xEb>KW_AG5VFXUOjAG4 z^>Qlm9A#1N{4snY=(AmWzatb!ngqiqPbBZ7>Uhb3)dTkSGcL#&SH>iMO-IJBPua`u zo)LWZ>=NZLr758j{%(|uQuZ)pXq_4c!!>s|aDM9#`~1bzK3J1^^D#<2bNCccH7~-X}Ggi!pIIF>uFx%aPARGQsnC8ZQc8lrQ5o~smqOg>Ti^GNme94*w z)JZy{_{#$jxGQ&`M z!OMvZMHR>8*^>eS%o*6hJwn!l8VOOjZQJvh)@tnHVW&*GYPuxqXw}%M!(f-SQf`=L z5;=5w2;%82VMH6Xi&-K3W)o&K^+vJCepWZ-rW%+Dc6X3(){z$@4zjYxQ|}8UIojeC zYZpQ1dU{fy=oTr<4VX?$q)LP}IUmpiez^O&N3E_qPpchGTi5ZM6-2ScWlQq%V&R2Euz zO|Q0Hx>lY1Q1cW5xHv5!0OGU~PVEqSuy#fD72d#O`N!C;o=m+YioGu-wH2k6!t<~K zSr`E=W9)!g==~x9VV~-8{4ZN9{~-A9zJpRe%NGg$+MDuI-dH|b@BD)~>pPCGUNNzY zMDg||0@XGQgw`YCt5C&A{_+J}mvV9Wg{6V%2n#YSRN{AP#PY?1FF1#|vO_%e+#`|2*~wGAJaeRX6=IzFNeWhz6gJc8+(03Ph4y6ELAm=AkN7TOgMUEw*N{= z_)EIDQx5q22oUR+_b*tazu9+pX|n1c*IB-}{DqIj z-?E|ks{o3AGRNb;+iKcHkZvYJvFsW&83RAPs1Oh@IWy%l#5x2oUP6ZCtv+b|q>jsf zZ_9XO;V!>n`UxH1LvH8)L4?8raIvasEhkpQoJ`%!5rBs!0Tu(s_D{`4opB;57)pkX z4$A^8CsD3U5*!|bHIEqsn~{q+Ddj$ME@Gq4JXtgVz&7l{Ok!@?EA{B3P~NAqb9)4? zkQo30A^EbHfQ@87G5&EQTd`frrwL)&Yw?%-W@uy^Gn23%j?Y!Iea2xw<-f;esq zf%w5WN@E1}zyXtYv}}`U^B>W`>XPmdLj%4{P298|SisrE;7HvXX;A}Ffi8B#3Lr;1 zHt6zVb`8{#+e$*k?w8|O{Uh|&AG}|DG1PFo1i?Y*cQm$ZwtGcVgMwtBUDa{~L1KT-{jET4w60>{KZ27vXrHJ;fW{6| z=|Y4!&UX020wU1>1iRgB@Q#m~1^Z^9CG1LqDhYBrnx%IEdIty z!46iOoKlKs)c}newDG)rWUikD%j`)p z_w9Ph&e40=(2eBy;T!}*1p1f1SAUDP9iWy^u^Ubdj21Kn{46;GR+hwLO=4D11@c~V zI8x&(D({K~Df2E)Nx_yQvYfh4;MbMJ@Z}=Dt3_>iim~QZ*hZIlEs0mEb z_54+&*?wMD`2#vsQRN3KvoT>hWofI_Vf(^C1ff-Ike@h@saEf7g}<9T`W;HAne-Nd z>RR+&SP35w)xKn8^U$7))PsM!jKwYZ*RzEcG-OlTrX3}9a{q%#Un5E5W{{hp>w~;` zGky+3(vJvQyGwBo`tCpmo0mo((?nM8vf9aXrrY1Ve}~TuVkB(zeds^jEfI}xGBCM2 zL1|#tycSaWCurP+0MiActG3LCas@_@tao@(R1ANlwB$4K53egNE_;!&(%@Qo$>h`^1S_!hN6 z)vZtG$8fN!|BXBJ=SI>e(LAU(y(i*PHvgQ2llulxS8>qsimv7yL}0q_E5WiAz7)(f zC(ahFvG8&HN9+6^jGyLHM~$)7auppeWh_^zKk&C_MQ~8;N??OlyH~azgz5fe^>~7F zl3HnPN3z-kN)I$4@`CLCMQx3sG~V8hPS^}XDXZrQA>}mQPw%7&!sd(Pp^P=tgp-s^ zjl}1-KRPNWXgV_K^HkP__SR`S-|OF0bR-N5>I%ODj&1JUeAQ3$9i;B~$S6}*^tK?= z**%aCiH7y?xdY?{LgVP}S0HOh%0%LI$wRx;$T|~Y8R)Vdwa}kGWv8?SJVm^>r6+%I z#lj1aR94{@MP;t-scEYQWc#xFA30^}?|BeX*W#9OL;Q9#WqaaM546j5j29((^_8Nu z4uq}ESLr~r*O7E7$D{!k9W>`!SLoyA53i9QwRB{!pHe8um|aDE`Cg0O*{jmor)^t)3`>V>SWN-2VJcFmj^1?~tT=JrP`fVh*t zXHarp=8HEcR#vFe+1a%XXuK+)oFs`GDD}#Z+TJ}Ri`FvKO@ek2ayn}yaOi%(8p%2$ zpEu)v0Jym@f}U|-;}CbR=9{#<^z28PzkkTNvyKvJDZe+^VS2bES3N@Jq!-*}{oQlz z@8bgC_KnDnT4}d#&Cpr!%Yb?E!brx0!eVOw~;lLwUoz#Np%d$o%9scc3&zPm`%G((Le|6o1 zM(VhOw)!f84zG^)tZ1?Egv)d8cdNi+T${=5kV+j;Wf%2{3g@FHp^Gf*qO0q!u$=m9 zCaY`4mRqJ;FTH5`a$affE5dJrk~k`HTP_7nGTY@B9o9vvnbytaID;^b=Tzp7Q#DmD zC(XEN)Ktn39z5|G!wsVNnHi) z%^q94!lL|hF`IijA^9NR0F$@h7k5R^ljOW(;Td9grRN0Mb)l_l7##{2nPQ@?;VjXv zaLZG}yuf$r$<79rVPpXg?6iiieX|r#&`p#Con2i%S8*8F}(E) zI5E6c3tG*<;m~6>!&H!GJ6zEuhH7mkAzovdhLy;)q z{H2*8I^Pb}xC4s^6Y}6bJvMu=8>g&I)7!N!5QG$xseeU#CC?ZM-TbjsHwHgDGrsD= z{%f;@Sod+Ch66Ko2WF~;Ty)v>&x^aovCbCbD7>qF*!?BXmOV3(s|nxsb*Lx_2lpB7 zokUnzrk;P=T-&kUHO}td+Zdj!3n&NR?K~cRU zAXU!DCp?51{J4w^`cV#ye}(`SQhGQkkMu}O3M*BWt4UsC^jCFUy;wTINYmhD$AT;4 z?Xd{HaJjP`raZ39qAm;%beDbrLpbRf(mkKbANan7XsL>_pE2oo^$TgdidjRP!5-`% zv0d!|iKN$c0(T|L0C~XD0aS8t{*&#LnhE;1Kb<9&=c2B+9JeLvJr*AyyRh%@jHej=AetOMSlz^=!kxX>>B{2B1uIrQyfd8KjJ+DBy!h)~*(!|&L4^Q_07SQ~E zcemVP`{9CwFvPFu7pyVGCLhH?LhEVb2{7U+Z_>o25#+3<|8%1T^5dh}*4(kfJGry} zm%r#hU+__Z;;*4fMrX=Bkc@7|v^*B;HAl0((IBPPii%X9+u3DDF6%bI&6?Eu$8&aWVqHIM7mK6?Uvq$1|(-T|)IV<>e?!(rY zqkmO1MRaLeTR=)io(0GVtQT@s6rN%C6;nS3@eu;P#ry4q;^O@1ZKCJyp_Jo)Ty^QW z+vweTx_DLm{P-XSBj~Sl<%_b^$=}odJ!S2wAcxenmzFGX1t&Qp8Vxz2VT`uQsQYtdn&_0xVivIcxZ_hnrRtwq4cZSj1c-SG9 z7vHBCA=fd0O1<4*=lu$6pn~_pVKyL@ztw1swbZi0B?spLo56ZKu5;7ZeUml1Ws1?u zqMf1p{5myAzeX$lAi{jIUqo1g4!zWLMm9cfWcnw`k6*BR^?$2(&yW?>w;G$EmTA@a z6?y#K$C~ZT8+v{87n5Dm&H6Pb_EQ@V0IWmG9cG=O;(;5aMWWrIPzz4Q`mhK;qQp~a z+BbQrEQ+w{SeiuG-~Po5f=^EvlouB@_|4xQXH@A~KgpFHrwu%dwuCR)=B&C(y6J4J zvoGk9;lLs9%iA-IJGU#RgnZZR+@{5lYl8(e1h6&>Vc_mvg0d@);X zji4T|n#lB!>pfL|8tQYkw?U2bD`W{na&;*|znjmalA&f;*U++_aBYerq;&C8Kw7mI z7tsG*?7*5j&dU)Lje;^{D_h`%(dK|pB*A*1(Jj)w^mZ9HB|vGLkF1GEFhu&rH=r=8 zMxO42e{Si6$m+Zj`_mXb&w5Q(i|Yxyg?juUrY}78uo@~3v84|8dfgbPd0iQJRdMj< zncCNGdMEcsxu#o#B5+XD{tsg*;j-eF8`mp~K8O1J!Z0+>0=7O=4M}E?)H)ENE;P*F z$Ox?ril_^p0g7xhDUf(q652l|562VFlC8^r8?lQv;TMvn+*8I}&+hIQYh2 z1}uQQaag&!-+DZ@|C+C$bN6W;S-Z@)d1|en+XGvjbOxCa-qAF*LA=6s(Jg+g;82f$ z(Vb)8I)AH@cdjGFAR5Rqd0wiNCu!xtqWbcTx&5kslzTb^7A78~Xzw1($UV6S^VWiP zFd{Rimd-0CZC_Bu(WxBFW7+k{cOW7DxBBkJdJ;VsJ4Z@lERQr%3eVv&$%)b%<~ zCl^Y4NgO}js@u{|o~KTgH}>!* z_iDNqX2(As7T0xivMH|3SC1ivm8Q}6Ffcd7owUKN5lHAtzMM4<0v+ykUT!QiowO;`@%JGv+K$bBx@*S7C8GJVqQ_K>12}M`f_Ys=S zKFh}HM9#6Izb$Y{wYzItTy+l5U2oL%boCJn?R3?jP@n$zSIwlmyGq30Cw4QBO|14` zW5c);AN*J3&eMFAk$SR~2k|&+&Bc$e>s%c{`?d~85S-UWjA>DS5+;UKZ}5oVa5O(N zqqc@>)nee)+4MUjH?FGv%hm2{IlIF-QX}ym-7ok4Z9{V+ZHVZQl$A*x!(q%<2~iVv znUa+BX35&lCb#9VE-~Y^W_f;Xhl%vgjwdjzMy$FsSIj&ok}L+X`4>J=9BkN&nu^E*gbhj3(+D>C4E z@Fwq_=N)^bKFSHTzZk?-gNU$@l}r}dwGyh_fNi=9b|n}J>&;G!lzilbWF4B}BBq4f zYIOl?b)PSh#XTPp4IS5ZR_2C!E)Z`zH0OW%4;&~z7UAyA-X|sh9@~>cQW^COA9hV4 zXcA6qUo9P{bW1_2`eo6%hgbN%(G-F1xTvq!sc?4wN6Q4`e9Hku zFwvlAcRY?6h^Fj$R8zCNEDq8`=uZB8D-xn)tA<^bFFy}4$vA}Xq0jAsv1&5!h!yRA zU()KLJya5MQ`q&LKdH#fwq&(bNFS{sKlEh_{N%{XCGO+po#(+WCLmKW6&5iOHny>g z3*VFN?mx!16V5{zyuMWDVP8U*|BGT$(%IO|)?EF|OI*sq&RovH!N%=>i_c?K*A>>k zyg1+~++zY4Q)J;VWN0axhoIKx;l&G$gvj(#go^pZskEVj8^}is3Jw26LzYYVos0HX zRPvmK$dVxM8(Tc?pHFe0Z3uq){{#OK3i-ra#@+;*=ui8)y6hsRv z4Fxx1c1+fr!VI{L3DFMwXKrfl#Q8hfP@ajgEau&QMCxd{g#!T^;ATXW)nUg&$-n25 zruy3V!!;{?OTobo|0GAxe`Acn3GV@W=&n;~&9 zQM>NWW~R@OYORkJAo+eq1!4vzmf9K%plR4(tB@TR&FSbDoRgJ8qVcH#;7lQub*nq&?Z>7WM=oeEVjkaG zT#f)=o!M2DO5hLR+op>t0CixJCIeXH*+z{-XS|%jx)y(j&}Wo|3!l7{o)HU3m7LYyhv*xF&tq z%IN7N;D4raue&&hm0xM=`qv`+TK@;_xAcGKuK(2|75~ar2Yw)geNLSmVxV@x89bQu zpViVKKnlkwjS&&c|-X6`~xdnh}Ps)Hs z4VbUL^{XNLf7_|Oi>tA%?SG5zax}esF*FH3d(JH^Gvr7Rp*n=t7frH!U;!y1gJB^i zY_M$KL_}mW&XKaDEi9K-wZR|q*L32&m+2n_8lq$xRznJ7p8}V>w+d@?uB!eS3#u<} zIaqi!b!w}a2;_BfUUhGMy#4dPx>)_>yZ`ai?Rk`}d0>~ce-PfY-b?Csd(28yX22L% zI7XI>OjIHYTk_@Xk;Gu^F52^Gn6E1&+?4MxDS2G_#PQ&yXPXP^<-p|2nLTb@AAQEY zI*UQ9Pmm{Kat}wuazpjSyXCdnrD&|C1c5DIb1TnzF}f4KIV6D)CJ!?&l&{T)e4U%3HTSYqsQ zo@zWB1o}ceQSV)<4G<)jM|@@YpL+XHuWsr5AYh^Q{K=wSV99D~4RRU52FufmMBMmd z_H}L#qe(}|I9ZyPRD6kT>Ivj&2Y?qVZq<4bG_co_DP`sE*_Xw8D;+7QR$Uq(rr+u> z8bHUWbV19i#)@@G4bCco@Xb<8u~wVDz9S`#k@ciJtlu@uP1U0X?yov8v9U3VOig2t zL9?n$P3=1U_Emi$#slR>N5wH-=J&T=EdUHA}_Z zZIl3nvMP*AZS9{cDqFanrA~S5BqxtNm9tlu;^`)3X&V4tMAkJ4gEIPl= zoV!Gyx0N{3DpD@)pv^iS*dl2FwANu;1;%EDl}JQ7MbxLMAp>)UwNwe{=V}O-5C*>F zu?Ny+F64jZn<+fKjF01}8h5H_3pey|;%bI;SFg$w8;IC<8l|3#Lz2;mNNik6sVTG3 z+Su^rIE#40C4a-587$U~%KedEEw1%r6wdvoMwpmlXH$xPnNQN#f%Z7|p)nC>WsuO= z4zyqapLS<8(UJ~Qi9d|dQijb_xhA2)v>la)<1md5s^R1N&PiuA$^k|A<+2C?OiHbj z>Bn$~t)>Y(Zb`8hW7q9xQ=s>Rv81V+UiuZJc<23HplI88isqRCId89fb`Kt|CxVIg znWcwprwXnotO>3s&Oypkte^9yJjlUVVxSe%_xlzmje|mYOVPH^vjA=?6xd0vaj0Oz zwJ4OJNiFdnHJX3rw&inskjryukl`*fRQ#SMod5J|KroJRsVXa5_$q7whSQ{gOi*s0 z1LeCy|JBWRsDPn7jCb4s(p|JZiZ8+*ExC@Vj)MF|*Vp{B(ziccSn`G1Br9bV(v!C2 z6#?eqpJBc9o@lJ#^p-`-=`4i&wFe>2)nlPK1p9yPFzJCzBQbpkcR>={YtamIw)3nt z(QEF;+)4`>8^_LU)_Q3 zC5_7lgi_6y>U%m)m@}Ku4C}=l^J=<<7c;99ec3p{aR+v=diuJR7uZi%aQv$oP?dn?@6Yu_+*^>T0ptf(oobdL;6)N-I!TO`zg^Xbv3#L0I~sn@WGk-^SmPh5>W+LB<+1PU}AKa?FCWF|qMNELOgdxR{ zbqE7@jVe+FklzdcD$!(A$&}}H*HQFTJ+AOrJYnhh}Yvta(B zQ_bW4Rr;R~&6PAKwgLWXS{Bnln(vUI+~g#kl{r+_zbngT`Y3`^Qf=!PxN4IYX#iW4 zucW7@LLJA9Zh3(rj~&SyN_pjO8H&)|(v%!BnMWySBJV=eSkB3YSTCyIeJ{i;(oc%_hk{$_l;v>nWSB)oVeg+blh=HB5JSlG_r7@P z3q;aFoZjD_qS@zygYqCn=;Zxjo!?NK!%J$ z52lOP`8G3feEj+HTp@Tnn9X~nG=;tS+z}u{mQX_J0kxtr)O30YD%oo)L@wy`jpQYM z@M>Me=95k1p*FW~rHiV1CIfVc{K8r|#Kt(ApkXKsDG$_>76UGNhHExFCw#Ky9*B-z zNq2ga*xax!HMf_|Vp-86r{;~YgQKqu7%szk8$hpvi_2I`OVbG1doP(`gn}=W<8%Gn z%81#&WjkH4GV;4u43EtSW>K_Ta3Zj!XF?;SO3V#q=<=>Tc^@?A`i;&`-cYj|;^ zEo#Jl5zSr~_V-4}y8pnufXLa80vZY4z2ko7fj>DR)#z=wWuS1$$W!L?(y}YC+yQ|G z@L&`2upy3f>~*IquAjkVNU>}c10(fq#HdbK$~Q3l6|=@-eBbo>B9(6xV`*)sae58*f zym~RRVx;xoCG3`JV`xo z!lFw)=t2Hy)e!IFs?0~7osWk(d%^wxq&>_XD4+U#y&-VF%4z?XH^i4w`TxpF{`XhZ z%G}iEzf!T(l>g;W9<~K+)$g!{UvhW{E0Lis(S^%I8OF&%kr!gJ&fMOpM=&=Aj@wuL zBX?*6i51Qb$uhkwkFYkaD_UDE+)rh1c;(&Y=B$3)J&iJfQSx!1NGgPtK!$c9OtJuu zX(pV$bfuJpRR|K(dp@^j}i&HeJOh@|7lWo8^$*o~Xqo z5Sb+!EtJ&e@6F+h&+_1ETbg7LfP5GZjvIUIN3ibCOldAv z)>YdO|NH$x7AC8dr=<2ekiY1%fN*r~e5h6Yaw<{XIErujKV~tiyrvV_DV0AzEknC- zR^xKM3i<1UkvqBj3C{wDvytOd+YtDSGu!gEMg+!&|8BQrT*|p)(dwQLEy+ zMtMzij3zo40)CA!BKZF~yWg?#lWhqD3@qR)gh~D{uZaJO;{OWV8XZ_)J@r3=)T|kt zUS1pXr6-`!Z}w2QR7nP%d?ecf90;K_7C3d!UZ`N(TZoWNN^Q~RjVhQG{Y<%E1PpV^4 z-m-K+$A~-+VDABs^Q@U*)YvhY4Znn2^w>732H?NRK(5QSS$V@D7yz2BVX4)f5A04~$WbxGOam22>t&uD)JB8-~yiQW6ik;FGblY_I>SvB_z2?PS z*Qm&qbKI{H1V@YGWzpx`!v)WeLT02};JJo*#f$a*FH?IIad-^(;9XC#YTWN6;Z6+S zm4O1KH=#V@FJw7Pha0!9Vb%ZIM$)a`VRMoiN&C|$YA3~ZC*8ayZRY^fyuP6$n%2IU z$#XceYZeqLTXw(m$_z|33I$B4k~NZO>pP6)H_}R{E$i%USGy{l{-jOE;%CloYPEU+ zRFxOn4;7lIOh!7abb23YKD+_-?O z0FP9otcAh+oSj;=f#$&*ExUHpd&e#bSF%#8*&ItcL2H$Sa)?pt0Xtf+t)z$_u^wZi z44oE}r4kIZGy3!Mc8q$B&6JqtnHZ>Znn!Zh@6rgIu|yU+zG8q`q9%B18|T|oN3zMq z`l&D;U!OL~%>vo&q0>Y==~zLiCZk4v%s_7!9DxQ~id1LLE93gf*gg&2$|hB#j8;?3 z5v4S;oM6rT{Y;I+#FdmNw z){d%tNM<<#GN%n9ox7B=3#;u7unZ~tLB_vRZ52a&2=IM)2VkXm=L+Iqq~uk#Dug|x z>S84e+A7EiOY5lj*!q?6HDkNh~0g;0Jy(al!ZHHDtur9T$y-~)94HelX1NHjXWIM7UAe}$?jiz z9?P4`I0JM=G5K{3_%2jPLC^_Mlw?-kYYgb7`qGa3@dn|^1fRMwiyM@Ch z;CB&o7&&?c5e>h`IM;Wnha0QKnEp=$hA8TJgR-07N~U5(>9vJzeoFsSRBkDq=x(YgEMpb=l4TDD`2 zwVJpWGTA_u7}?ecW7s6%rUs&NXD3+n;jB86`X?8(l3MBo6)PdakI6V6a}22{)8ilT zM~T*mU}__xSy|6XSrJ^%lDAR3Lft%+yxC|ZUvSO_nqMX!_ul3;R#*{~4DA=h$bP)%8Yv9X zyp><|e8=_ttI}ZAwOd#dlnSjck#6%273{E$kJuCGu=I@O)&6ID{nWF5@gLb16sj|&Sb~+du4e4O_%_o`Ix4NRrAsyr1_}MuP94s>de8cH-OUkVPk3+K z&jW)It9QiU-ti~AuJkL`XMca8Oh4$SyJ=`-5WU<{cIh+XVH#e4d&zive_UHC!pN>W z3TB;Mn5i)9Qn)#6@lo4QpI3jFYc0~+jS)4AFz8fVC;lD^+idw^S~Qhq>Tg(!3$yLD zzktzoFrU@6s4wwCMz}edpF5i5Q1IMmEJQHzp(LAt)pgN3&O!&d?3W@6U4)I^2V{;- z6A(?zd93hS*uQmnh4T)nHnE{wVhh(=MMD(h(P4+^p83Om6t<*cUW>l(qJzr%5vp@K zN27ka(L{JX=1~e2^)F^i=TYj&;<7jyUUR2Bek^A8+3Up*&Xwc{)1nRR5CT8vG>ExV zHnF3UqXJOAno_?bnhCX-&kwI~Ti8t4`n0%Up>!U`ZvK^w2+0Cs-b9%w%4`$+To|k= zKtgc&l}P`*8IS>8DOe?EB84^kx4BQp3<7P{Pq}&p%xF_81pg!l2|u=&I{AuUgmF5n zJQCTLv}%}xbFGYtKfbba{CBo)lWW%Z>i(_NvLhoQZ*5-@2l&x>e+I~0Nld3UI9tdL zRzu8}i;X!h8LHVvN?C+|M81e>Jr38%&*9LYQec9Ax>?NN+9(_>XSRv&6hlCYB`>Qm z1&ygi{Y()OU4@D_jd_-7vDILR{>o|7-k)Sjdxkjgvi{@S>6GqiF|o`*Otr;P)kLHN zZkpts;0zw_6;?f(@4S1FN=m!4^mv~W+lJA`&7RH%2$)49z0A+8@0BCHtj|yH--AEL z0tW6G%X-+J+5a{5*WKaM0QDznf;V?L5&uQw+yegDNDP`hA;0XPYc6e0;Xv6|i|^F2WB)Z$LR|HR4 zTQsRAby9(^Z@yATyOgcfQw7cKyr^3Tz7lc7+JEwwzA7)|2x+PtEb>nD(tpxJQm)Kn zW9K_*r!L%~N*vS8<5T=iv|o!zTe9k_2jC_j*7ik^M_ zaf%k{WX{-;0*`t`G!&`eW;gChVXnJ-Rn)To8vW-?>>a%QU1v`ZC=U)f8iA@%JG0mZ zDqH;~mgBnrCP~1II<=V9;EBL)J+xzCoiRBaeH&J6rL!{4zIY8tZka?_FBeQeNO3q6 zyG_alW54Ba&wQf{&F1v-r1R6ID)PTsqjIBc+5MHkcW5Fnvi~{-FjKe)t1bl}Y;z@< z=!%zvpRua>>t_x}^}z0<7MI!H2v6|XAyR9!t50q-A)xk0nflgF4*OQlCGK==4S|wc zRMsSscNhRzHMBU8TdcHN!q^I}x0iXJ%uehac|Zs_B$p@CnF)HeXPpB_Za}F{<@6-4 zl%kml@}kHQ(ypD8FsPJ2=14xXJE|b20RUIgs!2|R3>LUMGF6X*B_I|$`Qg=;zm7C z{mEDy9dTmPbued7mlO@phdmAmJ7p@GR1bjCkMw6*G7#4+`k>fk1czdJUB!e@Q(~6# zwo%@p@V5RL0ABU2LH7Asq^quDUho@H>eTZH9f*no9fY0T zD_-9px3e}A!>>kv5wk91%C9R1J_Nh!*&Kk$J3KNxC}c_@zlgpJZ+5L)Nw|^p=2ue}CJtm;uj*Iqr)K})kA$xtNUEvX;4!Px*^&9T_`IN{D z{6~QY=Nau6EzpvufB^hflc#XIsSq0Y9(nf$d~6ZwK}fal92)fr%T3=q{0mP-EyP_G z)UR5h@IX}3Qll2b0oCAcBF>b*@Etu*aTLPU<%C>KoOrk=x?pN!#f_Og-w+;xbFgjQ zXp`et%lDBBh~OcFnMKMUoox0YwBNy`N0q~bSPh@+enQ=4RUw1) zpovN`QoV>vZ#5LvC;cl|6jPr}O5tu!Ipoyib8iXqy}TeJ;4+_7r<1kV0v5?Kv>fYp zg>9L`;XwXa&W7-jf|9~uP2iyF5`5AJ`Q~p4eBU$MCC00`rcSF>`&0fbd^_eqR+}mK z4n*PMMa&FOcc)vTUR zlDUAn-mh`ahi_`f`=39JYTNVjsTa_Y3b1GOIi)6dY)D}xeshB0T8Eov5%UhWd1)u}kjEQ|LDo{tqKKrYIfVz~@dp!! zMOnah@vp)%_-jDTUG09l+;{CkDCH|Q{NqX*uHa1YxFShy*1+;J`gywKaz|2Q{lG8x zP?KBur`}r`!WLKXY_K;C8$EWG>jY3UIh{+BLv0=2)KH%P}6xE2kg)%(-uA6lC?u8}{K(#P*c zE9C8t*u%j2r_{;Rpe1A{9nNXU;b_N0vNgyK!EZVut~}+R2rcbsHilqsOviYh-pYX= zHw@53nlmwYI5W5KP>&`dBZe0Jn?nAdC^HY1wlR6$u^PbpB#AS&5L6zqrXN&7*N2Q` z+Rae1EwS)H=aVSIkr8Ek^1jy2iS2o7mqm~Mr&g5=jjt7VxwglQ^`h#Mx+x2v|9ZAwE$i_9918MjJxTMr?n!bZ6n$}y11u8I9COTU`Z$Fi z!AeAQLMw^gp_{+0QTEJrhL424pVDp%wpku~XRlD3iv{vQ!lAf!_jyqd_h}+Tr1XG| z`*FT*NbPqvHCUsYAkFnM`@l4u_QH&bszpUK#M~XLJt{%?00GXY?u_{gj3Hvs!=N(I z(=AuWPijyoU!r?aFTsa8pLB&cx}$*%;K$e*XqF{~*rA-qn)h^!(-;e}O#B$|S~c+U zN4vyOK0vmtx$5K!?g*+J@G1NmlEI=pyZXZ69tAv=@`t%ag_Hk{LP~OH9iE)I= zaJ69b4kuCkV0V zo(M0#>phpQ_)@j;h%m{-a*LGi(72TP)ws2w*@4|C-3+;=5DmC4s7Lp95%n%@Ko zfdr3-a7m*dys9iIci$A=4NPJ`HfJ;hujLgU)ZRuJI`n;Pw|yksu!#LQnJ#dJysgNb z@@qwR^wrk(jbq4H?d!lNyy72~Dnn87KxsgQ!)|*m(DRM+eC$wh7KnS-mho3|KE)7h zK3k;qZ;K1Lj6uEXLYUYi)1FN}F@-xJ z@@3Hb84sl|j{4$3J}aTY@cbX@pzB_qM~APljrjju6P0tY{C@ zpUCOz_NFmALMv1*blCcwUD3?U6tYs+N%cmJ98D%3)%)Xu^uvzF zS5O!sc#X6?EwsYkvPo6A%O8&y8sCCQH<%f2togVwW&{M;PR!a(ZT_A+jVAbf{@5kL zB@Z(hb$3U{T_}SKA_CoQVU-;j>2J=L#lZ~aQCFg-d<9rzs$_gO&d5N6eFSc z1ml8)P*FSi+k@!^M9nDWR5e@ATD8oxtDu=36Iv2!;dZzidIS(PCtEuXAtlBb1;H%Z zwnC^Ek*D)EX4#Q>R$$WA2sxC_t(!!6Tr?C#@{3}n{<^o;9id1RA&-Pig1e-2B1XpG zliNjgmd3c&%A}s>qf{_j#!Z`fu0xIwm4L0)OF=u(OEmp;bLCIaZX$&J_^Z%4Sq4GZ zPn6sV_#+6pJmDN_lx@1;Zw6Md_p0w9h6mHtzpuIEwNn>OnuRSC2=>fP^Hqgc)xu^4 z<3!s`cORHJh#?!nKI`Et7{3C27+EuH)Gw1f)aoP|B3y?fuVfvpYYmmukx0ya-)TQX zR{ggy5cNf4X|g)nl#jC9p>7|09_S7>1D2GTRBUTW zAkQ=JMRogZqG#v;^=11O6@rPPwvJkr{bW-Qg8`q8GoD#K`&Y+S#%&B>SGRL>;ZunM@49!}Uy zN|bBCJ%sO;@3wl0>0gbl3L@1^O60ONObz8ZI7nder>(udj-jt`;yj^nTQ$L9`OU9W zX4alF#$|GiR47%x@s&LV>2Sz2R6?;2R~5k6V>)nz!o_*1Y!$p>BC5&?hJg_MiE6UBy>RkVZj`9UWbRkN-Hk!S`=BS3t3uyX6)7SF#)71*}`~Ogz z1rap5H6~dhBJ83;q-Y<5V35C2&F^JI-it(=5D#v!fAi9p#UwV~2tZQI+W(Dv?1t9? zfh*xpxxO{-(VGB>!Q&0%^YW_F!@aZS#ucP|YaD#>wd1Fv&Z*SR&mc;asi}1G) z_H>`!akh-Zxq9#io(7%;a$)w+{QH)Y$?UK1Dt^4)up!Szcxnu}kn$0afcfJL#IL+S z5gF_Y30j;{lNrG6m~$Ay?)*V9fZuU@3=kd40=LhazjFrau>(Y>SJNtOz>8x_X-BlA zIpl{i>OarVGj1v(4?^1`R}aQB&WCRQzS~;7R{tDZG=HhgrW@B`W|#cdyj%YBky)P= zpxuOZkW>S6%q7U{VsB#G(^FMsH5QuGXhb(sY+!-R8Bmv6Sx3WzSW<1MPPN1!&PurYky(@`bP9tz z52}LH9Q?+FF5jR6-;|+GVdRA!qtd;}*-h&iIw3Tq3qF9sDIb1FFxGbo&fbG5n8$3F zyY&PWL{ys^dTO}oZ#@sIX^BKW*bon=;te9j5k+T%wJ zNJtoN1~YVj4~YRrlZl)b&kJqp+Z`DqT!la$x&&IxgOQw#yZd-nBP3!7FijBXD|IsU8Zl^ zc6?MKpJQ+7ka|tZQLfchD$PD|;K(9FiLE|eUZX#EZxhG!S-63C$jWX1Yd!6-Yxi-u zjULIr|0-Q%D9jz}IF~S%>0(jOqZ(Ln<$9PxiySr&2Oic7vb<8q=46)Ln%Z|<*z5&> z3f~Zw@m;vR(bESB<=Jqkxn(=#hQw42l(7)h`vMQQTttz9XW6^|^8EK7qhju4r_c*b zJIi`)MB$w@9epwdIfnEBR+?~);yd6C(LeMC& zn&&N*?-g&BBJcV;8&UoZi4Lmxcj16ojlxR~zMrf=O_^i1wGb9X-0@6_rpjPYemIin zmJb+;lHe;Yp=8G)Q(L1bzH*}I>}uAqhj4;g)PlvD9_e_ScR{Ipq|$8NvAvLD8MYr}xl=bU~)f%B3E>r3Bu9_t|ThF3C5~BdOve zEbk^r&r#PT&?^V1cb{72yEWH}TXEE}w>t!cY~rA+hNOTK8FAtIEoszp!qqptS&;r$ zaYV-NX96-h$6aR@1xz6_E0^N49mU)-v#bwtGJm)ibygzJ8!7|WIrcb`$XH~^!a#s& z{Db-0IOTFq#9!^j!n_F}#Z_nX{YzBK8XLPVmc&X`fT7!@$U-@2KM9soGbmOSAmqV z{nr$L^MBo_u^Joyf0E^=eo{Rt0{{e$IFA(#*kP@SQd6lWT2-#>` zP1)7_@IO!9lk>Zt?#CU?cuhiLF&)+XEM9B)cS(gvQT!X3`wL*{fArTS;Ak`J<84du zALKPz4}3nlG8Fo^MH0L|oK2-4xIY!~Oux~1sw!+It)&D3p;+N8AgqKI`ld6v71wy8I!eP0o~=RVcFQR2Gr(eP_JbSytoQ$Yt}l*4r@A8Me94y z8cTDWhqlq^qoAhbOzGBXv^Wa4vUz$(7B!mX`T=x_ueKRRDfg&Uc-e1+z4x$jyW_Pm zp?U;-R#xt^Z8Ev~`m`iL4*c#65Nn)q#=Y0l1AuD&+{|8-Gsij3LUZXpM0Bx0u7WWm zH|%yE@-#XEph2}-$-thl+S;__ciBxSSzHveP%~v}5I%u!z_l_KoW{KRx2=eB33umE zIYFtu^5=wGU`Jab8#}cnYry@9p5UE#U|VVvx_4l49JQ;jQdp(uw=$^A$EA$LM%vmE zvdEOaIcp5qX8wX{mYf0;#51~imYYPn4=k&#DsKTxo{_Mg*;S495?OBY?#gv=edYC* z^O@-sd-qa+U24xvcbL0@C7_6o!$`)sVr-jSJE4XQUQ$?L7}2(}Eixqv;L8AdJAVqc zq}RPgpnDb@E_;?6K58r3h4-!4rT4Ab#rLHLX?eMOfluJk=3i1@Gt1i#iA=O`M0@x! z(HtJP9BMHXEzuD93m|B&woj0g6T?f#^)>J>|I4C5?Gam>n9!8CT%~aT;=oco5d6U8 zMXl(=W;$ND_8+DD*?|5bJ!;8ebESXMUKBAf7YBwNVJibGaJ*(2G`F%wx)grqVPjudiaq^Kl&g$8A2 zWMxMr@_$c}d+;_B`#kUX-t|4VKH&_f^^EP0&=DPLW)H)UzBG%%Tra*5 z%$kyZe3I&S#gfie^z5)!twG={3Cuh)FdeA!Kj<-9** zvT*5%Tb`|QbE!iW-XcOuy39>D3oe6x{>&<#E$o8Ac|j)wq#kQzz|ATd=Z0K!p2$QE zPu?jL8Lb^y3_CQE{*}sTDe!2!dtlFjq&YLY@2#4>XS`}v#PLrpvc4*@q^O{mmnr5D zmyJq~t?8>FWU5vZdE(%4cuZuao0GNjp3~Dt*SLaxI#g_u>hu@k&9Ho*#CZP~lFJHj z(e!SYlLigyc?&5-YxlE{uuk$9b&l6d`uIlpg_z15dPo*iU&|Khx2*A5Fp;8iK_bdP z?T6|^7@lcx2j0T@x>X7|kuuBSB7<^zeY~R~4McconTxA2flHC0_jFxmSTv-~?zVT| zG_|yDqa9lkF*B6_{j=T>=M8r<0s;@z#h)3BQ4NLl@`Xr__o7;~M&dL3J8fP&zLfDfy z);ckcTev{@OUlZ`bCo(-3? z1u1xD`PKgSg?RqeVVsF<1SLF;XYA@Bsa&cY!I48ZJn1V<3d!?s=St?TLo zC0cNr`qD*M#s6f~X>SCNVkva^9A2ZP>CoJ9bvgXe_c}WdX-)pHM5m7O zrHt#g$F0AO+nGA;7dSJ?)|Mo~cf{z2L)Rz!`fpi73Zv)H=a5K)*$5sf_IZypi($P5 zsPwUc4~P-J1@^3C6-r9{V-u0Z&Sl7vNfmuMY4yy*cL>_)BmQF!8Om9Dej%cHxbIzA zhtV0d{=%cr?;bpBPjt@4w=#<>k5ee=TiWAXM2~tUGfm z$s&!Dm0R^V$}fOR*B^kGaipi~rx~A2cS0;t&khV1a4u38*XRUP~f za!rZMtay8bsLt6yFYl@>-y^31(*P!L^^s@mslZy(SMsv9bVoX`O#yBgEcjCmGpyc* zeH$Dw6vB5P*;jor+JOX@;6K#+xc)Z9B8M=x2a@Wx-{snPGpRmOC$zpsqW*JCh@M2Y z#K+M(>=#d^>Of9C`))h<=Bsy)6zaMJ&x-t%&+UcpLjV`jo4R2025 zXaG8EA!0lQa)|dx-@{O)qP6`$rhCkoQqZ`^SW8g-kOwrwsK8 z3ms*AIcyj}-1x&A&vSq{r=QMyp3CHdWH35!sad#!Sm>^|-|afB+Q;|Iq@LFgqIp#Z zD1%H+3I?6RGnk&IFo|u+E0dCxXz4yI^1i!QTu7uvIEH>i3rR{srcST`LIRwdV1P;W z+%AN1NIf@xxvVLiSX`8ILA8MzNqE&7>%jMzGt9wm78bo9<;h*W84i29^w!>V>{N+S zd`5Zmz^G;f=icvoOZfK5#1ctx*~UwD=ab4DGQXehQ!XYnak*dee%YN$_ZPL%KZuz$ zD;$PpT;HM^$KwtQm@7uvT`i6>Hae1CoRVM2)NL<2-k2PiX=eAx+-6j#JI?M}(tuBW zkF%jjLR)O`gI2fcPBxF^HeI|DWwQWHVR!;;{BXXHskxh8F@BMDn`oEi-NHt;CLymW z=KSv5)3dyzec0T5B*`g-MQ<;gz=nIWKUi9ko<|4I(-E0k$QncH>E4l z**1w&#={&zv4Tvhgz#c29`m|;lU-jmaXFMC11 z*dlXDMEOG>VoLMc>!rApwOu2prKSi*!w%`yzGmS+k(zm*CsLK*wv{S_0WX^8A-rKy zbk^Gf_92^7iB_uUF)EE+ET4d|X|>d&mdN?x@vxKAQk`O+r4Qdu>XGy(a(19g;=jU} zFX{O*_NG>!$@jh!U369Lnc+D~qch3uT+_Amyi}*k#LAAwh}k8IPK5a-WZ81ufD>l> z$4cF}GSz>ce`3FAic}6W4Z7m9KGO?(eWqi@L|5Hq0@L|&2flN1PVl}XgQ2q*_n2s3 zt5KtowNkTYB5b;SVuoXA@i5irXO)A&%7?V`1@HGCB&)Wgk+l|^XXChq;u(nyPB}b3 zY>m5jkxpZgi)zfbgv&ec4Zqdvm+D<?Im*mXweS9H+V>)zF#Zp3)bhl$PbISY{5=_z!8&*Jv~NYtI-g!>fDs zmvL5O^U%!^VaKA9gvKw|5?-jk>~%CVGvctKmP$kpnpfN{D8@X*Aazi$txfa%vd-|E z>kYmV66W!lNekJPom29LdZ%(I+ZLZYTXzTg*to~m?7vp%{V<~>H+2}PQ?PPAq`36R z<%wR8v6UkS>Wt#hzGk#44W<%9S=nBfB);6clKwnxY}T*w21Qc3_?IJ@4gYzC7s;WP zVQNI(M=S=JT#xsZy7G`cR(BP9*je0bfeN8JN5~zY(DDs0t{LpHOIbN);?T-69Pf3R zSNe*&p2%AwXHL>__g+xd4Hlc_vu<25H?(`nafS%)3UPP7_4;gk-9ckt8SJRTv5v0M z_Hww`qPudL?ajIR&X*;$y-`<)6dxx1U~5eGS13CB!lX;3w7n&lDDiArbAhSycd}+b zya_3p@A`$kQy;|NJZ~s44Hqo7Hwt}X86NK=(ey>lgWTtGL6k@Gy;PbO!M%1~Wcn2k zUFP|*5d>t-X*RU8g%>|(wwj*~#l4z^Aatf^DWd1Wj#Q*AY0D^V@sC`M zjJc6qXu0I7Y*2;;gGu!plAFzG=J;1%eIOdn zQA>J&e05UN*7I5@yRhK|lbBSfJ+5Uq;!&HV@xfPZrgD}kE*1DSq^=%{o%|LChhl#0 zlMb<^a6ixzpd{kNZr|3jTGeEzuo}-eLT-)Q$#b{!vKx8Tg}swCni>{#%vDY$Ww$84 zew3c9BBovqb}_&BRo#^!G(1Eg((BScRZ}C)Oz?y`T5wOrv);)b^4XR8 zhJo7+<^7)qB>I;46!GySzdneZ>n_E1oWZY;kf94#)s)kWjuJN1c+wbVoNQcmnv}{> zN0pF+Sl3E}UQ$}slSZeLJrwT>Sr}#V(dVaezCQl2|4LN`7L7v&siYR|r7M(*JYfR$ zst3=YaDw$FSc{g}KHO&QiKxuhEzF{f%RJLKe3p*7=oo`WNP)M(9X1zIQPP0XHhY3c znrP{$4#Ol$A0s|4S7Gx2L23dv*Gv2o;h((XVn+9+$qvm}s%zi6nI-_s6?mG! zj{DV;qesJb&owKeEK?=J>UcAlYckA7Sl+I&IN=yasrZOkejir*kE@SN`fk<8Fgx*$ zy&fE6?}G)d_N`){P~U@1jRVA|2*69)KSe_}!~?+`Yb{Y=O~_+@!j<&oVQQMnhoIRU zA0CyF1OFfkK44n*JD~!2!SCPM;PRSk%1XL=0&rz00wxPs&-_eapJy#$h!eqY%nS0{ z!aGg58JIJPF3_ci%n)QSVpa2H`vIe$RD43;#IRfDV&Ibit z+?>HW4{2wOfC6Fw)}4x}i1maDxcE1qi@BS*qcxD2gE@h3#4cgU*D-&3z7D|tVZWt= z-Cy2+*Cm@P4GN_TPUtaVyVesbVDazF@)j8VJ4>XZv!f%}&eO1SvIgr}4`A*3#vat< z_MoByL(qW6L7SFZ#|Gc1fFN)L2PxY+{B8tJp+pxRyz*87)vXR}*=&ahXjBlQKguuf zX6x<<6fQulE^C*KH8~W%ptpaC0l?b=_{~*U4?5Vt;dgM4t_{&UZ1C2j?b>b+5}{IF_CUyvz-@QZPMlJ)r_tS$9kH%RPv#2_nMb zRLj5;chJ72*U`Z@Dqt4$@_+k$%|8m(HqLG!qT4P^DdfvGf&){gKnGCX#H0!;W=AGP zbA&Z`-__a)VTS}kKFjWGk z%|>yE?t*EJ!qeQ%dPk$;xIQ+P0;()PCBDgjJm6Buj{f^awNoVx+9<|lg3%-$G(*f) zll6oOkN|yamn1uyl2*N-lnqRI1cvs_JxLTeahEK=THV$Sz*gQhKNb*p0fNoda#-&F zB-qJgW^g}!TtM|0bS2QZekW7_tKu%GcJ!4?lObt0z_$mZ4rbQ0o=^curCs3bJK6sq z9fu-aW-l#>z~ca(B;4yv;2RZ?tGYAU)^)Kz{L|4oPj zdOf_?de|#yS)p2v8-N||+XL=O*%3+y)oI(HbM)Ds?q8~HPzIP(vs*G`iddbWq}! z(2!VjP&{Z1w+%eUq^ '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..53a6b23 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,91 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 50c57bc1fc0a857c75c5ffaa2ddfb090e3ec8bd0 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sun, 14 Aug 2022 03:07:35 +0000 Subject: [PATCH 18/30] chore: Some Javadocs changes --- .gitignore | 3 ++- .../authmevelocity/api/paper/event/package-info.java | 2 ++ api/velocity/build.gradle.kts | 5 +++-- .../authmevelocity/api/velocity/event/package-info.java | 2 ++ .../adrianed/authmevelocity/api/velocity/package-info.java | 2 ++ jitpack.yml | 2 ++ 6 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/package-info.java create mode 100644 api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/package-info.java create mode 100644 api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/package-info.java diff --git a/.gitignore b/.gitignore index c9507cf..a16e24b 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ buildNumber.properties .project .vscode/ -*.class \ No newline at end of file +*.class +.gitpod.yml \ No newline at end of file diff --git a/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/package-info.java b/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/package-info.java new file mode 100644 index 0000000..a4f2fea --- /dev/null +++ b/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/package-info.java @@ -0,0 +1,2 @@ +/** AuthMeVelocity Paper API Events */ +package me.adrianed.authmevelocity.api.paper.event; diff --git a/api/velocity/build.gradle.kts b/api/velocity/build.gradle.kts index 1844d31..2c3c58a 100644 --- a/api/velocity/build.gradle.kts +++ b/api/velocity/build.gradle.kts @@ -21,8 +21,9 @@ tasks { javadoc { options.encoding = Charsets.UTF_8.name() (options as StandardJavadocDocletOptions).links( - "https://jd.adventure.kyori.net/api/4.10.0/", - "https://jd.adventure.kyori.net/text-minimessage/4.11.0/" + "https://jd.adventure.kyori.net/api/4.11.0/", + "https://jd.adventure.kyori.net/text-minimessage/4.11.0/", + "https://jd.papermc.io/velocity/3.0.0/" ) } } diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/package-info.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/package-info.java new file mode 100644 index 0000000..e37c40d --- /dev/null +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/package-info.java @@ -0,0 +1,2 @@ +/** AuthMeVelocity Velocity API Events */ +package me.adrianed.authmevelocity.api.velocity.event; diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/package-info.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/package-info.java new file mode 100644 index 0000000..cd1940a --- /dev/null +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/package-info.java @@ -0,0 +1,2 @@ +/** Main AuthMeVelocity Velocity API package */ +package me.adrianed.authmevelocity.api.velocity; diff --git a/jitpack.yml b/jitpack.yml index f530f12..ea33e92 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,3 +1,5 @@ +jdk: + - openjdk17 before_install: - source "$HOME/.sdkman/bin/sdkman-init.sh" - sdk update From 1a167398bcc26f3fd73090873bc1baf4fcd82172 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sun, 14 Aug 2022 03:23:56 +0000 Subject: [PATCH 19/30] chore: Implement missing Paper Javadocs references --- api/paper/build.gradle.kts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/api/paper/build.gradle.kts b/api/paper/build.gradle.kts index d15f043..15f243a 100644 --- a/api/paper/build.gradle.kts +++ b/api/paper/build.gradle.kts @@ -19,6 +19,11 @@ tasks { } javadoc { options.encoding = Charsets.UTF_8.name() + (options as StandardJavadocDocletOptions).links( + "https://jd.adventure.kyori.net/api/4.11.0/", + "https://jd.adventure.kyori.net/text-minimessage/4.11.0/", + "https://jd.papermc.io/paper/1.19/" + ) } } From 904b84638cd1d462acc305bb8031a7a7ac4ff622 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sun, 14 Aug 2022 03:32:55 +0000 Subject: [PATCH 20/30] feat: Simplify ServerResult --- .../authmevelocity/api/velocity/event/ServerResult.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java index b9f7d16..23e9941 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java @@ -4,12 +4,12 @@ import com.velocitypowered.api.event.ResultedEvent.Result; import com.velocitypowered.api.proxy.server.RegisteredServer; /**A result that produces a resulting server */ -public record ServerResult(boolean result, RegisteredServer server) implements Result { - private static final ServerResult DENIED = new ServerResult(false, null); +public record ServerResult(RegisteredServer server) implements Result { + private static final ServerResult DENIED = new ServerResult(null); @Override public boolean isAllowed() { - return result; + return server != null; } /** @@ -18,7 +18,7 @@ public record ServerResult(boolean result, RegisteredServer server) implements R * @return A ServerResult with allowed result and custom server result */ public static final ServerResult allowed(RegisteredServer server) { - return new ServerResult(true, server); + return new ServerResult(server); } /** From d2ef3fd7d5123d1793e13e75820b522fb74c9ec0 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sun, 14 Aug 2022 03:40:07 +0000 Subject: [PATCH 21/30] misc: Revert ServerResult record --- .../api/velocity/event/ServerResult.java | 17 +++++++++++++++-- .../listener/PluginMessageListener.java | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java index 23e9941..c69f2d2 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java @@ -4,12 +4,25 @@ import com.velocitypowered.api.event.ResultedEvent.Result; import com.velocitypowered.api.proxy.server.RegisteredServer; /**A result that produces a resulting server */ -public record ServerResult(RegisteredServer server) implements Result { +public final class ServerResult implements Result { private static final ServerResult DENIED = new ServerResult(null); + private final RegisteredServer server; + private ServerResult(RegisteredServer server) { + this.server = server; + } + @Override public boolean isAllowed() { - return server != null; + return this.server != null; + } + + /** + * Obtain the resulted server + * @return the resulted server if is allowed, else null + */ + public RegisteredServer getServer() { + return this.server; } /** diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java index 6c031e7..6d43f23 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java @@ -123,7 +123,7 @@ public class PluginMessageListener { if (!event.getResult().isAllowed()) { return; } - player.createConnectionRequest(event.getResult().server()) + player.createConnectionRequest(event.getResult().getServer()) .connect() .thenAcceptAsync(result -> { if (!result.isSuccessful()) { From d9760b691f157cd8351d7c4af8ac9211f07d6542 Mon Sep 17 00:00:00 2001 From: Adrian3d04 Date: Sun, 14 Aug 2022 03:53:11 +0000 Subject: [PATCH 22/30] ci: Some ci fixes --- .github/dependabot.yml | 26 +++++++++++++++++++------- .github/workflows/gradle.yml | 2 +- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b5bd4bd..1e1b343 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,18 +5,30 @@ version: 2 updates: - - package-ecosystem: "maven" + - package-ecosystem: "gradle" directory: "/" schedule: interval: "weekly" - - package-ecosystem: "maven" - directory: "/proxy" + - package-ecosystem: "gradle" + directory: "/api/paper" schedule: - interval: "daily" - - package-ecosystem: "maven" - directory: "/spigot" + interval: "weekly" + - package-ecosystem: "gradle" + directory: "/api/velocity" schedule: - interval: "daily" + interval: "weekly" + - package-ecosystem: "gradle" + directory: "/velocity" + schedule: + interval: "weekly" + - package-ecosystem: "gradle" + directory: "/paper" + schedule: + interval: "weekly" + - package-ecosystem: "gradle" + directory: "/common" + schedule: + interval: "weekly" - package-ecosystem: "github-actions" directory: "/" schedule: diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 5ce6c6e..94bffa1 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,4 +1,4 @@ -name: Maven Build +name: Gradle Build on: [push, pull_request] From 531a31344dc3d3924f4d7105597a7b2e69d022c6 Mon Sep 17 00:00:00 2001 From: 4drian3d Date: Mon, 15 Aug 2022 00:14:02 +0000 Subject: [PATCH 23/30] fix: Fixed missing geantyref relocation --- common/build.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 3745a61..615082e 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -18,6 +18,7 @@ tasks { shadowJar { relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby") relocate("org.spongepowered", "me.adrianed.authmevelocity.libs.sponge") + relocate("io.leangen.geantyref", "me.adrianed.authmevelocity.libs.geantyref") } compileJava { options.encoding = Charsets.UTF_8.name() @@ -31,4 +32,5 @@ java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) blossom { replaceTokenIn("src/main/java/me/adrianed/authmevelocity/common/Constants.java") replaceToken("{version}", project.version) + replaceToken("{description}", project.description) } \ No newline at end of file From 98831c4ae3fd0ada61fa4cfcf147b7d4ffe3532b Mon Sep 17 00:00:00 2001 From: 4drian3d Date: Mon, 15 Aug 2022 00:14:51 +0000 Subject: [PATCH 24/30] misc: Some plugin meta changes --- .../main/java/me/adrianed/authmevelocity/common/Constants.java | 3 +++ gradle.properties | 2 +- paper/build.gradle.kts | 1 + .../adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java | 3 ++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java b/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java index 974dd52..158488f 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java @@ -1,7 +1,10 @@ package me.adrianed.authmevelocity.common; public final class Constants { + private Constants() {} + public static final String VERSION = "{version}"; + public static final String DESCRIPTION = "{description}"; public static final String CONFIGURATE = "4.1.2"; public static final String GEANTYREF = "1.3.13"; } diff --git a/gradle.properties b/gradle.properties index 9c70bbe..b6e18df 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ group = me.adrianed.authmevelocity version = 3.0.0-SNAPSHOT -description = AuthMe Bridge with Velocity Proxy +description = AuthMeReloaded Support for Velocity url = https://github.com/4drian3d/AuthMeVelocity id = authmevelocity diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index 7f6b42c..585f18e 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -25,6 +25,7 @@ bukkit { main = "me.adrianed.authmevelocity.paper.AuthMeVelocityPaper" apiVersion = "1.13" website = "https://github.com/4drian3d/AuthMeVelocity" + description = project.description as String authors = listOf("xQuickGlare", "4drian3d") softDepend = listOf("MiniPlaceholders") depend = listOf("AuthMe") diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java index 1b403a1..9d56d6a 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java @@ -43,8 +43,9 @@ import java.util.UUID; id = "authmevelocity", name = "AuthMeVelocity", url = "https://github.com/4drian3d/AuthMeVelocity", - description = "This plugin adds the support for AuthMeReloaded to Velocity", + description = Constants.DESCRIPTION, version = Constants.VERSION, + authors = {"xQuickGlare", "4drian3d"}, dependencies = { @Dependency( id = "miniplaceholders", From bc54dd591f3952596be9bf59815ffabf1fe88187 Mon Sep 17 00:00:00 2001 From: 4drian3d Date: Mon, 15 Aug 2022 01:09:42 +0000 Subject: [PATCH 25/30] feat(docs): Improved PreSendOnLoginEvent documentation Implement AwaitingEvent annotation --- .../api/velocity/event/PreSendOnLoginEvent.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java index 7c0c0b7..d7f64a2 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java +++ b/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java @@ -3,6 +3,7 @@ package me.adrianed.authmevelocity.api.velocity.event; import java.util.Objects; import com.velocitypowered.api.event.ResultedEvent; +import com.velocitypowered.api.event.annotation.AwaitingEvent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.server.RegisteredServer; @@ -10,8 +11,12 @@ import org.jetbrains.annotations.NotNull; /** * Event to be executed just before sending a player to another server after login/registration. - * Here you have the ability to deny the event. + * + *

AuthMeVelocity will wait for the execution of this event to perform the given action, + * which means that you can modify the server to which the player will connect + * or if the player should not be sent to any server after being logged in

*/ +@AwaitingEvent public final class PreSendOnLoginEvent implements ResultedEvent { private ServerResult result; private final Player player; @@ -45,18 +50,11 @@ public final class PreSendOnLoginEvent implements ResultedEvent { return this.actualserver; } - /** - * Get the result of the event - */ @Override public @NotNull ServerResult getResult() { return this.result; } - /** - * Set the result of the event - * @param newResult the new result - */ @Override public void setResult(@NotNull ServerResult newResult) { this.result = Objects.requireNonNull(newResult); From b2e1e1185e3f565a729d9f44ad380c6b3d4987fe Mon Sep 17 00:00:00 2001 From: 4drian3d Date: Mon, 15 Aug 2022 01:11:00 +0000 Subject: [PATCH 26/30] feat(docs): Implement LoginByProxyEvent on Paper --- .../api/paper/event/LoginByProxyEvent.java | 31 +++++++++++++++++++ .../api/paper/event/PreSendLoginEvent.java | 4 +-- .../paper/listeners/MessageListener.java | 2 ++ 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/LoginByProxyEvent.java diff --git a/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/LoginByProxyEvent.java b/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/LoginByProxyEvent.java new file mode 100644 index 0000000..00c8f9c --- /dev/null +++ b/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/LoginByProxyEvent.java @@ -0,0 +1,31 @@ +package me.adrianed.authmevelocity.api.paper.event; + +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; +import org.bukkit.event.HandlerList; +import org.bukkit.event.player.PlayerEvent; +import org.jetbrains.annotations.NotNull; + +/** + * Event to be executed in case a player who has already logged + * into a previously configured server enters the server. + * + *

AuthMeVelocity will automatically login this player.

+ */ +public final class LoginByProxyEvent extends PlayerEvent { + private static final HandlerList HANDLER_LIST = new HandlerList(); + + /** + * Creates a new LoginByProxyEvent + * @param who the player to be logged in + */ + public LoginByProxyEvent(@NotNull Player who) { + super(who, !Bukkit.isPrimaryThread()); + } + + @Override + public @NotNull HandlerList getHandlers() { + return HANDLER_LIST; + } + +} diff --git a/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/PreSendLoginEvent.java b/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/PreSendLoginEvent.java index 44a8a2a..ba8bfff 100644 --- a/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/PreSendLoginEvent.java +++ b/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/PreSendLoginEvent.java @@ -9,9 +9,9 @@ import org.jetbrains.annotations.NotNull; /** * Event executed before a player is sent to another server after being logged in - *

Here you have the possibility to cancel the player's sending + *

Here you have the possibility to cancel the player's sending

*/ -public class PreSendLoginEvent extends PlayerEvent implements Cancellable { +public final class PreSendLoginEvent extends PlayerEvent implements Cancellable { private static final HandlerList HANDLERS = new HandlerList(); private boolean isCancelled = false; diff --git a/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/MessageListener.java b/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/MessageListener.java index 3ba00ad..faef963 100644 --- a/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/MessageListener.java +++ b/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/MessageListener.java @@ -7,6 +7,7 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.messaging.PluginMessageListener; import org.jetbrains.annotations.NotNull; +import me.adrianed.authmevelocity.api.paper.event.LoginByProxyEvent; import me.adrianed.authmevelocity.paper.AuthMeVelocityPlugin; import fr.xephi.authme.api.v3.AuthMeApi; @@ -35,6 +36,7 @@ public class MessageListener implements PluginMessageListener { final String msg = input.readUTF(); if ("LOGIN".equals(msg)) { plugin.logDebug("PluginMessage | Login Message"); + new LoginByProxyEvent(player).callEvent(); AuthMeApi.getInstance().forceLogin(player); } } From 23a8255796d5e2d3cc0fc6a97736b91dff9e4fad Mon Sep 17 00:00:00 2001 From: 4drian3d Date: Mon, 15 Aug 2022 02:37:35 +0000 Subject: [PATCH 27/30] chore: Add License --- LICENSE | 674 +++++++++++++++++++++++++++++++++++++++++++++++ build.gradle.kts | 4 +- 2 files changed, 676 insertions(+), 2 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/build.gradle.kts b/build.gradle.kts index 8e8365c..44a9d8c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ repositories { } allprojects { - apply(plugin = "java") + apply() repositories { mavenCentral() maven("https://repo.papermc.io/repository/maven-public/") @@ -43,4 +43,4 @@ tasks { } } -java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) \ No newline at end of file +java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) From b2a928883bab199221d904cf8953a3151c5cd955 Mon Sep 17 00:00:00 2001 From: 4drian3d Date: Mon, 15 Aug 2022 14:27:41 +0000 Subject: [PATCH 28/30] feat: Improved Random SendMode --- .../me/adrianed/authmevelocity/common/MessageType.java | 4 +++- .../authmevelocity/velocity/utils/AuthmeUtils.java | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/MessageType.java b/common/src/main/java/me/adrianed/authmevelocity/common/MessageType.java index a37b41f..a6064d7 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/MessageType.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/MessageType.java @@ -5,5 +5,7 @@ import net.kyori.adventure.util.Index; public enum MessageType { LOGIN, REGISTER, LOGOUT, FORCE_UNREGISTER, UNREGISTER; - public static final Index INDEX = Index.create((value) -> value.toString(), MessageType.values()); + // Enum#values is a heavy operation, so... cached MessageType members + public static final Index INDEX + = Index.create(MessageType::toString, MessageType.values()); } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java index 45a5dcf..64f78a1 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java @@ -61,9 +61,10 @@ public class AuthmeUtils { Optional server; if (servers.size() == 1) { server = proxy.getServer(servers.get(0)); - if (server.isPresent()) { - yield Pair.of(server.get().getServerInfo().getName(), server.get()); - } + // It is nonsense to make so many attempts if there are a single server + yield Pair.of( + server.map(sv -> sv.getServerInfo().getName()).orElse(null), + server.orElse(null)); } for (int i = 0; i < attempts; i++) { int value = RANDOM.nextInt(servers.size()); From 7a940ab9cff0fe54cc65b17c2431cfc4da4376d5 Mon Sep 17 00:00:00 2001 From: 4drian3d Date: Mon, 15 Aug 2022 14:28:13 +0000 Subject: [PATCH 29/30] misc: Removed static module dependency --- api/paper/src/main/java/module-info.java | 2 +- api/velocity/src/main/java/module-info.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/paper/src/main/java/module-info.java b/api/paper/src/main/java/module-info.java index 3c01847..3890771 100644 --- a/api/paper/src/main/java/module-info.java +++ b/api/paper/src/main/java/module-info.java @@ -1,7 +1,7 @@ /**AuthMeVelocity Paper API Module */ @SuppressWarnings({"requires-automatic", "requires-transitive-automatic"}) module me.adrianed.authmevelocity.api.paper { - requires static transitive org.bukkit; + requires transitive org.bukkit; requires static org.jetbrains.annotations; exports me.adrianed.authmevelocity.api.paper.event; } diff --git a/api/velocity/src/main/java/module-info.java b/api/velocity/src/main/java/module-info.java index 864806e..7d5622d 100644 --- a/api/velocity/src/main/java/module-info.java +++ b/api/velocity/src/main/java/module-info.java @@ -1,7 +1,7 @@ /**AuthMeVelocity Velocity API Module */ @SuppressWarnings({"requires-automatic", "requires-transitive-automatic"}) module me.adrianed.authmevelocity.api.velocity { - requires static transitive com.velocitypowered.api; + requires transitive com.velocitypowered.api; requires static org.jetbrains.annotations; exports me.adrianed.authmevelocity.api.velocity; exports me.adrianed.authmevelocity.api.velocity.event; From 115a283fade22e95d3328eeed880224ef877db9c Mon Sep 17 00:00:00 2001 From: 4drian3d Date: Mon, 15 Aug 2022 15:04:18 +0000 Subject: [PATCH 30/30] build: Some build fixes --- build.gradle.kts | 2 ++ velocity/src/main/resources/config.toml | 26 ------------------------- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 velocity/src/main/resources/config.toml diff --git a/build.gradle.kts b/build.gradle.kts index 44a9d8c..ac01f40 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,6 +30,8 @@ tasks { duplicatesStrategy = DuplicatesStrategy.EXCLUDE archiveFileName.set("AuthMeVelocity.jar") configurations = listOf(project.configurations.shadow.get()) + exclude("net/byteflux/libby/**/") + exclude("org/bstats/**/") } build { diff --git a/velocity/src/main/resources/config.toml b/velocity/src/main/resources/config.toml deleted file mode 100644 index 7f42bb1..0000000 --- a/velocity/src/main/resources/config.toml +++ /dev/null @@ -1,26 +0,0 @@ -# AuthmeVelocity Proxy -# Original Developer: xQuickGlare -# Actual Developer: 4drian3d - -# List of login/registration servers -authServers = ["auth1", "auth2"] - -[SendOnLogin] - # Send logged in players to another server? - sendToServerOnLogin = false - - # List of servers to send - # One of these servers will be chosen at random - teleportServers = ["lobby1", "lobby2"] - -[Commands] - # Sets the commands that users who have not yet logged in can execute - allowedCommands = ["login", "register", "l", "reg", "email", "captcha"] - - # Sets the message to send in case a non-logged-in player executes an unauthorized command - # To deactivate the message, leave it empty - blockedCommandMessage = "You cannot execute commands if you are not logged in yet" - -[EnsureAuthServer] - # Ensure that the first server to which players connect is an auth server - ensureFirstServerIsAuthServer = false