Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various minor code style fixes #100

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Aternos\Codex\Minecraft\Analysis\Information\Fabric;

use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\Fabric\FabricLog;
use Aternos\Codex\Minecraft\Log\Minecraft\Vanilla\VanillaServerLog;
use Aternos\Codex\Minecraft\Translator\Translator;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Aternos\Codex\Minecraft\Analysis\Problem\Fabric;

use Aternos\Codex\Minecraft\Analysis\Solution\Forge\ModInstallSolution;
use Aternos\Codex\Minecraft\Analysis\Solution\Forge\ModRemoveSolution;
use Aternos\Codex\Minecraft\Translator\Translator;

Expand Down
2 changes: 0 additions & 2 deletions src/Analysis/Problem/Vanilla/TickingBlockEntityProblem.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@

namespace Aternos\Codex\Minecraft\Analysis\Problem\Vanilla;

use Aternos\Codex\Minecraft\Analysis\Solution\File\FileDeleteSolution;
use Aternos\Codex\Minecraft\Analysis\Solution\Vanilla\BlockRemoveSolution;
use Aternos\Codex\Minecraft\Analysis\Solution\Vanilla\GenerateNewWorldSolution;
use Aternos\Codex\Minecraft\Analysis\Solution\Vanilla\WorldRepairSolution;
use Aternos\Codex\Minecraft\Translator\Translator;

/**
Expand Down
1 change: 0 additions & 1 deletion src/Analysis/Solution/UpdateJavaSolution.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Aternos\Codex\Minecraft\Analysis\Solution;

use Aternos\Codex\Analysis\AutomatableSolutionInterface;
use Aternos\Codex\Minecraft\Translator\Translator;

/**
Expand Down
5 changes: 3 additions & 2 deletions src/Log/Minecraft/CustomSkinLoader/CustomSkinLoaderLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
use Aternos\Codex\Analyser\AnalyserInterface;
use Aternos\Codex\Minecraft\Analyser\CustomSkinLoaderAnalyser;
use Aternos\Codex\Minecraft\Analysis\Information\CustomSkinLoader\CustomSkinLoaderVersionInformation;
use Aternos\Codex\Minecraft\Log\Minecraft\MinecraftLog;
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
abstract class CustomSkinLoaderLog extends 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]+)\](?: \[[^\]]+\]:)?) .*$/';
Expand All @@ -26,7 +27,7 @@ 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]);;
->setMatches([Parser::PREFIX, Parser::TIME, Parser::LEVEL]);
}

public static function getDefaultAnalyser(): AnalyserInterface
Expand Down
3 changes: 2 additions & 1 deletion src/Log/Minecraft/PrismLauncher/PrismLauncherLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@

use Aternos\Codex\Detective\DetectorInterface;
use Aternos\Codex\Detective\SinglePatternDetector;
use Aternos\Codex\Minecraft\Log\Minecraft\MinecraftLog;
use Aternos\Codex\Minecraft\Parser\Parser;

/**
* Class PrismLauncherLog
*
* @package Aternos\Codex\Minecraft\Log\Minecraft\PrismLauncherLog
*/
abstract class PrismLauncherLog extends \Aternos\Codex\Minecraft\Log\Minecraft\MinecraftLog
abstract class PrismLauncherLog extends MinecraftLog
{
/**
* @return Parser
Expand Down
Loading