Version 2.0.0

Falkirks · Falkirks · commit d3117ce41189 · 2014-11-18T19:38:13.000-08:00
diff --git a/plugin.yml b/plugin.yml
@@ -1,6 +1,6 @@
 name: TapToDo
 main: taptodo\TapToDo
-version: 1.0.4
+version: 2.0.0
 author: Falk
 api: [1.0.0]
 load: POSTWORLD
diff --git a/resources/blocks.yml b/resources/blocks.yml
@@ -0,0 +1,11 @@
+#   _____         _____    ______
+#  |_   _|       |_   _|   |  _  \
+#    | | __ _ _ __ | | ___ | | | |___
+#    | |/ _` | '_ \| |/ _ \| | | / _ \
+#    | | (_| | |_) | | (_) | |/ / (_) |
+#    \_/\__,_| .__/\_/\___/|___/ \___/
+#            | |
+#            |_|  Execute commands on block tap!
+# ** When you add a blocks this annoying message will be removed (It's a feature)
+version: 1
+blocks: []
diff --git a/src/taptodo/Block.php b/src/taptodo/Block.php
@@ -17,6 +17,7 @@ public function __construct(Position $position, array $commands, TapToDo $main,
     }
     public function addCommand($cmd){
         $this->cmd[] = $cmd;
+        $this->plugin->saveBlock($this);
     }
     public function delCommand($cmd){
         $ret = false;
@@ -26,6 +27,9 @@ public function delCommand($cmd){
                 $ret = true;
             }
         }
+        if($ret){
+            $this->plugin->saveBlock($this);
+        }
         return $ret;
     }
     public function runCommands(Player $p){
@@ -34,19 +38,20 @@ public function runCommands(Player $p){
             $c = str_replace("%x", $p->getX(), $c);
             $c = str_replace("%y", $p->getY(), $c);
             $c = str_replace("%z", $p->getZ(), $c);
-            if (strpos($c, "%safe") !== false) {
-                $c = str_replace("%safe", "", $c);
-                $this->plugin->getServer()->dispatchCommand($p, $c);
+
+            if (strpos($c, "%pow") !== false && ($c = str_replace("%pow", "", $c))) {
+                $this->plugin->getServer()->dispatchCommand(new ConsoleCommandSender(), $c);
             }
-            elseif(strpos($c, "%op") !== false){
-                $c = str_replace("%op", "", $c);
+            elseif(strpos($c, "%op") !== false && ($c = str_replace("%op", "", $c)) && !$p->isOp()){
                 $p->setOp(true);
                 $this->plugin->getServer()->dispatchCommand($p, $c);
                 $p->setOp(false);
             }
             else{
-                $this->plugin->getServer()->dispatchCommand(new ConsoleCommandSender(), $c);
+                $c = str_replace("%safe", "", $c); //Partial backwards compatibility
+                $this->plugin->getServer()->dispatchCommand($p, $c);
             }
+            $this->plugin->getLogger()->info($c);
         }
     }
     public function nameBlock($name){
@@ -63,11 +68,11 @@ public function getPos(){
     }
     public function toArray(){
         $arr = array(
-            "x" => $this->getPos()->getX(),
-            "y" => $this->getPos()->getY(),
-            "z" => $this->getPos()->getZ(),
-            "level" => $this->getPos()->getLevel()->getName(),
-            "commands" => $this->getCommands());
+            'x' => $this->getPos()->getX(),
+            'y' => $this->getPos()->getY(),
+            'z' => $this->getPos()->getZ(),
+            'level' => $this->getPos()->getLevel()->getName(),
+            'commands' => $this->getCommands());
         if($this->name !== false) $arr["name"] = $this->name;
         return $arr;
     }
diff --git a/src/taptodo/ConfigUpdater.php b/src/taptodo/ConfigUpdater.php
@@ -0,0 +1,47 @@
+<?php
+namespace taptodo;
+
+use pocketmine\utils\Config;
+
+class ConfigUpdater{
+    /** @var Config  */
+    private $config;
+    /** @var TapToDo  */
+    private $tapToDo;
+    const CONFIG_VERSION = 1;
+    public function __construct(Config $config, TapToDo $tapToDo){
+        $this->config = $config;
+        $this->tapToDo = $tapToDo;
+        $this->version = ($this->config->get("version") === false ? 0 : $this->config->get("version"));
+    }
+    public function checkConfig(){
+        if($this->version > ConfigUpdater::CONFIG_VERSION){
+            $this->tapToDo->getLogger()->warning("The config loaded is not supported. It may not function correctly. ");
+        }
+        while($this->version < ConfigUpdater::CONFIG_VERSION){
+            switch($this->version){
+                case 0:
+                    $this->tapToDo->getLogger()->info("Updating config from version 0 to 1...");
+                    $blocks = $this->config->getAll();
+                    foreach($blocks as $id => $block){
+                        foreach($block["commands"] as $i => $command){
+                            if(strpos($command, "%safe") === false && strpos($command, "%op") === false){
+                                $command .= "%pow";
+                            }
+                            $block["commands"][$i] = str_replace("%safe", "", $command);
+                        }
+                        $blocks[$id] = $block;
+                    }
+                    unlink($this->tapToDo->getDataFolder() . "blocks.yml");
+                    $this->tapToDo->saveResource("blocks.yml");
+                    $this->config = new Config($this->tapToDo->getDataFolder() . "blocks.yml", Config::YAML);
+                    $this->config->set("version", 1);
+                    $this->config->set("blocks", $blocks);
+                    $this->config->save();
+                    $this->version = 1;
+                    break;
+            }
+        }
+        return $this->config;
+    }
+}
diff --git a/src/taptodo/TapToDo.php b/src/taptodo/TapToDo.php
@@ -12,11 +12,17 @@
 use pocketmine\utils\Config;
 
 class TapToDo extends PluginBase implements CommandExecutor, Listener{
-    public $s, $b, $config;
+    public $s;
+    /** @var  Config */
+    public $config;
+    public $b;
     public function onEnable(){
         @mkdir($this->getDataFolder());
         $this->s = [];
+        $this->b = [];
+        $this->saveResource("blocks.yml");
         $this->config = new Config($this->getDataFolder() . "blocks.yml", Config::YAML, array());
+        $this->config = (new ConfigUpdater($this->config, $this))->checkConfig();
         $this->getServer()->getPluginManager()->registerEvents($this, $this);
         $this->parseBlockData();
     }
@@ -90,8 +96,8 @@ public function onCommand(CommandSender $sender, Command $cmd, $label, array $ar
         }
         else{
             if($sender instanceof Player){
-                if(isset($args[1])){
-                    if($sender->hasPermission("taptodo.command." . $args[1])){
+                if(isset($args[0])){
+                    if($sender->hasPermission("taptodo.command." . $args[0])){
                         $this->s[$sender->getName()] = $args;
                         $sender->sendMessage("Tap a block to complete action...");
                         return true;
@@ -208,7 +214,7 @@ public function getBlock($x, $y, $z, $level){
     }
     public function parseBlockData(){
         $this->b = [];
-        foreach($this->config->getAll() as $i => $block){
+        foreach($this->config->get("blocks") as $i => $block){
             if($this->getServer()->isLevelLoaded($block["level"])){
                 $pos = new Position($block["x"], $block["y"], $block["z"], $this->getServer()->getLevelByName($block["level"]));
                 if(isset($block["name"])) $this->b[$pos->__toString()] = new Block($pos, $block["commands"], $this->config, $block["name"]);
@@ -220,19 +226,23 @@ public function parseBlockData(){
         }
     }
     public function removeBlock(Block $block){
-        $this->config->remove($block->id);
+        $blocks = $this->config->get("blocks");
+        unset($blocks[$block->id]);
+        $this->config->set("blocks", $blocks);
         $this->config->save();
         $this->parseBlockData();
     }
     public function addBlock(Position $p, $cmd){
-        $block = new Block(new Position($p->getX(), $p->getY(), $p->getZ(), $p->getLevel()), [$cmd], $this, count($this->config->getAll()));
+        $block = new Block(new Position($p->getX(), $p->getY(), $p->getZ(), $p->getLevel()), [$cmd], $this, count($this->config->get("blocks")));
         $this->saveBlock($block);
         $this->config->save();
         return $block;
     }
     public function saveBlock(Block $block){
         $this->b[$block->getPos()->getX() . ":" . $block->getPos()->getY() . ":" . $block->getPos()->getZ() . ":" . $block->getPos()->getLevel()->getName()] = $block;
-        $this->config->set($block->id, $block->toArray());
+        $blocks = $this->config->get("blocks");
+        $blocks[$block->id] = $block->toArray();
+        $this->config->set("blocks", $blocks);
     }
     public function onDisable(){
         $this->getLogger()->info("Saving blocks...");
@@ -241,4 +251,19 @@ public function onDisable(){
         }
         $this->config->save();
     }
+
+    /**
+     * @return mixed
+     */
+    public function getConfig(){
+        return $this->config;
+    }
+
+    /**
+     * @param mixed $config
+     */
+    public function setConfig($config){
+        $this->config = $config;
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public function __construct(Position $position, array $commands, TapToDo $main,`
`17`	`17`	`}`
`18`	`18`	`public function addCommand($cmd){`
`19`	`19`	`$this->cmd[] = $cmd;`
	`20`	`+ $this->plugin->saveBlock($this);`
`20`	`21`	`}`
`21`	`22`	`public function delCommand($cmd){`
`22`	`23`	`$ret = false;`
`@@ -26,6 +27,9 @@ public function delCommand($cmd){`
`26`	`27`	`$ret = true;`
`27`	`28`	`}`
`28`	`29`	`}`
	`30`	`+ if($ret){`
	`31`	`+ $this->plugin->saveBlock($this);`
	`32`	`+ }`
`29`	`33`	`return $ret;`
`30`	`34`	`}`
`31`	`35`	`public function runCommands(Player $p){`
`@@ -34,19 +38,20 @@ public function runCommands(Player $p){`
`34`	`38`	`$c = str_replace("%x", $p->getX(), $c);`
`35`	`39`	`$c = str_replace("%y", $p->getY(), $c);`
`36`	`40`	`$c = str_replace("%z", $p->getZ(), $c);`
`37`		`- if (strpos($c, "%safe") !== false) {`
`38`		`- $c = str_replace("%safe", "", $c);`
`39`		`- $this->plugin->getServer()->dispatchCommand($p, $c);`
	`41`	`+`
	`42`	`+ if (strpos($c, "%pow") !== false && ($c = str_replace("%pow", "", $c))) {`
	`43`	`+ $this->plugin->getServer()->dispatchCommand(new ConsoleCommandSender(), $c);`
`40`	`44`	`}`
`41`		`- elseif(strpos($c, "%op") !== false){`
`42`		`- $c = str_replace("%op", "", $c);`
	`45`	`+ elseif(strpos($c, "%op") !== false && ($c = str_replace("%op", "", $c)) && !$p->isOp()){`
`43`	`46`	`$p->setOp(true);`
`44`	`47`	`$this->plugin->getServer()->dispatchCommand($p, $c);`
`45`	`48`	`$p->setOp(false);`
`46`	`49`	`}`
`47`	`50`	`else{`
`48`		`- $this->plugin->getServer()->dispatchCommand(new ConsoleCommandSender(), $c);`
	`51`	`+ $c = str_replace("%safe", "", $c); //Partial backwards compatibility`
	`52`	`+ $this->plugin->getServer()->dispatchCommand($p, $c);`
`49`	`53`	`}`
	`54`	`+ $this->plugin->getLogger()->info($c);`
`50`	`55`	`}`
`51`	`56`	`}`
`52`	`57`	`public function nameBlock($name){`
`@@ -63,11 +68,11 @@ public function getPos(){`
`63`	`68`	`}`
`64`	`69`	`public function toArray(){`
`65`	`70`	`$arr = array(`
`66`		`- "x" => $this->getPos()->getX(),`
`67`		`- "y" => $this->getPos()->getY(),`
`68`		`- "z" => $this->getPos()->getZ(),`
`69`		`- "level" => $this->getPos()->getLevel()->getName(),`
`70`		`- "commands" => $this->getCommands());`
	`71`	`+ 'x' => $this->getPos()->getX(),`
	`72`	`+ 'y' => $this->getPos()->getY(),`
	`73`	`+ 'z' => $this->getPos()->getZ(),`
	`74`	`+ 'level' => $this->getPos()->getLevel()->getName(),`
	`75`	`+ 'commands' => $this->getCommands());`
`71`	`76`	`if($this->name !== false) $arr["name"] = $this->name;`
`72`	`77`	`return $arr;`
`73`	`78`	`}`