From 85d603b219e2b00447206f7f14c083af0819c8b0 Mon Sep 17 00:00:00 2001 From: dags- Date: Fri, 28 Feb 2020 22:54:39 +0000 Subject: [PATCH] - use git tag first if available - update mods.toml --- .gitignore | 2 +- README.md | 6 ++++-- TerraForgedMod/build.gradle | 16 ++++++++++------ .../src/main/resources/META-INF/mods.toml | 5 ++++- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 4dc7817..fc48f87 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ .mtj.tmp/ # Package Files # -#*.jar +*.jar *.war *.nar *.ear diff --git a/README.md b/README.md index 81260c2..06ace73 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,10 @@ ![TerraForged Social](https://terraforged.com/curse/header.jpg) #### About: -TerraForged is a new terrain generation mod for Minecraft (Java Edition), whose aim is to create more -expansive and inspiring worlds to build and explore in! +TerraForged is an ambitious new terrain generator mod for Minecraft (Java Edition) attempting to + create more immersive, inspiring worlds to explore and build in. Featuring an overhaul of the + vanilla generation system, custom terrain shapes, simulated erosion, better rivers, custom + decorations, tonnes of configuration options, and more! #### Website(s): [https://terraforged.com](https://terraforged.com) diff --git a/TerraForgedMod/build.gradle b/TerraForgedMod/build.gradle index 359d786..3e03157 100644 --- a/TerraForgedMod/build.gradle +++ b/TerraForgedMod/build.gradle @@ -13,7 +13,7 @@ apply plugin: "net.minecraftforge.gradle" apply plugin: "maven-publish" apply plugin: "eclipse" -version = "${mc_version}-${version}${getBuildNumber()}" +version = "${mc_version}-${version}${getClassifier()}" archivesBaseName = "TerraForged" repositories { @@ -98,10 +98,14 @@ publish { dependsOn("reobfJar") } -static def getBuildNumber() { - def buildNumber = System.getenv("BUILD_NUMBER") - if (buildNumber == null) { - return "" +static def getClassifier() { + def buildTag = System.getenv("GIT_TAG_NAME"); + if (buildTag != null) { + return "-${buildTag}" } - return "-${buildNumber}" + def buildNumber = System.getenv("BUILD_NUMBER") + if (buildNumber != null) { + return "-${buildNumber}" + } + return "" } \ No newline at end of file diff --git a/TerraForgedMod/src/main/resources/META-INF/mods.toml b/TerraForgedMod/src/main/resources/META-INF/mods.toml index d0976c2..f4acce4 100644 --- a/TerraForgedMod/src/main/resources/META-INF/mods.toml +++ b/TerraForgedMod/src/main/resources/META-INF/mods.toml @@ -9,4 +9,7 @@ credits="dags" logoFile="terraforged.png" displayURL="https://terraforged.com" issueTrackerURL="https://github.com/TerraForged/TerraForged/issues" -description="A 'terrain first' world generator" \ No newline at end of file +description=''' +Description: + A terrain generator attempting to create more immersive, inspiring worlds to explore and build in! +''' \ No newline at end of file