diff options
13 files changed, 36 insertions, 28 deletions
diff --git a/build.gradle b/build.gradle index 706a1b7..b783539 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ plugins { } setGroup("net.elytrium") -setVersion("1.0.9") +setVersion("1.1.0") java { setSourceCompatibility(JavaVersion.VERSION_11) @@ -39,27 +39,27 @@ repositories { } dependencies { - compileOnly("net.elytrium:limboapi-api:1.0.8-SNAPSHOT") + compileOnly("net.elytrium.limboapi:api:$limboapiVersion") - compileOnly("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT") - compileOnly("com.velocitypowered:velocity-proxy:3.2.0-SNAPSHOT") // From Elytrium Repo. - annotationProcessor("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT") + compileOnly("com.velocitypowered:velocity-api:$velocityVersion") + annotationProcessor("com.velocitypowered:velocity-api:$velocityVersion") + compileOnly("com.velocitypowered:velocity-proxy:$velocityVersion") // From Elytrium Repo. // Needs for some velocity methods. - compileOnly('io.netty:netty-codec:4.1.86.Final') - compileOnly("io.netty:netty-handler:4.1.86.Final") + compileOnly("io.netty:netty-codec:$nettyVersion") + compileOnly("io.netty:netty-handler:$nettyVersion") - compileOnly("org.geysermc.floodgate:api:2.1.1-SNAPSHOT") + compileOnly("org.geysermc.floodgate:api:$floodgateVersion") implementation("at.favre.lib:bcrypt:0.9.0") implementation("dev.samstevens.totp:totp:1.7.1") implementation("com.j256.ormlite:ormlite-jdbc:6.1") - - implementation("org.bstats:bstats-velocity:3.0.0") implementation("de.mkammerer:argon2-jvm-nolibs:2.11") - compileOnly('com.github.spotbugs:spotbugs-annotations:4.7.3') + implementation("org.bstats:bstats-velocity:$bstatsVersion") + + compileOnly("com.github.spotbugs:spotbugs-annotations:$spotbugsVersion") } shadowJar { @@ -108,6 +108,7 @@ shadowJar { relocate("dev.samstevens.totp", "net.elytrium.limboauth.thirdparty.dev.samstevens.totp") relocate("org.apache.commons.codec", "net.elytrium.limboauth.thirdparty.org.apache.commons.codec") relocate("org.bstats", "net.elytrium.limboauth.thirdparty.org.bstats") + relocate("net.elytrium.commons", "net.elytrium.limboapi.thirdparty.commons") } license { diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..8539373 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,7 @@ +limboapiVersion=1.1.0 +velocityVersion=3.2.0-SNAPSHOT +nettyVersion=4.1.86.Final +floodgateVersion=2.1.1-SNAPSHOT +fastutilVersion=8.5.11 +bstatsVersion=3.0.0 +spotbugsVersion=4.7.3 diff --git a/src/main/java/net/elytrium/limboauth/LimboAuth.java b/src/main/java/net/elytrium/limboauth/LimboAuth.java index 5030a4d..5a422e4 100644 --- a/src/main/java/net/elytrium/limboauth/LimboAuth.java +++ b/src/main/java/net/elytrium/limboauth/LimboAuth.java @@ -72,10 +72,10 @@ import java.util.function.Function; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import net.elytrium.java.commons.mc.serialization.Serializer; -import net.elytrium.java.commons.mc.serialization.Serializers; -import net.elytrium.java.commons.reflection.ReflectionException; -import net.elytrium.java.commons.updates.UpdatesChecker; +import net.elytrium.commons.kyori.serialization.Serializer; +import net.elytrium.commons.kyori.serialization.Serializers; +import net.elytrium.commons.utils.reflection.ReflectionException; +import net.elytrium.commons.utils.updates.UpdatesChecker; import net.elytrium.limboapi.api.Limbo; import net.elytrium.limboapi.api.LimboFactory; import net.elytrium.limboapi.api.chunk.VirtualWorld; diff --git a/src/main/java/net/elytrium/limboauth/Settings.java b/src/main/java/net/elytrium/limboauth/Settings.java index c08cc08..9a61af3 100644 --- a/src/main/java/net/elytrium/limboauth/Settings.java +++ b/src/main/java/net/elytrium/limboauth/Settings.java @@ -18,8 +18,8 @@ package net.elytrium.limboauth; import java.util.List; -import net.elytrium.java.commons.config.YamlConfig; -import net.elytrium.java.commons.mc.serialization.Serializers; +import net.elytrium.commons.config.YamlConfig; +import net.elytrium.commons.kyori.serialization.Serializers; import net.elytrium.limboapi.api.chunk.Dimension; import net.elytrium.limboapi.api.player.GameMode; import net.elytrium.limboauth.dependencies.DatabaseLibrary; diff --git a/src/main/java/net/elytrium/limboauth/command/ChangePasswordCommand.java b/src/main/java/net/elytrium/limboauth/command/ChangePasswordCommand.java index c940226..f22a96f 100644 --- a/src/main/java/net/elytrium/limboauth/command/ChangePasswordCommand.java +++ b/src/main/java/net/elytrium/limboauth/command/ChangePasswordCommand.java @@ -24,7 +24,7 @@ import com.velocitypowered.api.command.SimpleCommand; import com.velocitypowered.api.permission.Tristate; import com.velocitypowered.api.proxy.Player; import java.sql.SQLException; -import net.elytrium.java.commons.mc.serialization.Serializer; +import net.elytrium.commons.kyori.serialization.Serializer; import net.elytrium.limboauth.LimboAuth; import net.elytrium.limboauth.Settings; import net.elytrium.limboauth.handler.AuthSessionHandler; diff --git a/src/main/java/net/elytrium/limboauth/command/DestroySessionCommand.java b/src/main/java/net/elytrium/limboauth/command/DestroySessionCommand.java index dc17104..604681c 100644 --- a/src/main/java/net/elytrium/limboauth/command/DestroySessionCommand.java +++ b/src/main/java/net/elytrium/limboauth/command/DestroySessionCommand.java @@ -21,7 +21,7 @@ import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.SimpleCommand; import com.velocitypowered.api.permission.Tristate; import com.velocitypowered.api.proxy.Player; -import net.elytrium.java.commons.mc.serialization.Serializer; +import net.elytrium.commons.kyori.serialization.Serializer; import net.elytrium.limboauth.LimboAuth; import net.elytrium.limboauth.Settings; import net.kyori.adventure.text.Component; diff --git a/src/main/java/net/elytrium/limboauth/command/ForceChangePasswordCommand.java b/src/main/java/net/elytrium/limboauth/command/ForceChangePasswordCommand.java index 5c960e1..f497c3c 100644 --- a/src/main/java/net/elytrium/limboauth/command/ForceChangePasswordCommand.java +++ b/src/main/java/net/elytrium/limboauth/command/ForceChangePasswordCommand.java @@ -26,8 +26,8 @@ import java.sql.SQLException; import java.text.MessageFormat; import java.util.List; import java.util.Locale; -import net.elytrium.java.commons.mc.serialization.Serializer; -import net.elytrium.java.commons.mc.velocity.commands.SuggestUtils; +import net.elytrium.commons.kyori.serialization.Serializer; +import net.elytrium.commons.velocity.commands.SuggestUtils; import net.elytrium.limboauth.LimboAuth; import net.elytrium.limboauth.Settings; import net.elytrium.limboauth.handler.AuthSessionHandler; diff --git a/src/main/java/net/elytrium/limboauth/command/ForceUnregisterCommand.java b/src/main/java/net/elytrium/limboauth/command/ForceUnregisterCommand.java index 3acc2d0..9d34d82 100644 --- a/src/main/java/net/elytrium/limboauth/command/ForceUnregisterCommand.java +++ b/src/main/java/net/elytrium/limboauth/command/ForceUnregisterCommand.java @@ -25,8 +25,8 @@ import java.sql.SQLException; import java.text.MessageFormat; import java.util.List; import java.util.Locale; -import net.elytrium.java.commons.mc.serialization.Serializer; -import net.elytrium.java.commons.mc.velocity.commands.SuggestUtils; +import net.elytrium.commons.kyori.serialization.Serializer; +import net.elytrium.commons.velocity.commands.SuggestUtils; import net.elytrium.limboauth.LimboAuth; import net.elytrium.limboauth.Settings; import net.elytrium.limboauth.event.AuthUnregisterEvent; diff --git a/src/main/java/net/elytrium/limboauth/command/PremiumCommand.java b/src/main/java/net/elytrium/limboauth/command/PremiumCommand.java index f81ce10..fb42e92 100644 --- a/src/main/java/net/elytrium/limboauth/command/PremiumCommand.java +++ b/src/main/java/net/elytrium/limboauth/command/PremiumCommand.java @@ -24,7 +24,7 @@ import com.velocitypowered.api.permission.Tristate; import com.velocitypowered.api.proxy.Player; import java.sql.SQLException; import java.util.Locale; -import net.elytrium.java.commons.mc.serialization.Serializer; +import net.elytrium.commons.kyori.serialization.Serializer; import net.elytrium.limboauth.LimboAuth; import net.elytrium.limboauth.Settings; import net.elytrium.limboauth.handler.AuthSessionHandler; diff --git a/src/main/java/net/elytrium/limboauth/command/TotpCommand.java b/src/main/java/net/elytrium/limboauth/command/TotpCommand.java index afa4b30..b5edb66 100644 --- a/src/main/java/net/elytrium/limboauth/command/TotpCommand.java +++ b/src/main/java/net/elytrium/limboauth/command/TotpCommand.java @@ -31,7 +31,7 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.sql.SQLException; import java.text.MessageFormat; -import net.elytrium.java.commons.mc.serialization.Serializer; +import net.elytrium.commons.kyori.serialization.Serializer; import net.elytrium.limboauth.LimboAuth; import net.elytrium.limboauth.Settings; import net.elytrium.limboauth.handler.AuthSessionHandler; diff --git a/src/main/java/net/elytrium/limboauth/command/UnregisterCommand.java b/src/main/java/net/elytrium/limboauth/command/UnregisterCommand.java index 53fe58e..03f0cfc 100644 --- a/src/main/java/net/elytrium/limboauth/command/UnregisterCommand.java +++ b/src/main/java/net/elytrium/limboauth/command/UnregisterCommand.java @@ -24,7 +24,7 @@ import com.velocitypowered.api.permission.Tristate; import com.velocitypowered.api.proxy.Player; import java.sql.SQLException; import java.util.Locale; -import net.elytrium.java.commons.mc.serialization.Serializer; +import net.elytrium.commons.kyori.serialization.Serializer; import net.elytrium.limboauth.LimboAuth; import net.elytrium.limboauth.Settings; import net.elytrium.limboauth.event.AuthUnregisterEvent; diff --git a/src/main/java/net/elytrium/limboauth/handler/AuthSessionHandler.java b/src/main/java/net/elytrium/limboauth/handler/AuthSessionHandler.java index 20188eb..ebdd6f4 100644 --- a/src/main/java/net/elytrium/limboauth/handler/AuthSessionHandler.java +++ b/src/main/java/net/elytrium/limboauth/handler/AuthSessionHandler.java @@ -33,7 +33,7 @@ import java.util.UUID; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import net.elytrium.java.commons.mc.serialization.Serializer; +import net.elytrium.commons.kyori.serialization.Serializer; import net.elytrium.limboapi.api.Limbo; import net.elytrium.limboapi.api.LimboSessionHandler; import net.elytrium.limboapi.api.player.LimboPlayer; diff --git a/src/main/java/net/elytrium/limboauth/listener/AuthListener.java b/src/main/java/net/elytrium/limboauth/listener/AuthListener.java index 93f1bc1..7e1cb82 100644 --- a/src/main/java/net/elytrium/limboauth/listener/AuthListener.java +++ b/src/main/java/net/elytrium/limboauth/listener/AuthListener.java @@ -38,7 +38,7 @@ import java.sql.SQLException; import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; -import net.elytrium.java.commons.reflection.ReflectionException; +import net.elytrium.commons.utils.reflection.ReflectionException; import net.elytrium.limboapi.api.event.LoginLimboRegisterEvent; import net.elytrium.limboauth.LimboAuth; import net.elytrium.limboauth.Settings; |