mirror of
https://github.com/GeyserMC/Geyser.git
synced 2025-12-19 14:59:27 +00:00
Update to Gradle 9 (#5976)
* Update gradle to 9.2.0 * Eclipse doesn't like defining a generic in an instanceof check... Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com> * Fix launching on standalone due to Gradle 9 changes Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com> * Update indra to v4; fix as many gradle deprecation warnings as possible Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com> * Do task order suggestion; remove properties comment line Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com> * Fix fabric runServer rask Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com> * Fix :neoforge:runServer gradle task Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com> * Fix libs.versions.toml * Fix dupe runtask def * Update architectury-loom and resolve properties issues --------- Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com> Co-authored-by: onebeastchris <github@onechris.mozmail.com>
This commit is contained in:
@@ -8,6 +8,16 @@ architectury {
|
||||
fabric()
|
||||
}
|
||||
|
||||
loom {
|
||||
mods {
|
||||
create("geyser-fabric") {
|
||||
sourceSet(sourceSets.main.get())
|
||||
sourceSet("main", projects.mod)
|
||||
sourceSet("main", projects.core)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
modImplementation(libs.fabric.loader)
|
||||
modApi(libs.fabric.api)
|
||||
|
||||
@@ -8,6 +8,16 @@ architectury {
|
||||
neoForge()
|
||||
}
|
||||
|
||||
loom {
|
||||
mods {
|
||||
create("geyser-neoforge") {
|
||||
sourceSet(sourceSets.main.get())
|
||||
sourceSet("main", projects.mod)
|
||||
sourceSet("main", projects.core)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// This is provided by "org.cloudburstmc.math.mutable" too, so yeet.
|
||||
// NeoForge's class loader is *really* annoying.
|
||||
provided("org.cloudburstmc.math", "api")
|
||||
|
||||
@@ -3,7 +3,7 @@ loaderVersion="[1,)"
|
||||
license="MIT"
|
||||
[[mods]]
|
||||
modId="geyser_neoforge"
|
||||
version="${version}"
|
||||
version="${file.jarVersion}"
|
||||
displayName="Geyser"
|
||||
displayURL="https://geysermc.org/"
|
||||
logoFile= "../assets/geyser/icon.png"
|
||||
|
||||
@@ -87,5 +87,6 @@ modrinth {
|
||||
tasks {
|
||||
runServer {
|
||||
minecraftVersion(libs.versions.runpaperversion.get())
|
||||
jvmArgs("-Dcom.mojang.eula.agree=true")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,6 +34,10 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
|
||||
archiveBaseName.set("Geyser-Standalone")
|
||||
|
||||
transform(Log4j2PluginsCacheFileTransformer())
|
||||
// https://gradleup.com/shadow/configuration/merging/#handling-duplicates-strategy
|
||||
filesMatching("META-INF/org/apache/logging/log4j/core/config/plugins/Log4j2Plugins.dat") {
|
||||
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
||||
}
|
||||
}
|
||||
|
||||
tasks.named<JavaExec>("run") {
|
||||
|
||||
Reference in New Issue
Block a user