Merge pull request #75 from aternosorg/network-protocol-error-reports

added network protocol error reports
aternosorg · Jun 17, 2024 · ab489e5 · ab489e5
2 parents 6d344ee + ff342d0
commit ab489e5
Show file tree

Hide file tree

Showing 29 changed files with 1,466 additions and 63 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -83,6 +83,7 @@
   "type-proxy": "Proxy Log",
   "type-content": "Content Log",
   "type-crash-report": "Crash Report",
+  "type-network-protocol-error-report": "Network Protocol Error Report",
   "type-unknown": "Unknown Log",
   "forge-language-provider-version-problem": "The mod '{{mod-file}}' requires '{{required-version}}', but '{{found-version}}' is installed."
 }
diff --git a/src/Analyser/CrashReport/MinecraftCrashReportAnalyser.php b/src/Analyser/CrashReport/MinecraftCrashReportAnalyser.php
diff --git a/...CrashReport/FabricCrashReportAnalyser.php → ...CrashReport/FabricCrashReportAnalyser.php b/...CrashReport/FabricCrashReportAnalyser.php → ...CrashReport/FabricCrashReportAnalyser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Aternos\Codex\Minecraft\Analyser\CrashReport;
+namespace Aternos\Codex\Minecraft\Analyser\Report\CrashReport;
 
 use Aternos\Codex\Minecraft\Analysis\Information\Fabric\CrashReport\FabricVersionInformation;
 

diff --git a/.../CrashReport/ForgeCrashReportAnalyser.php → .../CrashReport/ForgeCrashReportAnalyser.php b/.../CrashReport/ForgeCrashReportAnalyser.php → .../CrashReport/ForgeCrashReportAnalyser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Aternos\Codex\Minecraft\Analyser\CrashReport;
+namespace Aternos\Codex\Minecraft\Analyser\Report\CrashReport;
 
 use Aternos\Codex\Minecraft\Analysis\Information\Forge\CrashReport\ForgeVersionInformation;
 

diff --git a/src/Analyser/Report/CrashReport/MinecraftCrashReportAnalyser.php b/src/Analyser/Report/CrashReport/MinecraftCrashReportAnalyser.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Analyser\Report\CrashReport;
+
+use Aternos\Codex\Minecraft\Analyser\Report\MinecraftReportAnalyser;
+use Aternos\Codex\Minecraft\Analysis\Problem\CrashReport\TickingBlockEntityProblem;
+use Aternos\Codex\Minecraft\Analysis\Problem\CrashReport\TickingEntityProblem;
+
+/**
+ * Class MinecraftCrashReportAnalyser
+ *
+ * @package Aternos\Codex\Minecraft\Analyser\Report\CrashReport
+ */
+class MinecraftCrashReportAnalyser extends MinecraftReportAnalyser
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->addPossibleInsightClass(TickingEntityProblem::class);
+        $this->addPossibleInsightClass(TickingBlockEntityProblem::class);
+    }
+}
diff --git a/...ashReport/NeoForgeCrashReportAnalyser.php → ...ashReport/NeoForgeCrashReportAnalyser.php b/...ashReport/NeoForgeCrashReportAnalyser.php → ...ashReport/NeoForgeCrashReportAnalyser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Aternos\Codex\Minecraft\Analyser\CrashReport;
+namespace Aternos\Codex\Minecraft\Analyser\Report\CrashReport;
 
 use Aternos\Codex\Minecraft\Analysis\Information\NeoForge\NeoForgeVersionInformation;
 

diff --git a/.../CrashReport/QuiltCrashReportAnalyser.php → .../CrashReport/QuiltCrashReportAnalyser.php b/.../CrashReport/QuiltCrashReportAnalyser.php → .../CrashReport/QuiltCrashReportAnalyser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Aternos\Codex\Minecraft\Analyser\CrashReport;
+namespace Aternos\Codex\Minecraft\Analyser\Report\CrashReport;
 
 /**
  * Class FabricCrashReportAnalyser

diff --git a/src/Analyser/Report/MinecraftReportAnalyser.php b/src/Analyser/Report/MinecraftReportAnalyser.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Analyser\Report;
+
+use Aternos\Codex\Minecraft\Analyser\MinecraftAnalyser;
+use Aternos\Codex\Minecraft\Analysis\Information\CrashReport\JavaVersionInformation;
+use Aternos\Codex\Minecraft\Analysis\Information\CrashReport\VanillaVersionInformation;
+
+class MinecraftReportAnalyser extends MinecraftAnalyser
+{
+    public function __construct()
+    {
+        $this->addPossibleInsightClass(VanillaVersionInformation::class);
+        $this->addPossibleInsightClass(JavaVersionInformation::class);
+    }
+}
diff --git a/...nalyser/Report/NetworkProtocolErrorReport/MinecraftNetworkProtocolErrorReportAnalyser.php b/...nalyser/Report/NetworkProtocolErrorReport/MinecraftNetworkProtocolErrorReportAnalyser.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Analyser\Report\NetworkProtocolErrorReport;
+
+use Aternos\Codex\Minecraft\Analyser\Report\MinecraftReportAnalyser;
+
+class MinecraftNetworkProtocolErrorReportAnalyser extends MinecraftReportAnalyser
+{
+
+}
diff --git a/src/Detective/Detective.php b/src/Detective/Detective.php
@@ -42,6 +42,7 @@
 use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\Quilt\QuiltServerLog;
 use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\VanillaClientLog;
 use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\VanillaCrashReportLog;
+use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\VanillaNetworkProtocolErrorReportLog;
 use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\VanillaServerLog;
 use Aternos\Codex\Minecraft\Log\Minecraft\Velocity\VelocityProxyLog;
 
@@ -96,6 +97,8 @@ class Detective extends \Aternos\Codex\Detective\Detective
         MohistCrashReportLog::class,
         ArclightCrashReportLog::class,
 
+        VanillaNetworkProtocolErrorReportLog::class,
+
         PrismLauncherClientLog::class,
         CustomSkinLoaderClientLog::class,
     ];

diff --git a/src/Log/Minecraft/MinecraftLog.php b/src/Log/Minecraft/MinecraftLog.php
@@ -11,6 +11,7 @@
 use Aternos\Codex\Minecraft\Log\Type\ClientLogTypeInterface;
 use Aternos\Codex\Minecraft\Log\Type\ContentLogTypeInterface;
 use Aternos\Codex\Minecraft\Log\Type\CrashReportLogTypeInterface;
+use Aternos\Codex\Minecraft\Log\Type\NetworkProtocolErrorReportLogTypeInterface;
 use Aternos\Codex\Minecraft\Log\Type\ProxyLogTypeInterface;
 use Aternos\Codex\Minecraft\Log\Type\ServerLogTypeInterface;
 use Aternos\Codex\Minecraft\Parser\Parser;
@@ -95,6 +96,7 @@ public function getTypeId(): ?string
             $this instanceof ClientLogTypeInterface => "client",
             $this instanceof ProxyLogTypeInterface => "proxy",
             $this instanceof CrashReportLogTypeInterface => "crash-report",
+            $this instanceof NetworkProtocolErrorReportLogTypeInterface => "network-protocol-error-report",
             $this instanceof ContentLogTypeInterface => "content",
             default => null
         };

diff --git a/src/Log/Minecraft/Vanilla/Fabric/FabricCrashReportLog.php b/src/Log/Minecraft/Vanilla/Fabric/FabricCrashReportLog.php
@@ -4,8 +4,8 @@
 
 use Aternos\Codex\Detective\DetectorInterface;
 use Aternos\Codex\Detective\SinglePatternDetector;
-use Aternos\Codex\Minecraft\Analyser\CrashReport\FabricCrashReportAnalyser;
-use Aternos\Codex\Minecraft\Analyser\CrashReport\MinecraftCrashReportAnalyser;
+use Aternos\Codex\Minecraft\Analyser\Report\CrashReport\FabricCrashReportAnalyser;
+use Aternos\Codex\Minecraft\Analyser\Report\CrashReport\MinecraftCrashReportAnalyser;
 use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\VanillaCrashReportTrait;
 use Aternos\Codex\Minecraft\Log\Type\CrashReportLogTypeInterface;
 

diff --git a/src/Log/Minecraft/Vanilla/Forge/ForgeCrashReportLog.php b/src/Log/Minecraft/Vanilla/Forge/ForgeCrashReportLog.php
@@ -4,8 +4,8 @@
 
 use Aternos\Codex\Detective\DetectorInterface;
 use Aternos\Codex\Detective\SinglePatternDetector;
-use Aternos\Codex\Minecraft\Analyser\CrashReport\ForgeCrashReportAnalyser;
-use Aternos\Codex\Minecraft\Analyser\CrashReport\MinecraftCrashReportAnalyser;
+use Aternos\Codex\Minecraft\Analyser\Report\CrashReport\ForgeCrashReportAnalyser;
+use Aternos\Codex\Minecraft\Analyser\Report\CrashReport\MinecraftCrashReportAnalyser;
 use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\VanillaCrashReportTrait;
 use Aternos\Codex\Minecraft\Log\Type\CrashReportLogTypeInterface;
 

diff --git a/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeCrashReportLog.php b/src/Log/Minecraft/Vanilla/NeoForge/NeoForgeCrashReportLog.php
@@ -4,8 +4,8 @@
 
 use Aternos\Codex\Detective\DetectorInterface;
 use Aternos\Codex\Detective\SinglePatternDetector;
-use Aternos\Codex\Minecraft\Analyser\CrashReport\MinecraftCrashReportAnalyser;
-use Aternos\Codex\Minecraft\Analyser\CrashReport\NeoForgeCrashReportAnalyser;
+use Aternos\Codex\Minecraft\Analyser\Report\CrashReport\MinecraftCrashReportAnalyser;
+use Aternos\Codex\Minecraft\Analyser\Report\CrashReport\NeoForgeCrashReportAnalyser;
 use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\VanillaCrashReportTrait;
 use Aternos\Codex\Minecraft\Log\Type\CrashReportLogTypeInterface;
 

diff --git a/src/Log/Minecraft/Vanilla/Quilt/QuiltCrashReportLog.php b/src/Log/Minecraft/Vanilla/Quilt/QuiltCrashReportLog.php
@@ -4,9 +4,8 @@
 
 use Aternos\Codex\Detective\DetectorInterface;
 use Aternos\Codex\Detective\SinglePatternDetector;
-use Aternos\Codex\Minecraft\Analyser\CrashReport\MinecraftCrashReportAnalyser;
-use Aternos\Codex\Minecraft\Analyser\CrashReport\QuiltCrashReportAnalyser;
-use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\Quilt\QuiltLog;
+use Aternos\Codex\Minecraft\Analyser\Report\CrashReport\MinecraftCrashReportAnalyser;
+use Aternos\Codex\Minecraft\Analyser\Report\CrashReport\QuiltCrashReportAnalyser;
 use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\VanillaCrashReportTrait;
 use Aternos\Codex\Minecraft\Log\Type\CrashReportLogTypeInterface;
 

diff --git a/src/Log/Minecraft/Vanilla/VanillaCrashReportLog.php b/src/Log/Minecraft/Vanilla/VanillaCrashReportLog.php
@@ -11,7 +11,7 @@
  *
  * @package Aternos\Codex\Minecraft\Log\Minecraft\Vanilla
  */
-class VanillaCrashReportLog extends VanillaLog implements CrashReportLogTypeInterface
+class VanillaCrashReportLog extends VanillaReportLog implements CrashReportLogTypeInterface
 {
     use VanillaCrashReportTrait;
 

diff --git a/src/Log/Minecraft/Vanilla/VanillaCrashReportTrait.php b/src/Log/Minecraft/Vanilla/VanillaCrashReportTrait.php
@@ -2,18 +2,11 @@
 
 namespace Aternos\Codex\Minecraft\Log\Minecraft\Vanilla;
 
-use Aternos\Codex\Minecraft\Analyser\CrashReport\MinecraftCrashReportAnalyser;
-use Aternos\Codex\Minecraft\Parser\CrashReportParser;
+use Aternos\Codex\Minecraft\Analyser\Report\CrashReport\MinecraftCrashReportAnalyser;
 
 trait VanillaCrashReportTrait
 {
-    /**
-     * @return CrashReportParser
-     */
-    public static function getDefaultParser(): CrashReportParser
-    {
-        return new CrashReportParser();
-    }
+    use VanillaReportTrait;
 
     /**
      * @return MinecraftCrashReportAnalyser

diff --git a/src/Log/Minecraft/Vanilla/VanillaNetworkProtocolErrorReportLog.php b/src/Log/Minecraft/Vanilla/VanillaNetworkProtocolErrorReportLog.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Log\Minecraft\Vanilla;
+
+use Aternos\Codex\Detective\DetectorInterface;
+use Aternos\Codex\Detective\SinglePatternDetector;
+use Aternos\Codex\Minecraft\Log\Type\NetworkProtocolErrorReportLogTypeInterface;
+
+class VanillaNetworkProtocolErrorReportLog extends VanillaReportLog implements NetworkProtocolErrorReportLogTypeInterface
+{
+    use VanillaNetworkProtocolErrorReportTrait;
+
+    /**
+     * @return DetectorInterface[]
+     */
+    public static function getDetectors(): array
+    {
+        return [(new SinglePatternDetector())->setPattern("/---- Minecraft Network Protocol Error Report ----/")];
+    }
+}
diff --git a/src/Log/Minecraft/Vanilla/VanillaNetworkProtocolErrorReportTrait.php b/src/Log/Minecraft/Vanilla/VanillaNetworkProtocolErrorReportTrait.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Log\Minecraft\Vanilla;
+
+use Aternos\Codex\Minecraft\Analyser\Report\NetworkProtocolErrorReport\MinecraftNetworkProtocolErrorReportAnalyser;
+
+trait VanillaNetworkProtocolErrorReportTrait
+{
+    use VanillaReportTrait;
+
+    /**
+     * @return MinecraftNetworkProtocolErrorReportAnalyser
+     */
+    public static function getDefaultAnalyser(): MinecraftNetworkProtocolErrorReportAnalyser
+    {
+        return new MinecraftNetworkProtocolErrorReportAnalyser();
+    }
+}
diff --git a/src/Log/Minecraft/Vanilla/VanillaReportLog.php b/src/Log/Minecraft/Vanilla/VanillaReportLog.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Log\Minecraft\Vanilla;
+
+use Aternos\Codex\Minecraft\Log\Type\ReportLogTypeInterface;
+
+class VanillaReportLog extends VanillaLog implements ReportLogTypeInterface
+{
+
+}
diff --git a/src/Log/Minecraft/Vanilla/VanillaReportTrait.php b/src/Log/Minecraft/Vanilla/VanillaReportTrait.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Log\Minecraft\Vanilla;
+
+use Aternos\Codex\Minecraft\Parser\ReportParser;
+
+trait VanillaReportTrait
+{
+    /**
+     * @return ReportParser
+     */
+    public static function getDefaultParser(): ReportParser
+    {
+        return new ReportParser();
+    }
+}
diff --git a/src/Log/Type/CrashReportLogTypeInterface.php b/src/Log/Type/CrashReportLogTypeInterface.php
@@ -7,7 +7,7 @@
  *
  * @package Aternos\Codex\Minecraft\Log\Type
  */
-interface CrashReportLogTypeInterface extends LogTypeInterface
+interface CrashReportLogTypeInterface extends ReportLogTypeInterface
 {
 
 }
diff --git a/src/Log/Type/NetworkProtocolErrorReportLogTypeInterface.php b/src/Log/Type/NetworkProtocolErrorReportLogTypeInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Log\Type;
+
+/**
+ * Interface NetworkProtocolErrorReportLogTypeInterface
+ *
+ * @package Aternos\Codex\Minecraft\Log\Type
+ */
+interface NetworkProtocolErrorReportLogTypeInterface extends ReportLogTypeInterface
+{
+
+}
diff --git a/src/Log/Type/ReportLogTypeInterface.php b/src/Log/Type/ReportLogTypeInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Aternos\Codex\Minecraft\Log\Type;
+
+/**
+ * Interface ReportLogTypeInterface
+ *
+ * @package Aternos\Codex\Minecraft\Log\Type
+ */
+interface ReportLogTypeInterface
+{
+
+}
diff --git a/src/Parser/CrashReportLevel.php → src/Parser/ReportLevel.php b/src/Parser/CrashReportLevel.php → src/Parser/ReportLevel.php
@@ -9,7 +9,7 @@
  *
  * @package Aternos\Codex\Minecraft\Log\CrashReport
  */
-enum CrashReportLevel: int implements LevelInterface
+enum ReportLevel: int implements LevelInterface
 {
     case WARNING = 4;
     case INFO = 6;
@@ -23,11 +23,11 @@ enum CrashReportLevel: int implements LevelInterface
     public static function fromString(string $level): LevelInterface
     {
         return match (strtolower($level)) {
-            "warning" => CrashReportLevel::WARNING,
-            "title" => CrashReportLevel::TITLE,
-            "comment" => CrashReportLevel::COMMENT,
-            "stacktrace" => CrashReportLevel::STACKTRACE,
-            default => CrashReportLevel::INFO
+            "warning" => ReportLevel::WARNING,
+            "title" => ReportLevel::TITLE,
+            "comment" => ReportLevel::COMMENT,
+            "stacktrace" => ReportLevel::STACKTRACE,
+            default => ReportLevel::INFO
         };
     }
 
@@ -37,11 +37,11 @@ public static function fromString(string $level): LevelInterface
     public function asString(): string
     {
         return match ($this) {
-            CrashReportLevel::WARNING => "warning",
-            CrashReportLevel::TITLE => "title",
-            CrashReportLevel::COMMENT => "comment",
-            CrashReportLevel::STACKTRACE => "stacktrace",
-            CrashReportLevel::INFO => "info"
+            ReportLevel::WARNING => "warning",
+            ReportLevel::TITLE => "title",
+            ReportLevel::COMMENT => "comment",
+            ReportLevel::STACKTRACE => "stacktrace",
+            ReportLevel::INFO => "info"
         };
     }