Internal Change: More Random Cleanup (#724)

More Random Cleanup #724

48 files changed, 95 insertions, 109 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
index 3af97e0f9..29a344b18 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
@@ -24,7 +24,7 @@ import kotlin.time.Duration.Companion.minutes
 
 class GuiEditManager {
 
-    var lastHotkeyPressed = SimpleTimeMark.farPast()
+    private var lastHotkeyPressed = SimpleTimeMark.farPast()
 
     @SubscribeEvent
     fun onKeyClick(event: LorenzKeyPressEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt
index 3ab213025..17755da88 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/IslandType.kt
@@ -31,6 +31,6 @@ enum class IslandType(val displayName: String, val apiName: String = "null") {
         fun getByNameOrUnknown(name: String) = getByNameOrNull(name) ?: UNKNOWN
         fun getByName(name: String) = getByNameOrNull(name) ?: error("IslandType not found: '$name'")
 
-        fun getByNameOrNull(name: String) = entries.firstOrNull { it.displayName == name }
+        private fun getByNameOrNull(name: String) = entries.firstOrNull { it.displayName == name }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt
index 3c1586d61..b9a9a6e0b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt
@@ -76,7 +76,7 @@ class ChatFilterGui(private val history: List<ChatManager.MessageFilteringResult
         GlStateManager.color(1f, 1f, 1f, 1f)
     }
 
-    fun splitLine(comp: IChatComponent): List<IChatComponent> {
+    private fun splitLine(comp: IChatComponent): List<IChatComponent> {
         return GuiUtilRenderComponents.splitText(
             comp,
             w - (ChatManager.ActionKind.maxLength + reasonMaxLength + 10 + 10),
@@ -93,11 +93,11 @@ class ChatFilterGui(private val history: List<ChatManager.MessageFilteringResult
         }
     }
 
-    fun setScroll(newScroll: Double) {
+    private fun setScroll(newScroll: Double) {
         this.scroll = newScroll.coerceAtMost(historySize - h + 10.0).coerceAtLeast(0.0)
     }
 
-    fun drawMultiLineText(comp: IChatComponent, xPos: Int): Int {
+    private fun drawMultiLineText(comp: IChatComponent, xPos: Int): Int {
         val modifiedSplitText = splitLine(comp)
         for (line in modifiedSplitText) {
             drawString(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/CompactBestiaryChatMessage.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/CompactBestiaryChatMessage.kt
index ff3444bb0..fa2dfaa06 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/CompactBestiaryChatMessage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/CompactBestiaryChatMessage.kt
@@ -9,18 +9,18 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class CompactBestiaryChatMessage {
 
-    var inBestiary = false
-    var bestiaryDescription = mutableListOf<String>()
-    var acceptMoreDescription = true
+    private var inBestiary = false
+    private var bestiaryDescription = mutableListOf<String>()
+    private var acceptMoreDescription = true
     var command = ""
     private var blockedLines = 0
 
-    var lastBorder: IChatComponent? = null
-    var lastEmpty: IChatComponent? = null
+    private var lastBorder: IChatComponent? = null
+    private var lastEmpty: IChatComponent? = null
 
-    var milestoneMessage: String? = null
+    private var milestoneMessage: String? = null
 
-    val milestonePattern = "^.+(§8\\d{1,3}➡§e\\d{1,3})$".toRegex()
+    private val milestonePattern = "^.+(§8\\d{1,3}➡§e\\d{1,3})$".toRegex()
 
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
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
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
index 486a19d80..1b23bb1de 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
@@ -22,7 +22,7 @@ class GriffinBurrowParticleFinder {
 
     private val recentlyDugParticleBurrows = mutableListOf<LorenzVec>()
     private val burrows = mutableMapOf<LorenzVec, Burrow>()
-    var lastDugParticleBurrow: LorenzVec? = null
+    private var lastDugParticleBurrow: LorenzVec? = null
 
     @SubscribeEvent(priority = EventPriority.LOW, receiveCanceled = true)
     fun onChatPacket(event: PacketEvent.ReceiveEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
index ec0a1e2ae..a0b34e328 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
@@ -23,23 +23,23 @@ import kotlin.math.sin
  */
 class SoopyGuessBurrow {
 
-    var dingIndex = 0
-    var lastDing = 0L
-    var lastDingPitch = 0f
-    var firstPitch = 0f
-    var lastParticlePoint: LorenzVec? = null
-    var lastParticlePoint2: LorenzVec? = null
-    var firstParticlePoint: LorenzVec? = null
-    var particlePoint: LorenzVec? = null
-    var guessPoint: LorenzVec? = null
+    private var dingIndex = 0
+    private var lastDing = 0L
+    private var lastDingPitch = 0f
+    private var firstPitch = 0f
+    private var lastParticlePoint: LorenzVec? = null
+    private var lastParticlePoint2: LorenzVec? = null
+    private var firstParticlePoint: LorenzVec? = null
+    private var particlePoint: LorenzVec? = null
+    private var guessPoint: LorenzVec? = null
 
-    var lastSoundPoint: LorenzVec? = null
-    var locs = mutableListOf<LorenzVec>()
+    private var lastSoundPoint: LorenzVec? = null
+    private var locs = mutableListOf<LorenzVec>()
 
-    var dingSlope = mutableListOf<Float>()
+    private var dingSlope = mutableListOf<Float>()
 
     var distance: Double? = null
-    var distance2: Double? = null
+    private var distance2: Double? = null
 
     @SubscribeEvent
     fun onWorldChange(event: LorenzWorldChangeEvent) {
@@ -280,4 +280,4 @@ class SoopyGuessBurrow {
     }
 
     private fun isEnabled() = DianaAPI.featuresEnabled() && SkyHanniMod.feature.event.diana.burrowsSoopyGuess
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt
index d2d866f36..2f51e11f3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt
@@ -128,7 +128,7 @@ object FarmingContestAPI {
 
     fun getContestAtTime(time: Long) = contests[time]
 
-    fun getContestsOfType(crop: CropType) = contests.values.filter { it.crop == crop }
+    private fun getContestsOfType(crop: CropType) = contests.values.filter { it.crop == crop }
 
     fun calculateAverages(crop: CropType): Pair<Int, Map<ContestBracket, Int>> {
         var amount = 0
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt
index ec3284ef0..3f03cbe4b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt
@@ -81,10 +81,6 @@ class JacobContestFFNeededDisplay {
                 add(listOf("§cThis is too low, showing 19.9 Blocks/second instead!"))
                 blocksPerSecond = 19.9
             }
-            if (blocksPerSecond < 1) {
-                addAsSingletonList("§cLow blocks per second!")
-                addAsSingletonList("§cFarm this crop for couple more seconds!")
-            }
         }
         addAsSingletonList("")
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt
index e7af728cc..dfc83e404 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt
@@ -52,10 +52,7 @@ class JacobFarmingContestsInventory {
 
             val name = item.name!!
 
-            if (foundEvents.contains(name)) {
-            } else {
-                foundEvents.add(name)
-            }
+            foundEvents.add(name)
             val time = FarmingContestAPI.getSbTimeFor(name) ?: continue
             FarmingContestAPI.addContest(time, item)
             if (config.realTime) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
index 13125c349..fb9bdfaac 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt
@@ -519,7 +519,7 @@ class FarmingWeightDisplay {
             openWebsite(name, ignoreCooldown = true)
         }
 
-        var lastName = ""
+        private var lastName = ""
 
         private fun openWebsite(name: String, ignoreCooldown: Boolean = false) {
             if (!ignoreCooldown && lastOpenWebsite.passedSince() < 5.seconds && name == lastName) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/WildStrawberryDyeNotification.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/WildStrawberryDyeNotification.kt
index 29fe278ae..d923efb6d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/WildStrawberryDyeNotification.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/WildStrawberryDyeNotification.kt
@@ -15,7 +15,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.seconds
 
 class WildStrawberryDyeNotification {
-    var lastCloseTime = 0L
+    private var lastCloseTime = 0L
 
     val item by lazy { "DYE_WILD_STRAWBERRY".asInternalName() }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index 9c56927fb..2fe7e2f3a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -86,7 +86,6 @@ class GardenVisitorFeatures {
 
             val pair = ItemUtils.readItemAmount(line)
             if (pair == null) {
-                LorenzUtils.error("Could not read item '$line'")
                 continue
             }
             val (itemName, amount) = pair
@@ -97,7 +96,7 @@ class GardenVisitorFeatures {
         readToolTip(visitor, offerItem)
 
         if (visitor.status == VisitorAPI.VisitorStatus.NEW) {
-            val alreadyReady = offerItem.getLore().any { it == "§eClick to give!" } == true
+            val alreadyReady = offerItem.getLore().any { it == "§eClick to give!" }
             if (alreadyReady) {
                 VisitorAPI.changeStatus(visitor, VisitorAPI.VisitorStatus.READY, "inSacks")
                 visitor.inSacks = true
@@ -270,7 +269,6 @@ class GardenVisitorFeatures {
 
         if (visitor.lastLore.isEmpty()) {
             readToolTip(visitor, event.itemStack)
-            LorenzUtils.error("Reloaded the visitor data of that inventory, this should not happen.")
         }
 
         toolTip.addAll(visitor.lastLore)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
index 026d263ee..a4d370e62 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt
@@ -27,7 +27,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 class HighlightVisitorsOutsideOfGarden {
     private var visitorJson = mapOf<String?, List<GardenJson.GardenVisitor>>()
 
-    val config get() = SkyHanniMod.feature.garden.visitors
+    private val config get() = SkyHanniMod.feature.garden.visitors
 
     @SubscribeEvent
     fun onRepoReload(event: RepositoryReloadEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorAPI.kt
index 1ad82a241..f71ab6883 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorAPI.kt
@@ -153,7 +153,7 @@ object VisitorAPI {
                 found = false
                 continue
             }
-            val name = VisitorAPI.fromHypixelName(line)
+            val name = fromHypixelName(line)
 
             // Hide hypixel watchdog entries
             if (name.contains("§c") && !name.contains("Spaceman") && !name.contains("Grandma Wolf")) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
index f210f857c..0f8c3fe4a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt
@@ -17,7 +17,7 @@ import kotlin.time.Duration.Companion.milliseconds
 
 // Delaying key presses by 300ms comes from NotEnoughUpdates
 object HarpFeatures {
-    val config get() = SkyHanniMod.feature.inventory.helper.harp
+    private val config get() = SkyHanniMod.feature.inventory.helper.harp
     private var lastClick = SimpleTimeMark.farPast()
 
     private object KeyIterable : Iterable<Int> {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt
index 455efcef0..abb0c0f4c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt
@@ -18,7 +18,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 class FireVeilWandParticles {
     private val config get() = SkyHanniMod.feature.itemAbilities.fireVeilWands
 
-    var lastClick = 0L
+    private var lastClick = 0L
 
     val item by lazy { "FIRE_VEIL_WAND".asInternalName() }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/crystalhollows/CrystalHollowsNamesInCore.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/crystalhollows/CrystalHollowsNamesInCore.kt
index af4d3abf9..b1682baad 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/crystalhollows/CrystalHollowsNamesInCore.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/crystalhollows/Cryst