mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 19:49:44 +00:00
simple entity registering, tested on pig, some classes were created, althrough they are still not implemented
This commit is contained in:
parent
e5abc85f94
commit
6a321aabe0
13 changed files with 116 additions and 4 deletions
|
|
@ -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){
|
||||
$class = $efl->getEntityName();
|
||||
console("yey");
|
||||
$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];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . FILE_PATH);
|
|||
ini_set("memory_limit", "256M"); //Default
|
||||
define("LOG", true);
|
||||
define("START_TIME", microtime(true));
|
||||
define("MAJOR_VERSION", "1.0.2 (Alpha_1.3.12)");
|
||||
define("MAJOR_VERSION", "1.0.2dev (Alpha_1.3.12)");
|
||||
define("CODENAME", "懐かしさ (Nostalgia)"); //i'm not very creative - kotyaralih
|
||||
define("CURRENT_MINECRAFT_VERSION", "v0.8.1 alpha");
|
||||
define("CURRENT_API_VERSION", '12.1');
|
||||
|
|
|
|||
|
|
@ -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/");
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
<?php
|
||||
|
||||
interface Ageable{
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<?php
|
||||
/*
|
||||
TODO:
|
||||
move methods
|
||||
*/
|
||||
class Animal extends Creature implements Ageable{
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<?php
|
||||
/*
|
||||
TODO:
|
||||
move methods
|
||||
*/
|
||||
abstract class Creature extends Living{
|
||||
const CLASS_TYPE = ENTITY_MOB;
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
<?php
|
||||
|
||||
interface Damageable{
|
||||
|
||||
}
|
||||
|
|
@ -20,6 +20,8 @@
|
|||
*/
|
||||
|
||||
class Entity extends Position{
|
||||
const TYPE = -1;
|
||||
const CLASS_TYPE = -1;
|
||||
public $age;
|
||||
public $air;
|
||||
public $spawntime;
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
56
src/entity/EntityRegistry.php
Normal file
56
src/entity/EntityRegistry.php
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
<?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);
|
||||
}
|
||||
|
||||
/*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;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
<?php
|
||||
abstract class Living extends Entity implements Damageable{
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
<?php
|
||||
/*
|
||||
TODO:
|
||||
move methods
|
||||
*/
|
||||
class Pig extends Animal{
|
||||
const TYPE = 12;
|
||||
function __construct(Level $level, $eid, $class, $type = 0, $data = array()){
|
||||
console("A constructor which indicates it works! ".":".$eid.":".$class.":".$type);
|
||||
parent::__construct($level, $eid, $class, $type, $data);
|
||||
}
|
||||
}
|
||||
|
|
@ -30,7 +30,7 @@ class ObsidianBlock extends SolidBlock{
|
|||
return 0.20;
|
||||
}
|
||||
if($item->isPickaxe() >= 5){
|
||||
return 9.4;
|
||||
return 3.5;//from wiki
|
||||
}else{
|
||||
return 250;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue