diff --git a/GhostDisplays b/GhostDisplays index bfa6a23..a758ab1 160000 --- a/GhostDisplays +++ b/GhostDisplays @@ -1 +1 @@ -Subproject commit bfa6a2348b6268538f19703919ff6e14cb36213f +Subproject commit a758ab11bc413a7e766ff6ab1e1358578f12ffb9 diff --git a/build.gradle.kts b/build.gradle.kts index 92b758b..726d9f7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,13 +18,15 @@ val exposedVersion = "1.0.0-rc-4" dependencies { compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") - paperLibrary("org.jetbrains.kotlin:kotlin-stdlib:2.1.0") - paperLibrary("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0") - compileOnly("com.michael-bull.kotlin-result:kotlin-result:2.1.0") + implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0") { + exclude(group = "org.jetbrains.kotlin") + } + implementation("com.michael-bull.kotlin-result:kotlin-result:2.1.0") compileOnly("net.hareworks.hcu:hcu-core") - compileOnly("net.hareworks:kommand-lib") - compileOnly("net.hareworks:permits-lib") + implementation("net.hareworks:kommand-lib") + implementation("net.hareworks:permits-lib") compileOnly("net.hareworks:GhostDisplays") compileOnly("net.kyori:adventure-api:4.25.0") @@ -47,6 +49,9 @@ tasks { exclude(dependency("net.hareworks:kommand-lib")) exclude(dependency("net.hareworks:permits-lib")) } + relocate("kotlin", "net.hareworks.hcu.lands.libs.kotlin") + relocate("net.hareworks.kommand_lib", "net.hareworks.hcu.lands.libs.kommand_lib") + relocate("net.hareworks.permits_lib", "net.hareworks.hcu.lands.libs.permits_lib") } } diff --git a/hcu-core b/hcu-core index 5fbb83a..de6129c 160000 --- a/hcu-core +++ b/hcu-core @@ -1 +1 @@ -Subproject commit 5fbb83ada3e40a27e346bf77a1a54977fc67c7a7 +Subproject commit de6129cb1d227bbf4f0a277441f74a5aa7843c2e