Merge pull request #21 from JaxkDev/1.4.1

Release 1.4.1

.poggit.yml

@@ -1,4 +1,4 @@
---- # Poggit-CI Manifest. Open the CI at https://poggit.pmmp.io/ci/Jackthehaxk21/MCPE_DISCORD
+---
 branches:
 - master
 projects:

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/jackthehack21/MCPEToDiscord.svg?branch=master)](https://travis-ci.org/jackthehack21/MCPEToDiscord) [![HitCount](http://hits.dwyl.io/Jackthehack21/MCPEToDiscord.svg)](http://hits.dwyl.io/Jackthehack21/MCPEToDiscord)
+[![Build Status](https://travis-ci.org/JaxkDev/MCPEToDiscord.svg?branch=master)](https://travis-ci.org/JaxkDev/MCPEToDiscord) [![HitCount](http://hits.dwyl.io/JaxkDev/MCPEToDiscord.svg)](http://hits.dwyl.io/JaxkDev/MCPEToDiscord)
 
 <a href="https://tiny.cc/JaxksDC"><img src="https://discordapp.com/api/guilds/554059221847638040/embed.png" alt="Discord server"/></a>
 
@@ -11,16 +11,10 @@
 
 - NiekertDev (Async Tasks) (https://github.com/NiekertDev)
 
-## Whats new in 1.4
+## Whats new in 1.4.1
 
-- Traditional and simplified chinise support split into two files
-- Added PurePerms Support to add the {group} variable
-- Added FactionsPro Support to add the {faction} and {fac_rank} variables
-
-We smashed 4 Bugs:
-- No more 'send' being sent with message
-- Removed the odd true & false bug
-- Smashed back end glitches
+- No more pings for you mister...
+- Banned words list now in config.
 
 ### Known Bugs:
 - No known Bugs at the current time of writing this.

plugin.yml

@@ -1,10 +1,8 @@
 ---
 name: MCPEToDiscord
-author: Jackthehaxk21
-version: 1.4
-api:
-- 3.0.0
-- 3.1.1
+author: JaxkDev
+version: 1.4.1
+api: 3.0.0
 main: Jack\DiscordMCPE\Main
 
 commands:

resources/config.yml

@@ -9,6 +9,10 @@ discord: true
 pureperms: false
 factions: false
 
+banned_list:
+- '@here'
+- '@everyone'
+
 webhook_url: ""
 webhook_name: "MCPE Webhook"
 webhook_playerChat?: true

src/Jack/DiscordMCPE/Main.php

@@ -1,19 +1,5 @@
 <?php
 
-# +-------------------------------------------------+
-# |            MCPEToDiscord - VER 1.4              |
-# |-------------------------------------------------|
-# |                                                 |
-# | Made by : Jackthehack21 ([email protected])  |
-# |                                                 |
-# | Version : 1.4                                   |
-# |                                                 |
-# | Details : This plugin is aimed to give players  |
-# |           A simple but fun view of what plugins |
-# |           Can do to modify your MCPE experience.|
-# |                                                 |
-# +-------------------------------------------------+
-
 namespace Jack\DiscordMCPE;
 
 use pocketmine\plugin\PluginBase;
@@ -32,12 +18,7 @@
 class Main extends PluginBase implements Listener{
 
 	public function onEnable(){
-        if (!is_dir($this->getDataFolder())) {
-            @mkdir($this->getDataFolder());
-            //Use default, not PM.
-        }
-		$this->build = "187A";
-		$this->version = "1.4";
+		$this->version = "1.4.1";
         $this->saveResource("config.yml");
         $this->saveResource("help.txt");
         $this->cfg = new Config($this->getDataFolder()."config.yml", Config::YAML, []);
@@ -130,14 +111,12 @@ public function onCommand(CommandSender $sender, Command $cmd, string $label, ar
 				if($this->cfg->get('debug')){
 					$this->getLogger()->info(C::GOLD."=== DETAILS ===");
 					$this->getLogger()->info(C::GREEN."Name     ".C::GOLD.":: ".C::AQUA."MCPEToDiscord");
-					$this->getLogger()->info(C::GREEN."Build    ".C::GOLD.":: ".C::AQUA.$this->build);
 					$this->getLogger()->info(C::GREEN."Version  ".C::GOLD.":: ".C::AQUA.$this->version);
-					$this->getLogger()->info(C::GREEN."Release  ".C::GOLD.":: ".C::AQUA."Public Release - ".$this->build);
 					$this->getLogger()->info(C::GOLD.$this->responses->get('info_note'));
 					$sender->sendMessage(C::GOLD.$this->responses->get('debug_info_response'));
 					break;
 				} else {
-					$sender->sendMessage("Build - ".$this->build);
+					$sender->sendMessage("Versoon - ".$this->version);
 					break;
 				}
 				break;
@@ -215,7 +194,7 @@ public function onCommand(CommandSender $sender, Command $cmd, string $label, ar
                 break;
 
             case 'credits':
-                $sender->sendMessage(C::GOLD.'— Credits —\n'.C::AQUA."NiekertDev (AsyncTasks)\n".C::GREEN."View his plugin on github and poggit !");
+                $sender->sendMessage(C::GOLD.'— Credits —\n'.C::AQUA."NiekertDev (AsyncTasks)\n".C::GREEN."View his plugin on github");
                 break;
 
             default:
@@ -376,13 +355,23 @@ public function sendMessage(string $player = "nolog", string $msg){
         }
         $name = $this->cfg->get("webhook_name");
         $webhook = $this->cfg->get("webhook_url");
+		$cleanMsg = $this->cleanMessage($msg);
         $curlopts = [
-	    "content" => $msg,
+	    	"content" => $cleanMsg,
             "username" => $name
         ];
 
+        if($cleanMsg === ""){
+            $this->getLogger()->warning(C::RED."Warning: Empty message cannot be sent to discord.");
+            return;
+        }
+
         $this->getServer()->getAsyncPool()->submitTask(new tasks\SendAsync($player, $webhook, serialize($curlopts)));
-	# OLD $this->getServer()->getScheduler()->scheduleAsyncTask(new tasks\SendAsync($player, $webhook, serialize($curlopts)));
-	return true;
+		return;
     }
+
+	public function cleanMessage(string $msg) : string{
+		$banned = $this->cfg->get("banned_list", []);
+		return str_replace($banned,'',$msg); 
+	}
 }