diff --git a/src/PocketMine/ChatAPI.php b/src/PocketMine/ChatAPI.php deleted file mode 100644 index 41f6405c9..000000000 --- a/src/PocketMine/ChatAPI.php +++ /dev/null @@ -1,91 +0,0 @@ -server = Server::getInstance(); - } - - public function init(){ - $this->server->api->console->register("me", "", array($this, "commandHandler")); - $this->server->api->console->register("say", "", array($this, "commandHandler")); - $this->server->api->ban->cmdWhitelist("me"); - } - - /** - * @param string $cmd - * @param array $params - * @param string $issuer - * @param string $alias - * - * @return string - */ - public function commandHandler($cmd, $params, $issuer, $alias){ - $output = ""; - switch($cmd){ - case "say": - $s = implode(" ", $params); - if(trim($s) == ""){ - $output .= "Usage: /say \n"; - break; - } - $sender = ($issuer instanceof Player) ? "Server" : ucfirst($issuer); - Player::broadcastMessage("[$sender] " . $s); - break; - case "tell": - if(!isset($params[0]) or !isset($params[1])){ - $output .= "Usage: /$cmd \n"; - break; - } - if(!($issuer instanceof Player)){ - $sender = ucfirst($issuer); - }else{ - $sender = $issuer; - } - $n = array_shift($params); - $target = Player::get($n); - if(!($target instanceof Player)){ - $target = strtolower($n); - if($target === "server" or $target === "console" or $target === "rcon"){ - $target = "Console"; - } - } - $mes = implode(" ", $params); - $output .= "[me -> " . ($target instanceof Player ? $target->getDisplayName() : $target) . "] " . $mes . "\n"; - if($target instanceof Player){ - $target->sendMessage("[" . ($sender instanceof Player ? $sender->getDisplayName() : $sender) . " -> me] " . $mes); - } - if($target === "Console" or $sender === "Console"){ - console("[INFO] [" . ($sender instanceof Player ? $sender->getDisplayName() : $sender) . " -> " . ($target instanceof Player ? $target->getDisplayName() : $target) . "] " . $mes); - } - break; - } - - return $output; - } - -} \ No newline at end of file diff --git a/src/PocketMine/ConsoleAPI.php b/src/PocketMine/ConsoleAPI.php deleted file mode 100644 index 5039a0946..000000000 --- a/src/PocketMine/ConsoleAPI.php +++ /dev/null @@ -1,307 +0,0 @@ -help = array(); - $this->cmds = array(); - $this->alias = array(); - $this->server = Server::getInstance(); - } - - public function init(){ - $this->server->schedule(2, array($this, "handle"), array(), true); - if(!defined("NO_THREADS")){ - $this->loop = new ConsoleLoop(); - } - $this->register("help", "[page|command name]", array($this, "defaultCommands")); - $this->register("status", "", array($this, "defaultCommands")); - $this->register("difficulty", "<0|1|2|3>", array($this, "defaultCommands")); - $this->register("stop", "", array($this, "defaultCommands")); - $this->register("defaultgamemode", "", array($this, "defaultCommands")); - $this->server->api->ban->cmdWhitelist("help"); - } - - function __destruct(){ - $this->server->deleteEvent($this->event); - if(!defined("NO_THREADS")){ - $this->loop->stop(); - $this->loop->notify(); - //@fclose($this->loop->fp); - usleep(50000); - $this->loop->kill(); - //$this->loop->join(); - } - } - - public function defaultCommands($cmd, $params, $issuer, $alias){ - $output = ""; - switch($cmd){ - case "defaultgamemode": - $gms = array( - "0" => 0, - "survival" => 0, - "s" => 0, - "1" => 1, - "creative" => 1, - "c" => 1, - "2" => 2, - "adventure" => 2, - "a" => 2, - "3" => 3, - "view" => 3, - "viewer" => 3, - "spectator" => 3, - "v" => 3, - ); - if(!isset($gms[strtolower($params[0])])){ - $output .= "Usage: /$cmd \n"; - break; - } - $this->server->api->setProperty("gamemode", $gms[strtolower($params[0])]); - $output .= "Default Gamemode is now " . strtoupper($this->server->getGamemode()) . ".\n"; - break; - case "status": - if(!($issuer instanceof Player) and $issuer === "console"){ - $this->server->debugInfo(true); - } - $info = $this->server->debugInfo(); - $output .= "TPS: " . $info["tps"] . ", Memory usage: " . $info["memory_usage"] . " (Peak " . $info["memory_peak_usage"] . ")\n"; - break; - case "update-done": - $this->server->api->setProperty("last-update", time()); - break; - case "stop": - $this->loop->stop = true; - $output .= "Stopping the server\n"; - $this->server->close(); - break; - case "difficulty": - $s = trim(array_shift($params)); - if($s === "" or (((int) $s) > 3 and ((int) $s) < 0)){ - $output .= "Usage: /difficulty <0|1|2|3>\n"; - break; - } - $this->server->api->setProperty("difficulty", (int) $s); - $output .= "Difficulty changed to " . $this->server->difficulty . "\n"; - break; - default: - $output .= "Command doesn't exist! Use /help\n"; - break; - } - - return $output; - } - - public function alias($alias, $cmd){ - $this->alias[strtolower(trim($alias))] = trim($cmd); - - return true; - } - - public function register($cmd, $help, $callback){ - if(!is_callable($callback)){ - return false; - } - $cmd = strtolower(trim($cmd)); - $this->cmds[$cmd] = $callback; - $this->help[$cmd] = $help; - ksort($this->help, SORT_NATURAL | SORT_FLAG_CASE); - } - - public function run($line = "", $issuer = "console", $alias = false){ - if($line != ""){ - $output = ""; - $end = strpos($line, " "); - if($end === false){ - $end = strlen($line); - } - $cmd = strtolower(substr($line, 0, $end)); - $params = (string) substr($line, $end + 1); - if(isset($this->alias[$cmd])){ - return $this->run($this->alias[$cmd] . ($params !== "" ? " " . $params : ""), $issuer, $cmd); - } - if($issuer instanceof Player){ - console("[DEBUG] " . TextFormat::AQUA . $issuer->getName() . TextFormat::RESET . " issued server command: " . ltrim("$alias ") . "/$cmd " . $params, true, true, 2); - }else{ - console("[DEBUG] " . TextFormat::YELLOW . "*" . $issuer . TextFormat::RESET . " issued server command: " . ltrim("$alias ") . "/$cmd " . $params, true, true, 2); - } - - if(preg_match_all('#@([@a-z]{1,})#', $params, $matches, PREG_OFFSET_CAPTURE) > 0){ - $offsetshift = 0; - foreach($matches[1] as $selector){ - if($selector[0]{0} === "@"){ //Escape! - $params = substr_replace($params, $selector[0], $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1); - --$offsetshift; - continue; - } - switch(strtolower($selector[0])){ - case "u": - case "player": - case "username": - $p = ($issuer instanceof Player) ? $issuer->getName() : $issuer; - $params = substr_replace($params, $p, $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1); - $offsetshift -= strlen($selector[0]) - strlen($p) + 1; - break; - case "w": - case "world": - $p = ($issuer instanceof Player) ? $issuer->level->getName() : Level::getDefault()->getName(); - $params = substr_replace($params, $p, $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1); - $offsetshift -= strlen($selector[0]) - strlen($p) + 1; - break; - case "a": - case "all": - if($issuer instanceof Player){ - if($this->server->api->ban->isOp($issuer->getName())){ - $output = ""; - foreach(Player::getAll() as $p){ - $output .= $this->run($cmd . " " . substr_replace($params, $p->getName(), $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1), $issuer, $alias); - } - }else{ - $issuer->sendMessage("You don't have permissions to use this command.\n"); - } - }else{ - $output = ""; - foreach(Player::getAll() as $p){ - $output .= $this->run($cmd . " " . substr_replace($params, $p->getName(), $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1), $issuer, $alias); - } - } - - return $output; - case "r": - case "random": - $l = array(); - foreach(Player::getAll() as $p){ - if($p !== $issuer){ - $l[] = $p; - } - } - if(count($l) === 0){ - return; - } - - $p = $l[mt_rand(0, count($l) - 1)]->getName(); - $params = substr_replace($params, $p, $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1); - $offsetshift -= strlen($selector[0]) - strlen($p) + 1; - break; - } - } - } - $params = explode(" ", $params); - if(count($params) === 1 and $params[0] === ""){ - $params = array(); - } - - if(($d1 = $this->server->api->dhandle("console.command." . $cmd, array("cmd" => $cmd, "parameters" => $params, "issuer" => $issuer, "alias" => $alias))) === false - or ($d2 = $this->server->api->dhandle("console.command", array("cmd" => $cmd, "parameters" => $params, "issuer" => $issuer, "alias" => $alias))) === false - ){ - $output = "You don't have permissions to use this command.\n"; - }elseif($d1 !== true and (!isset($d2) or $d2 !== true)){ - if(isset($this->cmds[$cmd]) and is_callable($this->cmds[$cmd])){ - $output = @call_user_func($this->cmds[$cmd], $cmd, $params, $issuer, $alias); - }elseif($this->server->api->dhandle("console.command.unknown", array("cmd" => $cmd, "params" => $params, "issuer" => $issuer, "alias" => $alias)) !== false){ - $output = $this->defaultCommands($cmd, $params, $issuer, $alias); - } - } - - if($output != "" and ($issuer instanceof Player)){ - $issuer->sendMessage(trim($output)); - } - - return $output; - } - } - - public function handle($time){ - if(defined("NO_THREADS")){ - return; - } - if($this->loop->line !== false){ - $line = preg_replace("#\\x1b\\x5b([^\\x1b]*\\x7e|[\\x40-\\x50])#", "", trim($this->loop->line)); - $this->loop->line = false; - $output = $this->run($line, "console"); - if($output != ""){ - $mes = explode("\n", trim($output)); - foreach($mes as $m){ - console("[CMD] " . $m); - } - } - }else{ - $this->loop->notify(); - } - } - -} - -class ConsoleLoop extends \Thread{ - public $line; - public $stop; - public $base; - public $ev; - public $fp; - - public function __construct(){ - $this->line = false; - $this->stop = false; - $this->start(); - } - - public function stop(){ - $this->stop = true; - } - - private function readLine(){ - if($this->fp){ - $line = trim(fgets($this->fp)); - }else{ - $line = trim(readline("")); - if($line != ""){ - readline_add_history($line); - } - } - - return $line; - } - - public function run(){ - if(!extension_loaded("readline")){ - $this->fp = fopen("php://stdin", "r"); - } - - while($this->stop === false){ - $this->line = $this->readLine(); - $this->wait(); - $this->line = false; - } - - if(!extension_loaded("readline")){ - @fclose($this->fp); - } - exit(0); - } -} diff --git a/src/PocketMine/Server.php b/src/PocketMine/Server.php index b7a5a6609..f0f555501 100644 --- a/src/PocketMine/Server.php +++ b/src/PocketMine/Server.php @@ -302,6 +302,36 @@ class Server{ return -1; } + /** + * @param string $str + * + * @return int + */ + public static function getDifficultyFromString($str){ + switch(strtolower(trim($str))){ + case "0": + case "peaceful": + case "p": + return 0; + + case "1": + case "easy": + case "e": + return 1; + + case "2": + case "normal": + case "n": + return 2; + + case "3": + case "hard": + case "h": + return 3; + } + return -1; + } + /** * @return int */ diff --git a/src/PocketMine/command/PluginCommand.php b/src/PocketMine/command/PluginCommand.php index 8d1444cee..0459dc2fa 100644 --- a/src/PocketMine/command/PluginCommand.php +++ b/src/PocketMine/command/PluginCommand.php @@ -22,6 +22,7 @@ namespace PocketMine\Command; use PocketMine\Plugin\Plugin; +use PocketMine\Utils\TextFormat; class PluginCommand extends Command{ @@ -55,7 +56,7 @@ class PluginCommand extends Command{ $success = $this->executor->onCommand($sender, $this, $commandLabel, $args); if(!$success and $this->usageMessage !== ""){ - $sender->sendMessage($this->usageMessage); + $sender->sendMessage(TextFormat::RED . "Usage: ". $this->usageMessage); } return $success; diff --git a/src/PocketMine/command/SimpleCommandMap.php b/src/PocketMine/command/SimpleCommandMap.php index f56edac4e..5e66c3d1d 100644 --- a/src/PocketMine/command/SimpleCommandMap.php +++ b/src/PocketMine/command/SimpleCommandMap.php @@ -25,6 +25,7 @@ use PocketMine\Command\Defaults\BanCommand; use PocketMine\Command\Defaults\BanIpCommand; use PocketMine\Command\Defaults\BanListCommand; use PocketMine\Command\Defaults\DefaultGamemodeCommand; +use PocketMine\Command\Defaults\DifficultyCommand; use PocketMine\Command\Defaults\HelpCommand; use PocketMine\Command\Defaults\ListCommand; use PocketMine\Command\Defaults\MeCommand; @@ -70,6 +71,7 @@ class SimpleCommandMap implements CommandMap{ $this->register("pocketmine", new SayCommand("say")); $this->register("pocketmine", new MeCommand("me")); $this->register("pocketmine", new ListCommand("list")); + $this->register("pocketmine", new DifficultyCommand("difficulty")); } diff --git a/src/PocketMine/command/defaults/DifficultyCommand.php b/src/PocketMine/command/defaults/DifficultyCommand.php new file mode 100644 index 000000000..dab58cc56 --- /dev/null +++ b/src/PocketMine/command/defaults/DifficultyCommand.php @@ -0,0 +1,65 @@ +" + ); + $this->setPermission("pocketmine.command.difficulty"); + } + + public function execute(CommandSender $sender, $currentAlias, array $args){ + if(!$this->testPermission($sender)){ + return true; + } + + if(count($args) !== 1){ + $sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage); + + return false; + } + + $difficulty = Server::getDifficultyFromString($args[0]); + + if(Server::getInstance()->isHardcore()){ + $difficulty = 3; + } + + if($difficulty !== -1){ + Server::getInstance()->setConfigInt("difficulty", $difficulty); + $sender->sendMessage("Set difficulty to " . $difficulty); + }else{ + $sender->sendMessage("Unknown difficulty"); + } + + return true; + } +} \ No newline at end of file diff --git a/src/PocketMine/command/defaults/HelpCommand.php b/src/PocketMine/command/defaults/HelpCommand.php index 97e2e2f08..9ef93cf64 100644 --- a/src/PocketMine/command/defaults/HelpCommand.php +++ b/src/PocketMine/command/defaults/HelpCommand.php @@ -59,7 +59,7 @@ class HelpCommand extends VanillaCommand{ } if($sender instanceof ConsoleCommandSender){ - $pageHeight = 10; + $pageHeight = PHP_INT_MAX; }else{ $pageHeight = 5; } diff --git a/src/PocketMine/plugin/PluginBase.php b/src/PocketMine/plugin/PluginBase.php index 3884fa0b7..f7d90e71b 100644 --- a/src/PocketMine/plugin/PluginBase.php +++ b/src/PocketMine/plugin/PluginBase.php @@ -167,6 +167,12 @@ abstract class PluginBase implements Plugin, CommandExecutor{ return false; } + /** + * @param string $filename + * @param bool $replace + * + * @return bool + */ public function saveResource($filename, $replace = false){ if(trim($filename) === ""){ return false; diff --git a/src/build/compile.sh b/src/build/compile.sh index 7781effc8..7104c8da8 100644 --- a/src/build/compile.sh +++ b/src/build/compile.sh @@ -89,7 +89,7 @@ while getopts "::t:oj:srcxff:" OPTION; do echo "[opt] Enabling abusive optimizations..." DO_OPTIMIZE="yes" ffast_math="-fno-math-errno -funsafe-math-optimizations -fno-trapping-math -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fcx-limited-range" #workaround SQLite3 fail - CFLAGS="$CFLAGS -O2 -DSQLITE_HAVE_ISNAN $ffast_math -fno-signed-zeros -finline-functions -funsafe-loop-optimizations -fomit-frame-pointer -frename-registers -funroll-loops -funswitch-loops -fpredictive-commoning -fgcse-after-reload -ftree-vectorize -ftracer -ftree-loop-im -fivopts -ftree-parallelize-loops=4 -fomit-frame-pointer" + CFLAGS="$CFLAGS -O2 -DSQLITE_HAVE_ISNAN $ffast_math -fno-signed-zeros -funsafe-loop-optimizations -fomit-frame-pointer -frename-registers -funroll-loops -funswitch-loops -fpredictive-commoning -fgcse-after-reload -ftree-vectorize -ftracer -ftree-loop-im -fivopts -ftree-parallelize-loops=4" if [ "$OPTARG" == "arm" ]; then CFLAGS="$CFLAGS -mfloat-abi=softfp -mfpu=vfp" elif [ "$OPTARG" == "x86_64" ]; then