diff --git a/README.md b/README.md index c8317aa..07c3017 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,14 @@ # 命令格式 - /rtp - /rtp -- /rtp <被传送玩家名(PlayerID)> -- /rtp <被传送玩家名(PlayerID)> -- /rtp <被传送玩家名(PlayerID)> +- /rtp +- /rtp +- /rtp - /rtp -- /rtp <被传送玩家名(PlayerID)> -- /rtp <被传送玩家名(PlayerID)> -- /rtp <被传送玩家名(PlayerID)> -- /rtp <被传送玩家名(PlayerID)> +- /rtp +- /rtp +- /rtp +- /rtp ## 命令示例 - /rtp diff --git a/src/main/java/xyz/thewhitedog9487/CommandRegister.java b/src/main/java/xyz/thewhitedog9487/CommandRegister.java index 1c2d451..44bb4c0 100644 --- a/src/main/java/xyz/thewhitedog9487/CommandRegister.java +++ b/src/main/java/xyz/thewhitedog9487/CommandRegister.java @@ -97,7 +97,7 @@ public class CommandRegister { IntegerArgumentType.getInteger(context, CommandArgumentName_Radius), null, null))) - // /rtp <被传送玩家名(PlayerID)> + // /rtp .then(argument(CommandArgumentName_Target, EntityArgument.entity()) .requires(Commands.hasPermission(PermissionLevel)) .executes(context -> ExecuteCommand( @@ -105,7 +105,7 @@ public class CommandRegister { null, EntityArgument.getEntity(context,CommandArgumentName_Target), null))) - // /rtp <被传送玩家名(PlayerID)> + // /rtp .then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0)) .then(argument(CommandArgumentName_Target, EntityArgument.entity()) .requires(Commands.hasPermission(PermissionLevel)) @@ -114,7 +114,7 @@ public class CommandRegister { IntegerArgumentType.getInteger(context, CommandArgumentName_Radius), EntityArgument.getEntity(context,CommandArgumentName_Target), null)))) - // /rtp <被传送玩家名(PlayerID)> + // /rtp .then(argument(CommandArgumentName_Target, EntityArgument.entity()) .then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0)) .requires(Commands.hasPermission(PermissionLevel)) @@ -142,6 +142,7 @@ public class CommandRegister { null, Vec2Argument.getVec2(context,CommandArgumentName_OriginPosition))))) // /rtp <被传送玩家名(PlayerID)> + // /rtp .then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0)) .then(argument(CommandArgumentName_Target, EntityArgument.entity()) .then(argument(CommandArgumentName_OriginEntity, EntityArgument.entity()) @@ -153,6 +154,7 @@ public class CommandRegister { new Vec2( (float) EntityArgument.getEntity( context,CommandArgumentName_OriginEntity).position().x, (float) EntityArgument.getEntity( context,CommandArgumentName_OriginEntity).position().z )))))) // /rtp <被传送玩家名(PlayerID)> + // /rtp .then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0)) .then(argument(CommandArgumentName_Target, EntityArgument.entity()) .then(argument(CommandArgumentName_OriginPosition, Vec2Argument.vec2()) @@ -163,6 +165,7 @@ public class CommandRegister { EntityArgument.getEntity(context,CommandArgumentName_Target), Vec2Argument.getVec2(context,CommandArgumentName_OriginPosition)))))) // /rtp <被传送玩家名(PlayerID)> + // /rtp .then(argument(CommandArgumentName_Target, EntityArgument.entity()) .then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0)) .then(argument(CommandArgumentName_OriginEntity, EntityArgument.entity()) @@ -174,6 +177,7 @@ public class CommandRegister { new Vec2( (float) EntityArgument.getEntity( context,CommandArgumentName_OriginEntity).position().x, (float) EntityArgument.getEntity( context,CommandArgumentName_OriginEntity).position().z )))))) // /rtp <被传送玩家名(PlayerID)> + // /rtp .then(argument(CommandArgumentName_Target, EntityArgument.entity()) .then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0)) .then(argument(CommandArgumentName_OriginPosition, Vec2Argument.vec2()) diff --git a/src/main/java/xyz/thewhitedog9487/ResourceReloaderListener.java b/src/main/java/xyz/thewhitedog9487/ResourceReloaderListener.java index 8e257fa..72596fb 100644 --- a/src/main/java/xyz/thewhitedog9487/ResourceReloaderListener.java +++ b/src/main/java/xyz/thewhitedog9487/ResourceReloaderListener.java @@ -13,7 +13,7 @@ import static xyz.thewhitedog9487.RandomTeleporter.MOD_ID; */ public class ResourceReloaderListener { public static String CommandArgumentName_Radius = "Radius(半径)"; - public static String CommandArgumentName_Target = "被传送玩家名(PlayerID)"; + public static String CommandArgumentName_Target = "PlayerID(被传送玩家名)"; public static String CommandArgumentName_OriginPosition = "OriginPos(随机中心,坐标)"; public static String CommandArgumentName_OriginEntity = "OriginEntity(随机中心,实体)"; @@ -29,6 +29,6 @@ public class ResourceReloaderListener { @Override protected void apply(Void prepared, SharedState store) { CommandArgumentName_Radius = Component.translatableWithFallback("command.argument.radius", "Radius(半径)").getString(); - CommandArgumentName_Target = Component.translatableWithFallback("command.argument.target", "被传送玩家名(PlayerID)").getString(); + CommandArgumentName_Target = Component.translatableWithFallback("command.argument.target", "PlayerID(被传送玩家名)").getString(); CommandArgumentName_OriginPosition = Component.translatableWithFallback("command.argument.origin_pos", "OriginPos(随机中心,坐标)").getString(); CommandArgumentName_OriginEntity = Component.translatableWithFallback("command.argument.origin_entity", "OriginEntity(随机中心,实体)").getString(); } } ); } } \ No newline at end of file