diff options
| -rw-r--r-- | gradle.properties | 1 | ||||
| -rw-r--r-- | spark-bukkit/build.gradle | 2 | ||||
| -rw-r--r-- | spark-fabric/build.gradle | 31 | ||||
| -rw-r--r-- | spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricClientSparkPlugin.java | 2 | ||||
| -rw-r--r-- | spark-forge/build.gradle | 4 | ||||
| -rw-r--r-- | spark-velocity/build.gradle | 4 |
6 files changed, 29 insertions, 15 deletions
diff --git a/gradle.properties b/gradle.properties index f7c8378..dd68d76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true
\ No newline at end of file diff --git a/spark-bukkit/build.gradle b/spark-bukkit/build.gradle index 47ee2f5..fd5c016 100644 --- a/spark-bukkit/build.gradle +++ b/spark-bukkit/build.gradle @@ -4,7 +4,7 @@ dependencies { exclude(module: 'text-api') exclude(module: 'text-serializer-gson') } - compileOnly 'com.destroystokyo.paper:paper-api:1.16.2-R0.1-SNAPSHOT' + compileOnly 'com.destroystokyo.paper:paper-api:1.16.4-R0.1-SNAPSHOT' // placeholders compileOnly 'me.clip:placeholderapi:2.10.3' 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; diff --git a/spark-forge/build.gradle b/spark-forge/build.gradle index 8229963..ead3341 100644 --- a/spark-forge/build.gradle +++ b/spark-forge/build.gradle @@ -20,11 +20,11 @@ minecraft { processResources { from(sourceSets.main.resources.srcDirs) { + include 'META-INF/mods.toml' expand ( 'pluginVersion': project.pluginVersion, 'pluginDescription': project.pluginDescription ) - include 'META-INF/mods.toml' } from(sourceSets.main.resources.srcDirs) { @@ -38,7 +38,7 @@ configurations { } dependencies { - minecraft 'net.minecraftforge:forge:1.16.3-34.1.25' + minecraft 'net.minecraftforge:forge:1.16.4-35.0.3' shade project(':spark-common') } diff --git a/spark-velocity/build.gradle b/spark-velocity/build.gradle index 1cc67fd..f14bc15 100644 --- a/spark-velocity/build.gradle +++ b/spark-velocity/build.gradle @@ -5,8 +5,8 @@ plugins { dependencies { compile project(':spark-common') - compileOnly 'com.velocitypowered:velocity-api:1.0.9' - annotationProcessor 'com.velocitypowered:velocity-api:1.0.9' + compileOnly 'com.velocitypowered:velocity-api:1.1.0' + annotationProcessor 'com.velocitypowered:velocity-api:1.1.0' } blossom { |