From d2284d5c47926a2ab831dee7ef4c6256e8043476 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Wed, 23 Jan 2019 12:16:01 +0000
Subject: [PATCH] Move Particle IDs to protocol namespace

---
 .../level/particle/AngryVillagerParticle.php  |  4 +-
 .../particle/BlockForceFieldParticle.php      |  4 +-
 .../level/particle/BubbleParticle.php         |  4 +-
 .../level/particle/CriticalParticle.php       |  4 +-
 .../level/particle/DustParticle.php           |  4 +-
 .../level/particle/EnchantParticle.php        |  4 +-
 .../particle/EnchantmentTableParticle.php     |  4 +-
 .../level/particle/EntityFlameParticle.php    |  4 +-
 .../level/particle/ExplodeParticle.php        |  4 +-
 .../level/particle/FlameParticle.php          |  4 +-
 .../level/particle/HappyVillagerParticle.php  |  4 +-
 .../level/particle/HeartParticle.php          |  4 +-
 .../level/particle/HugeExplodeParticle.php    |  4 +-
 .../particle/HugeExplodeSeedParticle.php      |  4 +-
 src/pocketmine/level/particle/InkParticle.php |  4 +-
 .../level/particle/InstantEnchantParticle.php |  4 +-
 .../level/particle/ItemBreakParticle.php      |  3 +-
 .../level/particle/LavaDripParticle.php       |  4 +-
 .../level/particle/LavaParticle.php           |  4 +-
 src/pocketmine/level/particle/Particle.php    | 55 -------------
 .../level/particle/PortalParticle.php         |  4 +-
 .../level/particle/RainSplashParticle.php     |  4 +-
 .../level/particle/RedstoneParticle.php       |  4 +-
 .../level/particle/SmokeParticle.php          |  4 +-
 .../level/particle/SnowballPoofParticle.php   |  4 +-
 .../level/particle/SplashParticle.php         |  4 +-
 .../level/particle/SporeParticle.php          |  4 +-
 .../level/particle/TerrainParticle.php        |  3 +-
 .../level/particle/WaterDripParticle.php      |  4 +-
 .../level/particle/WaterParticle.php          |  4 +-
 .../mcpe/protocol/types/ParticleIds.php       | 81 +++++++++++++++++++
 31 files changed, 166 insertions(+), 84 deletions(-)
 create mode 100644 src/pocketmine/network/mcpe/protocol/types/ParticleIds.php

diff --git a/src/pocketmine/level/particle/AngryVillagerParticle.php b/src/pocketmine/level/particle/AngryVillagerParticle.php
index acde51b42..5841170c8 100644
--- a/src/pocketmine/level/particle/AngryVillagerParticle.php
+++ b/src/pocketmine/level/particle/AngryVillagerParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/BlockForceFieldParticle.php b/src/pocketmine/level/particle/BlockForceFieldParticle.php
index 312ff5c75..2da0a9aa6 100644
--- a/src/pocketmine/level/particle/BlockForceFieldParticle.php
+++ b/src/pocketmine/level/particle/BlockForceFieldParticle.php
@@ -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
 	}
 }
diff --git a/src/pocketmine/level/particle/BubbleParticle.php b/src/pocketmine/level/particle/BubbleParticle.php
index 6bf00072a..777eade96 100644
--- a/src/pocketmine/level/particle/BubbleParticle.php
+++ b/src/pocketmine/level/particle/BubbleParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/CriticalParticle.php b/src/pocketmine/level/particle/CriticalParticle.php
index 4943527c2..17e7ca128 100644
--- a/src/pocketmine/level/particle/CriticalParticle.php
+++ b/src/pocketmine/level/particle/CriticalParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/DustParticle.php b/src/pocketmine/level/particle/DustParticle.php
index dda464285..bd3b40d14 100644
--- a/src/pocketmine/level/particle/DustParticle.php
+++ b/src/pocketmine/level/particle/DustParticle.php
@@ -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));
 	}
 }
diff --git a/src/pocketmine/level/particle/EnchantParticle.php b/src/pocketmine/level/particle/EnchantParticle.php
index 4fc625cd4..5be274b69 100644
--- a/src/pocketmine/level/particle/EnchantParticle.php
+++ b/src/pocketmine/level/particle/EnchantParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/EnchantmentTableParticle.php b/src/pocketmine/level/particle/EnchantmentTableParticle.php
index a0756e2ad..bd6e288db 100644
--- a/src/pocketmine/level/particle/EnchantmentTableParticle.php
+++ b/src/pocketmine/level/particle/EnchantmentTableParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/EntityFlameParticle.php b/src/pocketmine/level/particle/EntityFlameParticle.php
index 234da0052..e3a94c53c 100644
--- a/src/pocketmine/level/particle/EntityFlameParticle.php
+++ b/src/pocketmine/level/particle/EntityFlameParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/ExplodeParticle.php b/src/pocketmine/level/particle/ExplodeParticle.php
index 86ef3bb25..962f57655 100644
--- a/src/pocketmine/level/particle/ExplodeParticle.php
+++ b/src/pocketmine/level/particle/ExplodeParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/FlameParticle.php b/src/pocketmine/level/particle/FlameParticle.php
index aa69de17b..41a643319 100644
--- a/src/pocketmine/level/particle/FlameParticle.php
+++ b/src/pocketmine/level/particle/FlameParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/HappyVillagerParticle.php b/src/pocketmine/level/particle/HappyVillagerParticle.php
index 007478e6e..71ce2d6b6 100644
--- a/src/pocketmine/level/particle/HappyVillagerParticle.php
+++ b/src/pocketmine/level/particle/HappyVillagerParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/HeartParticle.php b/src/pocketmine/level/particle/HeartParticle.php
index 66d6bb0a0..dc196ca3b 100644
--- a/src/pocketmine/level/particle/HeartParticle.php
+++ b/src/pocketmine/level/particle/HeartParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/HugeExplodeParticle.php b/src/pocketmine/level/particle/HugeExplodeParticle.php
index 4cb591517..26f80fc75 100644
--- a/src/pocketmine/level/particle/HugeExplodeParticle.php
+++ b/src/pocketmine/level/particle/HugeExplodeParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/HugeExplodeSeedParticle.php b/src/pocketmine/level/particle/HugeExplodeSeedParticle.php
index c8a495f75..409d08a2e 100644
--- a/src/pocketmine/level/particle/HugeExplodeSeedParticle.php
+++ b/src/pocketmine/level/particle/HugeExplodeSeedParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/InkParticle.php b/src/pocketmine/level/particle/InkParticle.php
index 37aa82682..7a6e8d6af 100644
--- a/src/pocketmine/level/particle/InkParticle.php
+++ b/src/pocketmine/level/particle/InkParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/InstantEnchantParticle.php b/src/pocketmine/level/particle/InstantEnchantParticle.php
index ed69f3c4b..da58d1696 100644
--- a/src/pocketmine/level/particle/InstantEnchantParticle.php
+++ b/src/pocketmine/level/particle/InstantEnchantParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/ItemBreakParticle.php b/src/pocketmine/level/particle/ItemBreakParticle.php
index 1d4146741..0baffed37 100644
--- a/src/pocketmine/level/particle/ItemBreakParticle.php
+++ b/src/pocketmine/level/particle/ItemBreakParticle.php
@@ -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());
 	}
 }
diff --git a/src/pocketmine/level/particle/LavaDripParticle.php b/src/pocketmine/level/particle/LavaDripParticle.php
index 738a01da5..6ca209e0b 100644
--- a/src/pocketmine/level/particle/LavaDripParticle.php
+++ b/src/pocketmine/level/particle/LavaDripParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/LavaParticle.php b/src/pocketmine/level/particle/LavaParticle.php
index f59210c98..9a3e65e66 100644
--- a/src/pocketmine/level/particle/LavaParticle.php
+++ b/src/pocketmine/level/particle/LavaParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/Particle.php b/src/pocketmine/level/particle/Particle.php
index ccf97d35b..91c3c3253 100644
--- a/src/pocketmine/level/particle/Particle.php
+++ b/src/pocketmine/level/particle/Particle.php
@@ -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
 	 *
diff --git a/src/pocketmine/level/particle/PortalParticle.php b/src/pocketmine/level/particle/PortalParticle.php
index e04898146..9175d3a6b 100644
--- a/src/pocketmine/level/particle/PortalParticle.php
+++ b/src/pocketmine/level/particle/PortalParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/RainSplashParticle.php b/src/pocketmine/level/particle/RainSplashParticle.php
index 67e7977ae..20ca50ec0 100644
--- a/src/pocketmine/level/particle/RainSplashParticle.php
+++ b/src/pocketmine/level/particle/RainSplashParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/RedstoneParticle.php b/src/pocketmine/level/particle/RedstoneParticle.php
index 7516e77b6..15b464e4b 100644
--- a/src/pocketmine/level/particle/RedstoneParticle.php
+++ b/src/pocketmine/level/particle/RedstoneParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/SmokeParticle.php b/src/pocketmine/level/particle/SmokeParticle.php
index 6092255b5..f057c5ed5 100644
--- a/src/pocketmine/level/particle/SmokeParticle.php
+++ b/src/pocketmine/level/particle/SmokeParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/SnowballPoofParticle.php b/src/pocketmine/level/particle/SnowballPoofParticle.php
index 6e79fa151..24e8d14c1 100644
--- a/src/pocketmine/level/particle/SnowballPoofParticle.php
+++ b/src/pocketmine/level/particle/SnowballPoofParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/SplashParticle.php b/src/pocketmine/level/particle/SplashParticle.php
index 1001076c7..b79e8ee07 100644
--- a/src/pocketmine/level/particle/SplashParticle.php
+++ b/src/pocketmine/level/particle/SplashParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/SporeParticle.php b/src/pocketmine/level/particle/SporeParticle.php
index 883cc24ee..846c7149e 100644
--- a/src/pocketmine/level/particle/SporeParticle.php
+++ b/src/pocketmine/level/particle/SporeParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/TerrainParticle.php b/src/pocketmine/level/particle/TerrainParticle.php
index c602a82ac..296934af8 100644
--- a/src/pocketmine/level/particle/TerrainParticle.php
+++ b/src/pocketmine/level/particle/TerrainParticle.php
@@ -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());
 	}
 }
diff --git a/src/pocketmine/level/particle/WaterDripParticle.php b/src/pocketmine/level/particle/WaterDripParticle.php
index 0aa04d79f..6a8431fa2 100644
--- a/src/pocketmine/level/particle/WaterDripParticle.php
+++ b/src/pocketmine/level/particle/WaterDripParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/level/particle/WaterParticle.php b/src/pocketmine/level/particle/WaterParticle.php
index 906bbe29a..fb85ff9d6 100644
--- a/src/pocketmine/level/particle/WaterParticle.php
+++ b/src/pocketmine/level/particle/WaterParticle.php
@@ -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);
 	}
 }
diff --git a/src/pocketmine/network/mcpe/protocol/types/ParticleIds.php b/src/pocketmine/network/mcpe/protocol/types/ParticleIds.php
new file mode 100644
index 000000000..271ddd3a0
--- /dev/null
+++ b/src/pocketmine/network/mcpe/protocol/types/ParticleIds.php
@@ -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;
+}