更新所有依赖

This commit is contained in:
Xujiayao 2025-02-22 22:55:47 +08:00
parent 454e5a8f0d
commit 4601ee7344
10 changed files with 62 additions and 66 deletions

View file

@ -1,7 +1,7 @@
plugins {
id "fabric-loom" version "1.8-SNAPSHOT" apply false // 1.9 is not working (2024/12/05)
id "com.replaymod.preprocess" version "88169fcb"
id "com.gradleup.shadow" version "8.3.3" apply false
id "fabric-loom" version "1.10-SNAPSHOT" apply false
id "com.replaymod.preprocess" version "9d21b334"
id "com.gradleup.shadow" version "8.3.6" apply false
}
preprocess {

View file

@ -4,12 +4,7 @@ import groovy.json.JsonSlurper
apply plugin: "fabric-loom"
apply plugin: "com.replaymod.preprocess"
int mcVersion = 1
preprocess {
mcVersion = vars.get().get("MC")
tabIndentation = true
}
int mcVersion = project.mcVersion
java {
sourceCompatibility = JavaVersion.VERSION_21
@ -30,12 +25,12 @@ dependencies {
modImplementation("net.fabricmc:fabric-loader:${loader_version}")
modApi("net.fabricmc.fabric-api:fabric-api:${fabric_version}")
modImplementation("net.dv8tion:JDA:5.1.0") {
modImplementation("net.dv8tion:JDA:5.3.0") {
exclude module: "opus-java"
}
modImplementation("net.sf.trove4j:core:3.1.0")
modImplementation("org.apache.commons:commons-collections4:4.4")
modImplementation("org.slf4j:slf4j-api:2.0.13") // 1.x is Incompatible with Quilt (#164)
modImplementation("org.slf4j:slf4j-api:2.0.13")
modImplementation("com.neovisionaries:nv-websocket-client:2.14")
modImplementation("com.fasterxml.jackson.core:jackson-core:2.17.2")
modImplementation("com.fasterxml.jackson.core:jackson-databind:2.17.2")
@ -44,9 +39,9 @@ dependencies {
modImplementation("com.squareup.okio:okio-jvm:3.6.0")
modImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.21")
modImplementation("net.fellbaum:jemoji:1.3.4") // File size of 1.4.x is too big
modImplementation("net.fellbaum:jemoji:1.7.1")
modImplementation("com.google.code.gson:gson:2.11.0")
modImplementation("com.google.code.gson:gson:2.12.1")
}
processResources {

View file

@ -10,5 +10,5 @@ archives_base_name=Discord-MC-Chat
# Wrapper Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.21.4
loader_version=0.16.9
fabric_version=0.110.5+1.21.4
loader_version=0.16.10
fabric_version=0.116.1+1.21.4

View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

View file

@ -24,7 +24,7 @@
"discord-mc-chat.mixins.json"
],
"depends": {
"fabricloader": ">=0.15.10",
"fabricloader": ">=0.16.10",
"java": ">=21"
}
}

View file

@ -6,4 +6,4 @@ minecraft_version=1.20.1
minecraft_dependency=1.20,1.20.1
# Dependencies
fabric_version=0.92.2+1.20.1
fabric_version=0.92.3+1.20.1

View file

@ -6,4 +6,4 @@ minecraft_version=1.21.1
minecraft_dependency=~1.20.5,1.21,1.21.1
# Dependencies
fabric_version=0.110.0+1.21.1
fabric_version=0.115.0+1.21.1

View file

@ -6,4 +6,4 @@ minecraft_version=1.21.4
minecraft_dependency=~1.21.2
# Dependencies
fabric_version=0.110.5+1.21.4
fabric_version=0.116.1+1.21.4

View file

@ -30,12 +30,12 @@ dependencies {
modImplementation("net.fabricmc:fabric-loader:${loader_version}")
modApi("net.fabricmc.fabric-api:fabric-api:${fabric_version}")
include("net.dv8tion:JDA:5.1.0") {
include("net.dv8tion:JDA:5.3.0") {
exclude module: "opus-java"
}
include("net.sf.trove4j:core:3.1.0")
include("org.apache.commons:commons-collections4:4.4")
shadow(implementation("org.slf4j:slf4j-api:2.0.13")) // 1.x is Incompatible with Quilt (#164)
shadow(implementation("org.slf4j:slf4j-api:2.0.13"))
shadow(implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.24.1")) // TODO Any better way?
include("com.neovisionaries:nv-websocket-client:2.14")
include("com.fasterxml.jackson.core:jackson-core:2.17.2")
@ -45,57 +45,19 @@ dependencies {
include("com.squareup.okio:okio-jvm:3.6.0")
include("org.jetbrains.kotlin:kotlin-stdlib:1.8.21")
include("net.fellbaum:jemoji:1.3.4") // File size of 1.4.x is too big
include("net.fellbaum:jemoji:1.7.1")
shadow(implementation("com.google.code.gson:gson:2.11.0"))
shadow(implementation("com.google.code.gson:gson:2.12.1"))
shadow(implementation("com.jetbrains.intellij.java:java-gui-forms-rt:242.22855.106"))
shadow(implementation("com.formdev:flatlaf:3.5.2"))
shadow(implementation("com.formdev:flatlaf-extras:3.5.2"))
shadow(implementation("com.jetbrains.intellij.java:java-gui-forms-rt:243.23654.166"))
shadow(implementation("com.formdev:flatlaf:3.5.4"))
shadow(implementation("com.formdev:flatlaf-extras:3.5.4"))
}
def fabric_subprojects = parent.subprojects.findAll({
it.name != "wrapper"
})
remapJar {
outputs.upToDateWhen { false }
inputFile.set shadowJar.archiveFile
dependsOn {
shadowJar
fabric_subprojects.collect {
it.tasks.remapJar
}
}
doFirst {
delete fileTree("build/tmp/versions/META-INF/jars")
copy {
from {
fabric_subprojects.collect {
it.tasks.remapJar.outputs.files
}
}
into("build/tmp/versions/META-INF/jars")
}
}
from("../LICENSE") {
rename { "${it}_${archives_base_name}" }
}
from("build/tmp/versions")
doLast {
copy {
from "build/libs"
into "../build"
exclude "*wrapper*"
}
}
}
processResources {
filesMatching("fabric.mod.json") {
expand "version": mod_version
@ -123,13 +85,52 @@ processResources {
}
jar {
outputs.upToDateWhen { false }
dependsOn {
shadowJar
fabric_subprojects.collect {
it.tasks.remapJar
}
}
doFirst {
delete fileTree("build/tmp/versions/META-INF/jars")
copy {
from {
fabric_subprojects.collect {
it.tasks.remapJar.outputs.files
}
}
into("build/tmp/versions/META-INF/jars")
}
}
manifest {
attributes "Main-Class": "com.xujiayao.discord_mc_chat.wrapper.Main"
}
from("../LICENSE") {
rename { "${it}_${archives_base_name}" }
}
from("build/tmp/versions")
from(zipTree(shadowJar.archiveFile)) {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}
}
shadowJar {
archiveClassifier = "wrapper"
configurations = [project.configurations.shadow]
// FlatLaf does not support minimization and relocation
}
remapJar {
doLast {
copy {
from "build/libs"
into "../build"
exclude "*wrapper*"
}
}
}

View file

@ -16,7 +16,7 @@
"icon": "assets/discord-mc-chat/icon.png",
"environment": "server",
"depends": {
"fabricloader": ">=0.15.10",
"fabricloader": ">=0.16.10",
"java": ">=21"
}
}