Update to 1.16.4

2 files changed, 23 insertions, 10 deletions

diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle
index a2592ed..2ae99f6 100644
--- a/spark-fabric/build.gradle
+++ b/spark-fabric/build.gradle
@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id 'fabric-loom' version '0.4-SNAPSHOT'
+    id 'fabric-loom' version '0.5-SNAPSHOT'
     id 'com.github.johnrengelman.shadow' version '4.0.1'
 }
 
@@ -12,24 +12,37 @@ configurations {
 
 dependencies {
     // https://modmuss50.me/fabric.html
-    minecraft "com.mojang:minecraft:1.16.2"
-    mappings "net.fabricmc:yarn:1.16.2+build.47:v2"
-    modCompile "net.fabricmc:fabric-loader:0.9.3+build.207"
-    modCompile "net.fabricmc.fabric-api:fabric-api:0.20.1+build.401-1.16"
+    minecraft 'com.mojang:minecraft:1.16.4'
+    mappings 'net.fabricmc:yarn:1.16.4+build.6:v2'
+    modCompile 'net.fabricmc:fabric-loader:0.10.6+build.214'
+
+    Set<String> apiModules = [
+            "fabric-api-base",
+            "fabric-command-api-v1",
+            "fabric-lifecycle-events-v1"
+    ]
+
+    // Add each module as a dependency
+    apiModules.forEach {
+        modImplementation(fabricApi.module(it, '0.25.1+build.416-1.16'))
+    }
 
     shade project(':spark-common')
 }
 
 processResources {
-    inputs.property "version", project.version
+    inputs.property 'version', project.version
 
     from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
-        expand "pluginVersion": project.pluginVersion, "pluginDescription": project.pluginDescription
+        include 'fabric.mod.json'
+        expand (
+                'pluginVersion': project.pluginVersion,
+                'pluginDescription': project.pluginDescription
+        )
     }
 
     from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
+        exclude 'fabric.mod.json'
     }
 }
 
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricClientSparkPlugin.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricClientSparkPlugin.java
index ef39fd2..21e92dc 100644
--- a/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricClientSparkPlugin.java
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricClientSparkPlugin.java
@@ -38,8 +38,8 @@ import me.lucko.spark.fabric.FabricTickHook;
 import me.lucko.spark.fabric.FabricTickReporter;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.command.CommandSource;
 import net.minecraft.server.command.CommandOutput;
-import net.minecraft.server.command.CommandSource;
 
 import java.util.Arrays;
 import java.util.Optional;