diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index 1a86c9e..8ea4da0 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -9,11 +9,11 @@ val rootDependencyDir = "${rootProject.group}.dependencies" val dependencyDir = "${group}.bukkit.dependencies" version = rootProject.version base { - archivesName.set("${rootProject.name}-Bukkit") + archivesName.set("${rootProject.name}-bukkit") } dependencies { - implementation("cloud.commandframework:cloud-paper:${VersionConstants.cloudVersion}") + implementation("org.zhdev.oblak:cloud-paper:${VersionConstants.cloudVersion}") implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") { exclude("net.kyori", "adventure-text-minimessage") } @@ -36,11 +36,11 @@ tasks.withType { } bukkit { - name = "ServerUtils" + name = "Bukman" main = "net.frankheijden.serverutils.bukkit.ServerUtils" description = "A server utility" apiVersion = "1.13" - website = "https://github.com/FrankHeijden/ServerUtils" + website = "https://git.zhira.net/zhdev/bukman" softDepend = listOf("ServerUtilsUpdater") - authors = listOf("FrankHeijden") + authors = listOf("FrankHeijden", "ZhDev") } diff --git a/Bungee/build.gradle.kts b/Bungee/build.gradle.kts index a49de7f..420993c 100644 --- a/Bungee/build.gradle.kts +++ b/Bungee/build.gradle.kts @@ -9,7 +9,7 @@ val rootDependencyDir = "${group}.dependencies" val dependencyDir = "${group}.bungee.dependencies" version = rootProject.version base { - archivesName.set("${rootProject.name}-Bungee") + archivesName.set("${rootProject.name}-bungee") } repositories { @@ -17,7 +17,7 @@ repositories { } dependencies { - implementation("cloud.commandframework:cloud-bungee:${VersionConstants.cloudVersion}") + implementation("org.zhdev.oblak:cloud-bungee:${VersionConstants.cloudVersion}") implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") { exclude("net.kyori", "adventure-text-minimessage") } @@ -38,7 +38,7 @@ tasks.withType { } bungee { - name = "ServerUtils" + name = "Bukman" main = "net.frankheijden.serverutils.bungee.ServerUtils" description = "A server utility" softDepends = setOf("ServerUtilsUpdater") diff --git a/Common/build.gradle.kts b/Common/build.gradle.kts index 5290a6b..a73506d 100644 --- a/Common/build.gradle.kts +++ b/Common/build.gradle.kts @@ -7,7 +7,7 @@ plugins { group = rootProject.group version = "${rootProject.version}" base { - archivesName.set("${rootProject.name}-Common") + archivesName.set("${rootProject.name}-common") } repositories { diff --git a/Velocity/build.gradle.kts b/Velocity/build.gradle.kts index c9499d6..ae56ff4 100644 --- a/Velocity/build.gradle.kts +++ b/Velocity/build.gradle.kts @@ -8,7 +8,7 @@ group = "${rootProject.group}" val dependencyDir = "${group}.velocity.dependencies" version = rootProject.version base { - archivesName.set("${rootProject.name}-Velocity") + archivesName.set("${rootProject.name}-velocity") } repositories { @@ -17,7 +17,7 @@ repositories { } dependencies { - implementation("cloud.commandframework:cloud-velocity:${VersionConstants.cloudVersion}") + implementation("org.zhdev.oblak:cloud-velocity:${VersionConstants.cloudVersion}") implementation("org.bstats:bstats-velocity:${VersionConstants.bstatsVersion}") implementation(project(":Common")) implementation("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") { diff --git a/build.gradle.kts b/build.gradle.kts index 22f6c5c..f2be164 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { group = "net.frankheijden.serverutils" val dependencyDir = "${group}.dependencies" -version = "3.5.5-SNAPSHOT" +version = "3.5.6-SNAPSHOT" java { sourceCompatibility = JavaVersion.VERSION_1_8 @@ -27,17 +27,19 @@ subprojects { } repositories { + mavenLocal() mavenCentral() maven("https://jitpack.io") maven("https://oss.sonatype.org/content/repositories/snapshots") - maven("https://papermc.io/repo/repository/maven-public/") + maven("https://repo.papermc.io/repository/maven-public/") maven("https://libraries.minecraft.net") + maven("https://maven.zhira.net/repository/zhdev/") } dependencies { - implementation("cloud.commandframework:cloud-core:${VersionConstants.cloudVersion}") - implementation("cloud.commandframework:cloud-brigadier:${VersionConstants.cloudVersion}") - implementation("com.github.FrankHeijden:MinecraftReflection:1.0.0") + implementation("org.zhdev.oblak:cloud-core:${VersionConstants.cloudVersion}") + implementation("org.zhdev.oblak:cloud-brigadier:${VersionConstants.cloudVersion}") + implementation("org.zhdev:megareflection:1.0.2-SNAPSHOT") implementation("com.google.code.gson:gson:2.8.6") implementation("me.lucko:commodore:2.2") compileOnly("com.mojang:brigadier:1.0.18") @@ -93,6 +95,7 @@ subprojects { } relocate("net.kyori.adventure.text.minimessage", "${dependencyDir}.adventure.text.minimessage") relocate("dev.frankheijden.minecraftreflection", "${dependencyDir}.minecraftreflection") + relocate("org.zhdev", "${dependencyDir}.zhdev") } publishing { @@ -113,11 +116,11 @@ subprojects { } publications { - create("ServerUtils") { + create("bukman") { artifact(tasks["shadowJar"]) { classifier = "" } - artifactId = "ServerUtils-$artifactId" + artifactId = "bukman-$artifactId" } } } @@ -192,11 +195,11 @@ publishing { } publications { - create("ServerUtils") { + create("bukman") { artifact(tasks["shadowJar"]) { classifier = "" } - artifactId = "ServerUtils" + artifactId = "bukman" } } }