From 4f852c5b9bbbf83b55086da047d4f5fc0a5ede3f Mon Sep 17 00:00:00 2001
From: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>
Date: Fri, 27 Aug 2021 19:50:09 +0200
Subject: we be fixing

---
 .../miscfeatures/StorageManager.java               | 31 ++++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java
index 03e6b98e..b85b79fe 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java
@@ -166,6 +166,7 @@ public class StorageManager {
     public static class StorageConfig {
         public HashMap<String, StoragePage[]> pages = new HashMap<>();
         public final HashMap<Integer, Integer> displayToStorageIdMap = new HashMap<>();
+        public final HashMap<Integer, Integer> displayToStorageIdMapRender = new HashMap<>();
     }
 
     public StorageConfig storageConfig = new StorageConfig();
@@ -491,21 +492,22 @@ public class StorageManager {
                 if(changed) {
                     synchronized(storageConfig.displayToStorageIdMap) {
                         storageConfig.displayToStorageIdMap.clear();
+                        storageConfig.displayToStorageIdMapRender.clear();
                         int displayIndex = 0;
                         for(int i=0; i<storagePresent.length; i++) {
                             if(storagePresent[i]) {
-                                if(lastSearch == null || lastSearch.isEmpty()) {
-                                    storageConfig.displayToStorageIdMap.put(displayIndex++, i);
-                                } else {
+                                storageConfig.displayToStorageIdMap.put(displayIndex, i);
+                                if(lastSearch != null && !lastSearch.isEmpty()){
                                     StoragePage page = getPage(i, false);
 
                                     if(page != null) {
                                         updateSearchForPage(lastSearch, page);
                                         if(page.matchesSearch) {
-                                            storageConfig.displayToStorageIdMap.put(displayIndex++, i);
+                                            storageConfig.displayToStorageIdMapRender.put(displayIndex++, i);
                                         }
                                     }
-                                }
+                                } else
+                                    storageConfig.displayToStorageIdMapRender.put(displayIndex++, i);
                             }
                         }
                     }
@@ -530,21 +532,22 @@ public class StorageManager {
                 if(changed) {
                     synchronized(storageConfig.displayToStorageIdMap) {
                         storageConfig.displayToStorageIdMap.clear();
+                        storageConfig.displayToStorageIdMapRender.clear();
                         int displayIndex = 0;
                         for(int i=0; i<storagePresent.length; i++) {
                             if(storagePresent[i]) {
-                                if(lastSearch == null || lastSearch.isEmpty()) {
-                                    storageConfig.displayToStorageIdMap.put(displayIndex++, i);
-                                } else {
+                                storageConfig.displayToStorageIdMap.put(displayIndex, i);
+                                if(lastSearch != null && !lastSearch.isEmpty()){
                                     StoragePage page = getPage(i, false);
 
                                     if(page != null) {
                                         updateSearchForPage(lastSearch, page);
                                         if(page.matchesSearch) {
-                                            storageConfig.displayToStorageIdMap.put(displayIndex++, i);
+                                            storageConfig.displayToStorageIdMapRender.put(displayIndex++, i);
                                         }
                                     }
-                                }
+                                } else
+                                    storageConfig.displayToStorageIdMapRender.put(displayIndex++, i);
                             }
                         }
                     }
@@ -590,8 +593,8 @@ public class StorageManager {
     public void searchDisplay(String searchStr) {
         if(storagePresent == null) return;
 
-        synchronized(storageConfig.displayToStorageIdMap) {
-            storageConfig.displayToStorageIdMap.clear();
+        synchronized(storageConfig.displayToStorageIdMapRender) {
+            storageConfig.displayToStorageIdMapRender.clear();
 
             lastSearch = searchStr;
             int sid = searchId.incrementAndGet();
@@ -603,10 +606,10 @@ public class StorageManager {
                         if(page.rows > 0) {
                             updateSearchForPage(searchStr, page);
                             if(page.matchesSearch) {
-                                storageConfig.displayToStorageIdMap.put(displayIndex++, i);
+                                storageConfig.displayToStorageIdMapRender.put(displayIndex++, i);
                             }
                         } else {
-                            storageConfig.displayToStorageIdMap.put(displayIndex++, i);
+                            storageConfig.displayToStorageIdMapRender.put(displayIndex++, i);
                             page.matchesSearch = true;
                             page.searchedId = sid;
                         }
-- 
cgit