Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into beeper-creams

# Conflicts:
#	src/main/java/de/hysky/skyblocker/SkyblockerMod.java
#	src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java

Pull updates from upstream and NOT get a heart attack

1 files changed, 94 insertions, 0 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
new file mode 100644
index 00000000..6165ac6a
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java
@@ -0,0 +1,94 @@
+package de.hysky.skyblocker.skyblock.dungeon;
+
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.utils.Utils;
+import de.hysky.skyblocker.utils.chat.ChatFilterResult;
+import de.hysky.skyblocker.utils.chat.ChatPatternListener;
+import de.hysky.skyblocker.utils.scheduler.MessageScheduler;
+import de.hysky.skyblocker.utils.scheduler.Scheduler;
+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();
+    public static final Pattern PLAYER = Pattern.compile(" ([a-zA-Z0-9_]{2,16}) ●");
+    private static final int BASE_DELAY = 10;
+
+    private String[] players;
+    private int playersSoFar;
+    private boolean repartying;
+    private String partyLeader;
+
+    public Reparty() {
+        super("^(?:You are not currently in a party\\." +
+                "|Party (?:Membe|Moderato)rs(?: \\(([0-9]+)\\)|:( .*))" +
+                "|([\\[A-z+\\]]* )?(?<disband>.*) has disbanded .*" +
+                "|.*\n([\\[A-z+\\]]* )?(?<invite>.*) has invited you to join their party!" +
+                "\nYou have 60 seconds to accept. Click here to join!\n.*)$");
+
+        this.repartying = false;
+        ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("rp").executes(context -> {
+            if (!Utils.isOnSkyblock() || this.repartying || client.player == null) return 0;
+            this.repartying = true;
+            MessageScheduler.INSTANCE.sendMessageAfterCooldown("/p list");
+            return 0;
+        })));
+    }
+
+    @Override
+    public ChatFilterResult state() {
+        return (SkyblockerConfigManager.get().general.acceptReparty || this.repartying) ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
+    }
+
+    @Override
+    public boolean onMatch(Text message, Matcher matcher) {
+        if (matcher.group(1) != null && repartying) {
+            this.playersSoFar = 0;
+            this.players = new String[Integer.parseInt(matcher.group(1)) - 1];
+        } else if (matcher.group(2) != null && repartying) {
+            Matcher m = PLAYER.matcher(matcher.group(2));
+            while (m.find()) {
+                this.players[playersSoFar++] = m.group(1);
+            }
+        } else if (matcher.group("disband") != null && !matcher.group("disband").equals(client.getSession().getUsername())) {
+            partyLeader = matcher.group("disband");
+            Scheduler.INSTANCE.schedule(() -> partyLeader = null, 61);
+            return false;
+        } else if (matcher.group("invite") != null && matcher.group("invite").equals(partyLeader)) {
+            String command = "/party accept " + partyLeader;
+            sendCommand(command, 0);
+            return false;
+        } else {
+            this.repartying = false;
+            return false;
+        }
+        if (this.playersSoFar == this.players.length) {
+            reparty();
+        }
+        return false;
+    }
+
+    private void reparty() {
+        ClientPlayerEntity playerEntity = client.player;
+        if (playerEntity == null) {
+            this.repartying = false;
+            return;
+        }
+        sendCommand("/p disband", 1);
+        for (int i = 0; i < this.players.length; ++i) {
+            String command = "/p invite " + this.players[i];
+            sendCommand(command, i + 2);
+        }
+        Scheduler.INSTANCE.schedule(() -> this.repartying = false, this.players.length + 2);
+    }
+
+    private void sendCommand(String command, int delay) {
+        MessageScheduler.INSTANCE.queueMessage(command, delay * BASE_DELAY);
+    }
+}
\ No newline at end of file