From 612bf5897935d867fb319e2d4032f17521f82344 Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Thu, 25 Apr 2024 11:50:11 +0100 Subject: [PATCH] bumped IE/Mek dep versions & some build fixes --- build.gradle | 25 ++++++++----------------- gradle.properties | 4 ++-- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index b428fde63..9d296ce50 100644 --- a/build.gradle +++ b/build.gradle @@ -18,13 +18,11 @@ plugins { id "me.modmuss50.mod-publish-plugin" version "0.4.5" } -//version = "${mod_version}+mc${minecraft_version}" -//group = mod_group_id - -ext.releaseTag = providers.environmentVariable("TAG").orElse("").toString() -ext.isAlpha = ext.releaseTag.contains("alpha") -ext.isBeta = ext.releaseTag.contains("beta") -def relType = ext.isAlpha ? "alpha" : (ext.isBeta ? "beta" : "release") +ext { + releaseTag = providers.environmentVariable("TAG").orElse("").get() + isAlpha = ext.releaseTag.contains("alpha") + isBeta = ext.releaseTag.contains("beta") +} // All jar files from this folder will be added automatically as runtime-only mod dependencies def extraModsDir = "extra-mods-${minecraft_version}" @@ -154,7 +152,7 @@ dependencies { testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.2" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.2" - compileOnly("mcjty.theoneprobe:theoneprobe:${top_version}") { + implementation("mcjty.theoneprobe:theoneprobe:${top_version}") { exclude group: "net.minecraftforge", module: "forge" } @@ -308,19 +306,12 @@ tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation } -Closure getReleaseType = { type -> - switch(type) { - case "alpha": return ReleaseType.ALPHA - case "beta": return ReleaseType.BETA - default: return ReleaseType.STABLE - } -} - +def releaseType = ext.isAlpha ? ReleaseType.ALPHA : (ext.isBeta ? ReleaseType.BETA : ReleaseType.STABLE) publishMods { dryRun = providers.environmentVariable("CURSEFORGE_TOKEN").getOrNull() == null changelog = providers.environmentVariable("CHANGELOG").orElse("dryrun") version = mod_version - type = getReleaseType(relType) + type = releaseType file = jar.archiveFile displayName = "${mod_name} ${mod_version} MC-${minecraft_version}" modLoaders.add("neoforge") diff --git a/gradle.properties b/gradle.properties index 028a5d5a9..06bbef54c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,8 +34,8 @@ curse_project_id=281849 ######################################################### jei_version=17.3.0.49 curios_version=7.3.4+1.20.4 -mekanism_version=1.20.4-10.5.8.30 -immersive_engineering_version=1.20.4-10.0.1-pre.205 +mekanism_version=1.20.4-10.5.19.40 +immersive_engineering_version=1.20.4-11.1.0-172.110 top_version=1.20.4_neo-11.0.2-3 patchouli_version=1.20.4-85-NEOFORGE-SNAPSHOT cc_tweaked_version=1.110.0