dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix craftable stack vanishing or duplicating when using craftable view (#2940)"

Browse Source 
This reverts commit e10f2593
This commit is contained in:
raoulvdberge
2021-06-12 17:30:51 +02:00
parent b456419fca
commit a42e629734
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -4,7 +4,6 @@
- Removed experimental pipeline nagging message (raoulvdberge) - Removed experimental pipeline nagging message (raoulvdberge)
- Fixed crash when using an External Storage on a fluid inventory (jeremiahwinsley) - Fixed crash when using an External Storage on a fluid inventory (jeremiahwinsley)
- Fixed craftable stacks not being visible using the "craftable only" view (BlueAgent)
- Added some performance improvements for autocrafting (necauqua, Darkere) - Added some performance improvements for autocrafting (necauqua, Darkere)
- Fixed a memory leak in the pattern cache (necauqua) - Fixed a memory leak in the pattern cache (necauqua)
- Fixed Detector crashing when dyed (Darkere) - Fixed Detector crashing when dyed (Darkere)

7
src/main/java/com/refinedmods/refinedstorage/screen/grid/view/GridViewImpl.java
View File

@@ -144,7 +144,6 @@ public class GridViewImpl implements IGridView {
IGridStack existing = map.get(stack.getId()); IGridStack existing = map.get(stack.getId());
boolean stillExists = true; boolean stillExists = true;
boolean shouldSort = screen.canSort(); boolean shouldSort = screen.canSort();
boolean shouldDisplay = getActiveFilters().test(existing);
if (existing == null) { if (existing == null) {
stack.setQuantity(delta); stack.setQuantity(delta);
@@ -152,7 +151,7 @@ public class GridViewImpl implements IGridView {
map.put(stack.getId(), stack); map.put(stack.getId(), stack);
existing = stack; existing = stack;
if (craftingStack != null && shouldSort && shouldDisplay) { if (craftingStack != null && shouldSort) {
stacks.remove(craftingStack); stacks.remove(craftingStack);
} }
} else { } else {
@@ -164,7 +163,7 @@ public class GridViewImpl implements IGridView {
map.remove(existing.getId()); map.remove(existing.getId());
stillExists = false; stillExists = false;
if (craftingStack != null && shouldSort && shouldDisplay && getActiveFilters().test(craftingStack)) { if (craftingStack != null && shouldSort && getActiveFilters().test(craftingStack)) {
addStack(craftingStack); addStack(craftingStack);
} }
} }
@@ -173,7 +172,7 @@ public class GridViewImpl implements IGridView {
} }
if (shouldSort) { if (shouldSort) {
if (stillExists && shouldDisplay) { if (stillExists && getActiveFilters().test(existing)) {
addStack(existing); addStack(existing);
} }
this.screen.updateScrollbar(); this.screen.updateScrollbar();