diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 3d26f3a25..19b30bc2c 100644 --- a/src/pocketmine/Player.php +++ b/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\EffectInstance; +use pocketmine\entity\effect\Effect; +use pocketmine\entity\effect\EffectInstance; use pocketmine\entity\Entity; use pocketmine\entity\Human; use pocketmine\entity\object\ItemEntity; diff --git a/src/pocketmine/block/Cake.php b/src/pocketmine/block/Cake.php index f50b09dc1..5518c467e 100644 --- a/src/pocketmine/block/Cake.php +++ b/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; diff --git a/src/pocketmine/command/defaults/EffectCommand.php b/src/pocketmine/command/defaults/EffectCommand.php index a13967bd1..34dffb8be 100644 --- a/src/pocketmine/command/defaults/EffectCommand.php +++ b/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\EffectInstance; +use pocketmine\entity\effect\Effect; +use pocketmine\entity\effect\EffectInstance; use pocketmine\lang\TranslationContainer; use pocketmine\utils\TextFormat; use function count; diff --git a/src/pocketmine/entity/EntityFactory.php b/src/pocketmine/entity/EntityFactory.php index 30f3f78cc..75bd41e19 100644 --- a/src/pocketmine/entity/EntityFactory.php +++ b/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; diff --git a/src/pocketmine/entity/Human.php b/src/pocketmine/entity/Human.php index e9b38dc1c..266ea5aaa 100644 --- a/src/pocketmine/entity/Human.php +++ b/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; diff --git a/src/pocketmine/entity/Living.php b/src/pocketmine/entity/Living.php index 2446808e3..409184983 100644 --- a/src/pocketmine/entity/Living.php +++ b/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; diff --git a/src/pocketmine/entity/effect/AbsorptionEffect.php b/src/pocketmine/entity/effect/AbsorptionEffect.php index 75aeff4e4..0d7f60513 100644 --- a/src/pocketmine/entity/effect/AbsorptionEffect.php +++ b/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{ diff --git a/src/pocketmine/entity/Effect.php b/src/pocketmine/entity/effect/Effect.php similarity index 92% rename from src/pocketmine/entity/Effect.php rename to src/pocketmine/entity/effect/Effect.php index f35b4dc96..f6d7466f3 100644 --- a/src/pocketmine/entity/Effect.php +++ b/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\effect\HealthBoostEffect; -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\entity\Entity; +use pocketmine\entity\Living; use pocketmine\utils\Color; use function constant; use function defined; diff --git a/src/pocketmine/entity/EffectInstance.php b/src/pocketmine/entity/effect/EffectInstance.php similarity index 99% rename from src/pocketmine/entity/EffectInstance.php rename to src/pocketmine/entity/effect/EffectInstance.php index c66341926..f3707f672 100644 --- a/src/pocketmine/entity/EffectInstance.php +++ b/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; diff --git a/src/pocketmine/entity/effect/HealthBoostEffect.php b/src/pocketmine/entity/effect/HealthBoostEffect.php index 86f92924d..c1d2439da 100644 --- a/src/pocketmine/entity/effect/HealthBoostEffect.php +++ b/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{ diff --git a/src/pocketmine/entity/effect/HungerEffect.php b/src/pocketmine/entity/effect/HungerEffect.php index c7f8c6692..25599c6b9 100644 --- a/src/pocketmine/entity/effect/HungerEffect.php +++ b/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; diff --git a/src/pocketmine/entity/effect/InstantDamageEffect.php b/src/pocketmine/entity/effect/InstantDamageEffect.php index ffd8e007a..88a22b804 100644 --- a/src/pocketmine/entity/effect/InstantDamageEffect.php +++ b/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; diff --git a/src/pocketmine/entity/effect/InstantEffect.php b/src/pocketmine/entity/effect/InstantEffect.php index 5ed863cb7..653925918 100644 --- a/src/pocketmine/entity/effect/InstantEffect.php +++ b/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{ diff --git a/src/pocketmine/entity/effect/InstantHealthEffect.php b/src/pocketmine/entity/effect/InstantHealthEffect.php index 9195b6b53..a591f237f 100644 --- a/src/pocketmine/entity/effect/InstantHealthEffect.php +++ b/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; diff --git a/src/pocketmine/entity/effect/InvisibilityEffect.php b/src/pocketmine/entity/effect/InvisibilityEffect.php index 6cd552c47..e17063067 100644 --- a/src/pocketmine/entity/effect/InvisibilityEffect.php +++ b/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{ diff --git a/src/pocketmine/entity/effect/LevitationEffect.php b/src/pocketmine/entity/effect/LevitationEffect.php index b75b0bd0c..746ad49ad 100644 --- a/src/pocketmine/entity/effect/LevitationEffect.php +++ b/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; diff --git a/src/pocketmine/entity/effect/PoisonEffect.php b/src/pocketmine/entity/effect/PoisonEffect.php index 1f2da37d5..2c351981a 100644 --- a/src/pocketmine/entity/effect/PoisonEffect.php +++ b/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; diff --git a/src/pocketmine/entity/effect/RegenerationEffect.php b/src/pocketmine/entity/effect/RegenerationEffect.php index 02d353ca7..ed5ca0f5f 100644 --- a/src/pocketmine/entity/effect/RegenerationEffect.php +++ b/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; diff --git a/src/pocketmine/entity/effect/SaturationEffect.php b/src/pocketmine/entity/effect/SaturationEffect.php index aea9ce762..e20eeec83 100644 --- a/src/pocketmine/entity/effect/SaturationEffect.php +++ b/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; diff --git a/src/pocketmine/entity/effect/SlownessEffect.php b/src/pocketmine/entity/effect/SlownessEffect.php index 59bfe4f8f..8fbbc9912 100644 --- a/src/pocketmine/entity/effect/SlownessEffect.php +++ b/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{ diff --git a/src/pocketmine/entity/effect/SpeedEffect.php b/src/pocketmine/entity/effect/SpeedEffect.php index dbd1b4d21..5f0cc29f5 100644 --- a/src/pocketmine/entity/effect/SpeedEffect.php +++ b/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{ diff --git a/src/pocketmine/entity/effect/WitherEffect.php b/src/pocketmine/entity/effect/WitherEffect.php index 89f53b1e3..5c8d6d463 100644 --- a/src/pocketmine/entity/effect/WitherEffect.php +++ b/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; diff --git a/src/pocketmine/entity/projectile/SplashPotion.php b/src/pocketmine/entity/projectile/SplashPotion.php index 4484d7eef..c718bcecb 100644 --- a/src/pocketmine/entity/projectile/SplashPotion.php +++ b/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; diff --git a/src/pocketmine/event/entity/EntityDamageByEntityEvent.php b/src/pocketmine/event/entity/EntityDamageByEntityEvent.php index a89a0dea7..d8f021202 100644 --- a/src/pocketmine/event/entity/EntityDamageByEntityEvent.php +++ b/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; diff --git a/src/pocketmine/event/entity/EntityEffectAddEvent.php b/src/pocketmine/event/entity/EntityEffectAddEvent.php index d1a84c03b..a42747f75 100644 --- a/src/pocketmine/event/entity/EntityEffectAddEvent.php +++ b/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; /** diff --git a/src/pocketmine/event/entity/EntityEffectEvent.php b/src/pocketmine/event/entity/EntityEffectEvent.php index 01bdb47c7..724944335 100644 --- a/src/pocketmine/event/entity/EntityEffectEvent.php +++ b/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; diff --git a/src/pocketmine/item/Consumable.php b/src/pocketmine/item/Consumable.php index 5977c37f4..eac296fc8 100644 --- a/src/pocketmine/item/Consumable.php +++ b/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; /** diff --git a/src/pocketmine/item/GoldenApple.php b/src/pocketmine/item/GoldenApple.php index 4bd1c3fb9..edec3b2b3 100644 --- a/src/pocketmine/item/GoldenApple.php +++ b/src/pocketmine/item/GoldenApple.php @@ -23,8 +23,8 @@ declare(strict_types=1); namespace pocketmine\item; -use pocketmine\entity\Effect; -use pocketmine\entity\EffectInstance; +use pocketmine\entity\effect\Effect; +use pocketmine\entity\effect\EffectInstance; class GoldenApple extends Food{ diff --git a/src/pocketmine/item/GoldenAppleEnchanted.php b/src/pocketmine/item/GoldenAppleEnchanted.php index b5d8bc305..120d67871 100644 --- a/src/pocketmine/item/GoldenAppleEnchanted.php +++ b/src/pocketmine/item/GoldenAppleEnchanted.php @@ -23,8 +23,8 @@ declare(strict_types=1); namespace pocketmine\item; -use pocketmine\entity\Effect; -use pocketmine\entity\EffectInstance; +use pocketmine\entity\effect\Effect; +use pocketmine\entity\effect\EffectInstance; class GoldenAppleEnchanted extends GoldenApple{ diff --git a/src/pocketmine/item/PoisonousPotato.php b/src/pocketmine/item/PoisonousPotato.php index 56ebe7032..7f6e1203d 100644 --- a/src/pocketmine/item/PoisonousPotato.php +++ b/src/pocketmine/item/PoisonousPotato.php @@ -23,8 +23,8 @@ declare(strict_types=1); namespace pocketmine\item; -use pocketmine\entity\Effect; -use pocketmine\entity\EffectInstance; +use pocketmine\entity\effect\Effect; +use pocketmine\entity\effect\EffectInstance; use function mt_rand; class PoisonousPotato extends Food{ diff --git a/src/pocketmine/item/Potion.php b/src/pocketmine/item/Potion.php index bddab81e9..40b8293e3 100644 --- a/src/pocketmine/item/Potion.php +++ b/src/pocketmine/item/Potion.php @@ -23,8 +23,8 @@ declare(strict_types=1); namespace pocketmine\item; -use pocketmine\entity\Effect; -use pocketmine\entity\EffectInstance; +use pocketmine\entity\effect\Effect; +use pocketmine\entity\effect\EffectInstance; use pocketmine\entity\Living; class Potion extends Item implements Consumable{ diff --git a/src/pocketmine/item/Pufferfish.php b/src/pocketmine/item/Pufferfish.php index 12d3a4c98..78b395806 100644 --- a/src/pocketmine/item/Pufferfish.php +++ b/src/pocketmine/item/Pufferfish.php @@ -23,8 +23,8 @@ declare(strict_types=1); namespace pocketmine\item; -use pocketmine\entity\Effect; -use pocketmine\entity\EffectInstance; +use pocketmine\entity\effect\Effect; +use pocketmine\entity\effect\EffectInstance; class Pufferfish extends Food{ public function __construct(){ diff --git a/src/pocketmine/item/RawChicken.php b/src/pocketmine/item/RawChicken.php index 746937e1c..36e59357b 100644 --- a/src/pocketmine/item/RawChicken.php +++ b/src/pocketmine/item/RawChicken.php @@ -23,8 +23,8 @@ declare(strict_types=1); namespace pocketmine\item; -use pocketmine\entity\Effect; -use pocketmine\entity\EffectInstance; +use pocketmine\entity\effect\Effect; +use pocketmine\entity\effect\EffectInstance; use function mt_rand; class RawChicken extends Food{ diff --git a/src/pocketmine/item/RottenFlesh.php b/src/pocketmine/item/RottenFlesh.php index 3eebcba6b..03045f76a 100644 --- a/src/pocketmine/item/RottenFlesh.php +++ b/src/pocketmine/item/RottenFlesh.php @@ -23,8 +23,8 @@ declare(strict_types=1); namespace pocketmine\item; -use pocketmine\entity\Effect; -use pocketmine\entity\EffectInstance; +use pocketmine\entity\effect\Effect; +use pocketmine\entity\effect\EffectInstance; use function lcg_value; class RottenFlesh extends Food{ diff --git a/src/pocketmine/item/SpiderEye.php b/src/pocketmine/item/SpiderEye.php index 2e386afb5..97b6ff10d 100644 --- a/src/pocketmine/item/SpiderEye.php +++ b/src/pocketmine/item/SpiderEye.php @@ -23,8 +23,8 @@ declare(strict_types=1); namespace pocketmine\item; -use pocketmine\entity\Effect; -use pocketmine\entity\EffectInstance; +use pocketmine\entity\effect\Effect; +use pocketmine\entity\effect\EffectInstance; class SpiderEye extends Food{ public function __construct(){