aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2023-11-11 12:44:59 +0100
committerGitHub <noreply@github.com>2023-11-11 12:44:59 +0100
commite914cabd155e0a7fded7b874cef219b904660ec1 (patch)
treece37243f8537f21e78d46972fa76b2ded532d12f /src/main
parentfb40235d00dcfa42ca6eb3b8dacec8138386260b (diff)
downloadskyhanni-e914cabd155e0a7fded7b874cef219b904660ec1.tar.gz
skyhanni-e914cabd155e0a7fded7b874cef219b904660ec1.tar.bz2
skyhanni-e914cabd155e0a7fded7b874cef219b904660ec1.zip
tab list debug (#702)
Added /shdebugtablist - Set your clipboard as a fake tab list. #702
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt73
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/command/CopyTabListCommand.kt27
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt46
3 files changed, 114 insertions, 32 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index a2a1468a9..3a36272de 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -46,12 +46,12 @@ import at.hannibal2.skyhanni.test.command.CopyItemCommand
import at.hannibal2.skyhanni.test.command.CopyNearbyEntitiesCommand
import at.hannibal2.skyhanni.test.command.CopyNearbyParticlesCommand
import at.hannibal2.skyhanni.test.command.CopyScoreboardCommand
-import at.hannibal2.skyhanni.test.command.CopyTabListCommand
import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.test.command.TestChatCommand
import at.hannibal2.skyhanni.utils.APIUtil
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.SoundUtils
+import at.hannibal2.skyhanni.utils.TabListData
import net.minecraft.client.Minecraft
import net.minecraft.command.ICommandSender
import net.minecraft.event.ClickEvent
@@ -260,6 +260,7 @@ object Commands {
private fun developersCodingHelp() {
registerCommand("shtest", "Unused test command.") { SkyHanniDebugsAndTests.testCommand(it) }
registerCommand("shdebugwaypoint", "Mark a waypoint on that location") { SkyHanniDebugsAndTests.waypoint(it) }
+ registerCommand("shdebugtablist", "Set your clipboard as a fake tab list.") { TabListData.toggleDebugCommand() }
registerCommand("shreloadlocalrepo", "Reloading the local repo data") { SkyHanniMod.repo.reloadLocalRepo() }
registerCommand("shchathistory", "Show the unfiltered chat history") { ChatManager.openChatFilterGUI() }
registerCommand(
@@ -278,7 +279,7 @@ object Commands {
"shcopyentities",
"Copies entities in the specified radius around the player to the clipboard"
) { CopyNearbyEntitiesCommand.command(it) }
- registerCommand("shcopytablist", "Copies the tab list data to the clipboard") { CopyTabListCommand.command(it) }
+ registerCommand("shcopytablist", "Copies the tab list data to the clipboard") { TabListData.copyCommand(it) }
registerCommand(
"shcopyscoreboard",
"Copies the scoreboard data to the clipboard"
@@ -428,3 +429,71 @@ object Commands {
}
}
}
+/**
+ *
+ §r§a§lPlayers §r§f(21)
+§8[§r§9307§r§8] §r§c[§r§fYOUTUBE§r§c] Pigicial§r§f §r§7Σ
+§8[§r§6409§r§8] §r§6tmoe617 §r§6➶
+§8[§r§5395§r§8] §r§6CraftedFury §r§6§l℻
+§8[§r§d355§r§8] §r§6Mr_Minecraft_Ash §r§7§l:zap:
+§8[§r§9304§r§8] §r§6ClockSeller §r§6§lᛝ
+§8[§r§3269§r§8] §r§6SubAt0mic §r§7➶
+§8[§r§6402§r§8] §r§bMasterofBoom §r§6〣
+§8[§r§5392§r§8] §r§bIm_Krazy §r§6♔§r§7♲
+§8[§r§5386§r§8] §r§b987654321kaboom §r§6ᛃ
+§8[§r§5386§r§8] §r§bEisengolem §r§6⚔
+§8[§r§5369§r§8] §r§bVictone §r§6ᱪ
+§8[§r§d330§r§8] §r§bRolexDE §r§6ᛃ
+§8[§r§d321§r§8] §r§bshanny_boi
+§8[§r§9304§r§8] §r§bRainIsCake
+§8[§r§9294§r§8] §r§bCloutCarrot §r§6⚔
+§8[§r§3276§r§8] §r§bderNiklaas §r§7§lツ
+§8[§r§b234§r§8] §r§bAnyKun_ §r§6♫
+§8[§r§b231§r§8] §r§bBlackIronSweat §r§7♲
+§8[§r§2179§r§8] §r§bDiabeticShoes §r§7Σ
+ §r§a§lPlayers §r§f(21)
+§8[§r§9282§r§8] §r§bjanaj777 §r§6❁
+§8[§r§e101§r§8] §r§7DomAmelie
+ §r§3§lServer Info
+§b§lArea: §r§7Hub
+ Server: §r§8mini7B
+ Gems: §r§a0
+ §r§6§lAccount Info
+§e§lProfile: §r§aKiwi
+ Pet Sitter: §r§bN/A
+ Bank: §r§61B/1B
+ Interest: §r§e1h 57m
+§e§lSkills: §r§aForaging 50: §r§c§lMAX
+ Speed: §r§f✦400
+ Strength: §r§c❁770
+ Crit Chance: §r§9☣100
+ Crit Damage: §r§9☠454
+ Attack Speed: §r§e⚔0
+§e§lEvent: §r§bElection Over!
+ Starts In: §r§e17 Minutes
+§e§lElection: §r§b17 Minutes
+ §r§aDiana: §r§a|||||||§r§f||| §r§f(70%)
+ §r§cMarina: §r§c||§r§f|||||||| §r§f(20%)
+ §r§eFinnegan: §r§e||§r§f|||||||| §r§f(16%)
+§8[§9307§8] §cPigicial §7Σ
+§8[§9304§8] §6ClockSeller §6§lᛝ
+§8[§d355§8] §6Mr_Minecraft_Ash §7§l:zap:
+§8[§3269§8] §6SubAt0mic §7➶
+§8[§5395§8] §6CraftedFury §6§l℻
+§8[§6409§8] §6tmoe617 §6➶
+§8[§5386§8] §bEisengolem §6⚔
+§8[§d330§8] §bRolexDE §6ᛃ
+§8[§5386§8] §b987654321kaboom §6ᛃ
+§8[§5392§8] §bIm_Krazy §6♔§7♲
+§8[§3276§8] §bderNiklaas §7§lツ
+§8[§6402§8] §bMasterofBoom §6〣
+§8[§2179§8] §bDiabeticShoes §7Σ
+§8[§5369§8] §bVictone §6ᱪ
+§8[§b231§8] §bBlackIronSweat §7♲
+§8[§9294§8] §bCloutCarrot §6⚔
+§8[§b234§8] §bAnyKun_ §6♫
+§8[§9304§8] §bRainIsCake
+§8[§d321§8] §bshanny_boi
+§8[§9282§8] §bjanaj777 §6❁
+ *
+ */
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/CopyTabListCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/CopyTabListCommand.kt
deleted file mode 100644
index a4f287e5b..000000000
--- a/src/main/java/at/hannibal2/skyhanni/test/command/CopyTabListCommand.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package at.hannibal2.skyhanni.test.command
-
-import at.hannibal2.skyhanni.mixins.transformers.AccessorGuiPlayerTabOverlay
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils.conditionalTransform
-import at.hannibal2.skyhanni.utils.LorenzUtils.transformIf
-import at.hannibal2.skyhanni.utils.OSUtils
-import at.hannibal2.skyhanni.utils.StringUtils.removeColor
-import at.hannibal2.skyhanni.utils.TabListData
-import net.minecraft.client.Minecraft
-
-object CopyTabListCommand {
- fun command(args: Array<String>) {
- val resultList = mutableListOf<String>()
- val noColor = args.size == 1 && args[0] == "true"
- for (line in TabListData.getTabList()) {
- val tabListLine = line.transformIf({ noColor }) { removeColor() }
- if (tabListLine != "") resultList.add("'$tabListLine'")
- }
- val tabList = Minecraft.getMinecraft().ingameGUI.tabList as AccessorGuiPlayerTabOverlay
- val tabHeader = tabList.header_skyhanni.conditionalTransform(noColor, { unformattedText }, { formattedText })
- val tabFooter = tabList.footer_skyhanni.conditionalTransform(noColor, { unformattedText }, { formattedText })
- val string = "Header:\n\n$tabHeader\n\nBody:\n\n${resultList.joinToString("\n")}\n\nFooter:\n\n$tabFooter"
- OSUtils.copyToClipboard(string)
- LorenzUtils.chat("§e[SkyHanni] Tab list copied into the clipboard!")
- }
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt b/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt
index 252d974ca..67ea197d2 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt
@@ -1,10 +1,16 @@
package at.hannibal2.skyhanni.utils
+import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.events.LorenzTickEvent
import at.hannibal2.skyhanni.events.TabListUpdateEvent
import at.hannibal2.skyhanni.mixins.hooks.tabListGuard
+import at.hannibal2.skyhanni.mixins.transformers.AccessorGuiPlayerTabOverlay
+import at.hannibal2.skyhanni.utils.LorenzUtils.conditionalTransform
+import at.hannibal2.skyhanni.utils.LorenzUtils.transformIf
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
import com.google.common.collect.ComparisonChain
import com.google.common.collect.Ordering
+import kotlinx.coroutines.launch
import net.minecraft.client.Minecraft
import net.minecraft.client.network.NetworkPlayerInfo
import net.minecraft.world.WorldSettings
@@ -16,9 +22,43 @@ class TabListData {
companion object {
private var cache = emptyList<String>()
+ private var debugCache: List<String>? = null
// TODO replace with TabListUpdateEvent
- fun getTabList() = cache
+ fun getTabList() = debugCache ?: cache
+
+ fun toggleDebugCommand() {
+ if (debugCache != null) {
+ LorenzUtils.chat("§e[SkyHanni] Disabled tab list debug.")
+ debugCache = null
+ return
+ }
+ SkyHanniMod.coroutineScope.launch {
+ val clipboard = OSUtils.readFromClipboard() ?: return@launch
+ debugCache = clipboard.lines()
+ LorenzUtils.chat("§e[SkyHanni] Enabled tab list debug with your clipboard.")
+ }
+ }
+
+ fun copyCommand(args: Array<String>) {
+ if (debugCache != null) {
+ LorenzUtils.clickableChat("§c[SkyHanni] Tab list debug is enambed!", "shdebugtablist")
+ return
+ }
+
+ val resultList = mutableListOf<String>()
+ val noColor = args.size == 1 && args[0] == "true"
+ for (line in getTabList()) {
+ val tabListLine = line.transformIf({ noColor }) { removeColor() }
+ if (tabListLine != "") resultList.add("'$tabListLine'")
+ }
+ val tabList = Minecraft.getMinecraft().ingameGUI.tabList as AccessorGuiPlayerTabOverlay
+ val tabHeader = tabList.header_skyhanni.conditionalTransform(noColor, { unformattedText }, { formattedText })
+ val tabFooter = tabList.footer_skyhanni.conditionalTransform(noColor, { unformattedText }, { formattedText })
+ val string = "Header:\n\n$tabHeader\n\nBody:\n\n${resultList.joinToString("\n")}\n\nFooter:\n\n$tabFooter"
+ OSUtils.copyToClipboard(string)
+ LorenzUtils.chat("§e[SkyHanni] Tab list copied into the clipboard!")
+ }
}
private val playerOrdering = Ordering.from(PlayerComparator())
@@ -60,7 +100,7 @@ class TabListData {
val tabList = readTabList() ?: return
if (cache != tabList) {
cache = tabList
- TabListUpdateEvent(cache).postAndCatch()
+ TabListUpdateEvent(getTabList()).postAndCatch()
}
}
-} \ No newline at end of file
+}