backport fix to 1.15.2

Author: LemmaEOF

gradle.properties

@@ -8,7 +8,7 @@ yarn_build=3
 loader_version=0.8.2+build.194
 
 # Mod Properties
-mod_version = 2.4.0
+mod_version = 2.4.1
 maven_group = io.github.cottonmc
 archives_base_name = libcd
 

src/main/java/io/github/cottonmc/libcd/api/tweaker/recipe/RecipeParser.java

@@ -107,28 +107,28 @@ else if (input instanceof String) {
 	}
 
 	public static ItemStack processItemStack(Object input) throws CDSyntaxError {
-		if (input instanceof ItemStack) return (ItemStack)input;
+		if (input instanceof ItemStack) return (ItemStack) input;
 		else if (input instanceof String) {
-			String in = (String)input;
+			String in = (String) input;
 			int atIndex = in.lastIndexOf('@');
 			int nbtIndex = in.indexOf('{');
 			int count = 1;
 			if (atIndex != -1 && atIndex > in.lastIndexOf('}')) {
 				count = Integer.parseInt(in.substring(atIndex + 1));
 				in = in.substring(0, atIndex);
 			}
-			Item item;
 			String nbt = "";
+			if (nbtIndex != -1) {
+				nbt = in.substring(nbtIndex);
+				in = in.substring(0, nbtIndex);
+			}
+			Item item;
 			if (in.indexOf('#') == 0) {
-				if (nbtIndex != -1) {
-					nbt = in.substring(nbtIndex);
-					in = in.substring(0, nbtIndex);
-				}
 				String tag = in.substring(1);
 				Tag<Item> itemTag = ItemTags.getContainer().get(new Identifier(tag));
 				if (itemTag == null) throw new CDSyntaxError("Failed to get item tag for output: " + in);
 				item = TagHelper.ITEM.getDefaultEntry(itemTag);
-			} else if (in.contains("->") && in.indexOf("->") < in.indexOf('{')) {
+			} else if (in.contains("->")) {
 				ItemStack stack = TweakerUtils.INSTANCE.getSpecialStack(in);
 				if (stack.isEmpty())
 					throw new CDSyntaxError("Failed to get special stack for output: " + in);
@@ -137,10 +137,6 @@ else if (input instanceof String) {
 				}
 				return stack;
 			} else {
-				if (nbtIndex != -1) {
-					nbt = in.substring(nbtIndex);
-					in = in.substring(0, nbtIndex);
-				}
 				item = TweakerUtils.INSTANCE.getItem(in);
 			}