Fix display history respawn after removing

shedaniel · shedaniel · commit 098fb7b5dae7 · 2025-04-12T16:16:14.000+08:00
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayHistoryManager.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayHistoryManager.java
@@ -118,7 +118,7 @@ public void removeEntry(DisplayEntry entry) {
         this.entries.remove(entry.getUuid().toString());
         this.displayToEntries.remove(entry.getDisplay());
         List<CompoundTag> displayHistory = ConfigManagerImpl.getInstance().getConfig().getDisplayHistory();
-        displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").equals(entry.getUuid().toString()));
+        displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").orElse(null).equals(entry.getUuid().toString()));
         save();
     }
     
@@ -128,7 +128,7 @@ public void addEntry(DisplayHistoryWidget parent, @Nullable Rectangle bounds, Di
         while (iterator.hasNext()) {
             DisplayEntry entry = iterator.next();
             if (entry.getDisplay() == display) {
-                displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").equals(entry.getUuid().toString()));
+                displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").orElse(null).equals(entry.getUuid().toString()));
                 this.displayToEntries.remove(entry.getDisplay());
                 iterator.remove();
             }
@@ -144,7 +144,7 @@ public void addEntry(DisplayHistoryWidget parent, @Nullable Rectangle bounds, Di
         }
         while (entries.size() >= 10) {
             DisplayEntry entry = Iterables.get(entries.values(), entries.size() - 1);
-            displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").equals(entry.getUuid().toString()));
+            displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").orElse(null).equals(entry.getUuid().toString()));
             this.entries.remove(entry.getUuid().toString());
             this.displayToEntries.remove(entry.getDisplay());
         }

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public void removeEntry(DisplayEntry entry) {`
`118`	`118`	`this.entries.remove(entry.getUuid().toString());`
`119`	`119`	`this.displayToEntries.remove(entry.getDisplay());`
`120`	`120`	`List<CompoundTag> displayHistory = ConfigManagerImpl.getInstance().getConfig().getDisplayHistory();`
`121`		`- displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").equals(entry.getUuid().toString()));`
	`121`	`+ displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").orElse(null).equals(entry.getUuid().toString()));`
`122`	`122`	`save();`
`123`	`123`	`}`
`124`	`124`
`@@ -128,7 +128,7 @@ public void addEntry(DisplayHistoryWidget parent, @Nullable Rectangle bounds, Di`
`128`	`128`	`while (iterator.hasNext()) {`
`129`	`129`	`DisplayEntry entry = iterator.next();`
`130`	`130`	`if (entry.getDisplay() == display) {`
`131`		`- displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").equals(entry.getUuid().toString()));`
	`131`	`+ displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").orElse(null).equals(entry.getUuid().toString()));`
`132`	`132`	`this.displayToEntries.remove(entry.getDisplay());`
`133`	`133`	`iterator.remove();`
`134`	`134`	`}`
`@@ -144,7 +144,7 @@ public void addEntry(DisplayHistoryWidget parent, @Nullable Rectangle bounds, Di`
`144`	`144`	`}`
`145`	`145`	`while (entries.size() >= 10) {`
`146`	`146`	`DisplayEntry entry = Iterables.get(entries.values(), entries.size() - 1);`
`147`		`- displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").equals(entry.getUuid().toString()));`
	`147`	`+ displayHistory.removeIf(tag -> tag.getString("DisplayHistoryUUID").orElse(null).equals(entry.getUuid().toString()));`
`148`	`148`	`this.entries.remove(entry.getUuid().toString());`
`149`	`149`	`this.displayToEntries.remove(entry.getDisplay());`
`150`	`150`	`}`