better crash report software detection

aternosorg · Jun 18, 2024 · 61517e0 · 61517e0
1 parent 48b0432
commit 61517e0
Show file tree

Hide file tree

Showing 7 changed files with 1,971 additions and 2 deletions.
diff --git a/src/Log/Minecraft/Vanilla/Fabric/FabricCrashReportLog.php b/src/Log/Minecraft/Vanilla/Fabric/FabricCrashReportLog.php
@@ -26,6 +26,7 @@ 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\tIs Modded: Definitely; Server 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,9 @@ 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"),
+            (new SinglePatternDetector())->setPattern("/---- Minecraft Crash Report ----(\n.*)*\n\tIs Modded: Definitely; Server brand changed to 'arclight'/im")
+        ];
     }
 }
diff --git a/src/Log/Minecraft/Vanilla/Forge/ForgeCrashReportLog.php b/src/Log/Minecraft/Vanilla/Forge/ForgeCrashReportLog.php
@@ -23,7 +23,12 @@ 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"),
+            (new SinglePatternDetector())->setPattern("/---- Minecraft Crash Report ----(\n.*)*\n\tIs Modded: Definitely; Client brand changed to '(?:fml,)?forge'/im"),
+            (new SinglePatternDetector())->setPattern("/---- Minecraft Crash Report ----(\n.*)*\n\tIs Modded: Definitely; Server brand changed to '(?:fml,)?forge'/im"),
+
+        ];
     }
 
 

diff --git a/src/Log/Minecraft/Vanilla/Quilt/QuiltCrashReportLog.php b/src/Log/Minecraft/Vanilla/Quilt/QuiltCrashReportLog.php
@@ -21,6 +21,7 @@ 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\tIs Modded: Definitely; Server brand changed to 'quilt'/im")
         ];
     }