diff --git a/src/Analyser/MohistAnalyser.php b/src/Analyser/MohistAnalyser.php index 1f5a07e8..0867d40f 100644 --- a/src/Analyser/MohistAnalyser.php +++ b/src/Analyser/MohistAnalyser.php @@ -17,6 +17,6 @@ public function __construct() { parent::__construct(); $this->addPossibleInsightClass(MohistVersionInformation::class); - $this->overridePossibleInsightClass(ForgeVersionInformation::class ,MohistForgeVersionInformation::class); + $this->overridePossibleInsightClass(ForgeVersionInformation::class, MohistForgeVersionInformation::class); } } \ No newline at end of file diff --git a/src/Analyser/VanillaAnalyser.php b/src/Analyser/VanillaAnalyser.php index cb43abe9..bea8d160 100644 --- a/src/Analyser/VanillaAnalyser.php +++ b/src/Analyser/VanillaAnalyser.php @@ -4,11 +4,11 @@ use Aternos\Codex\Minecraft\Analysis\Information\Vanilla\VanillaVersionInformation; use Aternos\Codex\Minecraft\Analysis\Problem\Vanilla\AquaticWorldOnOlderVersionProblem; +use Aternos\Codex\Minecraft\Analysis\Problem\Vanilla\AuthServerProblem; use Aternos\Codex\Minecraft\Analysis\Problem\Vanilla\MalformedEncodingProblem; use Aternos\Codex\Minecraft\Analysis\Problem\Vanilla\OldPlayerDirectoryProblem; use Aternos\Codex\Minecraft\Analysis\Problem\Vanilla\OverworldSettingsMissingProblem; use Aternos\Codex\Minecraft\Analysis\Problem\Vanilla\TickingBlockEntityProblem; -use Aternos\Codex\Minecraft\Analysis\Problem\Vanilla\AuthServerProblem; /** * Class VanillaAnalyser diff --git a/src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderJavaVersionInformation.php b/src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderJavaVersionInformation.php index bc2b3db6..15acca03 100644 --- a/src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderJavaVersionInformation.php +++ b/src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderJavaVersionInformation.php @@ -21,6 +21,6 @@ public function __construct() */ public static function getPatterns(): array { - return [ '/^' . CustomSkinLoaderLog::getPrefixPattern() . 'Java Version: ([0-9\.]+(?:_\d+)?)/']; + return ['/^' . CustomSkinLoaderLog::getPrefixPattern() . 'Java Version: ([0-9\.]+(?:_\d+)?)/']; } } \ No newline at end of file diff --git a/src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderMinecraftVersionInformation.php b/src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderMinecraftVersionInformation.php index 9e40f34a..260b4bb6 100644 --- a/src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderMinecraftVersionInformation.php +++ b/src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderMinecraftVersionInformation.php @@ -22,6 +22,6 @@ public function __construct() */ public static function getPatterns(): array { - return [ '/^' . CustomSkinLoaderLog::getPrefixPattern() . 'Minecraft: (' . VanillaVersionInformation::getVersionPattern() . ')$/']; + return ['/^' . CustomSkinLoaderLog::getPrefixPattern() . 'Minecraft: (' . VanillaVersionInformation::getVersionPattern() . ')$/']; } } \ No newline at end of file diff --git a/src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderVersionInformation.php b/src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderVersionInformation.php index c341612d..c2713371 100644 --- a/src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderVersionInformation.php +++ b/src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderVersionInformation.php @@ -23,7 +23,7 @@ public function __construct() */ public static function getPatterns(): array { - return [ '/^' . CustomSkinLoaderLog::getPrefixPattern() . 'CustomSkinLoader ('. static::$versionPattern .')$/']; + return ['/^' . CustomSkinLoaderLog::getPrefixPattern() . 'CustomSkinLoader (' . static::$versionPattern . ')$/']; } /** diff --git a/src/Analysis/Information/Fabric/CrashReport/FabricVersionInformation.php b/src/Analysis/Information/Fabric/CrashReport/FabricVersionInformation.php index 258e85b3..1dad8254 100644 --- a/src/Analysis/Information/Fabric/CrashReport/FabricVersionInformation.php +++ b/src/Analysis/Information/Fabric/CrashReport/FabricVersionInformation.php @@ -7,7 +7,7 @@ class FabricVersionInformation extends \Aternos\Codex\Minecraft\Analysis\Informa public static function getPatterns(): array { return [ - '/\t\tfabricloader: Fabric Loader ('. static::$fabricVersionPattern .')/' + '/\t\tfabricloader: Fabric Loader (' . static::$fabricVersionPattern . ')/' ]; } diff --git a/src/Analysis/Information/Fabric/FabricJavaVersionInformation.php b/src/Analysis/Information/Fabric/FabricJavaVersionInformation.php index aff2ddd3..e96f4044 100644 --- a/src/Analysis/Information/Fabric/FabricJavaVersionInformation.php +++ b/src/Analysis/Information/Fabric/FabricJavaVersionInformation.php @@ -30,8 +30,8 @@ public function __construct() public static function getPatterns(): array { return [ - '/'. FabricLog::getPrefixPattern() .'[\[(]FabricLoader[\])] Loading [0-9]+ mods:[\s\n](?:\s*[^,]+, ?)*(?:\s+- )?java[ @](\d+)/', - '/'. FabricLog::getPrefixPattern() .'(?:[\[(]FabricLoader[\])] )?Loading [0-9]+ mods:[\s\n](?:\s*- .+\n ?)*(?:\s+- )?java[ @](\d+)/' + '/' . FabricLog::getPrefixPattern() . '[\[(]FabricLoader[\])] Loading [0-9]+ mods:[\s\n](?:\s*[^,]+, ?)*(?:\s+- )?java[ @](\d+)/', + '/' . FabricLog::getPrefixPattern() . '(?:[\[(]FabricLoader[\])] )?Loading [0-9]+ mods:[\s\n](?:\s*- .+\n ?)*(?:\s+- )?java[ @](\d+)/' ]; } diff --git a/src/Analysis/Information/Fabric/FabricVersionInformation.php b/src/Analysis/Information/Fabric/FabricVersionInformation.php index 18f94362..ffc3b3ca 100644 --- a/src/Analysis/Information/Fabric/FabricVersionInformation.php +++ b/src/Analysis/Information/Fabric/FabricVersionInformation.php @@ -33,8 +33,8 @@ public function __construct() public static function getPatterns(): array { return [ - '/'. VanillaServerLog::getPrefixPattern() .'[\[(]FabricLoader[\])] Loading [0-9]+ mods: (?:\w{1,63}@[^, ]+, )*fabricloader@('. static::$fabricVersionPattern .')/', - '/'. VanillaServerLog::getPrefixPattern() .'(?:\(FabricLoader\/GameProvider\) )?Loading Minecraft '. VanillaVersionInformation::getVersionPattern() .' with Fabric Loader ('. static::$fabricVersionPattern .')/' + '/' . VanillaServerLog::getPrefixPattern() . '[\[(]FabricLoader[\])] Loading [0-9]+ mods: (?:\w{1,63}@[^, ]+, )*fabricloader@(' . static::$fabricVersionPattern . ')/', + '/' . VanillaServerLog::getPrefixPattern() . '(?:\(FabricLoader\/GameProvider\) )?Loading Minecraft ' . VanillaVersionInformation::getVersionPattern() . ' with Fabric Loader (' . static::$fabricVersionPattern . ')/' ]; } diff --git a/src/Analysis/Information/Forge/CrashReport/ForgeVersionInformation.php b/src/Analysis/Information/Forge/CrashReport/ForgeVersionInformation.php index f56fe6d0..55dc344c 100644 --- a/src/Analysis/Information/Forge/CrashReport/ForgeVersionInformation.php +++ b/src/Analysis/Information/Forge/CrashReport/ForgeVersionInformation.php @@ -7,8 +7,8 @@ class ForgeVersionInformation extends \Aternos\Codex\Minecraft\Analysis\Informat public static function getPatterns(): array { return [ - '/FML: MCP (?:'. static::$versionPattern .') Powered by Forge ('. static::$versionPattern .')/', - '/Forge: net.minecraftforge:('. static::$versionPattern .')/', + '/FML: MCP (?:' . static::$versionPattern . ') Powered by Forge (' . static::$versionPattern . ')/', + '/Forge: net.minecraftforge:(' . static::$versionPattern . ')/', ]; } } \ No newline at end of file diff --git a/src/Analysis/Information/Forge/ForgeVersionInformation.php b/src/Analysis/Information/Forge/ForgeVersionInformation.php index d1527b9c..6425c91c 100644 --- a/src/Analysis/Information/Forge/ForgeVersionInformation.php +++ b/src/Analysis/Information/Forge/ForgeVersionInformation.php @@ -31,8 +31,8 @@ public function __construct() public static function getPatterns(): array { return [ - '/MinecraftForge v('. static::$versionPattern .') Initialized/', - '/--fml\.forgeVersion, ('. static::$versionPattern .')/' + '/MinecraftForge v(' . static::$versionPattern . ') Initialized/', + '/--fml\.forgeVersion, (' . static::$versionPattern . ')/' ]; } diff --git a/src/Analysis/Information/NeoForge/NeoForgeVanillaVersionInformation.php b/src/Analysis/Information/NeoForge/NeoForgeVanillaVersionInformation.php index 8aabb5c4..955357c0 100644 --- a/src/Analysis/Information/NeoForge/NeoForgeVanillaVersionInformation.php +++ b/src/Analysis/Information/NeoForge/NeoForgeVanillaVersionInformation.php @@ -9,8 +9,8 @@ class NeoForgeVanillaVersionInformation extends VanillaVersionInformation public static function getPatterns(): array { return array_merge(parent::getPatterns(), [ - '/NeoForge mod loading, version '. NeoForgeVersionInformation::getVersionPattern() .', for MC ('. static::$vanillaVersionPattern . ')/', - "/--fml\.mcVersion, (". static::$vanillaVersionPattern .")/" + '/NeoForge mod loading, version ' . NeoForgeVersionInformation::getVersionPattern() . ', for MC (' . static::$vanillaVersionPattern . ')/', + "/--fml\.mcVersion, (" . static::$vanillaVersionPattern . ")/" ]); } } \ No newline at end of file diff --git a/src/Analysis/Information/Quilt/QuiltJavaVersionInformation.php b/src/Analysis/Information/Quilt/QuiltJavaVersionInformation.php index 5dc25f4c..075e319b 100644 --- a/src/Analysis/Information/Quilt/QuiltJavaVersionInformation.php +++ b/src/Analysis/Information/Quilt/QuiltJavaVersionInformation.php @@ -26,7 +26,7 @@ public function __construct() */ public static function getPatterns(): array { - return ['/'. VanillaServerLog::getPrefixPattern() .'Loading [0-9]+ mods:[\s\n](?:\s*- .+\n ?)*(?:\s+- )?java[ @](\d+)/']; + return ['/' . VanillaServerLog::getPrefixPattern() . 'Loading [0-9]+ mods:[\s\n](?:\s*- .+\n ?)*(?:\s+- )?java[ @](\d+)/']; } /** diff --git a/src/Analysis/Information/Quilt/QuiltVersionInformation.php b/src/Analysis/Information/Quilt/QuiltVersionInformation.php index 790e3c30..64051348 100644 --- a/src/Analysis/Information/Quilt/QuiltVersionInformation.php +++ b/src/Analysis/Information/Quilt/QuiltVersionInformation.php @@ -27,7 +27,7 @@ public function __construct() public static function getPatterns(): array { return [ - '/'. VanillaServerLog::getPrefixPattern() .'Loading Minecraft '. VanillaVersionInformation::getVersionPattern() .' with Quilt Loader ('. static::$quiltVersionInformation .')/' + '/' . VanillaServerLog::getPrefixPattern() . 'Loading Minecraft ' . VanillaVersionInformation::getVersionPattern() . ' with Quilt Loader (' . static::$quiltVersionInformation . ')/' ]; } diff --git a/src/Analysis/Problem/Fabric/FabricDuplicateModProblem.php b/src/Analysis/Problem/Fabric/FabricDuplicateModProblem.php index 299689b1..75b6208e 100644 --- a/src/Analysis/Problem/Fabric/FabricDuplicateModProblem.php +++ b/src/Analysis/Problem/Fabric/FabricDuplicateModProblem.php @@ -28,7 +28,7 @@ public function getMessage(): string public static function getPatterns(): array { return [ - "/". VanillaServerLog::getPrefixPattern() . "A critical error occurred\nnet\.fabricmc\.loader\.discovery\.ModResolutionException: Duplicate versions for mod ID '([^']+)': \[[^ ]+ at ([^\]]+)\]/" + "/" . VanillaServerLog::getPrefixPattern() . "A critical error occurred\nnet\.fabricmc\.loader\.discovery\.ModResolutionException: Duplicate versions for mod ID '([^']+)': \[[^ ]+ at ([^\]]+)\]/" ]; } diff --git a/src/Analysis/Problem/Fabric/FabricEntryStageProblem.php b/src/Analysis/Problem/Fabric/FabricEntryStageProblem.php index aebb6730..a6106b25 100644 --- a/src/Analysis/Problem/Fabric/FabricEntryStageProblem.php +++ b/src/Analysis/Problem/Fabric/FabricEntryStageProblem.php @@ -26,7 +26,7 @@ public function getMessage(): string public static function getPatterns(): array { return [ - "/java.lang.RuntimeException: Could not execute entrypoint stage '[^']+' due to errors, provided by '(".static::$modIDPattern.")'!/" + "/java.lang.RuntimeException: Could not execute entrypoint stage '[^']+' due to errors, provided by '(" . static::$modIDPattern . ")'!/" ]; } diff --git a/src/Analysis/Problem/Fabric/FabricIncompatibleModsProblem.php b/src/Analysis/Problem/Fabric/FabricIncompatibleModsProblem.php index 04050cc9..891593de 100644 --- a/src/Analysis/Problem/Fabric/FabricIncompatibleModsProblem.php +++ b/src/Analysis/Problem/Fabric/FabricIncompatibleModsProblem.php @@ -38,7 +38,7 @@ protected function setSecondModName(string $modName): static public static function getPatterns(): array { return [ - "/\s*- Mod ". static::$modNamePattern ." [^\\n]+ (?:is incompatible|conflicts) with [^\\n]+ of (?:mod )?". static::$modNamePattern .",/" + "/\s*- Mod " . static::$modNamePattern . " [^\\n]+ (?:is incompatible|conflicts) with [^\\n]+ of (?:mod )?" . static::$modNamePattern . ",/" ]; } diff --git a/src/Analysis/Problem/Fabric/FabricModDependencyProblem.php b/src/Analysis/Problem/Fabric/FabricModDependencyProblem.php index 28f3bb69..19331f82 100644 --- a/src/Analysis/Problem/Fabric/FabricModDependencyProblem.php +++ b/src/Analysis/Problem/Fabric/FabricModDependencyProblem.php @@ -37,13 +37,13 @@ public function getMessage(): string public static function getPatterns(): array { return [ - 'short-error' => '/net\.fabricmc\.loader\.discovery\.ModResolutionException: Could not find required mod: '. static::$modNamePattern .' requires {'. static::$modNamePattern .' @ \[([^\]]+)\]}/', - 'any' => "/\s*- Mod ". static::$modNamePattern ."(?: [^ ]+)? requires any version of (?:mod )?". static::$modNamePattern .",/", - 'minimum' => "/\s*- Mod ". static::$modNamePattern ."(?: [^ ]+)? requires version ([^ ]+) or later of (?:mod )?". static::$modNamePattern .",/", - 'any-after' => "/\s*- Mod ". static::$modNamePattern ."(?: [^ ]+)? requires any version after ([^ ]+) of (?:mod )?". static::$modNamePattern .",/", - 'any-before' => "/\s*- Mod ". static::$modNamePattern ."(?: [^ ]+)? requires any version before ([^ ]+) of (?:mod )?". static::$modNamePattern .",/", - 'specific' => "/\s*- Mod ". static::$modNamePattern ."(?: [^ ]+)? requires version ([^ ]+) of (?:mod )?". static::$modNamePattern .",/", - 'between' => "/\s*- Mod ". static::$modNamePattern ."(?: [^ ]+)? requires any version between ([^ ]+) \((inclusive|exclusive)\) and ([^ ]+) \((inclusive|exclusive)\) of (?:mod )?". static::$modNamePattern .",/" + 'short-error' => '/net\.fabricmc\.loader\.discovery\.ModResolutionException: Could not find required mod: ' . static::$modNamePattern . ' requires {' . static::$modNamePattern . ' @ \[([^\]]+)\]}/', + 'any' => "/\s*- Mod " . static::$modNamePattern . "(?: [^ ]+)? requires any version of (?:mod )?" . static::$modNamePattern . ",/", + 'minimum' => "/\s*- Mod " . static::$modNamePattern . "(?: [^ ]+)? requires version ([^ ]+) or later of (?:mod )?" . static::$modNamePattern . ",/", + 'any-after' => "/\s*- Mod " . static::$modNamePattern . "(?: [^ ]+)? requires any version after ([^ ]+) of (?:mod )?" . static::$modNamePattern . ",/", + 'any-before' => "/\s*- Mod " . static::$modNamePattern . "(?: [^ ]+)? requires any version before ([^ ]+) of (?:mod )?" . static::$modNamePattern . ",/", + 'specific' => "/\s*- Mod " . static::$modNamePattern . "(?: [^ ]+)? requires version ([^ ]+) of (?:mod )?" . static::$modNamePattern . ",/", + 'between' => "/\s*- Mod " . static::$modNamePattern . "(?: [^ ]+)? requires any version between ([^ ]+) \((inclusive|exclusive)\) and ([^ ]+) \((inclusive|exclusive)\) of (?:mod )?" . static::$modNamePattern . ",/" ]; } diff --git a/src/Analysis/Problem/Vanilla/AuthServerProblem.php b/src/Analysis/Problem/Vanilla/AuthServerProblem.php index 7297df6a..dce950f3 100644 --- a/src/Analysis/Problem/Vanilla/AuthServerProblem.php +++ b/src/Analysis/Problem/Vanilla/AuthServerProblem.php @@ -2,8 +2,8 @@ namespace Aternos\Codex\Minecraft\Analysis\Problem\Vanilla; -use Aternos\Codex\Minecraft\Translator\Translator; use Aternos\Codex\Minecraft\Analysis\Solution\Vanilla\AuthServerSolution; +use Aternos\Codex\Minecraft\Translator\Translator; /** * Class AuthServerProblem diff --git a/src/Analysis/Solution/Bukkit/ServerInstallDifferentVersionSolution.php b/src/Analysis/Solution/Bukkit/ServerInstallDifferentVersionSolution.php index c86852fd..c5ce8619 100644 --- a/src/Analysis/Solution/Bukkit/ServerInstallDifferentVersionSolution.php +++ b/src/Analysis/Solution/Bukkit/ServerInstallDifferentVersionSolution.php @@ -10,7 +10,7 @@ class ServerInstallDifferentVersionSolution extends BukkitSolution /** * Returns the suggested server software version that should be installed. - * + * * @return string */ public function getSoftwareVersion(): string diff --git a/src/Log/Minecraft/CustomSkinLoader/CustomSkinLoaderClientLog.php b/src/Log/Minecraft/CustomSkinLoader/CustomSkinLoaderClientLog.php index a5cd1b8b..1db856ac 100644 --- a/src/Log/Minecraft/CustomSkinLoader/CustomSkinLoaderClientLog.php +++ b/src/Log/Minecraft/CustomSkinLoader/CustomSkinLoaderClientLog.php @@ -15,7 +15,7 @@ class CustomSkinLoaderClientLog extends CustomSkinLoaderLog implements ClientLog public static function getDetectors(): array { return [(new SinglePatternDetector()) - ->setPattern("/^". static::$prefixPattern . "CustomSkinLoader " + ->setPattern("/^" . static::$prefixPattern . "CustomSkinLoader " . CustomSkinLoaderVersionInformation::getVersionPattern() . "$/m")]; } } \ No newline at end of file diff --git a/src/Log/Minecraft/Vanilla/Fabric/FabricLog.php b/src/Log/Minecraft/Vanilla/Fabric/FabricLog.php index eda5cb94..8d4af379 100644 --- a/src/Log/Minecraft/Vanilla/Fabric/FabricLog.php +++ b/src/Log/Minecraft/Vanilla/Fabric/FabricLog.php @@ -25,7 +25,7 @@ abstract class FabricLog extends VanillaLog public static function getDetectors(): array { return array_merge(parent::getDetectors(), [ - (new SinglePatternDetector())->setPattern('/^' . static::$prefixPattern . '(?:\(FabricLoader\/GameProvider\) )?Loading Minecraft '. VanillaVersionInformation::getVersionPattern() . ' with Fabric Loader/m'), + (new SinglePatternDetector())->setPattern('/^' . static::$prefixPattern . '(?:\(FabricLoader\/GameProvider\) )?Loading Minecraft ' . VanillaVersionInformation::getVersionPattern() . ' with Fabric Loader/m'), (new SinglePatternDetector())->setPattern('/^' . static::$prefixPattern . '[[(]FabricLoader[\])] Loading \d+ mods:/m'), (new SinglePatternDetector())->setPattern('/^' . static::$prefixPattern . 'A critical error occurred\nnet.fabricmc.loader/m'), (new SinglePatternDetector())->setPattern('/^' . static::$prefixPattern . 'Found new data pack Fabric Mods, loading it automatically$/m'), diff --git a/src/Log/Minecraft/Vanilla/Quilt/QuiltLog.php b/src/Log/Minecraft/Vanilla/Quilt/QuiltLog.php index d3fec6de..882db40f 100644 --- a/src/Log/Minecraft/Vanilla/Quilt/QuiltLog.php +++ b/src/Log/Minecraft/Vanilla/Quilt/QuiltLog.php @@ -22,7 +22,7 @@ abstract class QuiltLog extends VanillaLog public static function getDetectors(): array { return array_merge(parent::getDetectors(), [ - (new SinglePatternDetector())->setPattern('/^' . static::$prefixPattern . 'Loading Minecraft '. VanillaVersionInformation::getVersionPattern() . ' with Quilt Loader/m') + (new SinglePatternDetector())->setPattern('/^' . static::$prefixPattern . 'Loading Minecraft ' . VanillaVersionInformation::getVersionPattern() . ' with Quilt Loader/m') ]); }