Merge pull request #73 from aternosorg/inline-crash-reports

Detect various crash reports even if there's another character before it in the first line
aternosorg · Jun 14, 2024 · a489238 · a489238
2 parents 3d6e327 + c0684e1
commit a489238
Show file tree

Hide file tree

Showing 11 changed files with 4,621 additions and 10 deletions.
diff --git a/src/Log/Minecraft/Vanilla/Bukkit/Folia/FoliaCrashReport.php b/src/Log/Minecraft/Vanilla/Bukkit/Folia/FoliaCrashReport.php
@@ -21,6 +21,6 @@ class FoliaCrashReport extends FoliaLog implements CrashReportLogTypeInterface
      */
     public static function getDetectors(): array
     {
-        return [(new SinglePatternDetector())->setPattern("/^---- Minecraft Crash Report ----(\n.*)*\n\s+Running: Folia version git-Folia/m")];
+        return [(new SinglePatternDetector())->setPattern("/---- Minecraft Crash Report ----(\n.*)*\n\s+Running: Folia version git-Folia/m")];
     }
 }
diff --git a/src/Log/Minecraft/Vanilla/Bukkit/Paper/PaperCrashReportLog.php b/src/Log/Minecraft/Vanilla/Bukkit/Paper/PaperCrashReportLog.php
@@ -21,6 +21,6 @@ class PaperCrashReportLog extends PaperLog implements CrashReportLogTypeInterfac
      */
     public static function getDetectors(): array
     {
-        return [(new SinglePatternDetector())->setPattern("/^---- Minecraft Crash Report ----(\n.*)*\n\s+Running: Paper version git-Paper/m")];
+        return [(new SinglePatternDetector())->setPattern("/---- Minecraft Crash Report ----(\n.*)*\n\s+Running: Paper version git-Paper/m")];
     }
 }
diff --git a/src/Log/Minecraft/Vanilla/Bukkit/Purpur/PurpurCrashReportLog.php b/src/Log/Minecraft/Vanilla/Bukkit/Purpur/PurpurCrashReportLog.php
@@ -21,6 +21,6 @@ class PurpurCrashReportLog extends PurpurLog implements CrashReportLogTypeInterf
      */
     public static function getDetectors(): array
     {
-        return [(new SinglePatternDetector())->setPattern("/^---- Minecraft Crash Report ----(\n.*)*\n\s+Running: Purpur version git-Purpur/m")];
+        return [(new SinglePatternDetector())->setPattern("/---- Minecraft Crash Report ----(\n.*)*\n\s+Running: Purpur version git-Purpur/m")];
     }
 }
diff --git a/src/Log/Minecraft/Vanilla/Fabric/FabricCrashReportLog.php b/src/Log/Minecraft/Vanilla/Fabric/FabricCrashReportLog.php
@@ -24,8 +24,8 @@ class FabricCrashReportLog extends FabricLog implements CrashReportLogTypeInterf
     public static function getDetectors(): array
     {
         return [
-            (new SinglePatternDetector())->setPattern("/^---- Minecraft Crash Report ----(\n.*)*\n\t(?:Known )?server brands?: fabric/im"),
-            (new SinglePatternDetector())->setPattern("/^---- Minecraft Crash Report ----(\n.*)*\n\tIs Modded: Definitely; Client brand changed to 'fabric'/im"),
+            (new SinglePatternDetector())->setPattern("/---- Minecraft Crash Report ----(\n.*)*\n\t(?:Known )?server brands?: fabric/im"),
+            (new SinglePatternDetector())->setPattern("/---- Minecraft Crash Report ----(\n.*)*\n\tIs Modded: Definitely; Client brand changed to 'fabric'/im"),
         ];
     }
 

diff --git a/src/Log/Minecraft/Vanilla/Forge/Arclight/ArclightCrashReportLog.php b/src/Log/Minecraft/Vanilla/Forge/Arclight/ArclightCrashReportLog.php
@@ -21,6 +21,6 @@ class ArclightCrashReportLog extends ArclightLog implements CrashReportLogTypeIn
      */
     public static function getDetectors(): array
     {
-        return [(new SinglePatternDetector())->setPattern("/^---- Minecraft Crash Report ----(\n.*)*\n\tKnown server brands:( [a-zA-Z])* arclight/m")];
+        return [(new SinglePatternDetector())->setPattern("/---- Minecraft Crash Report ----(\n.*)*\n\tKnown server brands:( [a-zA-Z])* arclight/m")];
     }
 }
diff --git a/src/Log/Minecraft/Vanilla/Forge/ForgeCrashReportLog.php b/src/Log/Minecraft/Vanilla/Forge/ForgeCrashReportLog.php
@@ -23,7 +23,7 @@ class ForgeCrashReportLog extends ForgeLog implements CrashReportLogTypeInterfac
      */
     public static function getDetectors(): array
     {
-        return [(new SinglePatternDetector())->setPattern("/^---- Minecraft Crash Report ----(\n.*)*\n\tFML:/m")];
+        return [(new SinglePatternDetector())->setPattern("/---- Minecraft Crash Report ----(\n.*)*\n\tFML:/m")];
     }
 
 

diff --git a/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeCrashReportLog.php b/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeCrashReportLog.php
@@ -18,7 +18,7 @@ class NeoForgeCrashReportLog extends NeoForgeLog implements CrashReportLogTypeIn
      */
     public static function getDetectors(): array
     {
-        return [(new SinglePatternDetector())->setPattern("/^---- Minecraft Crash Report ----(\n.*)*\n\tNeoForge:/m")];
+        return [(new SinglePatternDetector())->setPattern("/---- Minecraft Crash Report ----(\n.*)*\n\tNeoForge:/m")];
     }
 
 

diff --git a/src/Log/Minecraft/Vanilla/Quilt/QuiltCrashReportLog.php b/src/Log/Minecraft/Vanilla/Quilt/QuiltCrashReportLog.php
@@ -20,8 +20,8 @@ class QuiltCrashReportLog extends QuiltLog implements CrashReportLogTypeInterfac
     public static function getDetectors(): array
     {
         return [
-            (new SinglePatternDetector())->setPattern("/^---- Minecraft Crash Report ----(\n.*)*\n\t(?:Known )?server brands?: quilt/im"),
-            (new SinglePatternDetector())->setPattern("/^---- Minecraft Crash Report ----(\n.*)*\n\tIs Modded: Definitely; Client brand changed to 'quilt'/im"),
+            (new SinglePatternDetector())->setPattern("/---- Minecraft Crash Report ----(\n.*)*\n\t(?:Known )?server brands?: quilt/im"),
+            (new SinglePatternDetector())->setPattern("/---- Minecraft Crash Report ----(\n.*)*\n\tIs Modded: Definitely; Client brand changed to 'quilt'/im"),
         ];
     }
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public static function getDetectors(): array
         {
-            return [(new SinglePatternDetector())->setPattern("/^---- Minecraft Crash Report ----(\n.*)*\n\tFML:/m")];
+            return [(new SinglePatternDetector())->setPattern("/---- Minecraft Crash Report ----(\n.*)*\n\tFML:/m")];
         }
@@ Expand Down @@