diff --git a/plugin.yml b/plugin.yml index f865bfb..6f9850a 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: FormConstructor version: 1.0.0 -api: 5.0.0 +api: 3.0.0 author: MEFRREEX description: Library for easy creating and handling of forms main: com\formconstructor\FormConstructor \ No newline at end of file diff --git a/src/com/formconstructor/event/FormEvent.php b/src/com/formconstructor/event/FormEvent.php index 61f5bd2..62cc9c6 100644 --- a/src/com/formconstructor/event/FormEvent.php +++ b/src/com/formconstructor/event/FormEvent.php @@ -4,11 +4,10 @@ namespace com\formconstructor\event; use com\formconstructor\form\Form; use pocketmine\event\Cancellable; -use pocketmine\event\CancellableTrait; + use pocketmine\event\Event; abstract class FormEvent extends Event implements Cancellable { - use CancellableTrait; private Form $form; diff --git a/src/com/formconstructor/event/PlayerFormCloseEvent.php b/src/com/formconstructor/event/PlayerFormCloseEvent.php index 4f9851f..ba4e71b 100644 --- a/src/com/formconstructor/event/PlayerFormCloseEvent.php +++ b/src/com/formconstructor/event/PlayerFormCloseEvent.php @@ -3,7 +3,8 @@ namespace com\formconstructor\event; use com\formconstructor\form\Form; -use pocketmine\player\Player; +use pocketmine\Player; + class PlayerFormCloseEvent extends FormEvent { diff --git a/src/com/formconstructor/event/PlayerFormSendEvent.php b/src/com/formconstructor/event/PlayerFormSendEvent.php index e6ff021..7b2261a 100644 --- a/src/com/formconstructor/event/PlayerFormSendEvent.php +++ b/src/com/formconstructor/event/PlayerFormSendEvent.php @@ -3,7 +3,8 @@ namespace com\formconstructor\event; use com\formconstructor\form\Form; -use pocketmine\player\Player; +use pocketmine\Player; + class PlayerFormSendEvent extends FormEvent { diff --git a/src/com/formconstructor/form/CustomForm.php b/src/com/formconstructor/form/CustomForm.php index 3611ad0..c71e387 100644 --- a/src/com/formconstructor/form/CustomForm.php +++ b/src/com/formconstructor/form/CustomForm.php @@ -8,7 +8,7 @@ use com\formconstructor\form\element\custom\Label; use com\formconstructor\form\element\custom\validator\IValidator; use com\formconstructor\form\response\CustomFormResponse; use com\formconstructor\form\response\FormResponse; -use pocketmine\player\Player; +use pocketmine\Player; class CustomForm extends CloseableForm { diff --git a/src/com/formconstructor/form/Form.php b/src/com/formconstructor/form/Form.php index 4cf67b7..30b4480 100644 --- a/src/com/formconstructor/form/Form.php +++ b/src/com/formconstructor/form/Form.php @@ -2,24 +2,25 @@ namespace com\formconstructor\form; -use pocketmine\player\Player; -use pocketmine\Server; -use pocketmine\form\Form as PMForm; use com\formconstructor\event\PlayerFormSendEvent; -use com\formconstructor\task\FormHandlingTask; use com\formconstructor\form\response\FormResponse; -use pocketmine\thread\NonThreadSafeValue; +use com\formconstructor\task\FormHandlingTask; +use pocketmine\form\Form as PMForm; +use pocketmine\Player; -abstract class Form implements PMForm { +abstract class Form implements PMForm +{ private FormType $type; private bool $async; - public function __construct(FormType $type) { + public function __construct(FormType $type) + { $this->type = $type; } - public function send(Player $player, bool $async = false): void { + public function send(Player $player, bool $async = false): void + { $event = new PlayerFormSendEvent($player, $this, $async); $event->call(); @@ -29,15 +30,18 @@ abstract class Form implements PMForm { } } - public function sendAsync(Player $player) { + public function sendAsync(Player $player) + { $this->send($player, true); } - public function getType(): FormType { + public function getType(): FormType + { return $this->type; } - public function isAsync(): bool { + public function isAsync(): bool + { return $this->async; } @@ -45,7 +49,8 @@ abstract class Form implements PMForm { public abstract function getResponse(): ?FormResponse; - public final function handleResponse(Player $player, $data): void { + public final function handleResponse(Player $player, $data): void + { $this->setResponse($data); $handler = new FormHandlingTask($this->getResponse(), $this, $player); diff --git a/src/com/formconstructor/form/response/CustomFormResponse.php b/src/com/formconstructor/form/response/CustomFormResponse.php index 7fffff2..2030edb 100644 --- a/src/com/formconstructor/form/response/CustomFormResponse.php +++ b/src/com/formconstructor/form/response/CustomFormResponse.php @@ -13,7 +13,8 @@ use com\formconstructor\form\element\custom\StepSlider; use com\formconstructor\form\element\custom\Toggle; use com\formconstructor\form\element\custom\validator\IValidator; use com\formconstructor\form\element\ElementType; -use pocketmine\player\Player; +use pocketmine\Player; + class CustomFormResponse extends FormResponse { diff --git a/src/com/formconstructor/form/response/FormResponse.php b/src/com/formconstructor/form/response/FormResponse.php index 0a6fa00..2760e67 100644 --- a/src/com/formconstructor/form/response/FormResponse.php +++ b/src/com/formconstructor/form/response/FormResponse.php @@ -3,7 +3,7 @@ namespace com\formconstructor\form\response; use Closure; -use pocketmine\player\Player; +use pocketmine\Player; abstract class FormResponse { diff --git a/src/com/formconstructor/form/response/ModalFormResponse.php b/src/com/formconstructor/form/response/ModalFormResponse.php index c44663f..f1468a4 100644 --- a/src/com/formconstructor/form/response/ModalFormResponse.php +++ b/src/com/formconstructor/form/response/ModalFormResponse.php @@ -3,7 +3,8 @@ namespace com\formconstructor\form\response; use Closure; -use pocketmine\player\Player; +use pocketmine\Player; + class ModalFormResponse extends FormResponse { diff --git a/src/com/formconstructor/form/response/SimpleFormResponse.php b/src/com/formconstructor/form/response/SimpleFormResponse.php index 83de674..ff6476d 100644 --- a/src/com/formconstructor/form/response/SimpleFormResponse.php +++ b/src/com/formconstructor/form/response/SimpleFormResponse.php @@ -2,8 +2,9 @@ namespace com\formconstructor\form\response; -use pocketmine\player\Player; + use com\formconstructor\form\element\simple\Button; +use pocketmine\Player; class SimpleFormResponse extends FormResponse { diff --git a/src/com/formconstructor/task/FormHandlingTask.php b/src/com/formconstructor/task/FormHandlingTask.php index 474709e..1672a60 100644 --- a/src/com/formconstructor/task/FormHandlingTask.php +++ b/src/com/formconstructor/task/FormHandlingTask.php @@ -9,7 +9,7 @@ use com\formconstructor\form\response\CustomFormResponse; use com\formconstructor\form\response\FormResponse; use com\formconstructor\form\response\ModalFormResponse; use com\formconstructor\form\response\SimpleFormResponse; -use pocketmine\player\Player; +use pocketmine\Player; // TODO async handing class FormHandlingTask {