Merge branch '1.16-2.0' into 1.17-2.0

Siphalor · Sep 20, 2022 · 85634ab · 85634ab
2 parents 94bde3e + 5339b73
commit 85634ab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.giup b/.giup
@@ -11,13 +11,18 @@
 			"ignore-errors": true
 		},
 		{
-			"title": "Publish & Upload",
-			"run": "gradlew build publish uploadToModSites",
-			"posix": "./gradlew build publish uploadToModSites"
+			"title": "Build & Publish",
+			"run": "gradlew build publish",
+			"posix": "./gradlew build publish"
 		},
 		{
 			"title": "Git push",
 			"run": "git push"
+		},
+		{
+			"title": "Upload",
+			"run": "gradlew uploadToModSites",
+			"posix": "./gradlew uploadToModSites"
 		}
 	]
 }
diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.11.6
 
 # Mod Properties
-	mod_version = 2.2.0-beta.1
+	mod_version = 2.2.0
 	mod_release = beta
 	mod_mc_version_specifier = 1.17
 	mod_mc_versions = 1.17;1.17.1

diff --git a/src/main/java/de/siphalor/nbtcrafting/api/RecipeUtil.java b/src/main/java/de/siphalor/nbtcrafting/api/RecipeUtil.java
@@ -57,7 +57,7 @@ public static Map<String, Object> buildReferenceMapFromResolvedIngredients(int[]
 		for (int i = 0; i < resolvedIngredientStacks.length; i++) {
 			int resolvedIngredientStack = resolvedIngredientStacks[i];
 			if (resolvedIngredientStack != -1) {
-				reference.put("i" + i, inventory.getStack(resolvedIngredientStack));
+				reference.put("i" + i, NbtUtil.getTagOrEmpty(inventory.getStack(resolvedIngredientStack)));
 			}
 		}
 		return reference;