Update to PM5

.github/workflows/main.yml

@@ -0,0 +1,27 @@
+name: PHPStan
+
+on: [push, pull_request]
+
+jobs:
+  phpstan:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.ref }}
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+      - name: Create Vendor Directory
+        run: |
+          echo Making directory...
+          mkdir vendor
+          echo Directory made.
+      - name: wget InvMenu
+        uses: wei/wget@v1
+        with:
+          args: -O vendor/InvMenu.phar https://poggit.pmmp.io/r/219916/InvMenu_dev-196.phar
+      - name: Run PHPStan
+        uses: paroxity/pmmp-phpstan-action@5.3.0
+        with:
+          phpstan-config: phpstan.neon.dist

phpstan.neon.dist

@@ -0,0 +1,14 @@
+parameters:
+  paths:
+    - /source/src
+  level: 6
+  bootstrapFiles:
+    - phar:///pocketmine/PocketMine-MP.phar/vendor/autoload.php
+  scanDirectories:
+    - /source/src
+    - phar:///source/vendor/InvMenu.phar/src/
+  excludePaths:
+      analyse:
+        - source/vendor
+  reportUnmatchedIgnoredErrors: false
+  checkMissingIterableValueType: false

plugin.yml

@@ -1,6 +1,6 @@
 name: Minion
-version: 2.0.0
-api: 4.0.0
+version: 2.1.0
+api: 5.0.0
 main: CLADevs\Minion\Loader
 author: CLADevs
 depend:

resources/config.yml

@@ -15,7 +15,8 @@ blocks:
   normal: true
   #Blocks that cannot be broken
   #ids of block that cannot be broken
-  cannot: [7, 20]
+  # Must be vanilla names
+  cannot: ["obsidian"]
 
 level:
   #if they reach level 2 or higher they will have auto smelt unlocked put "n" to turn it off

src/CLADevs/Minion/Loader.php

@@ -26,8 +26,6 @@ class Loader extends PluginBase{
 
     private array $removeTap = [];
 
-    private array $minions = [];
-
     public function onLoad(): void{
         self::setInstance($this);
         foreach(array_keys($this->getResources()) as $path){

src/CLADevs/Minion/entities/MinionEntity.php

@@ -12,13 +12,12 @@
 use muqsit\invmenu\transaction\InvMenuTransactionResult;
 use pocketmine\block\Block;
 use pocketmine\block\tile\Chest;
+use pocketmine\block\utils\MobHeadType;
 use pocketmine\block\VanillaBlocks;
 use pocketmine\entity\Human;
 use pocketmine\event\entity\EntityDamageByEntityEvent;
 use pocketmine\event\entity\EntityDamageEvent;
-use pocketmine\inventory\Inventory;
-use pocketmine\item\ItemFactory;
-use pocketmine\item\ItemIds;
+use pocketmine\item\ItemTypeIds;
 use pocketmine\item\VanillaItems;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
@@ -113,7 +112,7 @@ public function entityBaseTick(int $tickDiff = 1): bool{
     }
 
     public function sendSpawnItems(): void{
-        $this->getArmorInventory()->setHelmet(VanillaItems::PLAYER_HEAD());
+        $this->getArmorInventory()->setHelmet(VanillaBlocks::MOB_HEAD()->setMobHeadType(MobHeadType::PLAYER())->asItem());
         $this->getArmorInventory()->setChestplate(VanillaItems::LEATHER_TUNIC());
         $this->getArmorInventory()->setLeggings(VanillaItems::LEATHER_PANTS());
         $this->getArmorInventory()->setBoots(VanillaItems::LEATHER_BOOTS());
@@ -136,8 +135,8 @@ public function breakBlock(Block $block): bool{
                 }
                 $success = true;
             }
-            if(!in_array($block->getId(), Configuration::getUnbreakableBlocks()) && !$success){
-                $inv->addItem(ItemFactory::getInstance()->get($block->getId(), $block->getMeta()));
+            if(!in_array($block->getName(), Configuration::getUnbreakableBlocks()) && !$success){
+                $inv->addItem($block->asItem());
                 $success = true;
             }
         }
@@ -196,16 +195,16 @@ public function getMainInventory(?callable $callable = null): InvMenu{
             $player = $tr->getPlayer();
             $item = $tr->getItemClicked();
 
-            switch($item->getId()){
-                case ItemIds::REDSTONE_DUST:
+            switch($item->getTypeId()){
+                case ItemTypeIds::REDSTONE_DUST:
                     if($this->isFlaggedForDespawn()){
                         return $tr->discard();
                     }
                     MinionListener::getInstance()->removeLinkable($player);
                     $this->flagForDespawn();
                     $player->getInventory()->addItem(Loader::getInstance()->asMinionItem(static::getMinionType(), $player, $this->getLevel()));
                     break;
-                case ItemIds::CHEST:
+                case VanillaBlocks::CHEST()->asItem()->getTypeId():
                     if($this->getLookingBehind() instanceof \pocketmine\block\Chest){
                         $player->sendMessage(TextFormat::RED . "Please remove the chest behind the miner, to set new linkable chest.");
                         return $tr->discard();

src/CLADevs/Minion/entities/types/FarmerMinion.php

@@ -9,7 +9,7 @@
 use muqsit\invmenu\transaction\InvMenuTransaction;
 use muqsit\invmenu\transaction\InvMenuTransactionResult;
 use pocketmine\block\Block;
-use pocketmine\block\BlockLegacyIds;
+use pocketmine\block\BlockTypeIds;
 use pocketmine\block\Chest;
 use pocketmine\block\Crops;
 use pocketmine\item\VanillaItems;
@@ -50,7 +50,7 @@ public function entityBaseTick(int $tickDiff = 1): bool{
                         $xz = clone $this->getPosition()->add($x, 0, $z);
                         $pos = clone $xz->subtract(0, 1, 0);
 
-                        if($this->getWorld()->getBlock($pos)->getId() === BlockLegacyIds::FARMLAND && $i !== 4){ //4 is middle block
+                        if($this->getWorld()->getBlock($pos)->getTypeId() === BlockTypeIds::FARMLAND && $i !== 4){ //4 is middle block
                             $b = $this->getWorld()->getBlock($xz);
 
                             if($b instanceof Crops && $b->getAge() >= 7){
@@ -80,7 +80,7 @@ public function breakBlock(Block $block): bool{
                 $inv = $tile->getInventory();
 
                 foreach($inv->getContents() as $slot => $item){
-                    if($item->getBlock()->getId() === $block->getId()){
+                    if($item->getBlock()->getTypeId() === $block->getTypeId()){
                         $this->getInventory()->setItemInHand($item);
                         $this->getWorld()->setBlock($block->getPosition(), $item->getBlock(), true);
                         $this->sendSpawnItems();

src/CLADevs/Minion/entities/types/MinerMinion.php

@@ -12,7 +12,7 @@
 use onebone\economyapi\EconomyAPI;
 use pocketmine\block\Air;
 use pocketmine\block\Chest;
-use pocketmine\item\ItemIds;
+use pocketmine\item\ItemTypeIds;
 use pocketmine\item\VanillaItems;
 use pocketmine\player\Player;
 use pocketmine\Server;
@@ -75,7 +75,7 @@ protected function handleInventory(Player $attacker): void{
             $player = $tr->getPlayer();
             $item = $tr->getItemClicked();
 
-            if($item->getId() === ItemIds::EMERALD){
+            if($item->getTypeId() === ItemTypeIds::EMERALD){
                 if(($lvl = $this->getLevel()) >= Configuration::getMaxLevel()){
                     $player->sendMessage(TextFormat::RED . "You have maxed the level!");
                     return $tr->discard();