Moving files

PocketMine-MP.php

@@ -26,7 +26,6 @@ the Free Software Foundation, either version 3 of the License, or
 */
 
 require_once(dirname(__FILE__)."/src/common/dependencies.php");
-require_once("classes/PocketMinecraftServer.class.php");
 require_once("API/ServerAPI.php");
 
 $server = new ServerAPI();

src/API/PluginAPI.php

@@ -26,11 +26,10 @@ the Free Software Foundation, either version 3 of the License, or
 */
 
 class PluginAPI extends stdClass{
-	private $server, $plugins;
+	private $server
+	private $plugins = array();
 	public function __construct(PocketMinecraftServer $server){
 		$this->server = $server;
-		$this->plugins = array();
-		require_once("classes/Spyc.class.php"); //YAML parser
 	}
 
 	public function getList(){
@@ -164,9 +163,7 @@ class PluginAPI extends stdClass{
 			}
 		}
 		foreach($this->plugins as $p){
-			if(method_exists($p[0], "init")){
-				$p[0]->init();
-			}
+			$p[0]->init(); //ARGHHH!!! Plugin loading randomly fails!!
 		}
 	}
 }

src/API/ServerAPI.php

@@ -27,7 +27,9 @@ the Free Software Foundation, either version 3 of the License, or
 
 class ServerAPI{
 	var $restart = false;
-	private $server, $config, $apiList = array();
+	private $server
+	private $config
+	private $apiList = array();
 	
 	public function run(){
 		$this->load();
@@ -204,7 +206,7 @@ class ServerAPI{
 		}
 		foreach($this->apiList as $ob){
 			if(is_callable(array($ob, "init"))){
-				$ob->init();
+				$ob->init(); //Fails sometimes!!!
 			}
 		}
 

src/classes/Player.php

@@ -27,33 +27,40 @@ the Free Software Foundation, either version 3 of the License, or
 
 
 class Player{
-	private $server, $timeout, $connected, $queue, $buffer, $evid = array();
-	var $clientID, $ip, $port, $counter, $username, $eid, $data, $entity, $auth, $CID, $MTU, $spawned, $equipment;
-	function __construct($server, $clientID, $ip, $port, $MTU){
-		$this->queue = array();
-		$this->buffer = array();
+	private $server;
+	private $queue = array();
+	private $buffer = array();
+	private $evid = array();
+	var $timeout;
+	var $connected = true;
+	var $clientID;
+	var $ip;
+	var $port;
+	var $counter = array(0, 0, 0);
+	var $username;
+	var $eid = false;
+	var $data = array();
+	var $entity = false;
+	var $auth = false;
+	var $CID;
+	var $MTU;
+	var $spawned = false;
+	var $equipment = array(1, 0);
+	function __construct(PocketMinecraftServer $server, $clientID, $ip, $port, $MTU){
 		$this->MTU = $MTU;
 		$this->server = $server;
 		$this->clientID = $clientID;
 		$this->CID = $this->server->clientID($ip, $port);
-		$this->eid = false;
-		$this->data = array();
 		$this->ip = $ip;
-		$this->entity = false;
 		$this->port = $port;
 		$this->timeout = microtime(true) + 25;
-		$this->equipment = array(1, 0);
-		$this->spawned = false;
 		$this->evid[] = $this->server->event("server.tick", array($this, "onTick"));
 		$this->evid[] = $this->server->event("server.close", array($this, "close"));
 		console("[DEBUG] New Session started with ".$ip.":".$port.". MTU ".$this->MTU.", Client ID ".$this->clientID, true, true, 2);
-		$this->connected = true;
-		$this->auth = false;
-		$this->counter = array(0, 0, 0);
 	}
 
 	public function onTick($time, $event){
-		if($event !== "server.tick"){
+		if($event !== "server.tick"){ //WTF??
 			return;
 		}
 		if($time > $this->timeout){

src/classes/PocketMinecraftServer.php

@@ -482,7 +482,7 @@ class PocketMinecraftServer{
 					$port = $data[2];
 					$MTU = $data[3];
 					$clientID = $data[4];
-					$this->clients[$CID] = new Player($this, $clientID, $packet["ip"], $packet["port"], $MTU);
+					$this->clients[$CID] = new Player($this, $clientID, $packet["ip"], $packet["port"], $MTU); //New Session!
 					$this->clients[$CID]->handle(0x07, $data);
 					break;
 			}

src/classes/network/MinecraftInterface.php

@@ -26,18 +26,21 @@ the Free Software Foundation, either version 3 of the License, or
 */
 
 class MinecraftInterface{
-	var $pstruct, $name, $client, $dataName;
-	private $socket, $data;
+	var $pstruct
+	var $name
+	var $client
+	var $dataName;
+	private $socket
+	private $data;
 	function __construct($server, $port = 25565, $listen = false, $client = true){
 		$this->socket = new UDPSocket($server, $port, (bool) $listen);
-		require("pstruct/RakNet.php");
-		require("pstruct/packetName.php");
-		require("pstruct/protocol.php");
-		require("pstruct/dataName.php");
+		require("protocol/RakNet.php");
+		require("protocol/packetName.php");
+		require("protocol/current.php");
+		require("protocol/dataName.php");
 		$this->pstruct = $pstruct;
 		$this->name = $packetName;
 		$this->dataName = $dataName;
-		$this->buffer = array();
 		$this->client = (bool) $client;
 		$this->start = microtime(true);
 	}

src/classes/world/generator/object/tree/BigTreeObject.php

@@ -26,7 +26,7 @@ the Free Software Foundation, either version 3 of the License, or
 */
 
 
-require_once("misc/world/generator/object/tree/TreeObject.php");
+require_once("classes/world/generator/object/tree/TreeObject.php");
 
 class BigTreeObject extends TreeObject{
 	private $trunkHeightMultiplier = 0.618;

src/classes/world/generator/object/tree/PineTreeObject.php

@@ -26,7 +26,7 @@ the Free Software Foundation, either version 3 of the License, or
 */
 
 
-require_once("misc/world/generator/object/tree/TreeObject.php");
+require_once("classes/world/generator/object/tree/TreeObject.php");
 
 class PineTreeObject extends TreeObject{
 	var $type = 1;

src/classes/world/generator/object/tree/SmallTreeObject.php

@@ -26,7 +26,7 @@ the Free Software Foundation, either version 3 of the License, or
 */
 
 
-require_once("misc/world/generator/object/tree/TreeObject.php");
+require_once("classes/world/generator/object/tree/TreeObject.php");
 
 class SmallTreeObject extends TreeObject{
 	var $type = 0;

src/classes/world/generator/object/tree/SpruceTreeObject.php

@@ -26,7 +26,7 @@ the Free Software Foundation, either version 3 of the License, or
 */
 
 
-require_once("misc/world/generator/object/tree/TreeObject.php");
+require_once("classes/world/generator/object/tree/TreeObject.php");
 
 class SpruceTreeObject extends TreeObject{
 	var $type = 1;

src/common/dependencies.php

@@ -82,25 +82,6 @@ if($errors > 0){
 	die();
 }
 
-
-require_once("classes/Async.class.php");
-require_once("classes/Data.class.php");
-require_once("classes/Player.class.php");
-require_once("classes/Generator.class.php");
-require_once("classes/SuperflatGenerator.class.php");
-require_once("classes/Utils.class.php");
-require_once("classes/UDPSocket.class.php");
-require_once("classes/Packet.class.php");
-require_once("classes/Entity.class.php");
-require_once("classes/TileEntity.class.php");
-require_once("classes/Window.class.php");
-require_once("classes/ChunkParser.class.php");
-require_once("classes/NBT.class.php");
-require_once("classes/Java.class.php");
-require_once("classes/SerializedPacketHandler.class.php");
-require_once("classes/CustomPacketHandler.class.php");
-require_once("classes/MinecraftInterface.class.php");
-require_once("classes/BigInteger.class.php");
-require_all(FILE_PATH . "src/misc/");
+require_all(FILE_PATH . "src/classes/");
 
 ?>