Fix build after bad merge

FabricMC · Oct 15, 2024 · 2986a62 · 2986a62
1 parent c0bdb89
commit 2986a62
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/...c-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/ItemStorage.java b/...c-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/ItemStorage.java
@@ -167,23 +167,7 @@ private ItemStorage() {
 
 		ItemStorage.ITEM.registerForItems(
 				(itemStack, context) -> new BundleContentsStorage(context),
-				Items.BUNDLE,
-				Items.WHITE_BUNDLE,
-				Items.ORANGE_BUNDLE,
-				Items.MAGENTA_BUNDLE,
-				Items.LIGHT_BLUE_BUNDLE,
-				Items.YELLOW_BUNDLE,
-				Items.LIME_BUNDLE,
-				Items.PINK_BUNDLE,
-				Items.GRAY_BUNDLE,
-				Items.LIGHT_GRAY_BUNDLE,
-				Items.CYAN_BUNDLE,
-				Items.PURPLE_BUNDLE,
-				Items.BLUE_BUNDLE,
-				Items.BROWN_BUNDLE,
-				Items.GREEN_BUNDLE,
-				Items.RED_BUNDLE,
-				Items.BLACK_BUNDLE
+				Items.BUNDLE
 		);
 	}
 }
diff --git a/...er-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/BundleContentsStorage.java b/...er-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/BundleContentsStorage.java
@@ -64,7 +64,7 @@ public long insert(ItemVariant resource, long maxAmount, TransactionContext tran
 
 		ItemStack stack = resource.toStack((int) maxAmount);
 
-		if (!BundleContentsComponent.canBeBundled(stack)) return 0;
+		if (!stack.isEmpty() || !stack.getItem().canBeNested()) return 0;
 
 		var builder = new BundleContentsComponent.Builder(bundleContents());