diff --git a/PocketMine-MP.php b/PocketMine-MP.php index e405a1d5..f80f6ac5 100644 --- a/PocketMine-MP.php +++ b/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(); diff --git a/src/API/PluginAPI.php b/src/API/PluginAPI.php index ead5624f..4dce5689 100644 --- a/src/API/PluginAPI.php +++ b/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!! } } } diff --git a/src/API/ServerAPI.php b/src/API/ServerAPI.php index edd50690..1ae8ef7d 100644 --- a/src/API/ServerAPI.php +++ b/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!!! } } diff --git a/src/classes/Async.class.php b/src/classes/Async.php similarity index 100% rename from src/classes/Async.class.php rename to src/classes/Async.php diff --git a/src/misc/BlockIterator.php b/src/classes/BlockIterator.php similarity index 100% rename from src/misc/BlockIterator.php rename to src/classes/BlockIterator.php diff --git a/src/classes/Player.class.php b/src/classes/Player.php similarity index 96% rename from src/classes/Player.class.php rename to src/classes/Player.php index 54ebf1e3..ecc12035 100644 --- a/src/classes/Player.class.php +++ b/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){ diff --git a/src/classes/PocketMinecraftServer.class.php b/src/classes/PocketMinecraftServer.php similarity index 99% rename from src/classes/PocketMinecraftServer.class.php rename to src/classes/PocketMinecraftServer.php index 19fda960..8fd98e62 100644 --- a/src/classes/PocketMinecraftServer.class.php +++ b/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; } diff --git a/src/misc/block/plant/Sapling.php b/src/classes/block/plant/Sapling.php similarity index 100% rename from src/misc/block/plant/Sapling.php rename to src/classes/block/plant/Sapling.php diff --git a/src/classes/Window.class.php b/src/classes/inventory/Window.php similarity index 100% rename from src/classes/Window.class.php rename to src/classes/inventory/Window.php diff --git a/src/misc/math/Vector2.php b/src/classes/math/Vector2.php similarity index 100% rename from src/misc/math/Vector2.php rename to src/classes/math/Vector2.php diff --git a/src/misc/math/Vector3.php b/src/classes/math/Vector3.php similarity index 100% rename from src/misc/math/Vector3.php rename to src/classes/math/Vector3.php diff --git a/src/classes/CustomPacketHandler.class.php b/src/classes/network/CustomPacketHandler.php similarity index 100% rename from src/classes/CustomPacketHandler.class.php rename to src/classes/network/CustomPacketHandler.php diff --git a/src/classes/MinecraftInterface.class.php b/src/classes/network/MinecraftInterface.php similarity index 94% rename from src/classes/MinecraftInterface.class.php rename to src/classes/network/MinecraftInterface.php index 8c33593c..c6606e12 100644 --- a/src/classes/MinecraftInterface.class.php +++ b/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); } diff --git a/src/classes/Packet.class.php b/src/classes/network/Packet.php similarity index 100% rename from src/classes/Packet.class.php rename to src/classes/network/Packet.php diff --git a/src/classes/SerializedPacketHandler.class.php b/src/classes/network/SerializedPacketHandler.php similarity index 100% rename from src/classes/SerializedPacketHandler.class.php rename to src/classes/network/SerializedPacketHandler.php diff --git a/src/classes/UDPSocket.class.php b/src/classes/network/UDPSocket.php similarity index 100% rename from src/classes/UDPSocket.class.php rename to src/classes/network/UDPSocket.php diff --git a/src/classes/BigInteger.class.php b/src/classes/utils/BigInteger.php similarity index 100% rename from src/classes/BigInteger.class.php rename to src/classes/utils/BigInteger.php diff --git a/src/misc/utils/Container.php b/src/classes/utils/Container.php similarity index 100% rename from src/misc/utils/Container.php rename to src/classes/utils/Container.php diff --git a/src/classes/Java.class.php b/src/classes/utils/Java.php similarity index 100% rename from src/classes/Java.class.php rename to src/classes/utils/Java.php diff --git a/src/classes/NBT.class.php b/src/classes/utils/NBT.php similarity index 100% rename from src/classes/NBT.class.php rename to src/classes/utils/NBT.php diff --git a/src/classes/Spyc.class.php b/src/classes/utils/Spyc.php similarity index 100% rename from src/classes/Spyc.class.php rename to src/classes/utils/Spyc.php diff --git a/src/misc/utils/TickLoop.php b/src/classes/utils/TickLoop.php similarity index 100% rename from src/misc/utils/TickLoop.php rename to src/classes/utils/TickLoop.php diff --git a/src/misc/utils/UPnP.php b/src/classes/utils/UPnP.php similarity index 100% rename from src/misc/utils/UPnP.php rename to src/classes/utils/UPnP.php diff --git a/src/classes/Utils.class.php b/src/classes/utils/Utils.php similarity index 100% rename from src/classes/Utils.class.php rename to src/classes/utils/Utils.php diff --git a/src/misc/utils/VersionString.php b/src/classes/utils/VersionString.php similarity index 100% rename from src/misc/utils/VersionString.php rename to src/classes/utils/VersionString.php diff --git a/src/classes/ChunkParser.class.php b/src/classes/world/ChunkParser.php similarity index 100% rename from src/classes/ChunkParser.class.php rename to src/classes/world/ChunkParser.php diff --git a/src/classes/Entity.class.php b/src/classes/world/Entity.php similarity index 100% rename from src/classes/Entity.class.php rename to src/classes/world/Entity.php diff --git a/src/classes/TileEntity.class.php b/src/classes/world/TileEntity.php similarity index 100% rename from src/classes/TileEntity.class.php rename to src/classes/world/TileEntity.php diff --git a/src/classes/Generator.class.php b/src/classes/world/generator/Generator.class.php similarity index 100% rename from src/classes/Generator.class.php rename to src/classes/world/generator/Generator.class.php diff --git a/src/classes/NormalGenerator.class.php b/src/classes/world/generator/NormalGenerator.class.php similarity index 100% rename from src/classes/NormalGenerator.class.php rename to src/classes/world/generator/NormalGenerator.class.php diff --git a/src/classes/SuperflatGenerator.class.php b/src/classes/world/generator/SuperflatGenerator.class.php similarity index 100% rename from src/classes/SuperflatGenerator.class.php rename to src/classes/world/generator/SuperflatGenerator.class.php diff --git a/src/misc/world/generator/object/tree/BigTreeObject.php b/src/classes/world/generator/object/tree/BigTreeObject.php similarity index 97% rename from src/misc/world/generator/object/tree/BigTreeObject.php rename to src/classes/world/generator/object/tree/BigTreeObject.php index 3efbe607..4402acb0 100644 --- a/src/misc/world/generator/object/tree/BigTreeObject.php +++ b/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; diff --git a/src/misc/world/generator/object/tree/PineTreeObject.php b/src/classes/world/generator/object/tree/PineTreeObject.php similarity index 97% rename from src/misc/world/generator/object/tree/PineTreeObject.php rename to src/classes/world/generator/object/tree/PineTreeObject.php index c04fd120..674768f6 100644 --- a/src/misc/world/generator/object/tree/PineTreeObject.php +++ b/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; diff --git a/src/misc/world/generator/object/tree/SmallTreeObject.php b/src/classes/world/generator/object/tree/SmallTreeObject.php similarity index 96% rename from src/misc/world/generator/object/tree/SmallTreeObject.php rename to src/classes/world/generator/object/tree/SmallTreeObject.php index 601decc6..d393b882 100644 --- a/src/misc/world/generator/object/tree/SmallTreeObject.php +++ b/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; diff --git a/src/misc/world/generator/object/tree/SpruceTreeObject.php b/src/classes/world/generator/object/tree/SpruceTreeObject.php similarity index 97% rename from src/misc/world/generator/object/tree/SpruceTreeObject.php rename to src/classes/world/generator/object/tree/SpruceTreeObject.php index b574f949..7472ff2a 100644 --- a/src/misc/world/generator/object/tree/SpruceTreeObject.php +++ b/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; diff --git a/src/misc/world/generator/object/tree/TreeObject.php b/src/classes/world/generator/object/tree/TreeObject.php similarity index 100% rename from src/misc/world/generator/object/tree/TreeObject.php rename to src/classes/world/generator/object/tree/TreeObject.php diff --git a/src/common/dependencies.php b/src/common/dependencies.php index 683051bc..1119f1d8 100644 --- a/src/common/dependencies.php +++ b/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/"); ?> \ No newline at end of file diff --git a/src/pstruct/RakNet.php b/src/protocol/RakNet.php similarity index 100% rename from src/pstruct/RakNet.php rename to src/protocol/RakNet.php diff --git a/src/pstruct/protocol.php b/src/protocol/current.php similarity index 100% rename from src/pstruct/protocol.php rename to src/protocol/current.php diff --git a/src/pstruct/dataName.php b/src/protocol/dataName.php similarity index 100% rename from src/pstruct/dataName.php rename to src/protocol/dataName.php diff --git a/src/pstruct/packetName.php b/src/protocol/packetName.php similarity index 100% rename from src/pstruct/packetName.php rename to src/protocol/packetName.php