This commit is contained in:
ArkQuark 2022-06-08 17:23:26 +03:00
commit f7900700a9
16 changed files with 247 additions and 110 deletions

View file

@ -133,7 +133,7 @@ class EntityAPI{
$isBaby = 0;
if(strtolower($args[2]) == 'baby'){//summon <mob> [amount] [baby]
if($type > 13){
$output .= "Baby can be only animals!";
$output .= "This mob cant be baby!";
break;
}
$isBaby = 1;
@ -150,7 +150,7 @@ class EntityAPI{
"y" => $spawnY,
"z" => $spawnZ,
"Health" => $this->hp[$type],
"isBaby" => $isBaby,
"IsBaby" => $isBaby,
));
$this->spawnToAll($entityit, $level);
}
@ -270,7 +270,14 @@ class EntityAPI{
public function add(Level $level, $class, $type = 0, $data = array()){
$eid = $this->eCnt++;
$this->entities[$eid] = new Entity($level, $eid, $class, $type, $data);
$efl = EntityRegistry::$entityList->getEntityFromType($type);
if($efl instanceof PropertyEntity){
console(json_encode($data));
$class = $efl->getEntityName();
$this->entities[$eid] = new $class($level, $eid, $efl->getEntityClass(), $efl->getEntityType(), $data);
}else{
$this->entities[$eid] = new Entity($level, $eid, $class, $type, $data);
}
$this->server->handle("entity.add", $this->entities[$eid]);
return $this->entities[$eid];
}

View file

@ -31,6 +31,7 @@ class PocketMinecraftServer{
private function load(){
global $dolog;
EntityRegistry::registerEntities();
$this->version = new VersionString();
/*if(defined("DEBUG") and DEBUG >= 0){
@cli_set_process_title("NostalgiaCore ".MAJOR_VERSION);

View file

@ -95,6 +95,12 @@ $sha1sum = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
require_once(FILE_PATH."/src/math/Vector3.php");
require_once(FILE_PATH."/src/world/Position.php");
require_once(FILE_PATH."/src/pmf/PMF.php");
require_once(FILE_PATH."/src/entity/Entity.php");
require_once(FILE_PATH."/src/entity/Damageable.php");
require_once(FILE_PATH."/src/entity/Living.php");
require_once(FILE_PATH."/src/entity/Creature.php");
require_once(FILE_PATH."/src/entity/Ageable.php");
require_once(FILE_PATH."/src/entity/Animal.php");
require_all(FILE_PATH . "src/");

View file

@ -0,0 +1,5 @@
<?php
interface Ageable{
public function isBaby();
}

View file

@ -0,0 +1,18 @@
<?php
/*
TODO:
move methods
*/
class Animal extends Creature implements Ageable{
public function isBaby(){
return $this->data["IsBaby"];
}
public function environmentUpdate(){
if($this->server->api->getProperty("spawn-animals") !== true){
$this->close();
return false;
}
parent::environmentUpdate();
}
}

View file

@ -0,0 +1,8 @@
<?php
/*
TODO:
move methods
*/
abstract class Creature extends Living{
const CLASS_TYPE = ENTITY_MOB;
}

View file

@ -0,0 +1,5 @@
<?php
interface Damageable{
}

View file

@ -20,6 +20,8 @@
*/
class Entity extends Position{
const TYPE = -1;
const CLASS_TYPE = -1;
public $age;
public $air;
public $spawntime;
@ -47,7 +49,7 @@ class Entity extends Position{
public $fallStart;
private $tickCounter;
private $speedMeasure = array(0, 0, 0, 0, 0, 0, 0);
private $server;
protected $server;
private $isStatic;
public $level;
public $isInMinecart = false;
@ -56,7 +58,6 @@ class Entity extends Position{
public $check = true;
public $size = 1;
public $inAction = false;
function __construct(Level $level, $eid, $class, $type = 0, $data = array()){
$this->level = $level;
$this->fallY = false;
@ -113,38 +114,6 @@ class Entity extends Position{
break;
case ENTITY_MOB:
switch($this->type){
//Animals
case MOB_CHICKEN:
$this->server->schedule(mt_rand(0,6000) + 6000, array($this, "dropAnEgg"));
$this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:4, "generic");
$this->update();
//$this->setName('Chicken');
if(isset($this->data['isBaby'])) $this->size = 0.35;
else $this->size = 0.7;
break;
case MOB_COW:
$this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:10, "generic");
$this->update();
//$this->setName('Cow');
if(isset($this->data['isBaby'])) $this->size = 0.65;
else $this->size = 1.4;
break;
case MOB_PIG:
$this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:10, "generic");
$this->update();
//$this->setName('Pig');
if(isset($this->data['isBaby'])) $this->size = 0.60; //not original
else $this->size = 1.1875;
break;
case MOB_SHEEP:
$this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:8, "generic");
$this->update();
//$this->setName('Sheep');
if(isset($this->data['isBaby'])) $this->size = 0.65;
else $this->size = 1.3;
break;
//Monsters
case MOB_CREEPER:
$this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:20, "generic");
@ -218,10 +187,7 @@ class Entity extends Position{
$this->close();
}
}
public function dropAnEgg(){
ServerAPI::request()->api->entity->drop(new Position($this->x + 0.5, $this->y, $this->z + 0.5, $this->level), BlockAPI::getItem(EGG,0,1));
$this->server->schedule(mt_rand(0,6000) + 6000, array($this, "dropAnEgg"));
}
public function updateFuse(){
if($this->closed === true){
return false;
@ -266,7 +232,7 @@ class Entity extends Position{
);
}
}elseif($this->class === ENTITY_MOB){
if($this->data["isBaby"]){
if($this->data["IsBaby"]){
return array(
array(AIR, 0, 0),
);
@ -298,26 +264,6 @@ class Entity extends Position{
array(ARROW, 0, mt_rand(0,2)),
array(BONE, 0, mt_rand(0,2)),
);
//Animals
case MOB_CHICKEN:
return array(
array(FEATHER, 0, mt_rand(0,2)),
array(($this->fire > 0 ? COOKED_CHICKEN:RAW_CHICKEN), 0, 1),
);
case MOB_COW:
return array(
array(LEATHER, 0, mt_rand(0,2)),
array(($this->fire > 0 ? STEAK:BEEF), 0, 1),
);
case MOB_PIG:
return array(
array(($this->fire > 0 ? COOKED_PORKCHOP:RAW_PORKCHOP), 0, 1),
);
case MOB_SHEEP:
return array(
array(WOOL, $this->data["Color"] & 0x0F, 1),
);
}
}
return array();
@ -363,15 +309,6 @@ class Entity extends Position{
if($this->class === ENTITY_MOB){
switch($this->type){
case MOB_CHICKEN:
case MOB_SHEEP:
case MOB_COW:
case MOB_PIG:
if($this->server->api->getProperty("spawn-animals") !== true){
$this->close();
return false;
}
break;
case MOB_ZOMBIE:
case MOB_CREEPER:
case MOB_PIGMAN:
@ -723,36 +660,10 @@ class Entity extends Position{
******************
0 => array("type" => 0, "value" => $flags) --> Unknown
1 => array("type" => 1, "value" => $this->air) --> Entity Air
14 => array("type" => 0, "value" => 1) --> isBaby, value: 0 => false, 1 => true
14 => array("type" => 0, "value" => 1) --> IsBaby, value: 0 => false, 1 => true
16 => array("type" => 0, "value" => 0) --> Unknown
17 => array("type" => 6, "value" => array(0, 0, 0)) --> Unknown
*/
public function sheepColor(){
$pink = 0.1558;
$brown = 2.85;
$lightgray_black_gray = 14.25;
$chance = Utils::randomFloat() * 100;
switch($chance){
case($chance <= $pink):
$color = 6;
break;
case($chance > $pink and $chance <= ($brown+$pink)):
$color = 12;
break;
case($chance > ($brown+$pink) and $chance <= ($lightgray_black_gray+$brown+$pink)):
$rand = mt_rand(1,3);
if($rand == 1) $color = 15;
elseif($rand == 2) $color = 7;
else $color = 8;
break;
default:
$color = 0;
break;
}
return $color;
}
public function getMetadata(){
$flags = 0;
$flags |= $this->fire > 0 ? 1:0;
@ -765,17 +676,11 @@ class Entity extends Position{
16 => array("type" => 0, "value" => 0),
17 => array("type" => 6, "value" => array(0, 0, 0)),
);
if(!isset($this->data["isBaby"])){
$this->data["isBaby"] = 0;
if(!isset($this->data["IsBaby"])){
$this->data["IsBaby"] = 0;
}
$d[14]["value"] = $this->data["isBaby"];
if($this->class === ENTITY_MOB and $this->type === MOB_SHEEP){
if(!isset($this->data["Sheared"])){
$this->data["Sheared"] = 0;
$this->data["Color"] = $this->sheepColor();
}
$d[16]["value"] = (($this->data["Sheared"] == 1 ? 1:0) << 4) | ($this->data["Color"] & 0x0F);
}elseif($this->class === ENTITY_OBJECT && $this->type === OBJECT_PRIMEDTNT){ //ladder fix 2.0
$d[14]["value"] = $this->data["IsBaby"];
if($this->class === ENTITY_OBJECT && $this->type === OBJECT_PRIMEDTNT){ //ladder fix 2.0
$d[16]["value"] = (int) max(0, $this->data["fuse"] - (microtime(true) - $this->spawntime) * 20);
}elseif($this->class === ENTITY_PLAYER){
if($this->player->isSleeping !== false){

View file

@ -0,0 +1,59 @@
<?php
class PropertyEntity{
private $class,$type,$name;
function __construct($class, $type, $name){
$this->class = $class;
$this->type = $type;
$this->name = $name;
}
public function getEntityClass(){
return $this->class;
}
public function getEntityType(){
return $this->type;
}
public function getEntityName(){
return $this->name;
}
}
class EntityList{
public function getEntities(){
return $this->entities;
}
public function addEntity(PropertyEntity $property){
$this->entities[$property->getEntityType()] = $property;
}
public function getEntityFromType($type){
return isset($this->entities[$type]) ? $this->entities[$type] : 0;
}
private $entities = [];
}
class EntityRegistry{
public static $entityList;
/*Register all entities*/
public static function registerEntities(){
self::$entityList = new EntityList;
self::registerEntity(Pig::class);
self::registerEntity(Chicken::class);
self::registerEntity(Sheep::class);
self::registerEntity(Cow::class);
}
/*Register an Entity*/
public static function registerEntity($className){
$class = new \ReflectionClass($className);
if(is_a($className, Entity::class, true) and !$class->isAbstract()){
//self::$entityList[$className::TYPE] = $className;
self::$entityList->addEntity(new PropertyEntity($className::CLASS_TYPE, $className::TYPE, $className));
//self::$shortNames[$className] = $class->getShortName(); what is this even supposed to do?
console("Registered a ".$className);
return true;
}
return false;
}
}

View file

@ -0,0 +1,3 @@
<?php
abstract class Living extends Entity implements Damageable{
}

View file

@ -0,0 +1,27 @@
<?php
class Chicken extends Animal{
const TYPE = MOB_CHICKEN;
function __construct(Level $level, $eid, $class, $type = 0, $data = array()){
parent::__construct($level, $eid, $class, $type, $data);
$server = ServerAPI::request();
$server->schedule(mt_rand(0,6000) + 6000, array($this, "dropAnEgg"));
$this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:4, "generic");
$this->update();
//$this->setName('Chicken');
$this->size = $this->isBaby() ? 0.35 : 0.7;
}
public function dropAnEgg(){
ServerAPI::request()->api->entity->drop(new Position($this->x + 0.5, $this->y, $this->z + 0.5, $this->level), BlockAPI::getItem(EGG,0,1));
$this->server->schedule(mt_rand(0,6000) + 6000, array($this, "dropAnEgg"));
}
public function getDrops(){
return $this->isBaby() ? array() :
array(
array(FEATHER, 0, mt_rand(0,2)),
array(($this->fire > 0 ? COOKED_CHICKEN : RAW_CHICKEN), 0, 1),
);
}
}

View file

@ -0,0 +1,22 @@
<?php
class Cow extends Animal{
const TYPE = MOB_COW;
function __construct(Level $level, $eid, $class, $type = 0, $data = array()){
parent::__construct($level, $eid, $class, $type, $data);
$this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:10, "generic");
$this->update();
//$this->setName('Cow');
$this->size = $this->isBaby() ? 0.65 : 1.4;
}
public function getDrops(){
return $this->isBaby() ? array() :
array(
array(LEATHER, 0, mt_rand(0,2)),
array(($this->fire > 0 ? STEAK:BEEF), 0, 1),
);
}
}

View file

@ -0,0 +1,19 @@
<?php
class Pig extends Animal{
const TYPE = MOB_PIG;
function __construct(Level $level, $eid, $class, $type = 0, $data = array()){
parent::__construct($level, $eid, $class, $type, $data);
$this->setHealth(isset($this->data["Health"]) ? $this->data["Health"]:10, "generic");
$this->update();
//$this->setName('Pig');
$this->size = $this->isBaby() ? 0.60 : 1.1875;
}
public function getDrops(){
return $this->isBaby() ? array() :
array(
array(($this->fire > 0 ? COOKED_PORKCHOP:RAW_PORKCHOP), 0, 1),
);
}
}

View file

@ -0,0 +1,52 @@
<?php
class Sheep extends Animal{
const TYPE = MOB_SHEEP;
function __construct(Level $level, $eid, $class, $type = 0, $data = array()){
parent::__construct($level, $eid, $class, $type, $data);
$this->setHealth(isset($this->data["Health"]) ? $this->data["Health"] : 8, "generic");
$this->update();
//$this->setName('Sheep');
$this->size = $this->isBaby() ? 0.65 : 1.3;
}
public function getDrops(){
return $this->isBaby() ? array() :
array(
array(WOOL, $this->data["Color"] & 0x0F, 1),
);
}
public function getMetadata(){
$d = parent::getMetadata();
if(!isset($this->data["Sheared"])){
$this->data["Sheared"] = 0;
$this->data["Color"] = $this->sheepColor();
}
$d[16]["value"] = (($this->data["Sheared"] == 1 ? 1:0) << 4) | ($this->data["Color"] & 0x0F); //dark manipulations are happening here...
return $d;
}
public function sheepColor(){
$pink = 0.1558;
$brown = 2.85;
$lightgray_black_gray = 14.25;
$chance = Utils::randomFloat() * 100;
switch($chance){
case($chance <= $pink):
$color = 6;
break;
case($chance > $pink and $chance <= ($brown+$pink)):
$color = 12;
break;
case($chance > ($brown+$pink) and $chance <= ($lightgray_black_gray+$brown+$pink)):
$rand = mt_rand(1,3);
if($rand == 1) $color = 15;
elseif($rand == 2) $color = 7;
else $color = 8;
break;
default:
$color = 0;
break;
}
return $color;
}
}

View file

@ -43,7 +43,7 @@ class SpawnEggItem extends Item{
"x" => $block->x + 0.5,
"y" => $block->y,
"z" => $block->z + 0.5,
"isBaby" => $ageable ? Utils::chance(5) ? 1 : 0 : 0,
"IsBaby" => $ageable ? Utils::chance(5) ? 1 : 0 : 0,
);
$e = ServerAPI::request()->api->entity->add($block->level, ENTITY_MOB, $this->meta, $data);
ServerAPI::request()->api->entity->spawnToAll($e);

View file

@ -163,7 +163,7 @@ class Level{
"id" => $entity->type,
"Color" => @$entity->data["Color"],
"Sheared" => @$entity->data["Sheared"],
"isBaby" => @$entity->data["isBaby"],
"IsBaby" => @$entity->data["IsBaby"],
"Health" => $entity->health,
"Pos" => array(
0 => $entity->x,