Revert "infobox manager: make threadsafe"

This reverts commit ba9ffb1d

runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBox.java

@@ -26,7 +26,6 @@ package net.runelite.client.ui.overlay.infobox;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;
-import javax.annotation.Nonnull;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
@@ -34,7 +33,6 @@ import net.runelite.client.plugins.Plugin;
 
 public abstract class InfoBox
 {
-	@Nonnull
 	@Getter(AccessLevel.PACKAGE)
 	private final Plugin plugin;
 
@@ -54,7 +52,7 @@ public abstract class InfoBox
 	@Setter
 	private String tooltip;
 
-	public InfoBox(BufferedImage image, @Nonnull Plugin plugin)
+	public InfoBox(BufferedImage image, Plugin plugin)
 	{
 		this.plugin = plugin;
 		setImage(image);

runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java

@@ -27,7 +27,9 @@ package net.runelite.client.ui.overlay.infobox;
 import com.google.common.collect.ComparisonChain;
 import java.awt.Graphics;
 import java.awt.image.BufferedImage;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -44,7 +46,7 @@ import net.runelite.client.util.AsyncBufferedImage;
 @Slf4j
 public class InfoBoxManager
 {
-	private final List<InfoBox> infoBoxes = new CopyOnWriteArrayList<>();
+	private final List<InfoBox> infoBoxes = new ArrayList<>();
 	private final RuneLiteConfig runeLiteConfig;
 
 	@Inject
@@ -69,19 +71,8 @@ public class InfoBoxManager
 		log.debug("Adding InfoBox {}", infoBox);
 
 		updateInfoBoxImage(infoBox);
-
-		synchronized (this)
-		{
-			int idx = Collections.binarySearch(infoBoxes, infoBox, (b1, b2) -> ComparisonChain
-				.start()
-				.compare(b1.getPriority(), b2.getPriority())
-				.compare(b1.getPlugin().getName(), b2.getPlugin().getName())
-				.result());
-			if (idx < 0)
-			{
-				infoBoxes.add(-idx - 1, infoBox);
-			}
-		}
+		infoBoxes.add(infoBox);
+		refreshInfoBoxes();
 
 		BufferedImage image = infoBox.getImage();
 
@@ -92,19 +83,21 @@ public class InfoBoxManager
 		}
 	}
 
-	public synchronized void removeInfoBox(InfoBox infoBox)
+	public void removeInfoBox(InfoBox infoBox)
 	{
 		if (infoBoxes.remove(infoBox))
 		{
 			log.debug("Removed InfoBox {}", infoBox);
+			refreshInfoBoxes();
 		}
 	}
 
-	public synchronized void removeIf(Predicate<InfoBox> filter)
+	public void removeIf(Predicate<InfoBox> filter)
 	{
 		if (infoBoxes.removeIf(filter))
 		{
 			log.debug("Removed InfoBoxes for filter {}", filter);
+			refreshInfoBoxes();
 		}
 	}
 
@@ -113,9 +106,25 @@ public class InfoBoxManager
 		return Collections.unmodifiableList(infoBoxes);
 	}
 
-	public synchronized void cull()
+	public void cull()
 	{
-		infoBoxes.removeIf(InfoBox::cull);
+		boolean culled = false;
+		for (Iterator<InfoBox> it = infoBoxes.iterator(); it.hasNext();)
+		{
+			InfoBox box = it.next();
+
+			if (box.cull())
+			{
+				log.debug("Culling InfoBox {}", box);
+				it.remove();
+				culled = true;
+			}
+		}
+
+		if (culled)
+		{
+			refreshInfoBoxes();
+		}
 	}
 
 	public void updateInfoBoxImage(final InfoBox infoBox)
@@ -154,4 +163,13 @@ public class InfoBoxManager
 
 		infoBox.setScaledImage(resultImage);
 	}
+
+	private void refreshInfoBoxes()
+	{
+		infoBoxes.sort((b1, b2) -> ComparisonChain
+			.start()
+			.compare(b1.getPriority(), b2.getPriority())
+			.compare(b1.getPlugin().getName(), b2.getPlugin().getName())
+			.result());
+	}
 }