Merge pull request #61 from TPPI-Dev/Dev

Merge 1.0.0 into master

Author: tterrag1098

.classpath

@@ -1,4 +1,24 @@
+*.class
+
+# Package Files #
+*.war
+*.ear
+/build
+/eclipse
 /bin
-*.classpath
 
-build.properties
+*.mtl
+*.classpath
+*.project
+/.settings
+/.gradle
+/config
+!/src/main/resources
+/crash-reports
+/logs
+/mods
+/resourcepacks
+/saves
+/screenshots
+/options.txt
+/libs

.gitignore

@@ -0,0 +1,74 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
+    }
+}
+
+apply plugin: 'forge'
+
+ext.configFile = file "build.properties"
+
+configFile.withReader {
+    // Load config.  It shall from now be referenced as simply config or project.config
+    def prop = new Properties()
+    prop.load(it)
+    project.ext.config = new ConfigSlurper().parse prop
+}
+
+// Finds and sets version data
+task buildInfo {
+    def cmd = "git rev-parse --short HEAD"
+    def proc = cmd.execute()
+    proc.waitFor()
+    if (proc.exitValue() == 0) {
+        ext.revision = proc.text.trim()
+    } else {
+        ext.revision = "GITBORK"
+    }
+
+    if (System.getenv().BUILD_NUMBER != null) {
+        ext.buildNum = "${System.getenv().BUILD_NUMBER}"
+    } else {
+        ext.buildNum = "DEV.${project.buildInfo.revision}"
+    }
+}
+ext.artifact_version = 'NFG'
+if (System.getenv().ARTIFACT_VERSION == null) {
+    artifact_version = "${config.mod_version}"
+}
+if (System.getenv().ARTIFACT_VERSION != null) {
+    artifact_version = "${system.getenv().ARTIFACT_VERSION}"
+}
+
+version = "MC${config.minecraft_version}-${artifact_version}-${System.getenv().BUILD_NUMBER}"
+
+minecraft {
+	version = "1.6.4-9.11.1.964"
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: '*.jar')
+}
+
+processResources
+{
+    // 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
+    }
+        
+    // copy everything else, thats not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}

.project

@@ -1,17 +1,3 @@
-# Example build.properties file.  Feel free to set these values to meet your needs on your system.
-#
-# dir.mc : Not Required. I use it as a base folder for other properties. This is where all my MC related stuff lives.
-dir.mc=
-# forge.version : Not Required. This is the path of the folder under my ${dir.mc} folder that I extract the Forge source distribution to.
-forge.version=965
-# dir.forge : Not Required. The path to the forge folder extracted from the Forge source distribution. I use it in subsequent properties.
-dir.forge=E:/Development/Let's Mod/development/forge
-#
-# dir.project : Required. This is the folder that you pulled the TreeCapitator repo to.
-dir.project=E:/Development/Let's Mod/development/eclipse/TPPI-Tweaks
-# dir.core.project : Required. This is the folder that you pulled the bspkrsCore repo to.
-dir.core.project=
-# dir.mcp : Required. The path to the mcp folder created by Forge when running install.cmd or install.sh.
-dir.mcp=E:/Development/Let's Mod/development/forge/mcp
-# dir.release : Required. The target path where the .jar/.zip files will be created.
-dir.release=E:/Mod Builds
+minecraft_version=1.6.4
+forge_version=9.11.1.964
+mod_version=1.0.0

build.gradle

@@ -0,0 +1,6 @@
+#Tue Oct 29 18:00:54 CDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip