From 3722d896f6db07aac45beebc792bde61a3fb7ff1 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 24 Apr 2023 16:50:01 +0700 Subject: [PATCH] Bump to minecraft 1.19.4 --- build.gradle.kts | 17 ++++++++++------- gradle.properties | 37 ++++++++++++++++--------------------- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f4dbd601b..077846911 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ val forge_version: String by project val mod_id: String by project val handle_deps: String by project val use_commit_hash_in_version: String by project -val handleDeps = handle_deps == "true" +val handleDeps = handle_deps.toBoolean() plugins { java @@ -150,7 +150,6 @@ dependencies { val kotlin_coroutines_version: String by project val kotlin_serialization_version: String by project val mixin_version: String by project - val koremods_modlauncher_version: String by project minecraft("net.minecraftforge:forge:$mc_version-$forge_version") testImplementation("org.junit.jupiter:junit-jupiter:${jupiter_version}") @@ -179,10 +178,7 @@ dependencies { val cosmetic_armor_reworked_id: String by project val jade_id: String by project val configured_id: String by project - val worldedit_fileid: String by project - val more_overlays_version: String by project val curios_version: String by project - val deps_mc_version: String by project val jei_mc_version: String by project val curios_mc_version: String by project val ad_astra_id: String by project @@ -205,7 +201,7 @@ dependencies { // runtimeOnly(fg.deobf("curse.maven:worldedit-225608:${worldedit_fileid}")) // runtimeOnly(fg.deobf("at.ridgo8.moreoverlays:MoreOverlays-updated:${more_overlays_version}")) - compileOnly(fg.deobf("mekanism:Mekanism:${deps_mc_version}-${mekanism_version}:all")) + compileOnly(fg.deobf("mekanism:Mekanism:${mekanism_version}:all")) // runtimeOnly(fg.deobf("curse.maven:cyclops-core-232758:4392602")) // runtimeOnly(fg.deobf("curse.maven:integrated-dynamics-236307:4391535")) @@ -222,7 +218,14 @@ configurations { } minecraft { - mappings("parchment", parchment_version) + val use_parchment: String by project + + if (use_parchment.toBoolean()) { + mappings("parchment", parchment_version) + } else { + mappings("official", mc_version) + } + accessTransformer(file("src/main/resources/META-INF/accesstransformer.cfg")) runs { diff --git a/gradle.properties b/gradle.properties index da9732d31..12fe55182 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,34 +6,29 @@ kotlin.stdlib.default.dependency=false org.gradle.vfs.watch=true mod_id=overdrive_that_matters -mod_version=1.1 +mod_version=1.2 use_commit_hash_in_version=true -koremods_modlauncher_version=0.5.7 -koremods_script_version=0.5.0 +mc_version=1.19.4 +use_parchment=false +parchment_version=2023.03.12-1.19.3 +jei_mc_version=1.19.4 +curios_mc_version=1.19.4 -mc_version=1.19.3 -parchment_version=2022.12.18-1.19.3 -jei_mc_version=1.19.3 -deps_mc_version=1.19.2 -curios_mc_version=1.19.3 - -forge_gradle_version=5.1.27 -forge_version=44.1.5 +forge_gradle_version=5.1.+ +forge_version=45.0.47 mixingradle_version=0.7.32 mixin_version=0.8.5 -jei_version=12.0.2.2 -jupiter_version=5.8.2 -mekanism_version=10.3.5.homebaked -curios_version=5.1.4.0 -cosmetic_armor_reworked_id=4145717 -ad_astra_id=4390126 -jade_id=4330163 -configured_id=4166861 -worldedit_fileid=3922622 -more_overlays_version=1.21.3-mc1.19 +jei_version=13.1.0.6 +jupiter_version=5.9.2 +mekanism_version=1.19.2-10.3.5.homebaked +curios_version=5.1.5.1 +cosmetic_armor_reworked_id=4439659 +ad_astra_id=4452010 +jade_id=4439089 +configured_id=4462894 kotlin_for_forge_version=3.1.0 kotlin_version=1.8.0