Merge branch 'release/1.10.2-1.8.3'

.gitignore

@@ -20,4 +20,5 @@
 /bin
 .idea/
 classes/
-libs/FoxLib-1.8.9-0.8.2.jar
+
+/libs

README.md

@@ -1,10 +1,40 @@
-Tails
-=====
-
+# Tails
 A small mod that adds in a variety of tails
 
-Submitted PR's
-=====
+# Build and setup
+The standard build task will generate a shaded and non shaded version, with the non shaded having the `nonshaded` classifier
+Before it can be built however, a workspace must be setup.
+
+### Workspace
+To setup a workspace for general develop run `gradle setupDecompWorkspace`
+This will automatically download all required dependencies
+
+To setup a workspace for CI building, run `gradle setupCIWorkspace`
+
+### Building
+The standard build can be run by running `gradle build` which will output a shaded and nonshaded jar including sources.
+
+To only generate a `nonshaded` jar, run `gradle reobfJar`  
+To generate only a `sources` jar, run `gradle sourcejar`  
+To generate only a `shaded` jar, run `gradle reobfShadowJar`  
+
+# Maven 
+A maven repository is available at http://maven.foxes.rocks/
+
+To include this as a dependency in your project, add the following replacing `<version>` with the version you want.
+```
+repositories {
+    maven {
+        name = 'Kihira Maven'
+        url = 'http://maven.foxes.rocks'
+    }
+}
+dependencies {
+    deobfCompile "uk.kihira.tails:Tails:<version>:nonshaded"
+}
+```
+
+# Submitted PR's
 I use a git flow system so master is used for releases, develop for development etc. You can read more about it [here](http://nvie.com/posts/a-successful-git-branching-model/) or a quick cheatsheet [here](https://danielkummer.github.io/git-flow-cheatsheet/)
 
 Basically if you want to submit a language patch, submit it against the develop branch. Read [here](https://help.github.com/articles/using-pull-requests#changing-the-branch-range-and-destination-repository) on how to change branches when submitting a PR

build.gradle

@@ -1,47 +1,66 @@
 buildscript {
     repositories {
+        mavenCentral()
         jcenter()
         maven {
             name = "forge"
             url = "http://files.minecraftforge.net/maven"
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
     }
 }
+
+repositories {
+    mavenCentral()
+    maven {
+        name = 'Kihira Maven'
+        url = 'http://maven.foxes.rocks'
+    }
+}
+
 apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'maven'
+
+sourceCompatibility='1.8'
+targetCompatibility='1.8'
+
+configurations {
+    deployerJars
+    all {
+        resolutionStrategy.cacheChangingModulesFor 1, 'seconds'
+    }
+}
 
 ext {
     massive = "1"
-    major = "6"
-    minor = "1"
-    mcVersion = "1.9"
-    forgeVersion = "12.16.1.1888"
-    foxlibVersion = "1.9-0.9"
+    major = "8"
+    minor = "3"
+    mcVersion = "1.10.2"
+    forgeVersion = "12.18.1.2076"
+    foxlibVersion = "${project.mcVersion}-0.11.1"
 }
 
-group= "kihira"
+group= "uk.kihira.tails"
 archivesBaseName = "Tails"
 version = "${project.mcVersion}-${project.massive}.${project.major}.${project.minor}"
 
+dependencies {
+    deobfCompile "uk.kihira.foxlib:FoxLib:${project.mcVersion}-0.11+" // This requires setupDecompWorkspace to refresh
+    deployerJars "org.apache.maven.wagon:wagon-ssh:2.2"
+}
+
 minecraft {
     version = "${project.mcVersion}-${project.forgeVersion}"
     runDir = "run"
-    mappings = "snapshot_20160312"
+    mappings = "snapshot_20160518"
 
     replace '@VERSION@', project.version
     replace '@MCVERSION@', project.mcVersion
-    replace '@FOXLIBVERSION@', project.foxlibVersion
-}
-
-//noinspection GroovyAssignabilityCheck
-configurations {
-    deployerJars
-    //noinspection GroovyAssignabilityCheck
-    all {
-        resolutionStrategy.cacheChangingModulesFor 1, 'seconds'
-    }
+    replace '@FOXLIBVERSION@', project.foxlibVersion // todo auto calculate current version?
 }
 
 //noinspection GroovyAssignabilityCheck
@@ -66,8 +85,77 @@ processResources {
 
 //noinspection GroovyAssignabilityCheck
 jar {
-    manifest {
-        attributes 'FMLCorePlugin': 'kihira.tails.common.FoxLibManager',
-                'FMLCorePluginContainsFMLMod': 'true'
+    classifier = "nonshaded"
+}
+
+// provides the task reobfShadowJar
+reobf {
+    shadowJar {}
+}
+
+shadowJar {
+    classifier = ""
+}
+
+build.dependsOn 'reobfShadowJar' // standard build should create a shadow jar
+
+/**
+ * Maven uploading
+ */
+def deployer = {
+    repository(url: project.properties.maven_url) {
+        configuration = configurations.deployerJars
+        authentication(userName: project.properties.maven_username ?: "", password: project.properties.maven_password ?: "")
+    }
+
+    pom {
+        groupId = project.group
+        version = project.version
+        artifactId = project.archivesBaseName
+
+        project {
+            name project.archivesBaseName
+            packaging 'jar'
+            description 'Tails'
+            url 'https://github.com/kihira/Tails/'
+
+            scm {
+                url 'https://github.com/kihira/Tails/'
+                connection 'scm:git:git://github.com/kihira/Tails.git'
+                developerConnection 'scm:git:git@github.com/kihira/Tails.git'
+            }
+
+            issueManagement {
+                system 'github'
+                url 'https://github.com/kihira/Tails/issues'
+            }
+
+            licenses {
+                license {
+                    name 'The MIT License (MIT)'
+                    url 'https://opensource.org/licenses/MIT'
+                    distribution 'repo'
+                }
+            }
+
+            developers {
+                developer {
+                    id 'Kihira'
+                    name 'Kihira'
+                    roles {
+                        role 'developer'
+                    }
+                }
+            }
+        }
     }
+}
+
+uploadArchives {
+    repositories.mavenDeployer(deployer) // This took faaaaaaar too long to figure out how to do it
+}
+
+uploadShadow {
+    dependsOn 'reobfShadowJar'
+    repositories.mavenDeployer(deployer)
 }

gradle.properties

@@ -0,0 +1 @@
+shouldShade = true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Dec 22 15:56:52 GMT 2015
+#Mon Jul 11 14:44:04 BST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip

gradlew

@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`