Remove length check for remaining data when Importing items. This fixes the error when importing items created in other editors.

Author: ZakisM

bl3_save_edit_core/src/bl3_item.rs

@@ -347,7 +347,11 @@ impl Bl3Item {
 
             let rerolled = if serial_version >= 4 { bits.eat(8)? } else { 0 };
 
-            if bits.len() > 7 || bits.bitslice().count_ones() > 0 {
+            if bits.len() > 7 {
+                warn!("Remaining data length for item was more than expected. Expected length of 7 or less but found length of: {}.", bits.len());
+            }
+
+            if bits.bitslice().count_ones() > 0 {
                 bail!("Could not fully parse the item data, there was unexpected data left.")
             }
 

bl3_save_edit_core/src/bl3_profile/mod.rs

@@ -321,13 +321,13 @@ mod tests {
 
         assert_eq!(bl3_profile.profile_data.bank_items().len(), 399);
         assert_eq!(bl3_profile.profile_data.lost_loot_items().len(), 13);
-        assert_eq!(bl3_profile.profile_data.character_skins_unlocked(), 212);
-        assert_eq!(bl3_profile.profile_data.character_heads_unlocked(), 144);
-        assert_eq!(bl3_profile.profile_data.echo_themes_unlocked(), 57);
+        assert_eq!(bl3_profile.profile_data.character_skins_unlocked(), 204);
+        assert_eq!(bl3_profile.profile_data.character_heads_unlocked(), 136);
+        assert_eq!(bl3_profile.profile_data.echo_themes_unlocked(), 55);
         assert_eq!(bl3_profile.profile_data.profile_emotes_unlocked(), 72);
         assert_eq!(bl3_profile.profile_data.room_decorations_unlocked(), 93);
-        assert_eq!(bl3_profile.profile_data.weapon_skins_unlocked(), 27);
-        assert_eq!(bl3_profile.profile_data.weapon_trinkets_unlocked(), 68);
+        assert_eq!(bl3_profile.profile_data.weapon_skins_unlocked(), 23);
+        assert_eq!(bl3_profile.profile_data.weapon_trinkets_unlocked(), 63);
     }
 
     #[test]
@@ -437,12 +437,12 @@ mod tests {
 
         assert_eq!(bl3_profile.profile_data.bank_items().len(), 2000);
         assert_eq!(bl3_profile.profile_data.lost_loot_items().len(), 0);
-        assert_eq!(bl3_profile.profile_data.character_skins_unlocked(), 212);
-        assert_eq!(bl3_profile.profile_data.character_heads_unlocked(), 144);
-        assert_eq!(bl3_profile.profile_data.echo_themes_unlocked(), 57);
+        assert_eq!(bl3_profile.profile_data.character_skins_unlocked(), 204);
+        assert_eq!(bl3_profile.profile_data.character_heads_unlocked(), 136);
+        assert_eq!(bl3_profile.profile_data.echo_themes_unlocked(), 55);
         assert_eq!(bl3_profile.profile_data.profile_emotes_unlocked(), 64);
         assert_eq!(bl3_profile.profile_data.room_decorations_unlocked(), 94);
-        assert_eq!(bl3_profile.profile_data.weapon_skins_unlocked(), 28);
-        assert_eq!(bl3_profile.profile_data.weapon_trinkets_unlocked(), 68);
+        assert_eq!(bl3_profile.profile_data.weapon_skins_unlocked(), 24);
+        assert_eq!(bl3_profile.profile_data.weapon_trinkets_unlocked(), 63);
     }
 }