From 6d001dc57d873274d45ac82aa4f6c2771ecec66d Mon Sep 17 00:00:00 2001
From: Xiaro <62033805+Xiaro@users.noreply.github.com>
Date: Thu, 7 Jan 2021 11:47:39 -0500
Subject: [PATCH] [fix] StashLogger and ModuleList indexed hue

---
 .../gui/hudgui/elements/client/ModuleList.kt  |  2 +-
 .../kami/module/modules/misc/StashLogger.kt   | 25 ++++++++-----------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/main/java/me/zeroeightsix/kami/gui/hudgui/elements/client/ModuleList.kt b/src/main/java/me/zeroeightsix/kami/gui/hudgui/elements/client/ModuleList.kt
index ded589bda..0c0a8b5d8 100644
--- a/src/main/java/me/zeroeightsix/kami/gui/hudgui/elements/client/ModuleList.kt
+++ b/src/main/java/me/zeroeightsix/kami/gui/hudgui/elements/client/ModuleList.kt
@@ -128,7 +128,7 @@ object ModuleList : HudElement(
             GlStateManager.translate(animationXOffset - stringPosX - margin, 0.0f, 0.0f)
 
             if (rainbow.value) {
-                val hue = timedHue + indexedHue.value * 0.005f * index++
+                val hue = timedHue + indexedHue.value * 0.05f * index++
                 val color = ColorConverter.hexToRgb(Color.HSBtoRGB(hue, primaryHsb[1], primaryHsb[2]))
 
                 TextComponent.TextLine(" ").run {
diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/misc/StashLogger.kt b/src/main/java/me/zeroeightsix/kami/module/modules/misc/StashLogger.kt
index 87d92f579..1493624d5 100644
--- a/src/main/java/me/zeroeightsix/kami/module/modules/misc/StashLogger.kt
+++ b/src/main/java/me/zeroeightsix/kami/module/modules/misc/StashLogger.kt
@@ -43,15 +43,10 @@ object StashLogger : Module(
     private val logHoppers by setting("Hoppers", true)
     private val hopperDensity by setting("MinHoppers", 5, 1..20, 1, { logHoppers })
 
-    private val chunkData = Collections.synchronizedMap(LinkedHashMap<Long, ChunkStats>())
+    private val chunkData = LinkedHashMap<Long, ChunkStats>()
     private val knownPositions = HashSet<BlockPos>()
     private val timer = TickTimer(TimeUnit.SECONDS)
 
-    override fun onEnable() {
-        chunkData.clear()
-        knownPositions.clear()
-    }
-
     init {
         safeListener<TickEvent.ClientTickEvent> {
             if (it.phase != TickEvent.Phase.END || !timer.tick(3L)) return@safeListener
@@ -60,8 +55,7 @@ object StashLogger : Module(
                 coroutineScope {
                     launch {
                         world.loadedTileEntityList.toList().forEach(::logTileEntity)
-                    }
-                    launch {
+
                         for (chunkStats in chunkData.values) {
                             if (!chunkStats.hot) continue
 
@@ -94,7 +88,7 @@ object StashLogger : Module(
         if (!checkTileEntityType(tileEntity)) return
         if (!knownPositions.add(tileEntity.pos)) return
 
-        val chunk = ChunkPos.asLong(tileEntity.pos.x shl 4, tileEntity.pos.z shl 4)
+        val chunk = ChunkPos.asLong(tileEntity.pos.x shr 4, tileEntity.pos.z shr 4)
         val chunkStats = chunkData.getOrPut(chunk, ::ChunkStats)
 
         chunkStats.add(tileEntity)
@@ -108,13 +102,13 @@ object StashLogger : Module(
             || logHoppers && tileEntity is TileEntityHopper
 
     private class ChunkStats {
-        var chests: Int = 0; private set
-        var shulkers: Int = 0; private set
-        var droppers: Int = 0; private set
-        var dispensers: Int = 0; private set
-        var hoppers: Int = 0; private set
+        var chests = 0; private set
+        var shulkers = 0; private set
+        var droppers = 0; private set
+        var dispensers = 0; private set
+        var hoppers = 0; private set
 
-        var hot: Boolean = false
+        var hot = false
 
         private val tileEntities = Collections.synchronizedList(ArrayList<TileEntity>())
 
@@ -125,6 +119,7 @@ object StashLogger : Module(
                 is TileEntityDropper -> droppers++
                 is TileEntityDispenser -> dispensers++
                 is TileEntityHopper -> hoppers++
+                else -> return
             }
 
             tileEntities.add(tileEntity)