diff --git a/src/Log/Minecraft/PrismLauncher/PrismLauncherLog.php b/src/Log/Minecraft/PrismLauncher/PrismLauncherLog.php index 60dafb74..7bdd7035 100644 --- a/src/Log/Minecraft/PrismLauncher/PrismLauncherLog.php +++ b/src/Log/Minecraft/PrismLauncher/PrismLauncherLog.php @@ -21,7 +21,7 @@ public static function getDefaultParser(): Parser */ public static function getDetectors(): array { - return [(new SinglePatternDetector())->setPattern("/^Prism Launcher version: [\d\.]+$/m")]; + return [(new SinglePatternDetector())->setPattern("/^Prism Launcher version: [\d\.]+/m")]; } /** diff --git a/test/data/PrismLauncher/prismlauncher-official.json b/test/data/PrismLauncher/prismlauncher-official.json new file mode 100644 index 00000000..c66e0127 --- /dev/null +++ b/test/data/PrismLauncher/prismlauncher-official.json @@ -0,0 +1,552 @@ +{ + "id": "prism-launcher\/client", + "name": "Prism Launcher", + "type": "Client Log", + "version": null, + "title": "Prism Launcher Client Log", + "entries": [ + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 1, + "content": "Prism Launcher version: 10.0.5 (official)" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 2, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 3, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 4, + "content": "Launched instance in online mode" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 5, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 6, + "content": "session.minecraft.net resolves to:" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 7, + "content": " [127.0.0.1]" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 8, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 9, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 10, + "content": "Minecraft folder is:" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 11, + "content": "\/home\/user\/.local\/share\/PrismLauncher\/instances\/test\/.minecraft" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 12, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 13, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 14, + "content": "Java path is:" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 15, + "content": "\/usr\/lib\/jvm\/java-21\/bin\/java" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 16, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 17, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 18, + "content": "Checking Java version..." + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 19, + "content": "Java is version 21.0.1, using 64 (amd64) architecture, from N\/A." + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 20, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 21, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 22, + "content": "Main Class:" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 23, + "content": " net.minecraft.client.main.Main" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 24, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 25, + "content": "Native path:" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 26, + "content": " \/home\/user\/.local\/share\/PrismLauncher\/instances\/test\/natives" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 27, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 28, + "content": "Traits:" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 29, + "content": "traits FirstThreadOnMacOS" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 30, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 31, + "content": "Libraries:" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 32, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 33, + "content": "Native libraries:" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 34, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 35, + "content": "Params:" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 36, + "content": " --username user --version 1.21" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 37, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 38, + "content": "Window size: 854 x 480" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 39, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 40, + "content": "Java Arguments:" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 41, + "content": "[-Xms512m, -Xmx2048m]" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 42, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 43, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 44, + "content": "Minecraft process ID: 12345" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 45, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 46, + "content": "..." + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 47, + "content": "" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 48, + "content": "Process exited with code 0." + } + ] + }, + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 49, + "content": "" + } + ] + } + ], + "analysis": { + "problems": [], + "information": [] + } +} \ No newline at end of file diff --git a/test/data/PrismLauncher/prismlauncher-official.log b/test/data/PrismLauncher/prismlauncher-official.log new file mode 100644 index 00000000..b327f87f --- /dev/null +++ b/test/data/PrismLauncher/prismlauncher-official.log @@ -0,0 +1,48 @@ +Prism Launcher version: 10.0.5 (official) + + +Launched instance in online mode + +session.minecraft.net resolves to: + [127.0.0.1] + + +Minecraft folder is: +/home/user/.local/share/PrismLauncher/instances/test/.minecraft + + +Java path is: +/usr/lib/jvm/java-21/bin/java + + +Checking Java version... +Java is version 21.0.1, using 64 (amd64) architecture, from N/A. + + +Main Class: + net.minecraft.client.main.Main + +Native path: + /home/user/.local/share/PrismLauncher/instances/test/natives + +Traits: +traits FirstThreadOnMacOS + +Libraries: + +Native libraries: + +Params: + --username user --version 1.21 + +Window size: 854 x 480 + +Java Arguments: +[-Xms512m, -Xmx2048m] + + +Minecraft process ID: 12345 + +... + +Process exited with code 0. diff --git a/test/tests/Logs/AutoLogsTest.php b/test/tests/Logs/AutoLogsTest.php index 62a29d1c..db45280b 100644 --- a/test/tests/Logs/AutoLogsTest.php +++ b/test/tests/Logs/AutoLogsTest.php @@ -254,6 +254,16 @@ public function test_pocketmine_start_362(): void $this->assertStringEqualsFile($log->getExpectedPath(), $log->getOutput(), $log->getLogPath()); } + /** + * @return void + * @throws Exception + */ + public function test_prismlauncher_official(): void + { + $log = new TestLog('PrismLauncher/prismlauncher-official.log'); + $this->assertStringEqualsFile($log->getExpectedPath(), $log->getOutput(), $log->getLogPath()); + } + /** * @return void * @throws Exception