Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Detect + add latest logs for Forge 1.21.3 (client+server) and NeoForge 1.21.3 (client+server) #95

Merged
merged 2 commits into from
Nov 5, 2024
Merged

Detect + add latest logs for Forge 1.21.3 (client+server) and NeoForge 1.21.3 (client+server) #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71dfde4
Add latest logs for Forge 1.21.3 client+server, NeoForge 1.21.3 clien…
pavog Oct 29, 2024
2b6a516
Add new MultiPatternDetector for ForgeClientLog for 1.21.3 + add new …
pavog Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/Analysis/Information/Forge/ForgeVanillaVersionInformation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 . ")/",
]);
}
}
3 changes: 3 additions & 0 deletions src/Log/Minecraft/Vanilla/Forge/ForgeClientLog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion test/data/Vanilla/Forge/Arclight/arclight-1192.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2860,7 +2860,7 @@
"information": [
{
"message": "Minecraft version: 1.19.2",
"counter": 2,
"counter": 3,
"entry": {
"level": 6,
"time": null,
Expand Down
2 changes: 1 addition & 1 deletion test/data/Vanilla/Forge/Mohist/mohist-1-16-5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@
"information": [
{
"message": "Minecraft version: 1.16.5",
"counter": 2,
"counter": 3,
"entry": {
"level": 6,
"time": null,
Expand Down
2 changes: 1 addition & 1 deletion test/data/Vanilla/Forge/Mohist/mohist-1-18-2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2404,7 +2404,7 @@
"information": [
{
"message": "Minecraft version: 1.18.2",
"counter": 2,
"counter": 3,
"entry": {
"level": 6,
"time": null,
Expand Down
Loading
Loading