Compare commits

..

No commits in common. "7376393f37888e9847e5cf1614a1b0214946a8c9" and "e7c99c23645cc1b0556126f03afbf843b455ab42" have entirely different histories.

4 changed files with 54 additions and 60 deletions

View File

@ -31,19 +31,21 @@
- /rtp 1000 TheWhiteDog9487 - /rtp 1000 TheWhiteDog9487
将TheWhiteDog9487随机传送到以(0,0)为中心点1000作为随机半径的范围内的随机一点 将TheWhiteDog9487随机传送到以(0,0)为中心点1000作为随机半径的范围内的随机一点
- /rtp 1000 10000 10000 - /rtp 1000 10000 ~ 10000
将执行命令的玩家随机传送到以(10000,10000)为中心点1000作为随机半径的范围内的随机一点 将执行命令的玩家随机传送到以(10000,10000)为中心点1000作为随机半径的范围内的随机一点
提示按照道理来说中心坐标是不需要高度Y轴但由于坐标的类型是Vec3d所以还是要写高度的。
至于高度的具体数值,随便写,代码里也没用到过。
- /rtp 1000 TheWhiteDog9487 TheWhiteDog_CN - /rtp 1000 TheWhiteDog9487 TheWhiteDog_CN
将TheWhiteDog9487随机传送到以TheWhiteDog_CN所在位置为中心点1000作为随机半径的范围内的随机一点 将TheWhiteDog9487随机传送到以TheWhiteDog_CN所在位置为中心点1000作为随机半径的范围内的随机一点
- /rtp 1000 TheWhiteDog9487 10000 10000 - /rtp 1000 TheWhiteDog9487 10000 ~ 10000
将TheWhiteDog9487随机传送到以(10000,10000)为中心点1000作为随机半径的范围内的随机一点 将TheWhiteDog9487随机传送到以(10000,10000)为中心点1000作为随机半径的范围内的随机一点
- /rtp TheWhiteDog9487 1000 TheWhiteDog_CN - /rtp TheWhiteDog9487 1000 TheWhiteDog_CN
将TheWhiteDog9487随机传送到以TheWhiteDog_CN所在位置为中心点1000作为随机半径的范围内的随机一点 将TheWhiteDog9487随机传送到以TheWhiteDog_CN所在位置为中心点1000作为随机半径的范围内的随机一点
- /rtp TheWhiteDog9487 1000 10000 10000 - /rtp TheWhiteDog9487 1000 10000 ~ 10000
将TheWhiteDog9487随机传送到以(10000,10000)为中心点1000作为随机半径的范围内的随机一点 将TheWhiteDog9487随机传送到以(10000,10000)为中心点1000作为随机半径的范围内的随机一点
### 特别提示 ### 特别提示

View File

@ -4,17 +4,17 @@ org.gradle.parallel=true
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.21.3 minecraft_version=1.21.2
yarn_mappings=1.21.3+build.2 yarn_mappings=1.21.2+build.1
loader_version=0.16.7 loader_version=0.16.7
# Mod Properties # Mod Properties
mod_version=0.3.4 mod_version=0.3.2
maven_group=xyz.thewhitedog9487 maven_group=xyz.thewhitedog9487
archives_base_name=RandomTeleporter archives_base_name=randomteleporter
# Dependencies # Dependencies
fabric_version=0.106.1+1.21.3 fabric_version=0.106.1+1.21.2
# https://modrinth.com/mod/modmenu/versions # https://modrinth.com/mod/modmenu/versions
# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu # https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu

View File

@ -1,15 +1,15 @@
package xyz.thewhitedog9487; package xyz.thewhitedog9487;
import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.arguments.LongArgumentType;
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.command.argument.EntityArgumentType;
import net.minecraft.command.argument.Vec2ArgumentType; import net.minecraft.command.argument.Vec3ArgumentType;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec2f; import net.minecraft.util.math.Vec3d;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.HashSet; import java.util.HashSet;
@ -19,11 +19,8 @@ import static net.minecraft.server.command.CommandManager.argument;
import static net.minecraft.server.command.CommandManager.literal; import static net.minecraft.server.command.CommandManager.literal;
public class CommandRegister { public class CommandRegister {
final static Integer WorldBorder = (int) 2.9e7; final static long WorldBorder = (long) 2.9e7;
// static byte PermissionLevel = 2;
// https://zh.minecraft.wiki/w/%E4%B8%96%E7%95%8C%E8%BE%B9%E7%95%8C#%E5%A4%A7%E5%B0%8F
// https://minecraft.wiki/w/World_border#General_information
final static byte PermissionLevel = 2;
public static void Register(String Name){ public static void Register(String Name){
// /rtp // /rtp
CommandRegistrationCallback.EVENT CommandRegistrationCallback.EVENT
@ -37,11 +34,11 @@ public class CommandRegister {
CommandRegistrationCallback.EVENT CommandRegistrationCallback.EVENT
.register((dispatcher, registryAccess, environment) -> { .register((dispatcher, registryAccess, environment) -> {
dispatcher.register(literal(Name) dispatcher.register(literal(Name)
.then(argument("Radius(半径)", IntegerArgumentType.integer()) .then(argument("Radius(半径)", LongArgumentType.longArg())
.requires(source -> source.hasPermissionLevel(PermissionLevel)) .requires(source -> source.hasPermissionLevel(PermissionLevel))
.executes(context -> execute_command( .executes(context -> execute_command(
context.getSource(), context.getSource(),
IntegerArgumentType.getInteger(context, "Radius(半径)"), LongArgumentType.getLong(context, "Radius(半径)"),
null, null,
null))));}); null))));});
@ -61,12 +58,12 @@ public class CommandRegister {
CommandRegistrationCallback.EVENT CommandRegistrationCallback.EVENT
.register((dispatcher, registryAccess, environment) -> { .register((dispatcher, registryAccess, environment) -> {
dispatcher.register(literal(Name) dispatcher.register(literal(Name)
.then(argument("Radius(半径)", IntegerArgumentType.integer()) .then(argument("Radius(半径)", LongArgumentType.longArg())
.then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity()) .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
.requires(source -> source.hasPermissionLevel(PermissionLevel)) .requires(source -> source.hasPermissionLevel(PermissionLevel))
.executes(context -> execute_command( .executes(context -> execute_command(
context.getSource(), context.getSource(),
IntegerArgumentType.getInteger(context, "Radius(半径)"), LongArgumentType.getLong(context, "Radius(半径)"),
EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"), EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
null)))));}); null)))));});
@ -75,11 +72,11 @@ public class CommandRegister {
.register((dispatcher, registryAccess, environment) -> { .register((dispatcher, registryAccess, environment) -> {
dispatcher.register(literal(Name) dispatcher.register(literal(Name)
.then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity()) .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
.then(argument("Radius(半径)", IntegerArgumentType.integer()) .then(argument("Radius(半径)", LongArgumentType.longArg())
.requires(source -> source.hasPermissionLevel(PermissionLevel)) .requires(source -> source.hasPermissionLevel(PermissionLevel))
.executes(context -> execute_command( .executes(context -> execute_command(
context.getSource(), context.getSource(),
IntegerArgumentType.getInteger(context, "Radius(半径)"), LongArgumentType.getLong(context, "Radius(半径)"),
EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"), EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
null)))));}); null)))));});
@ -99,104 +96,100 @@ public class CommandRegister {
CommandRegistrationCallback.EVENT CommandRegistrationCallback.EVENT
.register((dispatcher, registryAccess, environment) -> { .register((dispatcher, registryAccess, environment) -> {
dispatcher.register(literal(Name) dispatcher.register(literal(Name)
.then(argument("Radius(半径)", IntegerArgumentType.integer()) .then(argument("Radius(半径)", LongArgumentType.longArg())
.then(argument("OriginPos(随机中心,坐标)",Vec2ArgumentType.vec2()) .then(argument("OriginPos(随机中心,坐标)",Vec3ArgumentType.vec3())
.requires(source -> source.hasPermissionLevel(PermissionLevel)) .requires(source -> source.hasPermissionLevel(PermissionLevel))
.executes(context -> execute_command( .executes(context -> execute_command(
context.getSource(), context.getSource(),
IntegerArgumentType.getInteger(context, "Radius(半径)"), LongArgumentType.getLong(context, "Radius(半径)"),
null, null,
Vec2ArgumentType.getVec2(context,"OriginPos(随机中心,坐标)"))))));}); Vec3ArgumentType.getVec3(context,"OriginPos(随机中心,坐标)"))))));});
// /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginEntity(随机中心实体)> // /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginEntity(随机中心实体)>
CommandRegistrationCallback.EVENT CommandRegistrationCallback.EVENT
.register((dispatcher, registryAccess, environment) -> { .register((dispatcher, registryAccess, environment) -> {
dispatcher.register(literal(Name) dispatcher.register(literal(Name)
.then(argument("Radius(半径)", IntegerArgumentType.integer()) .then(argument("Radius(半径)", LongArgumentType.longArg())
.then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity()) .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
.then(argument("OriginEntity(随机中心,实体)",EntityArgumentType.entity()) .then(argument("OriginEntity(随机中心,实体)",EntityArgumentType.entity())
.requires(source -> source.hasPermissionLevel(PermissionLevel)) .requires(source -> source.hasPermissionLevel(PermissionLevel))
.executes(context -> execute_command( .executes(context -> execute_command(
context.getSource(), context.getSource(),
IntegerArgumentType.getInteger(context, "Radius(半径)"), LongArgumentType.getLong(context, "Radius(半径)"),
EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"), EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
new Vec2f( (float) EntityArgumentType.getEntity( context,"OriginEntity(随机中心,实体)").getPos().x, EntityArgumentType.getEntity(context,"OriginEntity(随机中心,实体)").getPos()))))));});
(float) EntityArgumentType.getEntity( context,"OriginEntity(随机中心,实体)").getPos().y )))))));});
// /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginPos(随机中心坐标)> // /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginPos(随机中心坐标)>
CommandRegistrationCallback.EVENT CommandRegistrationCallback.EVENT
.register((dispatcher, registryAccess, environment) -> { .register((dispatcher, registryAccess, environment) -> {
dispatcher.register(literal(Name) dispatcher.register(literal(Name)
.then(argument("Radius(半径)", IntegerArgumentType.integer()) .then(argument("Radius(半径)", LongArgumentType.longArg())
.then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity()) .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
.then(argument("OriginPos(随机中心,坐标)",Vec2ArgumentType.vec2()) .then(argument("OriginPos(随机中心,坐标)",Vec3ArgumentType.vec3())
.requires(source -> source.hasPermissionLevel(PermissionLevel)) .requires(source -> source.hasPermissionLevel(PermissionLevel))
.executes(context -> execute_command( .executes(context -> execute_command(
context.getSource(), context.getSource(),
IntegerArgumentType.getInteger(context, "Radius(半径)"), LongArgumentType.getLong(context, "Radius(半径)"),
EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"), EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
Vec2ArgumentType.getVec2(context,"OriginPos(随机中心,坐标)")))))));}); Vec3ArgumentType.getVec3(context,"OriginPos(随机中心,坐标)")))))));});
// /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginEntity(随机中心实体)> // /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginEntity(随机中心实体)>
CommandRegistrationCallback.EVENT CommandRegistrationCallback.EVENT
.register((dispatcher, registryAccess, environment) -> { .register((dispatcher, registryAccess, environment) -> {
dispatcher.register(literal(Name) dispatcher.register(literal(Name)
.then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity()) .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
.then(argument("Radius(半径)", IntegerArgumentType.integer()) .then(argument("Radius(半径)", LongArgumentType.longArg())
.then(argument("OriginEntity(随机中心,实体)",EntityArgumentType.entity()) .then(argument("OriginEntity(随机中心,实体)",EntityArgumentType.entity())
.requires(source -> source.hasPermissionLevel(PermissionLevel)) .requires(source -> source.hasPermissionLevel(PermissionLevel))
.executes(context -> execute_command( .executes(context -> execute_command(
context.getSource(), context.getSource(),
IntegerArgumentType.getInteger(context, "Radius(半径)"), LongArgumentType.getLong(context, "Radius(半径)"),
EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"), EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
new Vec2f( (float) EntityArgumentType.getEntity( context,"OriginEntity(随机中心,实体)").getPos().x, EntityArgumentType.getEntity(context,"OriginEntity(随机中心,实体)").getPos()))))));});
(float) EntityArgumentType.getEntity( context,"OriginEntity(随机中心,实体)").getPos().y )))))));});
// /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginPos(随机中心坐标)> // /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginPos(随机中心坐标)>
CommandRegistrationCallback.EVENT CommandRegistrationCallback.EVENT
.register((dispatcher, registryAccess, environment) -> { .register((dispatcher, registryAccess, environment) -> {
dispatcher.register(literal(Name) dispatcher.register(literal(Name)
.then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity()) .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
.then(argument("Radius(半径)", IntegerArgumentType.integer()) .then(argument("Radius(半径)", LongArgumentType.longArg())
.then(argument("OriginPos(随机中心,坐标)",Vec2ArgumentType.vec2()) .then(argument("OriginPos(随机中心,坐标)",Vec3ArgumentType.vec3())
.requires(source -> source.hasPermissionLevel(PermissionLevel)) .requires(source -> source.hasPermissionLevel(PermissionLevel))
.executes(context -> execute_command( .executes(context -> execute_command(
context.getSource(), context.getSource(),
IntegerArgumentType.getInteger(context, "Radius(半径)"), LongArgumentType.getLong(context, "Radius(半径)"),
EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"), EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
Vec2ArgumentType.getVec2(context,"OriginPos(随机中心,坐标)")))))));});} Vec3ArgumentType.getVec3(context,"OriginPos(随机中心,坐标)")))))));});}
public static void Register(){ public static void Register(){
Register("随机传送"); Register("随机传送");
Register("rtp");} Register("rtp");}
static int execute_command(ServerCommandSource Source, @Nullable Integer Radius, @Nullable Entity Player, @Nullable Vec2f Origin){ static int execute_command(ServerCommandSource Source, @Nullable Long Radius, @Nullable Entity Player, @Nullable Vec3d Origin){
Entity entity = Player == null ? Source.getPlayer() : Player; Entity entity = Player == null ? Source.getPlayer() : Player;
if (entity == null) { if (entity == null) {
Source.sendFeedback(()->{ return Text.translatable("error.not_player"); }, true); Source.sendFeedback(()->{ return Text.translatable("error.not_player"); }, true);
return -1;} return -1;}
if (Radius == null){Radius = (int) (WorldBorder - 1e4);} if (Radius == null){Radius = WorldBorder - (long) 1e4;}
// 远离世界边界
Radius = Math.abs(Radius); Radius = Math.abs(Radius);
int Coordinate_X; long Coordinate_X;
int Coordinate_Z; long Coordinate_Z;
if (Origin == null){ if (Origin == null){
Coordinate_X = new SplittableRandom().nextInt(-Radius, Radius); Coordinate_X = new SplittableRandom().nextLong(-Radius, Radius);
Coordinate_Z = new SplittableRandom().nextInt(-Radius, Radius);} Coordinate_Z = new SplittableRandom().nextLong(-Radius, Radius);}
else{ else{
Coordinate_X = new SplittableRandom().nextInt((int) Origin.x - Radius, (int) Origin.x + Radius); Coordinate_X = new SplittableRandom().nextLong(Math.round(Origin.getX() - Radius), Math.round(Origin.getX() + Radius));
Coordinate_Z = new SplittableRandom().nextInt((int) Origin.y - Radius, (int) Origin.y + Radius);} Coordinate_Z = new SplittableRandom().nextLong(Math.round(Origin.getZ() - Radius), Math.round(Origin.getZ() + Radius));}
int Coordinate_Y = 320; int Coordinate_Y = 320;
for (var CurrentBlock = Source.getWorld().getBlockState(new BlockPos(Coordinate_X, Coordinate_Y, Coordinate_Z)).getBlock(); for (var CurrentBlock = Source.getWorld().getBlockState(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getBlock();
// 从世界顶层往下找直到遇到一个非空气方块 // 从世界顶层往下找直到遇到一个非空气方块
Blocks.AIR == CurrentBlock || Blocks.AIR == CurrentBlock ||
Blocks.VOID_AIR == CurrentBlock || Blocks.VOID_AIR == CurrentBlock ||
Blocks.CAVE_AIR == CurrentBlock Blocks.CAVE_AIR == CurrentBlock
;CurrentBlock = Source.getWorld().getBlockState(new BlockPos(Coordinate_X, Coordinate_Y, Coordinate_Z)).getBlock()){ ;CurrentBlock = Source.getWorld().getBlockState(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getBlock()){
Coordinate_Y--;} Coordinate_Y--;}
for (int x = -1; x <= 1; x++) { for (int x = -1; x <= 1; x++) {
for (int z = -1; z <= 1; z++) { for (int z = -1; z <= 1; z++) {
// 如果传送到的位置周围一圈是空气水或岩浆将其替换为玻璃 // 如果传送到的位置周围一圈是空气水或岩浆将其替换为玻璃
var BlockPos = new BlockPos(Coordinate_X - x, Coordinate_Y, Coordinate_Z - z); var BlockPos = new BlockPos(Math.toIntExact(Coordinate_X - x), Coordinate_Y, Math.toIntExact(Coordinate_Z - z));
var CurrentBlock = Source.getWorld().getBlockState(BlockPos).getBlock(); var CurrentBlock = Source.getWorld().getBlockState(BlockPos).getBlock();
if ( CurrentBlock == Blocks.AIR || if ( CurrentBlock == Blocks.AIR ||
CurrentBlock == Blocks.VOID_AIR || CurrentBlock == Blocks.VOID_AIR ||
@ -210,7 +203,6 @@ public class CommandRegister {
Coordinate_Y++; Coordinate_Y++;
// 高一层人别站在土里了 // 高一层人别站在土里了
entity.teleport(Source.getWorld(),Coordinate_X + 0.5, Coordinate_Y, Coordinate_Z + 0.5, new HashSet<>(), entity.getYaw(), entity.getPitch(), false); entity.teleport(Source.getWorld(),Coordinate_X + 0.5, Coordinate_Y, Coordinate_Z + 0.5, new HashSet<>(), entity.getYaw(), entity.getPitch(), false);
int finalCoordinate_Y = Coordinate_Y; Source.sendFeedback(()->{ return Text.translatable("info.success", entity.getName(), Coordinate_Z, Coordinate_Z, Coordinate_Z); },true);
Source.sendFeedback(()->{ return Text.translatable("info.success", entity.getName(), Coordinate_X, finalCoordinate_Y, Coordinate_Z); },true);
return 0;} return 0;}
} }

View File

@ -27,8 +27,8 @@
} }
], ],
"depends": { "depends": {
"fabricloader": ">=0.16.7", "fabricloader": ">=0.15.11",
"minecraft": "1.21.3", "minecraft": "1.21.2",
"java": ">=21", "java": ">=21",
"fabric-api": "*" "fabric-api": "*"
}, },