Merge pull request #1 from bartimaeusnek/GT-NH-Mod

+added gradlew automation

5 files changed, 46 insertions, 13 deletions

diff --git a/build.gradle b/build.gradle
index f5a6e5abc9..72194b5354 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,10 +12,12 @@ buildscript {
     }
     dependencies {
         classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath "de.undercouch:gradle-download-task:3.1.2"
     }
 }
 
 apply plugin: 'forge'
+import de.undercouch.gradle.tasks.download.Download
 
 version = "1.7.10-1.0.5-GT-NH"
 group= "pers.gwyog.gtneioreplugin"
@@ -26,17 +28,47 @@ targetCompatibility = 1.7
 
 minecraft {
     version = "1.7.10-10.13.4.1614-1.7.10"
+    replaceIn "GTNEIOrePlugin.java"
+    replace "@version@", project.version
     runDir = "eclipse"
 }
 
+file "build.properties" withReader {
+    def prop = new Properties()
+    prop.load(it)
+    ext.config = new ConfigSlurper().parse prop
+}
+
+repositories {
+    mavenLocal()
+    maven {
+        name "ChickenBones"
+        url "http://chickenbones.net/maven/"
+    }
+}
+
 dependencies {
-    // You should put the dev builds of NEI (with its dependencies), GregTech5 and GregTech6 in the /libs folder manually
-    // to make the gradlew build working properly. 	
-    // compile "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev"
-    // compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
-    // compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
+    //compile "codechicken:ForgeMultipart:${config.minecraft.version}-${config.fmp.version}:dev"
+    compile "codechicken:CodeChickenLib:${config.minecraft.version}-${config.ccl.version}:dev"
+    compile "codechicken:CodeChickenCore:${config.minecraft.version}-${config.ccc.version}:dev"
+    compile "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
 }
 
+task getGregTech(type: Download) {
+    onlyIf {
+        !file("libs/gregtech-${config.gregtech.version}-dev.jar").exists()
+    }
+    src "http://jenkins.usrv.de:8081/job/Gregtech-5-Unofficial/${config.gregtech.jenkinsbuild}/artifact/build/libs/gregtech-${config.gregtech.version}-dev.jar"
+    dest file("libs/gregtech-${config.gregtech.version}-dev.jar")
+    mustRunAfter "deobfBinJar"
+    mustRunAfter "repackMinecraft"
+}
+
+tasks.setupCIWorkspace.dependsOn getGregTech
+tasks.setupDevWorkspace.dependsOn getGregTech
+tasks.setupDecompWorkspace.dependsOn getGregTech
+tasks.compileJava.dependsOn getGregTech
+
 processResources
 {
     // this will ensure that this task is redone when the versions change.
diff --git a/build.properties b/build.properties
new file mode 100644
index 0000000000..e5849c14be
--- /dev/null
+++ b/build.properties
@@ -0,0 +1,7 @@
+gregtech.version=5.09.32.19
+gregtech.jenkinsbuild=1037
+croploadcore.version=0.0.8
+minecraft.version=1.7.10
+ccl.version=1.1.3.140
+ccc.version=1.0.7.47
+nei.version=1.0.5.120
\ No newline at end of file
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
index 995e1a02da..e0c28843bb 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
@@ -12,9 +12,7 @@ import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper;
 public class GTNEIOrePlugin {
     public static final String MODID = "gtneioreplugin";
     public static final String NAME = "GT NEI Ore Plugin GT:NH Mod";
-    public static final String VERSION = "1.0.5-GTNH";
-    
-    public static String GTVersion = "GT5";
+    public static final String VERSION = "@version@";
     
     @Mod.Instance(MODID)
     public static GTNEIOrePlugin instance;
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java
index d2cc0933d0..06133bebcc 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java
@@ -23,7 +23,6 @@ public class NEIPluginConfig implements IConfigureNEI {
 
     @Override
     public void loadConfig() {
-        if (GTNEIOrePlugin.GTVersion.equals("GT5")) {
             PluginGT5VeinStat pluginVeinStat = new PluginGT5VeinStat();
             //PluginGT5AsteroidStat pluginAsteriodStat = new PluginGT5AsteroidStat();
             PluginGT5SmallOreStat pluginSmallOreStat = new PluginGT5SmallOreStat();
@@ -33,6 +32,5 @@ public class NEIPluginConfig implements IConfigureNEI {
             //API.registerUsageHandler(pluginAsteriodStat);
             API.registerRecipeHandler(pluginSmallOreStat);
             API.registerUsageHandler(pluginSmallOreStat);
-            }
         }
     }
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java
index 39173c756f..fa09482efb 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/GT5OreSmallHelper.java
@@ -57,7 +57,6 @@ public class GT5OreSmallHelper {
     }
     
     private static void checkExtraSupport() {
-        if (GTNEIOrePlugin.GTVersion.equals("GT5")) {
             Class clazzGTOreSmall = null;
             try {
                 clazzGTOreSmall = Class.forName("gregtech.common.GT_Worldgen_GT_Ore_SmallPieces");
@@ -72,8 +71,7 @@ public class GT5OreSmallHelper {
                     Field fieldGCMars = clazzGTOreSmall.getField("mMars");
                     gcBasicSupport = true;
                 } catch (Exception e) {}
-            }
-        }   
+            } 
     }
     
     public static Materials[] getDroppedDusts() {