Skip to content

Commit

Permalink
Remove MC version from versioning
Browse files Browse the repository at this point in the history
Still included in jar name.
Also had to add a version series to dev and nightly to make their versions valid.
  • Loading branch information
Rover656 committed Jul 31, 2023
1 parent 7879fc0 commit 7f71ddf
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply plugin: 'org.moddingx.modgradle.mapping'

version = getVersionString()
group = 'com.enderio'
archivesBaseName = 'EnderIO'
archivesBaseName = "EnderIO-${minecraft_version}"

println("Building Ender IO version ${version}")
println("Release type: ${getReleaseType()}")
Expand Down Expand Up @@ -423,7 +423,7 @@ String getVersionString() {
version_number = version_number.substring(1)
}

return "${minecraft_version}-${version_number}"
return "${version_number}"
}

if (System.getenv('NIGHTLY') != null) {
Expand All @@ -432,7 +432,7 @@ String getVersionString() {
version_patch_lc = System.getenv('BUILD_NUMBER')
}

return "${minecraft_version}-nightly-${version_patch_lc}"
return "${mod_version_series}-nightly-${version_patch_lc}"
}

def version_hash = ''
Expand All @@ -443,7 +443,7 @@ String getVersionString() {
}
}

return "${minecraft_version}-dev-${version_hash}"
return "${mod_version_series}-dev-${version_hash}"
}

String getReleaseType() {
Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ org.gradle.daemon=false
minecraft_version=1.20.1
forge_version=47.1.0

# Used for nightly and dev build identification
mod_version_series=6.0

# Version ranges for mods.toml
minecraft_version_range=[1.20.1]
loader_version_range=[47,)
Expand Down

0 comments on commit 7f71ddf

Please sign in to comment.