Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
2a3d9fd0
Commit
2a3d9fd0
authored
May 29, 2022
by
tester233
Committed by
Melledy
May 28, 2022
Browse files
CoopCommand: Fix usage
parent
02e737e9
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/command/commands/CoopCommand.java
View file @
2a3d9fd0
...
@@ -9,7 +9,7 @@ import java.util.List;
...
@@ -9,7 +9,7 @@ import java.util.List;
import
static
emu
.
grasscutter
.
utils
.
Language
.
translate
;
import
static
emu
.
grasscutter
.
utils
.
Language
.
translate
;
@Command
(
label
=
"coop"
,
usage
=
"coop
<playerId> <target playerId>
"
,
permission
=
"server.coop"
,
permissionTargeted
=
"server.coop.others"
,
description
=
"commands.coop.description"
)
@Command
(
label
=
"coop"
,
usage
=
"coop
[host uid]
"
,
permission
=
"server.coop"
,
permissionTargeted
=
"server.coop.others"
,
description
=
"commands.coop.description"
)
public
final
class
CoopCommand
implements
CommandHandler
{
public
final
class
CoopCommand
implements
CommandHandler
{
@Override
@Override
...
...
src/main/java/emu/grasscutter/command/commands/GiveCommand.java
View file @
2a3d9fd0
...
@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
...
@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
import
static
emu
.
grasscutter
.
utils
.
Language
.
translate
;
import
static
emu
.
grasscutter
.
utils
.
Language
.
translate
;
@Command
(
label
=
"give"
,
usage
=
"give <itemId|itemName> [amount] [level]
[refinement]
"
,
aliases
=
{
@Command
(
label
=
"give"
,
usage
=
"give <itemId|itemName> [amount] [level]"
,
aliases
=
{
"g"
,
"item"
,
"giveitem"
},
permission
=
"player.give"
,
permissionTargeted
=
"player.give.others"
,
description
=
"commands.give.description"
)
"g"
,
"item"
,
"giveitem"
},
permission
=
"player.give"
,
permissionTargeted
=
"player.give.others"
,
description
=
"commands.give.description"
)
public
final
class
GiveCommand
implements
CommandHandler
{
public
final
class
GiveCommand
implements
CommandHandler
{
Pattern
lvlRegex
=
Pattern
.
compile
(
"l(?:vl?)?(\\d+)"
);
// Java is a joke of a proglang that doesn't have raw string literals
Pattern
lvlRegex
=
Pattern
.
compile
(
"l(?:vl?)?(\\d+)"
);
// Java is a joke of a proglang that doesn't have raw string literals
...
...
src/main/java/emu/grasscutter/command/commands/TeleportCommand.java
View file @
2a3d9fd0
...
@@ -10,7 +10,7 @@ import java.util.List;
...
@@ -10,7 +10,7 @@ import java.util.List;
import
static
emu
.
grasscutter
.
utils
.
Language
.
translate
;
import
static
emu
.
grasscutter
.
utils
.
Language
.
translate
;
@Command
(
label
=
"teleport"
,
usage
=
"teleport <x> <y> <z> [scene
i
d]"
,
aliases
=
{
"tp"
},
permission
=
"player.teleport"
,
permissionTargeted
=
"player.teleport.others"
,
description
=
"commands.teleport.description"
)
@Command
(
label
=
"teleport"
,
usage
=
"teleport <x> <y> <z> [scene
I
d]"
,
aliases
=
{
"tp"
},
permission
=
"player.teleport"
,
permissionTargeted
=
"player.teleport.others"
,
description
=
"commands.teleport.description"
)
public
final
class
TeleportCommand
implements
CommandHandler
{
public
final
class
TeleportCommand
implements
CommandHandler
{
private
float
parseRelative
(
String
input
,
Float
current
)
{
// TODO: Maybe this will be useful elsewhere later
private
float
parseRelative
(
String
input
,
Float
current
)
{
// TODO: Maybe this will be useful elsewhere later
...
...
src/main/resources/languages/en-US.json
View file @
2a3d9fd0
...
@@ -134,7 +134,7 @@
...
@@ -134,7 +134,7 @@
"description"
:
"Deletes unequipped unlocked items, including yellow rarity ones from your inventory"
"description"
:
"Deletes unequipped unlocked items, including yellow rarity ones from your inventory"
},
},
"coop"
:
{
"coop"
:
{
"usage"
:
"Usage: coop <playerID>
<target player
ID
>
"
,
"usage"
:
"Usage: coop <player
ID>
[host U
ID
]
"
,
"success"
:
"Summoned %s to %s's world."
,
"success"
:
"Summoned %s to %s's world."
,
"description"
:
"Forces someone to join the world of others"
"description"
:
"Forces someone to join the world of others"
},
},
...
@@ -353,8 +353,8 @@
...
@@ -353,8 +353,8 @@
"description"
:
"Teleports all players in your world to your position"
"description"
:
"Teleports all players in your world to your position"
},
},
"teleport"
:
{
"teleport"
:
{
"usage_server"
:
"Usage: /tp @<player ID> <x> <y> <z> [scene
ID]"
,
"usage_server"
:
"Usage: /tp @<player ID> <x> <y> <z> [sceneID]"
,
"usage"
:
"Usage: /tp [@<player ID>] <x> <y> <z> [scene
ID]"
,
"usage"
:
"Usage: /tp [@<player ID>] <x> <y> <z> [sceneID]"
,
"specify_player_id"
:
"You must specify a player ID."
,
"specify_player_id"
:
"You must specify a player ID."
,
"invalid_position"
:
"Invalid position."
,
"invalid_position"
:
"Invalid position."
,
"success"
:
"Teleported %s to %s, %s, %s in scene %s."
,
"success"
:
"Teleported %s to %s, %s, %s in scene %s."
,
...
...
src/main/resources/languages/pl-PL.json
View file @
2a3d9fd0
...
@@ -125,7 +125,7 @@
...
@@ -125,7 +125,7 @@
"everything"
:
"Wyczyszczono wszystko dla %s."
"everything"
:
"Wyczyszczono wszystko dla %s."
},
},
"coop"
:
{
"coop"
:
{
"usage"
:
"Użycie: coop <id gracza>
<id gracza docelowego>
"
,
"usage"
:
"Użycie: coop <id gracza>
[host uid]
"
,
"success"
:
"Przyzwano %s do świata %s."
"success"
:
"Przyzwano %s do świata %s."
},
},
"enter_dungeon"
:
{
"enter_dungeon"
:
{
...
...
src/main/resources/languages/zh-CN.json
View file @
2a3d9fd0
...
@@ -134,7 +134,7 @@
...
@@ -134,7 +134,7 @@
"description"
:
"从你的背包中删除所有未装备且已解锁的物品,包括稀有物品"
"description"
:
"从你的背包中删除所有未装备且已解锁的物品,包括稀有物品"
},
},
"coop"
:
{
"coop"
:
{
"usage"
:
"用法:coop <玩家ID>
<
目标玩家ID
>
"
,
"usage"
:
"用法:coop <玩家ID>
[
目标玩家
U
ID
]
"
,
"success"
:
"已强制传送 %s 到 %s 的世界。"
,
"success"
:
"已强制传送 %s 到 %s 的世界。"
,
"description"
:
"强制传送指定玩家到他人的世界"
"description"
:
"强制传送指定玩家到他人的世界"
},
},
...
...
src/main/resources/languages/zh-TW.json
View file @
2a3d9fd0
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
"description"
:
"向所有玩家發送公告。"
"description"
:
"向所有玩家發送公告。"
},
},
"changescene"
:
{
"changescene"
:
{
"usage"
:
"用法:changescene <scene
i
d>"
,
"usage"
:
"用法:changescene <scene
I
d>"
,
"already_in_scene"
:
"你已經在這個場景中了。"
,
"already_in_scene"
:
"你已經在這個場景中了。"
,
"success"
:
"已切換至場景 %s."
,
"success"
:
"已切換至場景 %s."
,
"exists_error"
:
"此場景不存在。"
,
"exists_error"
:
"此場景不存在。"
,
...
@@ -134,7 +134,7 @@
...
@@ -134,7 +134,7 @@
"description"
:
"從你的背包中刪除所有未裝備且未上鎖的物品,包括稀有物品。"
"description"
:
"從你的背包中刪除所有未裝備且未上鎖的物品,包括稀有物品。"
},
},
"coop"
:
{
"coop"
:
{
"usage"
:
"用法:coop <playerId>
<target playerId>
"
,
"usage"
:
"用法:coop <playerId>
[host uid]
"
,
"success"
:
"召喚了 %s 到 %s 的世界。"
,
"success"
:
"召喚了 %s 到 %s 的世界。"
,
"description"
:
"強制傳送指定用戶到他人的世界。"
"description"
:
"強制傳送指定用戶到他人的世界。"
},
},
...
@@ -358,8 +358,8 @@
...
@@ -358,8 +358,8 @@
"description"
:
"將你世界裡的所有玩家傳送到你目前的所在位置。"
"description"
:
"將你世界裡的所有玩家傳送到你目前的所在位置。"
},
},
"teleport"
:
{
"teleport"
:
{
"usage_server"
:
"用法:/tp @<player id> <x> <y> <z> [scene
i
d]"
,
"usage_server"
:
"用法:/tp @<player id> <x> <y> <z> [scene
I
d]"
,
"usage"
:
"用法:/tp [@<player id>] <x> <y> <z> [scene
i
d]"
,
"usage"
:
"用法:/tp [@<player id>] <x> <y> <z> [scene
I
d]"
,
"specify_player_id"
:
"你必須指定一個玩家ID。"
,
"specify_player_id"
:
"你必須指定一個玩家ID。"
,
"invalid_position"
:
"無效的座標。"
,
"invalid_position"
:
"無效的座標。"
,
"success"
:
"傳送 %s 到座標 %s,%s,%s ,場景為 %s 。"
,
"success"
:
"傳送 %s 到座標 %s,%s,%s ,場景為 %s 。"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment