Skip to content

Commit

Permalink
bumped IE/Mek dep versions & some build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
desht committed Apr 25, 2024
1 parent 979c791 commit 612bf58
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 19 deletions.
25 changes: 8 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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"
}

Expand Down Expand Up @@ -308,19 +306,12 @@ tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
}

Closure<ReleaseType> 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")
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 612bf58

Please sign in to comment.