codemasher / wildstar-database

src/Archive/AIDXReader.php

Spacing +8 added lines, -8 removed lines

@@ -21,7 +21,7 @@ 
 /**
  * @property array $dirs
  */
-final class AIDXReader extends PACKReaderAbstract{
+final class AIDXReader extends PACKReaderAbstract {
 
 	private const AIDX_ROOT = 'a4ArchiveType/LVersion/LBuildnumber/LIndex';
 	private const AIDX_DATA = 'LNameOffset/LFlags/QFiletime/QSizeUncompressed/QSizeCompressed/a20Hash/x4';
@@ -37,7 +37,7 @@ 
 		// get the root info block of the AIDX file (4+4+4+4 = 16 bytes)
 		$rootInfo = unpack($this::AIDX_ROOT, fread($this->fh, 16));
 
-		if($rootInfo['ArchiveType'] !== "\x58\x44\x49\x41"){ // XDIA
+		if ($rootInfo['ArchiveType'] !== "\x58\x44\x49\x41") { // XDIA
 			throw new WSDBException('invalid AIDX');
 		}
 
@@ -66,12 +66,12 @@ 
 		$files = array_fill(0, $n['files'], null);
 
 		// create a directory object for each dir (4+4 = 8 bytes)
-		foreach($dirs as $i => $_){
+		foreach ($dirs as $i => $_) {
 			$dirs[$i] = new Directory(unpack('LNameOffset/LBlockIndex', fread($this->fh, 8)), $parent);
 		}
 
 		// create a file object for each file (4+4+8+8+8+20+4 = 56 bytes)
-		foreach($files as $i => $_){
+		foreach ($files as $i => $_) {
 			$files[$i] = new File(unpack($this::AIDX_DATA, fread($this->fh, 56)), $parent);
 		}
 
@@ -83,17 +83,17 @@ 
 		};
 
 		// apply the names to each object in the block
-		foreach($dirs as $i => $e){
+		foreach ($dirs as $i => $e) {
 			$dirs[$i]->Name = $getname($e);
 		}
 
-		foreach($files as $i => $e){
+		foreach ($files as $i => $e) {
 			$files[$i]->Name = $getname($e);
 		}
 
 		// loop through the directory stucture recursively and add the block data
-		foreach($dirs as $i => $info){
-			if(isset($this->blocktable[$info->BlockIndex])){
+		foreach ($dirs as $i => $info) {
+			if (isset($this->blocktable[$info->BlockIndex])) {
 				$dirs[$i]->Content = $this->getBlock($this->blocktable[$info->BlockIndex], $parent.$info->Name);
 			}
 		}

src/Archive/Directory.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 namespace codemasher\WildstarDB\Archive;
 
-final class Directory extends ItemAbstract{
+final class Directory extends ItemAbstract {
 
 	/** @var int */
 	public $BlockIndex;

src/Archive/File.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 
 use function bin2hex;
 
-final class File extends ItemAbstract{
+final class File extends ItemAbstract {
 
 	/** @var int */
 	public $Flags;
@@ -35,7 +35,7 @@ 
 	 * @param array  $data
 	 * @param string $parent
 	 */
-	public function __construct(array $data, string $parent){
+	public function __construct(array $data, string $parent) {
 		parent::__construct($data, $parent);
 
 		$this->Hash      = bin2hex($this->Hash);

src/Archive/PACKReaderAbstract.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
 /**
  * @property array $blocktable
  */
-abstract class PACKReaderAbstract extends ReaderAbstract{
+abstract class PACKReaderAbstract extends ReaderAbstract {
 
 	/**
 	 * 4+4+512+8+8+8+4+4+4+8 = 564 bytes
@@ -57,14 +57,14 @@ 
 		$this->loadFile($filename);
 		$this->blocktable = [];
 
-		if($this->header['Signature'] !== "\x4b\x43\x41\x50"){ // KCAP
+		if ($this->header['Signature'] !== "\x4b\x43\x41\x50") { // KCAP
 			throw new WSDBException('invalid PACK');
 		}
 
 		// read the block info table
 		fseek($this->fh, $this->header['BlockTableOffset']);
 
-		for($i = 0; $i < $this->header['BlockCount']; $i++){
+		for ($i = 0; $i < $this->header['BlockCount']; $i++) {
 			$this->blocktable[$i] = unpack('QOffset/QSize', fread($this->fh, 16));
 		}
 

src/Archive/AARCReader.php

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 
 use function bin2hex, fread, fseek, unpack;
 
-final class AARCReader extends PACKReaderAbstract{
+final class AARCReader extends PACKReaderAbstract {
 
 	private const AARC_ROOT = 'a4ArchiveType/LVersion/LBlockcount/LIndex';
 	private const AARC_DATA = 'LIndex/a20Hash/QSizeCompressed';
@@ -29,7 +29,7 @@ 
 		// get the root info block of the AARC file (4+4+4+4 = 16 bytes)
 		$rootInfo = unpack($this::AARC_ROOT, fread($this->fh, 16));
 
-		if($rootInfo['ArchiveType'] !== "\x43\x52\x41\x41"){ // CRAA
+		if ($rootInfo['ArchiveType'] !== "\x43\x52\x41\x41") { // CRAA
 			throw new WSDBException('invalid AARC');
 		}
 
@@ -39,7 +39,7 @@ 
 		fseek($this->fh, $blockInfo['Offset']);
 
 		// read the data block info (4+20+8 = 32 bytes)
-		for($i = 0; $i < $rootInfo['Blockcount']; $i++){
+		for ($i = 0; $i < $rootInfo['Blockcount']; $i++) {
 			$data = unpack($this::AARC_DATA, fread($this->fh, 32));
 			$hash = bin2hex($data['Hash']);
 			unset($data['Hash']);

cli/map-tile.php

Spacing +3 added lines, -3 removed lines

@@ -99,12 +99,12 @@
 $optimizer = (new OptimizerFactory($optimizer_settings, $logger))->get($tilerOptions->tile_format);
 $map_tiler = new Imagetiler($tilerOptions, $optimizer, $logger);
 
-foreach($maps as $map => $dir){
+foreach ($maps as $map => $dir) {
 
-	try{
+	try {
 		$map_tiler->process(mapdir.'/'.$map.'.png', tiledir.'/'.$dir);
 	}
-	catch(ImagetilerException $e){
+	catch (ImagetilerException $e) {
 		echo $e->getMessage();
 		echo $e->getTraceAsString();
 	}

Braces +1 added lines, -2 removed lines

@@ -103,8 +103,7 @@
 
 	try{
 		$map_tiler->process(mapdir.'/'.$map.'.png', tiledir.'/'.$dir);
-	}
-	catch(ImagetilerException $e){
+	} catch(ImagetilerException $e){
 		echo $e->getMessage();
 		echo $e->getTraceAsString();
 	}

cli/map-build.php

Spacing +9 added lines, -9 removed lines

@@ -89,10 +89,10 @@ 
 
 $outpath = __DIR__.'/maps';
 
-foreach(new DirectoryIterator($wildstar_path.'/Patch/ClientData/Map') as $dir){ // 'C:\\Games\\Wildstar Studio\\out\\Map'
+foreach (new DirectoryIterator($wildstar_path.'/Patch/ClientData/Map') as $dir) { // 'C:\\Games\\Wildstar Studio\\out\\Map'
 	$map = $dir->getFilename();
 
-	if(!$dir->isDir() || $dir->isDot() || (!empty($include_maps) && !in_array($map, $include_maps))){
+	if (!$dir->isDir() || $dir->isDot() || (!empty($include_maps) && !in_array($map, $include_maps))) {
 		continue;
 	}
 
@@ -102,9 +102,9 @@ 
 	$xmax     = 0;
 	$ymax     = 0;
 
-	foreach(new DirectoryIterator($dir->getPathname()) as $file){
+	foreach (new DirectoryIterator($dir->getPathname()) as $file) {
 
-		if($file->getExtension() !== 'bmp'){
+		if ($file->getExtension() !== 'bmp') {
 			continue;
 		}
 
@@ -113,7 +113,7 @@ 
 		$y   = hexdec($hex[0]);
 
 		// exclude some empty tiles to not exaggerate map/image size
-		if(
+		if (
 			($map === 'Eastern' && $y < 3)
 			|| ($map === 'AdventureMalgrave' && ($x > 80 || $y < 65))
 			|| ($map === 'NewCentral' && ($x > 80 || $y < 3))
@@ -126,7 +126,7 @@ 
 			|| ($map === 'ProtostarWinterfest' && ($x < 63 || $x > 66 || $y < 63 || $y > 65))
 			|| ($map === 'PvPArena2' && ($x < 63 || $x > 66 || $y < 64 || $y > 65))
 			|| ($map === 'AdventureAstrovoidPrison' && ($x < 61 || $x > 65 || $y < 61 || $y > 66))
-		){
+		) {
 			continue;
 		}
 
@@ -138,7 +138,7 @@ 
 		$textures[$y][$x] = $file->getRealPath();
 	}
 
-	if(empty($textures)){
+	if (empty($textures)) {
 		continue;
 	}
 
@@ -148,8 +148,8 @@ 
 	$im->newImage(($xmax - $xmin + 1) * 512, ($ymax - $ymin + 1) * 512, '#757575');
 	$im->setImageFormat('png');
 
-	foreach($textures as $y => $col){
-		foreach($col as $x => $file){
+	foreach ($textures as $y => $col) {
+		foreach ($col as $x => $file) {
 			$im->compositeImage(new Imagick($file), Imagick::COMPOSITE_OVER, ($x - $xmin) * 512, ($y - $ymin) * 512);
 			$logger->info($file);
 		}