Merge pull request #76 from 4drian3d/v4

AuthMeVelocity 4

.gitignore

@@ -25,3 +25,5 @@ buildNumber.properties
 
 *.class
 .gitpod.yml
+
+*/run/

api/paper/src/main/java/io/github/_4drian3d/authmevelocity/api/paper/event/LoginByProxyEvent.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.api.paper.event;
+package io.github._4drian3d.authmevelocity.api.paper.event;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;

api/paper/src/main/java/io/github/_4drian3d/authmevelocity/api/paper/event/PreSendLoginEvent.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.api.paper.event;
+package io.github._4drian3d.authmevelocity.api.paper.event;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;

api/paper/src/main/java/io/github/_4drian3d/authmevelocity/api/paper/event/package-info.java

@@ -0,0 +1,2 @@
+/** AuthMeVelocity Paper API Events */
+package io.github._4drian3d.authmevelocity.api.paper.event;

api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/package-info.java

@@ -1,2 +0,0 @@
-/** AuthMeVelocity Paper API Events */
-package me.adrianed.authmevelocity.api.paper.event;

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 {
+module io.github._4drianed.authmevelocity.api.paper {
     requires transitive org.bukkit;
     requires static org.jetbrains.annotations;
-    exports me.adrianed.authmevelocity.api.paper.event;
+    exports io.github._4drian3d.authmevelocity.api.paper.event;
 }

api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/AuthMeVelocityAPI.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.api.velocity;
+package io.github._4drian3d.authmevelocity.api.velocity;
 
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;

api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.api.velocity.event;
+package io.github._4drian3d.authmevelocity.api.velocity.event;
 
 import java.util.Objects;
 

api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyForcedUnregisterEvent.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.api.velocity.event;
+package io.github._4drian3d.authmevelocity.api.velocity.event;
 
 import com.velocitypowered.api.proxy.Player;
 import org.jetbrains.annotations.Nullable;

api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyLoginEvent.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.api.velocity.event;
+package io.github._4drian3d.authmevelocity.api.velocity.event;
 
 import com.velocitypowered.api.proxy.Player;
 import org.jetbrains.annotations.NotNull;

api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyLogoutEvent.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.api.velocity.event;
+package io.github._4drian3d.authmevelocity.api.velocity.event;
 
 import com.velocitypowered.api.proxy.Player;
 import org.jetbrains.annotations.NotNull;

api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyRegisterEvent.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.api.velocity.event;
+package io.github._4drian3d.authmevelocity.api.velocity.event;
 
 import com.velocitypowered.api.proxy.Player;
 import org.jetbrains.annotations.NotNull;

api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyUnregisterEvent.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.api.velocity.event;
+package io.github._4drian3d.authmevelocity.api.velocity.event;
 
 import com.velocitypowered.api.proxy.Player;
 import org.jetbrains.annotations.NotNull;

api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ServerResult.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.api.velocity.event;
+package io.github._4drian3d.authmevelocity.api.velocity.event;
 
 import com.velocitypowered.api.event.ResultedEvent.Result;
 import com.velocitypowered.api.proxy.server.RegisteredServer;

api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/package-info.java

@@ -0,0 +1,2 @@
+/** AuthMeVelocity Velocity API Events */
+package io.github._4drian3d.authmevelocity.api.velocity.event;

api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/package-info.java

@@ -0,0 +1,2 @@
+/** Main AuthMeVelocity Velocity API package */
+package io.github._4drian3d.authmevelocity.api.velocity;

api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/package-info.java

@@ -1,2 +0,0 @@
-/** AuthMeVelocity Velocity API Events */
-package me.adrianed.authmevelocity.api.velocity.event;

api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/package-info.java

@@ -1,2 +0,0 @@
-/** Main AuthMeVelocity Velocity API package */
-package me.adrianed.authmevelocity.api.velocity;

api/velocity/src/main/java/module-info.java

@@ -1,8 +1,8 @@
 /**AuthMeVelocity Velocity API Module */
 @SuppressWarnings({"requires-automatic", "requires-transitive-automatic"})
-module me.adrianed.authmevelocity.api.velocity {
+module io.github._4drian3d.authmevelocity.api.velocity {
     requires transitive com.velocitypowered.api;
     requires static org.jetbrains.annotations;
-    exports me.adrianed.authmevelocity.api.velocity;
-    exports me.adrianed.authmevelocity.api.velocity.event;
+    exports io.github._4drian3d.authmevelocity.api.velocity;
+    exports io.github._4drian3d.authmevelocity.api.velocity.event;
 }

build.gradle.kts

@@ -1,50 +1,7 @@
-plugins {
-    java
-    alias(libs.plugins.shadow)
-}
-
-repositories {
-    maven("https://repo.alessiodp.com/releases/") {
-        mavenContent {
-            includeGroup("net.byteflux")
-        }
-    }
-}
-
 allprojects {
     apply<JavaPlugin>()
 
     repositories {
         maven("https://repo.papermc.io/repository/maven-public/")
     }
-
-    tasks.compileJava {
-        options.encoding = Charsets.UTF_8.name()
-        options.release.set(17)
-    }
-
-    java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }
-
-dependencies {
-    shadow(project(":authmevelocity-common", "shadow"))
-    shadow(projects.authmevelocityApiPaper)
-    shadow(projects.authmevelocityApiVelocity)
-    shadow(project(":authmevelocity-velocity", "shadow"))
-    shadow(project(":authmevelocity-paper", "shadow"))
-}
-
-tasks {
-    shadowJar {
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-        archiveFileName.set("AuthMeVelocity.jar")
-        configurations = listOf(project.configurations.shadow.get())
-        exclude("net/byteflux/libby/**/")
-        exclude("org/bstats/**/")
-    }
-
-    build {
-        dependsOn(shadowJar)
-    }
-}
-

common/build.gradle.kts

@@ -1,7 +1,5 @@
 plugins {
     alias(libs.plugins.blossom)
-    // Required to relocate packages
-    alias(libs.plugins.shadow)
     id("authmevelocity.spotless")
 }
 
@@ -15,16 +13,8 @@ dependencies {
     compileOnly(libs.libby.core)
 }
 
-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")
-    }
-}
-
 blossom {
-    replaceTokenIn("src/main/java/me/adrianed/authmevelocity/common/Constants.java")
+    replaceTokenIn("src/main/java/io/github/_4drian3d/authmevelocity/common/Constants.java")
     replaceToken("{version}", project.version)
     replaceToken("{description}", project.description)
     replaceToken("{configurate}", libs.versions.configurate.get())

common/src/main/java/io/github/_4drian3d/authmevelocity/common/Constants.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.common;
+package io.github._4drian3d.authmevelocity.common;
 
 public final class Constants {
     private Constants() {}

common/src/main/java/io/github/_4drian3d/authmevelocity/common/LibsManager.java

@@ -15,13 +15,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.common;
+package io.github._4drian3d.authmevelocity.common;
 
 import net.byteflux.libby.Library;
 import net.byteflux.libby.LibraryManager;
 import net.byteflux.libby.relocation.Relocation;
 
-
 public final class LibsManager {
     private final LibraryManager manager;
 
@@ -34,15 +33,15 @@ public final class LibsManager {
         final Relocation configurateRelocation
             = new Relocation(
                     "org{}spongepowered",
-                    "me.adrianed.authmevelocity.libs.sponge");
+                    "io.github._4drian3d.authmevelocity.libs.sponge");
         final Relocation geantyrefRelocation =
             new Relocation(
                     "io{}leangen{}geantyref",
-                    "me.adrianed.authmevelocity.libs.geantyref");
+                    "io.github._4drian3d.authmevelocity.libs.geantyref");
         final Relocation typesafeRelocation
             = new Relocation(
                     "com{}typesafe",
-                    "me.adrianed.authmevelocity.libs.config");
+                    "io.github._4drian3d.authmevelocity.libs.config");
         final Library hocon = Library.builder()
             .groupId("org{}spongepowered")
             .artifactId("configurate-hocon")

common/src/main/java/io/github/_4drian3d/authmevelocity/common/MessageType.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.common;
+package io.github._4drian3d.authmevelocity.common;
 
 public enum MessageType {
     LOGIN, REGISTER, LOGOUT, FORCE_UNREGISTER, UNREGISTER

common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/ConfigurationContainer.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.common.configuration;
+package io.github._4drian3d.authmevelocity.common.configuration;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;

common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/Loader.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.common.configuration;
+package io.github._4drian3d.authmevelocity.common.configuration;
 
 import java.io.IOException;
 import java.nio.file.Files;

common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/PaperConfiguration.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.common.configuration;
+package io.github._4drian3d.authmevelocity.common.configuration;
 
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;

common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/ProxyConfiguration.java

@@ -15,12 +15,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.common.configuration;
+package io.github._4drian3d.authmevelocity.common.configuration;
 
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 
-import me.adrianed.authmevelocity.common.enums.SendMode;
+import io.github._4drian3d.authmevelocity.common.enums.SendMode;
 
 import java.util.List;
 

common/src/main/java/io/github/_4drian3d/authmevelocity/common/enums/SendMode.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.common.enums;
+package io.github._4drian3d.authmevelocity.common.enums;
 
 public enum SendMode {
     TO_FIRST,

gradle.properties

@@ -1,5 +1,5 @@
-group = me.adrianed.authmevelocity
-version = 3.0.6
+group = io.github._4drian3d
+version = 4.0.0-SNAPSHOT
 description = AuthMeReloaded Support for Velocity
 url = https://modrinth.com/plugin/authmevelocity
 id = authmevelocity

gradle/libs.versions.toml

@@ -16,6 +16,7 @@ adventure = "4.12.0"
 blossom = "1.3.1"
 geantyref = "1.3.13"
 indra = "3.0.1"
+runtask = "2.0.1"
 
 [libraries]
 
@@ -44,5 +45,9 @@ plugin-shadow = { group = "gradle.plugin.com.github.johnrengelman", name = "shad
 
 pluginyml-bukkit = { id = "net.minecrell.plugin-yml.bukkit", version.ref = "pluginyml" }
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
+
 blossom = { id = "net.kyori.blossom", version.ref = "blossom" }
 indra = { id = "net.kyori.indra.publishing", version.ref = "indra" }
+
+runvelocity = { id = "xyz.jpenilla.run-velocity", version.ref = "runtask" }
+runpaper = { id = "xyz.jpenilla.run-paper", version.ref = "runtask" }

paper/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.pluginyml.bukkit)
     alias(libs.plugins.shadow)
+    alias(libs.plugins.runpaper)
     id("authmevelocity.spotless")
 }
 
@@ -23,17 +24,20 @@ repositories {
 }
 
 dependencies {
-    compileOnly(projects.authmevelocityCommon)
-    compileOnly(projects.authmevelocityApiPaper)
     compileOnly(libs.paper)
     compileOnly(libs.authme)
+
     compileOnly(libs.miniplaceholders)
-    shadow(libs.libby.bukkit)
+
+    implementation(projects.authmevelocityCommon)
+    implementation(projects.authmevelocityApiPaper)
+
+    implementation(libs.libby.bukkit)
 }
 
 bukkit {
     name = "AuthMeVelocity"
-    main = "me.adrianed.authmevelocity.paper.AuthMeVelocityPlugin"
+    main = "io.github._4drian3d.authmevelocity.paper.AuthMeVelocityPlugin"
     apiVersion = "1.13"
     website = project.property("url") as String
     description = project.description as String
@@ -45,9 +49,23 @@ bukkit {
 
 tasks {
     shadowJar {
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-        relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby")
-        configurations = listOf(project.configurations.shadow.get())
+        archiveFileName.set("AuthMeVelocity-Paper-${project.version}.jar")
+        archiveClassifier.set("")
+
+        relocate("net.byteflux.libby", "io.github._4drian3d.authmevelocity.libs.libby")
+        relocate("org.spongepowered", "io.github._4drian3d.authmevelocity.libs.sponge")
+        relocate("io.leangen.geantyref", "io.github._4drian3d.authmevelocity.libs.geantyref")
+    }
+    build {
+        dependsOn(shadowJar)
+    }
+    compileJava {
+        options.encoding = Charsets.UTF_8.name()
+        options.release.set(17)
+    }
+    runServer {
+        minecraftVersion("1.19.3")
     }
 }
 
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))

paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/AuthMePlaceholders.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.paper;
+package io.github._4drian3d.authmevelocity.paper;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/AuthMeVelocityPlugin.java

@@ -15,25 +15,23 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.paper;
+package io.github._4drian3d.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;
-
+import io.github._4drian3d.authmevelocity.common.LibsManager;
+import io.github._4drian3d.authmevelocity.common.MessageType;
+import io.github._4drian3d.authmevelocity.common.configuration.ConfigurationContainer;
+import io.github._4drian3d.authmevelocity.common.configuration.Loader;
+import io.github._4drian3d.authmevelocity.common.configuration.PaperConfiguration;
+import io.github._4drian3d.authmevelocity.paper.listeners.AuthMeListener;
+import io.github._4drian3d.authmevelocity.paper.listeners.MessageListener;
+import net.byteflux.libby.BukkitLibraryManager;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
-import net.byteflux.libby.BukkitLibraryManager;
-
 import java.util.logging.Level;
 
 public final class AuthMeVelocityPlugin extends JavaPlugin {

paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/AuthMeListener.java

@@ -15,16 +15,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.paper.listeners;
+package io.github._4drian3d.authmevelocity.paper.listeners;
 
 import fr.xephi.authme.events.LoginEvent;
 import fr.xephi.authme.events.LogoutEvent;
 import fr.xephi.authme.events.RegisterEvent;
 import fr.xephi.authme.events.UnregisterByAdminEvent;
 import fr.xephi.authme.events.UnregisterByPlayerEvent;
-import me.adrianed.authmevelocity.api.paper.event.PreSendLoginEvent;
-import me.adrianed.authmevelocity.common.MessageType;
-import me.adrianed.authmevelocity.paper.AuthMeVelocityPlugin;
+import io.github._4drian3d.authmevelocity.api.paper.event.PreSendLoginEvent;
+import io.github._4drian3d.authmevelocity.common.MessageType;
+import io.github._4drian3d.authmevelocity.paper.AuthMeVelocityPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/MessageListener.java

@@ -15,14 +15,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.paper.listeners;
+package io.github._4drian3d.authmevelocity.paper.listeners;
 
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
 import fr.xephi.authme.api.v3.AuthMeApi;
-import me.adrianed.authmevelocity.api.paper.event.LoginByProxyEvent;
-import me.adrianed.authmevelocity.common.MessageType;
-import me.adrianed.authmevelocity.paper.AuthMeVelocityPlugin;
+import io.github._4drian3d.authmevelocity.api.paper.event.LoginByProxyEvent;
+import io.github._4drian3d.authmevelocity.common.MessageType;
+import io.github._4drian3d.authmevelocity.paper.AuthMeVelocityPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.messaging.PluginMessageListener;

velocity/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.shadow)
+    alias(libs.plugins.runvelocity)
     id("authmevelocity.spotless")
 }
 
@@ -22,22 +23,36 @@ repositories {
 }
 
 dependencies {
-    compileOnly(projects.authmevelocityCommon)
-    compileOnly(projects.authmevelocityApiVelocity)
     compileOnly(libs.velocity)
+    annotationProcessor(libs.velocity)
+
     compileOnly(libs.miniplaceholders)
     compileOnly(libs.fastlogin.velocity)
-    shadow(libs.libby.velocity)
-    shadow(libs.bstats.velocity)
-    annotationProcessor(libs.velocity)
+
+    implementation(projects.authmevelocityCommon)
+    implementation(projects.authmevelocityApiVelocity)
+
+    implementation(libs.libby.velocity)
+    implementation(libs.bstats.velocity)
 }
 
 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())
+
+        archiveFileName.set("AuthMeVelocity-Velocity-${project.version}.jar")
+        archiveClassifier.set("")
+
+        relocate("org.bstats", "io.github._4drian3d.authmevelocity.libs.bstats")
+        relocate("net.byteflux.libby", "io.github._4drian3d.authmevelocity.libs.libby")
+        relocate("org.spongepowered", "io.github._4drian3d.authmevelocity.libs.sponge")
+        relocate("io.leangen.geantyref", "io.github._4drian3d.authmevelocity.libs.geantyref")
+    }
+    build {
+        dependsOn(shadowJar)
+    }
+    runVelocity {
+        velocityVersion(libs.versions.velocity.get())
     }
 }
 

velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMePlaceholders.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.velocity;
+package io.github._4drian3d.authmevelocity.velocity;
 
 import com.velocitypowered.api.proxy.Player;
 import me.dreamerzero.miniplaceholders.api.Expansion;

velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMeVelocityPlugin.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.velocity;
+package io.github._4drian3d.authmevelocity.velocity;
 
 import com.google.inject.Inject;
 import com.velocitypowered.api.command.CommandSource;
@@ -30,17 +30,17 @@ import com.velocitypowered.api.proxy.ServerConnection;
 import com.velocitypowered.api.proxy.messages.ChannelIdentifier;
 import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-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;
-import me.adrianed.authmevelocity.common.configuration.ProxyConfiguration;
-import me.adrianed.authmevelocity.velocity.commands.AuthMeCommand;
-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 io.github._4drian3d.authmevelocity.api.velocity.AuthMeVelocityAPI;
+import io.github._4drian3d.authmevelocity.common.Constants;
+import io.github._4drian3d.authmevelocity.common.LibsManager;
+import io.github._4drian3d.authmevelocity.common.configuration.ConfigurationContainer;
+import io.github._4drian3d.authmevelocity.common.configuration.Loader;
+import io.github._4drian3d.authmevelocity.common.configuration.ProxyConfiguration;
+import io.github._4drian3d.authmevelocity.velocity.commands.AuthMeCommand;
+import io.github._4drian3d.authmevelocity.velocity.listener.ConnectListener;
+import io.github._4drian3d.authmevelocity.velocity.listener.FastLoginListener;
+import io.github._4drian3d.authmevelocity.velocity.listener.PluginMessageListener;
+import io.github._4drian3d.authmevelocity.velocity.listener.ProxyListener;
 import net.byteflux.libby.VelocityLibraryManager;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bstats.charts.SimplePie;

velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/commands/AuthMeCommand.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.velocity.commands;
+package io.github._4drian3d.authmevelocity.velocity.commands;
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
@@ -24,7 +24,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 io.github._4drian3d.authmevelocity.velocity.AuthMeVelocityPlugin;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.slf4j.Logger;
 

velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ConnectListener.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.velocity.listener;
+package io.github._4drian3d.authmevelocity.velocity.listener;
 
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
@@ -28,8 +28,8 @@ import com.velocitypowered.api.event.player.ServerPreConnectEvent;
 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.utils.AuthmeUtils;
+import io.github._4drian3d.authmevelocity.velocity.AuthMeVelocityPlugin;
+import io.github._4drian3d.authmevelocity.velocity.utils.AuthmeUtils;
 import org.slf4j.Logger;
 
 import java.util.Optional;

velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/FastLoginListener.java

@@ -15,12 +15,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.velocity.listener;
+package io.github._4drian3d.authmevelocity.velocity.listener;
 
 import com.github.games647.fastlogin.velocity.event.VelocityFastLoginAutoLoginEvent;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.proxy.ProxyServer;
-import me.adrianed.authmevelocity.velocity.AuthMeVelocityPlugin;
+import io.github._4drian3d.authmevelocity.velocity.AuthMeVelocityPlugin;
 
 public class FastLoginListener {
     private final ProxyServer proxy;

velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/PluginMessageListener.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.velocity.listener;
+package io.github._4drian3d.authmevelocity.velocity.listener;
 
 import com.google.common.io.ByteArrayDataInput;
 import com.velocitypowered.api.event.Continuation;
@@ -25,10 +25,10 @@ import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.proxy.ServerConnection;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-import me.adrianed.authmevelocity.api.velocity.event.*;
-import me.adrianed.authmevelocity.common.MessageType;
-import me.adrianed.authmevelocity.velocity.AuthMeVelocityPlugin;
-import me.adrianed.authmevelocity.velocity.utils.AuthmeUtils;
+import io.github._4drian3d.authmevelocity.api.velocity.event.*;
+import io.github._4drian3d.authmevelocity.common.MessageType;
+import io.github._4drian3d.authmevelocity.velocity.AuthMeVelocityPlugin;
+import io.github._4drian3d.authmevelocity.velocity.utils.AuthmeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;

velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ProxyListener.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.velocity.listener;
+package io.github._4drian3d.authmevelocity.velocity.listener;
 
 import com.velocitypowered.api.event.Continuation;
 import com.velocitypowered.api.event.EventTask;
@@ -27,8 +27,8 @@ 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 me.adrianed.authmevelocity.velocity.AuthMeVelocityPlugin;
-import me.adrianed.authmevelocity.velocity.utils.AuthmeUtils;
+import io.github._4drian3d.authmevelocity.velocity.AuthMeVelocityPlugin;
+import io.github._4drian3d.authmevelocity.velocity.utils.AuthmeUtils;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 
 public final class ProxyListener {

velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/AuthmeUtils.java

@@ -15,11 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.velocity.utils;
+package io.github._4drian3d.authmevelocity.velocity.utils;
 
 import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-import me.adrianed.authmevelocity.common.enums.SendMode;
+import io.github._4drian3d.authmevelocity.common.enums.SendMode;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;

velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/Pair.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package me.adrianed.authmevelocity.velocity.utils;
+package io.github._4drian3d.authmevelocity.velocity.utils;
 
 public record Pair<O>(String string, O object) {
     public boolean isPresent() {