feat: last changes

Author: Josscoder

README.md

@@ -1,6 +1,6 @@
 # WoolVolcano
 
-Victory effect for your Minecraft BE server, inspired by Cubecraft, for Pocketmine 4.0.0
+Victory effect for your Minecraft BE server, inspired by Cubecraft, for Pocketmine 3.0.0
 
 If you encounter any bugs, have suggestions or questions, [create an issue](https://github.com/Josscoder/WoolVolcano/issues/new).
 

plugin.yml

@@ -1,5 +1,5 @@
-name: Main
+name: WoolVolcano
 main: jossc\volcano\Main
-api: 4.0.0
+api: 3.0.0
 version: 1.1
 author: Josscoder

src/jossc/volcano/Main.php

@@ -5,22 +5,20 @@
 use jossc\volcano\entity\CustomFallingWoolBlock;
 use jossc\volcano\listener\EventListener;
 use jossc\volcano\task\VolcanoTak;
-use pocketmine\block\BlockFactory;
-use pocketmine\block\BlockLegacyIds;
-use pocketmine\entity\EntityDataHelper;
-use pocketmine\entity\EntityFactory;
-use pocketmine\nbt\tag\CompoundTag;
-use pocketmine\player\Player;
+use pocketmine\entity\Entity;
+use pocketmine\Player;
 use pocketmine\plugin\PluginBase;
 use pocketmine\utils\TextFormat;
-use pocketmine\world\World;
 
 class Main extends PluginBase {
 
     /*** @var Main */
     private static $main;
 
-    protected function onEnable(): void{
+    public function onEnable()
+    {
+        parent::onEnable();
+
         self::$main = $this;
 
         $this->registerEntity();
@@ -33,15 +31,14 @@ protected function onEnable(): void{
         $this->getLogger()->info(TextFormat::GREEN . 'This plugin has been enabled!.');
     }
 
+    public function onDisable(): void {
+        parent::onDisable();
+
+        $this->getLogger()->info(TextFormat::RED . 'This plugin has been disabled!.');
+    }
+
     private function registerEntity(): void {
-        EntityFactory::getInstance()->register(CustomFallingWoolBlock::class,
-            function(World $world, CompoundTag $nbt) : CustomFallingWoolBlock {
-            return new CustomFallingWoolBlock(
-                EntityDataHelper::parseLocation($nbt, $world),
-                BlockFactory::getInstance()->get(BlockLegacyIds::WOOL, 0),
-                $nbt
-            );
-        }, ['CustomFallingWoolBlock', 'minecraft:falling_wool_block_entity']);
+        Entity::registerEntity(CustomFallingWoolBlock::class, true);
     }
 
     /*** @return Main */
@@ -52,11 +49,7 @@ public static function getInstance(): Main {
     /*** @param Player $player */
     public function giveTo(Player $player): void {
         $this->getScheduler()->scheduleDelayedRepeatingTask(
-            new VolcanoTak($player, $player->getWorld()), 1, 3
+            new VolcanoTak($player, $player->getLevel()), 1, 3
         );
     }
-
-    protected function onDisable(): void {
-        $this->getLogger()->info(TextFormat::RED . 'This plugin has been disabled!.');
-    }
 }

src/jossc/volcano/entity/CustomFallingWoolBlock.php

@@ -2,26 +2,23 @@
 
 namespace jossc\volcano\entity;
 
+use pocketmine\block\Block;
 use pocketmine\entity\object\FallingBlock;
-use pocketmine\nbt\tag\CompoundTag;
 
 class CustomFallingWoolBlock extends FallingBlock {
 
-    /*** @param CompoundTag $nbt */
-    protected function initEntity(CompoundTag $nbt): void
+    protected function initEntity(): void
     {
-        parent::initEntity($nbt);
-
+        $this->block = Block::get(Block::WOOL, rand(0, 15));
         $this->setForceMovementUpdate(true);
-        $this->setSilent(true);
         $this->setCanSaveWithChunk(false);
     }
 
     /**
      * @param int $tickDiff
      * @return bool
      */
-    protected function entityBaseTick(int $tickDiff = 1): bool
+    public function entityBaseTick(int $tickDiff = 1): bool
     {
         if ($this->isClosed()) {
             return false;

src/jossc/volcano/listener/EventListener.php

@@ -20,7 +20,7 @@ public function __construct(Main $main) {
     }
 
     /*** @param PlayerChatEvent $event */
-    public function PlayerChatEvent(PlayerChatEvent $event): void {
+    public function onChat(PlayerChatEvent $event): void {
         $player = $event->getPlayer();
 
         if (!$player->getServer()->isOp($player->getName())) {
@@ -31,7 +31,7 @@ public function PlayerChatEvent(PlayerChatEvent $event): void {
             return;
         }
 
-        $event->cancel();
+        $event->setCancelled();
 
         $this->main->giveTo($player);
     }

src/jossc/volcano/task/VolcanoTak.php

@@ -4,16 +4,16 @@
 
 use jossc\volcano\entity\CustomFallingWoolBlock;
 use jossc\volcano\utils\Utils;
-use pocketmine\player\Player;
+use pocketmine\level\Level;
+use pocketmine\Player;
 use pocketmine\scheduler\Task;
-use pocketmine\world\World;
 
 class VolcanoTak extends Task {
 
     /*** @var Player */
     private $player;
 
-    /*** @var World */
+    /*** @var Level */
     private $world;
 
     /*** @var array */
@@ -25,14 +25,16 @@ class VolcanoTak extends Task {
     /**
      * VolcanoTak constructor.
      * @param Player $player
-     * @param World $world
+     * @param Level $world
      */
-    public function __construct(Player $player, World $world) {
+    public function __construct(Player $player, Level $world) {
         $this->player = $player;
         $this->world = $world;
     }
 
-    public function onRun(): void {
+    /*** @param int $currentTick */
+    public function onRun(int $currentTick)
+    {
         if ($this->isExecutable()) {
 
             $location = $this->player->getLocation();
@@ -60,13 +62,14 @@ public function onRun(): void {
         }
     }
 
+
     /*** @return bool */
     private function isExecutable(): bool {
         $player = $this->player;
         $amount = $this->amount;
 
         return ($amount >= 1) &&
             ($player->isOnline()) &&
-            ($player->getWorld() === $this->world);
+            ($player->getLevel() === $this->world);
     }
 }

src/jossc/volcano/utils/Utils.php

@@ -3,13 +3,11 @@
 namespace jossc\volcano\utils;
 
 use jossc\volcano\entity\CustomFallingWoolBlock;
-use pocketmine\block\BlockFactory;
-use pocketmine\block\BlockLegacyIds;
-use pocketmine\entity\EntityDataHelper;
-use pocketmine\entity\Location;
+use pocketmine\entity\Entity;
+use pocketmine\level\Location;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\PlaySoundPacket;
-use pocketmine\player\Player;
+use pocketmine\Player;
 
 class Utils {
 
@@ -18,13 +16,9 @@ class Utils {
      * @return CustomFallingWoolBlock
      */
     public static function generateFallingWoolBlock(Location $location): CustomFallingWoolBlock {
-        $nbt = EntityDataHelper::createBaseNBT($location->asVector3());
+        $nbt = Entity::createBaseNBT($location->asVector3());
 
-        $fallingBlock = new CustomFallingWoolBlock(
-            $location,
-            BlockFactory::getInstance()->get(BlockLegacyIds::WOOL, rand(0, 15)),
-            $nbt
-        );
+        $fallingBlock = new CustomFallingWoolBlock($location->getLevel(), $nbt);
 
         $fallingBlock->setMotion(new Vector3(
                 -sin(mt_rand(1, 360) / 60 * M_PI),
@@ -52,6 +46,6 @@ public static function playSound(string $soundName, Player $player): void {
         $pk->y = $location->y;
         $pk->z = $location->z;
 
-        $player->getNetworkSession()->sendDataPacket($pk);
+        $player->sendDataPacket($pk);
     }
 }