Refactor

Author: Avanatiker

src/main/kotlin/com/lambda/client/gui/hudgui/elements/world/ChestCounter.kt

@@ -13,8 +13,16 @@ internal object ChestCounter : LabelHud(
     private val shulkers by setting("Count Shulkers", true, description = "Counts shulkers in the world")
 
     override fun SafeClientEvent.updateText() {
-        displayText.add(if (dubs) "Dubs:" else "Chests:", primaryColor)
-        displayText.add(if (dubs) "${ChestCountManager.dubsCount}" else "${ChestCountManager.chestCount}", secondaryColor)
+        if (dubs) {
+            displayText.add("Dubs:", primaryColor)
+            displayText.add("${ChestCountManager.dubsCount}", secondaryColor)
+            displayText.add("Chests:", primaryColor)
+            displayText.add("${ChestCountManager.chestCount - (ChestCountManager.dubsCount * 2)}", secondaryColor)
+        } else {
+            displayText.add("Chests:", primaryColor)
+            displayText.add("${ChestCountManager.chestCount}", secondaryColor)
+        }
+
         if (!shulkers) return
         displayText.add("Shulkers:", primaryColor)
         displayText.add("${ChestCountManager.shulkerCount}", secondaryColor)

src/main/kotlin/com/lambda/client/manager/managers/ChestCountManager.kt

@@ -1,6 +1,5 @@
 package com.lambda.client.manager.managers
 
-import com.lambda.client.LambdaMod
 import com.lambda.client.event.SafeClientEvent
 import com.lambda.client.gui.hudgui.elements.world.ChestCounter
 import com.lambda.client.manager.Manager
@@ -16,7 +15,7 @@ import net.minecraft.tileentity.TileEntityShulkerBox
 import net.minecraftforge.fml.common.gameevent.TickEvent
 
 object ChestCountManager : Manager {
-    private const val searchDelayTicks = 5L
+    private const val SEARCH_DELAY_TICKS = 5L
     private val delayTimer: TickTimer = TickTimer(TimeUnit.TICKS)
     var chestCount = 0
         private set
@@ -31,31 +30,20 @@ object ChestCountManager : Manager {
             if (it.phase != TickEvent.Phase.END) return@safeListener
             if (!ChestCounter.visible && !StorageESP.chestCountSetting) return@safeListener
             if (chestCountSearchJob?.isActive == true) return@safeListener
-            if (delayTimer.tick(searchDelayTicks)) {
-                chestCountSearchJob = defaultScope.launch {
-                    searchLoadedTileEntities()
-                    delayTimer.reset()
-                }
+            if (!delayTimer.tick(SEARCH_DELAY_TICKS)) return@safeListener
+
+            chestCountSearchJob = defaultScope.launch {
+                searchLoadedTileEntities()
+                delayTimer.reset()
             }
         }
     }
 
     private fun SafeClientEvent.searchLoadedTileEntities() {
-        try {
-            var dubsC = 0
-            var chestC = 0
-            var shulkC = 0
-            for (tileEntity in world.loadedTileEntityList) {
-                if (tileEntity is TileEntityChest) {
-                    chestC++
-                    if (tileEntity.adjacentChestXPos != null || tileEntity.adjacentChestZPos != null) dubsC++
-                } else if (tileEntity is TileEntityShulkerBox) shulkC++
-            }
-            dubsCount = dubsC
-            chestCount = chestC
-            shulkerCount = shulkC
-        } catch (e: Exception) {
-            LambdaMod.LOG.error("ChestCounter: Error searching loaded tile entities", e)
-        }
+        val chests = world.loadedTileEntityList.filterIsInstance<TileEntityChest>()
+
+        dubsCount = chests.count { it.adjacentChestXPos != null || it.adjacentChestZPos != null }
+        chestCount = chests.size
+        shulkerCount = world.loadedTileEntityList.filterIsInstance<TileEntityShulkerBox>().size
     }
 }

src/main/kotlin/com/lambda/client/module/modules/render/StorageESP.kt

@@ -40,7 +40,7 @@ object StorageESP : Module(
     private val dispenser by setting("Dispenser", false, { page == Page.TYPE })
     private val hopper by setting("Hopper", false, { page == Page.TYPE })
     private val cart by setting("Minecart", false, { page == Page.TYPE })
-    private val infinite by setting("Infinite Range", true, { page == Page.TYPE}) // To avoid a hard to control range slider
+    private val infinite by setting("Infinite Range", true, { page == Page.TYPE }) // To avoid a hard to control range slider
     private val range by setting("Range", 64, 8..512, 1, { page == Page.TYPE && !infinite }, unit = " blocks")
 
     /* Color settings */