1.6.4 Master Merge and some Work

.gitignore

@@ -1,3 +1,14 @@
+*.blend1
+*.blend2
+
+.settings
+build/
+eclipse/
+bin/
+
+.classpath
+.project
+
 /*
 !/.gitignore
 !/gradle/
@@ -7,4 +18,5 @@
 !/src/*
 !/*.gradle
 !/*.md
-.gradle
+
+.gradle/

README.md

@@ -3,9 +3,5 @@ MLCore
 A 'Library' of commonly used functions and class for my mods.
 
 ##License##
-* You may use my code to learn.
-* You may distribute MLCore in any mod packs without my permission; however, I would like to be notified..
-* You may also create derivatives for _private_ (includes server modpacks) use.
-* You may not publish derivatives of MLCore without my permission. PRs are preferred.
-* You may use MLCore in your mod as long as you notify me and give me credit.
-* You may link _directly_ to the download of MLCore if your mod requires it.
+Released under the Creative Commons `BY-NC-SA` License.
+Available at http://creativecommons.org/licenses/by-nc-sa/4.0/

build.gradle

@@ -15,49 +15,44 @@ buildscript {
     }
 }
 
+repositories {
+    ivy {
+        name 'Forge FS legacy'
+        artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]"
+    }
+		maven {
+        name 'CB Repo'
+        url "http://chickenbones.net/maven/"
+    }
+    maven {
+        name 'ForgeFS'
+        url 'http://files.minecraftforge.net/maven'
+     }
+}
+
 apply plugin: 'forge'
 
-version = "1.0"
-group= "ml" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+file "build.properties" withReader {
+    def prop = new Properties()
+    prop.load(it)
+    ext.config = new ConfigSlurper().parse prop
+}
+
+version = "${config.mlcore.version}"
+group = "ml"
 archivesBaseName = "MLCore"
 
-minecraft {
-    version = "1.7.2-10.12.2.1147"
-    assetDir = "run/assets"
-}
+if (System.getenv("BUILD_NUMBER") != null)
+    version += ".${System.getenv("BUILD_NUMBER")}"
 
-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"
-
-    // real examples
-    //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // for more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
+ext.simpleVersion = version
+version = "MC${config.minecraft.version}-${project.version}"
 
+dependencies {
+		compile "codechicken:NotEnoughItems:${config.minecraft.version}-${config.NEI.version}:dev"
 }
 
-processResources
-{
-    // this will ensure that this task is redone when the versions change.
-    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
-    }
-
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-}
+apply from: 'gradle/forge.gradle'
+apply from: 'gradle/artifact.gradle'
+apply from: 'gradle/release.gradle'
+

build.properties

@@ -1,2 +1,6 @@
-MLCore.version=0.8.1
-minecraft.version = 1.6.4
+minecraft.version=1.7.2
+forge.version=10.12.2.1121
+CCLIB.version=1.0.1.7
+NEI.version=1.0.2.14
+mlcore.version=0.8.2
+maven.url=file:///media/storage/Minecraft/web/maven

gradle/artifact.gradle

@@ -0,0 +1,39 @@
+jar {
+    classifier = 'universal'
+    manifest {
+        attributes FMLCorePlugin: "ml.core.MLCore"
+        attributes FMLCorePluginContainsFMLMod: "true"
+    }
+}
+
+javadoc {
+    include 'ml/core/api/**'
+}
+
+// because the normal default jar task has been modified to be obfuscated
+task deobfJar(type: Jar) {
+    from sourceSets.main.output
+    classifier = 'deobf'
+    manifest {
+        attributes FMLCorePlugin: "ml.core.MLCore"
+        attributes FMLCorePluginContainsFMLMod: "true"
+    }
+}
+
+task apiJar(type: Jar) {
+    from sourceSets.main.output
+    from sourceSets.main.java
+    classifier = 'api'
+    include 'li/cil/oc/api/**'
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    from 'build/docs/javadoc'
+    classifier 'javadoc'
+}
+
+artifacts {
+    archives deobfJar
+    //archives apiJar
+    //archives javadocJar
+}

gradle/forge.gradle

@@ -0,0 +1,14 @@
+
+minecraft {
+    version = "${config.minecraft.version}-${config.forge.version}"
+}
+
+processResources {
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+        expand 'version': project.simpleVersion, 'mcversion': config.minecraft.version
+    }
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}