diff options
| -rw-r--r-- | build.gradle | 1 | ||||
| -rw-r--r-- | settings.gradle | 2 | ||||
| -rw-r--r-- | spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java | 2 | ||||
| -rw-r--r-- | spark-common/src/main/java/me/lucko/spark/common/CommandHandler.java | 6 | ||||
| -rw-r--r-- | spark-universal/build.gradle | 1 | ||||
| -rw-r--r-- | spark-velocity/build.gradle | 14 | ||||
| -rw-r--r-- | spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java | 125 |
7 files changed, 146 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle index 0128f6e..59d0393 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,7 @@ subprojects { maven { url "https://repo.lucko.me/" } maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" } maven { url "https://repo.spongepowered.org/maven" } + maven { url "https://repo.velocitypowered.com/snapshots/" } } } diff --git a/settings.gradle b/settings.gradle index a6d6799..f94c60b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ rootProject.name = 'spark' -include 'spark-common', 'spark-bukkit', 'spark-bungeecord', 'spark-sponge', 'spark-universal', 'spark-forge'
\ No newline at end of file +include 'spark-common', 'spark-bukkit', 'spark-bungeecord', 'spark-velocity', 'spark-sponge', 'spark-universal', 'spark-forge'
\ No newline at end of file diff --git a/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java b/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java index de5ca68..7f958c5 100644 --- a/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java +++ b/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java @@ -79,7 +79,7 @@ public class SparkBungeeCordPlugin extends Plugin { @Override protected ThreadDumper getDefaultThreadDumper() { - return new ThreadDumper.All(); + return ThreadDumper.ALL; } @Override diff --git a/spark-common/src/main/java/me/lucko/spark/common/CommandHandler.java b/spark-common/src/main/java/me/lucko/spark/common/CommandHandler.java index 005b44b..91428ea 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/CommandHandler.java +++ b/spark-common/src/main/java/me/lucko/spark/common/CommandHandler.java @@ -173,7 +173,7 @@ public abstract class CommandHandler<T> { try { tickCounter = newTickCounter(); } catch (UnsupportedOperationException e) { - sendPrefixedMessage(sender, "&cTick counting is not supported on BungeeCord!"); + sendPrefixedMessage(sender, "&cTick counting is not supported!"); return; } } @@ -307,7 +307,7 @@ public abstract class CommandHandler<T> { TickCounter tickCounter = newTickCounter(); this.activeTickMonitor = new ReportingTickMonitor(tickCounter, threshold); } catch (UnsupportedOperationException e) { - sendPrefixedMessage(sender, "&cNot supported on BungeeCord!"); + sendPrefixedMessage(sender, "&cNot supported!"); } } else { this.activeTickMonitor.close(); @@ -317,7 +317,7 @@ public abstract class CommandHandler<T> { } private class ReportingTickMonitor extends TickMonitor { - public ReportingTickMonitor(TickCounter tickCounter, int percentageChangeThreshold) { + ReportingTickMonitor(TickCounter tickCounter, int percentageChangeThreshold) { super(tickCounter, percentageChangeThreshold); } diff --git a/spark-universal/build.gradle b/spark-universal/build.gradle index d0583ac..79172e3 100644 --- a/spark-universal/build.gradle +++ b/spark-universal/build.gradle @@ -13,6 +13,7 @@ dependencies { compile project(':spark-common') compile project(':spark-bukkit') compile project(':spark-bungeecord') + compile project(':spark-velocity') compile project(':spark-sponge') } diff --git a/spark-velocity/build.gradle b/spark-velocity/build.gradle new file mode 100644 index 0000000..aeeba60 --- /dev/null +++ b/spark-velocity/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'ninja.miserable.blossom' version '1.0.1' +} + +dependencies { + compile project(':spark-common') + compileOnly 'com.velocitypowered:velocity-api:1.0-SNAPSHOT' + annotationProcessor 'com.velocitypowered:velocity-api:1.0-SNAPSHOT' +} + +blossom { + replaceTokenIn('src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java') + replaceToken '@version@', project.pluginVersion +}
\ No newline at end of file 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 new file mode 100644 index 0000000..fb81d90 --- /dev/null +++ b/spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java @@ -0,0 +1,125 @@ +/* + * This file is part of spark. + * + * Copyright (c) lucko (Luck) <luck@lucko.me> + * 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 <http://www.gnu.org/licenses/>. + */ + +package me.lucko.spark.velocity; + +import com.google.inject.Inject; +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.plugin.Plugin; +import com.velocitypowered.api.proxy.Player; +import com.velocitypowered.api.proxy.ProxyServer; + +import me.lucko.spark.common.CommandHandler; +import me.lucko.spark.profiler.ThreadDumper; +import me.lucko.spark.profiler.TickCounter; + +import net.kyori.text.Component; +import net.kyori.text.TextComponent; +import net.kyori.text.event.ClickEvent; +import net.kyori.text.format.TextColor; +import net.kyori.text.serializer.ComponentSerializers; + +@Plugin( + id = "spark", + name = "spark", + version = "@version@", + description = "Spark is a CPU profiling plugin based on sk89q's WarmRoast profiler", + authors = {"Luck", "sk89q"} +) +public class SparkVelocityPlugin { + + private final ProxyServer proxy; + + private final CommandHandler<CommandSource> commandHandler = new CommandHandler<CommandSource>() { + @SuppressWarnings("deprecation") + private TextComponent colorize(String message) { + return ComponentSerializers.LEGACY.deserialize(message, '&'); + } + + private void broadcast(Component msg) { + SparkVelocityPlugin.this.proxy.getConsoleCommandSource().sendMessage(msg); + for (Player player : SparkVelocityPlugin.this.proxy.getAllPlayers()) { + if (player.hasPermission("spark.profiler")) { + player.sendMessage(msg); + } + } + } + + @Override + protected String getLabel() { + return "sparkvelocity"; + } + + @Override + protected void sendMessage(CommandSource sender, String message) { + sender.sendMessage(colorize(message)); + } + + @Override + protected void sendMessage(String message) { + broadcast(colorize(message)); + } + + @Override + protected void sendLink(String url) { + TextComponent msg = TextComponent.builder(url) + .color(TextColor.GRAY) + .clickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url)) + .build(); + broadcast(msg); + } + + @Override + protected void runAsync(Runnable r) { + SparkVelocityPlugin.this.proxy.getScheduler().buildTask(SparkVelocityPlugin.this, r).schedule(); + } + + @Override + protected ThreadDumper getDefaultThreadDumper() { + return ThreadDumper.ALL; + } + + @Override + protected TickCounter newTickCounter() { + throw new UnsupportedOperationException(); + } + }; + + @Inject + public SparkVelocityPlugin(ProxyServer proxy) { + this.proxy = proxy; + } + + @Subscribe(order = PostOrder.FIRST) + public void onEnable(ProxyInitializeEvent e) { + this.proxy.getCommandManager().register((sender, args) -> { + if (!sender.hasPermission("spark.profiler")) { + TextComponent msg = TextComponent.builder("You do not have permission to use this command.").color(TextColor.RED).build(); + sender.sendMessage(msg); + return; + } + + SparkVelocityPlugin.this.commandHandler.handleCommand(sender, args); + }, "sparkvelocity", "vprofiler"); + } +} |