Merge remote-tracking branch 'upstream/main'

Author: s1r1m1r1

packages/flame_texturepacker/lib/src/texture_packer_atlas.dart

@@ -265,15 +265,17 @@ Future<TextureAtlasData> _parse(
     var currentPackage = package;
     var finalPath = fullPath;
 
-    // Check for package path in the full path (which may already include assetsPrefix)
+    // Check for package path in the full path
+    //(which may already include assetsPrefix)
     const packageKeyword = 'packages/';
     final packageIndex = finalPath.indexOf(packageKeyword);
     if (packageIndex != -1) {
       final subPath = finalPath.substring(packageIndex + packageKeyword.length);
       final parts = subPath.split('/');
       if (parts.length > 1) {
         currentPackage ??= parts[0];
-        // Clean the path by removing everything up to and including the package name
+        // Clean the path by removing everything up to
+        //and including the package name
         finalPath = parts.sublist(1).join('/');
       }
     }
@@ -313,10 +315,12 @@ Future<TextureAtlasData> _parse(
     while (lineQueue.isNotEmpty) {
       final line = lineQueue.first.trim();
 
-      // Check if this line looks like a texture file (has file extension)
+      // Check if this line looks like a texture file
+      // (has file extension)
       if (_isTextureFile(line)) {
         // Peek at the next line to see if it's a region or a new page.
-        // Regions are followed by properties like 'bounds:', 'rotate:', 'xy:', 'offsets:'.
+        // Regions are followed by properties
+        // like 'bounds:', 'rotate:', 'xy:', 'offsets:'.
         // Pages are followed by 'size:', 'format:', 'filter:', 'repeat:'.
         if (lineQueue.length > 1) {
           final nextLine = lineQueue.elementAt(1).trim();
@@ -522,6 +526,7 @@ Region _parseRegion(ListQueue<String> lineQueue, Page page) {
     try {
       extractedIndex = int.parse(indexMatch.group(1)!);
       name = name.substring(0, indexMatch.start);
+      // ignore: avoid_catches_without_on_clauses
     } catch (_) {
       // Ignore parsing errors for very large numbers
     }

packages/flame_texturepacker/pubspec.yaml

@@ -18,7 +18,7 @@ environment:
 dependencies:
   collection: ^1.17.1
   cross_file: ^0.3.4+2
-  flame: ^1.35.0
+  flame: ^1.36.0
   flutter:
     sdk: flutter
 

packages/flame_texturepacker/test/atlas_path_resolution_test.dart

@@ -157,7 +157,7 @@ sprite1
       'should correctly parse region names with .png and extracted indexes',
       () async {
         final assets = AssetsCache(bundle: bundle);
-        final complexAtlasContent = '''
+        const complexAtlasContent = '''
 knight.png
 size: 64, 64
 filter: Nearest, Nearest