From e77393a51ef447ac69f21f52228a83aa8cb22e18 Mon Sep 17 00:00:00 2001
From: wizjany <wizjany@gmail.com>
Date: Thu, 19 Sep 2019 21:11:23 -0400
Subject: [PATCH] Bundle required fabric api jars.

---
 worldedit-fabric/build.gradle.kts             | 34 ++++++++++---------
 .../src/main/resources/fabric.mod.json        |  7 ++--
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/worldedit-fabric/build.gradle.kts b/worldedit-fabric/build.gradle.kts
index f8cb056eb..e6e3525ca 100644
--- a/worldedit-fabric/build.gradle.kts
+++ b/worldedit-fabric/build.gradle.kts
@@ -1,6 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import net.fabricmc.loom.task.RemapJarTask
-import kotlin.reflect.KClass
 
 buildscript {
     repositories {
@@ -16,7 +15,7 @@ buildscript {
     }
 
     dependencies {
-        "classpath"("net.fabricmc:fabric-loom:0.2.3-SNAPSHOT")
+        "classpath"("net.fabricmc:fabric-loom:0.2.5-SNAPSHOT")
         "classpath"("org.spongepowered:mixin:0.7.11-SNAPSHOT")
     }
 }
@@ -27,9 +26,8 @@ applyShadowConfiguration()
 apply(plugin = "fabric-loom")
 
 val minecraftVersion = "1.14.4"
-val fabricVersion = "0.3.0+build.200"
-val yarnMappings = "1.14.4+build.1"
-val loaderVersion = "0.4.8+build.155"
+val yarnMappings = "1.14.4+build.12"
+val loaderVersion = "0.6.2+build.166"
 
 configurations.all {
     resolutionStrategy {
@@ -45,7 +43,15 @@ dependencies {
     "mappings"("net.fabricmc:yarn:$yarnMappings")
     "modCompile"("net.fabricmc:fabric-loader:$loaderVersion")
 
-    "modCompile"("net.fabricmc.fabric-api:fabric-api:$fabricVersion")
+    listOf(
+        "net.fabricmc.fabric-api:fabric-api-base:0.1.0+2983bc0442",
+        "net.fabricmc.fabric-api:fabric-events-interaction-v0:0.1.1+591e97ae42",
+        "net.fabricmc.fabric-api:fabric-events-lifecycle-v0:0.1.1+591e97ae42",
+        "net.fabricmc.fabric-api:fabric-networking-v0:0.1.3+591e97ae42"
+    ).forEach {
+        "include"(it)
+        "modImplementation"(it)
+    }
 
     "testCompile"("org.mockito:mockito-core:1.9.0-rc1")
 }
@@ -96,16 +102,12 @@ artifacts {
     add("archives", tasks.named("deobfJar"))
 }
 
-// intellij has trouble detecting RemapJarTask as a subclass of Task
-@Suppress("UNCHECKED_CAST")
-val remapJarIntellijHack = RemapJarTask::class as KClass<Task>
-tasks.register("remapShadowJar", remapJarIntellijHack) {
-    (this as RemapJarTask).run {
-        val shadowJar = tasks.getByName<ShadowJar>("shadowJar")
-        dependsOn(shadowJar)
-        setInput(shadowJar.archiveFile)
-        setOutput(shadowJar.archiveFile.get().asFile.absolutePath.replace(Regex("-dev\\.jar$"), ".jar"))
-    }
+tasks.register<RemapJarTask>("remapShadowJar") {
+    val shadowJar = tasks.getByName<ShadowJar>("shadowJar")
+    dependsOn(shadowJar)
+    input.set(shadowJar.archiveFile)
+    archiveFileName.set(shadowJar.archiveFileName.get().replace(Regex("-dev\\.jar$"), ".jar"))
+    addNestedDependencies.set(true)
 }
 
 tasks.named("assemble").configure {
diff --git a/worldedit-fabric/src/main/resources/fabric.mod.json b/worldedit-fabric/src/main/resources/fabric.mod.json
index ee3e7b612..705320db0 100644
--- a/worldedit-fabric/src/main/resources/fabric.mod.json
+++ b/worldedit-fabric/src/main/resources/fabric.mod.json
@@ -29,9 +29,12 @@
 
     "depends": {
         "fabricloader": ">=0.4.0",
-        "fabric": "*"
+        "fabric-api-base": "*",
+        "fabric-events-lifecycle-v0": "*",
+        "fabric-events-interaction-v0": "*",
+        "fabric-networking-v0": "*"
     },
     "mixins": [
         "worldedit.mixins.json"
     ]
-}
\ No newline at end of file
+}