TheWhiteDog9487/RandomTeleporter
1
0
Fork 0
mirror of https://github.com/TheWhiteDog9487/RandomTeleporter.git synced 2025-08-30 07:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

0.3.3

Browse Source 
适配Minecraft 1.21.3
( 什么连夜OTA正式版

坐标类型由Vec3d改为Vec2f，高度一边凉快去根本用不到
修正上一个版本命令反馈消息的坐标显示错误，一路Ctrl V没发现问题，红豆泥私密马赛，已经修改好了
输出文件名改成首字母大写了
This commit is contained in:
TheWhiteDog9487
2024-10-25 13:49:09 +08:00
parent e7c99c2364
commit c442f12de4
4 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/xyz/thewhitedog9487/CommandRegister.java
View File

@@ -4,12 +4,12 @@ import com.mojang.brigadier.arguments.LongArgumentType;
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
import net.minecraft.block.Blocks;
import net.minecraft.command.argument.EntityArgumentType;
import net.minecraft.command.argument.Vec3ArgumentType;
import net.minecraft.command.argument.Vec2ArgumentType;
import net.minecraft.entity.Entity;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.math.Vec2f;
import org.jetbrains.annotations.Nullable;
import java.util.HashSet;
@@ -20,7 +20,10 @@ import static net.minecraft.server.command.CommandManager.literal;
public class CommandRegister {
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){
// /rtp
CommandRegistrationCallback.EVENT
@@ -97,13 +100,13 @@ public class CommandRegister {
.register((dispatcher, registryAccess, environment) -> {
dispatcher.register(literal(Name)
.then(argument("Radius(半径)", LongArgumentType.longArg())
.then(argument("OriginPos(随机中心，坐标)",Vec3ArgumentType.vec3())
.then(argument("OriginPos(随机中心，坐标)",Vec2ArgumentType.vec2())
.requires(source -> source.hasPermissionLevel(PermissionLevel))
.executes(context -> execute_command(
context.getSource(),
LongArgumentType.getLong(context, "Radius(半径)"),
null,
Vec3ArgumentType.getVec3(context,"OriginPos(随机中心，坐标)"))))));});
Vec2ArgumentType.getVec2(context,"OriginPos(随机中心，坐标)"))))));});
// /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginEntity(随机中心，实体)>
CommandRegistrationCallback.EVENT
@@ -117,7 +120,8 @@ public class CommandRegister {
context.getSource(),
LongArgumentType.getLong(context, "Radius(半径)"),
EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
EntityArgumentType.getEntity(context,"OriginEntity(随机中心，实体)").getPos()))))));});
new Vec2f( (float) EntityArgumentType.getEntity(context,"OriginEntity(随机中心，实体)").getPos().x,
(float) EntityArgumentType.getEntity(context,"OriginEntity(随机中心，实体)").getPos().y)))))));});
// /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginPos(随机中心，坐标)>
CommandRegistrationCallback.EVENT
@@ -125,13 +129,13 @@ public class CommandRegister {
dispatcher.register(literal(Name)
.then(argument("Radius(半径)", LongArgumentType.longArg())
.then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
.then(argument("OriginPos(随机中心，坐标)",Vec3ArgumentType.vec3())
.then(argument("OriginPos(随机中心，坐标)",Vec2ArgumentType.vec2())
.requires(source -> source.hasPermissionLevel(PermissionLevel))
.executes(context -> execute_command(
context.getSource(),
LongArgumentType.getLong(context, "Radius(半径)"),
EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
Vec3ArgumentType.getVec3(context,"OriginPos(随机中心，坐标)")))))));});
Vec2ArgumentType.getVec2(context,"OriginPos(随机中心，坐标)")))))));});
// /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginEntity(随机中心，实体)>
CommandRegistrationCallback.EVENT
@@ -145,7 +149,8 @@ public class CommandRegister {
context.getSource(),
LongArgumentType.getLong(context, "Radius(半径)"),
EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
EntityArgumentType.getEntity(context,"OriginEntity(随机中心，实体)").getPos()))))));});
new Vec2f( (float) EntityArgumentType.getEntity(context,"OriginEntity(随机中心，实体)").getPos().x,
(float) EntityArgumentType.getEntity(context,"OriginEntity(随机中心，实体)").getPos().y)))))));});
// /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginPos(随机中心，坐标)>
CommandRegistrationCallback.EVENT
@@ -153,22 +158,23 @@ public class CommandRegister {
dispatcher.register(literal(Name)
.then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
.then(argument("Radius(半径)", LongArgumentType.longArg())
.then(argument("OriginPos(随机中心，坐标)",Vec3ArgumentType.vec3())
.then(argument("OriginPos(随机中心，坐标)",Vec2ArgumentType.vec2())
.requires(source -> source.hasPermissionLevel(PermissionLevel))
.executes(context -> execute_command(
context.getSource(),
LongArgumentType.getLong(context, "Radius(半径)"),
EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
Vec3ArgumentType.getVec3(context,"OriginPos(随机中心，坐标)")))))));});}
Vec2ArgumentType.getVec2(context,"OriginPos(随机中心，坐标)")))))));});}
public static void Register(){
Register("随机传送");
Register("rtp");}
static int execute_command(ServerCommandSource Source, @Nullable Long Radius, @Nullable Entity Player, @Nullable Vec3d Origin){
static int execute_command(ServerCommandSource Source, @Nullable Long Radius, @Nullable Entity Player, @Nullable Vec2f Origin){
Entity entity = Player == null ? Source.getPlayer() : Player;
if (entity == null) {
Source.sendFeedback(()->{ return Text.translatable("error.not_player"); }, true);
return -1;}
if (Radius == null){Radius = WorldBorder - (long) 1e4;}
// ↑ 远离世界边界
Radius = Math.abs(Radius);
long Coordinate_X;
long Coordinate_Z;
@@ -176,8 +182,8 @@ public class CommandRegister {
Coordinate_X = new SplittableRandom().nextLong(-Radius, Radius);
Coordinate_Z = new SplittableRandom().nextLong(-Radius, Radius);}
else{
Coordinate_X = new SplittableRandom().nextLong(Math.round(Origin.getX() - Radius), Math.round(Origin.getX() + Radius));
Coordinate_Z = new SplittableRandom().nextLong(Math.round(Origin.getZ() - Radius), Math.round(Origin.getZ() + Radius));}
Coordinate_X = new SplittableRandom().nextLong(Math.round(Origin.x - Radius), Math.round(Origin.x + Radius));
Coordinate_Z = new SplittableRandom().nextLong(Math.round(Origin.y - Radius), Math.round(Origin.y + Radius));}
int Coordinate_Y = 320;
for (var CurrentBlock = Source.getWorld().getBlockState(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getBlock();
// 从世界顶层往下找，直到遇到一个非空气方块
@@ -203,6 +209,7 @@ public class CommandRegister {
Coordinate_Y++;
// ↑ 高一层，人别站在土里了
entity.teleport(Source.getWorld(),Coordinate_X + 0.5, Coordinate_Y, Coordinate_Z + 0.5, new HashSet<>(), entity.getYaw(), entity.getPitch(), false);
Source.sendFeedback(()->{ return Text.translatable("info.success", entity.getName(), Coordinate_Z, Coordinate_Z, Coordinate_Z); },true);
int finalCoordinate_Y = Coordinate_Y;
Source.sendFeedback(()->{ return Text.translatable("info.success", entity.getName(), Coordinate_X, finalCoordinate_Y, Coordinate_Z); },true);
return 0;}
}

4
src/main/resources/fabric.mod.json
View File

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