aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/misc
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/HideFarEntities.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/LesserOrbHider.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ParticleHider.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt5
6 files changed, 17 insertions, 5 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt
index 7efce2fcd..b43625ed2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt
@@ -276,7 +276,8 @@ object CarryTracker {
),
onClick = {
HypixelCommands.partyChat(
- "$customerName Carry: already paid: ${paidFormat.removeColor()}, " + "still missing: ${missingFormat.removeColor()}",
+ "$customerName Carry: already paid: ${paidFormat.removeColor()}, " +
+ "still missing: ${missingFormat.removeColor()}",
)
},
),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/HideFarEntities.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/HideFarEntities.kt
index d12953b98..8a47da6f7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/HideFarEntities.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/HideFarEntities.kt
@@ -41,6 +41,7 @@ object HideFarEntities {
}
}
- fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled && (!(GardenAPI.inGarden() && config.excludeGarden) && !(DungeonAPI.inDungeon() && config.excludeDungeon))
+ fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled &&
+ (!(GardenAPI.inGarden() && config.excludeGarden) && !(DungeonAPI.inDungeon() && config.excludeDungeon))
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/LesserOrbHider.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/LesserOrbHider.kt
index 36bfb3fb7..c07ab7de4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/LesserOrbHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/LesserOrbHider.kt
@@ -19,6 +19,8 @@ object LesserOrbHider {
private val config get() = SkyHanniMod.feature.misc
private val hiddenEntities = CollectionUtils.weakReferenceList<EntityArmorStand>()
+ // TODO: Move to repo
+ @Suppress("MaxLineLength")
private const val LESSER_TEXTURE =
"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjgzMjM2NjM5NjA3MDM2YzFiYTM5MWMyYjQ2YTljN2IwZWZkNzYwYzhiZmEyOTk2YTYwNTU1ODJiNGRhNSJ9fX0="
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
index 83f45e535..8fcc8fd87 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
@@ -96,6 +96,7 @@ object NonGodPotEffectDisplay {
// todo : cleanup and add support for poison candy I, and add support for splash / other formats
@SubscribeEvent
+ @Suppress("MaxLineLength")
fun onChat(event: LorenzChatEvent) {
if (event.message == "§aYou cleared all of your active effects!") {
effectDuration.clear()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ParticleHider.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ParticleHider.kt
index 990f1a8b7..c9ad14620 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/ParticleHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ParticleHider.kt
@@ -25,12 +25,16 @@ object ParticleHider {
}
val type = event.type
- if (SkyHanniMod.feature.misc.particleHiders.hideCloseRedstoneParticles && type == EnumParticleTypes.REDSTONE && distanceToPlayer < 2) {
+ if (SkyHanniMod.feature.misc.particleHiders.hideCloseRedstoneParticles &&
+ type == EnumParticleTypes.REDSTONE && distanceToPlayer < 2
+ ) {
event.cancel()
return
}
- if (SkyHanniMod.feature.misc.particleHiders.hideFireballParticles && (type == EnumParticleTypes.SMOKE_NORMAL || type == EnumParticleTypes.SMOKE_LARGE)) {
+ if (SkyHanniMod.feature.misc.particleHiders.hideFireballParticles &&
+ (type == EnumParticleTypes.SMOKE_NORMAL || type == EnumParticleTypes.SMOKE_LARGE)
+ ) {
for (entity in EntityUtils.getEntities<EntitySmallFireball>()) {
val distance = entity.getLorenzVec().distance(event.location)
if (distance < 5) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt
index 84d86615d..9f2d2ac59 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt
@@ -68,7 +68,10 @@ class GuiOptionEditorUpdateCheck(option: ProcessedOption) : GuiOptionEditor(opti
override fun mouseInput(x: Int, y: Int, width: Int, mouseX: Int, mouseY: Int): Boolean {
val width = width - 20
- if (Mouse.getEventButtonState() && (mouseX - getButtonPosition(width) - x) in (0..button.width) && (mouseY - 10 - y) in (0..button.height)) {
+ if (Mouse.getEventButtonState() &&
+ (mouseX - getButtonPosition(width) - x) in (0..button.width) &&
+ (mouseY - 10 - y) in (0..button.height)
+ ) {
when (UpdateManager.updateState) {
UpdateManager.UpdateState.AVAILABLE -> UpdateManager.queueUpdate()
UpdateManager.UpdateState.QUEUED -> {}