This commit is contained in:
Harveykang
2020-12-28 18:09:49 +08:00
parent cc392b1828
commit 3f66bb499f
4 changed files with 27 additions and 9 deletions
+2
View File
@@ -42,6 +42,8 @@ A Minecraft Datapack
- 记得用完就删掉它! - 记得用完就删掉它!
- 计划 - 计划
- 添加单独的记分板升级工具 - 添加单独的记分板升级工具
##### v2.0.0.11
- “/tagplayer spawn xxx”后面现在可以追加“at”、“facing”、“in”参数
##### v2.0.0.10 ##### v2.0.0.10
- 扫地机添加了位于怪物血条栏的文字提示,同时添加了各种提示的开关功能 - 扫地机添加了位于怪物血条栏的文字提示,同时添加了各种提示的开关功能
##### v2.0.0.9 ##### v2.0.0.9
+2 -2
View File
@@ -16,9 +16,9 @@ function fz:login/logintips/install
function fz:carpet/carpet function fz:carpet/carpet
#版本信息 #版本信息
data merge storage fz.installed {installed:1b} data merge storage fz.installed {installed:1b}
data merge storage fz {version:Beta-2.0.0.10} data merge storage fz {version:Beta-2.0.0.11}
data merge storage fz {date:2020-12.28} data merge storage fz {date:2020-12.28}
data merge storage fz {time:"17:16"} data merge storage fz {time:"1801"}
data merge storage fz {snapshot:-SNAPSHOT} data merge storage fz {snapshot:-SNAPSHOT}
##data remove storage fz snapshot ##data remove storage fz snapshot
tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"} tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"}
+2 -2
View File
@@ -1,8 +1,8 @@
#如果未安装且未卸载则安装 #如果未安装且未卸载则安装
execute unless data storage fz.installed {installed:1b} unless data storage fz.installed {installed:0b} run function fz:install execute unless data storage fz.installed {installed:1b} unless data storage fz.installed {installed:0b} run function fz:install
#如果版本正确且已安装则开始运行 #如果版本正确且已安装则开始运行
execute if data storage fz {version:Beta-2.0.0.10} if data storage fz.installed {installed:1b} run function fz:start execute if data storage fz {version:Beta-2.0.0.11} if data storage fz.installed {installed:1b} run function fz:start
#如果版本不符则更新 #如果版本不符则更新
execute unless data storage fz {version:Beta-2.0.0.10} run function fz:update execute unless data storage fz {version:Beta-2.0.0.11} run function fz:update
#输出版本信息 #输出版本信息
tellraw @a [{"text": "[版本信息]FZ's Datapack-","color": "#ffd900"},{"nbt":"version","storage":"fz","color": "#ffd900"},{"nbt": "snapshot", "storage": "fz","color": "red"}] tellraw @a [{"text": "[版本信息]FZ's Datapack-","color": "#ffd900"},{"nbt":"version","storage":"fz","color": "#ffd900"},{"nbt": "snapshot", "storage": "fz","color": "red"}]
+21 -5
View File
@@ -6,7 +6,7 @@ team_add('carpetBot');
team_add('shadowedPlayer'); team_add('shadowedPlayer');
team_property('carpetBot', 'prefix', '假的'); team_property('carpetBot', 'prefix', '假的');
team_property('shadowedPlayer', 'prefix', '挂机'); team_property('shadowedPlayer', 'prefix', '挂机');
global_version = '2.1.0'; global_version = '2.1.1';
global_carpet_version = split('\\+v',system_info('scarpet_version')); global_carpet_version = split('\\+v',system_info('scarpet_version'));
global_filename = system_info('app_name'); global_filename = system_info('app_name');
__config() -> { __config() -> {
@@ -14,7 +14,10 @@ __config() -> {
'allow_command_conflicts' -> true, 'allow_command_conflicts' -> true,
'commands' -> { 'commands' -> {
'' -> 'help', '' -> 'help',
'spawn <player>' -> 'summon', 'spawn <player>' -> ['summon',null,null,null],
'spawn <player> at <position>' -> ['summon',null,null],
'spawn <player> at <position> facing <rotation>' -> ['summon',null],
'spawn <player> at <position> facing <rotation> in <dimension>' -> 'summon',
'kill <killbot>' -> 'kill', 'kill <killbot>' -> 'kill',
'killall' -> 'killall', 'killall' -> 'killall',
'attack <bot>' -> 'attack_once', 'attack <bot>' -> 'attack_once',
@@ -81,6 +84,10 @@ __config() -> {
'shadow' -> 'shadow', 'shadow' -> 'shadow',
}, },
'arguments' -> { 'arguments' -> {
'dimension' -> {
'type' -> 'text',
'suggest' -> ['overworld','the_nether','the_end']
},
'hotbar' -> { 'hotbar' -> {
'type' -> 'int', 'type' -> 'int',
'min' -> 1, 'min' -> 1,
@@ -245,13 +252,22 @@ reload() ->(
run('tellraw @a {"text":"+ global_filename +重载成功!"}'); run('tellraw @a {"text":"+ global_filename +重载成功!"}');
return() return()
); );
summon(player_name) ->( summon(player_name, position, rotation, dimension) ->(
player_name = slice(player_name,0,15); player_name = slice(player_name,0,15);
check_online(player_name); check_online(player_name);
s_player = player(); s_player = player();
if(position == null,
position = query(s_player, 'pos')
);
if(rotation == null,
rotation = l(query(s_player, 'yaw'), query(s_player, 'pitch'))
);
if(dimension == null,
dimension = query(s_player, 'dimension')
);
run( run(
str('player %s spawn at %f %f %f facing %f %f', str('player %s spawn at %f %f %f facing %f %f in %s',
player_name, s_player~'x', s_player~'y', s_player~'z', query(s_player, 'yaw'), query(s_player, 'pitch') player_name, position:0, position:1, position:2, rotation:0, rotation:1, dimension
) )
); );
f_player = player(player_name); f_player = player(player_name);