diff --git a/src/main/java/xyz/soukup/ecocraftVelocity/EcocraftVelocity.java b/src/main/java/xyz/soukup/ecocraftVelocity/EcocraftVelocity.java index c6dea59..3384213 100644 --- a/src/main/java/xyz/soukup/ecocraftVelocity/EcocraftVelocity.java +++ b/src/main/java/xyz/soukup/ecocraftVelocity/EcocraftVelocity.java @@ -30,7 +30,7 @@ public class EcocraftVelocity { registerEvents(); registerCommands(); } - +; private void registerEvents(){ EventManager eventManager = server.getEventManager(); eventManager.register(this, new GlobalChat(server)); diff --git a/src/main/java/xyz/soukup/ecocraftVelocity/chat/DirectMessages.java b/src/main/java/xyz/soukup/ecocraftVelocity/chat/DirectMessages.java index 2c48b8c..c231eea 100644 --- a/src/main/java/xyz/soukup/ecocraftVelocity/chat/DirectMessages.java +++ b/src/main/java/xyz/soukup/ecocraftVelocity/chat/DirectMessages.java @@ -34,7 +34,6 @@ public class DirectMessages { proxy.getAllPlayers().forEach(player -> { builder.suggest(player.getUsername()); }); - builder.suggest("all"); return builder.buildFuture(); } @@ -71,4 +70,6 @@ public class DirectMessages { ); return Command.SINGLE_SUCCESS; } + + } diff --git a/src/main/java/xyz/soukup/ecocraftVelocity/chat/JoinLeaveMessages.java b/src/main/java/xyz/soukup/ecocraftVelocity/chat/JoinLeaveMessages.java index 3b3cf82..ab153cd 100644 --- a/src/main/java/xyz/soukup/ecocraftVelocity/chat/JoinLeaveMessages.java +++ b/src/main/java/xyz/soukup/ecocraftVelocity/chat/JoinLeaveMessages.java @@ -2,6 +2,7 @@ package xyz.soukup.ecocraftVelocity.chat; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.DisconnectEvent; +import com.velocitypowered.api.event.connection.LoginEvent; import com.velocitypowered.api.event.player.ServerPostConnectEvent; import com.velocitypowered.api.proxy.ProxyServer; import net.kyori.adventure.text.minimessage.MiniMessage; @@ -17,7 +18,7 @@ public class JoinLeaveMessages { } @Subscribe - public void onJoin(ServerPostConnectEvent event){ + public void onJoin(LoginEvent event){ String name = event.getPlayer().getUsername(); String messageFormat = "[+] "; diff --git a/src/main/java/xyz/soukup/ecocraftVelocity/chat/ReplyCommand.java b/src/main/java/xyz/soukup/ecocraftVelocity/chat/ReplyCommand.java new file mode 100644 index 0000000..559b8bf --- /dev/null +++ b/src/main/java/xyz/soukup/ecocraftVelocity/chat/ReplyCommand.java @@ -0,0 +1,36 @@ +package xyz.soukup.ecocraftVelocity.chat; + +import com.mojang.brigadier.Command; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.tree.LiteralCommandNode; +import com.velocitypowered.api.command.BrigadierCommand; +import com.velocitypowered.api.command.CommandSource; +import com.velocitypowered.api.proxy.Player; +import com.velocitypowered.api.proxy.ProxyServer; + +import java.util.HashMap; +import java.util.List; + +public class ReplyCommand { + + public static HashMap> replyRecipients = new HashMap<>(); + + public static BrigadierCommand replyCommand(final ProxyServer proxy){ + LiteralCommandNode reply = BrigadierCommand.literalArgumentBuilder("r") + .then(BrigadierCommand.requiredArgumentBuilder("message", StringArgumentType.greedyString()) + .executes(ReplyCommand::reply) + ) + .build(); + + return new BrigadierCommand(reply); + } + + private static int reply(CommandContext ctx){ + String message = ctx.getArgument("message", String.class); + List recipients = replyRecipients.get(ctx.getSource()); + return 0; + } + + +}