From a66ce000a370728bf86d8114cefb20e2af5f9f8b Mon Sep 17 00:00:00 2001 From: Tobias Wohlfarth Date: Wed, 9 Dec 2015 05:05:50 +0100 Subject: [PATCH] fix #285 : forgot to change Versionnumber There are to many ocurances of this number, remember 'Rule Number Undefined': don't repeat yourself --- build.gradle | 6 +++--- build.properties | 2 +- src/main/java/modtweaker2/ModProps.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 78faabe..da68dbe 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,6 @@ apply plugin: 'java' // define the properties file ext.configFile = file "build.properties" - configFile.withReader { // read config. it shall from now on be referenced as simply config or as project.config def prop = new Properties() @@ -35,6 +34,7 @@ archivesBaseName = "ModTweaker2" minecraft { version = "${config.minecraft.version}-${config.forge.version}" runDir = "eclipse" + replace "@modVersion@", config.mod.version } repositories { @@ -52,14 +52,14 @@ processResources { // this will ensure that this task is redone when the versions change. inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version + inputs.property "mcversion", config.minecraft.version // replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { include 'mcmod.info' // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version + expand 'version':project.version, 'mcversion':config.minecraft.version } // copy everything else, thats not the mcmod.info diff --git a/build.properties b/build.properties index 59225ac..99af6ea 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft.version=1.7.10 forge.version=10.13.4.1448-1.7.10 -mod.version=0.9.4 +mod.version=0.9.5 forestry.version=4.1.0.43 diff --git a/src/main/java/modtweaker2/ModProps.java b/src/main/java/modtweaker2/ModProps.java index 6d647e3..ce1a1a1 100644 --- a/src/main/java/modtweaker2/ModProps.java +++ b/src/main/java/modtweaker2/ModProps.java @@ -4,6 +4,6 @@ public class ModProps { public static final String NAME = "Mod Tweaker 2", name = NAME; public static final String MODID = "modtweaker2", modid = MODID; - public static final String VERSION = "0.9.4", version = VERSION; + public static final String VERSION = "@modVersion@", version = VERSION; public static final String DEPENDENCIES = "required-after:MineTweaker3;after:Forestry@[4.1.0,);", dependencies = DEPENDENCIES; }