Fix #7, #9

plugin.yml

@@ -1,6 +1,6 @@
 ---
 name: CubeBox
-version: 1.0.1
+version: 1.1.0
 api: 3.0.0
 author: TheAz928
 main: TheAz928\CubeBox\Loader

src/TheAz928/CubeBox/Loader.php

@@ -126,6 +126,8 @@ public function getCrate(string $id): ?Crate {
 
     /**
      * @param PlayerInteractEvent $event
+     * @priority MONITOR
+     * @ignoreCancelled false
      */
     public function onInteract(PlayerInteractEvent $event): void {
         $player = $event->getPlayer();
@@ -154,7 +156,8 @@ public function onInteract(PlayerInteractEvent $event): void {
             $crateTile->spawnToAll();
 
             unset($this->creationSession[$player->getName()]);
-        }elseif($tile instanceof CrateTile){
+        }
+        if($tile instanceof CrateTile){
             $event->setCancelled();
 
             if($item->equals($tile->getCrate()->getKey())){

src/TheAz928/CubeBox/entity/FloatingText.php

@@ -1,7 +1,7 @@
 <?php
 namespace TheAz928\CubeBox\entity;
 
-use pocketmine\entity\Zombie;
+use pocketmine\entity\Living;
 
 use pocketmine\event\entity\EntityDamageEvent;
 
@@ -26,7 +26,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class FloatingText extends Zombie {
+class FloatingText extends Living {
+
+    public const NETWORK_ID = self::VEX;
+
+    /** @var float */
+    public $height = 1.00;
+
+    /** @var float */
+    public $width = 1.00;
 
     /** @var float */
     protected $gravity = 0.00;
@@ -44,6 +52,13 @@ public static function spawn(Position $pos, string $text): self {
         return $entity;
     }
 
+    /**
+     * @return string
+     */
+    public function getName(): string {
+        return "Floating Text";
+    }
+
     protected function initEntity(): void {
         parent::initEntity();
 

src/TheAz928/CubeBox/entity/GiftBoxEntity.php

@@ -81,6 +81,7 @@ protected function initEntity(): void {
         parent::initEntity();
 
         $this->setScale(0.5);
+        $this->setCanSaveWithChunk(false);
     }
 
     /**
@@ -118,8 +119,8 @@ public function entityBaseTick(int $tickDiff = 1): bool {
             $this->getTile()->setIsInUse(false);
             $this->getTile()->setChestState(false);
 
-            if($this->rewardItem !== null){
-                $this->rewardItem->flagForDespawn();
+            if($this->rewardItem !== null and $this->rewardItem->isClosed() == false){
+                $this->rewardItem->close();
             }
 
             return true;
@@ -198,6 +199,7 @@ public function entityBaseTick(int $tickDiff = 1): bool {
 
                 if($reward->getItem()->isNull() == false){
                     $this->rewardItem = $this->getLevel()->dropItem($this, $reward->getItem(), new Vector3(0, 0, 0), 12000);
+
                     $this->rewardItem->setNameTag($rarity . $reward->getItem()->getName());
                     $this->rewardItem->setNameTagAlwaysVisible(true);
                 }
@@ -210,8 +212,8 @@ public function entityBaseTick(int $tickDiff = 1): bool {
         if($this->timeCounter > (20 * 11)){
             $this->flagForDespawn();
 
-            if($this->rewardItem !== null){
-                $this->rewardItem->flagForDespawn();
+            if($this->rewardItem !== null and $this->rewardItem->isClosed() == false){
+                $this->rewardItem->close();
             }
 
             $this->getTile()->setIsInUse(false);

src/TheAz928/CubeBox/form/ConfirmOpenForm.php

@@ -14,21 +14,17 @@
 /**
  * CubeBox: The next level crate plugin for PocketMine-MP
  * CopyRight (C)  2020 CubePM (TheAz928)
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * any later version.
- *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 class ConfirmOpenForm implements Form {
 
     /** @var CrateTile */
@@ -46,13 +42,22 @@ public function __construct(CrateTile $tile) {
      * @return array
      */
     public function jsonSerialize(): array {
+        $content = TextFormat::GRAY . "Open this crate for ";
+        if(($m = $this->tile->getCrate()->getMoneyCost()) > -1){
+            $content .= "$" . number_format($m);
+        }
+        if(($e = $this->tile->getCrate()->getXpCost()) > -1){
+            $content .= " and " . number_format($e) . "XP Level(s)";
+        }
+        $content .= "?";
+
         return [
             "type" => "form",
-            "title" => "CubeBox",
-            "content" => "Are you sure you want to open this crate for\n" . TextFormat::GREEN . "XP: " . TextFormat::WHITE . $this->tile->getCrate()->getXpCost() . "\n" . TextFormat::GREEN . "Money: " . TextFormat::WHITE . "$" . $this->tile->getCrate()->getMoneyCost() . "\n\n\n\n\n\n\n\n",
+            "title" => $this->tile->getCrate()->getName(),
+            "content" => $content,
             "buttons" => [
-                ["text" => "Yes"],
-                ["text" => "No"]
+                ["text" => TextFormat::DARK_GREEN . "Yes"],
+                ["text" => TextFormat::RED . "No"]
             ]
         ];
     }

src/TheAz928/CubeBox/tile/CrateTile.php

@@ -126,7 +126,7 @@ public function close(): void {
         parent::close();
 
         if($this->displayEntity !== null){
-            $this->displayEntity->flagForDespawn();
+            $this->displayEntity->close();
         }
     }
 
@@ -174,6 +174,8 @@ public function onUpdate(): bool {
 
                     $dust1 = new DustParticle($pos->asVector3(), ...$this->getCrate()->getRGBA());
 
+                    $pos = $this->asVector3();
+
                     $pos->x = ($pos->x + 0.5) + -sin($i);
                     $pos->z = ($pos->z + 0.5) + cos($i);
 
@@ -209,6 +211,15 @@ public function onUpdate(): bool {
                 }
             }
             if($this->getDisplayEntity()->isClosed() == false){
+                if($this->getDisplayEntity()->isClosed()){
+                    $pos = $this->asPosition();
+                    $pos->x += 0.5;
+                    $pos->y += 2.4;
+                    $pos->z += 0.5;
+
+                    $this->displayEntity = FloatingText::spawn($pos, "");
+                }
+
                 $this->getDisplayEntity()->setNameTag($this->getCrate()->getName() . "\n\n" . TextFormat::RESET . $display);
             }
         }