Merge branch '1.11.2-dev' into 1.12-dev

build.gradle

@@ -48,6 +48,7 @@ repositories {
         name = "SpongePowered Repo"
         url = "http://repo.spongepowered.org/maven/"
     }
+    maven { url 'https://jitpack.io' }
 }
 
 configurations {
@@ -68,24 +69,20 @@ dependencies {
 
     shade 'org.aspectj:aspectjrt:1.8.2'
 
-    compile project(':ReplayStudio')
+    shade 'com.github.replaymod:ReplayStudio:9ee698e'
 
     testCompile 'junit:junit:4.11'
 }
 
-tasks['idea'].dependsOn ':ReplayStudio:preshadowJar'
-
 jar {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
     dependsOn configurations.compile
     dependsOn configurations.shade
-    dependsOn ':ReplayStudio:shadowJar'
 
     def shade = {files(
             configurations.compile.findAll {it.name.startsWith 'mixin-'}
                     + configurations.shade
-                    + getTasks().getByPath(':ReplayStudio:shadowJar').outputs.files
     )}
 
     def noticeDir = file("$buildDir/NOTICE")
@@ -106,7 +103,7 @@ jar {
         exclude { new File(file('jGui/src/main/resources'), it.relativePath.pathString).exists() }
         eachFile {
             if (getName() == 'LICENSE.txt') {
-                setName(getFile().getParentFile().getName().split('-')[0] + '-LICENSE.txt')
+                setName(getFile().getParentFile().getName().split('.jar_')[0] + '-LICENSE.txt')
             }
         }
     }
@@ -163,7 +160,7 @@ sourceSets {
         resources {
             srcDir 'jGui/src/main/resources'
         }
-        refMap = "mixins.replaymod.refmap.json"
+        ext.refMap = "mixins.replaymod.refmap.json"
     }
     integrationTest {
         compileClasspath += main.runtimeClasspath + main.output