Update to the new version of PM

ipad54 · Dec 10, 2021 · e270b48 · e270b48 · JaxkDev · Jan 1, 2022
1 parent 6f5d6ea
commit e270b48
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/src/ipad54/composter/Main.php b/src/ipad54/composter/Main.php
@@ -15,7 +15,7 @@
 class Main extends PluginBase
 {
 
-    protected function onLoad()
+    protected function onLoad() : void
     {
         BlockFactory::getInstance()->register(new Composter(new BID(IDS::COMPOSTER, 0, ItemIds::COMPOSTER)));
     }

diff --git a/src/ipad54/composter/block/Composter.php b/src/ipad54/composter/block/Composter.php
@@ -99,9 +99,9 @@ public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player
     {
         if ($this->fill >= 8) {
             $this->fill = 0;
-            $this->pos->getWorld()->setBlock($this->pos, $this);
-            $this->pos->getWorld()->addSound($this->pos, new ComposteEmptySound());
-            $this->pos->getWorld()->dropItem($this->pos, VanillaItems::BONE_MEAL());
+            $this->position->getWorld()->setBlock($this->position, $this);
+            $this->position->getWorld()->addSound($this->position, new ComposteEmptySound());
+            $this->position->getWorld()->dropItem($this->position, VanillaItems::BONE_MEAL());
             return true;
         }
         if (isset($this->ingridients[$item->getId()]) && $this->fill < 7) {
@@ -116,7 +116,7 @@ public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player
                 $this->incrimentFill(true);
                 return true;
             }
-            $this->pos->getWorld()->addSound($this->pos, new ComposteFillSound());
+            $this->position->getWorld()->addSound($this->position, new ComposteFillSound());
         }
         return true;
     }
@@ -128,12 +128,12 @@ public function incrimentFill(bool $playsound = false): bool
             return false;
         }
         if (++$this->fill >= 7) {
-            $this->pos->getWorld()->scheduleDelayedBlockUpdate($this->pos, 25);
+            $this->position->getWorld()->scheduleDelayedBlockUpdate($this->position, 25);
         } else {
-            $this->pos->getWorld()->setBlock($this->pos, $this);
+            $this->position->getWorld()->setBlock($this->position, $this);
         }
         if ($playsound) {
-            $this->pos->getWorld()->addSound($this->pos, new ComposteFillSuccessSound());
+            $this->position->getWorld()->addSound($this->position, new ComposteFillSuccessSound());
         }
         return true;
     }
@@ -142,8 +142,8 @@ public function onScheduledUpdate(): void
     {
         if ($this->fill == 7) {
             ++$this->fill;
-            $this->pos->getWorld()->setBlock($this->pos, $this);
-            $this->pos->getWorld()->addSound($this->pos, new ComposteReadySound());
+            $this->position->getWorld()->setBlock($this->position, $this);
+            $this->position->getWorld()->addSound($this->position, new ComposteReadySound());
         }
     }
 }
diff --git a/src/ipad54/composter/sound/ComposteEmptySound.php b/src/ipad54/composter/sound/ComposteEmptySound.php
@@ -7,6 +7,7 @@
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
 use pocketmine\world\sound\Sound;
 
 class ComposteEmptySound implements Sound
@@ -15,6 +16,6 @@ class ComposteEmptySound implements Sound
 
     public function encode(?Vector3 $pos): array
     {
-        return [LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BLOCK_COMPOSTER_EMPTY, $pos)];
+        return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::BLOCK_COMPOSTER_EMPTY, $pos, false)];
     }
 }
diff --git a/src/ipad54/composter/sound/ComposteFillSound.php b/src/ipad54/composter/sound/ComposteFillSound.php
@@ -6,13 +6,14 @@
 
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
 use pocketmine\world\sound\Sound;
 
 class ComposteFillSound implements Sound
 {
 
     public function encode(?Vector3 $pos): array
     {
-        return [LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BLOCK_COMPOSTER_FILL, $pos)];
+        return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::BLOCK_COMPOSTER_FILL, $pos, false)];
     }
 }
diff --git a/src/ipad54/composter/sound/ComposteFillSuccessSound.php b/src/ipad54/composter/sound/ComposteFillSuccessSound.php
@@ -6,13 +6,14 @@
 
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
 use pocketmine\world\sound\Sound;
 
 class ComposteFillSuccessSound implements Sound
 {
 
     public function encode(?Vector3 $pos): array
     {
-        return [LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BLOCK_COMPOSTER_FILL_SUCCESS, $pos)];
+        return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::BLOCK_COMPOSTER_FILL_SUCCESS, $pos, false)];
     }
 }
diff --git a/src/ipad54/composter/sound/ComposteReadySound.php b/src/ipad54/composter/sound/ComposteReadySound.php
@@ -6,13 +6,14 @@
 
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
 use pocketmine\world\sound\Sound;
 
 class ComposteReadySound implements Sound
 {
 
     public function encode(?Vector3 $pos): array
     {
-        return [LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BLOCK_COMPOSTER_READY, $pos)];
+        return [LevelSoundEventPacket::nonActorSound(LevelSoundEvent::BLOCK_COMPOSTER_READY, $pos, false)];
     }
 }