Merge pull request #94 from aternosorg/neoforge-crash-report-version

Detect more crash reports from NeoForge + detect version in crash reports from NeoForge
aternosorg · Nov 6, 2024 · f85d637 · f85d637
2 parents 7b614b3 + 28d0e38
commit f85d637
Show file tree

Hide file tree

Showing 7 changed files with 942 additions and 11 deletions.
diff --git a/src/Analysis/Information/NeoForge/NeoForgeVersionInformation.php b/src/Analysis/Information/NeoForge/NeoForgeVersionInformation.php
@@ -16,9 +16,10 @@ public function __construct()
     public static function getPatterns(): array
     {
         return [
-            '/NeoForge mod loading, version ('. static::$versionPattern .'),/',
-            '/--fml\.neoForgeVersion, ('. static::$versionPattern .')/',
-            '/\tNeoForge: net.neoforged:('. static::$versionPattern .')/',
+            '/NeoForge mod loading, version (' . static::$versionPattern . '),/',
+            '/--fml\.neoForgeVersion, (' . static::$versionPattern . ')/',
+            '/\tNeoForge: net.neoforged:(' . static::$versionPattern . ')/',
+            '/^\t\t\S*\s*\|\S*\s*\|neoforge\s*\|(' . static::$versionPattern . ')\s*\|/'
         ];
     }
 

diff --git a/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeCrashReportLog.php b/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeCrashReportLog.php
@@ -22,6 +22,9 @@ public static function getDetectors(): array
             (new MultiPatternDetector())
                 ->addPattern("/^---- Minecraft Crash Report ----$/m")
                 ->addPattern("/^\tNeoForge: net\.neoforged:/m"),
+            (new MultiPatternDetector())
+                ->addPattern("/^---- Minecraft Crash Report ----$/m")
+                ->addPattern("/^\t\t[^|]*\|[^|]*\|\s*neoforge\s*\|/m"),
         ];
     }
 

diff --git a/test/data/Vanilla/NeoForge/neoforge-1-20-4-client-report.json b/test/data/Vanilla/NeoForge/neoforge-1-20-4-client-report.json
@@ -2124,15 +2124,15 @@
             },
             {
                 "message": "NeoForge version: 20.4.155-beta",
-                "counter": 1,
+                "counter": 2,
                 "entry": {
                     "level": 6,
                     "time": null,
-                    "prefix": "\tNeoForge:",
+                    "prefix": null,
                     "lines": [
                         {
-                            "number": 189,
-                            "content": "\tNeoForge: net.neoforged:20.4.155-beta"
+                            "number": 186,
+                            "content": "\t\tneoforge-20.4.155-beta-universal.jar              |NeoForge                      |neoforge                      |20.4.155-beta       |DONE      |Manifest: NOSIGNATURE"
                         }
                     ]
                 },

diff --git a/test/data/Vanilla/NeoForge/neoforge-1-20-4-server-report.json b/test/data/Vanilla/NeoForge/neoforge-1-20-4-server-report.json
@@ -1354,15 +1354,15 @@
             },
             {
                 "message": "NeoForge version: 20.4.155-beta",
-                "counter": 1,
+                "counter": 2,
                 "entry": {
                     "level": 6,
                     "time": null,
-                    "prefix": "\tNeoForge:",
+                    "prefix": null,
                     "lines": [
                         {
-                            "number": 119,
-                            "content": "\tNeoForge: net.neoforged:20.4.155-beta"
+                            "number": 116,
+                            "content": "\t\tneoforge-20.4.155-beta-universal.jar              |NeoForge                      |neoforge                      |20.4.155-beta       |DONE      |Manifest: NOSIGNATURE"
                         }
                     ]
                 },