Feature: Reverse Party Transfer

src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt

@@ -548,6 +548,7 @@ object Commands {
         registerCommand("pt", "Transfer the party to another party member") { PartyCommands.transfer(it) }
         registerCommand("pp", "Promote a specific party member") { PartyCommands.promote(it) }
         registerCommand("pd", "Disbands the party") { PartyCommands.disband() }
+        registerCommand("rpt", "Transfer party to the previous leader") { PartyCommands.reverseTransfer() }
     }
 
     @JvmStatic

src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java

@@ -18,6 +18,11 @@ public class CommandsConfig {
     @Expose
     public BetterWikiCommandConfig betterWiki = new BetterWikiCommandConfig();
 
+    @ConfigOption(name = "Reverse Party Transfer", desc = "")
+    @Accordion
+    @Expose
+    public ReversePartyTransferConfig reversePT = new ReversePartyTransferConfig();
+
     @ConfigOption(name = "Party Commands", desc = "Shortens party commands and allows tab-completing for them. " +
         "\n§eCommands: /pt /pp /pko /pk /pd §7SkyBlock command §e/pt §7to check the play time still works.")
     @Expose

src/main/java/at/hannibal2/skyhanni/config/features/commands/ReversePartyTransferConfig.java

@@ -0,0 +1,27 @@
+package at.hannibal2.skyhanni.config.features.commands;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class ReversePartyTransferConfig {
+
+    @Expose
+    @ConfigOption(name = "Command", desc = "Adds §e/rpt §7to transfer a party back to its previous leader.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean command = true;
+
+    @Expose
+    @ConfigOption(name = "Clickable Message", desc = "Allows transfer message to be clicked to transfer a party back to its previous leader if it has been transferred to you.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean clickable = false;
+
+    @Expose
+    @ConfigOption(name = "Response Message", desc = "Sends a custom message to party chat when the party is reverse transferred.")
+    @ConfigEditorText
+    public String message = "Nuh Uh";
+}

src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt

@@ -49,9 +49,9 @@ object PartyAPI {
         "others.transfer.leave",
         "The party was transferred to (?<newowner>.*) because (?<name>.*) left"
     )
-    private val transferVoluntaryPattern by patternGroup.pattern(
+    val transferVoluntaryPattern by patternGroup.pattern(
         "others.transfer.voluntary",
-        "The party was transferred to (?<newowner>.*) by .*"
+        "The party was transferred to (?<newowner>.*) by (?<name>.*)"
     )
     private val disbandedPattern by patternGroup.pattern(
         "others.disband",
@@ -81,6 +81,7 @@ object PartyAPI {
     val partyMembers = mutableListOf<String>()
 
     var partyLeader: String? = null
+    var prevPartyLeader: String? = null
 
     fun listMembers() {
         val size = partyMembers.size
@@ -144,14 +145,23 @@ object PartyAPI {
         otherLeftPattern.matchMatcher(message) {
             val name = group("name").cleanPlayerName()
             partyMembers.remove(name)
+            if (name == prevPartyLeader) {
+                prevPartyLeader = null
+            }
         }
         otherKickedPattern.matchMatcher(message) {
             val name = group("name").cleanPlayerName()
             partyMembers.remove(name)
+            if (name == prevPartyLeader) {
+                prevPartyLeader = null
+            }
         }
         otherOfflineKickedPattern.matchMatcher(message) {
             val name = group("name").cleanPlayerName()
             partyMembers.remove(name)
+            if (name == prevPartyLeader) {
+                prevPartyLeader = null
+            }
         }
         otherDisconnectedPattern.matchMatcher(message) {
             val name = group("name").cleanPlayerName()
@@ -164,6 +174,7 @@ object PartyAPI {
         }
         transferVoluntaryPattern.matchMatcher(message.removeColor()) {
             partyLeader = group("newowner").cleanPlayerName()
+            prevPartyLeader = group("name").cleanPlayerName()
         }
 
         // party disbanded
@@ -207,5 +218,6 @@ object PartyAPI {
     private fun partyLeft() {
         partyMembers.clear()
         partyLeader = null
+        prevPartyLeader = null
     }
 }

src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt

@@ -4,10 +4,19 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.FriendAPI
 import at.hannibal2.skyhanni.data.PartyAPI
+import at.hannibal2.skyhanni.data.PartyAPI.partyLeader
+import at.hannibal2.skyhanni.data.PartyAPI.transferVoluntaryPattern
+import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.MessageSendToServerEvent
 import at.hannibal2.skyhanni.features.misc.limbo.LimboTimeTracker
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.EntityUtils
 import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.RegexUtils.matches
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.StringUtils.trimWhiteSpace
+import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 object PartyCommands {
@@ -65,6 +74,17 @@ object PartyCommands {
         HypixelCommands.partyPromote(args[0])
     }
 
+    fun reverseTransfer() {
+        if (!config.reversePT.command) return
+        if (PartyAPI.partyMembers.isEmpty()) return
+        PartyAPI.prevPartyLeader?.let {
+            HypixelCommands.partyTransfer(it)
+            if (config.reversePT.message.isNotBlank()) {
+                HypixelCommands.partyChat(config.reversePT.message)
+            }
+        }
+    }
+
     @SubscribeEvent
     fun onMessageSendToServer(event: MessageSendToServerEvent) {
         if (!config.partyKickReason) {
@@ -114,6 +134,29 @@ object PartyCommands {
 
         event.move(31, "commands", "misc.commands")
     }
+
+    @SubscribeEvent(priority = EventPriority.LOW)
+    fun onChat(event: LorenzChatEvent) {
+        if (!config.reversePT.clickable) return
+        if (transferVoluntaryPattern.matches(event.message.trimWhiteSpace().removeColor())) {
+            if (partyLeader != LorenzUtils.getPlayerName()) return
+
+            PartyAPI.prevPartyLeader?.let {
+                event.blockedReason = "replacing"
+
+                ChatUtils.clickableChat(
+                    event.message,
+                    onClick = {
+                        HypixelCommands.partyTransfer(it)
+                        if (config.reversePT.message.isNotBlank()) {
+                            HypixelCommands.partyChat(config.reversePT.message)
+                        }
+                    },
+                    prefix = false
+                )
+            }
+        }
+    }
 }
 
 private val otherPartyCommands = listOf(