From 767995e05d46b416292a713756782f939b16f61f Mon Sep 17 00:00:00 2001 From: Luck Date: Thu, 27 May 2021 23:21:43 +0100 Subject: Rename velocity2 classes --- .../spark/velocity/Velocity2CommandSender.java | 66 ++++++++++++ .../spark/velocity/Velocity2PlatformInfo.java | 53 ++++++++++ .../lucko/spark/velocity/Velocity2SparkPlugin.java | 116 +++++++++++++++++++++ .../spark/velocity/VelocityCommandSender.java | 66 ------------ .../lucko/spark/velocity/VelocityPlatformInfo.java | 53 ---------- .../lucko/spark/velocity/VelocitySparkPlugin.java | 115 -------------------- 6 files changed, 235 insertions(+), 234 deletions(-) create mode 100644 spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2CommandSender.java create mode 100644 spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2PlatformInfo.java create mode 100644 spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2SparkPlugin.java delete mode 100644 spark-velocity2/src/main/java/me/lucko/spark/velocity/VelocityCommandSender.java delete mode 100644 spark-velocity2/src/main/java/me/lucko/spark/velocity/VelocityPlatformInfo.java delete mode 100644 spark-velocity2/src/main/java/me/lucko/spark/velocity/VelocitySparkPlugin.java (limited to 'spark-velocity2/src/main/java/me/lucko/spark/velocity') diff --git a/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2CommandSender.java b/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2CommandSender.java new file mode 100644 index 0000000..131e788 --- /dev/null +++ b/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2CommandSender.java @@ -0,0 +1,66 @@ +/* + * This file is part of spark. + * + * Copyright (c) lucko (Luck) + * Copyright (c) contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package me.lucko.spark.velocity; + +import com.velocitypowered.api.command.CommandSource; +import com.velocitypowered.api.command.ConsoleCommandSource; +import com.velocitypowered.api.proxy.connection.Player; + +import me.lucko.spark.common.command.sender.AbstractCommandSender; + +import net.kyori.adventure.text.Component; + +import java.util.UUID; + +public class Velocity2CommandSender extends AbstractCommandSender { + public Velocity2CommandSender(CommandSource source) { + super(source); + } + + @Override + public String getName() { + if (super.delegate instanceof Player) { + return ((Player) super.delegate).username(); + } else if (super.delegate instanceof ConsoleCommandSource) { + return "Console"; + } else { + return "unknown:" + super.delegate.getClass().getSimpleName(); + } + } + + @Override + public UUID getUniqueId() { + if (super.delegate instanceof Player) { + return ((Player) super.delegate).id(); + } + return null; + } + + @Override + public void sendMessage(Component message) { + super.delegate.sendMessage(message); + } + + @Override + public boolean hasPermission(String permission) { + return super.delegate.hasPermission(permission); + } +} diff --git a/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2PlatformInfo.java b/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2PlatformInfo.java new file mode 100644 index 0000000..cafe6a4 --- /dev/null +++ b/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2PlatformInfo.java @@ -0,0 +1,53 @@ +/* + * This file is part of spark. + * + * Copyright (c) lucko (Luck) + * Copyright (c) contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package me.lucko.spark.velocity; + +import com.velocitypowered.api.proxy.ProxyServer; + +import me.lucko.spark.common.platform.AbstractPlatformInfo; + +public class Velocity2PlatformInfo extends AbstractPlatformInfo { + private final ProxyServer proxy; + + public Velocity2PlatformInfo(ProxyServer proxy) { + this.proxy = proxy; + } + + @Override + public Type getType() { + return Type.PROXY; + } + + @Override + public String getName() { + return "Velocity"; + } + + @Override + public String getVersion() { + return this.proxy.version().version(); + } + + @Override + public String getMinecraftVersion() { + return null; + } +} diff --git a/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2SparkPlugin.java b/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2SparkPlugin.java new file mode 100644 index 0000000..a788a59 --- /dev/null +++ b/spark-velocity2/src/main/java/me/lucko/spark/velocity/Velocity2SparkPlugin.java @@ -0,0 +1,116 @@ +/* + * This file is part of spark. + * + * Copyright (c) lucko (Luck) + * Copyright (c) contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package me.lucko.spark.velocity; + +import com.google.inject.Inject; +import com.velocitypowered.api.command.SimpleCommand; +import com.velocitypowered.api.event.PostOrder; +import com.velocitypowered.api.event.Subscribe; +import com.velocitypowered.api.event.lifecycle.ProxyInitializeEvent; +import com.velocitypowered.api.event.lifecycle.ProxyShutdownEvent; +import com.velocitypowered.api.plugin.Plugin; +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 me.lucko.spark.common.platform.PlatformInfo; +import me.lucko.spark.common.util.ClassSourceLookup; + +import java.nio.file.Path; +import java.util.List; +import java.util.stream.Stream; + +@Plugin( + id = "spark", + name = "spark", + version = "@version@", + description = "@desc@", + authors = {"Luck"} +) +public class Velocity2SparkPlugin implements SparkPlugin, SimpleCommand { + + private final ProxyServer proxy; + private final Path configDirectory; + + private SparkPlatform platform; + + @Inject + public Velocity2SparkPlugin(ProxyServer proxy, @DataDirectory Path configDirectory) { + this.proxy = proxy; + this.configDirectory = configDirectory; + } + + @Subscribe(order = PostOrder.FIRST) + public void onEnable(ProxyInitializeEvent e) { + this.platform = new SparkPlatform(this); + this.platform.enable(); + this.proxy.commandManager().register("sparkv", this, "sparkvelocity"); + } + + @Subscribe(order = PostOrder.LAST) + public void onDisable(ProxyShutdownEvent e) { + this.platform.disable(); + } + + @Override + public void execute(Invocation inv) { + this.platform.executeCommand(new Velocity2CommandSender(inv.source()), inv.arguments()); + } + + @Override + public List suggest(Invocation inv) { + return this.platform.tabCompleteCommand(new Velocity2CommandSender(inv.source()), inv.arguments()); + } + + @Override + public String getVersion() { + return Velocity2SparkPlugin.class.getAnnotation(Plugin.class).version(); + } + + @Override + public Path getPluginDirectory() { + return this.configDirectory; + } + + @Override + public String getCommandName() { + return "sparkv"; + } + + @Override + public Stream getCommandSenders() { + return Stream.concat( + this.proxy.connectedPlayers().stream(), + Stream.of(this.proxy.consoleCommandSource()) + ).map(Velocity2CommandSender::new); + } + + @Override + public void executeAsync(Runnable task) { + this.proxy.scheduler().buildTask(this, task).schedule(); + } + + @Override + public PlatformInfo getPlatformInfo() { + return new Velocity2PlatformInfo(this.proxy); + } +} diff --git a/spark-velocity2/src/main/java/me/lucko/spark/velocity/VelocityCommandSender.java b/spark-velocity2/src/main/java/me/lucko/spark/velocity/VelocityCommandSender.java deleted file mode 100644 index f14b521..0000000 --- a/spark-velocity2/src/main/java/me/lucko/spark/velocity/VelocityCommandSender.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * This file is part of spark. - * - * Copyright (c) lucko (Luck) - * Copyright (c) contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package me.lucko.spark.velocity; - -import com.velocitypowered.api.command.CommandSource; -import com.velocitypowered.api.command.ConsoleCommandSource; -import com.velocitypowered.api.proxy.connection.Player; - -import me.lucko.spark.common.command.sender.AbstractCommandSender; - -import net.kyori.adventure.text.Component; - -import java.util.UUID; - -public class VelocityCommandSender extends AbstractCommandSender { - public VelocityCommandSender(CommandSource source) { - super(source); - } - - @Override - public String getName() { - if (super.delegate instanceof Player) { - return ((Player) super.delegate).username(); - } else if (super.delegate instanceof ConsoleCommandSource) { - return "Console"; - } else { - return "unknown:" + super.delegate.getClass().getSimpleName(); - } - } - - @Override - public UUID getUniqueId() { - if (super.delegate instanceof Player) { - return ((Player) super.delegate).id(); - } - return null; - } - - @Override - public void sendMessage(Component message) { - super.delegate.sendMessage(message); - } - - @Override - public boolean hasPermission(String permission) { - return super.delegate.hasPermission(permission); - } -} diff --git a/spark-velocity2/src/main/java/me/lucko/spark/velocity/VelocityPlatformInfo.java b/spark-velocity2/src/main/java/me/lucko/spark/velocity/VelocityPlatformInfo.java deleted file mode 100644 index 3ae6929..0000000 --- a/spark-velocity2/src/main/java/me/lucko/spark/velocity/VelocityPlatformInfo.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of spark. - * - * Copyright (c) lucko (Luck) - * Copyright (c) contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package me.lucko.spark.velocity; - -import com.velocitypowered.api.proxy.ProxyServer; - -import me.lucko.spark.common.platform.AbstractPlatformInfo; - -public class VelocityPlatformInfo extends AbstractPlatformInfo { - private final ProxyServer proxy; - - public VelocityPlatformInfo(ProxyServer proxy) { - this.proxy = proxy; - } - - @Override - public Type getType() { - return Type.PROXY; - } - - @Override - public String getName() { - return "Velocity"; - } - - @Override - public String getVersion() { - return this.proxy.version().version(); - } - - @Override - public String getMinecraftVersion() { - return null; - } -} diff --git a/spark-velocity2/src/main/java/me/lucko/spark/velocity/VelocitySparkPlugin.java b/spark-velocity2/src/main/java/me/lucko/spark/velocity/VelocitySparkPlugin.java deleted file mode 100644 index cfd8255..0000000 --- a/spark-velocity2/src/main/java/me/lucko/spark/velocity/VelocitySparkPlugin.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * This file is part of spark. - * - * Copyright (c) lucko (Luck) - * Copyright (c) contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package me.lucko.spark.velocity; - -import com.google.inject.Inject; -import com.velocitypowered.api.command.SimpleCommand; -import com.velocitypowered.api.event.PostOrder; -import com.velocitypowered.api.event.Subscribe; -import com.velocitypowered.api.event.lifecycle.ProxyInitializeEvent; -import com.velocitypowered.api.event.lifecycle.ProxyShutdownEvent; -import com.velocitypowered.api.plugin.Plugin; -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 me.lucko.spark.common.platform.PlatformInfo; - -import java.nio.file.Path; -import java.util.List; -import java.util.stream.Stream; - -@Plugin( - id = "spark", - name = "spark", - version = "@version@", - description = "@desc@", - authors = {"Luck"} -) -public class VelocitySparkPlugin implements SparkPlugin, SimpleCommand { - - private final ProxyServer proxy; - private final Path configDirectory; - - private SparkPlatform platform; - - @Inject - public VelocitySparkPlugin(ProxyServer proxy, @DataDirectory Path configDirectory) { - this.proxy = proxy; - this.configDirectory = configDirectory; - } - - @Subscribe(order = PostOrder.FIRST) - public void onEnable(ProxyInitializeEvent e) { - this.platform = new SparkPlatform(this); - this.platform.enable(); - this.proxy.commandManager().register("sparkv", this, "sparkvelocity"); - } - - @Subscribe(order = PostOrder.LAST) - public void onDisable(ProxyShutdownEvent e) { - this.platform.disable(); - } - - @Override - public void execute(Invocation inv) { - this.platform.executeCommand(new VelocityCommandSender(inv.source()), inv.arguments()); - } - - @Override - public List suggest(Invocation inv) { - return this.platform.tabCompleteCommand(new VelocityCommandSender(inv.source()), inv.arguments()); - } - - @Override - public String getVersion() { - return VelocitySparkPlugin.class.getAnnotation(Plugin.class).version(); - } - - @Override - public Path getPluginDirectory() { - return this.configDirectory; - } - - @Override - public String getCommandName() { - return "sparkv"; - } - - @Override - public Stream getCommandSenders() { - return Stream.concat( - this.proxy.connectedPlayers().stream(), - Stream.of(this.proxy.consoleCommandSource()) - ).map(VelocityCommandSender::new); - } - - @Override - public void executeAsync(Runnable task) { - this.proxy.scheduler().buildTask(this, task).schedule(); - } - - @Override - public PlatformInfo getPlatformInfo() { - return new VelocityPlatformInfo(this.proxy); - } -} -- cgit