initial commit

pixelwhiz · Aug 4, 2024 · 162d944 · 162d944
1 parent c373a6c
commit 162d944
Show file tree

Hide file tree

Showing 11 changed files with 208 additions and 189 deletions.
diff --git a/plugin.yml b/plugin.yml
@@ -4,5 +4,11 @@ version: 1.0.0
 main: pixelwhiz\minecart\Main
 api: 5.0.0
 author: pixelwhiz
+depend:
+  - EconomyAPI
 src-namespace-prefix: pixelwhiz\minecart
+permissions:
+  gokart.cmd:
+    default: true
+    description: Allows players to use the /gokart command.
 ...
diff --git a/src/Main.php b/src/Main.php
@@ -4,6 +4,7 @@
 
 namespace pixelwhiz\minecart;
 
+use pixelwhiz\minecart\commands\GokartCommands;
 use pixelwhiz\minecart\entity\Minecart;
 use pixelwhiz\minecart\listeners\GasStationListener;
 use pixelwhiz\minecart\listeners\MinecartListener;
@@ -32,9 +33,8 @@ public function onEnable(): void
         parent::onEnable();
         self::$instance = $this;
         Minecarts::init();
-        $this->config = new Config($this->getDataFolder() . "GasStation.json", Config::JSON);
+        Server::getInstance()->getCommandMap()->register("gokart", new GokartCommands());
         Server::getInstance()->getPluginManager()->registerEvents(new MinecartListener(), $this);
-        Server::getInstance()->getPluginManager()->registerEvents(new GasStationListener(), $this);
         EntityFactory::getInstance()->register(Minecart::class, function (World $world, CompoundTag $nbt): Entity {
             return new Minecart(EntityDataHelper::parseLocation($nbt, $world), $nbt);
         }, ["Minecart"]);

diff --git a/src/Minecarts.php b/src/Minecarts.php
@@ -22,6 +22,9 @@ class Minecarts {
 
     public static self $instance;
 
+    public static array $isMoving = [];
+    public static array $isRecharging = [];
+
     public static function init() : void {
         self::$instance = new self();
     }
@@ -45,6 +48,8 @@ public function ride(Player $player, PMMinecart $item) {
         $energy = $namedTag->getTag("Energy") ? $namedTag->getFloat("Energy") : 100;
         $entity::$energy = $energy;
 
+        self::$isMoving[$entity->getId()] = false;
+
         $player->getInventory()->setItemInHand(VanillaItems::AIR());
 
         $link = new SetActorLinkPacket();
@@ -62,6 +67,9 @@ public function unride(Player $player = null, Minecart $entity, bool $isClose =
         } elseif ($isClose === true) {
             $entity->close();
         }
+
+        unset(self::$isMoving[$entity->getId()]);
+
         $item = VanillaItems::MINECART();
         $entity->setTargetEntity(null);
         $player->setTargetEntity(null);
@@ -94,4 +102,18 @@ public function getRider(Minecart $entity) : ?Player {
         return $player;
     }
 
+    public function isMoving(Minecart $entity) : bool {
+        if (!isset(self::$isMoving[$entity->getId()]) || self::$isMoving[$entity->getId()] === false) {
+            return false;
+        }
+        return true;
+    }
+
+    public function isRecharging(Minecart $entity) : bool {
+        if (!isset(self::$isRecharging[$entity->getId()]) || self::$isRecharging[$entity->getId()] === false) {
+            return false;
+        }
+        return true;
+    }
+
 }
diff --git a/src/commands/GokartCommands.php b/src/commands/GokartCommands.php
@@ -2,20 +2,41 @@
 
 namespace pixelwhiz\minecart\commands;
 
+use pixelwhiz\minecart\Minecarts;
+use pixelwhiz\minecart\utils\GasStation;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\lang\Translatable;
+use pocketmine\player\Player;
+use pocketmine\utils\TextFormat;
 
 class GokartCommands extends Command {
 
     public function __construct()
     {
-        parent::__construct("gokart", "Gokart commands", "/gokart spawn shopkeeper", [""]);
+        parent::__construct("gokart", "Recharge your minecart energy", TextFormat::GRAY."Usage: ".TextFormat::RED."/gokart recharge", [""]);
+        $this->setPermission("gokart.cmd");
     }
 
     public function execute(CommandSender $sender, string $commandLabel, array $args)
     {
+        if (!$sender instanceof Player) return false;
 
+        if (!isset($args[0])) {
+            $sender->sendMessage($this->getUsage());
+            return false;
+        }
+
+        if ($args[0] === "recharge") {
+            $entity = Minecarts::getInstance()->getMinecart($sender);
+            if ($entity === null) {
+                $sender->sendMessage(TextFormat::RED."You must be in a minecart to use this command!");
+                return false;
+            }
+
+            GasStation::open($sender, $entity);
+        }
+        return true;
     }
 
 }
diff --git a/src/entity/Minecart.php b/src/entity/Minecart.php
@@ -43,7 +43,7 @@ public function walk(): bool {
 
         Controller::shouldDrop($this);
         Controller::shouldDespawn($this);
-        Controller::updateFuel($this, self::$startPos);
+        Controller::updateEnergy($this, self::$startPos);
 
         $motion = Controller::getMotion($this);
         $motionX = $motion["x"];
@@ -64,7 +64,7 @@ public function walkBackward(): bool {
 
         Controller::shouldDrop($this);
         Controller::shouldDespawn($this);
-        Controller::updateFuel($this, self::$startPos);
+        Controller::updateEnergy($this, self::$startPos);
 
         $motion = Controller::getMotion($this);
         $motionX = -$motion["x"] / 2;
@@ -81,6 +81,7 @@ protected function entityBaseTick(int $tickDiff = 1): bool
     {
         $player = Minecarts::getInstance()->getRider($this);
         if ($player instanceof Player) {
+            if (Minecarts::getInstance()->isRecharging($this) === true) return false;
             $player->sendTip("Minecart Energy: ". (int)$this->getEnergy() . "%%");
             return true;
         }

diff --git a/src/entity/RefuelingOfficer.php b/src/entity/RefuelingOfficer.php
diff --git a/src/forms/EnergyShop.php b/src/forms/EnergyShop.php
diff --git a/src/listeners/GasStationListener.php b/src/listeners/GasStationListener.php
diff --git a/src/listeners/MinecartListener.php b/src/listeners/MinecartListener.php
@@ -62,6 +62,7 @@ public function onReceive(DataPacketReceiveEvent $event) {
                         ];
                     }
 
+                    Minecarts::$isMoving[$entity->getId()] = true;
                     $entity->walk();
                 } else if ($isSPressed) {
                     if (count(array_filter($entity::$startPos, fn($value) => $value === null)) === 3) {
@@ -72,8 +73,10 @@ public function onReceive(DataPacketReceiveEvent $event) {
                         ];
                     }
 
+                    Minecarts::$isMoving[$entity->getId()] = true;
                     $entity->walkBackward();
                 } else if (!$isWPressed && !$isSPressed) {
+                    Minecarts::$isMoving[$entity->getId()] = false;
                     $entity::$startPos = [
                         "x" => null,
                         "y" => null,