diff --git a/build.gradle b/build.gradle index 981f1f50..714235d0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "fabric-loom" version "1.10-SNAPSHOT" apply false - id "com.replaymod.preprocess" version "9d21b334" + id "com.replaymod.preprocess" version "0a04a566" id "com.gradleup.shadow" version "8.3.6" apply false } diff --git a/common.gradle b/common.gradle index 1ba7d6d9..6411b2c4 100644 --- a/common.gradle +++ b/common.gradle @@ -25,23 +25,23 @@ dependencies { modImplementation("net.fabricmc:fabric-loader:${loader_version}") modApi("net.fabricmc.fabric-api:fabric-api:${fabric_version}") - modImplementation("net.dv8tion:JDA:5.3.0") { + modImplementation("net.dv8tion:JDA:5.5.1") { 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") + modImplementation("org.slf4j:slf4j-api:2.0.17") 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") - modImplementation("com.fasterxml.jackson.core:jackson-annotations:2.17.2") + modImplementation("com.fasterxml.jackson.core:jackson-core:2.18.3") + modImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.3") + modImplementation("com.fasterxml.jackson.core:jackson-annotations:2.18.3") modImplementation("com.squareup.okhttp3:okhttp:4.12.0") modImplementation("com.squareup.okio:okio-jvm:3.6.0") modImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.10") - modImplementation("net.fellbaum:jemoji:1.7.1") + modImplementation("net.fellbaum:jemoji:1.7.3") - modImplementation("com.google.code.gson:gson:2.12.1") + modImplementation("com.google.code.gson:gson:2.13.1") } processResources { diff --git a/gradle.properties b/gradle.properties index 2a0ce253..dc29bc17 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,5 +10,5 @@ archives_base_name=Discord-MC-Chat # Wrapper Properties # check these on https://fabricmc.net/develop minecraft_version=1.21.5 -loader_version=0.16.10 -fabric_version=0.119.5+1.21.5 \ No newline at end of file +loader_version=0.16.14 +fabric_version=0.123.0+1.21.5 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975c..1b33c55b 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b1..ca025c83 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf93008..23d15a93 100644 --- a/gradlew +++ b/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a218..db3a6ac2 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/versions/1.21.1/gradle.properties b/versions/1.21.1/gradle.properties index 16127c23..294f2ffa 100644 --- a/versions/1.21.1/gradle.properties +++ b/versions/1.21.1/gradle.properties @@ -6,4 +6,4 @@ minecraft_version=1.21.1 minecraft_dependency=~1.20.5,1.21,1.21.1 # Dependencies -fabric_version=0.115.3+1.21.1 \ No newline at end of file +fabric_version=0.116.0+1.21.1 \ No newline at end of file diff --git a/versions/1.21.5/gradle.properties b/versions/1.21.5/gradle.properties index 5dc9a5d8..5152f224 100644 --- a/versions/1.21.5/gradle.properties +++ b/versions/1.21.5/gradle.properties @@ -6,4 +6,4 @@ minecraft_version=1.21.5 minecraft_dependency=~1.21.5 # Dependencies -fabric_version=0.119.5+1.21.5 \ No newline at end of file +fabric_version=0.123.0+1.21.5 \ No newline at end of file diff --git a/wrapper/build.gradle b/wrapper/build.gradle index 794f5cb9..9bea7ecd 100644 --- a/wrapper/build.gradle +++ b/wrapper/build.gradle @@ -30,28 +30,28 @@ dependencies { modImplementation("net.fabricmc:fabric-loader:${loader_version}") modApi("net.fabricmc.fabric-api:fabric-api:${fabric_version}") - include("net.dv8tion:JDA:5.3.0") { + include("net.dv8tion:JDA:5.5.1") { 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")) - shadow(implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.24.1")) // TODO Any better way? + shadow(implementation("org.slf4j:slf4j-api:2.0.17")) + shadow(implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.24.3")) // TODO Any better way? include("com.neovisionaries:nv-websocket-client:2.14") - include("com.fasterxml.jackson.core:jackson-core:2.17.2") - include("com.fasterxml.jackson.core:jackson-databind:2.17.2") - include("com.fasterxml.jackson.core:jackson-annotations:2.17.2") + include("com.fasterxml.jackson.core:jackson-core:2.18.3") + include("com.fasterxml.jackson.core:jackson-databind:2.18.3") + include("com.fasterxml.jackson.core:jackson-annotations:2.18.3") include("com.squareup.okhttp3:okhttp:4.12.0") include("com.squareup.okio:okio-jvm:3.6.0") include("org.jetbrains.kotlin:kotlin-stdlib:1.9.10") + + include("net.fellbaum:jemoji:1.7.3") + + shadow(implementation("com.google.code.gson:gson:2.13.1")) - include("net.fellbaum:jemoji:1.7.1") - - shadow(implementation("com.google.code.gson:gson:2.12.1")) - - shadow(implementation("com.jetbrains.intellij.java:java-gui-forms-rt:243.26053.20")) - shadow(implementation("com.formdev:flatlaf:3.5.4")) - shadow(implementation("com.formdev:flatlaf-extras:3.5.4")) + shadow(implementation("com.jetbrains.intellij.java:java-gui-forms-rt:251.23774.444")) + shadow(implementation("com.formdev:flatlaf:3.6")) + shadow(implementation("com.formdev:flatlaf-extras:3.6")) } def fabric_subprojects = parent.subprojects.findAll({