1
0
mirror of https://github.com/GeyserMC/Geyser.git synced 2026-01-04 15:31:36 +00:00

Fix: Configurate conflicts on Geyser-Fabric / Geyser-NeoForge

This commit is contained in:
onebeastchris
2025-11-19 14:18:01 +01:00
parent 80db983a4c
commit bc26952723
3 changed files with 21 additions and 1 deletions

View File

@@ -25,6 +25,11 @@ dependencies {
shadowBundle(libs.raknet)
shadowBundle(libs.mcprotocollib)
// Shade + relocate configurate as we're using a fork
shadowBundle(libs.configurate.`interface`)
shadowBundle(libs.configurate.yaml)
shadowBundle(libs.configurate.core)
// Since we also relocate cloudburst protocol: shade erosion common
shadowBundle(libs.erosion.common)
@@ -43,6 +48,7 @@ tasks.withType<Jar> {
relocate("org.cloudburstmc.netty")
relocate("org.cloudburstmc.protocol")
relocate("org.spongepowered.configurate")
tasks {
remapJar {
@@ -52,6 +58,10 @@ tasks {
remapModrinthJar {
archiveBaseName.set("geyser-fabric")
}
shadowJar {
mergeServiceFiles()
}
}
modrinth {

View File

@@ -30,8 +30,10 @@ dependencies {
// Let's shade in our own api
shadowBundle(projects.api)
// this one is particularly dumb
// shade + relocate these to avoid conflicts
shadowBundle(libs.configurate.`interface`)
shadowBundle(libs.configurate.yaml)
shadowBundle(libs.configurate.core)
// cannot be shaded, since neoforge will complain if floodgate-neoforge tries to provide this
include(projects.common)
@@ -43,6 +45,8 @@ dependencies {
include(libs.cloud.neoforge)
}
relocate("org.spongepowered.configurate")
tasks.withType<Jar> {
manifest.attributes["Main-Class"] = "org.geysermc.geyser.platform.neoforge.GeyserNeoForgeMain"
}
@@ -55,6 +59,10 @@ tasks {
remapModrinthJar {
archiveBaseName.set("geyser-neoforge")
}
shadowJar {
mergeServiceFiles()
}
}
modrinth {