diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index acd0cfd..3cca5b8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: - name: Build Jar run: | gradle wrapper - ./gradlew shadowJar + ./gradlew clean shadowJar - name: Publish Jar uses: actions/upload-artifact@v4 diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..1133129 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "automatic" +} \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 7f2ffb2..0000000 --- a/build.gradle +++ /dev/null @@ -1,86 +0,0 @@ -plugins { - id 'java' - id 'eclipse' - id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.8' - id 'com.github.johnrengelman.shadow' version '8.1.1' - id("xyz.jpenilla.run-velocity") version "2.3.1" -} - - -group = 'dev.colbster937' -version = '1.1.3' -description = 'A reimplementation of OriginBlacklist for EaglerXServer' -def targetJavaVersion = 17 - -repositories { - mavenCentral() - maven { - name = "papermc-repo" - url = "https://repo.papermc.io/repository/maven-public/" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/groups/public/" - } - maven { - name = "spigotmc-repo" - url = "https://hub.spigotmc.org/nexus/content/repositories/public/" - } - maven { - name = "md_5" - url = "https://repo.md-5.net/content/repositories/releases/" - } - maven { - name = "aikar" - url = "https://repo.aikar.co/nexus/content/groups/aikar/" - } - maven { - name = "lax1dude" - url = "https://repo.lax1dude.net/repository/releases/" - } -} - -dependencies { - compileOnly("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT") - annotationProcessor("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT") - compileOnly("org.bukkit:bukkit:1.8-R0.1-SNAPSHOT") - compileOnly("net.md-5:bungeecord-api:1.8-SNAPSHOT") - compileOnly("net.lax1dude.eaglercraft.backend:api-velocity:1.0.0") - compileOnly("net.lax1dude.eaglercraft.backend:api-bungee:1.0.0") - compileOnly("net.lax1dude.eaglercraft.backend:api-bukkit:1.0.0") - implementation("org.yaml:snakeyaml:2.2") - implementation("net.kyori:adventure-text-serializer-legacy:4.20.0") - implementation("net.kyori:adventure-text-minimessage:4.20.0") - implementation("com.github.seancfoley:ipaddress:5.3.4") -} - -tasks { - runVelocity { - velocityVersion("3.3.0-SNAPSHOT") - } -} - -java { - toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) -} - -processResources { - filesMatching(['plugin.yml', 'bungee.yml', 'velocity-plugin.json', 'Base.java']) { - expand( - version: project.version, - description: project.description - ) - } -} - -shadowJar { - relocate 'org.yaml.snakeyaml', 'dev.colbster937.shaded.snakeyaml' - relocate 'inet.ipaddr', 'dev.colbster937.shaded.ipaddr' - archiveVersion.set('') - archiveClassifier.set('') -} - -tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' - options.release.set(targetJavaVersion) -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..cca76dd --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,70 @@ +plugins { + id("java") + id("eclipse") + id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.8" + id("com.gradleup.shadow") version "9.3.0" + id("xyz.jpenilla.run-velocity") version "2.3.1" +} + +group = "dev.colbster937" +version = "1.1.3" +description = "A reimplementation of OriginBlacklist for EaglerXServer" + +val targetJavaVersion = 17 + +repositories { + mavenCentral() + maven("https://repo.papermc.io/repository/maven-public/") + maven("https://oss.sonatype.org/content/groups/public/") + maven("https://hub.spigotmc.org/nexus/content/repositories/public/") + maven("https://repo.md-5.net/content/repositories/releases/") + maven("https://repo.aikar.co/nexus/content/groups/aikar/") + maven("https://repo.lax1dude.net/repository/releases/") +} + +dependencies { + compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") + annotationProcessor("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") + compileOnly("org.bukkit:bukkit:1.8-R0.1-SNAPSHOT") + compileOnly("net.md-5:bungeecord-api:1.8-SNAPSHOT") + compileOnly("net.lax1dude.eaglercraft.backend:api-velocity:1.0.0") + compileOnly("net.lax1dude.eaglercraft.backend:api-bungee:1.0.0") + compileOnly("net.lax1dude.eaglercraft.backend:api-bukkit:1.0.0") + implementation("org.yaml:snakeyaml:2.2") + implementation("net.kyori:adventure-text-serializer-legacy:4.20.0") + implementation("net.kyori:adventure-text-minimessage:4.20.0") + implementation("com.github.seancfoley:ipaddress:5.3.4") +} + +tasks { + named("runVelocity") { + velocityVersion("3.4.0-SNAPSHOT") + } +} + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(targetJavaVersion)) +} + +tasks.processResources { + filesMatching(listOf("plugin.yml", "bungee.yml", "velocity-plugin.json", "Base.java")) { + expand( + mapOf( + "version" to project.version, + "description" to project.description + ) + ) + } +} + +tasks.shadowJar { + relocate("org.yaml.snakeyaml", "dev.colbster937.shaded.snakeyaml") + relocate("inet.ipaddr", "dev.colbster937.shaded.ipaddr") + archiveVersion.set("") + archiveClassifier.set("") +} + +tasks.withType().configureEach { + options.encoding = "UTF-8" + options.release.set(targetJavaVersion) +} diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index e69de29..0000000 diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 6d9264f..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'OriginBlacklist' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..c4e3979 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "OriginBlacklist"