diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-11-22 12:53:20 +0100 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-11-22 12:53:20 +0100 |
| commit | 7137b0a07ba4c4efe65282a18ebc68f25ffa1796 (patch) | |
| tree | ba69ae6e3ba3c758906dfad41b9035af258e923c /src/main/java/at/hannibal2/skyhanni/features/misc | |
| parent | 4ff0a7de8109b748cdaa707e9714478140095171 (diff) | |
| download | skyhanni-7137b0a07ba4c4efe65282a18ebc68f25ffa1796.tar.gz skyhanni-7137b0a07ba4c4efe65282a18ebc68f25ffa1796.tar.bz2 skyhanni-7137b0a07ba4c4efe65282a18ebc68f25ffa1796.zip | |
The cleanup after the cleanup
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')
4 files changed, 10 insertions, 9 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt index 2f47b3db1..5133e65be 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt @@ -72,9 +72,8 @@ class PlayerChatSymbols { if (!component.text_skyhanni().contains(rankAndName)) return false val oldText = component.text_skyhanni() - component.setText_skyhanni( - component.text_skyhanni().replace(oldText, getNewText(emblemText, oldText, rankAndName)) - ) + val newText = getNewText(emblemText, oldText, rankAndName) + component.setText_skyhanni(component.text_skyhanni().replace(oldText, newText)) return true } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt index 780ed54c7..141870585 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt @@ -371,10 +371,10 @@ enum class DiscordStatus(private val displayMessageSupplier: Supplier<String>?) }), AFK({ - if (beenAfkFor.passedSince() > 5.minutes) "AFK for ${ - beenAfkFor.passedSince().format(maxUnits = 1, longName = true) - }" - else AutoStatus.AFK.placeholderText + if (beenAfkFor.passedSince() > 5.minutes) { + val format = beenAfkFor.passedSince().format(maxUnits = 1, longName = true) + "AFK for $format" + } else AutoStatus.AFK.placeholderText }) ; diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt index 7586805df..318d4c1f0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt @@ -232,8 +232,9 @@ object TrevorFeatures { location = LorenzVec(location.x, TrevorSolver.averageHeight, location.z) } if (TrevorSolver.mobLocation == CurrentMobArea.FOUND) { - val displayName = - if (TrevorSolver.currentMob == null) "Mob Location" else TrevorSolver.currentMob!!.mobName + val displayName = if (TrevorSolver.currentMob == null) "Mob Location" else { + TrevorSolver.currentMob!!.mobName + } location = TrevorSolver.mobCoordinates event.drawWaypointFilled(location.add(0, -2, 0), LorenzColor.GREEN.toColor(), true, true) event.drawDynamicText(location.add(0, 1, 0), displayName, 1.5) diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt index b6a8feca2..a996d7277 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt @@ -283,6 +283,7 @@ open class VisualWordGui : GuiScreen() { GlStateManager.scale(0.75f, 0.75f, 1f) + // TODO remove more code duplication drawUnmodifiedString( "§bThe top line of each section", (guiLeft + 10) * inverseScale, |