Move Effect and EffectInstance to entity\effect namespace

src/pocketmine/Player.php

@@ -28,8 +28,8 @@ use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
-use pocketmine\entity\Effect;
+use pocketmine\entity\effect\Effect;
-use pocketmine\entity\EffectInstance;
+use pocketmine\entity\effect\EffectInstance;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Human;
 use pocketmine\entity\object\ItemEntity;

src/pocketmine/block/Cake.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\BlockDataValidator;
-use pocketmine\entity\EffectInstance;
+use pocketmine\entity\effect\EffectInstance;
 use pocketmine\entity\Living;
 use pocketmine\item\FoodSource;
 use pocketmine\item\Item;

src/pocketmine/command/defaults/EffectCommand.php

@@ -25,8 +25,8 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\entity\Effect;
+use pocketmine\entity\effect\Effect;
-use pocketmine\entity\EffectInstance;
+use pocketmine\entity\effect\EffectInstance;
 use pocketmine\lang\TranslationContainer;
 use pocketmine\utils\TextFormat;
 use function count;

src/pocketmine/entity/EntityFactory.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\entity;
 
+use pocketmine\entity\effect\Effect;
 use pocketmine\entity\object\ExperienceOrb;
 use pocketmine\entity\object\FallingBlock;
 use pocketmine\entity\object\ItemEntity;

src/pocketmine/entity/Human.php

@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\entity;
 
+use pocketmine\entity\effect\Effect;
+use pocketmine\entity\effect\EffectInstance;
 use pocketmine\entity\projectile\ProjectileSource;
 use pocketmine\entity\utils\ExperienceUtils;
 use pocketmine\event\entity\EntityDamageEvent;

src/pocketmine/entity/Living.php

@@ -24,6 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\entity;
 
 use pocketmine\block\Block;
+use pocketmine\entity\effect\Effect;
+use pocketmine\entity\effect\EffectInstance;
 use pocketmine\event\entity\EntityArmorChangeEvent;
 use pocketmine\event\entity\EntityDamageByChildEntityEvent;
 use pocketmine\event\entity\EntityDamageByEntityEvent;

src/pocketmine/entity/effect/AbsorptionEffect.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\effect;
 
-use pocketmine\entity\Effect;
-use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Living;
 
 class AbsorptionEffect extends Effect{

src/pocketmine/entity/effect/Effect.php

@@ -21,21 +21,10 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\entity;
+namespace pocketmine\entity\effect;
 
-use pocketmine\entity\effect\AbsorptionEffect;
+use pocketmine\entity\Entity;
-use pocketmine\entity\effect\HealthBoostEffect;
+use pocketmine\entity\Living;
-use pocketmine\entity\effect\HungerEffect;
-use pocketmine\entity\effect\InstantDamageEffect;
-use pocketmine\entity\effect\InstantHealthEffect;
-use pocketmine\entity\effect\InvisibilityEffect;
-use pocketmine\entity\effect\LevitationEffect;
-use pocketmine\entity\effect\PoisonEffect;
-use pocketmine\entity\effect\RegenerationEffect;
-use pocketmine\entity\effect\SaturationEffect;
-use pocketmine\entity\effect\SlownessEffect;
-use pocketmine\entity\effect\SpeedEffect;
-use pocketmine\entity\effect\WitherEffect;
 use pocketmine\utils\Color;
 use function constant;
 use function defined;

src/pocketmine/entity/effect/EffectInstance.php

@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\entity;
+namespace pocketmine\entity\effect;
 
 use pocketmine\utils\Color;
 use function max;

src/pocketmine/entity/effect/HealthBoostEffect.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\effect;
 
-use pocketmine\entity\Effect;
-use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Living;
 
 class HealthBoostEffect extends Effect{

src/pocketmine/entity/effect/HungerEffect.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\effect;
 
-use pocketmine\entity\Effect;
-use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Human;
 use pocketmine\entity\Living;

src/pocketmine/entity/effect/InstantDamageEffect.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\effect;
 
-use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
 use pocketmine\event\entity\EntityDamageByChildEntityEvent;

src/pocketmine/entity/effect/InstantEffect.php

@@ -23,9 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\effect;
 
-use pocketmine\entity\Effect;
-use pocketmine\entity\EffectInstance;
-
 abstract class InstantEffect extends Effect{
 
 	public function getDefaultDuration() : int{

src/pocketmine/entity/effect/InstantHealthEffect.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\effect;
 
-use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
 use pocketmine\event\entity\EntityRegainHealthEvent;

src/pocketmine/entity/effect/InvisibilityEffect.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\effect;
 
-use pocketmine\entity\Effect;
-use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Living;
 
 class InvisibilityEffect extends Effect{

src/pocketmine/entity/effect/LevitationEffect.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\effect;
 
-use pocketmine\entity\Effect;
-use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
 use pocketmine\Player;

src/pocketmine/entity/effect/PoisonEffect.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\effect;
 
-use pocketmine\entity\Effect;
-use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
 use pocketmine\event\entity\EntityDamageEvent;

src/pocketmine/entity/effect/RegenerationEffect.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\effect;
 
-use pocketmine\entity\Effect;
-use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
 use pocketmine\event\entity\EntityRegainHealthEvent;

src/pocketmine/entity/effect/SaturationEffect.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\effect;
 
-use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Human;
 use pocketmine\entity\Living;

src/pocketmine/entity/effect/SlownessEffect.php

@@ -24,8 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\entity\effect;
 
 use pocketmine\entity\Attribute;
-use pocketmine\entity\Effect;
-use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Living;
 
 class SlownessEffect extends Effect{

src/pocketmine/entity/effect/SpeedEffect.php

@@ -24,8 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\entity\effect;
 
 use pocketmine\entity\Attribute;
-use pocketmine\entity\Effect;
-use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Living;
 
 class SpeedEffect extends Effect{

src/pocketmine/entity/effect/WitherEffect.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\effect;
 
-use pocketmine\entity\Effect;
-use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
 use pocketmine\event\entity\EntityDamageEvent;

src/pocketmine/entity/projectile/SplashPotion.php

@@ -25,8 +25,8 @@ namespace pocketmine\entity\projectile;
 
 use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;
+use pocketmine\entity\effect\EffectInstance;
 use pocketmine\entity\effect\InstantEffect;
-use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Living;
 use pocketmine\event\entity\ProjectileHitBlockEvent;
 use pocketmine\event\entity\ProjectileHitEntityEvent;

src/pocketmine/event/entity/EntityDamageByEntityEvent.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\event\entity;
 
-use pocketmine\entity\Effect;
+use pocketmine\entity\effect\Effect;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
 

src/pocketmine/event/entity/EntityEffectAddEvent.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\event\entity;
 
-use pocketmine\entity\EffectInstance;
+use pocketmine\entity\effect\EffectInstance;
 use pocketmine\entity\Entity;
 
 /**

src/pocketmine/event/entity/EntityEffectEvent.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\event\entity;
 
-use pocketmine\entity\EffectInstance;
+use pocketmine\entity\effect\EffectInstance;
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
 use pocketmine\event\CancellableTrait;

src/pocketmine/item/Consumable.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use pocketmine\block\Block;
-use pocketmine\entity\EffectInstance;
+use pocketmine\entity\effect\EffectInstance;
 use pocketmine\entity\Living;
 
 /**

src/pocketmine/item/GoldenApple.php

@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\entity\Effect;
+use pocketmine\entity\effect\Effect;
-use pocketmine\entity\EffectInstance;
+use pocketmine\entity\effect\EffectInstance;
 
 class GoldenApple extends Food{
 

src/pocketmine/item/GoldenAppleEnchanted.php

@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\entity\Effect;
+use pocketmine\entity\effect\Effect;
-use pocketmine\entity\EffectInstance;
+use pocketmine\entity\effect\EffectInstance;
 
 class GoldenAppleEnchanted extends GoldenApple{
 

src/pocketmine/item/PoisonousPotato.php

@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\entity\Effect;
+use pocketmine\entity\effect\Effect;
-use pocketmine\entity\EffectInstance;
+use pocketmine\entity\effect\EffectInstance;
 use function mt_rand;
 
 class PoisonousPotato extends Food{

src/pocketmine/item/Potion.php

@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\entity\Effect;
+use pocketmine\entity\effect\Effect;
-use pocketmine\entity\EffectInstance;
+use pocketmine\entity\effect\EffectInstance;
 use pocketmine\entity\Living;
 
 class Potion extends Item implements Consumable{

src/pocketmine/item/Pufferfish.php

@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\entity\Effect;
+use pocketmine\entity\effect\Effect;
-use pocketmine\entity\EffectInstance;
+use pocketmine\entity\effect\EffectInstance;
 
 class Pufferfish extends Food{
 	public function __construct(){

src/pocketmine/item/RawChicken.php

@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\entity\Effect;
+use pocketmine\entity\effect\Effect;
-use pocketmine\entity\EffectInstance;
+use pocketmine\entity\effect\EffectInstance;
 use function mt_rand;
 
 class RawChicken extends Food{

src/pocketmine/item/RottenFlesh.php

@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\entity\Effect;
+use pocketmine\entity\effect\Effect;
-use pocketmine\entity\EffectInstance;
+use pocketmine\entity\effect\EffectInstance;
 use function lcg_value;
 
 class RottenFlesh extends Food{

src/pocketmine/item/SpiderEye.php

@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\entity\Effect;
+use pocketmine\entity\effect\Effect;
-use pocketmine\entity\EffectInstance;
+use pocketmine\entity\effect\EffectInstance;
 
 class SpiderEye extends Food{
 	public function __construct(){