GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-22 16:29:25 +00:00
Code Issues Releases Activity

Update netty & mcpl dependencies

Browse Source 
Fixes https://github.com/GeyserMC/Geyser/issues/5375, https://github.com/GeyserMC/Geyser/issues/5301, fixes https://github.com/GeyserMC/Geyser/issues/5050
This commit is contained in:
onebeastchris
2025-07-25 18:07:35 +02:00
parent 7a154504cd
commit df4bb4f1c1
15 changed files with 47 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build-logic/src/main/kotlin/extensions.kt
View File

@@ -42,9 +42,12 @@ fun Project.relocate(pattern: String) {
}
}
fun Project.exclude(group: String) {
// Excludes all dependencies from a module - except one
fun Project.exclude(group: String, lib: Provider<MinimalExternalModuleDependency>) {
tasks.named<ShadowJar>("shadowJar") {
exclude(group)
dependencies {
exclude { it.moduleGroup == group && it.moduleName != lib.get().module.name }
}
}
}
@@ -58,10 +61,6 @@ fun Project.platformRelocate(pattern: String, exclusion: String = "") {
val providedDependencies = mutableMapOf<String, MutableSet<String>>()
fun getProvidedDependenciesForProject(projectName: String): MutableSet<String> {
return providedDependencies.getOrDefault(projectName, emptySet()).toMutableSet()
}
fun Project.provided(pattern: String, name: String, excludedOn: Int = 0b110) {
providedDependencies.getOrPut(project.name) { mutableSetOf() }
.add("${calcExclusion(pattern, 0b100, excludedOn)}:${calcExclusion(name, 0b10, excludedOn)}")

9
build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts
View File

@@ -24,8 +24,8 @@ provided("io.netty", "netty-transport-native-epoll")
provided("io.netty", "netty-transport-native-unix-common")
provided("io.netty", "netty-transport-classes-kqueue")
provided("io.netty", "netty-transport-native-kqueue")
provided("io.netty.incubator", "netty-incubator-transport-native-io_uring")
provided("io.netty.incubator", "netty-incubator-transport-classes-io_uring")
provided("io.netty", "netty-transport-native-io_uring")
provided("io.netty", "netty-transport-classes-io_uring")
provided("io.netty", "netty-handler")
provided("io.netty", "netty-common")
provided("io.netty", "netty-buffer")
@@ -33,9 +33,6 @@ provided("io.netty", "netty-resolver")
provided("io.netty", "netty-transport")
provided("io.netty", "netty-codec")
provided("io.netty", "netty-codec-base")
provided("io.netty", "netty-resolver-dns")
provided("io.netty", "netty-resolver-dns-native-macos")
provided("io.netty", "netty-resolver-dns-classes-macos")
provided("org.ow2.asm", "asm")
// cloud-fabric/cloud-neoforge jij's all cloud depends already
@@ -93,7 +90,7 @@ tasks {
}
afterEvaluate {
val providedDependencies = getProvidedDependenciesForProject(project.name)
val providedDependencies = providedDependencies[project.name]!!
// These are shaded, no need to JiJ them
configurations["shadow"].dependencies.forEach {shadowed ->

2
build-logic/src/main/kotlin/geyser.modrinth-uploading-conventions.gradle.kts
View File

@@ -13,7 +13,7 @@ modrinth {
versionNumber.set(projectVersion(project))
versionType.set("beta")
changelog.set(System.getenv("CHANGELOG") ?: "")
gameVersions.add(libs.minecraft.get().version as String)
gameVersions.addAll("1.21.7", libs.minecraft.get().version as String)
failSilently.set(true)
syncBodyFrom.set(rootProject.file("README.md").readText())