Refactor: minor item controller stuff

3 files changed, 101 insertions, 89 deletions

diff --git a/common/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/AbstractDropdownControllerElement.java b/common/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/AbstractDropdownControllerElement.java
index f91fc41..0e62af4 100644
--- a/common/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/AbstractDropdownControllerElement.java
+++ b/common/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/AbstractDropdownControllerElement.java
@@ -174,7 +174,7 @@ public abstract class AbstractDropdownControllerElement<T, U> extends StringCont
 	}
 
 	public void renderDropdown(GuiGraphics graphics) {
-		if (matchingValues.size() == 0) return;
+		if (matchingValues.isEmpty()) return;
 		// Limit the visible options to allow scrolling through the suggestion list
 		int begin = Math.max(0, selectedIndex - MAX_SHOWN_NUMBER_OF_ITEMS / 2);
 		int end = begin + MAX_SHOWN_NUMBER_OF_ITEMS;
@@ -184,7 +184,7 @@ public abstract class AbstractDropdownControllerElement<T, U> extends StringCont
 		}
 
 		renderDropdownBackground(graphics, end - begin);
-		if (matchingValues.size() >= 1) {
+		if (!matchingValues.isEmpty()) {
 			// Highlight the currently selected element
 			graphics.setColor(0.0f, 0.0f, 0.0f, 0.5f);
 			int x = getDimension().x();
diff --git a/common/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/ItemControllerElement.java b/common/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/ItemControllerElement.java
index b0bf566..1617c41 100644
--- a/common/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/ItemControllerElement.java
+++ b/common/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/ItemControllerElement.java
@@ -56,7 +56,7 @@ public class ItemControllerElement extends AbstractDropdownControllerElement<Ite
 
 	@Override
 	public String getString(ResourceLocation identifier) {
-		return BuiltInRegistries.ITEM.get(identifier).toString();
+		return identifier.toString();
 	}
 
 	@Override
diff --git a/common/src/main/java/dev/isxander/yacl3/gui/utils/ItemRegistryHelper.java b/common/src/main/java/dev/isxander/yacl3/gui/utils/ItemRegistryHelper.java
index 5bfbefb..3c4f03a 100644
--- a/common/src/main/java/dev/isxander/yacl3/gui/utils/ItemRegistryHelper.java
+++ b/common/src/main/java/dev/isxander/yacl3/gui/utils/ItemRegistryHelper.java
@@ -6,99 +6,111 @@ import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 public final class ItemRegistryHelper {
 
-	/**
-	 * Checks whether the given string is an identifier referring to a known item
-	 * @param identifier Item identifier, either of the format "namespace:path" or "path". If no namespace is included,
-	 *                   the default vanilla namespace "minecraft" is used.
-	 * @return true if the identifier refers to a registered item, false otherwise
-	 */
-	public static boolean isRegisteredItem(String identifier) {
-		try {
-			ResourceLocation itemIdentifier = new ResourceLocation(identifier.toLowerCase());
-			return BuiltInRegistries.ITEM.containsKey(itemIdentifier);
-		} catch (ResourceLocationException e) {
-			return false;
-		}
-	}
+    /**
+     * Checks whether the given string is an identifier referring to a known item
+     *
+     * @param identifier Item identifier, either of the format "namespace:path" or "path". If no namespace is included,
+     *                   the default vanilla namespace "minecraft" is used.
+     * @return true if the identifier refers to a registered item, false otherwise
+     */
+    public static boolean isRegisteredItem(String identifier) {
+        try {
+            ResourceLocation itemIdentifier = new ResourceLocation(identifier.toLowerCase());
+            return BuiltInRegistries.ITEM.containsKey(itemIdentifier);
+        } catch (ResourceLocationException e) {
+            return false;
+        }
+    }
 
-	/**
-	 * Looks up the item of the given identifier string.
-	 * @param identifier Item identifier, either of the format "namespace:path" or "path". If no namespace is included,
-	 *                   the default vanilla namespace "minecraft" is used.
-	 * @param defaultItem Fallback item that gets returned if the identifier does not name a registered item.
-	 * @return The item identified by the given string, or the fallback if the identifier is not known.
-	 */
-	public static Item getItemFromName(String identifier, Item defaultItem) {
-		try {
-			ResourceLocation itemIdentifier = new ResourceLocation(identifier.toLowerCase());
-			if (BuiltInRegistries.ITEM.containsKey(itemIdentifier)) {
-				return BuiltInRegistries.ITEM.get(itemIdentifier);
-			}
-		} catch (ResourceLocationException ignored) { }
-		return defaultItem;
-	}
-	/**
-	 * Looks up the item of the given identifier string.
-	 * @param identifier Item identifier, either of the format "namespace:path" or "path". If no namespace is included,
-	 *                   the default vanilla namespace "minecraft" is used.
-	 * @return The item identified by the given string, or `Items.AIR` if the identifier is not known.
-	 */
-	public static Item getItemFromName(String identifier) {
-		return getItemFromName(identifier, Items.AIR);
-	}
+    /**
+     * Looks up the item of the given identifier string.
+     *
+     * @param identifier  Item identifier, either of the format "namespace:path" or "path". If no namespace is included,
+     *                    the default vanilla namespace "minecraft" is used.
+     * @param defaultItem Fallback item that gets returned if the identifier does not name a registered item.
+     * @return The item identified by the given string, or the fallback if the identifier is not known.
+     */
+    public static Item getItemFromName(String identifier, Item defaultItem) {
+        try {
+            ResourceLocation itemIdentifier = new ResourceLocation(identifier.toLowerCase());
+            if (BuiltInRegistries.ITEM.containsKey(itemIdentifier)) {
+                return BuiltInRegistries.ITEM.get(itemIdentifier);
+            }
+        } catch (ResourceLocationException ignored) {
+        }
+        return defaultItem;
+    }
 
-	/**
-	 * Returns a list of item identifiers matching the given string. The value matches an identifier if:
-	 *  <li>No namespace is provided in the value and the value is a substring of the path segment of any identifier,
-	 *      regardless of namespace.</li>
-	 *  <li>A namespace is provided, equals the identifier's namespace, and the value is the begin of the identifier's
-	 *      path segment.</li>
-	 * @param value (partial) identifier, either of the format "namespace:path" or "path".
-	 * @return list of matching item identifiers; empty if the given string does not correspond to any known identifiers
-	 */
-	public static Stream<ResourceLocation> getMatchingItemIdentifiers(String value) {
-		int sep = value.indexOf(ResourceLocation.NAMESPACE_SEPARATOR);
-		Predicate<ResourceLocation> filterPredicate;
-		if (sep == -1) {
-			filterPredicate = identifier ->
-					identifier.getPath().contains(value)
-					|| BuiltInRegistries.ITEM.get(identifier).getDescription().getString().toLowerCase().contains(value.toLowerCase());
-		} else {
-			String namespace = value.substring(0, sep);
-			String path = value.substring(sep + 1);
-			filterPredicate = identifier -> identifier.getNamespace().equals(namespace) && identifier.getPath().startsWith(path);
-		}
-		return BuiltInRegistries.ITEM.keySet().stream()
-			.filter(filterPredicate)
-			/*
-			 Sort items as follows based on the given "value" string's path:
-			 - if both items' paths begin with the entered string, sort the identifiers (including namespace)
-			 - otherwise, if either of the items' path begins with the entered string, sort it to the left
-			 - else neither path matches: sort by identifiers again
+    /**
+     * Looks up the item of the given identifier string.
+     *
+     * @param identifier Item identifier, either of the format "namespace:path" or "path". If no namespace is included,
+     *                   the default vanilla namespace "minecraft" is used.
+     * @return The item identified by the given string, or `Items.AIR` if the identifier is not known.
+     */
+    public static Item getItemFromName(String identifier) {
+        return getItemFromName(identifier, Items.AIR);
+    }
 
-			 This allows the user to enter "diamond_ore" and match "minecraft:diamond_ore" before
-			 "minecraft:deepslate_diamond_ore", even though the second is lexicographically smaller
-			 */
-			.sorted((id1, id2) -> {
-				String path = (sep == -1 ? value : value.substring(sep + 1)).toLowerCase();
-				boolean id1StartsWith = id1.getPath().toLowerCase().startsWith(path);
-				boolean id2StartsWith = id2.getPath().toLowerCase().startsWith(path);
-				if (id1StartsWith) {
-					if (id2StartsWith) {
-						return id1.compareTo(id2);
-					}
-					return -1;
-				}
-				if (id2StartsWith) {
-					return 1;
-				}
-				return id1.compareTo(id2);
-			});
-	}
+    /**
+     * Returns a list of item identifiers matching the given string. The value matches an identifier if:
+     * <li>No namespace is provided in the value and the value is a substring of the path segment of any identifier,
+     * regardless of namespace.</li>
+     * <li>A namespace is provided, equals the identifier's namespace, and the value is the begin of the identifier's
+     * path segment.</li>
+     *
+     * @param value (partial) identifier, either of the format "namespace:path" or "path".
+     * @return list of matching item identifiers; empty if the given string does not correspond to any known identifiers
+     */
+    public static Stream<ResourceLocation> getMatchingItemIdentifiers(String value) {
+        int sep = value.indexOf(ResourceLocation.NAMESPACE_SEPARATOR);
+        Predicate<ResourceLocation> filterPredicate;
+        if (sep == -1) {
+            filterPredicate = identifier ->
+                    identifier.getPath().contains(value)
+                            || BuiltInRegistries.ITEM.get(identifier).getDescription().getString().toLowerCase().contains(value.toLowerCase());
+        } else {
+            String namespace = value.substring(0, sep);
+            String path = value.substring(sep + 1);
+            filterPredicate = identifier -> identifier.getNamespace().equals(namespace) && identifier.getPath().startsWith(path);
+        }
+        return BuiltInRegistries.ITEM.holders()
+                .map(holder -> holder.key().location())
+                .filter(filterPredicate)
+                /*
+                 Sort items as follows based on the given "value" string's path:
+                 - if both items' paths begin with the entered string, sort the identifiers (including namespace)
+                 - otherwise, if either of the items' path begins with the entered string, sort it to the left
+                 - else neither path matches: sort by identifiers again
+
+                 This allows the user to enter "diamond_ore" and match "minecraft:diamond_ore" before
+                 "minecraft:deepslate_diamond_ore", even though the second is lexicographically smaller
+                 */
+                .sorted((id1, id2) -> {
+                    String path = (sep == -1 ? value : value.substring(sep + 1)).toLowerCase();
+                    boolean id1StartsWith = id1.getPath().toLowerCase().startsWith(path);
+                    boolean id2StartsWith = id2.getPath().toLowerCase().startsWith(path);
+                    if (id1StartsWith) {
+                        if (id2StartsWith) {
+                            return id1.compareTo(id2);
+                        }
+                        return -1;
+                    }
+                    if (id2StartsWith) {
+                        return 1;
+                    }
+                    return id1.compareTo(id2);
+                });
+    }
 }