diff --git a/README.md b/README.md index 1cd90f8..2b58179 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,12 @@ This plugin adds the support for [Velocity](https://velocitypowered.com/) to [Au ## Requirements - Paper, Airplane or Purpur 1.13+ - Velocity 3.1.2+ -- Java 11+ +- Java 17+ ## Setup 1. Download the latest release of the plugin [link](https://github.com/4drian3d/AuthMeVelocity/releases) -2. Put the jar that ends with "-proxy" in Velocity's plugins folder -3. Put the jar that ends with "-spigot" in the Spigot servers that contains AuthMe -4. Start the Velocity proxy and set up the config.yml with the auth servers +2. Put the plugin in the Velocity plugins folder and on all your Auth servers that have AuthMe installed. +4. Start the Velocity proxy and set up the config.conf with the auth servers. ## Plugin API Check the plugin API [here](https://github.com/4drian3d/AuthMeVelocity/wiki/Plugin-API) diff --git a/api/paper/build.gradle.kts b/api/paper/build.gradle.kts index 15f243a..08dc163 100644 --- a/api/paper/build.gradle.kts +++ b/api/paper/build.gradle.kts @@ -5,7 +5,6 @@ plugins { java { withSourcesJar() withJavadocJar() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) } dependencies { @@ -13,10 +12,6 @@ dependencies { } tasks { - compileJava { - options.encoding = Charsets.UTF_8.name() - options.release.set(17) - } javadoc { options.encoding = Charsets.UTF_8.name() (options as StandardJavadocDocletOptions).links( diff --git a/api/velocity/build.gradle.kts b/api/velocity/build.gradle.kts index 2c3c58a..d102126 100644 --- a/api/velocity/build.gradle.kts +++ b/api/velocity/build.gradle.kts @@ -9,15 +9,9 @@ dependencies { java { withSourcesJar() withJavadocJar() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) } tasks { - compileJava { - options.encoding = Charsets.UTF_8.name() - - options.release.set(17) - } javadoc { options.encoding = Charsets.UTF_8.name() (options as StandardJavadocDocletOptions).links( diff --git a/build.gradle.kts b/build.gradle.kts index ac01f40..4a63c67 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,9 +12,16 @@ repositories { allprojects { apply() repositories { - mavenCentral() 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 { @@ -45,4 +52,3 @@ tasks { } } -java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 615082e..19d1f54 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -4,6 +4,7 @@ plugins { } repositories { + mavenCentral() maven("https://repo.alessiodp.com/releases/") } @@ -20,15 +21,8 @@ tasks { relocate("org.spongepowered", "me.adrianed.authmevelocity.libs.sponge") relocate("io.leangen.geantyref", "me.adrianed.authmevelocity.libs.geantyref") } - compileJava { - options.encoding = Charsets.UTF_8.name() - - options.release.set(17) - } } -java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) - blossom { replaceTokenIn("src/main/java/me/adrianed/authmevelocity/common/Constants.java") replaceToken("{version}", project.version) diff --git a/gradle.properties b/gradle.properties index b6e18df..b2421e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = me.adrianed.authmevelocity -version = 3.0.0-SNAPSHOT +version = 3.0.0 description = AuthMeReloaded Support for Velocity url = https://github.com/4drian3d/AuthMeVelocity id = authmevelocity diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index 585f18e..6faa13f 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -1,5 +1,3 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar - plugins { id("net.minecrell.plugin-yml.bukkit") version "0.5.2" id("com.github.johnrengelman.shadow") version "7.1.2" @@ -38,12 +36,5 @@ tasks { relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby") configurations = listOf(project.configurations.shadow.get()) } - - compileJava { - options.encoding = Charsets.UTF_8.name() - - options.release.set(17) - } } -java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 168dc72..4446a14 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -3,29 +3,23 @@ plugins { } repositories { + maven("https://repo.codemc.org/repository/maven-public/") maven("https://repo.alessiodp.com/releases/") maven("https://jitpack.io") - maven("https://repo.codemc.org/repository/maven-public/") } dependencies { + compileOnly(project(":authmevelocity-common")) + compileOnly(project(":authmevelocity-api-velocity")) compileOnly("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") - annotationProcessor("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") compileOnly("com.github.4drian3d:MiniPlaceholders:1.1.1") compileOnly("com.github.games647:fastlogin.velocity:1.11-SNAPSHOT") shadow("net.byteflux:libby-velocity:1.1.5") shadow("org.bstats:bstats-velocity:3.0.0") - compileOnly(project(":authmevelocity-common")) - compileOnly(project(":authmevelocity-api-velocity")) + annotationProcessor("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") } tasks { - compileJava { - options.encoding = Charsets.UTF_8.name() - - options.release.set(17) - } - shadowJar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE relocate("net.byteflux.libby", "me.adrianed.authmevelocity.libs.libby") @@ -34,4 +28,3 @@ tasks { } } -java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))