Compare commits

..
Author SHA1 Message Date
Martin Robertz 7a1065e789 Merge remote-tracking branch 'slprime/hide_items_until_searching' into dev 2024-12-29 11:56:47 +01:00
Martin Robertz 2cb60ea0cf Merge remote-tracking branch 'slprime/fix_item_rendering_cache' into dev 2024-12-29 11:56:40 +01:00
Martin Robertz a078d71746 Merge remote-tracking branch 'slprime/extend_subset_widget' into dev 2024-12-29 11:56:30 +01:00
Martin Robertz 1608665de0 Merge remote-tracking branch 'slprime/option_integer_field_width' into dev 2024-12-29 11:54:35 +01:00
Maya 55c111dff0 Merge branch 'master' into option_integer_field_width 2024-12-28 20:32:48 -06:00
Martin Robertz c041c953c6 missing imports 2024-12-27 09:56:46 +01:00
Martin Robertz 2448008b91 Merge remote-tracking branch 'slprime/extend_subset_widget' into dev
# Conflicts:
#	src/main/java/codechicken/nei/ItemPanel.java
#	src/main/java/codechicken/nei/guihook/GuiContainerManager.java
2024-12-27 09:55:10 +01:00
Martin Robertz 4e808cb44e Merge remote-tracking branch 'slprime/option_integer_field_width' into dev 2024-12-27 09:49:59 +01:00
Martin Robertz 827d42907d Merge remote-tracking branch 'origin/colored-tooltips' into dev 2024-12-27 09:49:40 +01:00
Martin Robertz ba659ee6ef Merge remote-tracking branch 'slprime/fix_item_rendering_cache' into dev 2024-12-27 09:49:34 +01:00
Martin Robertz a23e70c433 Merge remote-tracking branch 'slprime/hide_items_until_searching' into dev 2024-12-27 09:49:00 +01:00
Martin Robertz 489bfb7079 Merge branch 'master' into colored-tooltips 2024-12-26 23:20:56 +01:00
slprime c824d26bb1 Change OptionIntegerField Width 2024-12-20 18:37:08 +02:00
glowredman 91ec6b7e5e Add RenderTooltipEvent compat 2024-12-20 15:16:27 +01:00
2 changed files with 12 additions and 15 deletions

No files matched your search

+11 -15
View File
@@ -2,7 +2,6 @@ package codechicken.nei;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
@@ -47,7 +46,7 @@ public class ItemList {
private static final HashSet<Item> erroredItems = new HashSet<>();
private static final HashSet<String> stackTraces = new HashSet<>();
private static HashMap<ItemStack, Integer> ordering = new HashMap<>();
private static final HashMap<ItemStack, Integer> ordering = new HashMap<>();
/**
* Unlike {@link LayoutManager#itemsLoaded}, this indicates whether item loading is actually finished or not.
*/
@@ -237,9 +236,9 @@ public class ItemList {
}
private void updateOrdering(List<ItemStack> items) {
ItemSorter.sort(items);
ItemList.ordering.clear();
HashMap<ItemStack, Integer> newOrdering = new HashMap<>();
ItemSorter.sort(items);
if (!CollapsibleItems.isEmpty()) {
HashMap<Integer, Integer> groups = new HashMap<>();
@@ -249,25 +248,23 @@ public class ItemList {
final int groupIndex = CollapsibleItems.getGroupIndex(stack);
if (groupIndex == -1) {
newOrdering.put(stack, orderIndex++);
ItemList.ordering.put(stack, orderIndex++);
} else {
if (!groups.containsKey(groupIndex)) {
groups.put(groupIndex, orderIndex++);
}
newOrdering.put(stack, groups.get(groupIndex));
ItemList.ordering.put(stack, groups.get(groupIndex));
}
}
} else {
int orderIndex = 0;
for (ItemStack stack : items) {
newOrdering.put(stack, orderIndex++);
ItemList.ordering.put(stack, orderIndex++);
}
}
ItemList.ordering = newOrdering;
}
private List<ItemStack> getPermutations(Item item) {
@@ -390,9 +387,12 @@ public class ItemList {
public static final RestartableTask updateFilter = new RestartableTask("NEI Item Filtering") {
private int compare(ItemStack o1, ItemStack o2) {
return Integer.compare(ItemList.ordering.get(o1), ItemList.ordering.get(o2));
}
@Override
public void execute() {
if (!loadFinished) return;
ItemFilter filter = getItemListFilter();
ArrayList<ItemStack> filtered;
@@ -409,12 +409,8 @@ public class ItemList {
}
if (interrupted()) return;
Comparator<ItemStack> comparator = Comparator.comparingInt(ItemList.ordering::get);
filtered.sort(comparator::compare);
filtered.sort(this::compare);
if (interrupted()) return;
ItemPanel.updateItemList(filtered);
}
};
@@ -414,6 +414,7 @@ public class ItemPanel extends PanelWidget {
super.setVisible();
if (grid.getPerPage() > 0) {
if (!CollapsibleItems.isEmpty() && !grid.isEmpty()) {
LayoutManager.addWidget(toggleGroups);
}