summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/dungeon
diff options
context:
space:
mode:
authorWalker Selby <git@walkerselby.com>2023-11-22 12:10:51 +0000
committerGitHub <noreply@github.com>2023-11-22 13:10:51 +0100
commit5c9cbdba458638ae962ccf92e750ebdcea718478 (patch)
treef4ab8c3f6abe71d4e056125f582cfde465fd79d0 /src/main/java/at/hannibal2/skyhanni/features/dungeon
parent7137b0a07ba4c4efe65282a18ebc68f25ffa1796 (diff)
downloadskyhanni-5c9cbdba458638ae962ccf92e750ebdcea718478.tar.gz
skyhanni-5c9cbdba458638ae962ccf92e750ebdcea718478.tar.bz2
skyhanni-5c9cbdba458638ae962ccf92e750ebdcea718478.zip
Internal Change: More Random Cleanup (#724)
More Random Cleanup #724
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/dungeon')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt4
3 files changed, 6 insertions, 7 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt
index 834cd8fd6..8119535fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt
@@ -17,8 +17,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
class DungeonCopilot {
- var nextStep = ""
- var searchForKey = false
+ private var nextStep = ""
+ private var searchForKey = false
@SubscribeEvent
fun onChatMessage(event: LorenzChatEvent) {
@@ -142,4 +142,4 @@ class DungeonCopilot {
event.move(3, "dungeon.copilotEnabled", "dungeon.dungeonCopilot.enabled")
event.move(3, "dungeon.copilotPos", "dungeon.dungeonCopilot.pos")
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
index da2d35e0d..801b28ab4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
@@ -81,8 +81,7 @@ class DungeonHideItems {
event.isCanceled = true
}
- val itemStack = head
- if (itemStack != null && itemStack.cleanName() == "Superboom TNT") {
+ if (head != null && head.cleanName() == "Superboom TNT") {
event.isCanceled = true
hideParticles[entity] = System.currentTimeMillis()
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
index 48a0a9925..0c5b4fc52 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt
@@ -80,7 +80,7 @@ object DungeonLividFinder {
RenderLivingEntityHelper.setNoHurtTime(newLivid) { shouldHighlight() }
}
- fun shouldHighlight() = getLividAlive() != null && config.enabled
+ private fun shouldHighlight() = getLividAlive() != null && config.enabled
private fun getLividAlive() = lividEntity?.let {
if (!it.isDead && it.health > 0.5) it else null
@@ -132,7 +132,7 @@ object DungeonLividFinder {
gotBlinded = false
}
- fun inDungeon(): Boolean {
+ private fun inDungeon(): Boolean {
if (!LorenzUtils.inDungeons) return false
if (!DungeonAPI.inBossRoom) return false
if (!DungeonAPI.isOneOf("F5", "M5")) return false