diff --git a/src/main/java/codechicken/nei/CollapsibleItems.java b/src/main/java/codechicken/nei/CollapsibleItems.java index 2046764b..9274dc48 100644 --- a/src/main/java/codechicken/nei/CollapsibleItems.java +++ b/src/main/java/codechicken/nei/CollapsibleItems.java @@ -150,10 +150,16 @@ public class CollapsibleItems { } public static void putItem(ItemStack stack) { - final GroupItem group = CollapsibleItems.groups.stream().filter(g -> g.matches(stack)).findFirst().orElse(null); + int groupIndex = -1; - if (group != null) { - CollapsibleItems.cache.put(stack, CollapsibleItems.groups.indexOf(group)); + for (int i = 0; i < CollapsibleItems.groups.size() && groupIndex == -1; i++) { + if (CollapsibleItems.groups.get(i).matches(stack)) { + groupIndex = i; + } + } + + if (groupIndex != -1) { + CollapsibleItems.cache.put(stack, groupIndex); } } diff --git a/src/main/java/codechicken/nei/ItemList.java b/src/main/java/codechicken/nei/ItemList.java index 0aadbffb..45bf8b6f 100644 --- a/src/main/java/codechicken/nei/ItemList.java +++ b/src/main/java/codechicken/nei/ItemList.java @@ -8,7 +8,6 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinWorkerThread; @@ -29,7 +28,6 @@ import codechicken.nei.ThreadOperationTimer.TimeoutException; import codechicken.nei.api.ItemFilter; import codechicken.nei.api.ItemFilter.ItemFilterProvider; import codechicken.nei.api.ItemInfo; -import codechicken.nei.recipe.StackInfo; import codechicken.nei.search.TooltipFilter; public class ItemList { @@ -50,7 +48,7 @@ public class ItemList { private static final HashSet erroredItems = new HashSet<>(); private static final HashSet stackTraces = new HashSet<>(); - private static HashMap ordering = new HashMap<>(); + private static Map ordering = new HashMap<>(); /** * Unlike {@link LayoutManager#itemsLoaded}, this indicates whether item loading is actually finished or not. */ @@ -216,8 +214,7 @@ public class ItemList { IIcon icon = item.getIconIndex(itemstack); String name = getTooltip(itemstack); String s = name + "@" + (icon == null ? 0 : icon.hashCode()); - if (!damageIconSet.contains(s)) { - damageIconSet.add(s); + if (damageIconSet.add(s)) { permutations.add(itemstack); } } catch (TimeoutException t) { @@ -240,12 +237,11 @@ public class ItemList { } private void updateOrdering(List items) { + final Map newOrdering = new HashMap<>(); ItemSorter.sort(items); - HashMap newOrdering = new HashMap<>(); - if (!CollapsibleItems.isEmpty()) { - HashMap groups = new HashMap<>(); + final HashMap groups = new HashMap<>(); int orderIndex = 0; for (ItemStack stack : items) { @@ -312,7 +308,6 @@ public class ItemList { ListMultimap itemMap = ArrayListMultimap.create(); ItemStackSet unique = new ItemStackSet(); - timer.setLimit(NEIClientConfig.getItemLoadingTimeout()); StreamSupport.stream(((Iterable) Item.itemRegistry).spliterator(), true).forEach(item -> { if (item == null || item.delegate.name() == null || erroredItems.contains(item)) return; @@ -333,6 +328,7 @@ public class ItemList { } CollapsibleItems.putItem(stack); + TooltipFilter.getSearchTooltip(stack); } } @@ -361,10 +357,6 @@ public class ItemList { if (interrupted()) return; updateOrdering(ItemList.items); - new Thread( - () -> ItemList.items.parallelStream().forEach(TooltipFilter::getSearchTooltip), - "NEI Tooltip Filter Loader").start(); - loadFinished = true; SubsetWidget.updateHiddenItems(); @@ -414,8 +406,7 @@ public class ItemList { if (interrupted()) return; - Comparator comparator = Comparator.comparingInt(ItemList.ordering::get); - filtered.sort(comparator); + filtered.sort(Comparator.comparingInt(ItemList.ordering::get)); if (interrupted()) return; @@ -423,13 +414,6 @@ public class ItemList { } }; - public static int getItemOrderIndex(ItemStack stack) { - final Optional> orderingEntry = ItemList.ordering.entrySet().parallelStream() - .filter(entry -> StackInfo.equalItemAndNBT(entry.getKey(), stack, true)).findAny(); - - return orderingEntry.isPresent() ? orderingEntry.get().getValue() : 0; - } - /** * @deprecated Use updateFilter.restart() */ diff --git a/src/main/java/codechicken/nei/ItemsPanelGrid.java b/src/main/java/codechicken/nei/ItemsPanelGrid.java index 1196f3aa..90a79f4b 100644 --- a/src/main/java/codechicken/nei/ItemsPanelGrid.java +++ b/src/main/java/codechicken/nei/ItemsPanelGrid.java @@ -51,13 +51,10 @@ public class ItemsPanelGrid extends ItemsGrid { final String[] parts = text.split("\\|"); final List searchTokens = Arrays.stream(parts).map(this::parseSearchText).filter(s -> s != null) - .collect(Collectors.toCollection(ArrayList::new)); + .collect(Collectors.toList()); if (searchTokens.isEmpty()) { return new EverythingItemFilter(); diff --git a/src/main/java/codechicken/nei/bookmark/BookmarkGridGenerator.java b/src/main/java/codechicken/nei/bookmark/BookmarkGridGenerator.java index f57ca36b..09daaace 100644 --- a/src/main/java/codechicken/nei/bookmark/BookmarkGridGenerator.java +++ b/src/main/java/codechicken/nei/bookmark/BookmarkGridGenerator.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.stream.Collectors; import codechicken.nei.BookmarkPanel.BookmarkViewMode; -import codechicken.nei.ItemList; +import codechicken.nei.ItemSorter; import codechicken.nei.bookmark.RecipeChainDetails.BookmarkChainItem; import codechicken.nei.bookmark.RecipeChainDetails.CalculatedType; import codechicken.nei.recipe.Recipe.RecipeId; @@ -286,7 +286,10 @@ public class BookmarkGridGenerator { private Comparator generateSortingComparator(Map calculatedItems) { return Comparator.comparingInt((Integer index) -> calculatedItems.get(index).calculatedType.toInt()) .thenComparing(index -> StackInfo.getFluid(calculatedItems.get(index).getItem().itemStack) != null) - .thenComparing(index -> ItemList.getItemOrderIndex(calculatedItems.get(index).getItem().itemStack)); + .thenComparing( + (i1, i2) -> ItemSorter.instance.compare( + calculatedItems.get(i1).getItem().itemStack, + calculatedItems.get(i2).getItem().itemStack)); } private void splitGridMask() { diff --git a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java index d7fa799f..3f2d6104 100644 --- a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java +++ b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java @@ -212,7 +212,7 @@ public class GuiContainerManager { @Nullable public static String itemCountDetails(ItemStack stack) { - FluidStack fluid = StackInfo.getFluid(stack); + final FluidStack fluid = StackInfo.getFluid(stack); if (fluid != null) { return fluidAmountDetails(fluid.amount * Math.max(1, stack.stackSize)); } else { diff --git a/src/main/java/codechicken/nei/recipe/FillFluidContainerHandler.java b/src/main/java/codechicken/nei/recipe/FillFluidContainerHandler.java index 2494b17c..c2982ed1 100644 --- a/src/main/java/codechicken/nei/recipe/FillFluidContainerHandler.java +++ b/src/main/java/codechicken/nei/recipe/FillFluidContainerHandler.java @@ -18,7 +18,7 @@ public class FillFluidContainerHandler extends INEIGuiAdapter { return false; } - if (draggedStack.getItem() instanceof IFluidContainerItem || FluidContainerRegistry.isContainer(draggedStack)) { + if (StackInfo.isFluidContainer(draggedStack)) { ItemStack overItemStack = ItemPanels.itemPanel.getStackMouseOver(mouseX, mouseY); if (overItemStack == null) { diff --git a/src/main/java/codechicken/nei/recipe/StackInfo.java b/src/main/java/codechicken/nei/recipe/StackInfo.java index 81733323..aed47ee1 100644 --- a/src/main/java/codechicken/nei/recipe/StackInfo.java +++ b/src/main/java/codechicken/nei/recipe/StackInfo.java @@ -90,7 +90,7 @@ public class StackInfo { return false; } - if (useNBT) { + if (useNBT && stackA != stackB) { NBTTagCompound tagCompoundA = itemStackToNBT(stackA, false); NBTTagCompound tagCompoundB = itemStackToNBT(stackB, false); diff --git a/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java b/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java index 7b1d378f..aec1fb81 100644 --- a/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java +++ b/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java @@ -62,29 +62,31 @@ public class RecipeChainMath { while (true) { Map maxReference = Collections.emptyMap(); RecipeId maxRecipeId = null; + long maxMultiplier = 0; int maxDepth = 0; - for (RecipeId recipeId : multipliers.keySet()) { + for (Map.Entry entry : multipliers.entrySet()) { + final RecipeId recipeId = entry.getKey(); if (!this.outputRecipes.containsKey(recipeId) && this.preferredItems.values().stream() .noneMatch(resItem -> resItem.recipeId.equals(recipeId))) { final Map references = new HashMap<>(this.preferredItems); final int depth = collectPreferredItems(recipeId, references, new HashSet<>()); - if (maxDepth < depth) { + if (maxDepth < depth || maxDepth == depth && entry.getValue() > maxMultiplier) { + maxMultiplier = entry.getValue(); maxReference = references; maxRecipeId = recipeId; maxDepth = depth; } - } } - if (!maxReference.isEmpty()) { - this.preferredItems.putAll(maxReference); - this.outputRecipes.put(maxRecipeId, multipliers.get(maxRecipeId)); - } else { + if (maxReference.isEmpty()) { break; } + + this.preferredItems.putAll(maxReference); + this.outputRecipes.put(maxRecipeId, multipliers.get(maxRecipeId)); } for (Map.Entry entry : multipliers.entrySet()) { @@ -113,7 +115,6 @@ public class RecipeChainMath { for (BookmarkItem item : this.recipeResults) { if (item.factor > (prefItem == null ? 0 : prefItem.factor) && item.containsItems(ingrItem) - && !item.recipeId.equals(recipeId) && !visited.contains(item.recipeId)) { prefItem = item; } diff --git a/src/main/java/codechicken/nei/recipe/chain/RecipeChainTooltipLineHandler.java b/src/main/java/codechicken/nei/recipe/chain/RecipeChainTooltipLineHandler.java index bd650eaa..cb27e261 100644 --- a/src/main/java/codechicken/nei/recipe/chain/RecipeChainTooltipLineHandler.java +++ b/src/main/java/codechicken/nei/recipe/chain/RecipeChainTooltipLineHandler.java @@ -11,7 +11,7 @@ import net.minecraft.util.EnumChatFormatting; import codechicken.lib.gui.GuiDraw; import codechicken.lib.gui.GuiDraw.ITooltipLineHandler; -import codechicken.nei.ItemList; +import codechicken.nei.ItemSorter; import codechicken.nei.ItemStackAmount; import codechicken.nei.ItemsTooltipLineHandler; import codechicken.nei.NEIClientConfig; @@ -57,7 +57,8 @@ public class RecipeChainTooltipLineHandler implements ITooltipLineHandler { if (lastShiftKey) { for (ItemStack stack : inventory.values()) { - long invStackSize = inventory.get(stack); + final long invStackSize = inventory.get(stack); + if (invStackSize > 0) { this.math.initialItems.add(BookmarkItem.of(-1, stack.copy())); } @@ -125,13 +126,13 @@ public class RecipeChainTooltipLineHandler implements ITooltipLineHandler { inputs.sort( Comparator.comparing((ItemStack stack) -> StackInfo.getFluid(stack) != null) - .thenComparing(stack -> ItemList.getItemOrderIndex(stack))); + .thenComparing(ItemSorter.instance)); outputs.sort( Comparator.comparing((ItemStack stack) -> StackInfo.getFluid(stack) != null) - .thenComparing(stack -> ItemList.getItemOrderIndex(stack))); + .thenComparing(ItemSorter.instance)); remainder.sort( Comparator.comparing((ItemStack stack) -> StackInfo.getFluid(stack) != null) - .thenComparing(stack -> ItemList.getItemOrderIndex(stack))); + .thenComparing(ItemSorter.instance)); this.inputs = new ItemsTooltipLineHandler( lastShiftKey ? NEIClientUtils.translate("bookmark.crafting_chain.missing")