Change relocate behavior

Author: Rothes

buildSrc/src/main/kotlin/sources-fat-jar.gradle.kts renamed to buildSrc/src/main/kotlin/relocate-sources.gradle.kts

@@ -4,12 +4,17 @@ plugins {
     id("com.gradleup.shadow")
 }
 
-interface SourcesFatJarExtension {
-    val relocates: ListProperty<String>
+interface RelocateSourcesExtension {
+    val relocates: ListProperty<Relocate>
     val postSources: Property<(String) -> String>
+
+    data class Relocate(
+        val original: String,
+        val relocated: String = original,
+    )
 }
 
-val extension = project.extensions.create<SourcesFatJarExtension>("sourcesFatJar")
+val extension = project.extensions.create<RelocateSourcesExtension>("relocateSources")
 extension.postSources.convention { it }
 
 val sourcesFatJar = tasks.register("sourcesFatJar", Jar::class) {
@@ -24,13 +29,18 @@ val sourcesFatJar = tasks.register("sourcesFatJar", Jar::class) {
         .forComponents(configurations.runtimeClasspath.get().incoming.resolutionResult.allDependencies.filter {
             !it.from.id.displayName.startsWith("org.jetbrains.kotlin:kotlin-stdlib")
         }.map { it.from.id }).withArtifacts(JvmLibrary::class.java, SourcesArtifact::class.java).execute()
+
+    val relocates = extension.relocates.get().sortedByDescending { it.original.length }
     val replace = { str: String ->
         val destPrefix = "io.github.rothes.${rootProject.name.lowercase()}.lib."
-        fun String.relocate(s: String) = replace(s, destPrefix + s)
         var res = str
-        extension.relocates.get().forEach { res = res.relocate(it) }
+        relocates.forEach { res = res.replace(it.original, destPrefix + it.relocated) }
         extension.postSources.get().invoke(res)
     }
+    val rep = relocates.map { relocate ->
+        fun String.toPath() = replace('.', '/')
+        relocate.original.toPath() to "io/github/rothes/${rootProject.name.lowercase()}/lib/" + relocate.relocated.toPath()
+    }
     for (component in result.resolvedComponents) {
         component.getArtifacts(SourcesArtifact::class.java).forEach {
             if (it is ResolvedArtifactResult) {
@@ -41,11 +51,13 @@ val sourcesFatJar = tasks.register("sourcesFatJar", Jar::class) {
                     tmp.writeText(replace(file.readText()))
                     from(tmp) {
                         duplicatesStrategy = DuplicatesStrategy.WARN
-                        into(
-                            "io/github/rothes/${rootProject.name.lowercase()}/lib/" + path.substringBeforeLast(
-                                "/"
-                            )
-                        )
+                        var intoPath = path.substringBeforeLast("/")
+                        for ((from, dest) in rep) {
+                            if (intoPath.startsWith(from)) {
+                                intoPath = dest + intoPath.substring(from.length)
+                            }
+                        }
+                        into(intoPath)
                     }
                 }
             }
@@ -74,12 +86,11 @@ publishing {
 
 tasks.shadowJar {
     doFirst { // Wait for configuration
-        val pkg = "io.github.rothes.${rootProject.name.lowercase()}.lib"
-        fun relocate(pattern: String) {
-            relocate(pattern, "$pkg.$pattern")
-        }
+        val pkg = "io.github.rothes.${rootProject.name.lowercase()}.lib."
 
-        extension.relocates.get().forEach { relocate(it) }
+        extension.relocates.get()
+            .sortedByDescending { it.original.length }
+            .forEach { relocate(it.original, pkg + it.relocated) }
 
         mergeServiceFiles()
     }

bukkit/dep-bukkit/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    `sources-fat-jar`
+    `relocate-sources`
 }
 
 repositories {
@@ -11,6 +11,7 @@ dependencies {
     implementation("net.kyori:adventure-platform-bukkit:4.4.1")
 }
 
-sourcesFatJar {
-    relocates.add("net.kyori")
+relocateSources {
+    relocates.add(Relocate_sources_gradle.RelocateSourcesExtension.Relocate("net.kyori"))
+    relocates.add(Relocate_sources_gradle.RelocateSourcesExtension.Relocate("net.kyori.adventure", "adventure"))
 }

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/EsuPluginBukkit.kt

@@ -83,7 +83,10 @@ class EsuPluginBukkit(
             if (ServerCompatibility.hasMojmap)
                 MappingsLoader
         }
-        val relocator = PackageRelocator("net/kyori/" to "io/github/rothes/esu/lib/net/kyori/")
+        val relocator = PackageRelocator(
+            "net/kyori/adventure/" to "io/github/rothes/esu/lib/adventure/",
+            "net/kyori/" to "io/github/rothes/esu/lib/net/kyori/"
+        )
         MavenResolver.loadDependencies(
             listOf(
                 "net.kyori:adventure-platform-bukkit:4.4.1",
@@ -96,7 +99,7 @@ class EsuPluginBukkit(
             )
         ) { file, artifact ->
             if (artifact.groupId == "net.kyori")
-                CachedRelocator.relocate(relocator, file)
+                CachedRelocator.relocate(relocator, file, "2")
             else
                 file
         }

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/Internals.kt

@@ -6,9 +6,9 @@ import io.github.rothes.esu.bukkit.user.PlayerUser
 import io.github.rothes.esu.core.EsuBootstrap
 import io.github.rothes.esu.core.EsuCore
 import io.github.rothes.esu.core.util.ComponentUtils
-import io.github.rothes.esu.lib.net.kyori.adventure.audience.Audience
-import io.github.rothes.esu.lib.net.kyori.adventure.platform.bukkit.BukkitAudiences
-import io.github.rothes.esu.lib.net.kyori.adventure.text.Component
+import io.github.rothes.esu.lib.adventure.audience.Audience
+import io.github.rothes.esu.lib.adventure.platform.bukkit.BukkitAudiences
+import io.github.rothes.esu.lib.adventure.text.Component
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 import java.util.*

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/config/BukkitEsuLocale.kt

@@ -5,7 +5,7 @@ import io.github.rothes.esu.bukkit.config.BukkitEsuLocale.BukkitLocaleData
 import io.github.rothes.esu.core.EsuCore
 import io.github.rothes.esu.core.configuration.ConfigLoader
 import io.github.rothes.esu.core.configuration.MultiLocaleConfiguration
-import io.github.rothes.esu.lib.org.spongepowered.configurate.objectmapping.meta.PostProcess
+import io.github.rothes.esu.lib.configurate.objectmapping.meta.PostProcess
 import org.incendo.cloud.bukkit.BukkitDefaultCaptionsProvider
 import org.incendo.cloud.caption.ConstantCaptionProvider
 import org.incendo.cloud.caption.DelegatingCaptionProvider

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/config/data/InventoryData.kt

@@ -2,8 +2,8 @@ package io.github.rothes.esu.bukkit.config.data
 
 import io.github.rothes.esu.core.configuration.ConfigurationPart
 import io.github.rothes.esu.core.configuration.meta.NoDeserializeNull
-import io.github.rothes.esu.lib.org.spongepowered.configurate.objectmapping.meta.NodeKey
-import io.github.rothes.esu.lib.org.spongepowered.configurate.objectmapping.meta.Setting
+import io.github.rothes.esu.lib.configurate.objectmapping.meta.NodeKey
+import io.github.rothes.esu.lib.configurate.objectmapping.meta.Setting
 import org.bukkit.Material
 import org.bukkit.event.inventory.InventoryType
 

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/config/data/ItemData.kt

@@ -13,9 +13,9 @@ import io.github.rothes.esu.core.configuration.meta.NoDeserializeNull
 import io.github.rothes.esu.core.user.User
 import io.github.rothes.esu.core.util.ComponentUtils
 import io.github.rothes.esu.core.util.ComponentUtils.nonItalic
-import io.github.rothes.esu.lib.net.kyori.adventure.text.Component
-import io.github.rothes.esu.lib.net.kyori.adventure.text.minimessage.MiniMessage
-import io.github.rothes.esu.lib.net.kyori.adventure.text.minimessage.tag.resolver.TagResolver
+import io.github.rothes.esu.lib.adventure.text.Component
+import io.github.rothes.esu.lib.adventure.text.minimessage.MiniMessage
+import io.github.rothes.esu.lib.adventure.text.minimessage.tag.resolver.TagResolver
 import io.lumine.mythic.bukkit.BukkitAdapter
 import io.lumine.mythic.bukkit.MythicBukkit
 import io.lumine.mythic.core.drops.DropMetadataImpl

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/config/serializer/AttributeSerializer.kt

@@ -2,7 +2,7 @@ package io.github.rothes.esu.bukkit.config.serializer
 
 import io.github.rothes.esu.bukkit.util.version.adapter.AttributeAdapter
 import io.github.rothes.esu.bukkit.util.version.adapter.AttributeAdapter.Companion.key_
-import io.github.rothes.esu.lib.org.spongepowered.configurate.serialize.ScalarSerializer
+import io.github.rothes.esu.lib.configurate.serialize.ScalarSerializer
 import org.bukkit.attribute.Attribute
 import java.lang.reflect.Type
 import java.util.function.Predicate

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/event/UserChatEvent.kt

@@ -7,7 +7,7 @@ import io.github.rothes.esu.bukkit.util.extension.ListenerExt.register
 import io.github.rothes.esu.core.util.AdventureConverter.esu
 import io.github.rothes.esu.core.util.AdventureConverter.server
 import io.github.rothes.esu.core.util.ComponentUtils.legacy
-import io.github.rothes.esu.lib.net.kyori.adventure.text.Component
+import io.github.rothes.esu.lib.adventure.text.Component
 import org.bukkit.Bukkit
 import org.bukkit.entity.Player
 import org.bukkit.event.*

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/inventory/EsuInvHolder.kt

@@ -7,7 +7,7 @@ import io.github.rothes.esu.bukkit.util.scheduler.Scheduler
 import io.github.rothes.esu.core.util.AdventureConverter.server
 import io.github.rothes.esu.core.util.ComponentUtils.miniMessage
 import io.github.rothes.esu.core.util.VarLazy
-import io.github.rothes.esu.lib.net.kyori.adventure.text.Component
+import io.github.rothes.esu.lib.adventure.text.Component
 import org.bukkit.Bukkit
 import org.bukkit.entity.HumanEntity
 import org.bukkit.event.inventory.InventoryAction