Skip to content

Commit

Permalink
code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
hannibal002 committed Mar 21, 2024
1 parent e66f45a commit 181d311
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,9 @@ object GhostCounter {
}
val moneyMadeWithClickableTips = Renderable.clickAndHover(
textFormatting.moneyMadeFormat.formatText(moneyMade.addSeparators()),
moneyMadeTips, onClick =
{ OSUtils.copyToClipboard(moneyMadeTips.joinToString("\n").removeColor()) })
moneyMadeTips,
onClick = { OSUtils.copyToClipboard(moneyMadeTips.joinToString("\n").removeColor()) }
)
addAsSingletonList(textFormatting.moneyHourFormat.formatText(final))
addAsSingletonList(moneyMadeWithClickableTips)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,18 +131,18 @@ class FarmingWeightDisplay {
listOf("§eClick here to reload the data right now!"),
onClick = recalculate
), Renderable.clickAndHover(
"§cdata from Elite Farmers!",
listOf("§eClick here to reload the data right now!"),
onClick = recalculate
), Renderable.clickAndHover(
"§eRejoin the garden or",
listOf("§eClick here to reload the data right now!"),
onClick = recalculate
), Renderable.clickAndHover(
"§eclick here to fix it.",
listOf("§eClick here to reload the data right now!"),
onClick = recalculate
)
"§cdata from Elite Farmers!",
listOf("§eClick here to reload the data right now!"),
onClick = recalculate
), Renderable.clickAndHover(
"§eRejoin the garden or",
listOf("§eClick here to reload the data right now!"),
onClick = recalculate
), Renderable.clickAndHover(
"§eclick here to fix it.",
listOf("§eClick here to reload the data right now!"),
onClick = recalculate
)
)
}

Expand Down Expand Up @@ -180,9 +180,9 @@ class FarmingWeightDisplay {
list.add(
Renderable.clickAndHover(
"§6Farming Weight§7: $weight$leaderboard",
listOf("§eClick to open your Farming Profile."), onClick = {
openWebsite(LorenzUtils.getPlayerName())
})
listOf("§eClick to open your Farming Profile."),
onClick = { openWebsite(LorenzUtils.getPlayerName()) }
)
)

if (isEtaEnabled() && (weightPerSecond != -1.0 || config.overtakeETAAlways)) {
Expand Down Expand Up @@ -306,9 +306,9 @@ class FarmingWeightDisplay {
} else {
Renderable.clickAndHover(
text,
listOf("§eClick to open the Farming Profile of §b$nextName."), onClick = {
openWebsite(nextName)
})
listOf("§eClick to open the Farming Profile of §b$nextName."),
onClick = { openWebsite(nextName) }
)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -377,12 +377,14 @@ object SkillProgress {
val session = xpInfo.timeActive.seconds.format(TimeUnit.HOUR)
add(
Renderable.clickAndHover("§7Session: §e$session ${if (xpInfo.sessionTimerActive) "" else "§c(PAUSED)"}",
listOf("§eClick to reset!"), onClick = {
listOf("§eClick to reset!"),
onClick = {
xpInfo.sessionTimerActive = false

xpInfo.timeActive = 0L
chat("Timer for §b${activeSkill.displayName} §ehas been reset!")
})
}
)
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,21 +129,23 @@ class SkyHanniItemTracker<Data : ItemTrackerData>(
}

val lore = buildLore(data, itemProfit, hidden, newDrop, internalName)
val renderable = if (isInventoryOpen()) Renderable.clickAndHover(displayName, lore, onClick = {
if (System.currentTimeMillis() > lastClickDelay + 150) {
if (KeyboardManager.isModifierKeyDown()) {
data.items.remove(internalName)
ChatUtils.chat("Removed $cleanName §efrom $name.")
lastClickDelay = System.currentTimeMillis() + 500
} else {
modify {
it.items[internalName]?.hidden = !hidden
val renderable = if (isInventoryOpen()) Renderable.clickAndHover(displayName, lore,
onClick = {
if (System.currentTimeMillis() > lastClickDelay + 150) {
if (KeyboardManager.isModifierKeyDown()) {
data.items.remove(internalName)
ChatUtils.chat("Removed $cleanName §efrom $name.")
lastClickDelay = System.currentTimeMillis() + 500
} else {
modify {
it.items[internalName]?.hidden = !hidden
}
lastClickDelay = System.currentTimeMillis()
}
lastClickDelay = System.currentTimeMillis()
update()
}
update()
}
}) else Renderable.string(displayName)
) else Renderable.string(displayName)

lists.addAsSingletonList(renderable)
}
Expand Down

0 comments on commit 181d311

Please sign in to comment.