Main

.github/workflows/main.yml

@@ -0,0 +1,27 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  codestyle:
+    name: Code Style checks
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP and tools
+        uses: shivammathur/setup-php@2.31.1
+        with:
+          php-version: 8.0
+          tools: php-cs-fixer:3.60
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run PHP-CS-Fixer
+        run: php-cs-fixer fix --dry-run --diff --ansi

.gitignore

@@ -10,6 +10,9 @@ server.lock
 *.txt
 *.properties
 
+# php-cs-fixer
+/.php_cs.cache
+/.php-cs-fixer.cache
 
 ############
 ## Windows

.php-cs-fixer.php

@@ -0,0 +1,36 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+	->in(__DIR__ . '/src');
+
+return (new PhpCsFixer\Config)
+	->setRules([
+		'array_indentation' => true,
+		'array_syntax' => [
+			'syntax' => 'short'
+		],
+		'binary_operator_spaces' => [
+			'default' => 'single_space'
+		],
+		'blank_line_after_namespace' => true,
+		'blank_line_after_opening_tag' => true,
+		'cast_spaces' => [
+			'space' => 'single'
+		],
+		'elseif' => true,
+		'indentation_type' => true,
+		'no_closing_tag' => true,
+		'no_empty_phpdoc' => true,
+		'no_extra_blank_lines' => true,
+		'no_superfluous_phpdoc_tags' => [
+			'allow_mixed' => true,
+		],
+		'no_trailing_whitespace' => true,
+		'no_trailing_whitespace_in_comment' => true,
+		'no_whitespace_in_blank_line' => true,
+		'unary_operator_spaces' => true
+	])
+	->setFinder($finder)
+	->setIndent("\t")
+	->setLineEnding("\n")
+	->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect());

README.md

@@ -4,7 +4,7 @@
 
 NostalgiaCore is a fork of Legacy PocketMine-MP 1.3.12, which fixes bugs of Legacy PocketMine-MP, and adds new content
 
-Supported MCPE versions: 0.8.0, 0.8.1 (maybe 0.8.2)
+Supported MCPE versions: 0.3.0 ～ 0.8.1 (maybe 0.8.2)
 
 (Special thx to GullCraft Network and DartMiner43)
 

src/API/ChatAPI.php

@@ -123,8 +123,6 @@ public function broadcast($message){
 	/**
 	 * @param mixed $owner Can be either Player object or string username. Boolean false for broadcast.
 	 * @param string $text
-	 * @param $whitelist
-	 * @param $blacklist
 	 */
 	public function send($owner, $text, $whitelist = false, $blacklist = false){
 		$message = [

src/API/ConsoleAPI.php

@@ -24,20 +24,20 @@ public function init(){
 		$this->register("defaultgamemode", "<mode>", [$this, "defaultCommands"]);
 
 		$this->server->api->console->alias("tps", "status");
-  
+
 		$this->cmdWhitelist("help");
 		$this->cmdWhitelist("status");
 		$this->cmdWhitelist("?");
 	}
-	
+
 	/**
 	 * Whitelists a CMD so everyone can issue it - Even non OPs.
 	 * @param string $cmd Command to Whitelist
 	 */
 	public function cmdWhitelist($cmd){
 		$this->server->api->ban->cmdWhitelist[strtolower(trim($cmd))] = true;
 	}
-	
+
 	public function register($cmd, $help, $callback){
 		if(!is_callable($callback)){
 			return false;

src/API/LevelAPI.php

@@ -41,16 +41,15 @@ public function loadLevel($name){
 			console("[ERROR] Could not load level \"" . $name . "\"");
 			return false;
 		}
-		
+
 		if(PocketMinecraftServer::$KEEP_CHUNKS_LOADED){
 			for($X = 0; $X < 16; ++$X){
 				for($Z = 0; $Z < 16; ++$Z){
 					$level->loadChunk($X, $Z);
 				}
 			}
 		}
-
-
+
 		$entities = new Config($path . "entities.yml", CONFIG_YAML);
 		if(file_exists($path . "tileEntities.yml")){
 			@rename($path . "tileEntities.yml", $path . "tiles.yml");
@@ -62,13 +61,13 @@ public function loadLevel($name){
 			if(!isset($entity["id"])){
 				break;
 			}
-			
+
 			$entity["x"] = $entity["Pos"][0];
 			$entity["y"] = $entity["Pos"][1];
 			$entity["z"] = $entity["Pos"][2];
 			$entity["yaw"] = $entity["Rotation"][0];
 			$entity["pitch"] = $entity["Rotation"][1];
-			
+
 			if($entity["id"] === 64){ //Item Drop
 				$e = $this->server->api->entity->add($this->levels[$name], ENTITY_ITEM, ENTITY_ITEM_TYPE, [
 					"meta" => $entity["Item"]["Damage"],
@@ -106,7 +105,7 @@ public function loadLevel($name){
 		foreach($blockUpdates->getAll() as $bupdate){
 			if($bupdate["type"] !== BLOCK_UPDATE_RANDOM) $this->server->api->block->scheduleBlockUpdate(new Position((int) $bupdate["x"], (int) $bupdate["y"], (int) $bupdate["z"], $this->levels[$name]), (float) $bupdate["delay"], (int) $bupdate["type"]);
 		}
-		
+
 		return true;
 	}
 	/**

src/API/PluginAPI.php

@@ -154,20 +154,20 @@ private function loadAll(){
 						continue;
 					}
 					console("[INFO] Loading PHAR plugin \"".FORMAT_GREEN.$pluginInfo["name"].FORMAT_RESET."\" ".FORMAT_AQUA.$pluginInfo["version"].FORMAT_RESET." by ".FORMAT_AQUA.$pluginInfo["author"].FORMAT_RESET);
-					
+
 					$aver = CURRENT_API_VERSION;
-					if(!in_array((string) CURRENT_API_VERSION, $pluginInfo["api"])){ 
+					if(!in_array((string) CURRENT_API_VERSION, $pluginInfo["api"])){
 						if(is_array($pluginInfo)) $s = implode(",",$pluginInfo["api"]);
 						else $s = $pluginInfo["api"];
 						console("[WARNING] API is not the same as Core, might cause bugs({$s} != {$aver})");
 					}
-					
+
 					$phr = "phar://$filePath/";
 					include($phr."/src/".$pluginInfo["classLoader"]);
 					$class = $pluginInfo["CLClass"];
 					$loader = new $class();
 					$loader->loadAll($phr);
-					
+
 					$pluginName = PharUtils::getNameSpaceClass($pluginInfo["mainFile"]);
 					include($phr."/src/".$pluginInfo["mainFile"]);
 					$plugin = new $pluginName($this->server->api, false);
@@ -272,7 +272,7 @@ public function initAll(){
 			$names[] = $p[1]["name"];
 			$versions[] = $p[1]["version"];
 		}
-		
+
 		foreach($this->plugins as $p){
 			if($p[0] instanceof OtherPluginRequirement){
 				foreach($p[0]->getRequiredPlugins() as $required){
@@ -316,4 +316,3 @@ public function __construct($name, $version = false){
 	}
 }
 
-

src/API/ServerAPI.php

@@ -4,7 +4,7 @@ class ServerAPI{
 
 	private static $serverRequest = false;
 	public $restart = false;
-	
+
 	/**
 	 * @var QueryAPI
 	 */
@@ -59,7 +59,7 @@ class ServerAPI{
 	 * @var QueryHandler
 	 */
 	public $query;
-	
+
 	private $asyncCalls = [];
 	private $server;
 	private $config;

src/API/TileAPI.php

@@ -17,7 +17,7 @@ public function getXYZ(Level $level, $x, $y, $z){
 		}
 		return false;
 	}
-	
+
 	public function invalidateAll(Level $level, $x, $y, $z){
 		$x = (int) $x;
 		$y = (int) $y;
@@ -31,14 +31,14 @@ public function invalidateAll(Level $level, $x, $y, $z){
 					++$invcnt;
 					$tl->close();
 				}
-				
+
 				if($invcnt > 1){
 					ConsoleAPI::warn("{$level->getName()}: ($x $y $z) has more than 1 tile entity! Invalidated ID {$t["ID"]} (Total invaliated: $invcnt)");
 				}
 			}
 		}
 	}
-	
+
 	public function get(Position $pos){
 		$tile = $this->server->query("SELECT * FROM tiles WHERE level = '" . $pos->level->getName() . "' AND x = {$pos->x} AND y = {$pos->y} AND z = {$pos->z};", true);
 		if($tile !== false and $tile !== true and ($tile = $this->getByID($tile["ID"])) !== false){

src/API/TimeAPI.php

@@ -175,5 +175,4 @@ public function sunset(){
 		return $this->set("sunset");
 	}
 
-
 }

src/Deprecation.php

@@ -1,6 +1,5 @@
 <?php
 
-
 class Deprecation{
 
 	public static $events = [