diff --git a/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/LoginByProxyEvent.java b/api/paper/src/main/java/io/github/_4drian3d/authmevelocity/api/paper/event/LoginByProxyEvent.java similarity index 96% rename from api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/LoginByProxyEvent.java rename to api/paper/src/main/java/io/github/_4drian3d/authmevelocity/api/paper/event/LoginByProxyEvent.java index 6649c3b..de92678 100644 --- a/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/LoginByProxyEvent.java +++ b/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 . */ -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; diff --git a/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/PreSendLoginEvent.java b/api/paper/src/main/java/io/github/_4drian3d/authmevelocity/api/paper/event/PreSendLoginEvent.java similarity index 97% rename from api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/PreSendLoginEvent.java rename to api/paper/src/main/java/io/github/_4drian3d/authmevelocity/api/paper/event/PreSendLoginEvent.java index bff3ca7..03a195b 100644 --- a/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/PreSendLoginEvent.java +++ b/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 . */ -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; diff --git a/api/paper/src/main/java/io/github/_4drian3d/authmevelocity/api/paper/event/package-info.java b/api/paper/src/main/java/io/github/_4drian3d/authmevelocity/api/paper/event/package-info.java new file mode 100644 index 0000000..a0da654 --- /dev/null +++ b/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; 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 deleted file mode 100644 index a4f2fea..0000000 --- a/api/paper/src/main/java/me/adrianed/authmevelocity/api/paper/event/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** AuthMeVelocity Paper API Events */ -package me.adrianed.authmevelocity.api.paper.event; diff --git a/api/paper/src/main/java/module-info.java b/api/paper/src/main/java/module-info.java index 3890771..405ffa6 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 { +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; } diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/AuthMeVelocityAPI.java b/api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/AuthMeVelocityAPI.java similarity index 98% rename from api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/AuthMeVelocityAPI.java rename to api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/AuthMeVelocityAPI.java index 8eb184c..293a188 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/AuthMeVelocityAPI.java +++ b/api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/AuthMeVelocityAPI.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -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; diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java b/api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java similarity index 97% rename from api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java rename to api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java index c1f4b87..62502af 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/PreSendOnLoginEvent.java +++ b/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 . */ -package me.adrianed.authmevelocity.api.velocity.event; +package io.github._4drian3d.authmevelocity.api.velocity.event; import java.util.Objects; diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyForcedUnregisterEvent.java b/api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyForcedUnregisterEvent.java similarity index 93% rename from api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyForcedUnregisterEvent.java rename to api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyForcedUnregisterEvent.java index 5724630..38b145d 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyForcedUnregisterEvent.java +++ b/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 . */ -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; diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLoginEvent.java b/api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyLoginEvent.java similarity index 93% rename from api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLoginEvent.java rename to api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyLoginEvent.java index 2f3361d..134bd89 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLoginEvent.java +++ b/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 . */ -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; diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLogoutEvent.java b/api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyLogoutEvent.java similarity index 93% rename from api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLogoutEvent.java rename to api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyLogoutEvent.java index 148f911..a425891 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyLogoutEvent.java +++ b/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 . */ -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; diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyRegisterEvent.java b/api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyRegisterEvent.java similarity index 93% rename from api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyRegisterEvent.java rename to api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyRegisterEvent.java index 485f6a5..4d9e63b 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyRegisterEvent.java +++ b/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 . */ -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; diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyUnregisterEvent.java b/api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyUnregisterEvent.java similarity index 93% rename from api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyUnregisterEvent.java rename to api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ProxyUnregisterEvent.java index 4527993..23020f7 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ProxyUnregisterEvent.java +++ b/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 . */ -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; diff --git a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java b/api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ServerResult.java similarity index 96% rename from api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java rename to api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/ServerResult.java index 7f54d1f..e21f1c5 100644 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/ServerResult.java +++ b/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 . */ -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; diff --git a/api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/package-info.java b/api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/event/package-info.java new file mode 100644 index 0000000..c988a3c --- /dev/null +++ b/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; diff --git a/api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/package-info.java b/api/velocity/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/package-info.java new file mode 100644 index 0000000..f4ee919 --- /dev/null +++ b/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; 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 deleted file mode 100644 index e37c40d..0000000 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/event/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** 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 deleted file mode 100644 index cd1940a..0000000 --- a/api/velocity/src/main/java/me/adrianed/authmevelocity/api/velocity/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** Main AuthMeVelocity Velocity API package */ -package me.adrianed.authmevelocity.api.velocity; diff --git a/api/velocity/src/main/java/module-info.java b/api/velocity/src/main/java/module-info.java index 7d5622d..30f5994 100644 --- a/api/velocity/src/main/java/module-info.java +++ b/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; } diff --git a/common/build.gradle.kts b/common/build.gradle.kts index ec62d73..56f3f18 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -17,9 +17,9 @@ dependencies { 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") + 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") } } diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/Constants.java similarity index 95% rename from common/src/main/java/me/adrianed/authmevelocity/common/Constants.java rename to common/src/main/java/io/github/_4drian3d/authmevelocity/common/Constants.java index c95f41b..ed64344 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/Constants.java +++ b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/Constants.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package me.adrianed.authmevelocity.common; +package io.github._4drian3d.authmevelocity.common; public final class Constants { private Constants() {} diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/LibsManager.java similarity index 91% rename from common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java rename to common/src/main/java/io/github/_4drian3d/authmevelocity/common/LibsManager.java index dca3645..f97c046 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java +++ b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/LibsManager.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package me.adrianed.authmevelocity.common; +package io.github._4drian3d.authmevelocity.common; import net.byteflux.libby.Library; import net.byteflux.libby.LibraryManager; @@ -34,15 +34,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") diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/MessageType.java b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/MessageType.java similarity index 93% rename from common/src/main/java/me/adrianed/authmevelocity/common/MessageType.java rename to common/src/main/java/io/github/_4drian3d/authmevelocity/common/MessageType.java index a964a09..8669d63 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/MessageType.java +++ b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/MessageType.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package me.adrianed.authmevelocity.common; +package io.github._4drian3d.authmevelocity.common; public enum MessageType { LOGIN, REGISTER, LOGOUT, FORCE_UNREGISTER, UNREGISTER diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ConfigurationContainer.java b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/ConfigurationContainer.java similarity index 96% rename from common/src/main/java/me/adrianed/authmevelocity/common/configuration/ConfigurationContainer.java rename to common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/ConfigurationContainer.java index c9f0615..821ac73 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ConfigurationContainer.java +++ b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/ConfigurationContainer.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package me.adrianed.authmevelocity.common.configuration; +package io.github._4drian3d.authmevelocity.common.configuration; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/Loader.java similarity index 96% rename from common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java rename to common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/Loader.java index 0621e9d..cad99cf 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java +++ b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/Loader.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package me.adrianed.authmevelocity.common.configuration; +package io.github._4drian3d.authmevelocity.common.configuration; import java.io.IOException; import java.nio.file.Files; diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/PaperConfiguration.java similarity index 94% rename from common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java rename to common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/PaperConfiguration.java index 0ef61e1..7ea4168 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/PaperConfiguration.java +++ b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/PaperConfiguration.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -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; diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/ProxyConfiguration.java similarity index 97% rename from common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java rename to common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/ProxyConfiguration.java index 9539a5c..550fd3f 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/ProxyConfiguration.java +++ b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/configuration/ProxyConfiguration.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -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; diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/enums/SendMode.java b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/enums/SendMode.java similarity index 93% rename from common/src/main/java/me/adrianed/authmevelocity/common/enums/SendMode.java rename to common/src/main/java/io/github/_4drian3d/authmevelocity/common/enums/SendMode.java index 599af40..5eb800d 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/enums/SendMode.java +++ b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/enums/SendMode.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package me.adrianed.authmevelocity.common.enums; +package io.github._4drian3d.authmevelocity.common.enums; public enum SendMode { TO_FIRST, diff --git a/gradle.properties b/gradle.properties index ddfeaf5..9cee269 100644 --- a/gradle.properties +++ b/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 diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index 2cdc224..3a49f95 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { 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 @@ -46,8 +46,7 @@ bukkit { tasks { shadowJar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE - relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby") + relocate("net.byteflux.libby", "io.github._4drian3d.authmevelocity.libs.libby") configurations = listOf(project.configurations.shadow.get()) } } - diff --git a/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMePlaceholders.java b/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/AuthMePlaceholders.java similarity index 97% rename from paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMePlaceholders.java rename to paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/AuthMePlaceholders.java index c0ff25c..90e7cf7 100644 --- a/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMePlaceholders.java +++ b/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/AuthMePlaceholders.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package me.adrianed.authmevelocity.paper; +package io.github._4drian3d.authmevelocity.paper; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMeVelocityPlugin.java b/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/AuthMeVelocityPlugin.java similarity index 86% rename from paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMeVelocityPlugin.java rename to paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/AuthMeVelocityPlugin.java index 2ef7bb7..a3876d7 100644 --- a/paper/src/main/java/me/adrianed/authmevelocity/paper/AuthMeVelocityPlugin.java +++ b/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/AuthMeVelocityPlugin.java @@ -15,15 +15,15 @@ * along with this program. If not, see . */ -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 io.github._4drian3d.authmevelocity.paper.listeners.AuthMeListener; +import io.github._4drian3d.authmevelocity.paper.listeners.MessageListener; +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.common.MessageType; +import io.github._4drian3d.authmevelocity.common.LibsManager; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; diff --git a/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/AuthMeListener.java b/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/AuthMeListener.java similarity index 91% rename from paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/AuthMeListener.java rename to paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/AuthMeListener.java index 884c1b4..2c01d53 100644 --- a/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/AuthMeListener.java +++ b/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/AuthMeListener.java @@ -15,16 +15,16 @@ * along with this program. If not, see . */ -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; diff --git a/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/MessageListener.java b/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/MessageListener.java similarity index 89% rename from paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/MessageListener.java rename to paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/MessageListener.java index 93ac255..8624207 100644 --- a/paper/src/main/java/me/adrianed/authmevelocity/paper/listeners/MessageListener.java +++ b/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/MessageListener.java @@ -15,14 +15,14 @@ * along with this program. If not, see . */ -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; diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index ecfc27e..e926500 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -35,8 +35,8 @@ dependencies { tasks { shadowJar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE - relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby") - relocate("org.bstats", "me.adrianed.authmevelocity.libs.bstats") + relocate("net.byteflux.libby", "io.github._4drian3d.authmevelocity.libs.libby") + relocate("org.bstats", "io.github._4drian3d.authmevelocity.libs.bstats") configurations = listOf(project.configurations.shadow.get()) } } diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMePlaceholders.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMePlaceholders.java similarity index 98% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMePlaceholders.java rename to velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMePlaceholders.java index c59350a..55b9028 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMePlaceholders.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMePlaceholders.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package me.adrianed.authmevelocity.velocity; +package io.github._4drian3d.authmevelocity.velocity; import com.velocitypowered.api.proxy.Player; import me.dreamerzero.miniplaceholders.api.Expansion; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMeVelocityPlugin.java similarity index 88% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java rename to velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMeVelocityPlugin.java index 578d048..38ce207 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/AuthMeVelocityPlugin.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMeVelocityPlugin.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -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; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/commands/AuthMeCommand.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/commands/AuthMeCommand.java similarity index 95% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/commands/AuthMeCommand.java rename to velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/commands/AuthMeCommand.java index d6f5810..2fea4e0 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/commands/AuthMeCommand.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/commands/AuthMeCommand.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -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; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ConnectListener.java similarity index 95% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java rename to velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ConnectListener.java index 03ae38f..703d0c8 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ConnectListener.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ConnectListener.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -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; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/FastLoginListener.java similarity index 91% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java rename to velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/FastLoginListener.java index ae07e5b..8aca1e3 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/FastLoginListener.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/FastLoginListener.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -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; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/PluginMessageListener.java similarity index 94% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java rename to velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/PluginMessageListener.java index ba0ddfc..7ea8eb0 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/PluginMessageListener.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/PluginMessageListener.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -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; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ProxyListener.java similarity index 96% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java rename to velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ProxyListener.java index d418650..7718fe8 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ProxyListener.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -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 { diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/AuthmeUtils.java similarity index 96% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java rename to velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/AuthmeUtils.java index 2d12ecb..4ff64bb 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/AuthmeUtils.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/AuthmeUtils.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -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; diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/Pair.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/Pair.java similarity index 94% rename from velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/Pair.java rename to velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/Pair.java index 8c17ced..3a4d3b4 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/utils/Pair.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/Pair.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package me.adrianed.authmevelocity.velocity.utils; +package io.github._4drian3d.authmevelocity.velocity.utils; public record Pair(String string, O object) { public boolean isPresent() {