mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-11 08:19:45 +00:00
Code Issues Projects Releases Wiki Activity

Move Particle IDs to protocol namespace

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-01-23 12:16:01 +00:00
parent 23a18a8eb6
commit d2284d5c47
31 changed files with 166 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/level/particle/AngryVillagerParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class AngryVillagerParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_VILLAGER_ANGRY);
parent::__construct(ParticleIds::VILLAGER_ANGRY);
}
}

4
src/pocketmine/level/particle/BlockForceFieldParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class BlockForceFieldParticle extends GenericParticle{
public function __construct(int $data = 0){
parent::__construct(Particle::TYPE_BLOCK_FORCE_FIELD, $data); //TODO: proper encode/decode of data
parent::__construct(ParticleIds::BLOCK_FORCE_FIELD, $data); //TODO: proper encode/decode of data
}
}

4
src/pocketmine/level/particle/BubbleParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class BubbleParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_BUBBLE);
parent::__construct(ParticleIds::BUBBLE);
}
}

4
src/pocketmine/level/particle/CriticalParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class CriticalParticle extends GenericParticle{
public function __construct(int $scale = 2){
parent::__construct(Particle::TYPE_CRITICAL, $scale);
parent::__construct(ParticleIds::CRITICAL, $scale);
}
}

4
src/pocketmine/level/particle/DustParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class DustParticle extends GenericParticle{
public function __construct(int $r, int $g, int $b, int $a = 255){
parent::__construct(Particle::TYPE_DUST, (($a & 0xff) << 24) | (($r & 0xff) << 16) | (($g & 0xff) << 8) | ($b & 0xff));
parent::__construct(ParticleIds::DUST, (($a & 0xff) << 24) | (($r & 0xff) << 16) | (($g & 0xff) << 8) | ($b & 0xff));
}
}

4
src/pocketmine/level/particle/EnchantParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class EnchantParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_MOB_SPELL);
parent::__construct(ParticleIds::MOB_SPELL);
}
}

4
src/pocketmine/level/particle/EnchantmentTableParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class EnchantmentTableParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_ENCHANTMENT_TABLE);
parent::__construct(ParticleIds::ENCHANTMENT_TABLE);
}
}

4
src/pocketmine/level/particle/EntityFlameParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class EntityFlameParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_MOB_FLAME);
parent::__construct(ParticleIds::MOB_FLAME);
}
}

4
src/pocketmine/level/particle/ExplodeParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class ExplodeParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_EXPLODE);
parent::__construct(ParticleIds::EXPLODE);
}
}

4
src/pocketmine/level/particle/FlameParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class FlameParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_FLAME);
parent::__construct(ParticleIds::FLAME);
}
}

4
src/pocketmine/level/particle/HappyVillagerParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class HappyVillagerParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_VILLAGER_HAPPY);
parent::__construct(ParticleIds::VILLAGER_HAPPY);
}
}

4
src/pocketmine/level/particle/HeartParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class HeartParticle extends GenericParticle{
public function __construct(int $scale = 0){
parent::__construct(Particle::TYPE_HEART, $scale);
parent::__construct(ParticleIds::HEART, $scale);
}
}

4
src/pocketmine/level/particle/HugeExplodeParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class HugeExplodeParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_HUGE_EXPLODE);
parent::__construct(ParticleIds::HUGE_EXPLODE);
}
}

4
src/pocketmine/level/particle/HugeExplodeSeedParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class HugeExplodeSeedParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_HUGE_EXPLODE_SEED);
parent::__construct(ParticleIds::HUGE_EXPLODE_SEED);
}
}

4
src/pocketmine/level/particle/InkParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class InkParticle extends GenericParticle{
public function __construct(int $scale = 0){
parent::__construct(Particle::TYPE_INK, $scale);
parent::__construct(ParticleIds::INK, $scale);
}
}

4
src/pocketmine/level/particle/InstantEnchantParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class InstantEnchantParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_MOB_SPELL_INSTANTANEOUS);
parent::__construct(ParticleIds::MOB_SPELL_INSTANTANEOUS);
}
}

3
src/pocketmine/level/particle/ItemBreakParticle.php
View File

@ -24,9 +24,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\item\Item;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class ItemBreakParticle extends GenericParticle{
public function __construct(Item $item){
parent::__construct(Particle::TYPE_ITEM_BREAK, ($item->getId() << 16) | $item->getDamage());
parent::__construct(ParticleIds::ITEM_BREAK, ($item->getId() << 16) | $item->getDamage());
}
}

4
src/pocketmine/level/particle/LavaDripParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class LavaDripParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_DRIP_LAVA);
parent::__construct(ParticleIds::DRIP_LAVA);
}
}

4
src/pocketmine/level/particle/LavaParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class LavaParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_LAVA);
parent::__construct(ParticleIds::LAVA);
}
}

55
src/pocketmine/level/particle/Particle.php
View File

@ -28,61 +28,6 @@ use pocketmine\network\mcpe\protocol\ClientboundPacket;
abstract class Particle{
public const TYPE_BUBBLE = 1;
public const TYPE_CRITICAL = 2;
public const TYPE_BLOCK_FORCE_FIELD = 3;
public const TYPE_SMOKE = 4;
public const TYPE_EXPLODE = 5;
public const TYPE_EVAPORATION = 6;
public const TYPE_FLAME = 7;
public const TYPE_LAVA = 8;
public const TYPE_LARGE_SMOKE = 9;
public const TYPE_REDSTONE = 10;
public const TYPE_RISING_RED_DUST = 11;
public const TYPE_ITEM_BREAK = 12;
public const TYPE_SNOWBALL_POOF = 13;
public const TYPE_HUGE_EXPLODE = 14;
public const TYPE_HUGE_EXPLODE_SEED = 15;
public const TYPE_MOB_FLAME = 16;
public const TYPE_HEART = 17;
public const TYPE_TERRAIN = 18;
public const TYPE_SUSPENDED_TOWN = 19, TYPE_TOWN_AURA = 19;
public const TYPE_PORTAL = 20;
public const TYPE_SPLASH = 21, TYPE_WATER_SPLASH = 21;
public const TYPE_WATER_WAKE = 22;
public const TYPE_DRIP_WATER = 23;
public const TYPE_DRIP_LAVA = 24;
public const TYPE_FALLING_DUST = 25, TYPE_DUST = 25;
public const TYPE_MOB_SPELL = 26;
public const TYPE_MOB_SPELL_AMBIENT = 27;
public const TYPE_MOB_SPELL_INSTANTANEOUS = 28;
public const TYPE_INK = 29;
public const TYPE_SLIME = 30;
public const TYPE_RAIN_SPLASH = 31;
public const TYPE_VILLAGER_ANGRY = 32;
public const TYPE_VILLAGER_HAPPY = 33;
public const TYPE_ENCHANTMENT_TABLE = 34;
public const TYPE_TRACKING_EMITTER = 35;
public const TYPE_NOTE = 36;
public const TYPE_WITCH_SPELL = 37;
public const TYPE_CARROT = 38;
//39 unknown
public const TYPE_END_ROD = 40;
public const TYPE_DRAGONS_BREATH = 41;
public const TYPE_SPIT = 42;
public const TYPE_TOTEM = 43;
public const TYPE_FOOD = 44;
public const TYPE_FIREWORKS_STARTER = 45;
public const TYPE_FIREWORKS_SPARK = 46;
public const TYPE_FIREWORKS_OVERLAY = 47;
public const TYPE_BALLOON_GAS = 48;
public const TYPE_COLORED_FLAME = 49;
public const TYPE_SPARKLER = 50;
public const TYPE_CONDUIT = 51;
public const TYPE_BUBBLE_COLUMN_UP = 52;
public const TYPE_BUBBLE_COLUMN_DOWN = 53;
public const TYPE_SNEEZE = 54;
/**
* @param Vector3 $pos
*

4
src/pocketmine/level/particle/PortalParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class PortalParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_PORTAL);
parent::__construct(ParticleIds::PORTAL);
}
}

4
src/pocketmine/level/particle/RainSplashParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class RainSplashParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_RAIN_SPLASH);
parent::__construct(ParticleIds::RAIN_SPLASH);
}
}

4
src/pocketmine/level/particle/RedstoneParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class RedstoneParticle extends GenericParticle{
public function __construct(int $lifetime = 1){
parent::__construct(Particle::TYPE_REDSTONE, $lifetime);
parent::__construct(ParticleIds::REDSTONE, $lifetime);
}
}

4
src/pocketmine/level/particle/SmokeParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class SmokeParticle extends GenericParticle{
public function __construct(int $scale = 0){
parent::__construct(Particle::TYPE_SMOKE, $scale);
parent::__construct(ParticleIds::SMOKE, $scale);
}
}

4
src/pocketmine/level/particle/SnowballPoofParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class SnowballPoofParticle extends GenericParticle{
public function __construct(){
parent::__construct(self::TYPE_SNOWBALL_POOF, 0);
parent::__construct(ParticleIds::SNOWBALL_POOF, 0);
}
}

4
src/pocketmine/level/particle/SplashParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class SplashParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_WATER_SPLASH);
parent::__construct(ParticleIds::WATER_SPLASH);
}
}

4
src/pocketmine/level/particle/SporeParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class SporeParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_TOWN_AURA);
parent::__construct(ParticleIds::TOWN_AURA);
}
}

3
src/pocketmine/level/particle/TerrainParticle.php
View File

@ -24,9 +24,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\block\Block;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class TerrainParticle extends GenericParticle{
public function __construct(Block $b){
parent::__construct(Particle::TYPE_TERRAIN, $b->getRuntimeId());
parent::__construct(ParticleIds::TERRAIN, $b->getRuntimeId());
}
}

4
src/pocketmine/level/particle/WaterDripParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class WaterDripParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_DRIP_WATER);
parent::__construct(ParticleIds::DRIP_WATER);
}
}

4
src/pocketmine/level/particle/WaterParticle.php
View File

@ -23,8 +23,10 @@ declare(strict_types=1);
namespace pocketmine\level\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
class WaterParticle extends GenericParticle{
public function __construct(){
parent::__construct(Particle::TYPE_WATER_WAKE);
parent::__construct(ParticleIds::WATER_WAKE);
}
}

81
src/pocketmine/network/mcpe/protocol/types/ParticleIds.php Normal file
View File

@ -0,0 +1,81 @@
<?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/
*
*
*/
declare(strict_types=1);
namespace pocketmine\network\mcpe\protocol\types;
interface ParticleIds{
public const BUBBLE = 1;
public const CRITICAL = 2;
public const BLOCK_FORCE_FIELD = 3;
public const SMOKE = 4;
public const EXPLODE = 5;
public const EVAPORATION = 6;
public const FLAME = 7;
public const LAVA = 8;
public const LARGE_SMOKE = 9;
public const REDSTONE = 10;
public const RISING_RED_DUST = 11;
public const ITEM_BREAK = 12;
public const SNOWBALL_POOF = 13;
public const HUGE_EXPLODE = 14;
public const HUGE_EXPLODE_SEED = 15;
public const MOB_FLAME = 16;
public const HEART = 17;
public const TERRAIN = 18;
public const SUSPENDED_TOWN = 19, TOWN_AURA = 19;
public const PORTAL = 20;
public const SPLASH = 21, WATER_SPLASH = 21;
public const WATER_WAKE = 22;
public const DRIP_WATER = 23;
public const DRIP_LAVA = 24;
public const FALLING_DUST = 25, DUST = 25;
public const MOB_SPELL = 26;
public const MOB_SPELL_AMBIENT = 27;
public const MOB_SPELL_INSTANTANEOUS = 28;
public const INK = 29;
public const SLIME = 30;
public const RAIN_SPLASH = 31;
public const VILLAGER_ANGRY = 32;
public const VILLAGER_HAPPY = 33;
public const ENCHANTMENT_TABLE = 34;
public const TRACKING_EMITTER = 35;
public const NOTE = 36;
public const WITCH_SPELL = 37;
public const CARROT = 38;
//39 unknown
public const END_ROD = 40;
public const DRAGONS_BREATH = 41;
public const SPIT = 42;
public const TOTEM = 43;
public const FOOD = 44;
public const FIREWORKS_STARTER = 45;
public const FIREWORKS_SPARK = 46;
public const FIREWORKS_OVERLAY = 47;
public const BALLOON_GAS = 48;
public const COLORED_FLAME = 49;
public const SPARKLER = 50;
public const CONDUIT = 51;
public const BUBBLE_COLUMN_UP = 52;
public const BUBBLE_COLUMN_DOWN = 53;
public const SNEEZE = 54;
}