From cca212884a4a49719bf8d2acad6a21ed522aa70e Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 20:09:41 +1000 Subject: [PATCH 01/84] Update config.yml --- resources/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/config.yml b/resources/config.yml index ed3b000..94df26e 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -8,3 +8,5 @@ Message: "&aWelcome to our server, {player}! &cWe hope you enjoy your stay at " ServerName: "&cName" BroadcastToServer: true + +formmode: false From 71fcb21c3d0257fceea3ddf21dca80ddb1135856 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 20:12:44 +1000 Subject: [PATCH 02/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index a3652a0..7fcf1d8 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -18,17 +18,20 @@ public function onPlayerJoin(PlayerJoinEvent $event) { $servername = $this->getConfig()->get("ServerName"); $prefix = $this->getConfig()->get("Prefix"); $message = $this->getConfig()->get("Message"); + $formmode = $this->getConfig()->get("formmode); $broadcasttoserver = $this->getConfig()->get("BroadcastToServer"); $message = str_replace("{player}", $player->getName(), $message); $prefix = str_replace("&", "§", $prefix); $servername = str_replace("&", "§", $servername); $message = str_replace("&", "§", $message); $message = $prefix . ": " . $message . $servername; -if ($broadcasttoserver === true) { +if ($broadcasttoserver === true and $formmode === false) { $this->getServer()->broadcastMessage($message); } -else { +elseif ($broadcasttoserver === false and $formmode === false { $player->sendMessage($message); } +else { + //* form stuff here } } From 898e4bc646358ceb4f637b74051cdb5927e3f952 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 20:17:40 +1000 Subject: [PATCH 03/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 7fcf1d8..2536deb 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -5,6 +5,7 @@ use pocketmine\plugin\PluginBase; use pocketmine\event\Listener; use pocketmine\event\player\PlayerJoinEvent; +use joejoe7777\FormAPI; class Main extends PluginBase implements Listener { From 8b23ca1670a6e41c903eab5a5db34a6d5ddf9076 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 20:18:37 +1000 Subject: [PATCH 04/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 2536deb..a74ecc4 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -5,7 +5,7 @@ use pocketmine\plugin\PluginBase; use pocketmine\event\Listener; use pocketmine\event\player\PlayerJoinEvent; -use joejoe7777\FormAPI; +use joejoe77777\FormAPI; class Main extends PluginBase implements Listener { From 376b97402df97df87b6aba15ec4ce8ebfe7299b2 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:25:21 +1000 Subject: [PATCH 05/84] Update config.yml --- resources/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/config.yml b/resources/config.yml index 94df26e..0379881 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -2,7 +2,9 @@ # Use {player} for the player name # Use & for color - +# DO NOT EDIT THIS VALUE UNLESS YOU KNOW WHAT YOUR DOING!: +version: 1 +# ok all safe now Prefix: "&l&o&cName" Message: "&aWelcome to our server, {player}! &cWe hope you enjoy your stay at " ServerName: "&cName" From 232d4d500941a508c915d6b64378abb68993b95b Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:27:26 +1000 Subject: [PATCH 06/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index a74ecc4..45c735f 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -13,7 +13,20 @@ public function onEnable(): void { $this->saveDefaultConfig(); $this->getServer()->getPluginManager()->registerEvents($this, $this); } - +private function updateConfig() € +if (file_exists (Sthis->getDatafolder () . +'config.ym]')) { +Sthis->saveResource( config.ym]') ; +return: +if (Sthis->getConfig()-›get('config-version')!== self:: CONFIG_VERSION) { +Sconfig_version = $this->getConfig()->get('config-version'); +Sthis->getLogger()->info("Your Config isn't the latest. We renamed your old config to sbconfig-" +. Sconfig_version . ". ym +rename (Sthis->getDatafolder () . "config.ymI', Sthis->getDatafolder () . 'config-' . $config_version +".yml'); +Sthis->saveResource( config.ym]'); +} +} public function onPlayerJoin(PlayerJoinEvent $event) { $player = $event->getPlayer(); $servername = $this->getConfig()->get("ServerName"); From 07322ee05d31589747ac8124b9a710571d338113 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:32:42 +1000 Subject: [PATCH 07/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 45c735f..d31058b 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -8,24 +8,23 @@ use joejoe77777\FormAPI; class Main extends PluginBase implements Listener { - +const CONFIG_VERSION = 1; public function onEnable(): void { $this->saveDefaultConfig(); $this->getServer()->getPluginManager()->registerEvents($this, $this); } -private function updateConfig() € -if (file_exists (Sthis->getDatafolder () . -'config.ym]')) { -Sthis->saveResource( config.ym]') ; -return: -if (Sthis->getConfig()-›get('config-version')!== self:: CONFIG_VERSION) { -Sconfig_version = $this->getConfig()->get('config-version'); -Sthis->getLogger()->info("Your Config isn't the latest. We renamed your old config to sbconfig-" -. Sconfig_version . ". ym -rename (Sthis->getDatafolder () . "config.ymI', Sthis->getDatafolder () . 'config-' . $config_version -".yml'); -Sthis->saveResource( config.ym]'); -} + private function updateConfig(){ + if (!file_exists($this->getDataFolder() . 'config.yml')) { + $this->saveResource('config.yml'); + return; + } + if ($this->getConfig()->get('config-version') !== self::CONFIG_VERSION) { + $config_version = $this->getConfig()->get('config-version'); + $this->getLogger()->info("Your Config isn't the latest. We renamed your old config to §bconfig-" . $config_version . ".yml §6and created a new config"); + rename($this->getDataFolder() . 'config.yml', $this->getDataFolder() . 'config-' . $config_version . '.yml'); + $this->saveResource('config.yml'); + } + } } public function onPlayerJoin(PlayerJoinEvent $event) { $player = $event->getPlayer(); From 7bdfa8c85dd8ca41790979853911f1b5780ceb85 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:35:46 +1000 Subject: [PATCH 08/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index d31058b..7f607a5 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -45,6 +45,29 @@ public function onPlayerJoin(PlayerJoinEvent $event) { $player->sendMessage($message); } else { - //* form stuff here + ```php +public function onJoin(PlayerJoinEvent $event){ + $player = $event->getPlayer(); + + $joinform = new SimpleForm(function (Player $player, $data){ + $result = $data; + if ($result !== null) { + switch ($result) { + case 0: + $sumbitmsg = $this->config->get("Sumbit-Msg"); + $player->sendMessage(self::PREFIX . $sumbitmsg); + break; + } + } + }); + $formtitle = $this->config->get("Form-Title"); + $formcontent = $this->config->get("Form-Content"); + + $joinform->setTitle($formtitle); + $joinform->setContent($formcontent); + $joinform->addButton("§d§lSumbit"); + $player->sendForm($joinform); + } +``` } } From 1c132c7c2e55945e1d1ca57f8039db25a382559d Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:36:26 +1000 Subject: [PATCH 09/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 7f607a5..8d54749 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -45,8 +45,6 @@ public function onPlayerJoin(PlayerJoinEvent $event) { $player->sendMessage($message); } else { - ```php -public function onJoin(PlayerJoinEvent $event){ $player = $event->getPlayer(); $joinform = new SimpleForm(function (Player $player, $data){ @@ -68,6 +66,4 @@ public function onJoin(PlayerJoinEvent $event){ $joinform->addButton("§d§lSumbit"); $player->sendForm($joinform); } -``` - } } From af2fce49f2d812027147355763bb9dc8fee8f2fe Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:39:20 +1000 Subject: [PATCH 10/84] Update config.yml --- resources/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/config.yml b/resources/config.yml index 0379881..e64ef2b 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -12,3 +12,6 @@ ServerName: "&cName" BroadcastToServer: true formmode: false +Form-Title: "§aWelcome!" +Submit-Msg: "Submit" +Form-Content: "Welcome" From 7affa1194c06f1a540d2c889bf5790cecbd21324 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:43:51 +1000 Subject: [PATCH 11/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 8d54749..4dd7d15 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -24,8 +24,6 @@ private function updateConfig(){ rename($this->getDataFolder() . 'config.yml', $this->getDataFolder() . 'config-' . $config_version . '.yml'); $this->saveResource('config.yml'); } - } -} public function onPlayerJoin(PlayerJoinEvent $event) { $player = $event->getPlayer(); $servername = $this->getConfig()->get("ServerName"); @@ -67,3 +65,4 @@ public function onPlayerJoin(PlayerJoinEvent $event) { $player->sendForm($joinform); } } +} From 60a7785ec1cb585ce160370778d8bfdb57bbe9bf Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:45:05 +1000 Subject: [PATCH 12/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 4dd7d15..80c5b08 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -24,6 +24,7 @@ private function updateConfig(){ rename($this->getDataFolder() . 'config.yml', $this->getDataFolder() . 'config-' . $config_version . '.yml'); $this->saveResource('config.yml'); } + } public function onPlayerJoin(PlayerJoinEvent $event) { $player = $event->getPlayer(); $servername = $this->getConfig()->get("ServerName"); From eb893c397b29883956b3b7c52d4a7727d67f43bc Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:48:01 +1000 Subject: [PATCH 13/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 80c5b08..464d752 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -8,23 +8,12 @@ use joejoe77777\FormAPI; class Main extends PluginBase implements Listener { -const CONFIG_VERSION = 1; public function onEnable(): void { $this->saveDefaultConfig(); $this->getServer()->getPluginManager()->registerEvents($this, $this); } - private function updateConfig(){ - if (!file_exists($this->getDataFolder() . 'config.yml')) { - $this->saveResource('config.yml'); - return; - } - if ($this->getConfig()->get('config-version') !== self::CONFIG_VERSION) { - $config_version = $this->getConfig()->get('config-version'); - $this->getLogger()->info("Your Config isn't the latest. We renamed your old config to §bconfig-" . $config_version . ".yml §6and created a new config"); - rename($this->getDataFolder() . 'config.yml', $this->getDataFolder() . 'config-' . $config_version . '.yml'); - $this->saveResource('config.yml'); - } - } + + public function onPlayerJoin(PlayerJoinEvent $event) { $player = $event->getPlayer(); $servername = $this->getConfig()->get("ServerName"); From 5f55fec81f76be7fd480c3104fa2e1a58a949ee8 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:51:56 +1000 Subject: [PATCH 14/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 464d752..a11d872 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -15,25 +15,7 @@ public function onEnable(): void { public function onPlayerJoin(PlayerJoinEvent $event) { - $player = $event->getPlayer(); - $servername = $this->getConfig()->get("ServerName"); - $prefix = $this->getConfig()->get("Prefix"); - $message = $this->getConfig()->get("Message"); - $formmode = $this->getConfig()->get("formmode); - $broadcasttoserver = $this->getConfig()->get("BroadcastToServer"); - $message = str_replace("{player}", $player->getName(), $message); - $prefix = str_replace("&", "§", $prefix); - $servername = str_replace("&", "§", $servername); - $message = str_replace("&", "§", $message); - $message = $prefix . ": " . $message . $servername; -if ($broadcasttoserver === true and $formmode === false) { - $this->getServer()->broadcastMessage($message); -} -elseif ($broadcasttoserver === false and $formmode === false { - $player->sendMessage($message); -} -else { - $player = $event->getPlayer(); + $joinform = new SimpleForm(function (Player $player, $data){ $result = $data; @@ -55,4 +37,3 @@ public function onPlayerJoin(PlayerJoinEvent $event) { $player->sendForm($joinform); } } -} From 306537fdf2740a48391a088f42a5fa38b2ddeae6 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:52:28 +1000 Subject: [PATCH 15/84] Update config.yml --- resources/config.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/resources/config.yml b/resources/config.yml index e64ef2b..9a4b734 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -1,17 +1,4 @@ #config - -# Use {player} for the player name -# Use & for color -# DO NOT EDIT THIS VALUE UNLESS YOU KNOW WHAT YOUR DOING!: -version: 1 -# ok all safe now -Prefix: "&l&o&cName" -Message: "&aWelcome to our server, {player}! &cWe hope you enjoy your stay at " -ServerName: "&cName" - -BroadcastToServer: true - -formmode: false Form-Title: "§aWelcome!" Submit-Msg: "Submit" Form-Content: "Welcome" From dedb791250f8306a07c9b4d4eea9ee5bb46b7533 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:57:15 +1000 Subject: [PATCH 16/84] Create simpleform.php --- src/skyss0fly/welcomemessage/simpleform.php | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/skyss0fly/welcomemessage/simpleform.php diff --git a/src/skyss0fly/welcomemessage/simpleform.php b/src/skyss0fly/welcomemessage/simpleform.php new file mode 100644 index 0000000..b3d9bbc --- /dev/null +++ b/src/skyss0fly/welcomemessage/simpleform.php @@ -0,0 +1 @@ + Date: Sat, 3 Jun 2023 21:59:27 +1000 Subject: [PATCH 17/84] Update simpleform.php --- src/skyss0fly/welcomemessage/simpleform.php | 75 +++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/src/skyss0fly/welcomemessage/simpleform.php b/src/skyss0fly/welcomemessage/simpleform.php index b3d9bbc..4b95250 100644 --- a/src/skyss0fly/welcomemessage/simpleform.php +++ b/src/skyss0fly/welcomemessage/simpleform.php @@ -1 +1,76 @@ data["type"] = "form"; + $this->data["title"] = ""; + $this->data["content"] = $this->content; + $this->data["buttons"] = []; + } + + public function processData(mixed &$data): void { + $data = $this->labelMap[$data] ?? null; + } + + /** + * @param string $title + */ + public function setTitle(string $title) : void { + $this->data["title"] = $title; + } + + /** + * @return string + */ + public function getTitle() : string { + return $this->data["title"]; + } + + /** + * @return string + */ + public function getContent() : string { + return $this->data["content"]; + } + + /** + * @param string $content + */ + public function setContent(string $content) : void { + $this->data["content"] = $content; + } + + /** + * @param string $text + * @param int $imageType + * @param string $imagePath + * @param string $label + */ + public function addButton(string $text, int $imageType = -1, string $imagePath = "", ?string $label = null) : void { + $content = ["text" => $text]; + if($imageType !== -1) { + $content["image"]["type"] = $imageType === 0 ? "path" : "url"; + $content["image"]["data"] = $imagePath; + } + $this->data["buttons"][] = $content; + $this->labelMap[] = $label ?? count($this->labelMap); + } + +} From 412af34506f50b15ad82401608834291fdcc070d Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:00:05 +1000 Subject: [PATCH 18/84] Create form.php --- src/skyss0fly/welcomemessage/Form/form.php | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/skyss0fly/welcomemessage/Form/form.php diff --git a/src/skyss0fly/welcomemessage/Form/form.php b/src/skyss0fly/welcomemessage/Form/form.php new file mode 100644 index 0000000..b3d9bbc --- /dev/null +++ b/src/skyss0fly/welcomemessage/Form/form.php @@ -0,0 +1 @@ + Date: Sat, 3 Jun 2023 22:00:24 +1000 Subject: [PATCH 19/84] Rename src/skyss0fly/welcomemessage/simpleform.php to src/skyss0fly/welcomemessage/Form/simpleform.php --- src/skyss0fly/welcomemessage/{ => Form}/simpleform.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/skyss0fly/welcomemessage/{ => Form}/simpleform.php (100%) diff --git a/src/skyss0fly/welcomemessage/simpleform.php b/src/skyss0fly/welcomemessage/Form/simpleform.php similarity index 100% rename from src/skyss0fly/welcomemessage/simpleform.php rename to src/skyss0fly/welcomemessage/Form/simpleform.php From 96fb1c576f7628d12ffa1cc55affa029c9a691c2 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:01:43 +1000 Subject: [PATCH 20/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index a11d872..a8ececb 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -5,7 +5,7 @@ use pocketmine\plugin\PluginBase; use pocketmine\event\Listener; use pocketmine\event\player\PlayerJoinEvent; -use joejoe77777\FormAPI; +use skyss0fly\welcomemessage\Form\{Form, SimpleForm}; class Main extends PluginBase implements Listener { public function onEnable(): void { From 5c9f7b535f22549dd0ce2dcd1bd43e31eb0f0dcc Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:02:05 +1000 Subject: [PATCH 21/84] Update simpleform.php --- src/skyss0fly/welcomemessage/Form/simpleform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Form/simpleform.php b/src/skyss0fly/welcomemessage/Form/simpleform.php index 4b95250..c504e87 100644 --- a/src/skyss0fly/welcomemessage/Form/simpleform.php +++ b/src/skyss0fly/welcomemessage/Form/simpleform.php @@ -2,7 +2,7 @@ declare(strict_types = 1); -namespace skyss0fly\WelcomeMessage\Form; +namespace skyss0fly\welcomemessage\Form; class SimpleForm extends Form { From 2a27712e0a4207a2ca9e9641fa882da1f38b1042 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:03:01 +1000 Subject: [PATCH 22/84] Update form.php --- src/skyss0fly/welcomemessage/Form/form.php | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/src/skyss0fly/welcomemessage/Form/form.php b/src/skyss0fly/welcomemessage/Form/form.php index b3d9bbc..7b4038a 100644 --- a/src/skyss0fly/welcomemessage/Form/form.php +++ b/src/skyss0fly/welcomemessage/Form/form.php @@ -1 +1,56 @@ callable = $callable; + } + + /** + * @deprecated + * @see Player::sendForm() + * + * @param Player $sender + */ + public function sendToPlayer(Player $sender) : void { + $sender->sendForm($this); + } + + public function getCallable() : ?callable { + return $this->callable; + } + + public function setCallable(?callable $callable) { + $this->callable = $callable; + } + + public function handleResponse(Player $sender, $data) : void { + $this->processData($data); + $callable = $this->getCallable(); + if($callable !== null) { + $callable($sender, $data); + } + } + + public function processData(mixed &$data) : void { + } + + public function jsonSerialize():mixed{ + return $this->data; + } +} From dead0c75e7a731f4b16880b8ecb126dd2442ca8c Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:03:21 +1000 Subject: [PATCH 23/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index a8ececb..c0beba3 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -5,7 +5,7 @@ use pocketmine\plugin\PluginBase; use pocketmine\event\Listener; use pocketmine\event\player\PlayerJoinEvent; -use skyss0fly\welcomemessage\Form\{Form, SimpleForm}; +use skyss0fly\welcomemessage\Form\{form, simpleform}; class Main extends PluginBase implements Listener { public function onEnable(): void { From 19b57b78486ec9c221cd83b66e9c5ada63e30245 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:07:43 +1000 Subject: [PATCH 24/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index c0beba3..a80624e 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -22,14 +22,14 @@ public function onPlayerJoin(PlayerJoinEvent $event) { if ($result !== null) { switch ($result) { case 0: - $sumbitmsg = $this->config->get("Sumbit-Msg"); + $sumbitmsg = $this->getConfig->get("Sumbit-Msg"); $player->sendMessage(self::PREFIX . $sumbitmsg); break; } } }); - $formtitle = $this->config->get("Form-Title"); - $formcontent = $this->config->get("Form-Content"); + $formtitle = $this->getConfig->get("Form-Title"); + $formcontent = $this->getConfig->get("Form-Content"); $joinform->setTitle($formtitle); $joinform->setContent($formcontent); From 1e743b717c1560c4e995759b5225bd67dcdfb381 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:12:00 +1000 Subject: [PATCH 25/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index a80624e..f00409f 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -22,14 +22,15 @@ public function onPlayerJoin(PlayerJoinEvent $event) { if ($result !== null) { switch ($result) { case 0: - $sumbitmsg = $this->getConfig->get("Sumbit-Msg"); + + $submitmsg = $this->config()->get("Submit-Msg"); $player->sendMessage(self::PREFIX . $sumbitmsg); break; } } }); - $formtitle = $this->getConfig->get("Form-Title"); - $formcontent = $this->getConfig->get("Form-Content"); + $formtitle = $this->config()->get("Form-Title"); + $formcontent = $this->config()->get("Form-Content"); $joinform->setTitle($formtitle); $joinform->setContent($formcontent); From f1a716a37acd90309926009cc5dc0b460d44bf31 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:17:06 +1000 Subject: [PATCH 26/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index f00409f..92ed874 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -15,7 +15,7 @@ public function onEnable(): void { public function onPlayerJoin(PlayerJoinEvent $event) { - + $player = $event->getPlayer(); $joinform = new SimpleForm(function (Player $player, $data){ $result = $data; From 99659ede05fdb4fc27470a1e76fbac26dbce1f66 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:19:18 +1000 Subject: [PATCH 27/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 92ed874..addac19 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -34,7 +34,7 @@ public function onPlayerJoin(PlayerJoinEvent $event) { $joinform->setTitle($formtitle); $joinform->setContent($formcontent); - $joinform->addButton("§d§lSumbit"); + $joinform->addButton("§d§lSubmit!"); $player->sendForm($joinform); } } From 9823976ec2686bbdb91376df92fc6dbe34d44803 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:33:58 +1000 Subject: [PATCH 28/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index addac19..9da0eee 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -6,6 +6,7 @@ use pocketmine\event\Listener; use pocketmine\event\player\PlayerJoinEvent; use skyss0fly\welcomemessage\Form\{form, simpleform}; +use pocketmine\player\Player; class Main extends PluginBase implements Listener { public function onEnable(): void { From 2be12851530b283c927281c0d990cb0e8c616f46 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:42:20 +1000 Subject: [PATCH 29/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 9da0eee..98e0bcd 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -25,7 +25,7 @@ public function onPlayerJoin(PlayerJoinEvent $event) { case 0: $submitmsg = $this->config()->get("Submit-Msg"); - $player->sendMessage(self::PREFIX . $sumbitmsg); + $player->sendMessage($sumbitmsg); break; } } From 217a447f9f45828e54dd85206584c29318497b33 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:47:04 +1000 Subject: [PATCH 30/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 98e0bcd..5cdf1c2 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -24,14 +24,14 @@ public function onPlayerJoin(PlayerJoinEvent $event) { switch ($result) { case 0: - $submitmsg = $this->config()->get("Submit-Msg"); + $submitmsg = $this->getConfig()->get("Submit-Msg"); $player->sendMessage($sumbitmsg); break; } } }); - $formtitle = $this->config()->get("Form-Title"); - $formcontent = $this->config()->get("Form-Content"); + $formtitle = $this->getConfig()->get("Form-Title"); + $formcontent = $this->getConfig()->get("Form-Content"); $joinform->setTitle($formtitle); $joinform->setContent($formcontent); From 0abfa3390792e1a750da88109a0ad6e5ecf6d45c Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:49:48 +1000 Subject: [PATCH 31/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 5cdf1c2..3e41c8f 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -25,7 +25,7 @@ public function onPlayerJoin(PlayerJoinEvent $event) { case 0: $submitmsg = $this->getConfig()->get("Submit-Msg"); - $player->sendMessage($sumbitmsg); + $player->sendMessage($submitmsg); break; } } From 7f3285a252847119786f90ad39eba1f2be77dadb Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 4 Jun 2023 09:41:56 +1000 Subject: [PATCH 32/84] Update config.yml --- resources/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/config.yml b/resources/config.yml index 9a4b734..39be51d 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -1,4 +1,4 @@ #config -Form-Title: "§aWelcome!" -Submit-Msg: "Submit" +Form-Title: "Welcome!" +Submit-Msg: "Welcome to ServerName_Here, enjoy your stay" Form-Content: "Welcome" From dd57897775214e17759adc4cddbd28ffe75967c1 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 4 Jun 2023 09:42:24 +1000 Subject: [PATCH 33/84] Update plugin.yml --- plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index 4224dfc..206782d 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: WelcomeMessage main: skyss0fly\welcomemessage\Main -version: 1.8 +version: 1.9 api: 5.0.0 author: ["skyss0fly", "Inaayat"] description: A simple welcome message plugin thats customizable From a4edebf65dcc88045a8a94946a2d4893aa82b5aa Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Thu, 15 Jun 2023 07:58:28 +1000 Subject: [PATCH 34/84] Update config.yml --- resources/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/config.yml b/resources/config.yml index 39be51d..8c17547 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -1,4 +1,5 @@ #config Form-Title: "Welcome!" -Submit-Msg: "Welcome to ServerName_Here, enjoy your stay" +Submit-Msg: "Submit" Form-Content: "Welcome" +Btn1: "Rules" From 6bc8bf3ed755a6fa17158a5a3bdad83b4ab00f6c Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Thu, 15 Jun 2023 08:02:36 +1000 Subject: [PATCH 35/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 3e41c8f..f274b0a 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -32,10 +32,12 @@ public function onPlayerJoin(PlayerJoinEvent $event) { }); $formtitle = $this->getConfig()->get("Form-Title"); $formcontent = $this->getConfig()->get("Form-Content"); - + $btn1 = $this->getConfig()->get("Btn1"); + $joinform->setTitle($formtitle); $joinform->setContent($formcontent); $joinform->addButton("§d§lSubmit!"); + $joinform->addButton($btn1); $player->sendForm($joinform); } } From a7d45684ac445f222e379d86d778b548df5b327f Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Thu, 15 Jun 2023 16:05:37 +1000 Subject: [PATCH 36/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index f274b0a..e4fc850 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -26,13 +26,14 @@ public function onPlayerJoin(PlayerJoinEvent $event) { $submitmsg = $this->getConfig()->get("Submit-Msg"); $player->sendMessage($submitmsg); + break; } } }); $formtitle = $this->getConfig()->get("Form-Title"); $formcontent = $this->getConfig()->get("Form-Content"); - $btn1 = $this->getConfig()->get("Btn1"); + $btn1 = $this->getConfig()->get("Btn1"); $joinform->setTitle($formtitle); $joinform->setContent($formcontent); From 1177c898ca2088b8fe27fd2b2ce9f0c71886b86c Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Thu, 15 Jun 2023 16:07:27 +1000 Subject: [PATCH 37/84] Create Rules.php --- src/skyss0fly/welcomemessage/Rules.php | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 src/skyss0fly/welcomemessage/Rules.php diff --git a/src/skyss0fly/welcomemessage/Rules.php b/src/skyss0fly/welcomemessage/Rules.php new file mode 100644 index 0000000..12a1dd2 --- /dev/null +++ b/src/skyss0fly/welcomemessage/Rules.php @@ -0,0 +1,2 @@ + Date: Fri, 16 Jun 2023 16:34:10 +1000 Subject: [PATCH 38/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index e4fc850..50de170 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -41,4 +41,23 @@ public function onPlayerJoin(PlayerJoinEvent $event) { $joinform->addButton($btn1); $player->sendForm($joinform); } + + $ruleform = new SimpleForm(function (Player $player, $data){ + $result = $data; + if ($result !== null) { + switch ($result) { + case 0: + + $submitmsg = $this->getConfig()->get("Submit-Msg"); + $player->sendMessage($submitmsg); + + break; + } + } + }); + $ruleform->setTitle($formtitle); + $ruleform->setContent($formcontent); + $ruleform->addButton("§d§lSubmit!"); + +} } From 58daf33f55e9a0c9433c08504bba12f678bbf6bb Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Fri, 16 Jun 2023 16:45:08 +1000 Subject: [PATCH 39/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 50de170..5f3c2b6 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -42,6 +42,10 @@ public function onPlayerJoin(PlayerJoinEvent $event) { $player->sendForm($joinform); } + +public function sendJoinForm(Player $player){ +} + $ruleform = new SimpleForm(function (Player $player, $data){ $result = $data; if ($result !== null) { From 82d9ab1f11221f52e08dd1c884d72ae923c557a6 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Fri, 16 Jun 2023 16:47:17 +1000 Subject: [PATCH 40/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 5f3c2b6..e91b779 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -62,6 +62,16 @@ public function sendJoinForm(Player $player){ $ruleform->setTitle($formtitle); $ruleform->setContent($formcontent); $ruleform->addButton("§d§lSubmit!"); + $formtitle = $this->getConfig()->get("Form-Title"); + $formcontent = $this->getConfig()->get("Form-Content"); + $btn1 = $this->getConfig()->get("Btn1"); + + $ruleform->setTitle($formtitle); + $ruleform->setContent($formcontent); + $ruleform->addButton("§d§lSubmit!"); + $ruleform->addButton($btn1); + $player->sendForm($joinform); + } } From edd65afb303d0d7bf793792e29bc21fa221684cb Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Fri, 16 Jun 2023 16:50:56 +1000 Subject: [PATCH 41/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index e91b779..b239661 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -59,18 +59,16 @@ public function sendJoinForm(Player $player){ } } }); - $ruleform->setTitle($formtitle); - $ruleform->setContent($formcontent); + $ruleform->setTitle("Rules"); + $ruleform->setContent($rulecontent); $ruleform->addButton("§d§lSubmit!"); - $formtitle = $this->getConfig()->get("Form-Title"); - $formcontent = $this->getConfig()->get("Form-Content"); - $btn1 = $this->getConfig()->get("Btn1"); + $rulecontent = $this->getConfig()->get("RuleContent"); + $ruleform->setTitle($formtitle); $ruleform->setContent($formcontent); $ruleform->addButton("§d§lSubmit!"); - $ruleform->addButton($btn1); - $player->sendForm($joinform); + $player->sendForm($ruleform); } From d334956760eeeabf877301b6a947ee02cf396cf0 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 17 Jun 2023 09:21:57 +1000 Subject: [PATCH 42/84] Delete Rules.php --- src/skyss0fly/welcomemessage/Rules.php | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 src/skyss0fly/welcomemessage/Rules.php diff --git a/src/skyss0fly/welcomemessage/Rules.php b/src/skyss0fly/welcomemessage/Rules.php deleted file mode 100644 index 12a1dd2..0000000 --- a/src/skyss0fly/welcomemessage/Rules.php +++ /dev/null @@ -1,2 +0,0 @@ - Date: Sat, 17 Jun 2023 09:25:07 +1000 Subject: [PATCH 43/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index b239661..d21ae82 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -21,6 +21,7 @@ public function onPlayerJoin(PlayerJoinEvent $event) { $joinform = new SimpleForm(function (Player $player, $data){ $result = $data; if ($result !== null) { + $btn1->sendForm($ruleform); switch ($result) { case 0: @@ -65,9 +66,7 @@ public function sendJoinForm(Player $player){ $rulecontent = $this->getConfig()->get("RuleContent"); - $ruleform->setTitle($formtitle); - $ruleform->setContent($formcontent); - $ruleform->addButton("§d§lSubmit!"); + $ruleform->setTitle("Rules"); $player->sendForm($ruleform); From 399973456d3b5e0bfe6388a9642d899b4536f1dc Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 17 Jun 2023 09:50:16 +1000 Subject: [PATCH 44/84] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index c055f46..f459d55 100644 --- a/README.md +++ b/README.md @@ -25,3 +25,6 @@ Simple on the fly customisable welcome message. https://poggit.pmmp.io/p/WelcomeMessage

^^ Download the Latest Flavour of WelcomeMessage ^^ + + +#Note: V1.10 is having complications Updating, may be a while as i need to clean up my plugin From e57081dfda551279dd46b7138d670a67142b6ef3 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 17 Jun 2023 09:55:43 +1000 Subject: [PATCH 45/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index d21ae82..8c30a25 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -45,7 +45,7 @@ public function onPlayerJoin(PlayerJoinEvent $event) { public function sendJoinForm(Player $player){ -} + $ruleform = new SimpleForm(function (Player $player, $data){ $result = $data; From 137ee22adb8235c43ce1f01e83815cde313de772 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 17 Jun 2023 09:58:11 +1000 Subject: [PATCH 46/84] Rename form.php to Form.php --- src/skyss0fly/welcomemessage/Form/{form.php => Form.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/skyss0fly/welcomemessage/Form/{form.php => Form.php} (100%) diff --git a/src/skyss0fly/welcomemessage/Form/form.php b/src/skyss0fly/welcomemessage/Form/Form.php similarity index 100% rename from src/skyss0fly/welcomemessage/Form/form.php rename to src/skyss0fly/welcomemessage/Form/Form.php From 0cd98544edd7ba1c51ce23bc7a7f436676d765e7 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 17 Jun 2023 09:58:29 +1000 Subject: [PATCH 47/84] Rename simpleform.php to SimpleForm.php --- .../welcomemessage/Form/{simpleform.php => SimpleForm.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/skyss0fly/welcomemessage/Form/{simpleform.php => SimpleForm.php} (100%) diff --git a/src/skyss0fly/welcomemessage/Form/simpleform.php b/src/skyss0fly/welcomemessage/Form/SimpleForm.php similarity index 100% rename from src/skyss0fly/welcomemessage/Form/simpleform.php rename to src/skyss0fly/welcomemessage/Form/SimpleForm.php From cef96a0eca3d36f77de20ca16ef7bdcff2eb73ae Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 17 Jun 2023 09:58:52 +1000 Subject: [PATCH 48/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 8c30a25..bac8742 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -5,7 +5,7 @@ use pocketmine\plugin\PluginBase; use pocketmine\event\Listener; use pocketmine\event\player\PlayerJoinEvent; -use skyss0fly\welcomemessage\Form\{form, simpleform}; +use skyss0fly\welcomemessage\Form\{Form, SimpleForm}; use pocketmine\player\Player; class Main extends PluginBase implements Listener { From 5ae3e5ce94fea37c34c42805fe94a4d59372c9ca Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 17 Jun 2023 10:01:49 +1000 Subject: [PATCH 49/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index bac8742..45ab74d 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -17,7 +17,8 @@ public function onEnable(): void { public function onPlayerJoin(PlayerJoinEvent $event) { $player = $event->getPlayer(); - + $ruleform = $sendJoinForm + $btn1 = $this->getConfig()->get("Btn1"); $joinform = new SimpleForm(function (Player $player, $data){ $result = $data; if ($result !== null) { From af08de313a5e79cf73ee4be354c95836f7ef5f6f Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 17 Jun 2023 10:03:21 +1000 Subject: [PATCH 50/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 45ab74d..7856dc9 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -18,7 +18,8 @@ public function onEnable(): void { public function onPlayerJoin(PlayerJoinEvent $event) { $player = $event->getPlayer(); $ruleform = $sendJoinForm - $btn1 = $this->getConfig()->get("Btn1"); + $joinform->addButton($btn1); + $btn1 = $this->getConfig()->get("Btn1"); $joinform = new SimpleForm(function (Player $player, $data){ $result = $data; if ($result !== null) { From 10ac2e42459c15cf7c6536c7805ba143b4a4d89d Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 17 Jun 2023 10:04:06 +1000 Subject: [PATCH 51/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 7856dc9..798b464 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -17,7 +17,7 @@ public function onEnable(): void { public function onPlayerJoin(PlayerJoinEvent $event) { $player = $event->getPlayer(); - $ruleform = $sendJoinForm + $joinform->addButton($btn1); $btn1 = $this->getConfig()->get("Btn1"); $joinform = new SimpleForm(function (Player $player, $data){ From 8df1cda25bc8baa4da5cd96fc0f210b3d34361d6 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 17 Jun 2023 10:06:35 +1000 Subject: [PATCH 52/84] Scrapped 1.10 Update Until further Notice Taking a break from coding --- src/skyss0fly/welcomemessage/Main.php | 34 ++++----------------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 798b464..206164b 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -18,12 +18,12 @@ public function onEnable(): void { public function onPlayerJoin(PlayerJoinEvent $event) { $player = $event->getPlayer(); - $joinform->addButton($btn1); - $btn1 = $this->getConfig()->get("Btn1"); + + $joinform = new SimpleForm(function (Player $player, $data){ $result = $data; if ($result !== null) { - $btn1->sendForm($ruleform); + switch ($result) { case 0: @@ -36,7 +36,7 @@ public function onPlayerJoin(PlayerJoinEvent $event) { }); $formtitle = $this->getConfig()->get("Form-Title"); $formcontent = $this->getConfig()->get("Form-Content"); - $btn1 = $this->getConfig()->get("Btn1"); + $joinform->setTitle($formtitle); $joinform->setContent($formcontent); @@ -46,31 +46,5 @@ public function onPlayerJoin(PlayerJoinEvent $event) { } -public function sendJoinForm(Player $player){ - - $ruleform = new SimpleForm(function (Player $player, $data){ - $result = $data; - if ($result !== null) { - switch ($result) { - case 0: - - $submitmsg = $this->getConfig()->get("Submit-Msg"); - $player->sendMessage($submitmsg); - - break; - } - } - }); - $ruleform->setTitle("Rules"); - $ruleform->setContent($rulecontent); - $ruleform->addButton("§d§lSubmit!"); - $rulecontent = $this->getConfig()->get("RuleContent"); - - - $ruleform->setTitle("Rules"); - $player->sendForm($ruleform); - - -} } From ca439a44f190800f8d5deccd32887e3827f6aca8 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 17 Jun 2023 10:07:22 +1000 Subject: [PATCH 53/84] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f459d55..e32b8d1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # WelcomeMessage +## Note: V1.10 is having complications Updating, may be a while as i need to clean up my plugin and take a break for a bit. its stressful Simple on the fly customisable welcome message.

@@ -27,4 +28,4 @@ https://poggit.pmmp.io/p/WelcomeMessage ^^ Download the Latest Flavour of WelcomeMessage ^^ -#Note: V1.10 is having complications Updating, may be a while as i need to clean up my plugin + From c6bab10578b86b5fe259d916442bdf804e9c2b72 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 17 Jun 2023 10:09:27 +1000 Subject: [PATCH 54/84] Add files via upload --- DOCS/1.7.md | 12 ++++++++++++ DOCS/1.8.md | 12 ++++++++++++ DOCS/1.9.md | 18 ++++++++++++++++++ DOCS/index.md | 10 ++++++++++ 4 files changed, 52 insertions(+) create mode 100644 DOCS/1.7.md create mode 100644 DOCS/1.8.md create mode 100644 DOCS/1.9.md create mode 100644 DOCS/index.md diff --git a/DOCS/1.7.md b/DOCS/1.7.md new file mode 100644 index 0000000..484222d --- /dev/null +++ b/DOCS/1.7.md @@ -0,0 +1,12 @@ +# Documentation on Welcome Message + +## Features in this Version: +> - Customisable: +> > Prefix, Message, ServerName + +## How To Install: +> 1. Download the Plugin Here +> 2. Put the Plugin in your Plugins Folder +> 3. Restart/Start/Stop & Start your Server +> 4. go to `plugin_data -> WelcomeMessage -> Config.yml` and Edit the values to how you like it +**Done** diff --git a/DOCS/1.8.md b/DOCS/1.8.md new file mode 100644 index 0000000..91d7300 --- /dev/null +++ b/DOCS/1.8.md @@ -0,0 +1,12 @@ +# Documentation on Welcome Message + +## Features in this Version: +> - Customisable: +> > Prefix, Message, ServerName, Whisper Or Broadcast + +## How To Install: +> 1. Download the Plugin Here +> 2. Put the Plugin in your Plugins Folder +> 3. Restart/Start/Stop & Start your Server +> 4. go to `plugin_data -> WelcomeMessage -> Config.yml` and Edit the values to how you like it +**Done** diff --git a/DOCS/1.9.md b/DOCS/1.9.md new file mode 100644 index 0000000..c82f963 --- /dev/null +++ b/DOCS/1.9.md @@ -0,0 +1,18 @@ +# Documentation on Welcome Message + +## Features in this Version: +> - Customisable: +> > Prefix, Message, ServerName Customisable In a Form + +## How To Install: +> 1. Download the Plugin Here +> 2. Put the Plugin in your Plugins Folder +> 3. Restart/Start/Stop & Start your Server +> 4. go to `plugin_data -> WelcomeMessage -> Config.yml` and Edit the values to how you like it +> +**Done** + +# Disclaimer +** if you have a previous version of this plugin you must delete the config in `plugin_data -> WelcomeMessage -> config.yml` and delete the prexesisting plugin phar file, then reinstall the plugin for it to work!** +** Required Dependencies:** +jojoe77777/FormAPI diff --git a/DOCS/index.md b/DOCS/index.md new file mode 100644 index 0000000..6c17cc4 --- /dev/null +++ b/DOCS/index.md @@ -0,0 +1,10 @@ +# Documentation for WelcomeMessage + +> Click Here For Documentation on V1.7
+> Click Here For Documentation on V1.8
+> Click Here For Documentation on V1.9
+ +# Current Versions In Development: +**V1.10** +introduction of rules tab + From cf181a14c586a7501cb19c33a8115b87949bd827 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 17 Jun 2023 10:09:51 +1000 Subject: [PATCH 55/84] Update index.md --- DOCS/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/DOCS/index.md b/DOCS/index.md index 6c17cc4..da6ee11 100644 --- a/DOCS/index.md +++ b/DOCS/index.md @@ -8,3 +8,4 @@ **V1.10** introduction of rules tab +# Development Has Been Paused From 328500a1bc306648285a2f00b27acb556d5472d6 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 17 Jun 2023 10:11:02 +1000 Subject: [PATCH 56/84] Pause 1.10 Development Paused for break --- src/skyss0fly/welcomemessage/Main.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 206164b..fe87ead 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -41,7 +41,6 @@ public function onPlayerJoin(PlayerJoinEvent $event) { $joinform->setTitle($formtitle); $joinform->setContent($formcontent); $joinform->addButton("§d§lSubmit!"); - $joinform->addButton($btn1); $player->sendForm($joinform); } From 8c74cabf3ce2206111e5a831b67f6e574325fefc Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 20 Jan 2024 12:22:06 +1000 Subject: [PATCH 57/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index fe87ead..691cb24 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -4,7 +4,7 @@ use pocketmine\plugin\PluginBase; use pocketmine\event\Listener; -use pocketmine\event\player\PlayerJoinEvent; +use pocketmine\event\player\{PlayerJoinEvent, PlayerLeaveEvent}; use skyss0fly\welcomemessage\Form\{Form, SimpleForm}; use pocketmine\player\Player; @@ -44,6 +44,25 @@ public function onPlayerJoin(PlayerJoinEvent $event) { $player->sendForm($joinform); } + public function onPlayerLeave(PlayerLeaveEvent $event) { + $player = $event->getPlayer(); + $msg = $this->getConfig()->get("LeaveMessage"); + $deactivate = $this->getConfig()->get("LeaveMessageEnabled"); + if ($deactivate == "false") { +if ($msg->str_contains("{player}")) { + + $leavemsg = str_replace("{player}" , $player->getName(), $msg); +} + $this->getServer()->broadcastMessage($leavemsg); + } + elseif ($deactivate == "true") { + # Nothing + } + else { +$this->getLogger()->error("An Error Has Occurred within the configuration of This Plugin, 'LeaveMessageEnabled has an invalid bool Value' To protect your server from corruption, this Plugin Will Disable itself "); + $this->getServer()->getPluginManager()->disable($this); + } +} } From cea17ed8beb4e9768d48c6453b65382570f6162a Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 20 Jan 2024 12:24:23 +1000 Subject: [PATCH 58/84] Update config.yml --- resources/config.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/resources/config.yml b/resources/config.yml index 8c17547..44c54d0 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -3,3 +3,10 @@ Form-Title: "Welcome!" Submit-Msg: "Submit" Form-Content: "Welcome" Btn1: "Rules" + +# Leave Message Values: +# {player} - gives player name + +LeaveMessage: "{player} Has left the server" + +LeaveMessageEnabled: true From a9759055618e35946e676bc13e1a62f7a7f22c53 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 20 Jan 2024 12:24:43 +1000 Subject: [PATCH 59/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 691cb24..f2c0081 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -48,7 +48,7 @@ public function onPlayerLeave(PlayerLeaveEvent $event) { $player = $event->getPlayer(); $msg = $this->getConfig()->get("LeaveMessage"); $deactivate = $this->getConfig()->get("LeaveMessageEnabled"); - if ($deactivate == "false") { + if ($deactivate == "true") { if ($msg->str_contains("{player}")) { $leavemsg = str_replace("{player}" , $player->getName(), $msg); @@ -56,7 +56,7 @@ public function onPlayerLeave(PlayerLeaveEvent $event) { $this->getServer()->broadcastMessage($leavemsg); } - elseif ($deactivate == "true") { + elseif ($deactivate == "false") { # Nothing } else { From d6e7e0130ce2c74675dbf4026ae7cdeea1eace25 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 20 Jan 2024 12:31:48 +1000 Subject: [PATCH 60/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index f2c0081..62590eb 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -4,7 +4,7 @@ use pocketmine\plugin\PluginBase; use pocketmine\event\Listener; -use pocketmine\event\player\{PlayerJoinEvent, PlayerLeaveEvent}; +use pocketmine\event\player\{PlayerJoinEvent, PlayerQuitEvent}; use skyss0fly\welcomemessage\Form\{Form, SimpleForm}; use pocketmine\player\Player; @@ -44,7 +44,7 @@ public function onPlayerJoin(PlayerJoinEvent $event) { $player->sendForm($joinform); } - public function onPlayerLeave(PlayerLeaveEvent $event) { + public function onPlayerLeave(PlayerQuitEvent $event) { $player = $event->getPlayer(); $msg = $this->getConfig()->get("LeaveMessage"); $deactivate = $this->getConfig()->get("LeaveMessageEnabled"); From 5207ccf6f297580eff41b8c82cfaa7d7a64e1026 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 20 Jan 2024 12:35:42 +1000 Subject: [PATCH 61/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 62590eb..8d0bd3f 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -61,7 +61,7 @@ public function onPlayerLeave(PlayerQuitEvent $event) { } else { $this->getLogger()->error("An Error Has Occurred within the configuration of This Plugin, 'LeaveMessageEnabled has an invalid bool Value' To protect your server from corruption, this Plugin Will Disable itself "); - $this->getServer()->getPluginManager()->disable($this); + $this->getServer()->getPluginManager()->disablePlugin($this); } } From dbe6bf97567f5b768e026fae1573b9822d7fdc6c Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 20 Jan 2024 12:47:32 +1000 Subject: [PATCH 62/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index 8d0bd3f..b7170eb 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -9,6 +9,9 @@ use pocketmine\player\Player; class Main extends PluginBase implements Listener { +public const leavemessage = ""; + private $leavemessage; + public function onEnable(): void { $this->saveDefaultConfig(); $this->getServer()->getPluginManager()->registerEvents($this, $this); From e869bcb34536d4b709b219c4a60600f31269e073 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 20 Jan 2024 12:49:45 +1000 Subject: [PATCH 63/84] Update Main.php --- src/skyss0fly/welcomemessage/Main.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/welcomemessage/Main.php index b7170eb..620ed27 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/welcomemessage/Main.php @@ -9,8 +9,7 @@ use pocketmine\player\Player; class Main extends PluginBase implements Listener { -public const leavemessage = ""; - private $leavemessage; + public function onEnable(): void { $this->saveDefaultConfig(); @@ -48,6 +47,7 @@ public function onPlayerJoin(PlayerJoinEvent $event) { } public function onPlayerLeave(PlayerQuitEvent $event) { + $leavemsg = ""; $player = $event->getPlayer(); $msg = $this->getConfig()->get("LeaveMessage"); $deactivate = $this->getConfig()->get("LeaveMessageEnabled"); From 09913e92d334c9209fc5aee646b6e5b43157deb5 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:14:51 +1000 Subject: [PATCH 64/84] Update config.yml --- resources/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/config.yml b/resources/config.yml index 44c54d0..580953c 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -4,6 +4,9 @@ Submit-Msg: "Submit" Form-Content: "Welcome" Btn1: "Rules" +UseFormInsteadOfChat: true +# set to false if you want to use chat instead of form as welcoming.. + # Leave Message Values: # {player} - gives player name From cf2d8129b082fe5ea0c52a62f75daead1317b086 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:24:13 +1000 Subject: [PATCH 65/84] Rename ClassName and Implement 1.10 features --- .../Main.php | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) rename src/skyss0fly/{welcomemessage => WelcomeMessage}/Main.php (72%) diff --git a/src/skyss0fly/welcomemessage/Main.php b/src/skyss0fly/WelcomeMessage/Main.php similarity index 72% rename from src/skyss0fly/welcomemessage/Main.php rename to src/skyss0fly/WelcomeMessage/Main.php index 620ed27..3872173 100644 --- a/src/skyss0fly/welcomemessage/Main.php +++ b/src/skyss0fly/WelcomeMessage/Main.php @@ -1,6 +1,6 @@ config() = $this->getServer()->getConfig(); $this->saveDefaultConfig(); $this->getServer()->getPluginManager()->registerEvents($this, $this); } - public function onPlayerJoin(PlayerJoinEvent $event) { $player = $event->getPlayer(); - - - + if ($config->get("UseFormInsteadOfChat") === true { $joinform = new SimpleForm(function (Player $player, $data){ $result = $data; - if ($result !== null) { - + if ($result !== null) { switch ($result) { - case 0: - + case 0: $submitmsg = $this->getConfig()->get("Submit-Msg"); - $player->sendMessage($submitmsg); - + $player->sendMessage($submitmsg); break; } } }); $formtitle = $this->getConfig()->get("Form-Title"); - $formcontent = $this->getConfig()->get("Form-Content"); - - + $formcontent = $this->getConfig()->get("Form-Content"); $joinform->setTitle($formtitle); $joinform->setContent($formcontent); $joinform->addButton("§d§lSubmit!"); $player->sendForm($joinform); } - +} else { + $rawmessage = $this->config()->get("JoinMessage"); + if ($rawmessage->str_contains("{player}")) { +$message = str_replace("{player}", $player, $rawmessage); +$this->getServer()->broadcastMessage($message) + } + else { +$message = $this->config()->get("JoinMessage"); +$this->getServer()->broadcastMessage($message); +} +} + public function onPlayerLeave(PlayerQuitEvent $event) { $leavemsg = ""; $player = $event->getPlayer(); From 1abe6d9d3d69f13e6192dbed52762593feb4c44a Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:25:08 +1000 Subject: [PATCH 66/84] Update Namespaces and File Names --- src/skyss0fly/{welcomemessage => WelcomMessage}/Form/Form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/skyss0fly/{welcomemessage => WelcomMessage}/Form/Form.php (96%) diff --git a/src/skyss0fly/welcomemessage/Form/Form.php b/src/skyss0fly/WelcomMessage/Form/Form.php similarity index 96% rename from src/skyss0fly/welcomemessage/Form/Form.php rename to src/skyss0fly/WelcomMessage/Form/Form.php index 7b4038a..0476b6d 100644 --- a/src/skyss0fly/welcomemessage/Form/Form.php +++ b/src/skyss0fly/WelcomMessage/Form/Form.php @@ -2,7 +2,7 @@ declare(strict_types = 1); -namespace skyss0fly\welcomemessage\Form; +namespace skyss0fly\WelcomeMessage\Form; use pocketmine\form\Form as IForm; use pocketmine\player\Player; From bb6ab341040a73b115f224ce4ec488a1ca122f59 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:25:41 +1000 Subject: [PATCH 67/84] Fix typo --- src/skyss0fly/{WelcomMessage => WelcomeMessage}/Form/Form.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/skyss0fly/{WelcomMessage => WelcomeMessage}/Form/Form.php (100%) diff --git a/src/skyss0fly/WelcomMessage/Form/Form.php b/src/skyss0fly/WelcomeMessage/Form/Form.php similarity index 100% rename from src/skyss0fly/WelcomMessage/Form/Form.php rename to src/skyss0fly/WelcomeMessage/Form/Form.php From 169a81b649b7e1a9e790a677a44b518e142c836f Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:26:34 +1000 Subject: [PATCH 68/84] Update Namespaces and File Names --- .../{welcomemessage => WelcomeMessage}/Form/SimpleForm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/skyss0fly/{welcomemessage => WelcomeMessage}/Form/SimpleForm.php (97%) diff --git a/src/skyss0fly/welcomemessage/Form/SimpleForm.php b/src/skyss0fly/WelcomeMessage/Form/SimpleForm.php similarity index 97% rename from src/skyss0fly/welcomemessage/Form/SimpleForm.php rename to src/skyss0fly/WelcomeMessage/Form/SimpleForm.php index c504e87..4b95250 100644 --- a/src/skyss0fly/welcomemessage/Form/SimpleForm.php +++ b/src/skyss0fly/WelcomeMessage/Form/SimpleForm.php @@ -2,7 +2,7 @@ declare(strict_types = 1); -namespace skyss0fly\welcomemessage\Form; +namespace skyss0fly\WelcomeMessage\Form; class SimpleForm extends Form { From adc0e3d8cc2d2afe56bf759de626792b32826599 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:27:58 +1000 Subject: [PATCH 69/84] Add Configuration --- resources/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/config.yml b/resources/config.yml index 580953c..dc6d1bb 100644 --- a/resources/config.yml +++ b/resources/config.yml @@ -7,6 +7,10 @@ Btn1: "Rules" UseFormInsteadOfChat: true # set to false if you want to use chat instead of form as welcoming.. +JoinMessage: "{player} Welcome to the Server" +# if the UseFormInsteadOfChat is false then this will show instead of form + + # Leave Message Values: # {player} - gives player name From ee28dc9223ada76d0d23f685a0d364837ed05fea Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:28:30 +1000 Subject: [PATCH 70/84] 1.11 is Next --- plugin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.yml b/plugin.yml index 206782d..14fcf71 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: WelcomeMessage -main: skyss0fly\welcomemessage\Main -version: 1.9 +main: skyss0fly\WelcomeMessage\Main +version: 1.10 api: 5.0.0 author: ["skyss0fly", "Inaayat"] description: A simple welcome message plugin thats customizable From a3f454c3a6e0845fdbf0213c5152ac0e10a0057d Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:29:00 +1000 Subject: [PATCH 71/84] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index e32b8d1..18452af 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # WelcomeMessage -## Note: V1.10 is having complications Updating, may be a while as i need to clean up my plugin and take a break for a bit. its stressful Simple on the fly customisable welcome message.

From ad8d30ed9ca52627babf3699b014bf680bb4c366 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:31:31 +1000 Subject: [PATCH 72/84] Create 1.10.md --- DOCS/1.10.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 DOCS/1.10.md diff --git a/DOCS/1.10.md b/DOCS/1.10.md new file mode 100644 index 0000000..84d78a5 --- /dev/null +++ b/DOCS/1.10.md @@ -0,0 +1,20 @@ +# Documentation on Welcome Message + +## Features in this Version: +> - Customisable Prefix, +> - Customisable Message, +> - Customisable ServerName Customisable In a Form, +> - The Ability to chose to have a leave message and if you want the welcome message in a form or chat + +## How To Install: +> 1. Download the Plugin Here +> 2. Put the Plugin in your Plugins Folder +> 3. Restart/Start/Stop & Start your Server +> 4. go to `plugin_data -> WelcomeMessage -> Config.yml` and Edit the values to how you like it +> +**Done** + +# Disclaimer +** if you have a previous version of this plugin you must delete the config in `plugin_data -> WelcomeMessage -> config.yml` and delete the prexesisting plugin phar file, then reinstall the plugin for it to work!** +** Required Dependencies:** +jojoe77777/FormAPI From 5e5fd17921900e37802d5e03eda4d5c93ecc8cec Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:35:30 +1000 Subject: [PATCH 73/84] Update Main.php --- src/skyss0fly/WelcomeMessage/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/WelcomeMessage/Main.php b/src/skyss0fly/WelcomeMessage/Main.php index 3872173..8df1310 100644 --- a/src/skyss0fly/WelcomeMessage/Main.php +++ b/src/skyss0fly/WelcomeMessage/Main.php @@ -10,7 +10,7 @@ class Main extends PluginBase implements Listener { - private $config: + private $config; public function onEnable(): void { $this->config() = $this->getServer()->getConfig(); From 2c59157ac047c761a2b9a59eb5c841e1c4903e1d Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:37:38 +1000 Subject: [PATCH 74/84] Update Main.php --- src/skyss0fly/WelcomeMessage/Main.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/skyss0fly/WelcomeMessage/Main.php b/src/skyss0fly/WelcomeMessage/Main.php index 8df1310..eb5f437 100644 --- a/src/skyss0fly/WelcomeMessage/Main.php +++ b/src/skyss0fly/WelcomeMessage/Main.php @@ -32,13 +32,13 @@ public function onPlayerJoin(PlayerJoinEvent $event) { } } }); + $formtitle = $this->getConfig()->get("Form-Title"); $formcontent = $this->getConfig()->get("Form-Content"); $joinform->setTitle($formtitle); $joinform->setContent($formcontent); $joinform->addButton("§d§lSubmit!"); - $player->sendForm($joinform); - } + $player->sendForm($joinform); } else { $rawmessage = $this->config()->get("JoinMessage"); if ($rawmessage->str_contains("{player}")) { From f47548c7587370c48c94f210eda67c313be3f327 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:38:29 +1000 Subject: [PATCH 75/84] Update Main.php --- src/skyss0fly/WelcomeMessage/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/WelcomeMessage/Main.php b/src/skyss0fly/WelcomeMessage/Main.php index eb5f437..2849055 100644 --- a/src/skyss0fly/WelcomeMessage/Main.php +++ b/src/skyss0fly/WelcomeMessage/Main.php @@ -5,7 +5,7 @@ use pocketmine\plugin\PluginBase; use pocketmine\event\Listener; use pocketmine\event\player\{PlayerJoinEvent, PlayerQuitEvent}; -use skyss0fly\welcomemessage\Form\{Form, SimpleForm}; +use skyss0fly\WelcomeMessage\Form\{Form, SimpleForm}; use pocketmine\player\Player; class Main extends PluginBase implements Listener { From e1b8c87ccd38d6441f9285224060d87bf3192909 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:39:57 +1000 Subject: [PATCH 76/84] Update Main.php --- src/skyss0fly/WelcomeMessage/Main.php | 96 +++++++++++---------------- 1 file changed, 40 insertions(+), 56 deletions(-) diff --git a/src/skyss0fly/WelcomeMessage/Main.php b/src/skyss0fly/WelcomeMessage/Main.php index 2849055..d96cb66 100644 --- a/src/skyss0fly/WelcomeMessage/Main.php +++ b/src/skyss0fly/WelcomeMessage/Main.php @@ -5,72 +5,56 @@ use pocketmine\plugin\PluginBase; use pocketmine\event\Listener; use pocketmine\event\player\{PlayerJoinEvent, PlayerQuitEvent}; -use skyss0fly\WelcomeMessage\Form\{Form, SimpleForm}; +use skyss0fly\welcomemessage\Form\{Form, SimpleForm}; use pocketmine\player\Player; class Main extends PluginBase implements Listener { - private $config; - public function onEnable(): void { - $this->config() = $this->getServer()->getConfig(); $this->saveDefaultConfig(); $this->getServer()->getPluginManager()->registerEvents($this, $this); } - - public function onPlayerJoin(PlayerJoinEvent $event) { - $player = $event->getPlayer(); - if ($config->get("UseFormInsteadOfChat") === true { - $joinform = new SimpleForm(function (Player $player, $data){ - $result = $data; - if ($result !== null) { - switch ($result) { - case 0: - $submitmsg = $this->getConfig()->get("Submit-Msg"); - $player->sendMessage($submitmsg); - break; - } - } - }); - - $formtitle = $this->getConfig()->get("Form-Title"); - $formcontent = $this->getConfig()->get("Form-Content"); - $joinform->setTitle($formtitle); - $joinform->setContent($formcontent); - $joinform->addButton("§d§lSubmit!"); - $player->sendForm($joinform); -} else { - $rawmessage = $this->config()->get("JoinMessage"); - if ($rawmessage->str_contains("{player}")) { -$message = str_replace("{player}", $player, $rawmessage); -$this->getServer()->broadcastMessage($message) - } - else { -$message = $this->config()->get("JoinMessage"); -$this->getServer()->broadcastMessage($message); -} -} - - public function onPlayerLeave(PlayerQuitEvent $event) { - $leavemsg = ""; - $player = $event->getPlayer(); - $msg = $this->getConfig()->get("LeaveMessage"); - $deactivate = $this->getConfig()->get("LeaveMessageEnabled"); - if ($deactivate == "true") { -if ($msg->str_contains("{player}")) { - $leavemsg = str_replace("{player}" , $player->getName(), $msg); -} + public function onPlayerJoin(PlayerJoinEvent $event): void { + $player = $event->getPlayer(); + $config = $this->getConfig(); - $this->getServer()->broadcastMessage($leavemsg); + if ($config->get("UseFormInsteadOfChat") === true) { + $joinForm = new SimpleForm(function (Player $player, $data) { + if ($data !== null) { + $submitMessage = $this->getConfig()->get("Submit-Msg"); + $player->sendMessage($submitMessage); + } + }); + + $formTitle = $config->get("Form-Title"); + $formContent = $config->get("Form-Content"); + + $joinForm->setTitle($formTitle); + $joinForm->setContent($formContent); + $joinForm->addButton("§d§lSubmit!"); + $player->sendForm($joinForm); + } else { + $rawMessage = $config->get("JoinMessage"); + $message = str_replace("{player}", $player->getName(), $rawMessage); + $this->getServer()->broadcastMessage($message); + } } - elseif ($deactivate == "false") { - # Nothing - } - else { -$this->getLogger()->error("An Error Has Occurred within the configuration of This Plugin, 'LeaveMessageEnabled has an invalid bool Value' To protect your server from corruption, this Plugin Will Disable itself "); - $this->getServer()->getPluginManager()->disablePlugin($this); - } -} + public function onPlayerLeave(PlayerQuitEvent $event): void { + $player = $event->getPlayer(); + $config = $this->getConfig(); + $leaveMessageEnabled = $config->get("LeaveMessageEnabled"); + + if ($leaveMessageEnabled === true) { + $rawMessage = $config->get("LeaveMessage"); + $message = str_replace("{player}", $player->getName(), $rawMessage); + $this->getServer()->broadcastMessage($message); + } elseif ($leaveMessageEnabled === false) { + // No action required + } else { + $this->getLogger()->error("Invalid value for 'LeaveMessageEnabled'. Disabling plugin to protect the server."); + $this->getServer()->getPluginManager()->disablePlugin($this); + } + } } From 3c37e708328c0f53bcdb4e31745c2462d7b7cca6 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:41:45 +1000 Subject: [PATCH 77/84] Update Main.php --- src/skyss0fly/WelcomeMessage/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skyss0fly/WelcomeMessage/Main.php b/src/skyss0fly/WelcomeMessage/Main.php index d96cb66..10f53fc 100644 --- a/src/skyss0fly/WelcomeMessage/Main.php +++ b/src/skyss0fly/WelcomeMessage/Main.php @@ -5,7 +5,7 @@ use pocketmine\plugin\PluginBase; use pocketmine\event\Listener; use pocketmine\event\player\{PlayerJoinEvent, PlayerQuitEvent}; -use skyss0fly\welcomemessage\Form\{Form, SimpleForm}; +use skyss0fly\WelcomeMessage\Form\{Form, SimpleForm}; use pocketmine\player\Player; class Main extends PluginBase implements Listener { From d63de5d72db0cd824bb41189880124895b3250b4 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:53:11 +1000 Subject: [PATCH 78/84] Bump Version for Poggit. 2.1 Next Update --- plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index 14fcf71..db94b69 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: WelcomeMessage main: skyss0fly\WelcomeMessage\Main -version: 1.10 +version: 2.0 api: 5.0.0 author: ["skyss0fly", "Inaayat"] description: A simple welcome message plugin thats customizable From a91ca391a4d057f96b3c0703bae41f0d2da4b424 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 20:04:01 +1000 Subject: [PATCH 79/84] Semantic Versioning. 2.2 is Next --- plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index db94b69..b8d41a3 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: WelcomeMessage main: skyss0fly\WelcomeMessage\Main -version: 2.0 +version: 2.1 api: 5.0.0 author: ["skyss0fly", "Inaayat"] description: A simple welcome message plugin thats customizable From b68f67f3f01cf6d6c61c52129b2cdf8ca1751673 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sun, 15 Dec 2024 20:04:39 +1000 Subject: [PATCH 80/84] Rename 1.10.md to 2.1.md --- DOCS/{1.10.md => 2.1.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename DOCS/{1.10.md => 2.1.md} (100%) diff --git a/DOCS/1.10.md b/DOCS/2.1.md similarity index 100% rename from DOCS/1.10.md rename to DOCS/2.1.md From 62e821847783ef41752567c43d4a50568de6a98e Mon Sep 17 00:00:00 2001 From: ZalgoDev Date: Fri, 27 Dec 2024 02:31:24 +0100 Subject: [PATCH 81/84] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 18452af..0faeea1 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ Simple on the fly customisable welcome message. - 5.X.X # thanks to the following for helping me construct this plugin: +- ZalgoDev - SOFe - Inaayat - RuzBenzy (kinda, just gave like 1 suggestion) From 9f31e159a44e7d03aaf70e07d547ed40c9a7d9b8 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Fri, 28 Feb 2025 12:02:24 +1000 Subject: [PATCH 82/84] Update index.md --- DOCS/index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DOCS/index.md b/DOCS/index.md index da6ee11..d0e716b 100644 --- a/DOCS/index.md +++ b/DOCS/index.md @@ -3,9 +3,10 @@ > Click Here For Documentation on V1.7
> Click Here For Documentation on V1.8
> Click Here For Documentation on V1.9
+ Click Here For Documentation on V1.21
# Current Versions In Development: **V1.10** introduction of rules tab -# Development Has Been Paused +# Development Has Been slowed due to me no longer having as much time to develop. From 6fabefee1068a4dd3c5ecec2c414be5dfe51d155 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Fri, 28 Feb 2025 12:02:55 +1000 Subject: [PATCH 83/84] Update index.md --- DOCS/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCS/index.md b/DOCS/index.md index d0e716b..8cb9351 100644 --- a/DOCS/index.md +++ b/DOCS/index.md @@ -6,7 +6,7 @@ Click Here For Documentation on V1.21
# Current Versions In Development: -**V1.10** +**V1.22** introduction of rules tab # Development Has Been slowed due to me no longer having as much time to develop. From 90f94d956e6e4e9faec3d1b70860775be7e26914 Mon Sep 17 00:00:00 2001 From: skyss0fly <100278495+skyss0fly@users.noreply.github.com> Date: Sat, 18 Oct 2025 11:39:29 +1000 Subject: [PATCH 84/84] Bump version to 2.2 and API to 6.0.0 Updated version and API compatibility in plugin.yml --- plugin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.yml b/plugin.yml index b8d41a3..8b7e564 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: WelcomeMessage main: skyss0fly\WelcomeMessage\Main -version: 2.1 -api: 5.0.0 +version: 2.2 +api: 6.0.0 author: ["skyss0fly", "Inaayat"] description: A simple welcome message plugin thats customizable