refactor!: change package to io.github._4drian3d.authmevelocity

This commit is contained in:
Adrian 2023-02-07 11:57:36 -05:00
parent b1d31f317d
commit d04626fb00
43 changed files with 90 additions and 91 deletions

View File

@ -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;

View File

@ -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;

View File

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

View File

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

View File

@ -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;
}

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

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

View File

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

View File

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

View File

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

View File

@ -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;
}

View File

@ -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")
}
}

View File

@ -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() {}

View File

@ -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;
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")

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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,

View File

@ -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

View File

@ -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())
}
}

View File

@ -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;

View File

@ -15,15 +15,15 @@
* 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 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;

View File

@ -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;

View File

@ -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;

View File

@ -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())
}
}

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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;

View File

@ -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() {