Fix versions in toml. Use internalversion (with git hash).

This commit is contained in:
wizjany 2019-03-12 17:30:45 -04:00
parent 1c5d3368a0
commit 4f0506ec8b
2 changed files with 7 additions and 8 deletions

View File

@ -56,21 +56,20 @@ project.archivesBaseName = "${project.archivesBaseName}-mc${minecraftVersion}"
processResources { processResources {
// this will ensure that this task is redone when the versions change. // this will ensure that this task is redone when the versions change.
inputs.property 'version', project.version inputs.property 'version', project.internalVersion
inputs.property 'mcversion', minecraftVersion inputs.property 'forgeVersion', forgeVersion
inputs.property 'internalVersion', internalVersion
// replace stuff in mcmod.info, nothing else // replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) { from(sourceSets.main.resources.srcDirs) {
include 'META_INF/mods.toml' include 'META-INF/mods.toml'
// replace version and mcversion // replace version and mcversion
expand 'version':project.version, 'mcversion': minecraftVersion, 'internalVersion': internalVersion expand 'version': project.internalVersion, 'forgeVersion': forgeVersion
} }
// copy everything else except the mcmod.info // copy everything else except the mcmod.info
from(sourceSets.main.resources.srcDirs) { from(sourceSets.main.resources.srcDirs) {
exclude 'META_INF/mods.toml' exclude 'META-INF/mods.toml'
} }
} }

View File

@ -3,7 +3,7 @@ modLoader="javafml"
# A version range to match for said mod loader - for regular FML @Mod it will be the minecraft version (without the 1.) # A version range to match for said mod loader - for regular FML @Mod it will be the minecraft version (without the 1.)
loaderVersion="[24,)" loaderVersion="[24,)"
# A URL to refer people to when problems occur with this mod # A URL to refer people to when problems occur with this mod
issueTrackerURL="https://discord.gg/YKbmj7V" issueTrackerURL="https://discord.gg/enginehub"
# A URL for the "homepage" for this mod, displayed in the mod UI # A URL for the "homepage" for this mod, displayed in the mod UI
displayURL="http://wiki.sk89q.com/wiki/WorldEdit/" displayURL="http://wiki.sk89q.com/wiki/WorldEdit/"
# A file name (in the root of the mod JAR) containing a logo for display # A file name (in the root of the mod JAR) containing a logo for display
@ -25,7 +25,7 @@ WorldEdit is an easy-to-use in-game world editor for Minecraft, supporting both
[[dependencies.worldedit]] [[dependencies.worldedit]]
modId="forge" modId="forge"
mandatory=true mandatory=true
versionRange="[${forge_version},)" versionRange="[${forgeVersion},)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"
[[dependencies.worldedit]] [[dependencies.worldedit]]