Toggle fuzzy for all

src/main/java/inventorysetups/InventorySetupsItem.java

@@ -46,10 +46,6 @@ public class InventorySetupsItem
 	@Setter
 	private InventorySetupsStackCompareID stackCompare;
 
-	public void toggleIsFuzzy()
-	{
-		fuzzy = !fuzzy;
-	}
 
 	public static InventorySetupsItem getDummyItem()
 	{

src/main/java/inventorysetups/InventorySetupsPlugin.java

@@ -1495,7 +1495,7 @@ public void updateSlotFromSearch(final InventorySetupsSlot slot, boolean allowSt
 								panel.getCurrentSelectedSetup().getAdditionalFilteredItems();
 						if (!additionalFilteredItemsHasItem(finalId, additionalFilteredItems))
 						{
-							removeAdditionalFilteredItem(slot, additionalFilteredItems);
+							removeAdditionalFilteredItem(slot);
 							addAdditionalFilteredItem(finalId, slot.getParentSetup(), additionalFilteredItems);
 						}
 						return;
@@ -1608,14 +1608,18 @@ public void removeItemFromSlot(final InventorySetupsSlot slot)
 				JOptionPane.ERROR_MESSAGE);
 			return;
 		}
+		if (panel.getCurrentSelectedSetup() == null)
+		{
+			return;
+		}
 
 		// must be invoked on client thread to get the name
 		clientThread.invokeLater(() ->
 		{
 
 			if (slot.getSlotID() == InventorySetupsSlotID.ADDITIONAL_ITEMS)
 			{
-				removeAdditionalFilteredItem(slot, panel.getCurrentSelectedSetup().getAdditionalFilteredItems());
+				removeAdditionalFilteredItem(slot);
 				layoutUtilities.recalculateLayout(panel.getCurrentSelectedSetup());
 				dataManager.updateConfig(true, false);
 				panel.refreshCurrentSetup();
@@ -1642,58 +1646,70 @@ public void removeItemFromSlot(final InventorySetupsSlot slot)
 		});
 	}
 
-	public void toggleFuzzyOnSlot(final InventorySetupsSlot slot)
+	public void toggleAllFuzzyOnSlot(final InventorySetupsSlot slot)
 	{
 		if (panel.getCurrentSelectedSetup() == null)
 		{
 			return;
 		}
 
-		InventorySetupsItem item = null;
-
+		final InventorySetup inventorySetup = slot.getParentSetup();
+		InventorySetupsItem originalItem;
+		//If an additional slot was clicked
 		if (slot.getSlotID() == InventorySetupsSlotID.ADDITIONAL_ITEMS)
 		{
-			// Empty slot was selected to be toggled, don't do anything
-			if (slot.getIndexInSlot() >= slot.getParentSetup().getAdditionalFilteredItems().size())
+			Integer keyToToggle = getAdditionalItemKey(slot);
+			if (keyToToggle == null)
 			{
 				return;
 			}
-
-			final Map<Integer, InventorySetupsItem> additionalFilteredItems = slot.getParentSetup().getAdditionalFilteredItems();
-			final int slotID = slot.getIndexInSlot();
-			int j = 0;
-			Integer keyToMakeFuzzy = null;
-			for (final Integer key : additionalFilteredItems.keySet())
-			{
-				if (slotID == j)
-				{
-					keyToMakeFuzzy = key;
-					break;
-				}
-				j++;
+			else{
+				originalItem = inventorySetup.getAdditionalFilteredItems().get(keyToToggle);
 			}
-			item = additionalFilteredItems.get(keyToMakeFuzzy);
 		}
-		else
+		else{
+			originalItem = getContainerFromSlot(slot).get(slot.getIndexInSlot());
+		}
+		if (originalItem.getId() == -1)
 		{
-			final List<InventorySetupsItem> container = getContainerFromSlot(slot);
-			item = container.get(slot.getIndexInSlot());
+			return;
 		}
-		item.toggleIsFuzzy();
-		final int itemId = item.getId();
+		boolean newFuzzyValue = !originalItem.isFuzzy();
+
+		//has to be in client to use itemManager
 		clientThread.invoke(() ->
 		{
-			if (itemId == -1)
+			//Find all variations of the item, so they can also be toggled
+			int processedId = itemManager.canonicalize(originalItem.getId());
+			int baseProcessedId = InventorySetupsVariationMapping.map(processedId);
+			Collection<Integer> variations = InventorySetupsVariationMapping.getVariations(baseProcessedId);
+			variations.add(processedId);
+
+			Consumer<InventorySetupsItem> toggleFuzzyIfMatched = item ->
 			{
-				return;
+				if (variations.contains(item.getId()))
+				{
+					item.setFuzzy(newFuzzyValue);
+				}
+			};
+
+			inventorySetup.getInventory().forEach(toggleFuzzyIfMatched);
+
+			inventorySetup.getEquipment().forEach(toggleFuzzyIfMatched);
+			inventorySetup.getAdditionalFilteredItems().values().forEach(toggleFuzzyIfMatched);
+
+			if (inventorySetup.getQuiver() != null)
+			{
+				inventorySetup.getQuiver().forEach(toggleFuzzyIfMatched);
 			}
+
 			layoutUtilities.recalculateLayout(slot.getParentSetup());
+			dataManager.updateConfig(true, false);
+			panel.refreshCurrentSetup();
 		});
 
-		dataManager.updateConfig(true, false);
-		panel.refreshCurrentSetup();
-	}
 
+	}
 	public void setStackCompareOnSlot(final InventorySetupsSlot slot, final InventorySetupsStackCompareID newStackCompare)
 	{
 		if (panel.getCurrentSelectedSetup() == null)
@@ -1708,32 +1724,45 @@ public void setStackCompareOnSlot(final InventorySetupsSlot slot, final Inventor
 		panel.refreshCurrentSetup();
 	}
 
-	private void removeAdditionalFilteredItem(final InventorySetupsSlot slot, final Map<Integer, InventorySetupsItem> additionalFilteredItems)
+	private Integer getAdditionalItemKey(final InventorySetupsSlot slot)
 	{
-
-		assert panel.getCurrentSelectedSetup() != null : "Current setup is null";
-
-		final int slotID = slot.getIndexInSlot();
-
-		// Empty slot was selected to be removed, don't do anything
-		if (slotID >= additionalFilteredItems.size())
+		final Map<Integer, InventorySetupsItem> additionalFilteredItems = slot.getParentSetup().getAdditionalFilteredItems();
+		// Empty slot was selected to be toggled, don't do anything
+		if (slot.getIndexInSlot() >= additionalFilteredItems.size())
 		{
-			return;
+			return null;
 		}
 
+
+		final int slotID = slot.getIndexInSlot();
 		int j = 0;
-		Integer keyToDelete = null;
+		Integer keyToMakeFuzzy = null;
 		for (final Integer key : additionalFilteredItems.keySet())
 		{
 			if (slotID == j)
 			{
-				keyToDelete = key;
+				keyToMakeFuzzy = key;
 				break;
 			}
 			j++;
 		}
+		return keyToMakeFuzzy;
+	}
+	private void removeAdditionalFilteredItem(final InventorySetupsSlot slot)
+	{
+
+		if (panel.getCurrentSelectedSetup() == null)
+		{
+			return;
+		}
+
+		Integer keyToDelete = getAdditionalItemKey(slot);
+		if (keyToDelete == null)
+		{
+			return;
+		}
 
-		additionalFilteredItems.remove(keyToDelete);
+		slot.getParentSetup().getAdditionalFilteredItems().remove(keyToDelete);
 		// None of the data functions are called here because the callee does it.
 		// If an item is swapped (removed + added) this would result in a double data process
 		// Which isn't bad, just a minor optimization

src/main/java/inventorysetups/ui/InventorySetupsSlot.java

@@ -254,10 +254,9 @@ public static void addFuzzyMouseListenerToSlot(final InventorySetupsPlugin plugi
 		slot.getRightClickMenu().add(makeSlotFuzzy);
 		makeSlotFuzzy.addActionListener(e ->
 		{
-			plugin.toggleFuzzyOnSlot(slot);
+			plugin.toggleAllFuzzyOnSlot(slot);
 		});
 	}
-
 	// adds the menu option to update set a slot to fuzzy
 	public static void addStackMouseListenerToSlot(final InventorySetupsPlugin plugin, final InventorySetupsSlot slot)
 	{