aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--settings.gradle2
-rw-r--r--spark-velocity4/build.gradle (renamed from spark-velocity2/build.gradle)6
-rw-r--r--spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4ClassSourceLookup.java (renamed from spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2ClassSourceLookup.java)4
-rw-r--r--spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4CommandSender.java (renamed from spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2CommandSender.java)4
-rw-r--r--spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4PlatformInfo.java (renamed from spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2PlatformInfo.java)4
-rw-r--r--spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4SparkPlugin.java (renamed from spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2SparkPlugin.java)18
6 files changed, 19 insertions, 19 deletions
diff --git a/settings.gradle b/settings.gradle
index b47da02..d3b1913 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,7 +16,7 @@ include (
'spark-bukkit',
'spark-bungeecord',
'spark-velocity',
- 'spark-velocity2',
+ 'spark-velocity4',
'spark-sponge',
'spark-sponge8',
'spark-forge',
diff --git a/spark-velocity2/build.gradle b/spark-velocity4/build.gradle
index f16ab40..f25c887 100644
--- a/spark-velocity2/build.gradle
+++ b/spark-velocity4/build.gradle
@@ -11,8 +11,8 @@ compileJava {
dependencies {
implementation project(':spark-common')
- compileOnly 'com.velocitypowered:velocity-api:2.0.0-SNAPSHOT'
- annotationProcessor 'com.velocitypowered:velocity-annotation-processor:2.0.0-SNAPSHOT'
+ compileOnly 'com.velocitypowered:velocity-api:4.0.0-SNAPSHOT'
+ annotationProcessor 'com.velocitypowered:velocity-annotation-processor:4.0.0-SNAPSHOT'
}
repositories {
@@ -26,7 +26,7 @@ blossom {
}
shadowJar {
- archiveName = 'spark-velocity2.jar'
+ archiveName = 'spark-velocity4.jar'
relocate 'okio', 'me.lucko.spark.lib.okio'
relocate 'okhttp3', 'me.lucko.spark.lib.okhttp3'
diff --git a/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2ClassSourceLookup.java b/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4ClassSourceLookup.java
index 8374f09..28bf3da 100644
--- a/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2ClassSourceLookup.java
+++ b/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4ClassSourceLookup.java
@@ -27,7 +27,7 @@ import me.lucko.spark.common.util.ClassSourceLookup;
import org.checkerframework.checker.nullness.qual.Nullable;
-public class Velocity2ClassSourceLookup extends ClassSourceLookup.ByClassLoader {
+public class Velocity4ClassSourceLookup extends ClassSourceLookup.ByClassLoader {
private static final Class<?> PLUGIN_CLASS_LOADER;
static {
@@ -40,7 +40,7 @@ public class Velocity2ClassSourceLookup extends ClassSourceLookup.ByClassLoader
private final PluginManager pluginManager;
- public Velocity2ClassSourceLookup(PluginManager pluginManager) {
+ public Velocity4ClassSourceLookup(PluginManager pluginManager) {
this.pluginManager = pluginManager;
}
diff --git a/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2CommandSender.java b/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4CommandSender.java
index 131e788..d346c2c 100644
--- a/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2CommandSender.java
+++ b/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4CommandSender.java
@@ -30,8 +30,8 @@ import net.kyori.adventure.text.Component;
import java.util.UUID;
-public class Velocity2CommandSender extends AbstractCommandSender<CommandSource> {
- public Velocity2CommandSender(CommandSource source) {
+public class Velocity4CommandSender extends AbstractCommandSender<CommandSource> {
+ public Velocity4CommandSender(CommandSource source) {
super(source);
}
diff --git a/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2PlatformInfo.java b/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4PlatformInfo.java
index cafe6a4..fd2b3b5 100644
--- a/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2PlatformInfo.java
+++ b/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4PlatformInfo.java
@@ -24,10 +24,10 @@ import com.velocitypowered.api.proxy.ProxyServer;
import me.lucko.spark.common.platform.AbstractPlatformInfo;
-public class Velocity2PlatformInfo extends AbstractPlatformInfo {
+public class Velocity4PlatformInfo extends AbstractPlatformInfo {
private final ProxyServer proxy;
- public Velocity2PlatformInfo(ProxyServer proxy) {
+ public Velocity4PlatformInfo(ProxyServer proxy) {
this.proxy = proxy;
}
diff --git a/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2SparkPlugin.java b/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4SparkPlugin.java
index 0ea4bf8..072f5c7 100644
--- a/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2SparkPlugin.java
+++ b/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4SparkPlugin.java
@@ -46,7 +46,7 @@ import java.util.stream.Stream;
description = "@desc@",
authors = {"Luck"}
)
-public class Velocity2SparkPlugin implements SparkPlugin, SimpleCommand {
+public class Velocity4SparkPlugin implements SparkPlugin, SimpleCommand {
private final ProxyServer proxy;
private final Path configDirectory;
@@ -54,7 +54,7 @@ public class Velocity2SparkPlugin implements SparkPlugin, SimpleCommand {
private SparkPlatform platform;
@Inject
- public Velocity2SparkPlugin(ProxyServer proxy, @DataDirectory Path configDirectory) {
+ public Velocity4SparkPlugin(ProxyServer proxy, @DataDirectory Path configDirectory) {
this.proxy = proxy;
this.configDirectory = configDirectory;
}
@@ -73,17 +73,17 @@ public class Velocity2SparkPlugin implements SparkPlugin, SimpleCommand {
@Override
public void execute(Invocation inv) {
- this.platform.executeCommand(new Velocity2CommandSender(inv.source()), inv.arguments());
+ this.platform.executeCommand(new Velocity4CommandSender(inv.source()), inv.arguments());
}
@Override
public List<String> suggest(Invocation inv) {
- return this.platform.tabCompleteCommand(new Velocity2CommandSender(inv.source()), inv.arguments());
+ return this.platform.tabCompleteCommand(new Velocity4CommandSender(inv.source()), inv.arguments());
}
@Override
public String getVersion() {
- return Velocity2SparkPlugin.class.getAnnotation(Plugin.class).version();
+ return Velocity4SparkPlugin.class.getAnnotation(Plugin.class).version();
}
@Override
@@ -97,11 +97,11 @@ public class Velocity2SparkPlugin implements SparkPlugin, SimpleCommand {
}
@Override
- public Stream<Velocity2CommandSender> getCommandSenders() {
+ public Stream<Velocity4CommandSender> getCommandSenders() {
return Stream.concat(
this.proxy.connectedPlayers().stream(),
Stream.of(this.proxy.consoleCommandSource())
- ).map(Velocity2CommandSender::new);
+ ).map(Velocity4CommandSender::new);
}
@Override
@@ -111,11 +111,11 @@ public class Velocity2SparkPlugin implements SparkPlugin, SimpleCommand {
@Override
public ClassSourceLookup createClassSourceLookup() {
- return new Velocity2ClassSourceLookup(this.proxy.pluginManager());
+ return new Velocity4ClassSourceLookup(this.proxy.pluginManager());
}
@Override
public PlatformInfo getPlatformInfo() {
- return new Velocity2PlatformInfo(this.proxy);
+ return new Velocity4PlatformInfo(this.proxy);
}
}