diff options
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java | 19 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/shortcut/Shortcuts.java | 1 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java index f92204cd..66288eed 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java @@ -15,6 +15,7 @@ import net.azureaaron.hmapi.network.packet.s2c.HypixelS2CPacket; import net.azureaaron.hmapi.network.packet.v2.s2c.PartyInfoS2CPacket; import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; +import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; @@ -26,6 +27,7 @@ import java.util.regex.Matcher; import org.slf4j.Logger; import com.mojang.brigadier.Command; +import com.mojang.brigadier.context.CommandContext; import com.mojang.logging.LogUtils; public class Reparty extends ChatPatternListener { @@ -43,14 +45,19 @@ public class Reparty extends ChatPatternListener { this.repartying = false; HypixelPacketEvents.PARTY_INFO.register(this::onPacket); - ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("rp").executes(context -> { - if (!Utils.isOnSkyblock() || this.repartying || CLIENT.player == null) return 0; + ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> { + dispatcher.register(ClientCommandManager.literal("reparty").executes(this::executeCommand)); + dispatcher.register(ClientCommandManager.literal("rp").executes(this::executeCommand)); + }); + } + + private int executeCommand(CommandContext<FabricClientCommandSource> source) { + if (!Utils.isOnSkyblock() || this.repartying || CLIENT.player == null) return 0; - this.repartying = true; - HypixelNetworking.sendPartyInfoC2SPacket(2); + this.repartying = true; + HypixelNetworking.sendPartyInfoC2SPacket(2); - return Command.SINGLE_SUCCESS; - }))); + return Command.SINGLE_SUCCESS; } private void onPacket(HypixelS2CPacket packet) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/shortcut/Shortcuts.java b/src/main/java/de/hysky/skyblocker/skyblock/shortcut/Shortcuts.java index 7dab70a3..8853857b 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/shortcut/Shortcuts.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/shortcut/Shortcuts.java @@ -103,7 +103,6 @@ public class Shortcuts { // Party commandArgs.put("/pa", "/p accept"); commands.put("/pd", "/p disband"); - commands.put("/rp", "/reparty"); // Visit commandArgs.put("/v", "/visit"); |