diff --git a/build.gradle b/build.gradle index 10145ec..9c7023b 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,12 @@ buildscript { repositories { mavenCentral() maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" + name = 'forge' + url = 'http://files.minecraftforge.net/maven' } maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" + name = 'sonatype' + url = 'https://oss.sonatype.org/content/repositories/snapshots/' } } dependencies { @@ -17,29 +17,29 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-0.2" -group = "net.moecraft.nechar" -archivesBaseName = "NotEnoughCharacters" +version = '0.2' +group = 'net.moecraft.nechar' +archivesBaseName = 'NotEnoughCharacters' minecraft { - version = "1.7.10-10.13.4.1614-1.7.10" - runDir = "eclipse" + version = '1.7.10-10.13.4.1614-1.7.10' + runDir = 'eclipse' } compileJava { - options.encoding = "UTF-8" - sourceCompatibility = "1.8" - targetCompatibility = "1.8" + options.encoding = 'UTF-8' + sourceCompatibility = '1.8' + targetCompatibility = '1.8' } repositories { mavenCentral() maven { - name "chickenbones" - url "http://chickenbones.net/maven" + name 'chickenbones' + url 'http://chickenbones.net/maven' } flatDir { - dirs "libs" + dirs 'libs' } } @@ -51,8 +51,8 @@ configurations { dependencies { // you may put jars on which you depend on in ./libs // or you may define them like so.. - //compile "some.group:artifact:version:classifier" - //compile "some.group:artifact:version" + //compile 'some.group:artifact:version:classifier' + //compile 'some.group:artifact:version' // real examples //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env @@ -62,11 +62,11 @@ dependencies { // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html // http://www.gradle.org/docs/current/userguide/dependency_management.html - compile "codechicken:NotEnoughItems:1.7.10-2.0.0-GTNH:dev" - compile "codechicken:CodeChickenLib:1.7.10-1.1.3.138:dev" - compile "codechicken:CodeChickenCore:1.7.10-1.0.7.+:dev" + compile 'codechicken:NotEnoughItems:1.7.10-2.0.0-GTNH:dev' + compile 'codechicken:CodeChickenLib:1.7.10-1.1.3.138:dev' + compile 'codechicken:CodeChickenCore:1.7.10-1.0.7.+:dev' - shade "me.towdium:PinIn:1.0.4-all" + shade 'me.towdium:PinIn:1.0.4-all' } jar { @@ -75,19 +75,25 @@ jar { exclude 'META-INF', 'META-INF/**' } } + + manifest { + attributes 'Implementation-Version': project.version + } + + appendix project.minecraft.version } 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 'version', project.version + inputs.property 'mcversion', project.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': project.minecraft.version } // copy everything else, thats not the mcmod.info diff --git a/src/main/java/net/moecraft/nechar/NEINecharConfig.java b/src/main/java/net/moecraft/nechar/NEINecharConfig.java index 91e9af4..2db34da 100644 --- a/src/main/java/net/moecraft/nechar/NEINecharConfig.java +++ b/src/main/java/net/moecraft/nechar/NEINecharConfig.java @@ -7,7 +7,7 @@ public class NEINecharConfig implements IConfigureNEI { @Override public void loadConfig() { API.addSearchProvider(new NecharSearchProvider()); - NotEnoughCharacters.getLogger().info("search provider added!"); + NotEnoughCharacters.logger.info("search provider added!"); } @Override diff --git a/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java b/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java index 080cf98..52d1106 100644 --- a/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java +++ b/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java @@ -2,21 +2,18 @@ package net.moecraft.nechar; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @Mod(modid = NotEnoughCharacters.ID, useMetadata = true) public class NotEnoughCharacters { public static final String ID = "nechar"; - public static final String VERSION = "0.2"; + public static final String VERSION = NotEnoughCharacters.class.getPackage().getImplementationVersion(); - private static Logger logger; - - public static Logger getLogger() { - return logger; - } + public static final Logger logger = LogManager.getLogger("NotEnoughCharacters"); @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - logger = event.getModLog(); + logger.info("Not Enough Characters - v" + VERSION); } } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index ed0ca63..891b10b 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,8 +3,8 @@ "modid": "nechar", "name": "Not Enough Characters", "description": "Enhanced NEI search", - "version": "0.1", - "mcversion": "1.7.10", + "version": "${version}", + "mcversion": "${mcversion}", "url": "https://github.com/MoeNetwork/NotEnoughCharacters/", "updateUrl": "", "authorList": ["Balthild"],