Merge pull request #38 from aternosorg/magma-1-16

Detect magma 1.16.5
aternosorg · Oct 28, 2022 · b5ffdf6 · b5ffdf6
2 parents 899cf92 + f1e5815
commit b5ffdf6
Show file tree

Hide file tree

Showing 5 changed files with 2,213 additions and 4 deletions.
diff --git a/src/Analysis/Information/Magma/MagmaVersionInformation.php b/src/Analysis/Information/Magma/MagmaVersionInformation.php
@@ -28,6 +28,6 @@ public function __construct()
      */
     public static function getPatterns(): array
     {
-        return ['/This server is running Magma version ([0-9a-f]+)/'];
+        return ['/This server is running Magma version (?:git-Magma-[0-9\.a-zA-Z]+-)?([0-9a-f]+)/'];
     }
 }
diff --git a/src/Log/Minecraft/Vanilla/Forge/Magma/MagmaLog.php b/src/Log/Minecraft/Vanilla/Forge/Magma/MagmaLog.php
@@ -14,15 +14,13 @@
  */
 abstract class MagmaLog extends ForgeLog
 {
-    protected static string $prefixPattern = '(\[(?:[0-9]{2}\:?){3}\] \[[^\/]+\/(\w+)\](?: \[[^\]]+\])?\:) ';
-
     /**
      * @return DetectorInterface[]
      */
     public static function getDetectors(): array
     {
         return [
-            (new SinglePatternDetector())->setPattern('/' . static::$prefixPattern . 'This server is running Magma version/')
+            (new SinglePatternDetector())->setPattern('/This server is running Magma version/')
         ];
     }