Merge pull request #44 from aternosorg/custom-skin-loader

Add support for logs by CustomSkinLoader

lang/en.json

@@ -10,6 +10,7 @@
   "magma-version": "Magma version",
   "mohist-version": "Mohist version",
   "arclight-version": "Arclight version",
+  "custom-skin-loader-version": "Custom Skin Loader version",
   "authme-shutdown-problem": "The plugin 'AuthMe' fails to load and shuts the server down.",
   "pex-config-problem": "The configuration of the plugin 'PermissionsEx' is invalid.",
   "ambiguous-plugin-name-problem": "There are multiple plugin files for the plugin name '{{plugin-name}}': '{{first-plugin-path}}' and '{{second-plugin-path}}'.",

src/Analyser/CustomSkinLoaderAnalyser.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Analyser;
+
+use Aternos\Codex\Minecraft\Analysis\Information\CustomSkinLoader\CustomSkinLoaderJavaVersionInformation;
+use Aternos\Codex\Minecraft\Analysis\Information\CustomSkinLoader\CustomSkinLoaderMinecraftVersionInformation;
+use Aternos\Codex\Minecraft\Analysis\Information\CustomSkinLoader\CustomSkinLoaderVersionInformation;
+
+class CustomSkinLoaderAnalyser extends MinecraftAnalyser
+{
+    public function __construct()
+    {
+        $this->addPossibleInsightClass(CustomSkinLoaderVersionInformation::class);
+        $this->addPossibleInsightClass(CustomSkinLoaderJavaVersionInformation::class);
+        $this->addPossibleInsightClass(CustomSkinLoaderMinecraftVersionInformation::class);
+    }
+}

src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderInformation.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Analysis\Information\CustomSkinLoader;
+
+use Aternos\Codex\Minecraft\Analysis\Information\MinecraftInformation;
+
+abstract class CustomSkinLoaderInformation extends MinecraftInformation
+{
+
+}

src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderJavaVersionInformation.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Analysis\Information\CustomSkinLoader;
+
+use Aternos\Codex\Minecraft\Analysis\Information\Vanilla\VanillaVersionInformation;
+use Aternos\Codex\Minecraft\Log\Minecraft\CustomSkinLoader\CustomSkinLoaderLog;
+use Aternos\Codex\Minecraft\Translator\Translator;
+
+class CustomSkinLoaderJavaVersionInformation extends CustomSkinLoaderInformation
+{
+    public function __construct()
+    {
+        $this->label = Translator::getInstance()->getTranslation("java-version");
+    }
+
+    /**
+     * Get an array of possible patterns
+     *
+     * The array key of the pattern will be passed to setMatches()
+     *
+     * @return string[]
+     */
+    public static function getPatterns(): array
+    {
+        return [ '/^' . CustomSkinLoaderLog::getPrefixPattern() . 'Java Version: ([0-9\.]+(?:_\d+)?)/'];
+    }
+}

src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderMinecraftVersionInformation.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Analysis\Information\CustomSkinLoader;
+
+use Aternos\Codex\Minecraft\Analysis\Information\Vanilla\VanillaVersionInformation;
+use Aternos\Codex\Minecraft\Log\Minecraft\CustomSkinLoader\CustomSkinLoaderLog;
+use Aternos\Codex\Minecraft\Translator\Translator;
+
+class CustomSkinLoaderMinecraftVersionInformation extends CustomSkinLoaderInformation
+{
+    public function __construct()
+    {
+        $this->label = Translator::getInstance()->getTranslation("minecraft-version");
+    }
+
+    /**
+     * Get an array of possible patterns
+     *
+     * The array key of the pattern will be passed to setMatches()
+     *
+     * @return string[]
+     */
+    public static function getPatterns(): array
+    {
+        return [ '/^' . CustomSkinLoaderLog::getPrefixPattern() . 'Minecraft: (' . VanillaVersionInformation::getVersionPattern() . ')$/'];
+    }
+}

src/Analysis/Information/CustomSkinLoader/CustomSkinLoaderVersionInformation.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Analysis\Information\CustomSkinLoader;
+
+use Aternos\Codex\Minecraft\Log\Minecraft\CustomSkinLoader\CustomSkinLoaderLog;
+use Aternos\Codex\Minecraft\Translator\Translator;
+
+class CustomSkinLoaderVersionInformation extends CustomSkinLoaderInformation
+{
+    public function __construct()
+    {
+        $this->label = Translator::getInstance()->getTranslation("custom-skin-loader-version");
+    }
+
+    /**
+     * Get an array of possible patterns
+     *
+     * The array key of the pattern will be passed to setMatches()
+     *
+     * @return string[]
+     */
+    public static function getPatterns(): array
+    {
+        return [ '/^' . CustomSkinLoaderLog::getPrefixPattern() . 'CustomSkinLoader ([\d.]+)$/'];
+    }
+}

src/Detective/Detective.php

@@ -6,6 +6,7 @@
 use Aternos\Codex\Minecraft\Log\Minecraft\Bedrock\BedrockServerLog;
 use Aternos\Codex\Minecraft\Log\Minecraft\BungeeCord\BungeeCordProxyLog;
 use Aternos\Codex\Minecraft\Log\Minecraft\BungeeCord\Waterfall\WaterFallProxyLog;
+use Aternos\Codex\Minecraft\Log\Minecraft\CustomSkinLoader\CustomSkinLoaderClientLog;
 use Aternos\Codex\Minecraft\Log\Minecraft\Geyser\GeyserProxyLog;
 use Aternos\Codex\Minecraft\Log\Minecraft\MinecraftLog;
 use Aternos\Codex\Minecraft\Log\Minecraft\Pocketmine\PocketmineServerLog;
@@ -83,7 +84,8 @@ class Detective extends \Aternos\Codex\Detective\Detective
         MohistCrashReportLog::class,
         ArclightCrashReportLog::class,
 
-        PrismLauncherClientLog::class
+        PrismLauncherClientLog::class,
+        CustomSkinLoaderClientLog::class,
     ];
 
     /**

src/Log/Minecraft/CustomSkinLoader/CustomSkinLoaderClientLog.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Log\Minecraft\CustomSkinLoader;
+
+use Aternos\Codex\Detective\DetectorInterface;
+use Aternos\Codex\Detective\SinglePatternDetector;
+use Aternos\Codex\Minecraft\Log\Type\ClientLogTypeInterface;
+
+class CustomSkinLoaderClientLog extends CustomSkinLoaderLog implements ClientLogTypeInterface
+{
+    /**
+     * @return DetectorInterface[]
+     */
+    public static function getDetectors(): array
+    {
+        return [(new SinglePatternDetector())->setPattern("/^\[\d{4}(?:\-\d\d){2} (?:[0-9]{2}\:?){3}\] \[Render thread INFO\] CustomSkinLoader [\d\.]+$/m")];
+    }
+}

src/Log/Minecraft/CustomSkinLoader/CustomSkinLoaderLog.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Log\Minecraft\CustomSkinLoader;
+
+use Aternos\Codex\Analyser\AnalyserInterface;
+use Aternos\Codex\Minecraft\Analyser\CustomSkinLoaderAnalyser;
+use Aternos\Codex\Minecraft\Parser\Parser;
+
+/**
+ * Class CustomSkinLoaderLog
+ *
+ * @package Aternos\Codex\Minecraft\Log\Minecraft\CustomSkinLoader
+ */
+abstract class CustomSkinLoaderLog extends \Aternos\Codex\Minecraft\Log\Minecraft\MinecraftLog
+{
+    protected static string $prefixPattern = '\[\d{4}(?:\-\d\d){2} (?:[0-9]{2}\:?){3}\] \[[^\]]+ [A-Z]+\] ';
+    protected static string $pattern = '/^(\[(\d{4}(?:\-\d\d){2} (?:[0-9]{2}\:?){3})\] \[[^\]]+ ([A-Z]+)\]) .*$/';
+
+    /**
+     * @return Parser
+     */
+    public static function getDefaultParser(): Parser
+    {
+        return (new Parser())
+            ->setPattern(static::$pattern)
+            ->setTimeFormat('Y-m-d H:i:s')
+            ->setMatches([Parser::PREFIX, Parser::TIME, Parser::LEVEL]);;
+    }
+
+    public static function getDefaultAnalyser(): AnalyserInterface
+    {
+        return new CustomSkinLoaderAnalyser();
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return "Custom Skin Loader";
+    }
+
+    /**
+     * @return string
+     */
+    public static function getPrefixPattern(): string
+    {
+        return static::$prefixPattern;
+    }
+}