From 2a03b547c7714a130b2bc1407b12a8abd58a9069 Mon Sep 17 00:00:00 2001 From: Luck Date: Sat, 3 Aug 2019 22:04:20 +0100 Subject: Some more reorganising --- .../lucko/spark/velocity/SparkVelocityPlugin.java | 123 --------------------- .../lucko/spark/velocity/VelocitySparkPlugin.java | 111 +++++++++++++++++++ 2 files changed, 111 insertions(+), 123 deletions(-) delete mode 100644 spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java create mode 100644 spark-velocity/src/main/java/me/lucko/spark/velocity/VelocitySparkPlugin.java (limited to 'spark-velocity/src') diff --git a/spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java b/spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java deleted file mode 100644 index 69217a9..0000000 --- a/spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java +++ /dev/null @@ -1,123 +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.Command; -import com.velocitypowered.api.command.CommandSource; -import com.velocitypowered.api.event.PostOrder; -import com.velocitypowered.api.event.Subscribe; -import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; -import com.velocitypowered.api.event.proxy.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.sampler.ThreadDumper; -import me.lucko.spark.common.sampler.TickCounter; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.optional.qual.MaybePresent; - -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", "sk89q"} -) -public class SparkVelocityPlugin implements SparkPlugin, Command { - - private final ProxyServer proxy; - private final Path configDirectory; - - private SparkPlatform platform; - - @Inject - public SparkVelocityPlugin(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.getCommandManager().register(this, "sparkv", "sparkvelocity"); - } - - @Subscribe(order = PostOrder.LAST) - public void onDisable(ProxyShutdownEvent e) { - this.platform.disable(); - } - - @Override - public void execute(@MaybePresent CommandSource sender, @NonNull @MaybePresent String[] args) { - this.platform.executeCommand(new VelocityCommandSender(sender), args); - } - - @Override - public @MaybePresent List suggest(@MaybePresent CommandSource sender, @NonNull @MaybePresent String[] currentArgs) { - return this.platform.tabCompleteCommand(new VelocityCommandSender(sender), currentArgs); - } - - @Override - public String getVersion() { - return SparkVelocityPlugin.class.getAnnotation(Plugin.class).version(); - } - - @Override - public Path getPluginFolder() { - return this.configDirectory; - } - - @Override - public String getLabel() { - return "sparkv"; - } - - @Override - public Stream getSendersWithPermission(String permission) { - return Stream.concat( - this.proxy.getAllPlayers().stream().filter(player -> player.hasPermission(permission)), - Stream.of(this.proxy.getConsoleCommandSource()) - ).map(VelocityCommandSender::new); - } - - @Override - public void runAsync(Runnable r) { - this.proxy.getScheduler().buildTask(this, r).schedule(); - } - - @Override - public ThreadDumper getDefaultThreadDumper() { - return ThreadDumper.ALL; - } - - @Override - public TickCounter createTickCounter() { - return null; - } -} 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 new file mode 100644 index 0000000..7e98679 --- /dev/null +++ b/spark-velocity/src/main/java/me/lucko/spark/velocity/VelocitySparkPlugin.java @@ -0,0 +1,111 @@ +/* + * 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.Command; +import com.velocitypowered.api.command.CommandSource; +import com.velocitypowered.api.event.PostOrder; +import com.velocitypowered.api.event.Subscribe; +import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; +import com.velocitypowered.api.event.proxy.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 org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.optional.qual.MaybePresent; + +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", "sk89q"} +) +public class VelocitySparkPlugin implements SparkPlugin, Command { + + 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.getCommandManager().register(this, "sparkv", "sparkvelocity"); + } + + @Subscribe(order = PostOrder.LAST) + public void onDisable(ProxyShutdownEvent e) { + this.platform.disable(); + } + + @Override + public void execute(@MaybePresent CommandSource sender, @NonNull @MaybePresent String[] args) { + this.platform.executeCommand(new VelocityCommandSender(sender), args); + } + + @Override + public @MaybePresent List suggest(@MaybePresent CommandSource sender, @NonNull @MaybePresent String[] currentArgs) { + return this.platform.tabCompleteCommand(new VelocityCommandSender(sender), currentArgs); + } + + @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 getSendersWithPermission(String permission) { + return Stream.concat( + this.proxy.getAllPlayers().stream().filter(player -> player.hasPermission(permission)), + Stream.of(this.proxy.getConsoleCommandSource()) + ).map(VelocityCommandSender::new); + } + + @Override + public void executeAsync(Runnable task) { + this.proxy.getScheduler().buildTask(this, task).schedule(); + } +} -- cgit