MattTheTekie/GladiatorMine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into php7-0.14

Browse source
This commit is contained in:
PeratX 2016-02-10 09:48:06 +08:00
commit d0ca8fc503
8 changed files with 105 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

14
README.md
View file

@ -1,6 +1,6 @@
[
![Genisys - PocketMine-iTX Core]
(http://i8.tietuku.com/6600adf65e57e2f3.jpg)
(http://i13.tietuku.com/aa044daf6ecb66a4.jpg)
]
(#)
@ -37,13 +37,13 @@
* **@FENGberd**'s encouragement
* Our leaders are **@ishitatsuyuki** and **@jasonczc**
###Jenkins CI
[**Click Here to go to Jenkins CI Page**](http://jenkins.mcper.cn/job/Genisys-master/)
###Auto Build (CI) Pages
[**Jenkins**](http://jenkins.mcper.cn/job/Genisys-master/)
<br>
[**Click Here to go to Travis-CI**](https://travis-ci.org/iTXTech/Genisys)
[**Travis-CI**](https://travis-ci.org/iTXTech/Genisys)
###Documentation
[**Click Here to go to Genisys Documentation Page**](http://mcper.cn/Genisys-Docs/)
###Official Development Documentation
[**Click Here to go to Genisys Official Development Documentation Page**](http://mcper.cn/Genisys-Docs/)
###Features
* Performance optimization (Let 100+ players join in a server)
@ -141,7 +141,7 @@ Port: **888**
* 感谢 **@FENGberd** 的支持与鼓励；
* 我们的项目负责人为 **@ishitatsuyuki** 及 **@jasonczc**。
###自动构建的核心
###自动构建的核心 - CI
[**点击这里进入官方 Jenkins CI**](http://jenkins.mcper.cn/job/Genisys-master)
<br>
[**点击这里进入官方 Travis-CI**](https://travis-ci.org/iTXTech/Genisys)

1
src/pocketmine/Player.php
View file

@ -272,6 +272,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
public $fishingHook = null;
public $selectedPos = [];
public $selectedLev = [];
public function getAttribute(){
return $this->attribute;

60
src/pocketmine/command/defaults/BiomeCommand.php
View file

@ -18,6 +18,7 @@ use pocketmine\utils\TextFormat;
use pocketmine\Player;
class BiomeCommand extends VanillaCommand{
public function __construct($name){
parent::__construct(
$name,
@ -39,28 +40,44 @@ class BiomeCommand extends VanillaCommand{
if($sender instanceof Player){
if($args[0] == "set"){
$biome = isset($args[1]) ? $args[1] : 0;
$biome = isset($args[1]) ? $args[1] : 1;//默认改成草原
if(isset($sender->selectedPos[0]) and isset($sender->selectedPos[1])){
if(is_numeric($biome) === false){
$sender->sendMessage(TextFormat::RED . "%pocketmine.command.biome.wrongBio");
return false;
}
$biome=(int) $biome;
if($sender->selectedLev[0] !== $sender->selectedLev[1]){
$sender->sendMessage(TextFormat::RED . "%pocketmine.command.biome.wrongLev");
return false;
}
$x1 = min($sender->selectedPos[0][0], $sender->selectedPos[1][0]);
$z1 = min($sender->selectedPos[0][1], $sender->selectedPos[1][1]);
$x2 = max($sender->selectedPos[0][0], $sender->selectedPos[1][0]);
$z2 = max($sender->selectedPos[0][1], $sender->selectedPos[1][1]);
$level = $sender->selectedLev[0];
for($x = $x1; $x <= $x2; $x++){
for($z = $z1; $z <= $z2; $z++){
$level = $sender->getLevel();
$level->setBiomeId($x, $z, $biome);
}
}
$sender->sendMessage(TextFormat::GREEN . "已成功设置生态为 $biome");
$sender->sendMessage(TextFormat::GREEN . "$pocketmine.command.biome.set" . "$biome");
}else{
$sender->sendMessage("请先通过 /biome pos1/pos2 设定范围");
$sender->sendMessage("%pocketmine.command.biome.noPos");
}
}elseif($args[0] == "color"){
$color = isset($args[1]) ? $args[1] : "130,180,147";
$color = isset($args[1]) ? $args[1] : "146,188,89";//1=草原("146,188,89"),2=沙漠(251,183,19)"130,180,147"
$a = explode(",", $color);
var_dump($a);
if(count($a) != 3) return false;
if(count($a) != 3){
$sender->sendMessage(TextFormat::RED . "%pocketmine.command.biome.wrongCol");
return false;
}
if(isset($sender->selectedPos[0]) and isset($sender->selectedPos[1])){
if($sender->selectedLev[0] !== $sender->selectedLev[1]){
$sender->sendMessage(TextFormat::RED . "%pocketmine.command.biome.wrongLev");
return false;
}
$x1 = min($sender->selectedPos[0][0], $sender->selectedPos[1][0]);
$z1 = min($sender->selectedPos[0][1], $sender->selectedPos[1][1]);
$x2 = max($sender->selectedPos[0][0], $sender->selectedPos[1][0]);
@ -72,31 +89,36 @@ class BiomeCommand extends VanillaCommand{
}
}
//$sender->selectedPos = array();
$sender->sendMessage(TextFormat::GREEN . "已成功设置生态颜色为 $a[0], $a[1], $a[2]");
$sender->sendMessage(TextFormat::GREEN . "%pocketmine.command.biome.color" . "$a[0], $a[1], $a[2]");
}else{
$sender->sendMessage("请先通过 /biome pos1/pos2 设定范围");
$sender->sendMessage("%pocketmine.command.biome.noPos");
}
}elseif($args[0] == "pos1"){
$x = $sender->getX();
$z = $sender->getZ();
$x = (int) $sender->getX();
$z = (int) $sender->getZ();
$sender->selectedLev[0] = $sender->getlevel();
$sender->selectedPos[0][0] = $x;
$sender->selectedPos[0][1] = $z;
$sender->sendMessage("已设置第一个坐标为 $x, $z");
$sender->sendMessage(new TranslationContainer("pocketmine.command.biome.posset", [$sender->selectedLev[0]->getname(), $x, $z, "1"]));
}elseif($args[0] == "pos2"){
$x = $sender->getX();
$z = $sender->getZ();
$x = (int) $sender->getX();
$z = (int) $sender->getZ();
$sender->selectedLev[1] = $sender->getlevel();
$sender->selectedPos[1][0] = $x;
$sender->selectedPos[1][1] = $z;
$sender->sendMessage("已设置第二个坐标为 $x, $z");
$sender->sendMessage(new TranslationContainer("pocketmine.command.biome.posset", [$sender->selectedLev[1]->getname(), $x, $z, "2"]));
}elseif($args[0] == "get"){
$x = $sender->getX();
$z = $sender->getZ();
$x = (int) $sender->getX();
$z = (int) $sender->getZ();
$biome = $sender->getLevel()->getBiomeId($x, $z);
$color = $sender->getLevel()->getBiomeColor($x, $z);
$sender->sendMessage("您所在的生态id为: $biome");
$sender->sendMessage(new TranslationContainer("pocketmine.command.biome.get", [$biome, $color[0], $color[1], $color[2]]));
}
}else{
$sender->sendMessage("%commands.generic.runingame");
return false;
}
$sender->sendMessage(new TranslationContainer("commands.generic.usage", [$this->usageMessage]));
return true;
}
}
}

11
src/pocketmine/lang/locale/chs.ini
View file

@ -82,6 +82,7 @@ commands.generic.seed=种子
commands.generic.name=名称
commands.generic.generator=生成器名称
commands.generic.opt.missing=指令缺少参数，请确认后重新输入。
commands.generic.runingame=请在游戏中使用该命令。
commands.time.added=时间增加了 {%0}
commands.time.set=时间设定为 {%0}
@ -289,6 +290,16 @@ pocketmine.command.gc.tiles=方块:
pocketmine.command.gc.cycles=循环:
pocketmine.command.gc.memory=内存释放:
pocketmine.command.biome.description=设置指定地图生物群系
pocketmine.command.biome.posset=已设置第{%3}个坐标为:({%1},{%2})[{%0}]
pocketmine.command.biome.get=您所在的生物群系id为:{%0} 颜色值为:{%1},{%2},{%3}
pocketmine.command.biome.wrongLev=不能跨地图设置取点。
pocketmine.command.biome.wrongBio=错误的生物群系ID，请输入数字ID(1=草原，2=沙漠，13=雪山，6=沼泽)
pocketmine.command.biome.wrongCol=错误的生物群系颜色，例如 146,188,89 可以使用 /biome get 获取
pocketmine.command.biome.noPos=请先通过 /biome pos1|pos2 设定范围
pocketmine.command.biome.set=已成功设置生物群系为：
pocketmine.command.biome.color=已成功设置生态颜色为：
pocketmine.command.timings.description=纪录计时数据，以检视服务器的性能。
pocketmine.command.timings.usage=/timings <reset|report|on|off|paste>
pocketmine.command.timings.enable=启用定时和重启

11
src/pocketmine/lang/locale/eng.ini
View file

@ -82,6 +82,7 @@ commands.generic.seed=seed-name
commands.generic.name=name
commands.generic.generator=generator-name
commands.generic.opt.missing=Missing required properties，please confirm and re-enter.
commands.generic.runingame=Plz run this commond in game.
commands.time.added=Added {%0} to the time
commands.time.set=Set the time to {%0}
@ -286,6 +287,16 @@ pocketmine.command.gc.tiles=Tiles:
pocketmine.command.gc.cycles=Cycles:
pocketmine.command.gc.memory=Release memory:
pocketmine.command.biome.description=change the biome of the area.(To change snow or rain)
pocketmine.command.biome.posset=Has set pos{%3} at:({%1},{%2})[{%0}]
pocketmine.command.biome.get=The ID of biome you stay is {%0} Color:{%1},{%2},{%3}
pocketmine.command.biome.wrongLev=Cannot set point in different level.
pocketmine.command.biome.wrongBio=Wrong ID of biome. e.g. 1 (Plains), 2 (Desert)，13 (Ice Mountains)，6 (Swampland)
pocketmine.command.biome.wrongCol=Wrong Color. e.g. 146,188,89 .Use "/biome get" to get other color.
pocketmine.command.biome.noPos=Plz use "/biome pos1|pos2" to select the area first.
pocketmine.command.biome.set=Has set biome as：
pocketmine.command.biome.color=Has set color as：
pocketmine.command.timings.description=Records timings to see performance of the server.
pocketmine.command.timings.usage=/timings <reset|report|on|off|paste>
pocketmine.command.timings.enable=Enabled Timings & Reset

11
src/pocketmine/lang/locale/jpn.ini
View file

@ -82,6 +82,7 @@ commands.generic.seed=seed-name
commands.generic.name=name
commands.generic.generator=generator-name
commands.generic.opt.missing=Missing required properties，please confirm and re-enter.
commands.generic.runingame=Please run this commond in game.
commands.time.added=時間を{%0}進めました
commands.time.set=現在時刻を{%0}に設定しました
@ -286,6 +287,16 @@ pocketmine.command.gc.tiles=タイル:
pocketmine.command.gc.cycles=サイクル:
pocketmine.command.gc.memory=解放されたメモリ:
pocketmine.command.biome.description=change the biome of the area.(To change snow or rain)
pocketmine.command.biome.posset=Has set pos{%3} at:({%1},{%2})[{%0}]
pocketmine.command.biome.get=The ID of biome you stay is {%0} Color:{%1},{%2},{%3}
pocketmine.command.biome.wrongLev=Cannot set point in different level.
pocketmine.command.biome.wrongBio=Wrong ID of biome. e.g. 1 (Plains), 2 (Desert)，13 (Ice Mountains)，6 (Swampland)
pocketmine.command.biome.wrongCol=Wrong Color. e.g. 146,188,89 .Use "/biome get" to get other color.
pocketmine.command.biome.noPos=Plz use "/biome pos1|pos2" to select the area first.
pocketmine.command.biome.set=Has set biome as：
pocketmine.command.biome.color=Has set color as：
pocketmine.command.timings.description=サーバーのパフォーマンスを確認する記録のタイミングを設定します
pocketmine.command.timings.usage=/timings <reset|report|on|off|paste>
pocketmine.command.timings.enable=タイミングをリセット及び有効にしました

12
src/pocketmine/lang/locale/rus.ini
View file

@ -82,6 +82,7 @@ commands.generic.seed=seed-name
commands.generic.name=name
commands.generic.generator=generator-name
commands.generic.opt.missing=Требуемые настройки отсутствуют，пожалуйста повторите ввод.
commands.generic.runingame=Используйте эту команду в игре.
commands.time.added=Добавлено {%0} к времени
commands.time.set=Установлено время {%0}
@ -275,6 +276,17 @@ pocketmine.command.gc.entities=Сущностей:
pocketmine.command.gc.tiles=Тайлов:
pocketmine.command.gc.cycles=Циклов:
pocketmine.command.gc.memory=Освобождённая память:
pocketmine.command.biome.description=Изменяет биом выделенной области. (Для смены снега на дождь)
pocketmine.command.biome.posset=Установлена точка {%3} на позиции: ({%1},{%2})[{%0}]
pocketmine.command.biome.get=ID биома, где ты стоишь: {%0}. Цвет:{%1},{%2},{%3}
pocketmine.command.biome.wrongLev=Нельзя устанавливать точки в разнымх мирах.
pocketmine.command.biome.wrongBio=Неверный ID биома. Пример: 1 (Равнины), 2 (Пустыня)，13 (Ледяные горы)，6 (Болото)
pocketmine.command.biome.wrongCol=Неверный цвет!. Пример: 146,188,89 .Используй: "/biome get" чтобы получить остальные цвета.
pocketmine.command.biome.noPos=Используйте "/biome pos1|pos2" чтобы отметить точки.
pocketmine.command.biome.set=Был установлен цвет：
pocketmine.command.biome.color=Выбран цвет：
pocketmine.command.timings.description=Записывает тайминги, чтобы показать производительность сервера.
pocketmine.command.timings.usage=/timings <reset|report|on|off|paste>
pocketmine.command.timings.enable=Тайминги включены и сброшены.

11
src/pocketmine/lang/locale/zho.ini
View file

@ -82,6 +82,7 @@ commands.generic.seed=種子碼
commands.generic.name=名稱
commands.generic.generator=生成器名稱
commands.generic.opt.missing=指令缺少參數，請確認后重新輸入。
commands.generic.runingame=请在游戏中使用该命令。
commands.time.added=時間增加了 {%0}
commands.time.set=時間設定為 {%0}
@ -286,6 +287,16 @@ pocketmine.command.gc.tiles=方塊:
pocketmine.command.gc.cycles=循環:
pocketmine.command.gc.memory=記憶體釋放:
pocketmine.command.biome.description=设置指定地图生物群系
pocketmine.command.biome.posset=已设置第{%3}个坐标为:({%1},{%2})[{%0}]
pocketmine.command.biome.get=您所在的生物群系id为:{%0} 颜色值为:{%1},{%2},{%3}
pocketmine.command.biome.wrongLev=不能跨地图设置取点。
pocketmine.command.biome.wrongBio=错误的生物群系ID，请输入数字ID(1=草原，2=沙漠，13=雪山，6=沼泽)
pocketmine.command.biome.wrongCol=错误的生物群系颜色，例如 146,188,89 可以使用 /biome get 获取
pocketmine.command.biome.noPos=请先通过 /biome pos1|pos2 设定范围
pocketmine.command.biome.set=已成功设置生物群系为：
pocketmine.command.biome.color=已成功设置生态颜色为：
pocketmine.command.timings.description=紀錄計時數據，以檢視伺服器的性能。
pocketmine.command.timings.usage=/timings <reset|report|on|off|paste>
pocketmine.command.timings.enable=啟用定時和重啟