Fix build

Author: IotaBread

enigma-swing/src/main/java/org/quiltmc/enigma/gui/search/SearchEntry.java

@@ -1,7 +1,5 @@
 package org.quiltmc.enigma.gui.search;
 
-import org.quiltmc.enigma.gui.dialog.SearchDialog;
-
 import java.util.List;
 
 public interface SearchEntry {
@@ -15,5 +13,9 @@ public interface SearchEntry {
 	 */
 	String getIdentifier();
 
-	SearchDialog.Type getType();
+	/**
+	 * Returns the priority of the type of this entry. Entries with higher
+	 * priorities show up higher in the result list. Should be greater than zero.
+	 */
+	int getTypePriority();
 }

enigma-swing/src/main/java/org/quiltmc/enigma/gui/search/SearchUtil.java

@@ -1,6 +1,5 @@
 package org.quiltmc.enigma.gui.search;
 
-import org.quiltmc.enigma.gui.dialog.SearchDialog;
 import org.quiltmc.enigma.util.Pair;
 
 import java.util.ArrayList;
@@ -160,8 +159,7 @@ public float getScore(String term, int hits) {
 			}
 
 			// modify by type
-			int typeModifier = SearchDialog.Type.values().length - this.searchEntry.getType().ordinal() + 1;
-			return maxScore * (hits + 1) * typeModifier;
+			return maxScore * (hits + 1) * this.searchEntry.getTypePriority();
 		}
 
 		/**
@@ -211,7 +209,11 @@ private static float getScoreFor(String term, String[] name) {
 		}
 
 		private static <K, V> void merge(Map<K, V> self, Map<K, V> source, BiFunction<V, V, V> combiner) {
-			source.forEach((k, v) -> self.compute(k, (_k, v1) -> v1 == null ? v : v == null ? v1 : combiner.apply(v, v1)));
+			source.forEach((k, v) -> {
+				if (v != null) {
+					self.merge(k, v, combiner);
+				}
+			});
 		}
 
 		public static <T extends SearchEntry> Entry<T> from(T e) {