aternosorg · JulianVennen · Feb 9, 2024 · Feb 9, 2024
diff --git a/lang/en.json b/lang/en.json
@@ -7,6 +7,7 @@
   "pocketmine-version": "Pocketmine version",
   "bedrock-version": "Bedrock version",
   "forge-version": "Forge version",
+  "neoforge-version": "NeoForge version",
   "magma-version": "Magma version",
   "mohist-version": "Mohist version",
   "arclight-version": "Arclight version",

diff --git a/src/Analyser/NeoForgeAnalyser.php b/src/Analyser/NeoForgeAnalyser.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Analyser;
+
+use Aternos\Codex\Minecraft\Analysis\Information\NeoForge\NeoForgeJavaVersionInformation;
+use Aternos\Codex\Minecraft\Analysis\Information\NeoForge\NeoForgeVanillaVersionInformation;
+use Aternos\Codex\Minecraft\Analysis\Information\NeoForge\NeoForgeVersionInformation;
+use Aternos\Codex\Minecraft\Analysis\Information\Vanilla\VanillaVersionInformation;
+
+class NeoForgeAnalyser extends VanillaAnalyser
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->addPossibleInsightClass(NeoForgeVersionInformation::class);
+        $this->overridePossibleInsightClass(VanillaVersionInformation::class, NeoForgeVanillaVersionInformation::class);
+        $this->addPossibleInsightClass(NeoForgeJavaVersionInformation::class);
+    }
+}
diff --git a/src/Analysis/Information/NeoForge/NeoForgeInformation.php b/src/Analysis/Information/NeoForge/NeoForgeInformation.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Analysis\Information\NeoForge;
+
+use Aternos\Codex\Minecraft\Analysis\Information\MinecraftInformation;
+
+abstract class NeoForgeInformation extends MinecraftInformation
+{
+
+}
diff --git a/src/Analysis/Information/NeoForge/NeoForgeJavaVersionInformation.php b/src/Analysis/Information/NeoForge/NeoForgeJavaVersionInformation.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Analysis\Information\NeoForge;
+
+use Aternos\Codex\Minecraft\Translator\Translator;
+
+class NeoForgeJavaVersionInformation extends NeoForgeInformation
+{
+    public function __construct()
+    {
+        $this->label = Translator::getInstance()->getTranslation("java-version");
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getPatterns(): array
+    {
+        return ['/\[cpw\.mods\.modlauncher\.Launcher\/MODLAUNCHER\]: ModLauncher(?: [\w\.+]+)? starting: java version ([0-9\._]+) by Oracle Corporation/'];
+    }
+}
diff --git a/src/Analysis/Information/NeoForge/NeoForgeVanillaVersionInformation.php b/src/Analysis/Information/NeoForge/NeoForgeVanillaVersionInformation.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Analysis\Information\NeoForge;
+
+use Aternos\Codex\Minecraft\Analysis\Information\Vanilla\VanillaVersionInformation;
+
+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 .")/"
+        ]);
+    }
+}
diff --git a/src/Analysis/Information/NeoForge/NeoForgeVersionInformation.php b/src/Analysis/Information/NeoForge/NeoForgeVersionInformation.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Analysis\Information\NeoForge;
+
+use Aternos\Codex\Minecraft\Translator\Translator;
+
+class NeoForgeVersionInformation extends NeoForgeInformation
+{
+    protected static string $versionPattern = "[0-9\.]+(-beta)?";
+
+    public function __construct()
+    {
+        $this->label = Translator::getInstance()->getTranslation("neoforge-version");
+    }
+
+    public static function getPatterns(): array
+    {
+        return [
+            '/NeoForge mod loading, version ('. static::$versionPattern .'),/',
+            '/--fml\.neoForgeVersion, ('. static::$versionPattern .')/'
+        ];
+    }
+
+    /**
+     * Get the NeoForge version pattern
+     * @return string
+     */
+    public static function getVersionPattern(): string
+    {
+        return static::$versionPattern;
+    }
+}
diff --git a/src/Detective/Detective.php b/src/Detective/Detective.php
@@ -33,6 +33,8 @@
 use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\Forge\Magma\MagmaServerLog;
 use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\Forge\Mohist\MohistCrashReportLog;
 use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\Forge\Mohist\MohistServerLog;
+    use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\NeoForge\NeoForgeClientLog;
+use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\NeoForge\NeoForgeServerLog;
 use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\OldVanillaServerLog;
 use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\Quilt\QuiltClientLog;
 use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\Quilt\QuiltServerLog;
@@ -53,6 +55,7 @@ class Detective extends \Aternos\Codex\Detective\Detective
         FabricClientLog::class,
         QuiltClientLog::class,
         ForgeClientLog::class,
+        NeoForgeClientLog::class,
         VanillaClientLog::class,
 
         VanillaServerLog::class,
@@ -68,6 +71,7 @@ class Detective extends \Aternos\Codex\Detective\Detective
         ArclightServerLog::class,
         MagmaServerLog::class,
         ForgeServerLog::class,
+        NeoForgeServerLog::class,
         PocketmineServerLog::class,
         BedrockServerLog::class,
         BedrockContentLog::class,

diff --git a/src/Log/Minecraft/Vanilla/Forge/ForgeClientLog.php b/src/Log/Minecraft/Vanilla/Forge/ForgeClientLog.php
@@ -19,7 +19,7 @@ class ForgeClientLog extends ForgeLog implements ClientLogTypeInterface
     public static function getDetectors(): array
     {
         return [
-            (new SinglePatternDetector())->setPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Launching target \'(fml|forge)client\' with arguments.*$/m')
+            (new SinglePatternDetector())->setPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: ModLauncher running: .*--fml.forgeVersion.*(\n.*)*\n\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Launching target \'(fml|forge)client\' with arguments.*$/m')
         ];
     }
 }
diff --git a/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeClientLog.php b/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeClientLog.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\NeoForge;
+
+use Aternos\Codex\Detective\DetectorInterface;
+use Aternos\Codex\Detective\SinglePatternDetector;
+use Aternos\Codex\Minecraft\Log\Type\ClientLogTypeInterface;
+
+class NeoForgeClientLog extends NeoForgeLog implements ClientLogTypeInterface
+{
+    /**
+     * @return DetectorInterface[]
+     */
+    public static function getDetectors(): array
+    {
+        return [
+            (new SinglePatternDetector())->setPattern('/^\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: ModLauncher running: .*--fml.neoForgeVersion.*(\n.*)*\n\[[^\]]+\] \[main\/INFO\]( \[[^\]]+\])?: Launching target \'(fml|forge)client\' with arguments.*$/m')
+        ];
+    }
+}
diff --git a/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeLog.php b/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeLog.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\NeoForge;
+
+use Aternos\Codex\Analyser\AnalyserInterface;
+use Aternos\Codex\Detective\DetectorInterface;
+use Aternos\Codex\Detective\SinglePatternDetector;
+use Aternos\Codex\Minecraft\Analyser\NeoForgeAnalyser;
+use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\VanillaLog;
+use Aternos\Codex\Minecraft\Parser\ForgeParser;
+use Aternos\Codex\Parser\ParserInterface;
+
+abstract class NeoForgeLog extends VanillaLog
+{
+    protected static string $pattern = '/^(\[(?:\S+ )?(?:[0-9]{2}\:?){3}(?:\.[0-9]+)?\] \[[^\]]+\/(\w+)\](?: \[([^\]]+)\])?\:).*$/';
+
+    /**
+     * @return DetectorInterface[]
+     */
+    public static function getDetectors(): array
+    {
+        return array_merge(parent::getDetectors(), [
+            (new SinglePatternDetector())->setPattern('/NeoForge mod loading/')
+        ]);
+    }
+
+    /**
+     * @return AnalyserInterface
+     */
+    public static function getDefaultAnalyser(): AnalyserInterface
+    {
+        return new NeoForgeAnalyser();
+    }
+
+    /**
+     * @return ParserInterface
+     */
+    public static function getDefaultParser(): ParserInterface
+    {
+        return (new ForgeParser())
+            ->setPattern(static::$pattern)
+            ->setMatches([ForgeParser::PREFIX, ForgeParser::LEVEL, ForgeParser::CHANNEL]);
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return "NeoForge";
+    }
+}
diff --git a/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeServerLog.php b/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeServerLog.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\NeoForge;
+
+use Aternos\Codex\Minecraft\Log\Type\ServerLogTypeInterface;
+
+class NeoForgeServerLog extends NeoForgeLog implements ServerLogTypeInterface
+{
+
+}