Menus Simplified

src/DaPigGuy/PiggyAuctions/EventListener.php

@@ -28,9 +28,9 @@ public function onDataPacketReceive(DataPacketReceiveEvent $event): void
         $player = $event->getPlayer();
         $packet = $event->getPacket();
         if ($packet instanceof ContainerClosePacket) {
-            if (isset(Menu::$displayQueue[$player->getName()])) {
-                Menu::$displayQueue[$player->getName()]->send($player);
-                unset(Menu::$displayQueue[$player->getName()]);
+            if (isset(Menu::$awaitingInventoryClose[$player->getName()])) {
+                Menu::$awaitingInventoryClose[$player->getName()]->send($player);
+                unset(Menu::$awaitingInventoryClose[$player->getName()]);
             }
         }
     }

src/DaPigGuy/PiggyAuctions/auction/Auction.php

@@ -117,7 +117,7 @@ public function getUnclaimedBids(): array
      */
     public function getUnclaimedBidsHeldBy(string $player): array
     {
-        return array_filter($this->getUnclaimedBids(), function (AuctionBid $bid) use ($player): bool {
+        return array_filter($this->getUnclaimedBids(), static function (AuctionBid $bid) use ($player): bool {
             return $bid->getBidder() === $player;
         });
     }

src/DaPigGuy/PiggyAuctions/auction/AuctionManager.php

@@ -38,11 +38,11 @@ public function init(): void
                     $row["startdate"],
                     $row["enddate"],
                     (bool)$row["claimed"],
-                    array_map(function (array $bidData) use ($row) {
+                    array_map(static function (array $bidData) use ($row) {
                         return new AuctionBid($row["id"], $bidData["bidder"], $bidData["bidamount"], $bidData["timestamp"]);
                     }, json_decode($row["claimed_bids"], true)),
                     $row["starting_bid"],
-                    array_map(function (array $bidData) use ($row) {
+                    array_map(static function (array $bidData) use ($row) {
                         return new AuctionBid($row["id"], $bidData["bidder"], $bidData["bidamount"], $bidData["timestamp"]);
                     }, json_decode($row["bids"], true))
                 );
@@ -75,7 +75,7 @@ public function getAuction(int $id): ?Auction
     public function getAuctionsHeldBy($player): array
     {
         if ($player instanceof Player) $player = $player->getName();
-        return array_filter($this->auctions, function (Auction $auction) use ($player): bool {
+        return array_filter($this->auctions, static function (Auction $auction) use ($player): bool {
             return strtolower($auction->getAuctioneer()) === strtolower($player);
         });
     }
@@ -87,14 +87,14 @@ public function getAuctionsHeldBy($player): array
     public function getActiveAuctionsHeldBy($player): array
     {
         if ($player instanceof Player) $player = $player->getName();
-        return array_filter($this->auctions, function (Auction $auction) use ($player): bool {
+        return array_filter($this->auctions, static function (Auction $auction) use ($player): bool {
             return strtolower($auction->getAuctioneer()) === strtolower($player) && !$auction->hasExpired();
         });
     }
 
     public function getActiveAuctions(): array
     {
-        return array_filter($this->auctions, function (Auction $auction): bool {
+        return array_filter($this->auctions, static function (Auction $auction): bool {
             return !$auction->hasExpired();
         });
     }
@@ -116,7 +116,7 @@ public function getBids(): array
     public function getBidsBy($player): array
     {
         if ($player instanceof Player) $player = $player->getName();
-        return array_filter($this->getBids(), function (AuctionBid $bid) use ($player): bool {
+        return array_filter($this->getBids(), static function (AuctionBid $bid) use ($player): bool {
             return strtolower($bid->getBidder()) === strtolower($player);
         });
     }
@@ -143,10 +143,10 @@ public function updateAuction(Auction $auction): void
         $this->plugin->getDatabase()->executeChange("piggyauctions.update", [
             "id" => $auction->getId(),
             "claimed" => (int)$auction->isClaimed(),
-            "claimed_bids" => json_encode(array_map(function (AuctionBid $bid) {
+            "claimed_bids" => json_encode(array_map(static function (AuctionBid $bid) {
                 return ["bidder" => $bid->getBidder(), "bidamount" => $bid->getBidAmount(), "timestamp" => $bid->getTimestamp()];
             }, $auction->getclaimedBids())),
-            "bids" => json_encode(array_map(function (AuctionBid $bid) {
+            "bids" => json_encode(array_map(static function (AuctionBid $bid) {
                 return ["bidder" => $bid->getBidder(), "bidamount" => $bid->getBidAmount(), "timestamp" => $bid->getTimestamp()];
             }, $auction->getBids()))
         ]);

src/DaPigGuy/PiggyAuctions/commands/AuctionHouseCommand.php

@@ -8,7 +8,8 @@
 use CortexPE\Commando\args\RawStringArgument;
 use CortexPE\Commando\BaseCommand;
 use CortexPE\Commando\exception\ArgumentOrderException;
-use DaPigGuy\PiggyAuctions\menu\Menu;
+use DaPigGuy\PiggyAuctions\menu\pages\AuctioneerMenu;
+use DaPigGuy\PiggyAuctions\menu\pages\MainMenu;
 use DaPigGuy\PiggyAuctions\PiggyAuctions;
 use pocketmine\command\CommandSender;
 use pocketmine\Player;
@@ -43,10 +44,10 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args): vo
                 $sender->sendMessage(PiggyAuctions::getInstance()->getMessage("commands.no-active-auctions", ["{PLAYER}" => $args["player"]]));
                 return;
             }
-            Menu::displayAuctioneerPage($sender, $args["player"]);
+            new AuctioneerMenu($sender, $args["player"]);
             return;
         }
-        Menu::displayMainMenu($sender);
+        new MainMenu($sender);
     }
 
     /**