Merge pull request #517 from kaendfinger/master

Reformated build.gradle

.gitignore

@@ -15,4 +15,5 @@
 ## intellij
 /out
 /.idea
-/*.iml
+/*.iml
+/atlassian-ide-plugin.xml

build.gradle

@@ -20,7 +20,7 @@ configFile.withReader {
     // read config.  it shall from now on be referenced as simply config or as project.config
     def prop = new Properties()
     prop.load(it)
-    project.ext.config = new ConfigSlurper().parse prop
+    ext.config = new ConfigSlurper().parse prop
 }
 
 group = "com.pahimar.ee3"
@@ -36,92 +36,87 @@ minecraft {
         replace "@FINGERPRINT@", project.ee3_signature
 }
 
-processResources
-        {
-            // replace stuff in the files we want.
-            from(sourceSets.main.resources.srcDirs) {
-                include 'mcmod.info'
-                include 'version.properties'
+processResources {
+    // replace stuff in the files we want.
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+        include 'version.properties'
 
-                // replaces
-                expand 'version': project.config.mod_version, 'buildnumber': project.config.build_number
-            }
+        // replaces
+        expand 'version': project.config.mod_version, 'buildnumber': project.config.build_number
+    }
 
-            // copy everything else, thats we didnt do before
-            from(sourceSets.main.resources.srcDirs) {
-                exclude 'mcmod.info'
-                exclude 'version.properties'
-            }
-        }
+    // copy everything else, thats we didnt do before
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+        exclude 'version.properties'
+    }
+}
 
 // BEYOND THIS POINT.. 
 // IS STUFF THATS FOR RELEASING...
 
 // verify the properties exist.. or initialize.
 if (!project.hasProperty("keystore_location")) // keystore stuff
-    ext.keystore_location = ".";
+    ext.keystore_location = "."
 
 if (!project.hasProperty("ee3_keystore_alias")) // keystore stuff
-    ext.ee3_keystore_alias = "";
+    ext.ee3_keystore_alias = ""
 
 if (!project.hasProperty("keystore_password")) // keystore stuff
-    ext.keystore_password = "";
+    ext.keystore_password = ""
 
 if (!project.hasProperty("ee3_release_loc")) // release loc
-    ext.ee3_release_loc = ".";
+    ext.ee3_release_loc = "."
 else
     ee3_release_loc = ee3_release_loc.replace('{MC}', minecraft.version).replace('{MODVER}', config.mod_version).replace('{BUILD}', config.build_number)
 
-task("signJar", dependsOn: "reobf")
-        {
-            inputs.file jar.getArchivePath()
-            inputs.file keystore_location
-            inputs.property "ee3_keystore_alias", ee3_keystore_alias
-            inputs.property "keystore_password", keystore_password
-            outputs.file jar.getArchivePath()
+task signJar(dependsOn: "reobf") {
+    inputs.file jar.getArchivePath()
+    inputs.file keystore_location
+    inputs.property "ee3_keystore_alias", ee3_keystore_alias
+    inputs.property "keystore_password", keystore_password
+    outputs.file jar.getArchivePath()
 
-            // only sign if the keystore exists
-            onlyIf {
-                return keystore_location != "."
-            }
+    // only sign if the keystore exists
+    onlyIf {
+        return keystore_location != "."
+    }
 
-            // the actual action.. sign the jar.
-            doLast {
-                ant.signjar(
-                        destDir: jar.destinationDir,
-                        jar: jar.getArchivePath(),
-                        keystore: keystore_location,
-                        alias: ee3_keystore_alias,
-                        storepass: keystore_password
-                )
-            }
+    // the actual action.. sign the jar.
+    doLast {
+        ant.signjar(
+                destDir: jar.destinationDir,
+                jar: jar.getArchivePath(),
+                keystore: keystore_location,
+                alias: ee3_keystore_alias,
+                storepass: keystore_password
+        )
+    }
+}
+
+task incrementBuildNumber() {
+    doLast {
+        // increment
+        config.build_number = (config.build_number.toString().toInteger()) + 1
+
+        // write back to the file
+        configFile.withWriter {
+            config.toProperties().store(it, "")
         }
+    }
+}
 
-task("incrementBuildNumber")
-        {
-            // increment build number
-            doFirst {
-                // increment
-                config.build_number = (config.build_number.toString().toInteger()) + 1
+task release(type: Copy) {
+    dependsOn "incrementBuildNumber"
+    dependsOn "signJar"
 
-                // write back to the file
-                configFile.withWriter {
-                    config.toProperties().store(it, "")
-                }
-            }
-        }
+    eachFile { file ->
+        logger.info "copying ${file}"
+    }
 
-task("release", type: Copy)
-        {
-            dependsOn "incrementBuildNumber"
-            dependsOn "signJar"
-
-            eachFile { file ->
-                logger.info "copying ${file}"
-            }
-
-            // only if the release location isnt empty.
-            onlyIf {
-                return project.ee3_release_loc != "."
-            }
-        }
+    // only if the release location isn't empty.
+    onlyIf {
+        return project.ee3_release_loc != "."
+    }
+}

build.properties

@@ -1,6 +1,6 @@
 #
-#Sat Dec 14 19:57:18 EST 2013
+#Tue Dec 17 19:56:56 EST 2013
 minecraft_version=1.6.4
 forge_version=9.11.1.964
 mod_version=0.0
-build_number=28
+build_number=30