Merge pull request #95 from aternosorg/latest-forge-neoforge-logs

Detect + add latest logs for Forge 1.21.3 (client+server) and NeoForge 1.21.3 (client+server)
aternosorg · Nov 5, 2024 · 7b614b3 · 7b614b3
2 parents 874a5d1 + 2b6a516
commit 7b614b3
Show file tree

Hide file tree

Showing 21 changed files with 2,969 additions and 13 deletions.
diff --git a/src/Analysis/Information/Forge/ForgeVanillaVersionInformation.php b/src/Analysis/Information/Forge/ForgeVanillaVersionInformation.php
@@ -17,9 +17,10 @@ class ForgeVanillaVersionInformation extends VanillaVersionInformation
     public static function getPatterns(): array
     {
         return array_merge(parent::getPatterns(), [
-            "/Received command line version data {0,2}: MC Version: '(". static::$vanillaVersionPattern .")'/",
-            "/--fml\.mcVersion, (". static::$vanillaVersionPattern .")/",
-            "/Forge Mod Loader version ". ForgeVersionInformation::getVersionPattern() ." for Minecraft (". static::$vanillaVersionPattern.") loading/",
+            "/Received command line version data {0,2}: MC Version: '(" . static::$vanillaVersionPattern . ")'/",
+            "/--fml\.mcVersion, (" . static::$vanillaVersionPattern . ")/",
+            "/Forge Mod Loader version " . ForgeVersionInformation::getVersionPattern() . " for Minecraft (" . static::$vanillaVersionPattern . ") loading/",
+            "/Forge mod loading, version " . ForgeVersionInformation::getVersionPattern() . ", for MC (" . static::$vanillaVersionPattern . ")/",
         ]);
     }
 }
diff --git a/src/Log/Minecraft/Vanilla/Forge/ForgeClientLog.php b/src/Log/Minecraft/Vanilla/Forge/ForgeClientLog.php
@@ -22,6 +22,9 @@ public static function getDetectors(): array
             (new MultiPatternDetector())
                 ->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: ModLauncher running: .*--fml.forgeVersion/m')
                 ->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Launching target \'(fml|forge)client\' with arguments/m'),
+            (new MultiPatternDetector())
+                ->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: ModLauncher running: .*--version, forge-/m')
+                ->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Launching target \'forge_client\' with arguments/m'),
             (new MultiPatternDetector())
                 ->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Forge Mod Loader version/m')
                 ->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Launching wrapped minecraft \{net\.minecraft\.client/m')

diff --git a/test/data/Vanilla/Forge/Arclight/arclight-1192.json b/test/data/Vanilla/Forge/Arclight/arclight-1192.json
@@ -2860,7 +2860,7 @@
         "information": [
             {
                 "message": "Minecraft version: 1.19.2",
-                "counter": 2,
+                "counter": 3,
                 "entry": {
                     "level": 6,
                     "time": null,

diff --git a/test/data/Vanilla/Forge/Mohist/mohist-1-16-5.json b/test/data/Vanilla/Forge/Mohist/mohist-1-16-5.json
@@ -418,7 +418,7 @@
         "information": [
             {
                 "message": "Minecraft version: 1.16.5",
-                "counter": 2,
+                "counter": 3,
                 "entry": {
                     "level": 6,
                     "time": null,

diff --git a/test/data/Vanilla/Forge/Mohist/mohist-1-18-2.json b/test/data/Vanilla/Forge/Mohist/mohist-1-18-2.json
@@ -2404,7 +2404,7 @@
         "information": [
             {
                 "message": "Minecraft version: 1.18.2",
-                "counter": 2,
+                "counter": 3,
                 "entry": {
                     "level": 6,
                     "time": null,