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

Merge remote-tracking branch 'upstream/master' into feature/1.21.6

Browse Source
This commit is contained in:
onebeastchris
2025-06-19 02:53:57 +02:00
parent ca6340e56d 489c4f2e9a
commit 32057c31b6
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,8 +32,10 @@ provided("io.netty", "netty-buffer")
provided("io.netty", "netty-resolver") provided("io.netty", "netty-resolver")
provided("io.netty", "netty-transport") provided("io.netty", "netty-transport")
provided("io.netty", "netty-codec") provided("io.netty", "netty-codec")
provided("io.netty", "netty-codec-base")
provided("io.netty", "netty-resolver-dns") provided("io.netty", "netty-resolver-dns")
provided("io.netty", "netty-resolver-dns-native-macos") provided("io.netty", "netty-resolver-dns-native-macos")
provided("io.netty", "netty-resolver-dns-classes-macos")
provided("org.ow2.asm", "asm") provided("org.ow2.asm", "asm")
// cloud-fabric/cloud-neoforge jij's all cloud depends already // cloud-fabric/cloud-neoforge jij's all cloud depends already
@@ -103,10 +105,10 @@ afterEvaluate {
configurations["includeTransitive"].resolvedConfiguration.resolvedArtifacts.forEach { dep -> configurations["includeTransitive"].resolvedConfiguration.resolvedArtifacts.forEach { dep ->
if (!providedDependencies.contains("${dep.moduleVersion.id.group}:${dep.moduleVersion.id.name}") if (!providedDependencies.contains("${dep.moduleVersion.id.group}:${dep.moduleVersion.id.name}")
and !providedDependencies.contains("${dep.moduleVersion.id.group}:.*")) { and !providedDependencies.contains("${dep.moduleVersion.id.group}:.*")) {
//println("Including dependency via JiJ: ${dep.id}") println("Including dependency via JiJ: ${dep.id}")
dependencies.add("include", dep.moduleVersion.id.toString()) dependencies.add("include", dep.moduleVersion.id.toString())
} else { } else {
//println("Not including ${dep.id} for ${project.name}!") println("Not including ${dep.id} for ${project.name}!")
} }
} }
} }

6
gradle/libs.versions.toml
View File

@@ -9,9 +9,9 @@ netty = "4.2.1.Final"
guava = "29.0-jre" guava = "29.0-jre"
gson = "2.3.1" # Provided by Spigot 1.8.8 gson = "2.3.1" # Provided by Spigot 1.8.8
websocket = "1.5.1" websocket = "1.5.1"
protocol-connection = "3.0.0.Beta7-20250616.124609-6" protocol-connection = "3.0.0.Beta7-20250618.210427-9"
protocol-common = "3.0.0.Beta7-20250616.124609-6" protocol-common = "3.0.0.Beta7-20250618.210427-9"
protocol-codec = "3.0.0.Beta7-20250616.124609-6" protocol-codec = "3.0.0.Beta7-20250618.210427-9"
raknet = "1.0.0.CR3-20250218.160705-18" raknet = "1.0.0.CR3-20250218.160705-18"
minecraftauth = "4.1.1" minecraftauth = "4.1.1"
mcprotocollib = "1.21.6-20250615.123941-7" mcprotocollib = "1.21.6-20250615.123941-7"