aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-01-18 20:41:59 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-01-18 20:41:59 +0100
commit934e6a7d106238d80f0f986ac99c044de8515e31 (patch)
tree4b44c933613f656429092832254d74dbe2ddff01
parent16e9a946212a270f63dfc5647374581dd122586f (diff)
downloadskyhanni-934e6a7d106238d80f0f986ac99c044de8515e31.tar.gz
skyhanni-934e6a7d106238d80f0f986ac99c044de8515e31.tar.bz2
skyhanni-934e6a7d106238d80f0f986ac99c044de8515e31.zip
code cleanup
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt72
1 files changed, 37 insertions, 35 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt
index ded048300..0cf0e4b5a 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt
@@ -25,9 +25,9 @@ object DebugCommand {
list.add(
if (search != null) {
if (search.equalsIgnoreColor("all")) {
- "search for everything."
- } else "search: '$search'"
- } else "search not specified, showing only interesting stuff"
+ "search for everything:"
+ } else "search '$search':"
+ } else "search is not specified, show only interesting stuff:"
)
val event = DebugDataCollectEvent(list, search)
@@ -58,20 +58,21 @@ object DebugCommand {
event.title("Profile Type")
if (!LorenzUtils.inSkyBlock) {
event.ignore("Not on SkyBlcok")
+ return
+ }
+
+ val classic = !LorenzUtils.noTradeMode
+ if (classic) {
+ event.ignore("on classic")
} else {
- val classic = !LorenzUtils.noTradeMode
- if (classic) {
- event.ignore("on classic")
- } else {
- if (HypixelData.ironman) {
- event.addData("on ironman")
- }
- if (HypixelData.stranded) {
- event.addData("on stranded")
- }
- if (HypixelData.bingo) {
- event.addData("on bingo")
- }
+ if (HypixelData.ironman) {
+ event.addData("on ironman")
+ }
+ if (HypixelData.stranded) {
+ event.addData("on stranded")
+ }
+ if (HypixelData.bingo) {
+ event.addData("on bingo")
}
}
}
@@ -80,12 +81,13 @@ object DebugCommand {
event.title("Profile Name")
if (!LorenzUtils.inSkyBlock) {
event.ignore("Not on SkyBlcok")
+ return
+ }
+
+ if (HypixelData.profileName != "") {
+ event.ignore("profileName: '${HypixelData.profileName}'")
} else {
- if (HypixelData.profileName != "") {
- event.ignore("profileName: '${HypixelData.profileName}'")
- } else {
- event.addData("profile name is empty!")
- }
+ event.addData("profile name is empty!")
}
}
@@ -93,20 +95,20 @@ object DebugCommand {
event.title("SkyBlock Status")
if (!LorenzUtils.onHypixel) {
event.addData("not on Hypixel")
- } else {
- if (!LorenzUtils.inSkyBlock) {
- event.addData("not on SkyBlock, but on Hypixel")
- } else {
- if (LorenzUtils.skyBlockIsland == IslandType.UNKNOWN) {
- event.addData("Unknown SkyBlock island!")
- } else {
- event.ignore {
- add("on Hypixel SkyBlock")
- add("skyBlockIsland: ${LorenzUtils.skyBlockIsland}")
- add("skyBlockArea: '${LorenzUtils.skyBlockArea}'")
- }
- }
- }
+ return
+ }
+ if (!LorenzUtils.inSkyBlock) {
+ event.addData("not on SkyBlock, but on Hypixel")
+ return
+ }
+ if (LorenzUtils.skyBlockIsland == IslandType.UNKNOWN) {
+ event.addData("Unknown SkyBlock island!")
+ return
+ }
+ event.ignore {
+ add("on Hypixel SkyBlock")
+ add("skyBlockIsland: ${LorenzUtils.skyBlockIsland}")
+ add("skyBlockArea: '${LorenzUtils.skyBlockArea}'")
}
}