more cleanup work, fix build

8 files changed, 37 insertions, 52 deletions

diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java
index 15882ce..ebcc3e8 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java
@@ -31,10 +31,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.nio.file.Path;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class SparkBukkitPlugin extends JavaPlugin implements SparkPlugin {
 
@@ -102,11 +100,11 @@ public class SparkBukkitPlugin extends JavaPlugin implements SparkPlugin {
     }
 
     @Override
-    public Set<BukkitCommandSender> getSendersWithPermission(String permission) {
-        List<CommandSender> senders = new LinkedList<>(getServer().getOnlinePlayers());
-        senders.removeIf(sender -> !sender.hasPermission(permission));
-        senders.add(getServer().getConsoleSender());
-        return senders.stream().map(BukkitCommandSender::new).collect(Collectors.toSet());
+    public Stream<BukkitCommandSender> getSendersWithPermission(String permission) {
+        return Stream.concat(
+                getServer().getOnlinePlayers().stream().filter(player -> player.hasPermission(permission)),
+                Stream.of(getServer().getConsoleSender())
+        ).map(BukkitCommandSender::new);
     }
 
     @Override
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 9becaf1..630035b 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
@@ -30,10 +30,7 @@ import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.TabExecutor;
 
 import java.nio.file.Path;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class SparkBungeeCordPlugin extends Plugin implements SparkPlugin {
 
@@ -67,11 +64,11 @@ public class SparkBungeeCordPlugin extends Plugin implements SparkPlugin {
     }
 
     @Override
-    public Set<BungeeCordCommandSender> getSendersWithPermission(String permission) {
-        List<CommandSender> senders = new LinkedList<>(getProxy().getPlayers());
-        senders.removeIf(sender -> !sender.hasPermission(permission));
-        senders.add(getProxy().getConsole());
-        return senders.stream().map(BungeeCordCommandSender::new).collect(Collectors.toSet());
+    public Stream<BungeeCordCommandSender> getSendersWithPermission(String permission) {
+        return Stream.concat(
+                getProxy().getPlayers().stream().filter(player -> player.hasPermission(permission)),
+                Stream.of(getProxy().getConsole())
+        ).map(BungeeCordCommandSender::new);
     }
 
     @Override
diff --git a/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java b/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java
index 2b48ca7..72bbfbc 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java
@@ -24,7 +24,7 @@ import me.lucko.spark.common.sampler.ThreadDumper;
 import me.lucko.spark.common.sampler.TickCounter;
 
 import java.nio.file.Path;
-import java.util.Set;
+import java.util.stream.Stream;
 
 public interface SparkPlugin {
 
@@ -34,7 +34,7 @@ public interface SparkPlugin {
 
     String getLabel();
 
-    Set<? extends CommandSender> getSendersWithPermission(String permission);
+    Stream<? extends CommandSender> getSendersWithPermission(String permission);
 
     void runAsync(Runnable r);
 
diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/CommandResponseHandler.java b/spark-common/src/main/java/me/lucko/spark/common/command/CommandResponseHandler.java
index 88a597d..6f02180 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/command/CommandResponseHandler.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/command/CommandResponseHandler.java
@@ -29,6 +29,7 @@ import net.kyori.text.format.TextDecoration;
 
 import java.util.Set;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 public class CommandResponseHandler {
 
@@ -53,7 +54,7 @@ public class CommandResponseHandler {
     }
 
     public void allSenders(Consumer<? super CommandSender> action) {
-        Set<CommandSender> senders = this.platform.getPlugin().getSendersWithPermission("spark");
+        Set<CommandSender> senders = this.platform.getPlugin().getSendersWithPermission("spark").collect(Collectors.toSet());
         senders.add(this.sender);
         senders.forEach(action);
     }
diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientSparkPlugin.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientSparkPlugin.java
index ec6a0fc..5dd2ded 100644
--- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientSparkPlugin.java
+++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientSparkPlugin.java
@@ -20,7 +20,6 @@
 
 package me.lucko.spark.forge;
 
-import me.lucko.spark.common.CommandSender;
 import me.lucko.spark.common.sampler.TickCounter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.command.ICommandSender;
@@ -28,9 +27,8 @@ import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
+import java.util.stream.Stream;
 
 public class ForgeClientSparkPlugin extends ForgeSparkPlugin {
 
@@ -48,8 +46,8 @@ public class ForgeClientSparkPlugin extends ForgeSparkPlugin {
     }
 
     @Override
-    public Set<CommandSender> getSendersWithPermission(String permission) {
-        return new HashSet<>(Collections.singleton(new ForgeCommandSender(Minecraft.getMinecraft().player, this)));
+    public Stream<ForgeCommandSender> getSendersWithPermission(String permission) {
+        return Stream.of(new ForgeCommandSender(Minecraft.getMinecraft().player, this));
     }
 
     @Override
diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerSparkPlugin.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerSparkPlugin.java
index ba56f44..3c686ae 100644
--- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerSparkPlugin.java
+++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerSparkPlugin.java
@@ -20,7 +20,6 @@
 
 package me.lucko.spark.forge;
 
-import me.lucko.spark.common.CommandSender;
 import me.lucko.spark.common.sampler.TickCounter;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.server.MinecraftServer;
@@ -28,10 +27,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class ForgeServerSparkPlugin extends ForgeSparkPlugin {
     public ForgeServerSparkPlugin(SparkForgeMod mod) {
@@ -44,12 +41,12 @@ public class ForgeServerSparkPlugin extends ForgeSparkPlugin {
     }
 
     @Override
-    public Set<CommandSender> getSendersWithPermission(String permission) {
+    public Stream<ForgeCommandSender> getSendersWithPermission(String permission) {
         MinecraftServer mcServer = FMLCommonHandler.instance().getMinecraftServerInstance();
-        List<ICommandSender> senders = new LinkedList<>(mcServer.getPlayerList().getPlayers());
-        senders.removeIf(sender -> !sender.canUseCommand(4, permission));
-        senders.add(mcServer);
-        return senders.stream().map(sender -> new ForgeCommandSender(sender, this)).collect(Collectors.toSet());
+        return Stream.concat(
+                mcServer.getPlayerList().getPlayers().stream().filter(player -> player.canUseCommand(4, permission)),
+                Stream.of(mcServer)
+        ).map(sender -> new ForgeCommandSender(sender, this));
     }
 
     @Override
diff --git a/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java b/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java
index 0e42379..ae312a0 100644
--- a/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java
+++ b/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java
@@ -21,7 +21,6 @@
 package me.lucko.spark.sponge;
 
 import com.google.inject.Inject;
-import me.lucko.spark.common.CommandSender;
 import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.SparkPlugin;
 import me.lucko.spark.common.sampler.ThreadDumper;
@@ -44,11 +43,9 @@ import org.spongepowered.api.world.World;
 
 import javax.annotation.Nullable;
 import java.nio.file.Path;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Plugin(
         id = "spark",
@@ -104,11 +101,11 @@ public class SparkSpongePlugin implements SparkPlugin {
     }
 
     @Override
-    public Set<CommandSender> getSendersWithPermission(String permission) {
-        List<CommandSource> senders = new LinkedList<>(this.game.getServer().getOnlinePlayers());
-        senders.removeIf(sender -> !sender.hasPermission(permission));
-        senders.add(this.game.getServer().getConsole());
-        return senders.stream().map(SpongeCommandSender::new).collect(Collectors.toSet());
+    public Stream<SpongeCommandSender> getSendersWithPermission(String permission) {
+        return Stream.concat(
+                this.game.getServer().getOnlinePlayers().stream().filter(player -> player.hasPermission(permission)),
+                Stream.of(this.game.getServer().getConsole())
+        ).map(SpongeCommandSender::new);
     }
 
     @Override
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
index 7cf345a..69217a9 100644
--- a/spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java
+++ b/spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java
@@ -30,7 +30,6 @@ 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.CommandSender;
 import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.SparkPlugin;
 import me.lucko.spark.common.sampler.ThreadDumper;
@@ -39,10 +38,8 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.optional.qual.MaybePresent;
 
 import java.nio.file.Path;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Plugin(
         id = "spark",
@@ -102,11 +99,11 @@ public class SparkVelocityPlugin implements SparkPlugin, Command {
     }
 
     @Override
-    public Set<CommandSender> getSendersWithPermission(String permission) {
-        List<CommandSource> senders = new LinkedList<>(this.proxy.getAllPlayers());
-        senders.removeIf(sender -> !sender.hasPermission(permission));
-        senders.add(this.proxy.getConsoleCommandSource());
-        return senders.stream().map(VelocityCommandSender::new).collect(Collectors.toSet());
+    public Stream<VelocityCommandSender> getSendersWithPermission(String permission) {
+        return Stream.concat(
+                this.proxy.getAllPlayers().stream().filter(player -> player.hasPermission(permission)),
+                Stream.of(this.proxy.getConsoleCommandSource())
+        ).map(VelocityCommandSender::new);
     }
 
     @Override