diff options
-rw-r--r-- | spark-bukkit/build.gradle | 2 | ||||
-rw-r--r-- | spark-bungeecord/build.gradle | 2 | ||||
-rw-r--r-- | spark-fabric/build.gradle | 8 | ||||
-rw-r--r-- | spark-forge/build.gradle | 4 | ||||
-rw-r--r-- | spark-forge/src/main/resources/META-INF/mods.toml | 4 | ||||
-rw-r--r-- | spark-forge/src/main/resources/pack.mcmeta | 2 | ||||
-rw-r--r-- | spark-velocity/build.gradle | 4 | ||||
-rw-r--r-- | spark-velocity/src/main/java/me/lucko/spark/velocity/VelocitySparkPlugin.java | 5 |
8 files changed, 15 insertions, 16 deletions
diff --git a/spark-bukkit/build.gradle b/spark-bukkit/build.gradle index c4b9d8c..794465b 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.14.4-R0.1-SNAPSHOT' + compileOnly 'com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT' // placeholders compileOnly 'me.clip:placeholderapi:2.10.3' diff --git a/spark-bungeecord/build.gradle b/spark-bungeecord/build.gradle index fbe9719..051cafd 100644 --- a/spark-bungeecord/build.gradle +++ b/spark-bungeecord/build.gradle @@ -4,7 +4,7 @@ dependencies { exclude(module: 'text-api') exclude(module: 'text-serializer-gson') } - compileOnly 'net.md-5:bungeecord-api:1.14-SNAPSHOT' + compileOnly 'net.md-5:bungeecord-api:1.15-SNAPSHOT' } processResources { diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle index cf7ff1f..bc88c7d 100644 --- a/spark-fabric/build.gradle +++ b/spark-fabric/build.gradle @@ -12,10 +12,10 @@ configurations { dependencies { // https://modmuss50.me/fabric.html - minecraft "com.mojang:minecraft:1.15.1" - mappings "net.fabricmc:yarn:1.15.1+build.35:v2" - modCompile "net.fabricmc:fabric-loader:0.7.3+build.176" - modCompile "net.fabricmc.fabric-api:fabric-api:0.4.27+build.286-1.15" + minecraft "com.mojang:minecraft:1.15.2" + mappings "net.fabricmc:yarn:1.15.2+build.7:v2" + modCompile "net.fabricmc:fabric-loader:0.7.6+build.179" + modCompile "net.fabricmc.fabric-api:fabric-api:0.4.29+build.290-1.15" shade project(':spark-common') } diff --git a/spark-forge/build.gradle b/spark-forge/build.gradle index 526778e..63ed770 100644 --- a/spark-forge/build.gradle +++ b/spark-forge/build.gradle @@ -14,7 +14,7 @@ plugins { apply plugin: 'net.minecraftforge.gradle' minecraft { - mappings channel: 'snapshot', version: '20200112-1.14.3' + mappings channel: 'snapshot', version: '20200125-1.15.1' } processResources { @@ -37,7 +37,7 @@ configurations { } dependencies { - minecraft 'net.minecraftforge:forge:1.14.4-28.1.0' + minecraft 'net.minecraftforge:forge:1.15.2-31.0.1' shade project(':spark-common') } diff --git a/spark-forge/src/main/resources/META-INF/mods.toml b/spark-forge/src/main/resources/META-INF/mods.toml index 3c57015..9f0f9e2 100644 --- a/spark-forge/src/main/resources/META-INF/mods.toml +++ b/spark-forge/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[28,)" +loaderVersion="[31,)" authors="Luck, sk89q" [[mods]] @@ -11,6 +11,6 @@ description="${pluginDescription}" [[dependencies.spark]] modId="forge" mandatory=true - versionRange="[28,)" + versionRange="[31,)" ordering="NONE" side="BOTH"
\ No newline at end of file diff --git a/spark-forge/src/main/resources/pack.mcmeta b/spark-forge/src/main/resources/pack.mcmeta index 6dd0930..6a06fe5 100644 --- a/spark-forge/src/main/resources/pack.mcmeta +++ b/spark-forge/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "spark resources", - "pack_format": 4 + "pack_format": 5 } }
\ No newline at end of file diff --git a/spark-velocity/build.gradle b/spark-velocity/build.gradle index 03fe260..e90ed7f 100644 --- a/spark-velocity/build.gradle +++ b/spark-velocity/build.gradle @@ -4,8 +4,8 @@ plugins { dependencies { compile project(':spark-common') - compileOnly 'com.velocitypowered:velocity-api:1.0.3' - annotationProcessor 'com.velocitypowered:velocity-api:1.0.3' + compileOnly 'com.velocitypowered:velocity-api:1.0.4' + annotationProcessor 'com.velocitypowered:velocity-api:1.0.4' } blossom { diff --git a/spark-velocity/src/main/java/me/lucko/spark/velocity/VelocitySparkPlugin.java b/spark-velocity/src/main/java/me/lucko/spark/velocity/VelocitySparkPlugin.java index 7e98679..4fe8c52 100644 --- a/spark-velocity/src/main/java/me/lucko/spark/velocity/VelocitySparkPlugin.java +++ b/spark-velocity/src/main/java/me/lucko/spark/velocity/VelocitySparkPlugin.java @@ -32,7 +32,6 @@ import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.ProxyServer; import me.lucko.spark.common.SparkPlatform; import me.lucko.spark.common.SparkPlugin; -import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.optional.qual.MaybePresent; import java.nio.file.Path; @@ -72,12 +71,12 @@ public class VelocitySparkPlugin implements SparkPlugin, Command { } @Override - public void execute(@MaybePresent CommandSource sender, @NonNull @MaybePresent String[] args) { + public void execute(CommandSource sender, String[] args) { this.platform.executeCommand(new VelocityCommandSender(sender), args); } @Override - public @MaybePresent List<String> suggest(@MaybePresent CommandSource sender, @NonNull @MaybePresent String[] currentArgs) { + public @MaybePresent List<String> suggest(CommandSource sender, String[] currentArgs) { return this.platform.tabCompleteCommand(new VelocityCommandSender(sender), currentArgs); } |