Speed up item tracking system

MineInAbyss · Aug 21, 2022 · 26094d2 · 26094d2
1 parent 40a3bc2
commit 26094d2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/main/kotlin/com/mineinabyss/looty/LootyFactory.kt b/src/main/kotlin/com/mineinabyss/looty/LootyFactory.kt
@@ -56,10 +56,10 @@ object LootyFactory {
         }
     }
 
-    private fun updateOldLootyItem(pdc: PersistentDataContainer, item: NMSItemStack) {
+    private fun updateOldLootyItem(pdc: PersistentDataContainer, prefabs: Set<PrefabKey>, item: NMSItemStack) {
         val tag = item.tag ?: return
         if (!tag.contains("CustomModelData")) return
-        if (!pdc.hasComponentsEncoded || pdc.decodePrefabs().isEmpty()) {
+        if (prefabs.isEmpty()) {
             val prefab = CustomModelDataToPrefabMap[CustomItem(
                 CraftMagicNumbers.getMaterial(item.item),
                 tag.getInt("CustomModelData")
@@ -71,11 +71,11 @@ object LootyFactory {
 
     //TODO maybe if the prefab has PlayerInstancedItem added to it, we should remove id?
     fun getItemState(pdc: PersistentDataContainer?, slot: Int, item: NMSItemStack): ItemState {
-        if (pdc == null || item.item == Items.AIR) return ItemState.Empty()
+        if (pdc == null || item.item == Items.AIR || !pdc.hasComponentsEncoded) return ItemState.Empty()
+        val prefabs = pdc.decodePrefabs()
         if (LootyConfig.data.migrateByCustomModelData) {
-            updateOldLootyItem(pdc, item)
+            updateOldLootyItem(pdc, prefabs, item)
         }
-        val prefabs = pdc.decodePrefabs()
         if (prefabs.size == 1) {
             val prefab = prefabs.first().toEntityOrNull() ?: return ItemState.Empty()
             if (prefab.has<PlayerInstancedItem>()) {

diff --git a/src/main/kotlin/com/mineinabyss/looty/ecs/components/PlayerItemCache.kt b/src/main/kotlin/com/mineinabyss/looty/ecs/components/PlayerItemCache.kt
@@ -70,7 +70,8 @@ class PlayerItemCache(parent: GearyEntity) {
 
     fun updateItem(slot: Int, item: NMSItemStack) {
         // Get the instance of the prefab if the entity is a prefab
-
+        val cached = cachedItems[slot]
+        if(cached === item) return
         cachedItems[slot] = item
         val entity = entities[slot].toGeary()
         if(entity == NO_ENTITY) return

diff --git a/src/main/kotlin/com/mineinabyss/looty/ecs/systems/tracking/ItemTrackerSystem.kt b/src/main/kotlin/com/mineinabyss/looty/ecs/systems/tracking/ItemTrackerSystem.kt
@@ -109,7 +109,7 @@ class ItemTrackerSystem : RepeatingSystem(interval = 1.ticks) {
             }
 
             nmsInv.compartments.forEach { comp ->
-                comp.forEach itemLoop@{ item ->
+                comp.forEach { item ->
                     calculateForItem(item, slot++)
                 }
             }