mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-14 01:39:52 +00:00
Code Issues Projects Releases Wiki Activity

Refactored JSON-parsing NBT utilities into their own class

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-05-19 20:02:43 +01:00
parent 2e480b5ea1
commit afd90adb1c
3 changed files with 261 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/command/defaults/GiveCommand.php
View File

@ -25,7 +25,7 @@ use pocketmine\command\Command;
use pocketmine\command\CommandSender; use pocketmine\command\CommandSender;
use pocketmine\event\TranslationContainer; use pocketmine\event\TranslationContainer;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\nbt\NBT; use pocketmine\nbt\JsonNBTParser;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\utils\TextFormat; use pocketmine\utils\TextFormat;
@ -65,7 +65,7 @@ class GiveCommand extends VanillaCommand{
$tags = $exception = null; $tags = $exception = null;
$data = implode(" ", array_slice($args, 3)); $data = implode(" ", array_slice($args, 3));
try{ try{
$tags = NBT::parseJSON($data); $tags = JsonNBTParser::parseJSON($data);
}catch(\Throwable $ex){ }catch(\Throwable $ex){
$exception = $ex; $exception = $ex;
} }

259
src/pocketmine/nbt/JsonNBTParser.php Normal file
View File

@ -0,0 +1,259 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* 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.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
namespace pocketmine\nbt;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\NamedTag;
class JsonNBTParser{
/**
* Parses JSON-formatted NBT into a CompoundTag and returns it. Used for parsing tags supplied with the /give command.
*
* @param string $data
* @param int &$offset
*
* @return CompoundTag|null
*
* @throws \Exception
*/
public static function parseJSON(string $data, int &$offset = 0){
$len = strlen($data);
for(; $offset < $len; ++$offset){
$c = $data{$offset};
if($c === "{"){
++$offset;
$data = self::parseCompound($data, $offset);
return new CompoundTag("", $data);
}elseif($c !== " " and $c !== "\r" and $c !== "\n" and $c !== "\t"){
throw new \Exception("Syntax error: unexpected '$c' at offset $offset");
}
}
return null;
}
/**#
* @param string $str
* @param int &$offset
*
* @return NamedTag[]
*/
private static function parseList(string $str, int &$offset = 0) : array{
$len = strlen($str);
$key = 0;
$value = null;
$data = [];
for(; $offset < $len; ++$offset){
if($str{$offset - 1} === "]"){
break;
}elseif($str{$offset} === "]"){
++$offset;
break;
}
$value = self::readValue($str, $offset, $type);
$tag = NBT::createTag($type);
if($tag instanceof NamedTag){
$tag->setName($key);
$tag->setValue($value);
$data[$key] = $tag;
}
$key++;
}
return $data;
}
/**
* @param string $str
* @param int $offset
*
* @return NamedTag[]
*/
private static function parseCompound(string $str, int &$offset = 0) : array{
$len = strlen($str);
$data = [];
for(; $offset < $len; ++$offset){
if($str{$offset - 1} === "}"){
break;
}elseif($str{$offset} === "}"){
++$offset;
break;
}
$key = self::readKey($str, $offset);
$value = self::readValue($str, $offset, $type);
$tag = NBT::createTag($type);
if($tag instanceof NamedTag){
$tag->setName($key);
$tag->setValue($value);
$data[$key] = $tag;
}
}
return $data;
}
/**
* @param string $data
* @param int $offset
* @param int|null $type
*
* @return mixed
* @throws \Exception
*/
private static function readValue(string $data, int &$offset, &$type = null){
$value = "";
$type = null;
$inQuotes = false;
$len = strlen($data);
for(; $offset < $len; ++$offset){
$c = $data{$offset};
if(!$inQuotes and ($c === " " or $c === "\r" or $c === "\n" or $c === "\t" or $c === "," or $c === "}" or $c === "]")){
if($c === "," or $c === "}" or $c === "]"){
break;
}
}elseif($c === '"'){
$inQuotes = !$inQuotes;
if($type === null){
$type = NBT::TAG_String;
}elseif($inQuotes){
throw new \Exception("Syntax error: invalid quote at offset $offset");
}
}elseif($c === "\\"){
$value .= $data{$offset + 1} ?? "";
++$offset;
}elseif($c === "{" and !$inQuotes){
if($value !== ""){
throw new \Exception("Syntax error: invalid compound start at offset $offset");
}
++$offset;
$value = self::parseCompound($data, $offset);
$type = NBT::TAG_Compound;
break;
}elseif($c === "[" and !$inQuotes){
if($value !== ""){
throw new \Exception("Syntax error: invalid list start at offset $offset");
}
++$offset;
$value = self::parseList($data, $offset);
$type = NBT::TAG_List;
break;
}else{
$value .= $c;
}
}
if($value === ""){
throw new \Exception("Syntax error: invalid empty value at offset $offset");
}
if($type === null and strlen($value) > 0){
$value = trim($value);
$last = strtolower(substr($value, -1));
$part = substr($value, 0, -1);
if($last !== "b" and $last !== "s" and $last !== "l" and $last !== "f" and $last !== "d"){
$part = $value;
$last = null;
}
if($last !== "f" and $last !== "d" and ((string) ((int) $part)) === $part){
if($last === "b"){
$type = NBT::TAG_Byte;
}elseif($last === "s"){
$type = NBT::TAG_Short;
}elseif($last === "l"){
$type = NBT::TAG_Long;
}else{
$type = NBT::TAG_Int;
}
$value = (int) $part;
}elseif(is_numeric($part)){
if($last === "f" or $last === "d" or strpos($part, ".") !== false){
if($last === "f"){
$type = NBT::TAG_Float;
}elseif($last === "d"){
$type = NBT::TAG_Double;
}else{
$type = NBT::TAG_Float;
}
$value = (float) $part;
}else{
if($last === "l"){
$type = NBT::TAG_Long;
}else{
$type = NBT::TAG_Int;
}
$value = $part;
}
}else{
$type = NBT::TAG_String;
}
}
return $value;
}
/**
* @param string $data
* @param int $offset
*
* @return string
* @throws \Exception
*/
private static function readKey(string $data, int &$offset){
$key = "";
$len = strlen($data);
for(; $offset < $len; ++$offset){
$c = $data{$offset};
if($c === ":"){
++$offset;
break;
}elseif($c !== " " and $c !== "\r" and $c !== "\n" and $c !== "\t" and $c !== "\""){
$key .= $c;
}
}
if($key === ""){
throw new \Exception("Syntax error: invalid empty key at offset $offset");
}
return $key;
}
}

193
src/pocketmine/nbt/NBT.php
View File

@ -171,199 +171,6 @@ class NBT{
return true; return true;
} }
public static function parseJSON($data, &$offset = 0){
$len = strlen($data);
for(; $offset < $len; ++$offset){
$c = $data{$offset};
if($c === "{"){
++$offset;
$data = self::parseCompound($data, $offset);
return new CompoundTag("", $data);
}elseif($c !== " " and $c !== "\r" and $c !== "\n" and $c !== "\t"){
throw new \Exception("Syntax error: unexpected '$c' at offset $offset");
}
}
return null;
}
private static function parseList($str, &$offset = 0){
$len = strlen($str);
$key = 0;
$value = null;
$data = [];
for(; $offset < $len; ++$offset){
if($str{$offset - 1} === "]"){
break;
}elseif($str{$offset} === "]"){
++$offset;
break;
}
$value = self::readValue($str, $offset, $type);
$tag = self::createTag($type);
if($tag instanceof NamedTag){
$tag->setName($key);
$tag->setValue($value);
$data[$key] = $tag;
}
$key++;
}
return $data;
}
private static function parseCompound($str, &$offset = 0){
$len = strlen($str);
$data = [];
for(; $offset < $len; ++$offset){
if($str{$offset - 1} === "}"){
break;
}elseif($str{$offset} === "}"){
++$offset;
break;
}
$key = self::readKey($str, $offset);
$value = self::readValue($str, $offset, $type);
$tag = self::createTag($type);
if($tag instanceof NamedTag){
$tag->setName($key);
$tag->setValue($value);
$data[$key] = $tag;
}
}
return $data;
}
private static function readValue($data, &$offset, &$type = null){
$value = "";
$type = null;
$inQuotes = false;
$len = strlen($data);
for(; $offset < $len; ++$offset){
$c = $data{$offset};
if(!$inQuotes and ($c === " " or $c === "\r" or $c === "\n" or $c === "\t" or $c === "," or $c === "}" or $c === "]")){
if($c === "," or $c === "}" or $c === "]"){
break;
}
}elseif($c === '"'){
$inQuotes = !$inQuotes;
if($type === null){
$type = self::TAG_String;
}elseif($inQuotes){
throw new \Exception("Syntax error: invalid quote at offset $offset");
}
}elseif($c === "\\"){
$value .= $data{$offset + 1} ?? "";
++$offset;
}elseif($c === "{" and !$inQuotes){
if($value !== ""){
throw new \Exception("Syntax error: invalid compound start at offset $offset");
}
++$offset;
$value = self::parseCompound($data, $offset);
$type = self::TAG_Compound;
break;
}elseif($c === "[" and !$inQuotes){
if($value !== ""){
throw new \Exception("Syntax error: invalid list start at offset $offset");
}
++$offset;
$value = self::parseList($data, $offset);
$type = self::TAG_List;
break;
}else{
$value .= $c;
}
}
if($value === ""){
throw new \Exception("Syntax error: invalid empty value at offset $offset");
}
if($type === null and strlen($value) > 0){
$value = trim($value);
$last = strtolower(substr($value, -1));
$part = substr($value, 0, -1);
if($last !== "b" and $last !== "s" and $last !== "l" and $last !== "f" and $last !== "d"){
$part = $value;
$last = null;
}
if($last !== "f" and $last !== "d" and ((string) ((int) $part)) === $part){
if($last === "b"){
$type = self::TAG_Byte;
}elseif($last === "s"){
$type = self::TAG_Short;
}elseif($last === "l"){
$type = self::TAG_Long;
}else{
$type = self::TAG_Int;
}
$value = (int) $part;
}elseif(is_numeric($part)){
if($last === "f" or $last === "d" or strpos($part, ".") !== false){
if($last === "f"){
$type = self::TAG_Float;
}elseif($last === "d"){
$type = self::TAG_Double;
}else{
$type = self::TAG_Float;
}
$value = (float) $part;
}else{
if($last === "l"){
$type = self::TAG_Long;
}else{
$type = self::TAG_Int;
}
$value = $part;
}
}else{
$type = self::TAG_String;
}
}
return $value;
}
private static function readKey($data, &$offset){
$key = "";
$len = strlen($data);
for(; $offset < $len; ++$offset){
$c = $data{$offset};
if($c === ":"){
++$offset;
break;
}elseif($c !== " " and $c !== "\r" and $c !== "\n" and $c !== "\t" and $c !== "\""){
$key .= $c;
}
}
if($key === ""){
throw new \Exception("Syntax error: invalid empty key at offset $offset");
}
return $key;
}
public function get($len){ public function get($len){
if($len < 0){ if($len < 0){
$this->offset = strlen($this->buffer) - 1; $this->offset = strlen($this->buffer) - 1;