Added new methods of Block properties (WiP)

This commit is contained in:
Shoghi Cervantes Pueyo 2013-02-02 13:36:18 +01:00
parent 4c06b384c7
commit 5a054a8ab4
6 changed files with 236 additions and 25 deletions

View file

@ -29,7 +29,7 @@ class PocketMinecraftServer{
public $tCnt;
var $version, $invisible, $api, $tickMeasure, $preparedSQL, $seed, $gamemode, $name, $maxClients, $clients, $eidCnt, $custom, $description, $motd, $timePerSecond, $spawn, $entities, $mapDir, $mapName, $map, $levelData, $tileEntities;
private $database, $interface, $evCnt, $handCnt, $events, $eventsID, $handlers, $serverType, $lastTick, $ticker;
private function load(){
$this->version = new VersionString();
console("[INFO] \x1b[33;1mPocketMine-MP ".MAJOR_VERSION." #".$this->version->getNumber()." by @shoghicp, LGPL License", true, true, 0);
@ -46,7 +46,7 @@ class PocketMinecraftServer{
console("[INFO] Loading database...");
$this->startDatabase();
$this->doTick = false;
$this->api = false;
$this->api = false;
$this->tCnt = 1;
$this->mapDir = false;
$this->mapName = false;
@ -78,9 +78,9 @@ class PocketMinecraftServer{
$this->reloadConfig();
console("[INFO] Server Name: \x1b[36m".$this->name."\x1b[0m");
console("[DEBUG] Server ID: ".$this->serverID, true, true, 2);
$this->stop = false;
$this->stop = false;
}
function __construct($name, $gamemode = 1, $seed = false, $port = 19132, $serverID = false){
$this->port = (int) $port; //19132 - 19135
$this->gamemode = (int) $gamemode;
@ -244,7 +244,7 @@ class PocketMinecraftServer{
}
console("[ERROR] Event \"$event\" has been deprecated.$sub [Handler]");
}
if($result !== false){
$this->trigger($event, $data);
}
@ -295,7 +295,7 @@ class PocketMinecraftServer{
console("[INFO] Gamemode: \x1b[36m".$this->getGamemode()."\x1b[0m");
}
}
public function getGamemode(){
switch($this->gamemode){
case 0:
@ -376,7 +376,7 @@ class PocketMinecraftServer{
"Rotation" => array(
0 => $entity->yaw,
1 => $entity->pitch,
),
),
);
}elseif($entity->class === ENTITY_ITEM){
$entities[] = array(
@ -395,8 +395,8 @@ class PocketMinecraftServer{
"Rotation" => array(
0 => 0,
1 => 0,
),
);
),
);
}
}
file_put_contents($this->mapDir."entities.dat", serialize($entities));
@ -433,7 +433,7 @@ class PocketMinecraftServer{
console("[INFO] Server started!");
$this->process();
}
public function dumpError(){
console("[ERROR] An Unrecovereable has ocurred and the server has Crashed. Creating an Error Dump");
$dump = "# PocketMine-MP Error Dump ".date("D M j H:i:s T Y")."\r\n";
@ -616,7 +616,7 @@ class PocketMinecraftServer{
$ev[0]->$method($data, $event);
}else{
$ev($data, $event);
}
}
}
}elseif(isset(Deprecation::$events[$event])){
$sub = "";
@ -641,7 +641,7 @@ class PocketMinecraftServer{
return $chcnt;
}
public function action($microseconds, $code, $repeat = true){
public function action($microseconds, $code, $repeat = true){
$this->query("INSERT INTO actions (interval, last, code, repeat) VALUES(".($microseconds / 1000000).", ".microtime(true).", '".base64_encode($code)."', ".($repeat === true ? 1:0).");");
console("[INTERNAL] Attached to action ".$microseconds, true, true, 3);
}

View file

@ -27,10 +27,6 @@ the Free Software Foundation, either version 3 of the License, or
abstract class Block{
/*public static $name = array(
AIR => "GenericBlock",
);*/
protected $id;
protected $meta;

View file

@ -0,0 +1,41 @@
<?php
/*
-
/ \
/ \
/ PocketMine \
/ MP \
|\ @shoghicp /|
|. \ / .|
| .. \ / .. |
| .. | .. |
| .. | .. |
\ | /
\ | /
\ | /
\ | /
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
*/
class AirBlock extends TransparentBlock{
public function __construct(){
parent::__construct(AIR, 0, "Air");
$this->isActivable = false;
$this->isBreakable = false;
$this->isFlowable = true;
$this->isTransparent = true;
$this->isReplaceable = true;
$this->isPlaceable = false;
$this->inWorld = false;
$this->hasPhysics = false;
}
}

View file

@ -0,0 +1,52 @@
<?php
/*
-
/ \
/ \
/ PocketMine \
/ MP \
|\ @shoghicp /|
|. \ / .|
| .. \ / .. |
| .. | .. |
| .. | .. |
\ | /
\ | /
\ | /
\ | /
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
*/
class WoolBlock extends SolidBlock{
public function __construct($type = 0){
parent::__construct(WOOL, $type, "Wool");
$names = array(
0 => "White Wool",
1 => "Orange Wool",
2 => "Magenta Wool",
3 => "Light Blue Wool",
4 => "Yellow Wool",
5 => "Lime Wool",
6 => "Pink Wool",
7 => "Gray Wool",
8 => "Light Gray Wool",
9 => "Cyan Wool",
10 => "Purple Wool",
11 => "Blue Wool",
12 => "Brown Wool",
13 => "Green Wool",
14 => "Red Wool",
15 => "Black Wool",
);
$this->name = $names[$this->type];
}
}

View file

@ -35,19 +35,19 @@ class TreeObject{
);
public static function growTree(LevelAPI $level, Block $block){
switch($block->getMetadata() & 0x03){
case Sapling::SPRUCE:
case SaplingBlock::SPRUCE:
if(mt_rand(0,1) == 1){
$tree = new SpruceTreeObject();
}else{
$tree = new PineTreeObject();
}
break;
case Sapling::BIRCH:
case SaplingBlock::BIRCH:
$tree = new SmallTreeObject();
$tree->type = Sapling::BIRCH;
$tree->type = SaplingBlock::BIRCH;
break;
default:
case Sapling::OAK:
case SaplingBlock::OAK:
if(mt_rand(0,9) === 0){
$tree = new BigTreeObject();
}else{