diff --git a/PocketMine-MP.php b/PocketMine-MP.php index c6df6792c..79bd393d9 100644 --- a/PocketMine-MP.php +++ b/PocketMine-MP.php @@ -25,8 +25,12 @@ the Free Software Foundation, either version 3 of the License, or */ -require_once(dirname(__FILE__)."/src/dependencies.php"); -require_once("API/ServerAPI.php"); + +/***REM_START***/ +require_once(dirname(__FILE__)."/src/config.php"); +require_once(FILE_PATH."/src/functions.php"); +require_once(FILE_PATH."/src/dependencies.php"); +/***REM_END***/ $server = new ServerAPI(); $server->run();//$server->start(); diff --git a/src/API/ServerAPI.php b/src/API/ServerAPI.php index 91e7af68f..34f3abe1b 100644 --- a/src/API/ServerAPI.php +++ b/src/API/ServerAPI.php @@ -191,19 +191,19 @@ class ServerAPI{ } $this->loadProperties(); $this->server->loadMap(); - - //Autoload all default APIs + console("[INFO] Loading default APIs"); - $dir = dir(FILE_PATH."src/API/"); - while(false !== ($file = $dir->read())){ - if($file{0} !== "."){ //Hidden and upwards folders - $API = basename($file, ".php"); - if(strtolower($API) !== "serverapi" and strtolower($API) !== "pluginapi"){ - $name = strtolower(substr($API, 0, -3)); - $this->loadAPI($name, $API); - } - } - } + + $this->loadAPI("console", "ConsoleAPI"); + $this->loadAPI("level", "LevelAPI"); + $this->loadAPI("block", "BlockAPI"); + $this->loadAPI("chat", "ChatAPI"); + $this->loadAPI("ban", "BanAPI"); + $this->loadAPI("entity", "EntityAPI"); + $this->loadAPI("tileentity", "TileEntityAPI"); + $this->loadAPI("player", "PlayerAPI"); + $this->loadAPI("time", "TimeAPI"); + foreach($this->apiList as $ob){ if(is_callable(array($ob, "init"))){ $ob->init(); //Fails sometimes!!! @@ -448,15 +448,19 @@ class ServerAPI{ } public function loadAPI($name, $class, $dir = false){ - if($dir === false){ - $dir = FILE_PATH."src/API/"; - } - $file = $dir.$class.".php"; - if(!file_exists($file)){ - console("[ERROR] API ".$name." [".$class."] in ".$dir." doesn't exist", true, true, 0); + if(isset($this->$name)){ return false; + }elseif(!class_exists($class)){ + if($dir === false){ + $dir = FILE_PATH."src/API/"; + } + $file = $dir.$class.".php"; + if(!file_exists($file)){ + console("[ERROR] API ".$name." [".$class."] in ".$dir." doesn't exist", true, true, 0); + return false; + } + require_once($file); } - require_once($file); $this->$name = new $class($this->server); $this->apiList[] = $this->$name; console("[INFO] API \x1b[36m".$name."\x1b[0m [\x1b[30;1m".$class."\x1b[0m] loaded"); diff --git a/src/classes/Async.php b/src/Async.php similarity index 100% rename from src/classes/Async.php rename to src/Async.php diff --git a/src/classes/BlockIterator.php b/src/BlockIterator.php similarity index 100% rename from src/classes/BlockIterator.php rename to src/BlockIterator.php diff --git a/src/classes/Data.php b/src/Data.php similarity index 100% rename from src/classes/Data.php rename to src/Data.php diff --git a/src/classes/Deprecation.php b/src/Deprecation.php similarity index 100% rename from src/classes/Deprecation.php rename to src/Deprecation.php diff --git a/src/classes/Player.php b/src/Player.php similarity index 100% rename from src/classes/Player.php rename to src/Player.php diff --git a/src/classes/PocketMinecraftServer.php b/src/PocketMinecraftServer.php similarity index 100% rename from src/classes/PocketMinecraftServer.php rename to src/PocketMinecraftServer.php diff --git a/src/config.php b/src/config.php index 4ad5b081b..09b0a491b 100644 --- a/src/config.php +++ b/src/config.php @@ -32,8 +32,8 @@ error_reporting(E_ALL ^ E_NOTICE); ini_set("allow_url_fopen", 1); ini_set("display_errors", 1); ini_set('default_charset', 'utf-8'); -define("FILE_PATH", dirname(__FILE__)."/../"); -set_include_path(get_include_path() . PATH_SEPARATOR . FILE_PATH . PATH_SEPARATOR . FILE_PATH . "/src/" . PATH_SEPARATOR . FILE_PATH . "/src/classes/"); +define("FILE_PATH", dirname(get_included_files()[0])."/"); +set_include_path(get_include_path() . PATH_SEPARATOR . FILE_PATH); ini_set("memory_limit", "256M"); define("LOG", true); define("MAGIC", "\x00\xff\xff\x00\xfe\xfe\xfe\xfe\xfd\xfd\xfd\xfd\x12\x34\x56\x78"); diff --git a/src/classes/material/IDs.php b/src/constants/BlockIDs.php similarity index 100% rename from src/classes/material/IDs.php rename to src/constants/BlockIDs.php diff --git a/src/classes/GeneralConstants.php b/src/constants/GeneralConstants.php similarity index 100% rename from src/classes/GeneralConstants.php rename to src/constants/GeneralConstants.php diff --git a/src/classes/network/protocol.php b/src/constants/ProtocolInfo.php similarity index 100% rename from src/classes/network/protocol.php rename to src/constants/ProtocolInfo.php diff --git a/src/dependencies.php b/src/dependencies.php index 7b7c3e820..58c3cbf32 100644 --- a/src/dependencies.php +++ b/src/dependencies.php @@ -25,8 +25,11 @@ the Free Software Foundation, either version 3 of the License, or */ +/***REM_START***/ require_once(dirname(__FILE__)."/config.php"); -require_once(dirname(__FILE__)."/functions.php"); +require_once(FILE_PATH."/src/functions.php"); +/***REM_END***/ + if(strpos(strtoupper(php_uname("s")), "WIN") === false or arg("enable-ansi", false) === true){ define("ENABLE_ANSI", true); }else{ @@ -81,6 +84,9 @@ if($errors > 0){ exit(1); //Exit with error } -require_all(FILE_PATH . "src/classes/"); +/***REM_START***/ +require_all(FILE_PATH . "src/"); +/***REM_END***/ + ?> \ No newline at end of file diff --git a/src/classes/inventory/Window.php b/src/inventory/Window.php similarity index 100% rename from src/classes/inventory/Window.php rename to src/inventory/Window.php diff --git a/src/classes/material/Block.php b/src/material/Block.php similarity index 99% rename from src/classes/material/Block.php rename to src/material/Block.php index c737b32cb..189396e52 100644 --- a/src/classes/material/Block.php +++ b/src/material/Block.php @@ -25,8 +25,6 @@ the Free Software Foundation, either version 3 of the License, or */ -require_once("classes/material/IDs.php"); - abstract class Block{ public static $class = array( AIR => "AirBlock", @@ -199,6 +197,7 @@ abstract class Block{ abstract function onUpdate(BlockAPI $level, $type); } +/***REM_START***/ require_once("block/GenericBlock.php"); require_once("block/SolidBlock.php"); require_once("block/TransparentBlock.php"); @@ -206,3 +205,4 @@ require_once("block/FallableBlock.php"); require_once("block/LiquidBlock.php"); require_once("block/StairBlock.php"); require_once("block/DoorBlock.php"); +/***REM_END***/ diff --git a/src/classes/material/Item.php b/src/material/Item.php similarity index 98% rename from src/classes/material/Item.php rename to src/material/Item.php index 2d80dbad7..21f66c8be 100644 --- a/src/classes/material/Item.php +++ b/src/material/Item.php @@ -25,8 +25,6 @@ the Free Software Foundation, either version 3 of the License, or */ -require_once("classes/material/IDs.php"); - class Item{ public static $class = array( SUGARCANE => "SugarcaneItem", diff --git a/src/classes/material/block/DoorBlock.php b/src/material/block/DoorBlock.php similarity index 100% rename from src/classes/material/block/DoorBlock.php rename to src/material/block/DoorBlock.php diff --git a/src/classes/material/block/FallableBlock.php b/src/material/block/FallableBlock.php similarity index 100% rename from src/classes/material/block/FallableBlock.php rename to src/material/block/FallableBlock.php diff --git a/src/classes/material/block/FlowableBlock.php b/src/material/block/FlowableBlock.php similarity index 100% rename from src/classes/material/block/FlowableBlock.php rename to src/material/block/FlowableBlock.php diff --git a/src/classes/material/block/GenericBlock.php b/src/material/block/GenericBlock.php similarity index 100% rename from src/classes/material/block/GenericBlock.php rename to src/material/block/GenericBlock.php diff --git a/src/classes/material/block/LiquidBlock.php b/src/material/block/LiquidBlock.php similarity index 100% rename from src/classes/material/block/LiquidBlock.php rename to src/material/block/LiquidBlock.php diff --git a/src/classes/material/block/SolidBlock.php b/src/material/block/SolidBlock.php similarity index 100% rename from src/classes/material/block/SolidBlock.php rename to src/material/block/SolidBlock.php diff --git a/src/classes/material/block/StairBlock.php b/src/material/block/StairBlock.php similarity index 100% rename from src/classes/material/block/StairBlock.php rename to src/material/block/StairBlock.php diff --git a/src/classes/material/block/TransparentBlock.php b/src/material/block/TransparentBlock.php similarity index 100% rename from src/classes/material/block/TransparentBlock.php rename to src/material/block/TransparentBlock.php diff --git a/src/classes/material/block/attachable/Ladder.php b/src/material/block/attachable/Ladder.php similarity index 100% rename from src/classes/material/block/attachable/Ladder.php rename to src/material/block/attachable/Ladder.php diff --git a/src/classes/material/block/attachable/SignPost.php b/src/material/block/attachable/SignPost.php similarity index 100% rename from src/classes/material/block/attachable/SignPost.php rename to src/material/block/attachable/SignPost.php diff --git a/src/classes/material/block/attachable/Torch.php b/src/material/block/attachable/Torch.php similarity index 100% rename from src/classes/material/block/attachable/Torch.php rename to src/material/block/attachable/Torch.php diff --git a/src/classes/material/block/attachable/Trapdoor.php b/src/material/block/attachable/Trapdoor.php similarity index 100% rename from src/classes/material/block/attachable/Trapdoor.php rename to src/material/block/attachable/Trapdoor.php diff --git a/src/classes/material/block/attachable/WallSign.php b/src/material/block/attachable/WallSign.php similarity index 100% rename from src/classes/material/block/attachable/WallSign.php rename to src/material/block/attachable/WallSign.php diff --git a/src/classes/material/block/liquid/Lava.php b/src/material/block/liquid/Lava.php similarity index 100% rename from src/classes/material/block/liquid/Lava.php rename to src/material/block/liquid/Lava.php diff --git a/src/classes/material/block/liquid/StillLava.php b/src/material/block/liquid/StillLava.php similarity index 100% rename from src/classes/material/block/liquid/StillLava.php rename to src/material/block/liquid/StillLava.php diff --git a/src/classes/material/block/liquid/StillWater.php b/src/material/block/liquid/StillWater.php similarity index 100% rename from src/classes/material/block/liquid/StillWater.php rename to src/material/block/liquid/StillWater.php diff --git a/src/classes/material/block/liquid/Water.php b/src/material/block/liquid/Water.php similarity index 100% rename from src/classes/material/block/liquid/Water.php rename to src/material/block/liquid/Water.php diff --git a/src/classes/material/block/misc/Air.php b/src/material/block/misc/Air.php similarity index 100% rename from src/classes/material/block/misc/Air.php rename to src/material/block/misc/Air.php diff --git a/src/classes/material/block/misc/Bed.php b/src/material/block/misc/Bed.php similarity index 100% rename from src/classes/material/block/misc/Bed.php rename to src/material/block/misc/Bed.php diff --git a/src/classes/material/block/misc/Fire.php b/src/material/block/misc/Fire.php similarity index 100% rename from src/classes/material/block/misc/Fire.php rename to src/material/block/misc/Fire.php diff --git a/src/classes/material/block/misc/NetherReactor.php b/src/material/block/misc/NetherReactor.php similarity index 100% rename from src/classes/material/block/misc/NetherReactor.php rename to src/material/block/misc/NetherReactor.php diff --git a/src/classes/material/block/misc/TNT.php b/src/material/block/misc/TNT.php similarity index 100% rename from src/classes/material/block/misc/TNT.php rename to src/material/block/misc/TNT.php diff --git a/src/classes/material/block/ore/CoalOre.php b/src/material/block/ore/CoalOre.php similarity index 100% rename from src/classes/material/block/ore/CoalOre.php rename to src/material/block/ore/CoalOre.php diff --git a/src/classes/material/block/ore/DiamondOre.php b/src/material/block/ore/DiamondOre.php similarity index 100% rename from src/classes/material/block/ore/DiamondOre.php rename to src/material/block/ore/DiamondOre.php diff --git a/src/classes/material/block/ore/GlowingRedstoneOre.php b/src/material/block/ore/GlowingRedstoneOre.php similarity index 100% rename from src/classes/material/block/ore/GlowingRedstoneOre.php rename to src/material/block/ore/GlowingRedstoneOre.php diff --git a/src/classes/material/block/ore/GoldOre.php b/src/material/block/ore/GoldOre.php similarity index 100% rename from src/classes/material/block/ore/GoldOre.php rename to src/material/block/ore/GoldOre.php diff --git a/src/classes/material/block/ore/IronOre.php b/src/material/block/ore/IronOre.php similarity index 100% rename from src/classes/material/block/ore/IronOre.php rename to src/material/block/ore/IronOre.php diff --git a/src/classes/material/block/ore/LapisOre.php b/src/material/block/ore/LapisOre.php similarity index 100% rename from src/classes/material/block/ore/LapisOre.php rename to src/material/block/ore/LapisOre.php diff --git a/src/classes/material/block/ore/RedstoneOre.php b/src/material/block/ore/RedstoneOre.php similarity index 100% rename from src/classes/material/block/ore/RedstoneOre.php rename to src/material/block/ore/RedstoneOre.php diff --git a/src/classes/material/block/plant/BrownMushroom.php b/src/material/block/plant/BrownMushroom.php similarity index 100% rename from src/classes/material/block/plant/BrownMushroom.php rename to src/material/block/plant/BrownMushroom.php diff --git a/src/classes/material/block/plant/Cactus.php b/src/material/block/plant/Cactus.php similarity index 100% rename from src/classes/material/block/plant/Cactus.php rename to src/material/block/plant/Cactus.php diff --git a/src/classes/material/block/plant/CyanFlower.php b/src/material/block/plant/CyanFlower.php similarity index 100% rename from src/classes/material/block/plant/CyanFlower.php rename to src/material/block/plant/CyanFlower.php diff --git a/src/classes/material/block/plant/Dandelion.php b/src/material/block/plant/Dandelion.php similarity index 100% rename from src/classes/material/block/plant/Dandelion.php rename to src/material/block/plant/Dandelion.php diff --git a/src/classes/material/block/plant/DeadBush.php b/src/material/block/plant/DeadBush.php similarity index 100% rename from src/classes/material/block/plant/DeadBush.php rename to src/material/block/plant/DeadBush.php diff --git a/src/classes/material/block/plant/MelonStem.php b/src/material/block/plant/MelonStem.php similarity index 100% rename from src/classes/material/block/plant/MelonStem.php rename to src/material/block/plant/MelonStem.php diff --git a/src/classes/material/block/plant/RedMushroom.php b/src/material/block/plant/RedMushroom.php similarity index 100% rename from src/classes/material/block/plant/RedMushroom.php rename to src/material/block/plant/RedMushroom.php diff --git a/src/classes/material/block/plant/Sapling.php b/src/material/block/plant/Sapling.php similarity index 100% rename from src/classes/material/block/plant/Sapling.php rename to src/material/block/plant/Sapling.php diff --git a/src/classes/material/block/plant/Sugarcane.php b/src/material/block/plant/Sugarcane.php similarity index 100% rename from src/classes/material/block/plant/Sugarcane.php rename to src/material/block/plant/Sugarcane.php diff --git a/src/classes/material/block/plant/TallGrass.php b/src/material/block/plant/TallGrass.php similarity index 100% rename from src/classes/material/block/plant/TallGrass.php rename to src/material/block/plant/TallGrass.php diff --git a/src/classes/material/block/plant/Wheat.php b/src/material/block/plant/Wheat.php similarity index 100% rename from src/classes/material/block/plant/Wheat.php rename to src/material/block/plant/Wheat.php diff --git a/src/classes/material/block/solid/Bedrock.php b/src/material/block/solid/Bedrock.php similarity index 100% rename from src/classes/material/block/solid/Bedrock.php rename to src/material/block/solid/Bedrock.php diff --git a/src/classes/material/block/solid/Bookshelf.php b/src/material/block/solid/Bookshelf.php similarity index 100% rename from src/classes/material/block/solid/Bookshelf.php rename to src/material/block/solid/Bookshelf.php diff --git a/src/classes/material/block/solid/Bricks.php b/src/material/block/solid/Bricks.php similarity index 100% rename from src/classes/material/block/solid/Bricks.php rename to src/material/block/solid/Bricks.php diff --git a/src/classes/material/block/solid/BurningFurnace.php b/src/material/block/solid/BurningFurnace.php similarity index 100% rename from src/classes/material/block/solid/BurningFurnace.php rename to src/material/block/solid/BurningFurnace.php diff --git a/src/classes/material/block/solid/Chest.php b/src/material/block/solid/Chest.php similarity index 100% rename from src/classes/material/block/solid/Chest.php rename to src/material/block/solid/Chest.php diff --git a/src/classes/material/block/solid/Clay.php b/src/material/block/solid/Clay.php similarity index 100% rename from src/classes/material/block/solid/Clay.php rename to src/material/block/solid/Clay.php diff --git a/src/classes/material/block/solid/Cobblestone.php b/src/material/block/solid/Cobblestone.php similarity index 100% rename from src/classes/material/block/solid/Cobblestone.php rename to src/material/block/solid/Cobblestone.php diff --git a/src/classes/material/block/solid/Cobweb.php b/src/material/block/solid/Cobweb.php similarity index 100% rename from src/classes/material/block/solid/Cobweb.php rename to src/material/block/solid/Cobweb.php diff --git a/src/classes/material/block/solid/Diamond.php b/src/material/block/solid/Diamond.php similarity index 100% rename from src/classes/material/block/solid/Diamond.php rename to src/material/block/solid/Diamond.php diff --git a/src/classes/material/block/solid/Dirt.php b/src/material/block/solid/Dirt.php similarity index 100% rename from src/classes/material/block/solid/Dirt.php rename to src/material/block/solid/Dirt.php diff --git a/src/classes/material/block/solid/DoubleSlab.php b/src/material/block/solid/DoubleSlab.php similarity index 100% rename from src/classes/material/block/solid/DoubleSlab.php rename to src/material/block/solid/DoubleSlab.php diff --git a/src/classes/material/block/solid/Farmland.php b/src/material/block/solid/Farmland.php similarity index 100% rename from src/classes/material/block/solid/Farmland.php rename to src/material/block/solid/Farmland.php diff --git a/src/classes/material/block/solid/Fence.php b/src/material/block/solid/Fence.php similarity index 100% rename from src/classes/material/block/solid/Fence.php rename to src/material/block/solid/Fence.php diff --git a/src/classes/material/block/solid/FenceGate.php b/src/material/block/solid/FenceGate.php similarity index 100% rename from src/classes/material/block/solid/FenceGate.php rename to src/material/block/solid/FenceGate.php diff --git a/src/classes/material/block/solid/Furnace.php b/src/material/block/solid/Furnace.php similarity index 100% rename from src/classes/material/block/solid/Furnace.php rename to src/material/block/solid/Furnace.php diff --git a/src/classes/material/block/solid/Glass.php b/src/material/block/solid/Glass.php similarity index 100% rename from src/classes/material/block/solid/Glass.php rename to src/material/block/solid/Glass.php diff --git a/src/classes/material/block/solid/GlassPane.php b/src/material/block/solid/GlassPane.php similarity index 100% rename from src/classes/material/block/solid/GlassPane.php rename to src/material/block/solid/GlassPane.php diff --git a/src/classes/material/block/solid/GlowingObsidian.php b/src/material/block/solid/GlowingObsidian.php similarity index 100% rename from src/classes/material/block/solid/GlowingObsidian.php rename to src/material/block/solid/GlowingObsidian.php diff --git a/src/classes/material/block/solid/Glowstone.php b/src/material/block/solid/Glowstone.php similarity index 100% rename from src/classes/material/block/solid/Glowstone.php rename to src/material/block/solid/Glowstone.php diff --git a/src/classes/material/block/solid/Gold.php b/src/material/block/solid/Gold.php similarity index 100% rename from src/classes/material/block/solid/Gold.php rename to src/material/block/solid/Gold.php diff --git a/src/classes/material/block/solid/Grass.php b/src/material/block/solid/Grass.php similarity index 100% rename from src/classes/material/block/solid/Grass.php rename to src/material/block/solid/Grass.php diff --git a/src/classes/material/block/solid/Gravel.php b/src/material/block/solid/Gravel.php similarity index 100% rename from src/classes/material/block/solid/Gravel.php rename to src/material/block/solid/Gravel.php diff --git a/src/classes/material/block/solid/Ice.php b/src/material/block/solid/Ice.php similarity index 100% rename from src/classes/material/block/solid/Ice.php rename to src/material/block/solid/Ice.php diff --git a/src/classes/material/block/solid/Iron.php b/src/material/block/solid/Iron.php similarity index 100% rename from src/classes/material/block/solid/Iron.php rename to src/material/block/solid/Iron.php diff --git a/src/classes/material/block/solid/IronDoor.php b/src/material/block/solid/IronDoor.php similarity index 100% rename from src/classes/material/block/solid/IronDoor.php rename to src/material/block/solid/IronDoor.php diff --git a/src/classes/material/block/solid/Lapis.php b/src/material/block/solid/Lapis.php similarity index 100% rename from src/classes/material/block/solid/Lapis.php rename to src/material/block/solid/Lapis.php diff --git a/src/classes/material/block/solid/Leaves.php b/src/material/block/solid/Leaves.php similarity index 100% rename from src/classes/material/block/solid/Leaves.php rename to src/material/block/solid/Leaves.php diff --git a/src/classes/material/block/solid/Melon.php b/src/material/block/solid/Melon.php similarity index 100% rename from src/classes/material/block/solid/Melon.php rename to src/material/block/solid/Melon.php diff --git a/src/classes/material/block/solid/MossStone.php b/src/material/block/solid/MossStone.php similarity index 100% rename from src/classes/material/block/solid/MossStone.php rename to src/material/block/solid/MossStone.php diff --git a/src/classes/material/block/solid/NetherBrick.php b/src/material/block/solid/NetherBrick.php similarity index 100% rename from src/classes/material/block/solid/NetherBrick.php rename to src/material/block/solid/NetherBrick.php diff --git a/src/classes/material/block/solid/Netherrack.php b/src/material/block/solid/Netherrack.php similarity index 100% rename from src/classes/material/block/solid/Netherrack.php rename to src/material/block/solid/Netherrack.php diff --git a/src/classes/material/block/solid/Obsidian.php b/src/material/block/solid/Obsidian.php similarity index 100% rename from src/classes/material/block/solid/Obsidian.php rename to src/material/block/solid/Obsidian.php diff --git a/src/classes/material/block/solid/Planks.php b/src/material/block/solid/Planks.php similarity index 100% rename from src/classes/material/block/solid/Planks.php rename to src/material/block/solid/Planks.php diff --git a/src/classes/material/block/solid/Quartz.php b/src/material/block/solid/Quartz.php similarity index 100% rename from src/classes/material/block/solid/Quartz.php rename to src/material/block/solid/Quartz.php diff --git a/src/classes/material/block/solid/Sand.php b/src/material/block/solid/Sand.php similarity index 100% rename from src/classes/material/block/solid/Sand.php rename to src/material/block/solid/Sand.php diff --git a/src/classes/material/block/solid/Sandstone.php b/src/material/block/solid/Sandstone.php similarity index 100% rename from src/classes/material/block/solid/Sandstone.php rename to src/material/block/solid/Sandstone.php diff --git a/src/classes/material/block/solid/Slab.php b/src/material/block/solid/Slab.php similarity index 100% rename from src/classes/material/block/solid/Slab.php rename to src/material/block/solid/Slab.php diff --git a/src/classes/material/block/solid/Snow.php b/src/material/block/solid/Snow.php similarity index 100% rename from src/classes/material/block/solid/Snow.php rename to src/material/block/solid/Snow.php diff --git a/src/classes/material/block/solid/SnowLayer.php b/src/material/block/solid/SnowLayer.php similarity index 100% rename from src/classes/material/block/solid/SnowLayer.php rename to src/material/block/solid/SnowLayer.php diff --git a/src/classes/material/block/solid/SoulSand.php b/src/material/block/solid/SoulSand.php similarity index 100% rename from src/classes/material/block/solid/SoulSand.php rename to src/material/block/solid/SoulSand.php diff --git a/src/classes/material/block/solid/Stone.php b/src/material/block/solid/Stone.php similarity index 100% rename from src/classes/material/block/solid/Stone.php rename to src/material/block/solid/Stone.php diff --git a/src/classes/material/block/solid/StoneBricks.php b/src/material/block/solid/StoneBricks.php similarity index 100% rename from src/classes/material/block/solid/StoneBricks.php rename to src/material/block/solid/StoneBricks.php diff --git a/src/classes/material/block/solid/Stonecutter.php b/src/material/block/solid/Stonecutter.php similarity index 100% rename from src/classes/material/block/solid/Stonecutter.php rename to src/material/block/solid/Stonecutter.php diff --git a/src/classes/material/block/solid/Wood.php b/src/material/block/solid/Wood.php similarity index 100% rename from src/classes/material/block/solid/Wood.php rename to src/material/block/solid/Wood.php diff --git a/src/classes/material/block/solid/WoodDoor.php b/src/material/block/solid/WoodDoor.php similarity index 100% rename from src/classes/material/block/solid/WoodDoor.php rename to src/material/block/solid/WoodDoor.php diff --git a/src/classes/material/block/solid/Wool.php b/src/material/block/solid/Wool.php similarity index 100% rename from src/classes/material/block/solid/Wool.php rename to src/material/block/solid/Wool.php diff --git a/src/classes/material/block/solid/Workbench.php b/src/material/block/solid/Workbench.php similarity index 100% rename from src/classes/material/block/solid/Workbench.php rename to src/material/block/solid/Workbench.php diff --git a/src/classes/material/block/stairs/BrickStairs.php b/src/material/block/stairs/BrickStairs.php similarity index 100% rename from src/classes/material/block/stairs/BrickStairs.php rename to src/material/block/stairs/BrickStairs.php diff --git a/src/classes/material/block/stairs/CobblestoneStairs.php b/src/material/block/stairs/CobblestoneStairs.php similarity index 100% rename from src/classes/material/block/stairs/CobblestoneStairs.php rename to src/material/block/stairs/CobblestoneStairs.php diff --git a/src/classes/material/block/stairs/NetherBricksStairs.php b/src/material/block/stairs/NetherBricksStairs.php similarity index 100% rename from src/classes/material/block/stairs/NetherBricksStairs.php rename to src/material/block/stairs/NetherBricksStairs.php diff --git a/src/classes/material/block/stairs/QuartzStairs.php b/src/material/block/stairs/QuartzStairs.php similarity index 100% rename from src/classes/material/block/stairs/QuartzStairs.php rename to src/material/block/stairs/QuartzStairs.php diff --git a/src/classes/material/block/stairs/SandstoneStairs.php b/src/material/block/stairs/SandstoneStairs.php similarity index 100% rename from src/classes/material/block/stairs/SandstoneStairs.php rename to src/material/block/stairs/SandstoneStairs.php diff --git a/src/classes/material/block/stairs/StoneBrickStairs.php b/src/material/block/stairs/StoneBrickStairs.php similarity index 100% rename from src/classes/material/block/stairs/StoneBrickStairs.php rename to src/material/block/stairs/StoneBrickStairs.php diff --git a/src/classes/material/block/stairs/WoodStairs.php b/src/material/block/stairs/WoodStairs.php similarity index 100% rename from src/classes/material/block/stairs/WoodStairs.php rename to src/material/block/stairs/WoodStairs.php diff --git a/src/classes/material/item/generic/Apple.php b/src/material/item/generic/Apple.php similarity index 100% rename from src/classes/material/item/generic/Apple.php rename to src/material/item/generic/Apple.php diff --git a/src/classes/material/item/generic/Bed.php b/src/material/item/generic/Bed.php similarity index 100% rename from src/classes/material/item/generic/Bed.php rename to src/material/item/generic/Bed.php diff --git a/src/classes/material/item/generic/Bowl.php b/src/material/item/generic/Bowl.php similarity index 100% rename from src/classes/material/item/generic/Bowl.php rename to src/material/item/generic/Bowl.php diff --git a/src/classes/material/item/generic/Brick.php b/src/material/item/generic/Brick.php similarity index 100% rename from src/classes/material/item/generic/Brick.php rename to src/material/item/generic/Brick.php diff --git a/src/classes/material/item/generic/Coal.php b/src/material/item/generic/Coal.php similarity index 100% rename from src/classes/material/item/generic/Coal.php rename to src/material/item/generic/Coal.php diff --git a/src/classes/material/item/generic/Diamond.php b/src/material/item/generic/Diamond.php similarity index 100% rename from src/classes/material/item/generic/Diamond.php rename to src/material/item/generic/Diamond.php diff --git a/src/classes/material/item/generic/Feather.php b/src/material/item/generic/Feather.php similarity index 100% rename from src/classes/material/item/generic/Feather.php rename to src/material/item/generic/Feather.php diff --git a/src/classes/material/item/generic/GoldIngot.php b/src/material/item/generic/GoldIngot.php similarity index 100% rename from src/classes/material/item/generic/GoldIngot.php rename to src/material/item/generic/GoldIngot.php diff --git a/src/classes/material/item/generic/IronAxe.php b/src/material/item/generic/IronAxe.php similarity index 100% rename from src/classes/material/item/generic/IronAxe.php rename to src/material/item/generic/IronAxe.php diff --git a/src/classes/material/item/generic/IronDoor.php b/src/material/item/generic/IronDoor.php similarity index 100% rename from src/classes/material/item/generic/IronDoor.php rename to src/material/item/generic/IronDoor.php diff --git a/src/classes/material/item/generic/IronHoe.php b/src/material/item/generic/IronHoe.php similarity index 100% rename from src/classes/material/item/generic/IronHoe.php rename to src/material/item/generic/IronHoe.php diff --git a/src/classes/material/item/generic/IronIngot.php b/src/material/item/generic/IronIngot.php similarity index 100% rename from src/classes/material/item/generic/IronIngot.php rename to src/material/item/generic/IronIngot.php diff --git a/src/classes/material/item/generic/IronPickaxe.php b/src/material/item/generic/IronPickaxe.php similarity index 100% rename from src/classes/material/item/generic/IronPickaxe.php rename to src/material/item/generic/IronPickaxe.php diff --git a/src/classes/material/item/generic/IronShovel.php b/src/material/item/generic/IronShovel.php similarity index 100% rename from src/classes/material/item/generic/IronShovel.php rename to src/material/item/generic/IronShovel.php diff --git a/src/classes/material/item/generic/MelonSeeds.php b/src/material/item/generic/MelonSeeds.php similarity index 100% rename from src/classes/material/item/generic/MelonSeeds.php rename to src/material/item/generic/MelonSeeds.php diff --git a/src/classes/material/item/generic/Painting.php b/src/material/item/generic/Painting.php similarity index 100% rename from src/classes/material/item/generic/Painting.php rename to src/material/item/generic/Painting.php diff --git a/src/classes/material/item/generic/SignItem.php b/src/material/item/generic/SignItem.php similarity index 100% rename from src/classes/material/item/generic/SignItem.php rename to src/material/item/generic/SignItem.php diff --git a/src/classes/material/item/generic/Stick.php b/src/material/item/generic/Stick.php similarity index 100% rename from src/classes/material/item/generic/Stick.php rename to src/material/item/generic/Stick.php diff --git a/src/classes/material/item/generic/Sugarcane.php b/src/material/item/generic/Sugarcane.php similarity index 100% rename from src/classes/material/item/generic/Sugarcane.php rename to src/material/item/generic/Sugarcane.php diff --git a/src/classes/material/item/generic/WheatSeeds.php b/src/material/item/generic/WheatSeeds.php similarity index 100% rename from src/classes/material/item/generic/WheatSeeds.php rename to src/material/item/generic/WheatSeeds.php diff --git a/src/classes/material/item/generic/WoodenDoor.php b/src/material/item/generic/WoodenDoor.php similarity index 100% rename from src/classes/material/item/generic/WoodenDoor.php rename to src/material/item/generic/WoodenDoor.php diff --git a/src/classes/math/Vector2.php b/src/math/Vector2.php similarity index 100% rename from src/classes/math/Vector2.php rename to src/math/Vector2.php diff --git a/src/classes/math/Vector3.php b/src/math/Vector3.php similarity index 100% rename from src/classes/math/Vector3.php rename to src/math/Vector3.php diff --git a/src/classes/network/CustomPacketHandler.php b/src/network/CustomPacketHandler.php similarity index 100% rename from src/classes/network/CustomPacketHandler.php rename to src/network/CustomPacketHandler.php diff --git a/src/classes/network/MinecraftInterface.php b/src/network/MinecraftInterface.php similarity index 100% rename from src/classes/network/MinecraftInterface.php rename to src/network/MinecraftInterface.php diff --git a/src/classes/network/Packet.php b/src/network/Packet.php similarity index 100% rename from src/classes/network/Packet.php rename to src/network/Packet.php diff --git a/src/classes/network/SerializedPacketHandler.php b/src/network/SerializedPacketHandler.php similarity index 100% rename from src/classes/network/SerializedPacketHandler.php rename to src/network/SerializedPacketHandler.php diff --git a/src/classes/network/UDPSocket.php b/src/network/UDPSocket.php similarity index 100% rename from src/classes/network/UDPSocket.php rename to src/network/UDPSocket.php diff --git a/src/classes/utils/BigInteger.php b/src/utils/BigInteger.php similarity index 100% rename from src/classes/utils/BigInteger.php rename to src/utils/BigInteger.php diff --git a/src/classes/utils/Config.php b/src/utils/Config.php similarity index 100% rename from src/classes/utils/Config.php rename to src/utils/Config.php diff --git a/src/classes/utils/Container.php b/src/utils/Container.php similarity index 100% rename from src/classes/utils/Container.php rename to src/utils/Container.php diff --git a/src/classes/utils/Java.php b/src/utils/Java.php similarity index 100% rename from src/classes/utils/Java.php rename to src/utils/Java.php diff --git a/src/classes/utils/NBT.php b/src/utils/NBT.php similarity index 100% rename from src/classes/utils/NBT.php rename to src/utils/NBT.php diff --git a/src/classes/utils/Spyc.php b/src/utils/Spyc.php similarity index 100% rename from src/classes/utils/Spyc.php rename to src/utils/Spyc.php diff --git a/src/classes/utils/TickLoop.php b/src/utils/TickLoop.php similarity index 100% rename from src/classes/utils/TickLoop.php rename to src/utils/TickLoop.php diff --git a/src/classes/utils/UPnP.php b/src/utils/UPnP.php similarity index 100% rename from src/classes/utils/UPnP.php rename to src/utils/UPnP.php diff --git a/src/classes/utils/Utils.php b/src/utils/Utils.php similarity index 100% rename from src/classes/utils/Utils.php rename to src/utils/Utils.php diff --git a/src/classes/utils/VersionString.php b/src/utils/VersionString.php similarity index 100% rename from src/classes/utils/VersionString.php rename to src/utils/VersionString.php diff --git a/src/classes/world/ChunkParser.php b/src/world/ChunkParser.php similarity index 100% rename from src/classes/world/ChunkParser.php rename to src/world/ChunkParser.php diff --git a/src/classes/world/Entity.php b/src/world/Entity.php similarity index 100% rename from src/classes/world/Entity.php rename to src/world/Entity.php diff --git a/src/classes/world/TileEntity.php b/src/world/TileEntity.php similarity index 100% rename from src/classes/world/TileEntity.php rename to src/world/TileEntity.php diff --git a/src/classes/world/generator/Generator.class.php b/src/world/generator/Generator.class.php similarity index 100% rename from src/classes/world/generator/Generator.class.php rename to src/world/generator/Generator.class.php diff --git a/src/classes/world/generator/NormalGenerator.class.php b/src/world/generator/NormalGenerator.class.php similarity index 100% rename from src/classes/world/generator/NormalGenerator.class.php rename to src/world/generator/NormalGenerator.class.php diff --git a/src/classes/world/generator/SuperflatGenerator.class.php b/src/world/generator/SuperflatGenerator.class.php similarity index 100% rename from src/classes/world/generator/SuperflatGenerator.class.php rename to src/world/generator/SuperflatGenerator.class.php diff --git a/src/classes/world/generator/object/tree/BigTreeObject.php b/src/world/generator/object/tree/BigTreeObject.php similarity index 96% rename from src/classes/world/generator/object/tree/BigTreeObject.php rename to src/world/generator/object/tree/BigTreeObject.php index e32a111b3..4f5fd29a6 100644 --- a/src/classes/world/generator/object/tree/BigTreeObject.php +++ b/src/world/generator/object/tree/BigTreeObject.php @@ -25,8 +25,9 @@ the Free Software Foundation, either version 3 of the License, or */ - -require_once("classes/world/generator/object/tree/TreeObject.php"); +/***REM_START***/ +require_once("src/world/generator/object/tree/TreeObject.php"); +/***REM_END***/ class BigTreeObject extends TreeObject{ private $trunkHeightMultiplier = 0.618; diff --git a/src/classes/world/generator/object/tree/PineTreeObject.php b/src/world/generator/object/tree/PineTreeObject.php similarity index 96% rename from src/classes/world/generator/object/tree/PineTreeObject.php rename to src/world/generator/object/tree/PineTreeObject.php index 1fd86cb86..11cb30c0a 100644 --- a/src/classes/world/generator/object/tree/PineTreeObject.php +++ b/src/world/generator/object/tree/PineTreeObject.php @@ -25,8 +25,9 @@ the Free Software Foundation, either version 3 of the License, or */ - -require_once("classes/world/generator/object/tree/TreeObject.php"); +/***REM_START***/ +require_once("src/world/generator/object/tree/TreeObject.php"); +/***REM_END***/ class PineTreeObject extends TreeObject{ var $type = 1; diff --git a/src/classes/world/generator/object/tree/SmallTreeObject.php b/src/world/generator/object/tree/SmallTreeObject.php similarity index 95% rename from src/classes/world/generator/object/tree/SmallTreeObject.php rename to src/world/generator/object/tree/SmallTreeObject.php index 3a49aa905..665b14faa 100644 --- a/src/classes/world/generator/object/tree/SmallTreeObject.php +++ b/src/world/generator/object/tree/SmallTreeObject.php @@ -25,8 +25,9 @@ the Free Software Foundation, either version 3 of the License, or */ - -require_once("classes/world/generator/object/tree/TreeObject.php"); +/***REM_START***/ +require_once("src/world/generator/object/tree/TreeObject.php"); +/***REM_END***/ class SmallTreeObject extends TreeObject{ var $type = 0; diff --git a/src/classes/world/generator/object/tree/SpruceTreeObject.php b/src/world/generator/object/tree/SpruceTreeObject.php similarity index 96% rename from src/classes/world/generator/object/tree/SpruceTreeObject.php rename to src/world/generator/object/tree/SpruceTreeObject.php index ea620361a..1837989e0 100644 --- a/src/classes/world/generator/object/tree/SpruceTreeObject.php +++ b/src/world/generator/object/tree/SpruceTreeObject.php @@ -25,8 +25,9 @@ the Free Software Foundation, either version 3 of the License, or */ - -require_once("classes/world/generator/object/tree/TreeObject.php"); +/***REM_START***/ +require_once("src/world/generator/object/tree/TreeObject.php"); +/***REM_END***/ class SpruceTreeObject extends TreeObject{ var $type = 1; diff --git a/src/classes/world/generator/object/tree/TreeObject.php b/src/world/generator/object/tree/TreeObject.php similarity index 100% rename from src/classes/world/generator/object/tree/TreeObject.php rename to src/world/generator/object/tree/TreeObject.php