diff --git a/build.gradle.kts b/build.gradle.kts index 077846911..2076e4873 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -183,15 +183,15 @@ dependencies { val curios_mc_version: String by project val ad_astra_id: String by project - implementation(fg.deobf("top.theillusivec4.curios:curios-forge:${curios_mc_version}-${curios_version}")) - implementation(fg.deobf("curse.maven:cosmetic-armor-reworked-237307:$cosmetic_armor_reworked_id")) + compileOnly(fg.deobf("top.theillusivec4.curios:curios-forge:${curios_mc_version}-${curios_version}")) + compileOnly(fg.deobf("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}")) + //runtimeOnly(fg.deobf("mezz.jei:jei-${jei_mc_version}-forge:${jei_version}")) - runtimeOnly(fg.deobf("curse.maven:jade-324717:${jade_id}")) - runtimeOnly(fg.deobf("curse.maven:configured-457570:${configured_id}")) + //runtimeOnly(fg.deobf("curse.maven:jade-324717:${jade_id}")) + //runtimeOnly(fg.deobf("curse.maven:configured-457570:${configured_id}")) compileOnly(fg.deobf("curse.maven:ad-astra-635042:${ad_astra_id}")) compileOnly(fg.deobf("curse.maven:resourceful-lib-570073:4378849")) @@ -275,8 +275,6 @@ minecraft { sources(sourceSets["main"], sourceSets["data"]) } } - - forceExit(false) } } } diff --git a/gradle.properties b/gradle.properties index bc19199ab..879ac047b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,18 +6,18 @@ kotlin.stdlib.default.dependency=false org.gradle.vfs.watch=true mod_id=overdrive_that_matters -mod_version=1.2 +mod_version=1.3 use_commit_hash_in_version=true -mc_version=1.19.4 +mc_version=1.20 use_parchment=false parchment_version=2023.03.12-1.19.3 jei_mc_version=1.19.4 curios_mc_version=1.19.4 -forge_gradle_version=5.1.+ -forge_version=45.0.47 +forge_gradle_version=[6.0,6.2) +forge_version=46.0.1 mixingradle_version=0.7.32 mixin_version=0.8.5 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2..943f0cbfa 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 e750102e0..37aef8d3f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index c424d90e3..caa828904 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,16 @@ println("Running with Java ${System.getProperty("java.version")} on JVM: ${System.getProperty("java.vendor")} ${System.getProperty("java.vm.version")} (Architecture: ${System.getProperty("os.arch")})") +pluginManagement { + repositories { + gradlePluginPortal() + } +} + +plugins { + id("org.gradle.toolchains.foojay-resolver-convention").version("0.5.0") +} + buildscript { repositories { // These repositories are only for Gradle plugins, put any other repositories in the repository block further below @@ -45,5 +55,7 @@ buildscript { classpath("org.spongepowered:mixingradle:${mixingradle_version}") classpath(group = "org.parchmentmc", name = "librarian", version = "1.+") + + classpath(group = "org.gradle.toolchains", name = "foojay-resolver", version = "0.5.0") } }