Allow getting UID for empty itemstack

mezz · Oct 2, 2024 · 2d509e3 · 2d509e3
1 parent 4d89747
commit 2d509e3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/Common/src/main/java/mezz/jei/common/util/ErrorUtil.java b/Common/src/main/java/mezz/jei/common/util/ErrorUtil.java
@@ -80,17 +80,6 @@ private static String getBlockName(BlockItem blockItem) {
 		return block.getClass().getName();
 	}
 
-
-	@SuppressWarnings("ConstantConditions")
-	public static void checkNotEmpty(ItemStack itemStack) {
-		if (itemStack == null) {
-			throw new NullPointerException("ItemStack must not be null.");
-		} else if (itemStack.isEmpty()) {
-			String info = getItemStackInfo(itemStack);
-			throw new IllegalArgumentException("ItemStack value must not be empty. " + info);
-		}
-	}
-
 	@SuppressWarnings("ConstantConditions")
 	public static void checkNotEmpty(ItemStack itemStack, String name) {
 		if (itemStack == null) {

diff --git a/Common/src/main/java/mezz/jei/common/util/StackHelper.java b/Common/src/main/java/mezz/jei/common/util/StackHelper.java
@@ -77,7 +77,7 @@ public boolean hasSubtypes(ItemStack stack) {
 	}
 
 	public static String getRegistryNameForStack(ItemStack stack) {
-		ErrorUtil.checkNotEmpty(stack, "stack");
+		ErrorUtil.checkNotNull(stack, "stack");
 
 		Item item = stack.getItem();
 		ResourceLocation key = RegistryUtil

diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/ingredients/ItemStackHelper.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/ingredients/ItemStackHelper.java
@@ -64,13 +64,13 @@ public String getDisplayName(ItemStack ingredient) {
 	@SuppressWarnings("removal")
 	@Override
 	public String getUniqueId(ItemStack ingredient, UidContext context) {
-		ErrorUtil.checkNotEmpty(ingredient);
+		ErrorUtil.checkNotNull(ingredient, "ingredient");
 		return stackHelper.getUniqueIdentifierForStack(ingredient, context);
 	}
 
 	@Override
 	public Object getUid(ItemStack ingredient, UidContext context) {
-		ErrorUtil.checkNotEmpty(ingredient, "ingredient");
+		ErrorUtil.checkNotNull(ingredient, "ingredient");
 		ErrorUtil.checkNotNull(context, "type");
 		return stackHelper.getUidForStack(ingredient, context);
 	}
@@ -96,13 +96,13 @@ public boolean hasSubtypes(ItemStack ingredient) {
 	@SuppressWarnings("removal")
 	@Override
 	public String getWildcardId(ItemStack ingredient) {
-		ErrorUtil.checkNotEmpty(ingredient);
+		ErrorUtil.checkNotNull(ingredient, "ingredient");
 		return StackHelper.getRegistryNameForStack(ingredient);
 	}
 
 	@Override
 	public String getDisplayModId(ItemStack ingredient) {
-		ErrorUtil.checkNotEmpty(ingredient);
+		ErrorUtil.checkNotNull(ingredient, "ingredient");
 
 		IPlatformItemStackHelper itemStackHelper = Services.PLATFORM.getItemStackHelper();
 		return itemStackHelper.getCreatorModId(ingredient)
@@ -141,7 +141,7 @@ public Iterable<Integer> getColors(ItemStack ingredient) {
 
 	@Override
 	public ResourceLocation getResourceLocation(ItemStack ingredient) {
-		ErrorUtil.checkNotEmpty(ingredient);
+		ErrorUtil.checkNotNull(ingredient, "ingredient");
 
 		Item item = ingredient.getItem();
 		ResourceLocation key = RegistryUtil