From 266346ab466beab267198ef73b5e97c7e5e99ccd Mon Sep 17 00:00:00 2001 From: Chicken-Bones Date: Thu, 10 Apr 2014 13:56:00 +1000 Subject: [PATCH] Fix a few build variables and temporarily remove NEI plugin --- build.gradle | 4 ++-- build.properties | 4 ++-- codechicken/multipart/nei/NEI_MicroblockConfig.java | 8 +++++--- dependancies.info | 7 ------- dependencies.info | 6 ++++++ 5 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 dependancies.info create mode 100644 dependencies.info diff --git a/build.gradle b/build.gradle index 626e16a..c3eccc9 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ configFile.withReader { project.ext.config = new ConfigSlurper().parse prop } dependencies { - compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev" + compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.ccl_version}:dev" } version = "${project.config.mod_version}." + System.getenv("BUILD_NUMBER") ?: "1" @@ -77,7 +77,7 @@ processResources from(sourceSets.main.resources.srcDirs) { include '**/*.info' // Replace version and MCversion - expand 'version':version,'MCversion':config.minecraft_version + expand 'version':version,'mc_version':config.mc_version,'ccl_version':config.ccl_version } // Copy everything else that's not text from(sourceSets.main.resources.srcDirs) { diff --git a/build.properties b/build.properties index cdbd58b..c1b4d2a 100644 --- a/build.properties +++ b/build.properties @@ -1,4 +1,4 @@ -minecraft_version=1.7.2 +mc_version=1.7.2 forge_version=10.12.0.1054 -CCLIB_version=1.1.0.71 +ccl_version=1.1.0.71 mod_version=1.1.0 diff --git a/codechicken/multipart/nei/NEI_MicroblockConfig.java b/codechicken/multipart/nei/NEI_MicroblockConfig.java index 8bf3c36..615ee2c 100644 --- a/codechicken/multipart/nei/NEI_MicroblockConfig.java +++ b/codechicken/multipart/nei/NEI_MicroblockConfig.java @@ -1,5 +1,7 @@ package codechicken.multipart.nei; +/* Commented until NEI is setup with maven + import codechicken.microblock.MicroblockClass; import codechicken.microblock.MicroblockClassRegistry; import codechicken.nei.api.IConfigureNEI; @@ -24,8 +26,8 @@ public class NEI_MicroblockConfig implements IConfigureNEI private void addSubset(MicroblockClass mcrClass, int i) { - /*API.addSetRange("Microblocks."+LangUtil.translateG(mcrClass.getName()+"."+(i&0xFF)+".subset"), - new MultiItemRange().add(MicroblockProxy.itemMicro(), i, i));*/ + API.addSetRange("Microblocks."+LangUtil.translateG(mcrClass.getName()+"."+(i&0xFF)+".subset"), + new MultiItemRange().add(MicroblockProxy.itemMicro(), i, i)); } @Override @@ -39,4 +41,4 @@ public class NEI_MicroblockConfig implements IConfigureNEI { return "1.0.0.0"; } -} +}*/ \ No newline at end of file diff --git a/dependancies.info b/dependancies.info deleted file mode 100644 index 16cc50d..0000000 --- a/dependancies.info +++ /dev/null @@ -1,7 +0,0 @@ -{ - "repo": "http://files.minecraftforge.net/maven/codechicken/CodeChickenLib/${MCversion}-${version}/", - "file": "CodeChickenLib-${MCversion}-${version}-universal.jar", - "dev": "CodeChickenLib-${MCversion}-${version}-dev.jar", - "class": "codechicken.lib.asm.ASMHelper", - "version": "1.1.0.71" -} \ No newline at end of file diff --git a/dependencies.info b/dependencies.info new file mode 100644 index 0000000..8a2d633 --- /dev/null +++ b/dependencies.info @@ -0,0 +1,6 @@ +{ + "repo": "http://files.minecraftforge.net/maven/codechicken/CodeChickenLib/${mc_version}-${ccl_version}/", + "file": "CodeChickenLib-${mc_version}-${ccl_version}-universal.jar", + "dev": "CodeChickenLib-${mc_version}-${ccl_version}-dev.jar", + "class": "codechicken.lib.asm.ASMHelper" +} \ No newline at end of file