From d27e15f8f346e9859edf5d034d258462e5a4871c Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Thu, 16 Mar 2023 20:40:07 -0400 Subject: Properly send commands over the network --- .../xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java index 8bfa9c0a..19f13c32 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java @@ -1,18 +1,18 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import me.xmrvizzy.skyblocker.SkyblockerMod; import me.xmrvizzy.skyblocker.chat.ChatFilterResult; import me.xmrvizzy.skyblocker.chat.ChatPatternListener; import me.xmrvizzy.skyblocker.utils.Utils; -import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.text.Text; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - public class Reparty extends ChatPatternListener { private static final MinecraftClient client = MinecraftClient.getInstance(); private static final SkyblockerMod skyblocker = SkyblockerMod.getInstance(); @@ -30,8 +30,7 @@ public class Reparty extends ChatPatternListener { dispatcher.register(ClientCommandManager.literal("rp").executes(context -> { if (!Utils.isOnSkyblock || this.repartying || client.player == null) return 0; this.repartying = true; - //client.player.sendChatMessage("/p list", Text.of("/p list")); - client.player.sendMessage(Text.of("/p list")); + client.player.networkHandler.sendCommand("p list"); return 0; })); }); @@ -69,9 +68,9 @@ public class Reparty extends ChatPatternListener { this.repartying = false; return; } - sendCommand(playerEntity, "/p disband", 1); + sendCommand(playerEntity, "p disband", 1); for (int i = 0; i < this.players.length; ++i) { - String command = "/p invite " + this.players[i]; + String command = "p invite " + this.players[i]; sendCommand(playerEntity, command, i + 2); } skyblocker.scheduler.schedule(() -> this.repartying = false, this.players.length + 2); @@ -79,6 +78,6 @@ public class Reparty extends ChatPatternListener { private void sendCommand(ClientPlayerEntity player, String command, int delay) { // skyblocker.scheduler.schedule(() -> player.sendChatMessage(command, Text.of(command)), delay * BASE_DELAY); - skyblocker.scheduler.schedule(() -> player.sendMessage(Text.of(command)), delay * BASE_DELAY); + skyblocker.scheduler.schedule(() -> player.networkHandler.sendCommand(command), delay * BASE_DELAY); } } -- cgit