mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-01 15:49:54 +00:00
Code Issues Projects Releases Wiki Activity

ParticleCommand: standardise usage, don't use legacy block/item IDs

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-06-05 20:47:54 +01:00
parent f2dc9187f0
commit 2a24982bc4
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/command/defaults/ParticleCommand.php
View File

@ -23,11 +23,11 @@ declare(strict_types=1);
namespace pocketmine\command\defaults; namespace pocketmine\command\defaults;
use pocketmine\block\BlockFactory; use pocketmine\block\BlockLegacyIds;
use pocketmine\color\Color; use pocketmine\color\Color;
use pocketmine\command\CommandSender; use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\item\ItemFactory; use pocketmine\item\StringToItemParser;
use pocketmine\item\VanillaItems; use pocketmine\item\VanillaItems;
use pocketmine\lang\KnownTranslationFactory; use pocketmine\lang\KnownTranslationFactory;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
@ -70,7 +70,6 @@ use function explode;
use function max; use function max;
use function microtime; use function microtime;
use function mt_rand; use function mt_rand;
use function strpos;
use function strtolower; use function strtolower;
class ParticleCommand extends VanillaCommand{ class ParticleCommand extends VanillaCommand{
@ -114,7 +113,7 @@ class ParticleCommand extends VanillaCommand{
$count = isset($args[7]) ? max(1, (int) $args[7]) : 1; $count = isset($args[7]) ? max(1, (int) $args[7]) : 1;
$data = isset($args[8]) ? (int) $args[8] : null; $data = $args[8] ?? null;
$particle = $this->getParticle($name, $data); $particle = $this->getParticle($name, $data);
@ -138,7 +137,7 @@ class ParticleCommand extends VanillaCommand{
return true; return true;
} }
private function getParticle(string $name, ?int $data = null) : ?Particle{ private function getParticle(string $name, ?string $data = null) : ?Particle{
switch($name){ switch($name){
case "explode": case "explode":
return new ExplodeParticle(); return new ExplodeParticle();
@ -156,7 +155,7 @@ class ParticleCommand extends VanillaCommand{
case "crit": case "crit":
return new CriticalParticle(); return new CriticalParticle();
case "smoke": case "smoke":
return new SmokeParticle($data ?? 0); return new SmokeParticle((int) ($data ?? 0));
case "spell": case "spell":
return new EnchantParticle(new Color(0, 0, 0, 255)); //TODO: colour support return new EnchantParticle(new Color(0, 0, 0, 255)); //TODO: colour support
case "instantspell": case "instantspell":
@ -175,25 +174,31 @@ class ParticleCommand extends VanillaCommand{
case "lava": case "lava":
return new LavaParticle(); return new LavaParticle();
case "reddust": case "reddust":
return new RedstoneParticle($data ?? 1); return new RedstoneParticle((int) ($data ?? 1));
case "snowballpoof": case "snowballpoof":
return new ItemBreakParticle(VanillaItems::SNOWBALL()); return new ItemBreakParticle(VanillaItems::SNOWBALL());
case "slime": case "slime":
return new ItemBreakParticle(VanillaItems::SLIMEBALL()); return new ItemBreakParticle(VanillaItems::SLIMEBALL());
case "itembreak": case "itembreak":
if($data !== null && $data !== 0){ if($data !== null){
return new ItemBreakParticle(ItemFactory::getInstance()->get($data)); $item = StringToItemParser::getInstance()->parse($data);
if($item !== null && !$item->isNull()){
return new ItemBreakParticle($item);
}
} }
break; break;
case "terrain": case "terrain":
if($data !== null && $data !== 0){ if($data !== null){
return new TerrainParticle(BlockFactory::getInstance()->get($data, 0)); $block = StringToItemParser::getInstance()->parse($data)?->getBlock();
if($block !== null && $block->getId() !== BlockLegacyIds::AIR){
return new TerrainParticle($block);
}
} }
break; break;
case "heart": case "heart":
return new HeartParticle($data ?? 0); return new HeartParticle((int) ($data ?? 0));
case "ink": case "ink":
return new InkParticle($data ?? 0); return new InkParticle((int) ($data ?? 0));
case "droplet": case "droplet":
return new RainSplashParticle(); return new RainSplashParticle();
case "enchantmenttable": case "enchantmenttable":
@ -203,26 +208,32 @@ class ParticleCommand extends VanillaCommand{
case "angryvillager": case "angryvillager":
return new AngryVillagerParticle(); return new AngryVillagerParticle();
case "forcefield": case "forcefield":
return new BlockForceFieldParticle($data ?? 0); return new BlockForceFieldParticle((int) ($data ?? 0));
case "mobflame": case "mobflame":
return new EntityFlameParticle(); return new EntityFlameParticle();
case "iconcrack":
if($data !== null && ($item = StringToItemParser::getInstance()->parse($data)) !== null && !$item->isNull()){
return new ItemBreakParticle($item);
} }
break;
if(strpos($name, "iconcrack_") === 0){ case "blockcrack":
$d = explode("_", $name); if($data !== null && ($block = StringToItemParser::getInstance()->parse($data)?->getBlock()) !== null && $block->getId() !== BlockLegacyIds::AIR){
if(count($d) === 3){ return new TerrainParticle($block);
return new ItemBreakParticle(ItemFactory::getInstance()->get((int) $d[1], (int) $d[2]));
} }
}elseif(strpos($name, "blockcrack_") === 0){ break;
$d = explode("_", $name); case "blockdust":
if(count($d) === 2){ if($data !== null){
return new TerrainParticle(BlockFactory::getInstance()->get(((int) $d[1]) & 0xff, ((int) $d[1]) >> 12)); $d = explode("_", $data);
if(count($d) >= 3){
return new DustParticle(new Color(
((int) $d[0]) & 0xff,
((int) $d[1]) & 0xff,
((int) $d[2]) & 0xff,
((int) ($d[3] ?? 255)) & 0xff
));
} }
}elseif(strpos($name, "blockdust_") === 0){
$d = explode("_", $name);
if(count($d) >= 4){
return new DustParticle(new Color(((int) $d[1]) & 0xff, ((int) $d[2]) & 0xff, ((int) $d[3]) & 0xff, isset($d[4]) ? ((int) $d[4]) & 0xff : 255));
} }
break;
} }
return null; return null;