diff --git a/src/Log/Minecraft/Vanilla/Forge/ForgeClientLog.php b/src/Log/Minecraft/Vanilla/Forge/ForgeClientLog.php index 585da94d..d7cd51a8 100644 --- a/src/Log/Minecraft/Vanilla/Forge/ForgeClientLog.php +++ b/src/Log/Minecraft/Vanilla/Forge/ForgeClientLog.php @@ -3,6 +3,7 @@ namespace Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\Forge; use Aternos\Codex\Detective\MultiPatternDetector; +use Aternos\Codex\Detective\SinglePatternDetector; use Aternos\Codex\Minecraft\Analysis\Information\Vanilla\VanillaVersionInformation; use Aternos\Codex\Minecraft\Log\Type\ClientLogTypeInterface; @@ -15,14 +16,18 @@ public static function getDetectors(): array { return [ (new MultiPatternDetector()) - ->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: ModLauncher running: .*--fml\.forgeVersion/m') - ->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Launching target \'(fml|forge)client\' with arguments/m'), + ->addPattern('/' . static::MAIN_INFO_PREFIX . 'ModLauncher running: .*--fml\.forgeVersion/m') + ->addPattern('/' . static::MAIN_INFO_PREFIX . 'Launching target \'(fml|forge)client\' with arguments/m'), (new MultiPatternDetector()) - ->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: ModLauncher running: .*--version, (?:' . VanillaVersionInformation::getVersionPattern() . '-)?forge-/m') - ->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Launching target \'forge_client\' with arguments/m'), + ->addPattern('/' . static::MAIN_INFO_PREFIX . 'ModLauncher running: .*--version, (?:' . VanillaVersionInformation::getVersionPattern() . '-)?forge-/m') + ->addPattern('/' . static::MAIN_INFO_PREFIX . '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') + ->addPattern('/' . static::MAIN_INFO_PREFIX . 'Forge Mod Loader version/m') + ->addPattern('/' . static::MAIN_INFO_PREFIX . 'Launching wrapped minecraft \{net\.minecraft\.client/m'), + // The Modrinth App only starts clients and passes the plain Minecraft version without "forge-": + // [23:18:07] [main] [cpw.mods.modlauncher.LaunchServiceHandler/INFO]: Launching target 'forge_client' with arguments [--version, 26.3, ... + (new SinglePatternDetector()) + ->setPattern('/^\[[^\]]+\] \[main\] \[[^\]\/]+\/INFO\]: Launching target \'forge_client\' with arguments/m') ]; } } diff --git a/src/Log/Minecraft/Vanilla/Forge/ForgeLog.php b/src/Log/Minecraft/Vanilla/Forge/ForgeLog.php index 8a9531ad..393a3921 100644 --- a/src/Log/Minecraft/Vanilla/Forge/ForgeLog.php +++ b/src/Log/Minecraft/Vanilla/Forge/ForgeLog.php @@ -13,7 +13,22 @@ abstract class ForgeLog extends VanillaLog { - protected static string $pattern = '/^(\[(?:\S+ )?(?:[0-9]{2}:?){3}(?:\.[0-9]+)?\] \[[^\]]+\/(\w+)\](?: \[([^\]]+)\])?:).*$/'; + /** + * Start of an INFO line from the main thread, used by the Forge and NeoForge detectors. + * Usually the level is in the thread bracket, in newer versions followed by the logger: + * [12:00:00] [main/INFO]: + * [12:00:00] [main/INFO] [cpw.mods.modlauncher.Launcher/]: + * The Modrinth App writes the thread and the logger in separate brackets, with the level after the logger: + * [18:43:19] [main] [cpw.mods.modlauncher.Launcher/INFO]: + */ + public const string MAIN_INFO_PREFIX = '^\[[^\]]+\] \[main(?:\/INFO\](?: \[[^\]]+\])?|\] \[[^\]]+\/INFO\]): '; + + /** + * Matches the start of an entry, the optional bracket without a slash is the thread written by the Modrinth App: + * [12:00:00] [main/INFO] [cpw.mods.modlauncher.Launcher/]: + * [18:43:19] [main] [cpw.mods.modlauncher.Launcher/INFO]: + */ + protected static string $pattern = '/^(\[(?:\S+ )?(?:[0-9]{2}:?){3}(?:\.[0-9]+)?\] (?:\[[^\]\/]+\] )?\[[^\]]+\/(\w+)\](?: \[([^\]]+)\])?:).*$/'; /** * @inheritDoc diff --git a/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeClientLog.php b/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeClientLog.php index 109a02bd..bd2d7504 100644 --- a/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeClientLog.php +++ b/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeClientLog.php @@ -4,6 +4,7 @@ use Aternos\Codex\Detective\MultiPatternDetector; use Aternos\Codex\Detective\SinglePatternDetector; +use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\Forge\ForgeLog; use Aternos\Codex\Minecraft\Log\Type\ClientLogTypeInterface; class NeoForgeClientLog extends NeoForgeLog implements ClientLogTypeInterface @@ -15,9 +16,9 @@ public static function getDetectors(): array { return [ new MultiPatternDetector() - ->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: ModLauncher running: .*--fml\.neoForgeVersion/m') - ->addPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Launching target \'(fml|forge)client\' with arguments/m'), - new SinglePatternDetector()->setPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Starting FancyModLoader version [0-9.]+ \(CLIENT/m'), + ->addPattern('/' . ForgeLog::MAIN_INFO_PREFIX . 'ModLauncher running: .*--fml\.neoForgeVersion/m') + ->addPattern('/' . ForgeLog::MAIN_INFO_PREFIX . 'Launching target \'(fml|forge)client\' with arguments/m'), + new SinglePatternDetector()->setPattern('/' . ForgeLog::MAIN_INFO_PREFIX . 'Starting FancyModLoader version [0-9.]+ \(CLIENT/m'), ]; } } diff --git a/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeLog.php b/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeLog.php index 7a66e8fd..b1ac1879 100644 --- a/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeLog.php +++ b/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeLog.php @@ -5,6 +5,7 @@ use Aternos\Codex\Analyser\AnalyserInterface; use Aternos\Codex\Detective\SinglePatternDetector; use Aternos\Codex\Minecraft\Analyser\NeoForgeAnalyser; +use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\Forge\ForgeLog; use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\VanillaLog; use Aternos\Codex\Minecraft\Parser\ForgeParser; use Aternos\Codex\Minecraft\Parser\Parser; @@ -13,7 +14,10 @@ abstract class NeoForgeLog extends VanillaLog { - protected static string $pattern = '/^(\[(?:\S+ )?(?:[0-9]{2}:?){3}(?:\.[0-9]+)?\] \[[^\]]+\/(\w+)\](?: \[([^\]]+)\])?:).*$/'; + /** + * Same entry format as Forge, see ForgeLog::$pattern. + */ + protected static string $pattern = '/^(\[(?:\S+ )?(?:[0-9]{2}:?){3}(?:\.[0-9]+)?\] (?:\[[^\]\/]+\] )?\[[^\]]+\/(\w+)\](?: \[([^\]]+)\])?:).*$/'; /** * @inheritDoc @@ -22,7 +26,7 @@ public static function getDetectors(): array { return array_merge(parent::getDetectors(), [ (new SinglePatternDetector())->setPattern('/NeoForge mod loading/'), - (new SinglePatternDetector())->setPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: ModLauncher running: .*--fml\.neoForgeVersion/m') + (new SinglePatternDetector())->setPattern('/' . ForgeLog::MAIN_INFO_PREFIX . 'ModLauncher running: .*--fml\.neoForgeVersion/m') ]); } diff --git a/test/data/Vanilla/Forge/forge-client-modrinth-app.json b/test/data/Vanilla/Forge/forge-client-modrinth-app.json new file mode 100644 index 00000000..b949d8a1 --- /dev/null +++ b/test/data/Vanilla/Forge/forge-client-modrinth-app.json @@ -0,0 +1,254 @@ +{ + "id": "forge\/client", + "name": "Forge", + "type": "Client Log", + "version": "26.3", + "title": "Forge 26.3 Client Log", + "entries": [ + { + "level": 6, + "time": null, + "prefix": null, + "lines": [ + { + "number": 1, + "content": "Ignoring duplicate module on SecureModuleFinder: jtracy: Jar[jar:file:\/\/\/Users\/********\/Library\/Application%20Support\/ModrinthApp\/meta\/libraries\/com\/mojang\/jtracy\/1.14.38\/jtracy-1.14.38-natives-macos.jar!\/]" + }, + { + "number": 2, + "content": "Ignoring duplicate module on SecureModuleFinder: jtracy: Jar[jar:file:\/\/\/Users\/********\/Library\/Application%20Support\/ModrinthApp\/meta\/libraries\/com\/mojang\/jtracy\/1.14.38\/jtracy-1.14.38-natives-macos-arm64.jar!\/]" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:18:06] [main] [cpw.mods.modlauncher.Launcher\/INFO]:", + "lines": [ + { + "number": 3, + "content": "[23:18:06] [main] [cpw.mods.modlauncher.Launcher\/INFO]: ModLauncher running: args [--username, {MINECRAFT_USERNAME}, --version, 26.3, --gameDir, \/Users\/********\/Library\/Application Support\/ModrinthApp\/profiles\/Forge 26.3, --assetsDir, \/Users\/********\/Library\/Application Support\/ModrinthApp\/meta\/assets, --assetIndex, 34, --uuid, {MINECRAFT_UUID}, --accessToken, **********, --clientId, c4502edb-87c6-40cb-b595-64a280cf8906, --xuid, 0, --versionType, release, --width, 854, --height, 480, --launchTarget, forge_client]" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:18:06] [main] [cpw.mods.modlauncher.Launcher\/INFO]:", + "lines": [ + { + "number": 4, + "content": "[23:18:06] [main] [cpw.mods.modlauncher.Launcher\/INFO]: JVM identified as Azul Systems, Inc. OpenJDK 64-Bit Server VM **.**.**.**.3+1-LTS" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:18:06] [main] [cpw.mods.modlauncher.Launcher\/INFO]:", + "lines": [ + { + "number": 5, + "content": "[23:18:06] [main] [cpw.mods.modlauncher.Launcher\/INFO]: ModLauncher 10.2.6 starting: java version 25.**.**.**.** by Azul Systems, Inc.; OS Mac OS X arch aarch64 version 27.2.1" + } + ] + }, + { + "level": 4, + "time": null, + "prefix": "[23:18:06] [main] [net.minecraftforge.fml.loading.FMLConfig\/WARN]:", + "lines": [ + { + "number": 6, + "content": "[23:18:06] [main] [net.minecraftforge.fml.loading.FMLConfig\/WARN]: Configuration file \/Users\/********\/Library\/Application Support\/ModrinthApp\/profiles\/Forge 26.3\/config\/fml.toml is not correct. Correcting" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:18:06] [main] [net.minecraftforge.fml.loading.ImmediateWindowHandler\/INFO]:", + "lines": [ + { + "number": 7, + "content": "[23:18:06] [main] [net.minecraftforge.fml.loading.ImmediateWindowHandler\/INFO]: Loading ImmediateWindowProvider fmlearlywindow" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:18:06] [main] [net.minecraftforge.fml.loading.ImmediateWindowHandler\/INFO]:", + "lines": [ + { + "number": 8, + "content": "[23:18:06] [main] [net.minecraftforge.fml.loading.ImmediateWindowHandler\/INFO]: ImmediateWindowProvider fmlearlywindow does not support default, switching to dummyprovider" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:18:06] [main] [mixin\/INFO]:", + "lines": [ + { + "number": 9, + "content": "[23:18:06] [main] [mixin\/INFO]: SpongePowered MIXIN Subsystem Version=0.8.7 Source=jar:file:\/\/\/Users\/********\/Library\/Application%20Support\/ModrinthApp\/meta\/libraries\/org\/spongepowered\/mixin\/0.8.7\/mixin-0.8.7.jar!\/ Service=ModLauncher Env=CLIENT" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:18:07] [main] [net.minecraftforge.fml.loading.moddiscovery.ModDiscoverer\/INFO]:", + "lines": [ + { + "number": 10, + "content": "[23:18:07] [main] [net.minecraftforge.fml.loading.moddiscovery.ModDiscoverer\/INFO]: Found mod file forge-26.3-66.1.8-client.jar of type MOD with provider net.minecraftforge.fml.loading.moddiscovery.MinecraftLocator@344344fa" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:18:07] [main] [cpw.mods.modlauncher.LaunchServiceHandler\/INFO]:", + "lines": [ + { + "number": 11, + "content": "[23:18:07] [main] [cpw.mods.modlauncher.LaunchServiceHandler\/INFO]: Launching target 'forge_client' with arguments [--version, 26.3, --gameDir, \/Users\/********\/Library\/Application Support\/ModrinthApp\/profiles\/Forge 26.3, --assetsDir, \/Users\/********\/Library\/Application Support\/ModrinthApp\/meta\/assets, --uuid, {MINECRAFT_UUID}, --username, {MINECRAFT_USERNAME}, --assetIndex, 34, --accessToken, **********, --clientId, c4502edb-87c6-40cb-b595-64a280cf8906, --xuid, 0, --versionType, release, --width, 854, --height, 480]" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:18:09] [Datafixer Bootstrap #0] [com.mojang.datafixers.DataFixerBuilder\/INFO]:", + "lines": [ + { + "number": 12, + "content": "[23:18:09] [Datafixer Bootstrap #0] [com.mojang.datafixers.DataFixerBuilder\/INFO]: 307 Datafixer optimizations took 302 milliseconds" + } + ] + }, + { + "level": 4, + "time": null, + "prefix": "[23:18:10] [main] [oshi.software.os.mac.MacOperatingSystem\/WARN]:", + "lines": [ + { + "number": 13, + "content": "[23:18:10] [main] [oshi.software.os.mac.MacOperatingSystem\/WARN]: Unable to parse version 27.2 to a codename." + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:18:14] [Render thread] [com.mojang.blaze3d.platform.SdlDebug\/INFO]:", + "lines": [ + { + "number": 14, + "content": "[23:18:14] [Render thread] [com.mojang.blaze3d.platform.SdlDebug\/INFO]: SDL [SYSTEM]: App ID: com.mojang.minecraft" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:18:14] [Render thread] [com.mojang.blaze3d.platform.SdlDebug\/INFO]:", + "lines": [ + { + "number": 15, + "content": "[23:18:14] [Render thread] [com.mojang.blaze3d.platform.SdlDebug\/INFO]: SDL [SYSTEM]: SDL revision: SDL-3.4.14-62f10da" + } + ] + }, + { + "level": 4, + "time": null, + "prefix": "[23:18:14] [Render thread] [com.mojang.renderpearl.backend.vulkan.VulkanBackend\/WARN]:", + "lines": [ + { + "number": 16, + "content": "[23:18:14] [Render thread] [com.mojang.renderpearl.backend.vulkan.VulkanBackend\/WARN]: Device [Apple M5 Pro] supports all extensions from FeatureSet [Vulkan Portability Subset], making required" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:18:15] [modloading-worker-0] [net.minecraftforge.common.ForgeMod\/INFO]:", + "lines": [ + { + "number": 17, + "content": "[23:18:15] [modloading-worker-0] [net.minecraftforge.common.ForgeMod\/INFO]: Forge mod loading, version 66.1.8, for MC 26.3 with MCP 20260918.230105" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:18:15] [modloading-worker-0] [net.minecraftforge.common.MinecraftForge\/INFO]:", + "lines": [ + { + "number": 18, + "content": "[23:18:15] [modloading-worker-0] [net.minecraftforge.common.MinecraftForge\/INFO]: MinecraftForge v66.1.8 Initialized" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:18:15] [modloading-worker-0] [net.minecraftforge.common.ForgeMod\/INFO]:", + "lines": [ + { + "number": 19, + "content": "[23:18:15] [modloading-worker-0] [net.minecraftforge.common.ForgeMod\/INFO]: Opening jdk.naming.dns\/com.sun.jndi.dns to java.naming" + }, + { + "number": 20, + "content": "" + } + ] + } + ], + "analysis": { + "problems": [], + "information": [ + { + "message": "Minecraft version: 26.3", + "counter": 1, + "entry": { + "level": 6, + "time": null, + "prefix": "[23:18:15] [modloading-worker-0] [net.minecraftforge.common.ForgeMod\/INFO]:", + "lines": [ + { + "number": 17, + "content": "[23:18:15] [modloading-worker-0] [net.minecraftforge.common.ForgeMod\/INFO]: Forge mod loading, version 66.1.8, for MC 26.3 with MCP 20260918.230105" + } + ] + }, + "label": "Minecraft version", + "value": "26.3" + }, + { + "message": "Forge version: 66.1.8", + "counter": 1, + "entry": { + "level": 6, + "time": null, + "prefix": "[23:18:15] [modloading-worker-0] [net.minecraftforge.common.MinecraftForge\/INFO]:", + "lines": [ + { + "number": 18, + "content": "[23:18:15] [modloading-worker-0] [net.minecraftforge.common.MinecraftForge\/INFO]: MinecraftForge v66.1.8 Initialized" + } + ] + }, + "label": "Forge version", + "value": "66.1.8" + } + ] + } +} \ No newline at end of file diff --git a/test/data/Vanilla/Forge/forge-client-modrinth-app.log b/test/data/Vanilla/Forge/forge-client-modrinth-app.log new file mode 100644 index 00000000..d9a1fbed --- /dev/null +++ b/test/data/Vanilla/Forge/forge-client-modrinth-app.log @@ -0,0 +1,19 @@ +Ignoring duplicate module on SecureModuleFinder: jtracy: Jar[jar:file:///Users/********/Library/Application%20Support/ModrinthApp/meta/libraries/com/mojang/jtracy/1.14.38/jtracy-1.14.38-natives-macos.jar!/] +Ignoring duplicate module on SecureModuleFinder: jtracy: Jar[jar:file:///Users/********/Library/Application%20Support/ModrinthApp/meta/libraries/com/mojang/jtracy/1.14.38/jtracy-1.14.38-natives-macos-arm64.jar!/] +[23:18:06] [main] [cpw.mods.modlauncher.Launcher/INFO]: ModLauncher running: args [--username, {MINECRAFT_USERNAME}, --version, 26.3, --gameDir, /Users/********/Library/Application Support/ModrinthApp/profiles/Forge 26.3, --assetsDir, /Users/********/Library/Application Support/ModrinthApp/meta/assets, --assetIndex, 34, --uuid, {MINECRAFT_UUID}, --accessToken, **********, --clientId, c4502edb-87c6-40cb-b595-64a280cf8906, --xuid, 0, --versionType, release, --width, 854, --height, 480, --launchTarget, forge_client] +[23:18:06] [main] [cpw.mods.modlauncher.Launcher/INFO]: JVM identified as Azul Systems, Inc. OpenJDK 64-Bit Server VM **.**.**.**.3+1-LTS +[23:18:06] [main] [cpw.mods.modlauncher.Launcher/INFO]: ModLauncher 10.2.6 starting: java version 25.**.**.**.** by Azul Systems, Inc.; OS Mac OS X arch aarch64 version 27.2.1 +[23:18:06] [main] [net.minecraftforge.fml.loading.FMLConfig/WARN]: Configuration file /Users/********/Library/Application Support/ModrinthApp/profiles/Forge 26.3/config/fml.toml is not correct. Correcting +[23:18:06] [main] [net.minecraftforge.fml.loading.ImmediateWindowHandler/INFO]: Loading ImmediateWindowProvider fmlearlywindow +[23:18:06] [main] [net.minecraftforge.fml.loading.ImmediateWindowHandler/INFO]: ImmediateWindowProvider fmlearlywindow does not support default, switching to dummyprovider +[23:18:06] [main] [mixin/INFO]: SpongePowered MIXIN Subsystem Version=0.8.7 Source=jar:file:///Users/********/Library/Application%20Support/ModrinthApp/meta/libraries/org/spongepowered/mixin/0.8.7/mixin-0.8.7.jar!/ Service=ModLauncher Env=CLIENT +[23:18:07] [main] [net.minecraftforge.fml.loading.moddiscovery.ModDiscoverer/INFO]: Found mod file forge-26.3-66.1.8-client.jar of type MOD with provider net.minecraftforge.fml.loading.moddiscovery.MinecraftLocator@344344fa +[23:18:07] [main] [cpw.mods.modlauncher.LaunchServiceHandler/INFO]: Launching target 'forge_client' with arguments [--version, 26.3, --gameDir, /Users/********/Library/Application Support/ModrinthApp/profiles/Forge 26.3, --assetsDir, /Users/********/Library/Application Support/ModrinthApp/meta/assets, --uuid, {MINECRAFT_UUID}, --username, {MINECRAFT_USERNAME}, --assetIndex, 34, --accessToken, **********, --clientId, c4502edb-87c6-40cb-b595-64a280cf8906, --xuid, 0, --versionType, release, --width, 854, --height, 480] +[23:18:09] [Datafixer Bootstrap #0] [com.mojang.datafixers.DataFixerBuilder/INFO]: 307 Datafixer optimizations took 302 milliseconds +[23:18:10] [main] [oshi.software.os.mac.MacOperatingSystem/WARN]: Unable to parse version 27.2 to a codename. +[23:18:14] [Render thread] [com.mojang.blaze3d.platform.SdlDebug/INFO]: SDL [SYSTEM]: App ID: com.mojang.minecraft +[23:18:14] [Render thread] [com.mojang.blaze3d.platform.SdlDebug/INFO]: SDL [SYSTEM]: SDL revision: SDL-3.4.14-62f10da +[23:18:14] [Render thread] [com.mojang.renderpearl.backend.vulkan.VulkanBackend/WARN]: Device [Apple M5 Pro] supports all extensions from FeatureSet [Vulkan Portability Subset], making required +[23:18:15] [modloading-worker-0] [net.minecraftforge.common.ForgeMod/INFO]: Forge mod loading, version 66.1.8, for MC 26.3 with MCP 20260918.230105 +[23:18:15] [modloading-worker-0] [net.minecraftforge.common.MinecraftForge/INFO]: MinecraftForge v66.1.8 Initialized +[23:18:15] [modloading-worker-0] [net.minecraftforge.common.ForgeMod/INFO]: Opening jdk.naming.dns/com.sun.jndi.dns to java.naming diff --git a/test/data/Vanilla/NeoForge/neoforge-1-21-1-client-modrinth-app.json b/test/data/Vanilla/NeoForge/neoforge-1-21-1-client-modrinth-app.json new file mode 100644 index 00000000..3e67c734 --- /dev/null +++ b/test/data/Vanilla/NeoForge/neoforge-1-21-1-client-modrinth-app.json @@ -0,0 +1,181 @@ +{ + "id": "neoforge\/client", + "name": "NeoForge", + "type": "Client Log", + "version": "1.21.1", + "title": "NeoForge 1.21.1 Client Log", + "entries": [ + { + "level": 6, + "time": null, + "prefix": "[23:20:37] [main] [cpw.mods.modlauncher.Launcher\/INFO]:", + "lines": [ + { + "number": 1, + "content": "[23:20:37] [main] [cpw.mods.modlauncher.Launcher\/INFO]: ModLauncher running: args [--username, {MINECRAFT_USERNAME}, --version, 1.21.1, --gameDir, \/Users\/********\/Library\/Application Support\/ModrinthApp\/profiles\/NeoForge 1.21.1, --assetsDir, \/Users\/********\/Library\/Application Support\/ModrinthApp\/meta\/assets, --assetIndex, 17, --uuid, {MINECRAFT_UUID}, --accessToken, \u2744\u2744\u2744\u2744\u2744\u2744\u2744\u2744, --clientId, c4502edb-87c6-40cb-b595-64a280cf8906, --xuid, 0, --userType, msa, --versionType, release, --width, 854, --height, 480, --fml.neoForgeVersion, 21.1.266, --fml.fmlVersion, 4.0.45, --fml.mcVersion, 1.21.1, --fml.neoFormVersion, 20240808.144430, --launchTarget, forgeclient]" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:20:37] [main] [cpw.mods.modlauncher.Launcher\/INFO]:", + "lines": [ + { + "number": 2, + "content": "[23:20:37] [main] [cpw.mods.modlauncher.Launcher\/INFO]: JVM identified as Azul Systems, Inc. OpenJDK 64-Bit Server VM **.**.**.**.3+1-LTS" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:20:37] [main] [cpw.mods.modlauncher.Launcher\/INFO]:", + "lines": [ + { + "number": 3, + "content": "[23:20:37] [main] [cpw.mods.modlauncher.Launcher\/INFO]: ModLauncher 11.0.5+main.901c6ea8 starting: java version 21.**.**.**.** by Azul Systems, Inc.; OS Mac OS X arch aarch64 version 27.2.1" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:20:37] [main] [net.neoforged.fml.loading.ImmediateWindowHandler\/INFO]:", + "lines": [ + { + "number": 4, + "content": "[23:20:37] [main] [net.neoforged.fml.loading.ImmediateWindowHandler\/INFO]: Loading ImmediateWindowProvider fmlearlywindow" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:20:40] [main] [cpw.mods.modlauncher.LaunchServiceHandler\/INFO]:", + "lines": [ + { + "number": 5, + "content": "[23:20:40] [main] [cpw.mods.modlauncher.LaunchServiceHandler\/INFO]: Launching target 'forgeclient' with arguments [--version, 1.21.1, --gameDir, \/Users\/********\/Library\/Application Support\/ModrinthApp\/profiles\/NeoForge 1.21.1, --assetsDir, \/Users\/********\/Library\/Application Support\/ModrinthApp\/meta\/assets, --uuid, {MINECRAFT_UUID}, --username, {MINECRAFT_USERNAME}, --assetIndex, 17, --accessToken, \u2744\u2744\u2744\u2744\u2744\u2744\u2744\u2744, --clientId, c4502edb-87c6-40cb-b595-64a280cf8906, --xuid, 0, --userType, msa, --versionType, release, --width, 854, --height, 480]" + }, + { + "number": 6, + "content": "WARN StatusConsoleListener Error parsing URI \/Users\/********\/Library\/Application Support\/ModrinthApp\/meta\/log_configs\/client-1.12.xml" + }, + { + "number": 7, + "content": "WARN StatusConsoleListener Advanced terminal features are not available in this environment" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:20:41] [Datafixer Bootstrap\/INFO] [mojang\/DataFixerBuilder]:", + "lines": [ + { + "number": 8, + "content": "[23:20:41] [Datafixer Bootstrap\/INFO] [mojang\/DataFixerBuilder]: 229 Datafixer optimizations took 316 milliseconds" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:20:43] [pool-6-thread-1\/INFO] [MixinExtras|Service\/]:", + "lines": [ + { + "number": 9, + "content": "[23:20:43] [pool-6-thread-1\/INFO] [MixinExtras|Service\/]: Initializing MixinExtras via com.llamalad7.mixinextras.service.MixinExtrasServiceImpl(version=0.5.5)." + } + ] + }, + { + "level": 4, + "time": null, + "prefix": "[23:20:48] [Render thread\/WARN] [minecraft\/VanillaPackResourcesBuilder]:", + "lines": [ + { + "number": 10, + "content": "[23:20:48] [Render thread\/WARN] [minecraft\/VanillaPackResourcesBuilder]: Assets URL 'union:\/Users\/********\/Library\/Application%20Support\/ModrinthApp\/meta\/libraries\/net\/minecraft\/client\/1.21.1-20240808.144430\/client-1.21.1-20240808.144430-srg.jar%23185!\/assets\/.mcassetsroot' uses unexpected schema" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:20:48] [Render thread\/INFO] [minecraft\/Minecraft]:", + "lines": [ + { + "number": 11, + "content": "[23:20:48] [Render thread\/INFO] [minecraft\/Minecraft]: Setting user: {MINECRAFT_USERNAME}" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:20:48] [modloading-worker-0\/INFO] [ne.ne.ne.co.NeoForgeMod\/NEOFORGE-MOD]:", + "lines": [ + { + "number": 12, + "content": "[23:20:48] [modloading-worker-0\/INFO] [ne.ne.ne.co.NeoForgeMod\/NEOFORGE-MOD]: NeoForge mod loading, version 21.1.266, for MC 1.21.1" + } + ] + }, + { + "level": 4, + "time": null, + "prefix": "[23:20:52] [Render thread\/WARN] [minecraft\/SoundEngine]:", + "lines": [ + { + "number": 13, + "content": "[23:20:52] [Render thread\/WARN] [minecraft\/SoundEngine]: Missing sound for event: minecraft:item.goat_horn.play" + }, + { + "number": 14, + "content": "" + } + ] + } + ], + "analysis": { + "problems": [], + "information": [ + { + "message": "Minecraft version: 1.21.1", + "counter": 2, + "entry": { + "level": 6, + "time": null, + "prefix": "[23:20:37] [main] [cpw.mods.modlauncher.Launcher\/INFO]:", + "lines": [ + { + "number": 1, + "content": "[23:20:37] [main] [cpw.mods.modlauncher.Launcher\/INFO]: ModLauncher running: args [--username, {MINECRAFT_USERNAME}, --version, 1.21.1, --gameDir, \/Users\/********\/Library\/Application Support\/ModrinthApp\/profiles\/NeoForge 1.21.1, --assetsDir, \/Users\/********\/Library\/Application Support\/ModrinthApp\/meta\/assets, --assetIndex, 17, --uuid, {MINECRAFT_UUID}, --accessToken, \u2744\u2744\u2744\u2744\u2744\u2744\u2744\u2744, --clientId, c4502edb-87c6-40cb-b595-64a280cf8906, --xuid, 0, --userType, msa, --versionType, release, --width, 854, --height, 480, --fml.neoForgeVersion, 21.1.266, --fml.fmlVersion, 4.0.45, --fml.mcVersion, 1.21.1, --fml.neoFormVersion, 20240808.144430, --launchTarget, forgeclient]" + } + ] + }, + "label": "Minecraft version", + "value": "1.21.1" + }, + { + "message": "NeoForge version: 21.1.266", + "counter": 2, + "entry": { + "level": 6, + "time": null, + "prefix": "[23:20:37] [main] [cpw.mods.modlauncher.Launcher\/INFO]:", + "lines": [ + { + "number": 1, + "content": "[23:20:37] [main] [cpw.mods.modlauncher.Launcher\/INFO]: ModLauncher running: args [--username, {MINECRAFT_USERNAME}, --version, 1.21.1, --gameDir, \/Users\/********\/Library\/Application Support\/ModrinthApp\/profiles\/NeoForge 1.21.1, --assetsDir, \/Users\/********\/Library\/Application Support\/ModrinthApp\/meta\/assets, --assetIndex, 17, --uuid, {MINECRAFT_UUID}, --accessToken, \u2744\u2744\u2744\u2744\u2744\u2744\u2744\u2744, --clientId, c4502edb-87c6-40cb-b595-64a280cf8906, --xuid, 0, --userType, msa, --versionType, release, --width, 854, --height, 480, --fml.neoForgeVersion, 21.1.266, --fml.fmlVersion, 4.0.45, --fml.mcVersion, 1.21.1, --fml.neoFormVersion, 20240808.144430, --launchTarget, forgeclient]" + } + ] + }, + "label": "NeoForge version", + "value": "21.1.266" + } + ] + } +} \ No newline at end of file diff --git a/test/data/Vanilla/NeoForge/neoforge-1-21-1-client-modrinth-app.log b/test/data/Vanilla/NeoForge/neoforge-1-21-1-client-modrinth-app.log new file mode 100644 index 00000000..79402eed --- /dev/null +++ b/test/data/Vanilla/NeoForge/neoforge-1-21-1-client-modrinth-app.log @@ -0,0 +1,13 @@ +[23:20:37] [main] [cpw.mods.modlauncher.Launcher/INFO]: ModLauncher running: args [--username, {MINECRAFT_USERNAME}, --version, 1.21.1, --gameDir, /Users/********/Library/Application Support/ModrinthApp/profiles/NeoForge 1.21.1, --assetsDir, /Users/********/Library/Application Support/ModrinthApp/meta/assets, --assetIndex, 17, --uuid, {MINECRAFT_UUID}, --accessToken, ❄❄❄❄❄❄❄❄, --clientId, c4502edb-87c6-40cb-b595-64a280cf8906, --xuid, 0, --userType, msa, --versionType, release, --width, 854, --height, 480, --fml.neoForgeVersion, 21.1.266, --fml.fmlVersion, 4.0.45, --fml.mcVersion, 1.21.1, --fml.neoFormVersion, 20240808.144430, --launchTarget, forgeclient] +[23:20:37] [main] [cpw.mods.modlauncher.Launcher/INFO]: JVM identified as Azul Systems, Inc. OpenJDK 64-Bit Server VM **.**.**.**.3+1-LTS +[23:20:37] [main] [cpw.mods.modlauncher.Launcher/INFO]: ModLauncher 11.0.5+main.901c6ea8 starting: java version 21.**.**.**.** by Azul Systems, Inc.; OS Mac OS X arch aarch64 version 27.2.1 +[23:20:37] [main] [net.neoforged.fml.loading.ImmediateWindowHandler/INFO]: Loading ImmediateWindowProvider fmlearlywindow +[23:20:40] [main] [cpw.mods.modlauncher.LaunchServiceHandler/INFO]: Launching target 'forgeclient' with arguments [--version, 1.21.1, --gameDir, /Users/********/Library/Application Support/ModrinthApp/profiles/NeoForge 1.21.1, --assetsDir, /Users/********/Library/Application Support/ModrinthApp/meta/assets, --uuid, {MINECRAFT_UUID}, --username, {MINECRAFT_USERNAME}, --assetIndex, 17, --accessToken, ❄❄❄❄❄❄❄❄, --clientId, c4502edb-87c6-40cb-b595-64a280cf8906, --xuid, 0, --userType, msa, --versionType, release, --width, 854, --height, 480] +WARN StatusConsoleListener Error parsing URI /Users/********/Library/Application Support/ModrinthApp/meta/log_configs/client-1.12.xml +WARN StatusConsoleListener Advanced terminal features are not available in this environment +[23:20:41] [Datafixer Bootstrap/INFO] [mojang/DataFixerBuilder]: 229 Datafixer optimizations took 316 milliseconds +[23:20:43] [pool-6-thread-1/INFO] [MixinExtras|Service/]: Initializing MixinExtras via com.llamalad7.mixinextras.service.MixinExtrasServiceImpl(version=0.5.5). +[23:20:48] [Render thread/WARN] [minecraft/VanillaPackResourcesBuilder]: Assets URL 'union:/Users/********/Library/Application%20Support/ModrinthApp/meta/libraries/net/minecraft/client/1.21.1-20240808.144430/client-1.21.1-20240808.144430-srg.jar%23185!/assets/.mcassetsroot' uses unexpected schema +[23:20:48] [Render thread/INFO] [minecraft/Minecraft]: Setting user: {MINECRAFT_USERNAME} +[23:20:48] [modloading-worker-0/INFO] [ne.ne.ne.co.NeoForgeMod/NEOFORGE-MOD]: NeoForge mod loading, version 21.1.266, for MC 1.21.1 +[23:20:52] [Render thread/WARN] [minecraft/SoundEngine]: Missing sound for event: minecraft:item.goat_horn.play diff --git a/test/data/Vanilla/NeoForge/neoforge-26-3-client-modrinth-app.json b/test/data/Vanilla/NeoForge/neoforge-26-3-client-modrinth-app.json new file mode 100644 index 00000000..edf080e4 --- /dev/null +++ b/test/data/Vanilla/NeoForge/neoforge-26-3-client-modrinth-app.json @@ -0,0 +1,454 @@ +{ + "id": "neoforge\/client", + "name": "NeoForge", + "type": "Client Log", + "version": "26.3", + "title": "NeoForge 26.3 Client Log", + "entries": [ + { + "level": 6, + "time": null, + "prefix": "[23:15:17] [main] [net.neoforged.fml.startup.Entrypoint\/INFO]:", + "lines": [ + { + "number": 1, + "content": "[23:15:17] [main] [net.neoforged.fml.startup.Entrypoint\/INFO]: JVM Uptime at startup: 542ms" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:17] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]:", + "lines": [ + { + "number": 2, + "content": "[23:15:17] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]: Starting FancyModLoader version 12.0.12 (CLIENT in PROD)" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:17] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]:", + "lines": [ + { + "number": 3, + "content": "[23:15:17] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]: Game directory: \/Users\/********\/Library\/Application Support\/ModrinthApp\/profiles\/NeoForge 26.3" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:18] [main] [net.neoforged.fml.loading.EarlyServiceDiscovery\/INFO]:", + "lines": [ + { + "number": 4, + "content": "[23:15:18] [main] [net.neoforged.fml.loading.EarlyServiceDiscovery\/INFO]: Found 2 early service jars (out of 108) in 42ms" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:18] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]:", + "lines": [ + { + "number": 5, + "content": "[23:15:18] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]: Loading FML Early Services:" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:18] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]:", + "lines": [ + { + "number": 6, + "content": "[23:15:18] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]: - \/Users\/********\/Library\/Application Support\/ModrinthApp\/meta\/libraries\/net\/neoforged\/fancymodloader\/loader\/12.0.12\/loader-12.0.12.jar" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:18] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]:", + "lines": [ + { + "number": 7, + "content": "[23:15:18] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]: - \/Users\/********\/Library\/Application Support\/ModrinthApp\/meta\/libraries\/net\/neoforged\/fancymodloader\/earlydisplay\/12.0.12\/earlydisplay-12.0.12.jar" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:18] [main] [net.neoforged.fml.loading.ImmediateWindowHandler\/INFO]:", + "lines": [ + { + "number": 8, + "content": "[23:15:18] [main] [net.neoforged.fml.loading.ImmediateWindowHandler\/INFO]: Loading ImmediateWindowProvider fmlearlywindow" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:19] [main] [net.neoforged.fml.earlydisplay.render.backend.opengl.GlRenderer\/INFO]:", + "lines": [ + { + "number": 9, + "content": "[23:15:19] [main] [net.neoforged.fml.earlydisplay.render.backend.opengl.GlRenderer\/INFO]: GL info: Apple M5 Pro GL version 4.1 Metal - 91.7, Apple" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:19] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.locators.GameLocator\/INFO]:", + "lines": [ + { + "number": 10, + "content": "[23:15:19] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.locators.GameLocator\/INFO]: Marking unmodified client jar as claimed to prevent loading: \/Users\/********\/Library\/Application Support\/ModrinthApp\/meta\/versions\/26.3-26.3.0.103\/26.3-26.3.0.103.jar" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:19] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.locators.GameLocator\/INFO]:", + "lines": [ + { + "number": 11, + "content": "[23:15:19] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.locators.GameLocator\/INFO]: Failed to find common Minecraft classes and resources on the classpath. Assuming we're launching production." + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer\/INFO]:", + "lines": [ + { + "number": 12, + "content": "[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer\/INFO]: Found mod file \"minecraft-client-patched-26.3.0.103.jar\" [locator: game locator, reader: mod manifest]" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer\/INFO]:", + "lines": [ + { + "number": 13, + "content": "[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer\/INFO]: Found mod file \"neoforge-26.3.0.103-universal.jar\" [locator: game locator, reader: mod manifest]" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.locators.JarInJarDependencyLocator\/INFO]:", + "lines": [ + { + "number": 14, + "content": "[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.locators.JarInJarDependencyLocator\/INFO]: Found 2 dependencies adding them to mods collection" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer\/INFO]:", + "lines": [ + { + "number": 15, + "content": "[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer\/INFO]: Found gamelibrary file \"mixinextras-neoforge-0.5.5.jar\" [parent: neoforge-26.3.0.103-universal.jar, locator: jarinjar, reader: mod manifest]" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer\/INFO]:", + "lines": [ + { + "number": 16, + "content": "[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer\/INFO]: Found library file \"net.neoforged.neoforge-coremods-26.3.0.103.jar\" [parent: neoforge-26.3.0.103-universal.jar, locator: jarinjar, reader: mod manifest]" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer\/INFO]:", + "lines": [ + { + "number": 17, + "content": "[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer\/INFO]: Mod List:" + }, + { + "number": 18, + "content": "\t\tName Version (Mod Id)" + }, + { + "number": 19, + "content": "\t\tMinecraft 26.3 (minecraft)" + }, + { + "number": 20, + "content": "\t\tNeoForge **.**.**.** (neoforge)" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:20] [main] [mixin\/INFO]:", + "lines": [ + { + "number": 21, + "content": "[23:15:20] [main] [mixin\/INFO]: SpongePowered MIXIN Subsystem Version=0.8.7 Source=file:\/Users\/********\/Library\/Application%20Support\/ModrinthApp\/meta\/libraries\/net\/fabricmc\/sponge-mixin\/0.17.4+mixin.0.8.7\/sponge-mixin-0.17.4+mixin.0.8.7.jar Service=FML Env=CLIENT" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:20] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]:", + "lines": [ + { + "number": 22, + "content": "[23:15:20] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]: Loading FML Plugins:" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:20] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]:", + "lines": [ + { + "number": 23, + "content": "[23:15:20] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]: - ~libraries\/net\/neoforged\/neoforge\/**.**.**.**\/neoforge-26.3.0.103-universal.jar > net.neoforged.neoforge-coremods-26.3.0.103.jar" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:20] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]:", + "lines": [ + { + "number": 24, + "content": "[23:15:20] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]: Building game content classloader:" + }, + { + "number": 25, + "content": " - minecraft (jar(~libraries\/net\/neoforged\/minecraft-client-patched\/**.**.**.**\/minecraft-client-patched-26.3.0.103.jar))" + }, + { + "number": 26, + "content": " - mixinextras.neoforge (jar(~libraries\/net\/neoforged\/neoforge\/**.**.**.**\/neoforge-26.3.0.103-universal.jar > mixinextras-neoforge-0.5.5.jar))" + }, + { + "number": 27, + "content": " - neoforge (jar(~libraries\/net\/neoforged\/neoforge\/**.**.**.**\/neoforge-26.3.0.103-universal.jar))" + }, + { + "number": 28, + "content": " - net.neoforged.fml.generated (empty(VirtualJar\/net.neoforged.fml.generated))" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:20] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]:", + "lines": [ + { + "number": 29, + "content": "[23:15:20] [main] [net.neoforged.fml.loading.FMLLoader\/INFO]: Built game content classloader in 11ms" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:22] [Datafixer Bootstrap #0] [com.mojang.datafixers.DataFixerBuilder\/INFO]:", + "lines": [ + { + "number": 30, + "content": "[23:15:22] [Datafixer Bootstrap #0] [com.mojang.datafixers.DataFixerBuilder\/INFO]: 310 Datafixer optimizations took 257 milliseconds" + } + ] + }, + { + "level": 4, + "time": null, + "prefix": "[23:15:22] [main] [oshi.software.os.mac.MacOperatingSystem\/WARN]:", + "lines": [ + { + "number": 31, + "content": "[23:15:22] [main] [oshi.software.os.mac.MacOperatingSystem\/WARN]: Unable to parse version 27.2 to a codename." + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:22] [pool-7-thread-1] [MixinExtras|Service\/INFO]:", + "lines": [ + { + "number": 32, + "content": "[23:15:22] [pool-7-thread-1] [MixinExtras|Service\/INFO]: Initializing MixinExtras via com.llamalad7.mixinextras.service.MixinExtrasServiceImpl(version=0.5.5)." + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:26] [modloading-worker-0] [net.neoforged.neoforge.common.NeoForgeMod\/INFO]:", + "lines": [ + { + "number": 33, + "content": "[23:15:26] [modloading-worker-0] [net.neoforged.neoforge.common.NeoForgeMod\/INFO]: NeoForge mod loading, version 26.3.0.103, for MC 26.3" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:27] [Render thread] [com.mojang.authlib.services.MinecraftServicesDiscoveryService\/INFO]:", + "lines": [ + { + "number": 34, + "content": "[23:15:27] [Render thread] [com.mojang.authlib.services.MinecraftServicesDiscoveryService\/INFO]: Environment: Environment[discoveryUrl=https:\/\/discovery.minecraftservices.com\/minecraft\/client, name=PROD]" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:27] [Render thread] [net.minecraft.client.Minecraft\/INFO]:", + "lines": [ + { + "number": 35, + "content": "[23:15:27] [Render thread] [net.minecraft.client.Minecraft\/INFO]: Setting user: {MINECRAFT_USERNAME}" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:27] [Render thread] [net.minecraft.client.Minecraft\/INFO]:", + "lines": [ + { + "number": 36, + "content": "[23:15:27] [Render thread] [net.minecraft.client.Minecraft\/INFO]: Backend library: LWJGL version 3.4.3+4" + } + ] + }, + { + "level": 4, + "time": null, + "prefix": "[23:15:27] [Render thread] [com.mojang.renderpearl.backend.vulkan.VulkanBackend\/WARN]:", + "lines": [ + { + "number": 37, + "content": "[23:15:27] [Render thread] [com.mojang.renderpearl.backend.vulkan.VulkanBackend\/WARN]: Device [Apple M5 Pro] supports all extensions from FeatureSet [Vulkan Portability Subset], making required" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:27] [Render thread] [net.minecraft.client.Minecraft\/INFO]:", + "lines": [ + { + "number": 38, + "content": "[23:15:27] [Render thread] [net.minecraft.client.Minecraft\/INFO]: Using graphics backend OpenGL, using drivers: 4.1 Metal - 91.7" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:27] [Render thread] [net.minecraft.client.Minecraft\/INFO]:", + "lines": [ + { + "number": 39, + "content": "[23:15:27] [Render thread] [net.minecraft.client.Minecraft\/INFO]: Using graphics device: Apple M5 Pro (Apple)" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:27] [Render thread] [net.minecraft.client.Minecraft\/INFO]:", + "lines": [ + { + "number": 40, + "content": "[23:15:27] [Render thread] [net.minecraft.client.Minecraft\/INFO]: Using graphics device extensions: GL_ARB_draw_indirect, GL_EXT_texture_filter_anisotropic" + } + ] + }, + { + "level": 6, + "time": null, + "prefix": "[23:15:27] [Render thread] [com.mojang.blaze3d.platform.Window\/INFO]:", + "lines": [ + { + "number": 41, + "content": "[23:15:27] [Render thread] [com.mojang.blaze3d.platform.Window\/INFO]: Created window using SDL video driver: cocoa" + }, + { + "number": 42, + "content": "" + } + ] + } + ], + "analysis": { + "problems": [], + "information": [ + { + "message": "Minecraft version: 26.3", + "counter": 1, + "entry": { + "level": 6, + "time": null, + "prefix": "[23:15:26] [modloading-worker-0] [net.neoforged.neoforge.common.NeoForgeMod\/INFO]:", + "lines": [ + { + "number": 33, + "content": "[23:15:26] [modloading-worker-0] [net.neoforged.neoforge.common.NeoForgeMod\/INFO]: NeoForge mod loading, version 26.3.0.103, for MC 26.3" + } + ] + }, + "label": "Minecraft version", + "value": "26.3" + }, + { + "message": "NeoForge version: 26.3.0.103", + "counter": 1, + "entry": { + "level": 6, + "time": null, + "prefix": "[23:15:26] [modloading-worker-0] [net.neoforged.neoforge.common.NeoForgeMod\/INFO]:", + "lines": [ + { + "number": 33, + "content": "[23:15:26] [modloading-worker-0] [net.neoforged.neoforge.common.NeoForgeMod\/INFO]: NeoForge mod loading, version 26.3.0.103, for MC 26.3" + } + ] + }, + "label": "NeoForge version", + "value": "26.3.0.103" + } + ] + } +} \ No newline at end of file diff --git a/test/data/Vanilla/NeoForge/neoforge-26-3-client-modrinth-app.log b/test/data/Vanilla/NeoForge/neoforge-26-3-client-modrinth-app.log new file mode 100644 index 00000000..e6f84aca --- /dev/null +++ b/test/data/Vanilla/NeoForge/neoforge-26-3-client-modrinth-app.log @@ -0,0 +1,41 @@ +[23:15:17] [main] [net.neoforged.fml.startup.Entrypoint/INFO]: JVM Uptime at startup: 542ms +[23:15:17] [main] [net.neoforged.fml.loading.FMLLoader/INFO]: Starting FancyModLoader version 12.0.12 (CLIENT in PROD) +[23:15:17] [main] [net.neoforged.fml.loading.FMLLoader/INFO]: Game directory: /Users/********/Library/Application Support/ModrinthApp/profiles/NeoForge 26.3 +[23:15:18] [main] [net.neoforged.fml.loading.EarlyServiceDiscovery/INFO]: Found 2 early service jars (out of 108) in 42ms +[23:15:18] [main] [net.neoforged.fml.loading.FMLLoader/INFO]: Loading FML Early Services: +[23:15:18] [main] [net.neoforged.fml.loading.FMLLoader/INFO]: - /Users/********/Library/Application Support/ModrinthApp/meta/libraries/net/neoforged/fancymodloader/loader/12.0.12/loader-12.0.12.jar +[23:15:18] [main] [net.neoforged.fml.loading.FMLLoader/INFO]: - /Users/********/Library/Application Support/ModrinthApp/meta/libraries/net/neoforged/fancymodloader/earlydisplay/12.0.12/earlydisplay-12.0.12.jar +[23:15:18] [main] [net.neoforged.fml.loading.ImmediateWindowHandler/INFO]: Loading ImmediateWindowProvider fmlearlywindow +[23:15:19] [main] [net.neoforged.fml.earlydisplay.render.backend.opengl.GlRenderer/INFO]: GL info: Apple M5 Pro GL version 4.1 Metal - 91.7, Apple +[23:15:19] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.locators.GameLocator/INFO]: Marking unmodified client jar as claimed to prevent loading: /Users/********/Library/Application Support/ModrinthApp/meta/versions/26.3-26.3.0.103/26.3-26.3.0.103.jar +[23:15:19] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.locators.GameLocator/INFO]: Failed to find common Minecraft classes and resources on the classpath. Assuming we're launching production. +[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer/INFO]: Found mod file "minecraft-client-patched-26.3.0.103.jar" [locator: game locator, reader: mod manifest] +[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer/INFO]: Found mod file "neoforge-26.3.0.103-universal.jar" [locator: game locator, reader: mod manifest] +[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.locators.JarInJarDependencyLocator/INFO]: Found 2 dependencies adding them to mods collection +[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer/INFO]: Found gamelibrary file "mixinextras-neoforge-0.5.5.jar" [parent: neoforge-26.3.0.103-universal.jar, locator: jarinjar, reader: mod manifest] +[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer/INFO]: Found library file "net.neoforged.neoforge-coremods-26.3.0.103.jar" [parent: neoforge-26.3.0.103-universal.jar, locator: jarinjar, reader: mod manifest] +[23:15:20] [ForkJoinPool.commonPool-worker-1] [net.neoforged.fml.loading.moddiscovery.ModDiscoverer/INFO]: Mod List: + Name Version (Mod Id) + Minecraft 26.3 (minecraft) + NeoForge **.**.**.** (neoforge) +[23:15:20] [main] [mixin/INFO]: SpongePowered MIXIN Subsystem Version=0.8.7 Source=file:/Users/********/Library/Application%20Support/ModrinthApp/meta/libraries/net/fabricmc/sponge-mixin/0.17.4+mixin.0.8.7/sponge-mixin-0.17.4+mixin.0.8.7.jar Service=FML Env=CLIENT +[23:15:20] [main] [net.neoforged.fml.loading.FMLLoader/INFO]: Loading FML Plugins: +[23:15:20] [main] [net.neoforged.fml.loading.FMLLoader/INFO]: - ~libraries/net/neoforged/neoforge/**.**.**.**/neoforge-26.3.0.103-universal.jar > net.neoforged.neoforge-coremods-26.3.0.103.jar +[23:15:20] [main] [net.neoforged.fml.loading.FMLLoader/INFO]: Building game content classloader: + - minecraft (jar(~libraries/net/neoforged/minecraft-client-patched/**.**.**.**/minecraft-client-patched-26.3.0.103.jar)) + - mixinextras.neoforge (jar(~libraries/net/neoforged/neoforge/**.**.**.**/neoforge-26.3.0.103-universal.jar > mixinextras-neoforge-0.5.5.jar)) + - neoforge (jar(~libraries/net/neoforged/neoforge/**.**.**.**/neoforge-26.3.0.103-universal.jar)) + - net.neoforged.fml.generated (empty(VirtualJar/net.neoforged.fml.generated)) +[23:15:20] [main] [net.neoforged.fml.loading.FMLLoader/INFO]: Built game content classloader in 11ms +[23:15:22] [Datafixer Bootstrap #0] [com.mojang.datafixers.DataFixerBuilder/INFO]: 310 Datafixer optimizations took 257 milliseconds +[23:15:22] [main] [oshi.software.os.mac.MacOperatingSystem/WARN]: Unable to parse version 27.2 to a codename. +[23:15:22] [pool-7-thread-1] [MixinExtras|Service/INFO]: Initializing MixinExtras via com.llamalad7.mixinextras.service.MixinExtrasServiceImpl(version=0.5.5). +[23:15:26] [modloading-worker-0] [net.neoforged.neoforge.common.NeoForgeMod/INFO]: NeoForge mod loading, version 26.3.0.103, for MC 26.3 +[23:15:27] [Render thread] [com.mojang.authlib.services.MinecraftServicesDiscoveryService/INFO]: Environment: Environment[discoveryUrl=https://discovery.minecraftservices.com/minecraft/client, name=PROD] +[23:15:27] [Render thread] [net.minecraft.client.Minecraft/INFO]: Setting user: {MINECRAFT_USERNAME} +[23:15:27] [Render thread] [net.minecraft.client.Minecraft/INFO]: Backend library: LWJGL version 3.4.3+4 +[23:15:27] [Render thread] [com.mojang.renderpearl.backend.vulkan.VulkanBackend/WARN]: Device [Apple M5 Pro] supports all extensions from FeatureSet [Vulkan Portability Subset], making required +[23:15:27] [Render thread] [net.minecraft.client.Minecraft/INFO]: Using graphics backend OpenGL, using drivers: 4.1 Metal - 91.7 +[23:15:27] [Render thread] [net.minecraft.client.Minecraft/INFO]: Using graphics device: Apple M5 Pro (Apple) +[23:15:27] [Render thread] [net.minecraft.client.Minecraft/INFO]: Using graphics device extensions: GL_ARB_draw_indirect, GL_EXT_texture_filter_anisotropic +[23:15:27] [Render thread] [com.mojang.blaze3d.platform.Window/INFO]: Created window using SDL video driver: cocoa diff --git a/test/tests/Logs/AutoLogsTest.php b/test/tests/Logs/AutoLogsTest.php index 75b36308..052099f4 100644 --- a/test/tests/Logs/AutoLogsTest.php +++ b/test/tests/Logs/AutoLogsTest.php @@ -1680,6 +1680,16 @@ public function test_forge_client_1_19_2(): void $this->assertStringEqualsFile($log->getExpectedPath(), $log->getOutput(), $log->getLogPath()); } + /** + * @return void + * @throws Exception + */ + public function test_forge_client_modrinth_app(): void + { + $log = new TestLog('Vanilla/Forge/forge-client-modrinth-app.log'); + $this->assertStringEqualsFile($log->getExpectedPath(), $log->getOutput(), $log->getLogPath()); + } + /** * @return void * @throws Exception @@ -2120,6 +2130,16 @@ public function test_neoforge_1_20_4_server(): void $this->assertStringEqualsFile($log->getExpectedPath(), $log->getOutput(), $log->getLogPath()); } + /** + * @return void + * @throws Exception + */ + public function test_neoforge_1_21_1_client_modrinth_app(): void + { + $log = new TestLog('Vanilla/NeoForge/neoforge-1-21-1-client-modrinth-app.log'); + $this->assertStringEqualsFile($log->getExpectedPath(), $log->getOutput(), $log->getLogPath()); + } + /** * @return void * @throws Exception @@ -2160,6 +2180,16 @@ public function test_neoforge_26_1_client(): void $this->assertStringEqualsFile($log->getExpectedPath(), $log->getOutput(), $log->getLogPath()); } + /** + * @return void + * @throws Exception + */ + public function test_neoforge_26_3_client_modrinth_app(): void + { + $log = new TestLog('Vanilla/NeoForge/neoforge-26-3-client-modrinth-app.log'); + $this->assertStringEqualsFile($log->getExpectedPath(), $log->getOutput(), $log->getLogPath()); + } + /** * @return void * @throws Exception