Skip to content

Commit 2b6a516

Browse files
pavogpavog
committed
Add new MultiPatternDetector for ForgeClientLog for 1.21.3 + add new pattern for ForgeVanillaVersionInformation for 1.21.3
1 parent 71dfde4 commit 2b6a516

14 files changed

+87
-31
lines changed

‎src/Analysis/Information/Forge/ForgeVanillaVersionInformation.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ class ForgeVanillaVersionInformation extends VanillaVersionInformation
1717
public static function getPatterns(): array
1818
{
1919
return array_merge(parent::getPatterns(), [
20-
"/Received command line version data {0,2}: MC Version: '(". static::$vanillaVersionPattern .")'/",
21-
"/--fml\.mcVersion, (". static::$vanillaVersionPattern .")/",
22-
"/Forge Mod Loader version ". ForgeVersionInformation::getVersionPattern() ." for Minecraft (". static::$vanillaVersionPattern.") loading/",
20+
"/Received command line version data {0,2}: MC Version: '(" . static::$vanillaVersionPattern . ")'/",
21+
"/--fml\.mcVersion, (" . static::$vanillaVersionPattern . ")/",
22+
"/Forge Mod Loader version " . ForgeVersionInformation::getVersionPattern() . " for Minecraft (" . static::$vanillaVersionPattern . ") loading/",
23+
"/Forge mod loading, version " . ForgeVersionInformation::getVersionPattern() . ", for MC (" . static::$vanillaVersionPattern . ")/",
2324
]);
2425
}
2526
}

‎src/Log/Minecraft/Vanilla/Forge/ForgeClientLog.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ public static function getDetectors(): array
2222
(new MultiPatternDetector())
2323
->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: ModLauncher running: .*--fml.forgeVersion/m')
2424
->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Launching target \'(fml|forge)client\' with arguments/m'),
25+
(new MultiPatternDetector())
26+
->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: ModLauncher running: .*--version, forge-/m')
27+
->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Launching target \'forge_client\' with arguments/m'),
2528
(new MultiPatternDetector())
2629
->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Forge Mod Loader version/m')
2730
->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Launching wrapped minecraft \{net\.minecraft\.client/m')

‎test/data/Vanilla/Forge/Arclight/arclight-1192.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2860,7 +2860,7 @@
28602860
"information": [
28612861
{
28622862
"message": "Minecraft version: 1.19.2",
2863-
"counter": 2,
2863+
"counter": 3,
28642864
"entry": {
28652865
"level": 6,
28662866
"time": null,

‎test/data/Vanilla/Forge/Mohist/mohist-1-16-5.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@
418418
"information": [
419419
{
420420
"message": "Minecraft version: 1.16.5",
421-
"counter": 2,
421+
"counter": 3,
422422
"entry": {
423423
"level": 6,
424424
"time": null,

‎test/data/Vanilla/Forge/Mohist/mohist-1-18-2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2404,7 +2404,7 @@
24042404
"information": [
24052405
{
24062406
"message": "Minecraft version: 1.18.2",
2407-
"counter": 2,
2407+
"counter": 3,
24082408
"entry": {
24092409
"level": 6,
24102410
"time": null,

‎test/data/Vanilla/Forge/forge-1-21-3-client.json‎

Lines changed: 57 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"id": "vanilla\/client",
3-
"name": "Vanilla",
2+
"id": "forge\/client",
3+
"name": "Forge",
44
"type": "Client Log",
5-
"version": null,
6-
"title": "Vanilla Client Log",
5+
"version": "1.21.3",
6+
"title": "Forge 1.21.3 Client Log",
77
"entries": [
88
{
99
"level": 6,
@@ -723,6 +723,58 @@
723723
],
724724
"analysis": {
725725
"problems": [],
726-
"information": []
726+
"information": [
727+
{
728+
"message": "Java version: 21.0.3",
729+
"counter": 1,
730+
"entry": {
731+
"level": 6,
732+
"time": null,
733+
"prefix": "[16:56:56] [main\/INFO]:",
734+
"lines": [
735+
{
736+
"number": 3,
737+
"content": "[16:56:56] [main\/INFO]: ModLauncher 10.2.2 starting: java version 21.0.3 by Microsoft; OS Linux arch amd64 version 5.15.167-1-MANJARO"
738+
}
739+
]
740+
},
741+
"label": "Java version",
742+
"value": "21.0.3"
743+
},
744+
{
745+
"message": "Minecraft version: 1.21.3",
746+
"counter": 1,
747+
"entry": {
748+
"level": 6,
749+
"time": null,
750+
"prefix": "[16:57:03] [modloading-worker-0\/INFO]:",
751+
"lines": [
752+
{
753+
"number": 37,
754+
"content": "[16:57:03] [modloading-worker-0\/INFO]: Forge mod loading, version 53.0.7, for MC 1.21.3 with MCP 20241025.112443"
755+
}
756+
]
757+
},
758+
"label": "Minecraft version",
759+
"value": "1.21.3"
760+
},
761+
{
762+
"message": "Forge version: 53.0.7",
763+
"counter": 1,
764+
"entry": {
765+
"level": 6,
766+
"time": null,
767+
"prefix": "[16:57:03] [modloading-worker-0\/INFO]:",
768+
"lines": [
769+
{
770+
"number": 38,
771+
"content": "[16:57:03] [modloading-worker-0\/INFO]: MinecraftForge v53.0.7 Initialized"
772+
}
773+
]
774+
},
775+
"label": "Forge version",
776+
"value": "53.0.7"
777+
}
778+
]
727779
}
728780
}

‎test/data/Vanilla/Forge/forge-1-21-3-server.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -621,38 +621,38 @@
621621
"value": "21.0.4"
622622
},
623623
{
624-
"message": "Forge version: 53.0.7",
625-
"counter": 1,
624+
"message": "Minecraft version: 1.21.3",
625+
"counter": 2,
626626
"entry": {
627627
"level": 6,
628628
"time": null,
629-
"prefix": "[29Oct2024 17:00:31.096] [modloading-worker-0\/INFO] [net.minecraftforge.common.MinecraftForge\/FORGE]:",
629+
"prefix": "[29Oct2024 17:00:31.096] [modloading-worker-0\/INFO] [net.minecraftforge.common.ForgeMod\/FORGEMOD]:",
630630
"lines": [
631631
{
632-
"number": 11,
633-
"content": "[29Oct2024 17:00:31.096] [modloading-worker-0\/INFO] [net.minecraftforge.common.MinecraftForge\/FORGE]: MinecraftForge v53.0.7 Initialized"
632+
"number": 10,
633+
"content": "[29Oct2024 17:00:31.096] [modloading-worker-0\/INFO] [net.minecraftforge.common.ForgeMod\/FORGEMOD]: Forge mod loading, version 53.0.7, for MC 1.21.3 with MCP 20241025.112443"
634634
}
635635
]
636636
},
637-
"label": "Forge version",
638-
"value": "53.0.7"
637+
"label": "Minecraft version",
638+
"value": "1.21.3"
639639
},
640640
{
641-
"message": "Minecraft version: 1.21.3",
641+
"message": "Forge version: 53.0.7",
642642
"counter": 1,
643643
"entry": {
644644
"level": 6,
645645
"time": null,
646-
"prefix": "[29Oct2024 17:00:34.158] [Server thread\/INFO] [net.minecraft.server.dedicated.DedicatedServer\/]:",
646+
"prefix": "[29Oct2024 17:00:31.096] [modloading-worker-0\/INFO] [net.minecraftforge.common.MinecraftForge\/FORGE]:",
647647
"lines": [
648648
{
649-
"number": 19,
650-
"content": "[29Oct2024 17:00:34.158] [Server thread\/INFO] [net.minecraft.server.dedicated.DedicatedServer\/]: Starting minecraft server version 1.21.3"
649+
"number": 11,
650+
"content": "[29Oct2024 17:00:31.096] [modloading-worker-0\/INFO] [net.minecraftforge.common.MinecraftForge\/FORGE]: MinecraftForge v53.0.7 Initialized"
651651
}
652652
]
653653
},
654-
"label": "Minecraft version",
655-
"value": "1.21.3"
654+
"label": "Forge version",
655+
"value": "53.0.7"
656656
}
657657
]
658658
}

‎test/data/Vanilla/Forge/forge-client-1-16-5.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@
646646
"information": [
647647
{
648648
"message": "Minecraft version: 1.16.5",
649-
"counter": 1,
649+
"counter": 2,
650650
"entry": {
651651
"level": 6,
652652
"time": null,

‎test/data/Vanilla/Forge/forge-client-1-19-2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@
572572
"information": [
573573
{
574574
"message": "Minecraft version: 1.19.2",
575-
"counter": 1,
575+
"counter": 2,
576576
"entry": {
577577
"level": 6,
578578
"time": null,

‎test/data/Vanilla/Forge/forge-loading-stage-error.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3317,7 +3317,7 @@
33173317
"information": [
33183318
{
33193319
"message": "Minecraft version: 1.16.5",
3320-
"counter": 2,
3320+
"counter": 3,
33213321
"entry": {
33223322
"level": 6,
33233323
"time": null,

0 commit comments

Comments
 (0)