New version 1.0.1: minor fixes on DELETE

PEMapModder · Oct 5, 2014 · e33752a · e33752a
1 parent 1ea8d4b
commit e33752a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/NailedKeyboard/bin/NailedKeyboard_dev_build.phar b/NailedKeyboard/bin/NailedKeyboard_dev_build.phar
diff --git a/NailedKeyboard/bin/ignoreme/compile.php b/NailedKeyboard/bin/ignoreme/compile.php
@@ -34,8 +34,8 @@
 	$v = "0".$v;
 }
 $ymlData["version"] = substr($version, 0, -3).$v;
-echo "New version! ".$ymlData["version"];
-yaml_emit_file($plugin_yml, $ymlData);
+//echo "New version! ".$ymlData["version"]."\n";
+//yaml_emit_file($plugin_yml, $ymlData);
 exec("git add $plugin_yml");
 $folderPath = rtrim(str_replace("\\", "/", realpath($opts["make"])), "/") . "/";
 $relativePath = isset($opts["relative"]) ? rtrim(str_replace("\\", "/", realpath($opts["relative"])), "/") . "/" : $folderPath;

diff --git a/NailedKeyboard/plugin.yml b/NailedKeyboard/plugin.yml
@@ -1,6 +1,6 @@
 ---
 name: NailedKeyboard
-version: 1.0.0_dev_build_005
+version: 1.0.1
 api:
 - 1.0.0
 main: pemapmodder\nailedkeyboard\NailedKeyboard

diff --git a/NailedKeyboard/src/pemapmodder/nailedkeyboard/Line.php b/NailedKeyboard/src/pemapmodder/nailedkeyboard/Line.php
@@ -33,8 +33,12 @@ public function backspace(){
 		$this->pointer--;
 	}
 	public function delete(){
-		$this->pointer++;
-		$this->backspace();
+		if($this->pointer === self::strlen($this->text)){
+			throw new \OutOfBoundsException;
+		}
+		$left = $this->getLeftText();
+		$right = self::substr($this->getRightText(), 1);
+		$this->text = $left . $right;
 	}
 	public function input($input){
 		$left = self::substr($this->text, 0, $this->pointer);

diff --git a/NailedKeyboard/src/pemapmodder/nailedkeyboard/NailedKeyboard.php b/NailedKeyboard/src/pemapmodder/nailedkeyboard/NailedKeyboard.php
@@ -2,7 +2,6 @@
 
 namespace pemapmodder\nailedkeyboard;
 
-use pemapmodder\cmdsel\event\PlayerCommandPreprocessEvent_sub;
 use pocketmine\block\SignPost;
 use pocketmine\event\Listener;
 use pocketmine\event\player\PlayerChatEvent;
@@ -81,12 +80,18 @@ private function handleSignTouch(Player $player, array $texts){
 					return "Nothing to delete at the right side!";
 				}
 				break;
+			case "HOME":
+				$line->home();
+				break;
+			case "END":
+				$line->end();
+				break;
 			case "SUBMIT":
 			case "ENTER":
 			case "SEND":
 				$text = $line->getText();
 				$line->reset();
-				$this->getServer()->getPluginManager()->callEvent($ev = new PlayerCommandPreprocessEvent_sub($player, $text));
+				$this->getServer()->getPluginManager()->callEvent($ev = new PlayerCommandPreprocessEvent_sub($player, $text, $this));
 				if($ev->isCancelled()){
 					return "";
 				}