Automatically set Entity / Tile entity save identifiers

src/pocketmine/block/Block.php

@@ -794,7 +794,7 @@ class Block extends Position implements Metadatable{
 	/**
 	 * @return int
 	 */
-	final public function getID(){
+	final public function getId(){
 		return $this->id;
 	}
 

src/pocketmine/entity/Arrow.php

@@ -45,12 +45,6 @@ class Arrow extends Projectile{
 		parent::__construct($chunk, $nbt);
 	}
 
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Arrow");
-		parent::initEntity();
-
-	}
-
 	public function onUpdate($currentTick){
 		if($this->closed){
 			return false;

src/pocketmine/entity/Chicken.php

@@ -26,7 +26,4 @@ use pocketmine\nbt\tag\String;
 
 class Chicken extends Animal{
 
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Chicken");
-	}
 }

src/pocketmine/entity/Cow.php

@@ -25,7 +25,5 @@ namespace pocketmine\entity;
 use pocketmine\nbt\tag\String;
 
 class Cow extends Animal{
-	protected function initEntity(){
+
-		$this->namedtag->id = new String("id", "Cow");
-	}
 }

src/pocketmine/entity/Creeper.php

@@ -25,7 +25,5 @@ namespace pocketmine\entity;
 use pocketmine\nbt\tag\String;
 
 class Creeper extends Monster implements Explosive{
-	protected function initEntity(){
+
-		$this->namedtag->id = new String("id", "Creeper");
-	}
 }

src/pocketmine/entity/Egg.php

@@ -25,7 +25,5 @@ namespace pocketmine\entity;
 use pocketmine\nbt\tag\String;
 
 class Egg extends Projectile{
-	protected function initEntity(){
+
-		$this->namedtag->id = new String("id", "Egg");
-	}
 }

src/pocketmine/entity/Enderman.php

@@ -26,7 +26,5 @@ use pocketmine\inventory\InventoryHolder;
 use pocketmine\nbt\tag\String;
 
 class Enderman extends Monster implements InventoryHolder{
-	protected function initEntity(){
+
-		$this->namedtag->id = new String("id", "Enderman");
-	}
 }

src/pocketmine/entity/Entity.php

@@ -49,6 +49,7 @@ use pocketmine\nbt\tag\Double;
 use pocketmine\nbt\tag\Enum;
 use pocketmine\nbt\tag\Float;
 use pocketmine\nbt\tag\Short;
+use pocketmine\nbt\tag\String;
 use pocketmine\Network;
 use pocketmine\network\protocol\MoveEntityPacket;
 use pocketmine\network\protocol\MovePlayerPacket;
@@ -69,6 +70,7 @@ abstract class Entity extends Location implements Metadatable{
 	public static $entityCount = 1;
 	/** @var Entity[] */
 	private static $knownEntities = [];
+	private static $shortNames = [];
 
 	/**
 	 * @var Player[]
@@ -250,13 +252,27 @@ abstract class Entity extends Location implements Metadatable{
 			}
 
 			self::$knownEntities[$class->getShortName()] = $className;
+			self::$shortNames[$className] = $class->getShortName();
 			return true;
 		}
 
 		return false;
 	}
 
+	/**
+	 * Returns the short save name
+	 *
+	 * @return string
+	 */
+	public function getSaveId(){
+		return self::$shortNames[static::class];
+	}
+
 	public function saveNBT(){
+		if(!($this instanceof Player)){
+			$this->namedtag->id = new String("id", $this->getSaveId());
+		}
+
 		$this->namedtag->Pos = new Enum("Pos", [
 			new Double(0, $this->x),
 			new Double(1, $this->y),

src/pocketmine/entity/FallingSand.php

@@ -50,7 +50,6 @@ class FallingSand extends Entity{
 	public $canCollide = false;
 
 	protected function initEntity(){
-		$this->namedtag->id = new String("id", "FallingSand");
 		if(isset($this->namedtag->TileID)){
 			$this->blockId = $this->namedtag["TileID"];
 		}elseif(isset($this->namedtag->Tile)){

src/pocketmine/entity/Item.php

@@ -53,7 +53,6 @@ class Item extends Entity{
 	public $canCollide = false;
 
 	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Item");
 		$this->setMaxHealth(5);
 		$this->setHealth($this->namedtag["Health"]);
 		if(isset($this->namedtag->Age)){

src/pocketmine/entity/Ozelot.php

@@ -24,8 +24,6 @@ namespace pocketmine\entity;
 
 use pocketmine\nbt\tag\String;
 
-class Ocelot extends Animal implements Tameable{
+class Ozelot extends Animal implements Tameable{
-	protected function initEntity(){
+
-		$this->namedtag->id = new String("id", "Ozelot");
-	}
 }

src/pocketmine/entity/Painting.php

@@ -25,7 +25,5 @@ namespace pocketmine\entity;
 use pocketmine\nbt\tag\String;
 
 class Painting extends Hanging{
-	protected function initEntity(){
+
-		$this->namedtag->id = new String("id", "Painting");
-	}
 }

src/pocketmine/entity/Pig.php

@@ -25,7 +25,5 @@ namespace pocketmine\entity;
 use pocketmine\nbt\tag\String;
 
 class Pig extends Animal implements Rideable{
-	protected function initEntity(){
+
-		$this->namedtag->id = new String("id", "Pig");
-	}
 }

src/pocketmine/entity/PigZombie.php

@@ -25,7 +25,5 @@ namespace pocketmine\entity;
 use pocketmine\nbt\tag\String;
 
 class PigZombie extends Zombie{
-	protected function initEntity(){
+
-		$this->namedtag->id = new String("id", "PigZombie");
-	}
 }

src/pocketmine/entity/PrimedTNT.php

@@ -47,7 +47,6 @@ class PrimedTNT extends Entity implements Explosive{
 	public $canCollide = false;
 
 	protected function initEntity(){
-		$this->namedtag->id = new String("id", "PrimedTNT");
 		if(isset($this->namedtag->Fuse)){
 			$this->fuse = $this->namedtag["Fuse"];
 		}else{

src/pocketmine/entity/Sheep.php

@@ -25,7 +25,5 @@ namespace pocketmine\entity;
 use pocketmine\nbt\tag\String;
 
 class Sheep extends Animal implements Colorable{
-	protected function initEntity(){
+
-		$this->namedtag->id = new String("id", "Sheep");
-	}
 }

src/pocketmine/entity/Silverfish.php

@@ -25,7 +25,5 @@ namespace pocketmine\entity;
 use pocketmine\nbt\tag\String;
 
 class Silverfish extends Monster{
-	protected function initEntity(){
+
-		$this->namedtag->id = new String("id", "Silverfish");
-	}
 }

src/pocketmine/entity/Skeleton.php

@@ -24,7 +24,5 @@ namespace pocketmine\entity;
 use pocketmine\nbt\tag\String;
 
 class Skeleton extends Monster implements ProjectileSource{
-	protected function initEntity(){
+
-		$this->namedtag->id = new String("id", "Skeleton");
-	}
 }

src/pocketmine/entity/Slime.php

@@ -25,7 +25,5 @@ namespace pocketmine\entity;
 use pocketmine\nbt\tag\String;
 
 class Slime extends Living{
-	protected function initEntity(){
+
-		$this->namedtag->id = new String("id", "Slime");
-	}
 }

src/pocketmine/entity/Snowball.php

@@ -63,11 +63,6 @@ class Snowball extends Projectile{
 		return $hasUpdate;
 	}
 
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Snowball");
-		parent::initEntity();
-	}
-
 	public function spawnTo(Player $player){
 		$pk = new AddEntityPacket();
 		$pk->type = Snowball::NETWORK_ID;

src/pocketmine/entity/Spider.php

@@ -25,7 +25,5 @@ namespace pocketmine\entity;
 use pocketmine\nbt\tag\String;
 
 class Spider extends Monster{
-	protected function initEntity(){
+
-		$this->namedtag->id = new String("id", "Spider");
-	}
 }

src/pocketmine/entity/Villager.php

@@ -48,7 +48,6 @@ class Villager extends Creature implements NPC, Ageable{
 
 	protected function initEntity(){
 		parent::initEntity();
-		$this->namedtag->id = new String("id", "Villager");
 		if(!isset($this->namedtag->Profession)){
 			$this->setProfession(self::PROFESSION_GENERIC);
 		}

src/pocketmine/entity/Wolf.php

@@ -25,7 +25,5 @@ namespace pocketmine\entity;
 use pocketmine\nbt\tag\String;
 
 class Wolf extends Animal implements Tameable{
-	protected function initEntity(){
+
-		$this->namedtag->id = new String("id", "Wolf");
-	}
 }

src/pocketmine/entity/Zombie.php

@@ -36,10 +36,6 @@ class Zombie extends Monster{
 	public $length = 0.6;
 	public $height = 1.8;
 
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Zombie");
-	}
-
 	public function getName(){
 		return "Zombie";
 	}

src/pocketmine/item/Item.php

@@ -539,7 +539,7 @@ class Item{
 		}
 	}
 
-	final public function getID(){
+	final public function getId(){
 		return $this->id;
 	}
 

src/pocketmine/level/Level.php

@@ -307,7 +307,7 @@ class Level implements ChunkManager, Metadatable{
 	 *
 	 * @return int
 	 */
-	final public function getID(){
+	final public function getId(){
 		return $this->levelId;
 	}
 

src/pocketmine/level/generator/GenerationChunkManager.php

@@ -66,7 +66,7 @@ class GenerationChunkManager implements ChunkManager{
 	/**
 	 * @return int
 	 */
-	public function getID(){
+	public function getId(){
 		return $this->levelID;
 	}
 

src/pocketmine/tile/Chest.php

@@ -43,7 +43,6 @@ class Chest extends Spawnable implements InventoryHolder, Container{
 	protected $doubleInventory = null;
 
 	public function __construct(FullChunk $chunk, Compound $nbt){
-		$nbt->id = new String("id", Tile::CHEST);
 		parent::__construct($chunk, $nbt);
 		$this->inventory = new ChestInventory($this);
 

src/pocketmine/tile/Furnace.php

@@ -42,7 +42,6 @@ class Furnace extends Tile implements InventoryHolder, Container{
 	protected $inventory;
 
 	public function __construct(FullChunk $chunk, Compound $nbt){
-		$nbt->id = new String("id", Tile::FURNACE);
 		parent::__construct($chunk, $nbt);
 		$this->inventory = new FurnaceInventory($this);
 

src/pocketmine/tile/Sign.php

@@ -29,7 +29,6 @@ use pocketmine\nbt\tag\String;
 class Sign extends Spawnable{
 
 	public function __construct(FullChunk $chunk, Compound $nbt){
-		$nbt->id = new String("id", Tile::SIGN);
 		if(!isset($nbt->Text1)){
 			$nbt->Text1 = new String("Text1", "");
 		}

src/pocketmine/tile/Tile.php

@@ -32,6 +32,7 @@ use pocketmine\level\Level;
 use pocketmine\level\Position;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Int;
+use pocketmine\nbt\tag\String;
 use pocketmine\utils\ChunkException;
 
 abstract class Tile extends Position{
@@ -41,8 +42,8 @@ abstract class Tile extends Position{
 
 	public static $tileCount = 1;
 
-	/** @var Tile[] */
 	private static $knownTiles = [];
+	private static $shortNames = [];
 
 	/** @var Chunk */
 	public $chunk;
@@ -88,12 +89,22 @@ abstract class Tile extends Position{
 		$class = new \ReflectionClass($className);
 		if(is_a($className, Tile::class, true) and !$class->isAbstract()){
 			self::$knownTiles[$class->getShortName()] = $className;
+			self::$shortNames[$className] = $class->getShortName();
 			return true;
 		}
 
 		return false;
 	}
 
+	/**
+	 * Returns the short save name
+	 *
+	 * @return string
+	 */
+	public function getSaveId(){
+		return self::$shortNames[static::class];
+	}
+
 	public function __construct(FullChunk $chunk, Compound $nbt){
 		if($chunk === null or $chunk->getProvider() === null){
 			throw new ChunkException("Invalid garbage Chunk given to Tile");
@@ -117,11 +128,12 @@ abstract class Tile extends Position{
 		$this->tickTimer = Timings::getTileEntityTimings($this);
 	}
 
-	public function getID(){
+	public function getId(){
 		return $this->id;
 	}
 
 	public function saveNBT(){
+		$this->namedtag->id = new String("id", $this->getSaveId());
 		$this->namedtag->x = new Int("x", $this->x);
 		$this->namedtag->y = new Int("y", $this->y);
 		$this->namedtag->z = new Int("z", $this->z);