From 53c4e643feee851e0221104d67350b3f0335ff6b Mon Sep 17 00:00:00 2001 From: supercrafter333 Date: Sat, 17 Apr 2021 18:26:54 +0200 Subject: [PATCH] Initial commit --- .github/ISSUE_TEMPLATE/bug_report.md | 28 +++ .github/ISSUE_TEMPLATE/feature_request.md | 20 ++ LICENSE | 201 ++++++++++++++++++ README.md | 38 ++++ plugin.yml | 5 + resources/config.yml | 12 ++ src/supercrafter333/BetterBan/BetterBan.php | 100 +++++++++ .../BetterBan/Commands/BanCommand.php | 87 ++++++++ 8 files changed, 491 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 LICENSE create mode 100644 README.md create mode 100644 plugin.yml create mode 100644 resources/config.yml create mode 100644 src/supercrafter333/BetterBan/BetterBan.php create mode 100644 src/supercrafter333/BetterBan/Commands/BanCommand.php diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..698b416 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,28 @@ +--- +name: Bug report +about: Create a report to help us improve +title: "[BUG:] Description..." +labels: bug +assignees: '' + +--- + +# Bug: [Bug Name] + +### Informations +PTimeUI Version: [1.0.1] +Server-OS: [Linux Ubuntu 20.04] +PHP Version: [8.0.2] +PocketMine-MP Version: [3.17.5] + +### Error +[Console Error:] + +### readjustment instructions +[I've done...] +[1. ...] +[2. ...] +[3. ...] + +### fix suggestions [optional] +[Your suggestion] diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..944b474 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: "[Suggestion:] NAME" +labels: suggestion +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..35ca107 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2021 Christoph Regensburger - supercrafter333 + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md new file mode 100644 index 0000000..e75e2ea --- /dev/null +++ b/README.md @@ -0,0 +1,38 @@ +# BetterBan - V1.0.0 + +**Would you like to ban players for a certain period of time? Then BetterBan is just right for you! Easily ban players for a certain time and configure a bit in `config.yml`.** + +I would be very happy if you leave a star for this project. + +### Features +- Ban players easy per time +- configure something in the `config.yml` +- Easy2Use + +### TODOs +None + +### Bugs - none +You've found a Bug? +- Go to [Issues](https://github.com/supercrafter333/BetterBan/issues) +- Click on [New Issue](https://github.com/supercrafter333/BetterBan/issues/new/choose) +- Write your bug with all Informations that you have down +- Send Issue +- Wait, I where answer you + +### Commands +|**Command**|**Description**| +|-----------|---------------| +|`/ban`|Ban a player (this overrides the PMMP Ban commmand)| + +### License: +This Pluginis licensed under the [Apache License 2.0](/LICENSE)! Plugin by supercrafter333! + +### Credits +Owner: supercrafter333 + +Helper: --- + +Icon: --- + +Discord-Tag: `supercrafter333#4062` diff --git a/plugin.yml b/plugin.yml new file mode 100644 index 0000000..0aa9e0c --- /dev/null +++ b/plugin.yml @@ -0,0 +1,5 @@ +name: BetterBan +version: 1.0.0 +api: 3.0.0 +main: supercrafter333\BetterBan\BetterBan +author: supercrfafter333 \ No newline at end of file diff --git a/resources/config.yml b/resources/config.yml new file mode 100644 index 0000000..bb4da71 --- /dev/null +++ b/resources/config.yml @@ -0,0 +1,12 @@ +# BetterBan© by supercrafter333 +# Ban better, with BetterBan© + +# Configuration + +# Messages +kick-message: "Banned by admin." +kick-message-with-reason: "Banned by admin. Reason: {reason}" +kick-message-with-time: "Banned by admin. {line} Reason: {reason} {line} Ends at: {time}" + +# Error messages +use-DateInterval-format: "§4Please use the the right format!§4 For example: §81d" \ No newline at end of file diff --git a/src/supercrafter333/BetterBan/BetterBan.php b/src/supercrafter333/BetterBan/BetterBan.php new file mode 100644 index 0000000..29a670d --- /dev/null +++ b/src/supercrafter333/BetterBan/BetterBan.php @@ -0,0 +1,100 @@ +saveResource("config.yml"); + $cmdMap = $this->getServer()->getCommandMap(); + $pmmpBanCmd = $cmdMap->getCommand("ban"); + $cmdMap->unregister($pmmpBanCmd); + $cmdMap->register("BetterBan", new BanCommand("ban")); + } + + /** + * @return static + */ + public static function getInstance(): self + { + return self::$instance; + } + + /** + * @return Config + */ + public function getConfig(): Config + { + $cfg = new Config($this->getDataFolder() . "config.yml", Config::YAML); + return $cfg; + } + + /** + * @param string $string + * @return array|null + * @throws \Exception + */ + public function stringToTimestamp(string $string): ?array{ + /** + * Rules: + * Integers without suffix are considered as seconds + * "s" is for seconds + * "m" is for minutes + * "h" is for hours + * "d" is for days + * "w" is for weeks + * "mo" is for months + * "y" is for years + */ + if(trim($string) === ""){ + return null; + } + $t = new \DateTime(); + preg_match_all("/[0-9]+(y|mo|w|d|h|m|s)|[0-9]+/", $string, $found); + if(count($found[0]) < 1){ + return null; + } + $found[2] = preg_replace("/[^0-9]/", "", $found[0]); + foreach($found[2] as $k => $i){ + switch($c = $found[1][$k]){ + case "y": + case "w": + case "d": + $t->add(new \DateInterval("P" . $i. strtoupper($c))); + break; + case "mo": + $t->add(new \DateInterval("P" . $i. strtoupper(substr($c, 0, strlen($c) -1)))); + break; + case "h": + case "m": + case "s": + $t->add(new \DateInterval("PT" . $i . strtoupper($c))); + break; + default: + $t->add(new \DateInterval("PT" . $i . "S")); + break; + } + $string = str_replace($found[0][$k], "", $string); + } + return [$t, ltrim(str_replace($found[0], "", $string))]; + } +} \ No newline at end of file diff --git a/src/supercrafter333/BetterBan/Commands/BanCommand.php b/src/supercrafter333/BetterBan/Commands/BanCommand.php new file mode 100644 index 0000000..b6d20b3 --- /dev/null +++ b/src/supercrafter333/BetterBan/Commands/BanCommand.php @@ -0,0 +1,87 @@ + [reason: ...] [date interval: ...]"); + $this->setPermission("pocketmine.command.ban.player"); + } + + /** + * @param CommandSender $sender + * @param string $commandLabel + * @param array $args + * @return bool + */ + public function execute(CommandSender $sender, string $commandLabel, array $args): bool + { + $pl = BetterBan::getInstance(); + $cfg = $pl->getConfig(); + if (!$this->testPermission($sender)) { + return true; + } + + if (count($args) < 1) { + throw new InvalidCommandSyntaxException(); + } + + if (count($args) <= 2) { + $name = array_shift($args); + $reason = isset($args[0]) ? $args[0] : ""; + + $sender->getServer()->getNameBans()->addBan($name, $reason, null, $sender->getName()); + if (($player = $sender->getServer()->getPlayerExact($name)) instanceof Player) { + $player->kick($reason !== "" ? str_replace(["{reason}", "{line}"], [$args[0], "\n"], $cfg->get("kick-message-with-reason")) . $reason : $cfg->get("kick-message")); + Command::broadcastCommandMessage($sender, new TranslationContainer("%commands.ban.success", [$player !== null ? $player->getName() : $name])); + $sender->sendMessage("Banned!"); + } + } elseif (count($args) >= 3) { + $name = array_shift($args); + $reason = isset($args[0]) ? $args[0] : ""; + + if (!$pl->stringToTimestamp(implode(" ", $args))) { + $sender->sendMessage($cfg->get("use-DateInterval-format")); + return true; + } + + $informations = $pl->stringToTimestamp(implode(" ", $args)); + $bantime = $informations[0]; + $reason = $informations[1]; + //if ($args[1] instanceof DateInterval) { + $sender->getServer()->getNameBans()->addBan($name, $reason, $bantime, $sender->getName()); + if (($player = $sender->getServer()->getPlayerExact($name)) instanceof Player) { + $player->kick($reason !== "" ? str_replace(["{reason}", "{time}", "{line}"], [$args[0], $bantime->format("Y.m.d H:i:s"), "\n"], $cfg->get("kick-message-with-time")) . $reason : $cfg->get("kick-message")); + Command::broadcastCommandMessage($sender, new TranslationContainer("%commands.ban.success", [$player !== null ? $player->getName() : $name])); + $sender->sendMessage("[Time] Banned!"); + } + } else { + $sender->sendMessage($this->usageMessage); + } + return true; + } +} \ No newline at end of file