diff --git a/build.gradle.kts b/build.gradle.kts index 0559d7fde..29beec57b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -90,7 +90,7 @@ fun getCommitVersion(): GitInfo? { return null } -java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) +java.toolchain.languageVersion.set(JavaLanguageVersion.of(21)) println("Targeting Java ${java.toolchain.languageVersion.get()}") tasks.withType(KotlinCompile::class.java) { @@ -157,33 +157,33 @@ dependencies { val ad_astra_id: String by project val worldedit_id: String by project - compileOnly(fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}+${curios_mc_version}")) - compileOnly(fg.deobf("curse.maven:cosmetic-armor-reworked-237307:$cosmetic_armor_reworked_id")) + compileOnly(("top.theillusivec4.curios:curios-forge:${curios_version}+${curios_mc_version}")) + compileOnly(("curse.maven:cosmetic-armor-reworked-237307:$cosmetic_armor_reworked_id")) - compileOnly(fg.deobf("mezz.jei:jei-${jei_mc_version}-common-api:${jei_version}")) - compileOnly(fg.deobf("mezz.jei:jei-${jei_mc_version}-forge-api:${jei_version}")) - runtimeOnly(fg.deobf("mezz.jei:jei-${jei_mc_version}-forge:${jei_version}")) + compileOnly(("mezz.jei:jei-${jei_mc_version}-common-api:${jei_version}")) + compileOnly(("mezz.jei:jei-${jei_mc_version}-forge-api:${jei_version}")) + runtimeOnly(("mezz.jei:jei-${jei_mc_version}-forge:${jei_version}")) - // runtimeOnly(fg.deobf("ru.dbotthepony:particle-collider:0.4.5")) + // runtimeOnly(("ru.dbotthepony:particle-collider:0.4.5")) - implementation(fg.deobf("curse.maven:jade-324717:${jade_id}")) - //runtimeOnly(fg.deobf("curse.maven:configured-457570:${configured_id}")) + implementation(("curse.maven:jade-324717:${jade_id}")) + //runtimeOnly(("curse.maven:configured-457570:${configured_id}")) - compileOnly(fg.deobf("curse.maven:resourceful-lib-570073:${resourceful_lib_id}")) - compileOnly(fg.deobf("curse.maven:resourceful-config-714059:${resourceful_config_id}")) - compileOnly(fg.deobf("curse.maven:botarium-704113:${botarium_id}")) - compileOnly(fg.deobf("curse.maven:ad-astra-635042:${ad_astra_id}")) - runtimeOnly(fg.deobf("curse.maven:worldedit-225608:${worldedit_id}")) + compileOnly(("curse.maven:resourceful-lib-570073:${resourceful_lib_id}")) + compileOnly(("curse.maven:resourceful-config-714059:${resourceful_config_id}")) + compileOnly(("curse.maven:botarium-704113:${botarium_id}")) + compileOnly(("curse.maven:ad-astra-635042:${ad_astra_id}")) + runtimeOnly(("curse.maven:worldedit-225608:${worldedit_id}")) - // runtimeOnly(fg.deobf("curse.maven:worldedit-225608:${worldedit_fileid}")) - // runtimeOnly(fg.deobf("at.ridgo8.moreoverlays:MoreOverlays-updated:${more_overlays_version}")) + // runtimeOnly(("curse.maven:worldedit-225608:${worldedit_fileid}")) + // runtimeOnly(("at.ridgo8.moreoverlays:MoreOverlays-updated:${more_overlays_version}")) - // runtimeOnly(fg.deobf("curse.maven:cyclops-core-232758:4392602")) - // runtimeOnly(fg.deobf("curse.maven:integrated-dynamics-236307:4391535")) - // runtimeOnly(fg.deobf("curse.maven:integrated-crafting-287357:4391487")) - // runtimeOnly(fg.deobf("curse.maven:integrated-terminals-295910:4400924")) - // runtimeOnly(fg.deobf("curse.maven:common-capabilities-247007:4391468")) - // runtimeOnly(fg.deobf("curse.maven:integrated-tunnels-251389:4344632")) + // runtimeOnly(("curse.maven:cyclops-core-232758:4392602")) + // runtimeOnly(("curse.maven:integrated-dynamics-236307:4391535")) + // runtimeOnly(("curse.maven:integrated-crafting-287357:4391487")) + // runtimeOnly(("curse.maven:integrated-terminals-295910:4400924")) + // runtimeOnly(("curse.maven:common-capabilities-247007:4391468")) + // runtimeOnly(("curse.maven:integrated-tunnels-251389:4344632")) } } diff --git a/gradle.properties b/gradle.properties index 03d6c4312..6d3118f21 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,18 +10,18 @@ mod_version=1.4 use_commit_hash_in_version=true -mc_version=1.20.2 -jei_mc_version=1.20.2 +mc_version=1.21 +jei_mc_version=1.21 curios_mc_version=1.20.2 forge_gradle_version=[6.0.14,6.2) -forge_version=48.1.0 +forge_version=51.0.18 mixingradle_version=0.7.33 mixin_version=0.8.5 kommons_version=3.0.2 -jei_version=16.0.0.28 +jei_version=19.0.0.11 jupiter_version=5.9.2 curios_version=6.0.2 cosmetic_armor_reworked_id=4764779 @@ -33,7 +33,7 @@ jade_id=4818518 configured_id=4462894 worldedit_id=4807512 -kotlin_for_forge_version=4.7.0 -kotlin_version=1.9.0 +kotlin_for_forge_version=5.3.0 +kotlin_version=2.0.0 handle_deps=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbfa..c1962a79e 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 37aef8d3f..bb6c19194 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.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d6..aeb74cbb4 100644 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -144,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in