0.3.5

适配Minecraft 1.21.4
修正了一个严重Bug，同样是由0.3.3的Vec3d → Vec2f引入。
具体表现就是当传送中心被设置为一个实体时，传送中心点的Z轴坐标被错误地设置为给定实体的Y轴（表示高度的那个轴）坐标。
可能是我测试的时候没用到这个格式所以没发现问题？反正现在修了，已经没事了。
更换Text.translatable成Text.translatableWithFallback，确保未安装模组时至少有人类可读文字，而不是翻译键。
补充英语翻译。
ModMenu显示的详细信息中移除掉博客链接。
增加了一大堆的JavaDoc.

README.md

@@ -31,21 +31,19 @@
 - /rtp 1000 TheWhiteDog9487  
 将TheWhiteDog9487随机传送到以(0,0)为中心点，1000作为随机半径的范围内的随机一点  
 
-- /rtp 1000 10000 ~ 10000  
+- /rtp 1000 10000 10000  
 将执行命令的玩家随机传送到以(10000,10000)为中心点，1000作为随机半径的范围内的随机一点
-提示：按照道理来说中心坐标是不需要高度（Y轴）的，但由于坐标的类型是Vec3d，所以还是要写高度的。  
-至于高度的具体数值，随便写，代码里也没用到过。  
 
 - /rtp 1000 TheWhiteDog9487 TheWhiteDog_CN  
 将TheWhiteDog9487随机传送到以TheWhiteDog_CN所在位置为中心点，1000作为随机半径的范围内的随机一点  
 
-- /rtp 1000 TheWhiteDog9487 10000 ~ 10000  
+- /rtp 1000 TheWhiteDog9487 10000 10000  
 将TheWhiteDog9487随机传送到以(10000,10000)为中心点，1000作为随机半径的范围内的随机一点  
 
 - /rtp TheWhiteDog9487 1000 TheWhiteDog_CN  
 将TheWhiteDog9487随机传送到以TheWhiteDog_CN所在位置为中心点，1000作为随机半径的范围内的随机一点  
 
-- /rtp TheWhiteDog9487 1000 10000 ~ 10000  
+- /rtp TheWhiteDog9487 1000 10000 10000  
 将TheWhiteDog9487随机传送到以(10000,10000)为中心点，1000作为随机半径的范围内的随机一点  
 
 ### 特别提示
@@ -73,9 +71,8 @@
     1. 服务器需要安装
     2. 客户端不需要
 
-**注意：情况2和3，虽然其他玩家不需要安装本模组就能使用功能。但是由于命令执行后的反馈结果文字使用了翻译，如果其他玩家没有安装模组会导致显示不正常，玩家会直接看到翻译键而不是对应的文字。  
-因此，虽然可以但不建议其他人不安装。  
-能安装的话还是都装一下吧。**  
+**注意：情况2和3，如果其他玩家不安装本模组，他们看到的命令执行反馈就无法正确使用翻译，而在这种情况下默认显示中文文本。  
+如果有查看多语言翻译文本的需求 ，那建议还是都装一下吧。**  
 
 # 一些小彩蛋
 你可以使用 /随机传送 来替代 /rtp  

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.8-SNAPSHOT"
+    id("fabric-loom") version "1.9-SNAPSHOT"
     id("maven-publish")
 }
 

gradle.properties

@@ -4,21 +4,21 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.2
-yarn_mappings=1.21.2+build.1
-loader_version=0.16.7
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.1
+loader_version=0.16.9
 
 # Mod Properties
-mod_version=0.3.2
+mod_version=0.3.5
 maven_group=xyz.thewhitedog9487
-archives_base_name=randomteleporter
+archives_base_name=RandomTeleporter
 
 # Dependencies
-fabric_version=0.106.1+1.21.2
+fabric_version=0.110.5+1.21.4
 
 # https://modrinth.com/mod/modmenu/versions
 # https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu
-modmenu_version=12.0.0-beta.1
+modmenu_version=13.0.0-beta.1
 
 # loom_libraries_base=https://bmclapi2.bangbang93.com/maven/
 # loom_resources_base=https://bmclapi2.bangbang93.com/assets/

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/xyz/thewhitedog9487/CommandRegister.java

@@ -1,15 +1,15 @@
 package xyz.thewhitedog9487;
 
-import com.mojang.brigadier.arguments.LongArgumentType;
+import com.mojang.brigadier.arguments.IntegerArgumentType;
 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;
@@ -19,8 +19,30 @@ import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
 
 public class CommandRegister {
-    final static long WorldBorder = (long) 2.9e7;
-    static byte PermissionLevel = 2;
+
+    /**
+     * 世界边界
+     * <br>
+     * @see <a href="https://zh.minecraft.wiki/w/%E4%B8%96%E7%95%8C%E8%BE%B9%E7%95%8C#%E5%A4%A7%E5%B0%8F">Minecraft Wiki (中文)</a>
+     * @see <a href="https://minecraft.wiki/w/World_border#General_information">Minecraft Wiki (English)</a>
+     */
+    final static Integer WorldBorder = (int) 2.9e7;
+
+    /**
+     * 执行命令所需权限等级
+     * @see net.minecraft.server.command.TeleportCommand
+     */
+    final static byte PermissionLevel = 2;
+
+    /**
+     * 使用Fabric API向游戏内注册命令
+     * @param Name 根命令名
+     * <br>
+     * @see <a href="https://docs.fabricmc.net/zh_cn/develop/commands/basics">Fabric Wiki (新样式，中文)</a>
+     * @see <a href="https://wiki.fabricmc.net/zh_cn:tutorial:commands">Fabric Wiki (旧样式，中文)</a>
+     * @see <a href="https://docs.fabricmc.net/develop/commands/basics">Fabric Wiki (New style,English)</a>
+     * @see <a href="https://wiki.fabricmc.net/tutorial:commands">Fabric Wiki (Old style,English)</a>
+     */
     public static void Register(String Name){
         // /rtp
         CommandRegistrationCallback.EVENT
@@ -34,11 +56,11 @@ public class CommandRegister {
         CommandRegistrationCallback.EVENT
                 .register((dispatcher, registryAccess, environment) -> {
                     dispatcher.register(literal(Name)
-                            .then(argument("Radius(半径)", LongArgumentType.longArg())
+                            .then(argument("Radius(半径)", IntegerArgumentType.integer())
                                     .requires(source -> source.hasPermissionLevel(PermissionLevel))
                                     .executes(context -> execute_command(
                                             context.getSource(),
-                                            LongArgumentType.getLong(context, "Radius(半径)"),
+                                            IntegerArgumentType.getInteger(context, "Radius(半径)"),
                                             null,
                                             null))));});
 
@@ -58,12 +80,12 @@ public class CommandRegister {
         CommandRegistrationCallback.EVENT
                 .register((dispatcher, registryAccess, environment) -> {
                     dispatcher.register(literal(Name)
-                            .then(argument("Radius(半径)", LongArgumentType.longArg())
+                            .then(argument("Radius(半径)", IntegerArgumentType.integer())
                                     .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
                                             .requires(source -> source.hasPermissionLevel(PermissionLevel))
                                             .executes(context -> execute_command(
                                                     context.getSource(),
-                                                    LongArgumentType.getLong(context, "Radius(半径)"),
+                                                    IntegerArgumentType.getInteger(context, "Radius(半径)"),
                                                     EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
                                                     null)))));});
 
@@ -72,11 +94,11 @@ public class CommandRegister {
                 .register((dispatcher, registryAccess, environment) -> {
                     dispatcher.register(literal(Name)
                             .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
-                                .then(argument("Radius(半径)", LongArgumentType.longArg())
+                                .then(argument("Radius(半径)", IntegerArgumentType.integer())
                                             .requires(source -> source.hasPermissionLevel(PermissionLevel))
                                             .executes(context -> execute_command(
                                                     context.getSource(),
-                                                    LongArgumentType.getLong(context, "Radius(半径)"),
+                                                    IntegerArgumentType.getInteger(context, "Radius(半径)"),
                                                     EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
                                                     null)))));});
 
@@ -92,104 +114,133 @@ public class CommandRegister {
 //                                                LongArgumentType.getLong(context, "Radius(半径)"),
 //                                                null,
 //                                                EntityArgumentType.getEntity(context,"Origin(随机中心)"))))));});
+
         // /rtp <Radius(半径)> <OriginPos(随机中心，坐标)>
         CommandRegistrationCallback.EVENT
                 .register((dispatcher, registryAccess, environment) -> {
                     dispatcher.register(literal(Name)
-                            .then(argument("Radius(半径)", LongArgumentType.longArg())
-                                    .then(argument("OriginPos(随机中心，坐标)",Vec3ArgumentType.vec3())
+                            .then(argument("Radius(半径)", IntegerArgumentType.integer())
+                                    .then(argument("OriginPos(随机中心，坐标)",Vec2ArgumentType.vec2())
                                             .requires(source -> source.hasPermissionLevel(PermissionLevel))
                                             .executes(context -> execute_command(
                                                     context.getSource(),
-                                                    LongArgumentType.getLong(context, "Radius(半径)"),
+                                                    IntegerArgumentType.getInteger(context, "Radius(半径)"),
                                                     null,
-                                                    Vec3ArgumentType.getVec3(context,"OriginPos(随机中心，坐标)"))))));});
+                                                    Vec2ArgumentType.getVec2(context,"OriginPos(随机中心，坐标)"))))));});
 
         // /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginEntity(随机中心，实体)>
         CommandRegistrationCallback.EVENT
                 .register((dispatcher, registryAccess, environment) -> {
                     dispatcher.register(literal(Name)
-                            .then(argument("Radius(半径)", LongArgumentType.longArg())
+                            .then(argument("Radius(半径)", IntegerArgumentType.integer())
                                     .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
                                             .then(argument("OriginEntity(随机中心，实体)",EntityArgumentType.entity())
                                                     .requires(source -> source.hasPermissionLevel(PermissionLevel))
                                                     .executes(context -> execute_command(
                                                             context.getSource(),
-                                                            LongArgumentType.getLong(context, "Radius(半径)"),
+                                                            IntegerArgumentType.getInteger(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().z )))))));});
 
         // /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginPos(随机中心，坐标)>
         CommandRegistrationCallback.EVENT
                 .register((dispatcher, registryAccess, environment) -> {
                     dispatcher.register(literal(Name)
-                            .then(argument("Radius(半径)", LongArgumentType.longArg())
+                            .then(argument("Radius(半径)", IntegerArgumentType.integer())
                                     .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(半径)"),
+                                                            IntegerArgumentType.getInteger(context, "Radius(半径)"),
                                                             EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
-                                                            Vec3ArgumentType.getVec3(context,"OriginPos(随机中心，坐标)")))))));});
+                                                            Vec2ArgumentType.getVec2(context,"OriginPos(随机中心，坐标)")))))));});
 
         // /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginEntity(随机中心，实体)>
         CommandRegistrationCallback.EVENT
                 .register((dispatcher, registryAccess, environment) -> {
                     dispatcher.register(literal(Name)
                             .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
-                                    .then(argument("Radius(半径)", LongArgumentType.longArg())
+                                    .then(argument("Radius(半径)", IntegerArgumentType.integer())
                                             .then(argument("OriginEntity(随机中心，实体)",EntityArgumentType.entity())
                                                     .requires(source -> source.hasPermissionLevel(PermissionLevel))
                                                     .executes(context -> execute_command(
                                                             context.getSource(),
-                                                            LongArgumentType.getLong(context, "Radius(半径)"),
+                                                            IntegerArgumentType.getInteger(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().z )))))));});
 
         // /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginPos(随机中心，坐标)>
         CommandRegistrationCallback.EVENT
                 .register((dispatcher, registryAccess, environment) -> {
                     dispatcher.register(literal(Name)
                             .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
-                                    .then(argument("Radius(半径)", LongArgumentType.longArg())
-                                            .then(argument("OriginPos(随机中心，坐标)",Vec3ArgumentType.vec3())
+                                    .then(argument("Radius(半径)", IntegerArgumentType.integer())
+                                            .then(argument("OriginPos(随机中心，坐标)",Vec2ArgumentType.vec2())
                                                     .requires(source -> source.hasPermissionLevel(PermissionLevel))
                                                     .executes(context -> execute_command(
                                                             context.getSource(),
-                                                            LongArgumentType.getLong(context, "Radius(半径)"),
+                                                            IntegerArgumentType.getInteger(context, "Radius(半径)"),
                                                             EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
-                                                            Vec3ArgumentType.getVec3(context,"OriginPos(随机中心，坐标)")))))));});}
+                                                            Vec2ArgumentType.getVec2(context,"OriginPos(随机中心，坐标)")))))));});}
+
+    /**
+     * 向游戏内注册命令
+     * <br>
+     * 是 {@link CommandRegister#Register(String)} 的包装器
+     * @see CommandRegister#Register(String)
+     */
     public static void Register(){
         Register("随机传送");
-        Register("rtp");}
-    static int execute_command(ServerCommandSource Source, @Nullable Long Radius, @Nullable Entity Player, @Nullable Vec3d Origin){
+        Register("rtp");
+    }
+
+    /**
+     *
+     * @param Source 命令执行者
+     * @param Radius 随机选择的目的坐标距离参数 {@code Origin} 的最大距离
+     * @param Player 被传送的玩家
+     * @param Origin 随机选择的目的坐标的中心
+     * @return 命令运行是否成功
+     */
+    static int execute_command(ServerCommandSource Source, @Nullable Integer 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;
-        if (Origin == null){
-            Coordinate_X = new SplittableRandom().nextLong(-Radius, Radius);
-            Coordinate_Z = new SplittableRandom().nextLong(-Radius, Radius);}
+        /*
+            ↑
+            Entity entity = null;
+            if (Player == null){
+                entity = Source.getPlayer();}
             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));}
+                entity = Player;}
+         */
+        if (entity == null) {
+            Source.sendFeedback(()->{ return  Text.translatableWithFallback("error.no_target","不存在被传送目标，由非玩家物体执行命令时请显式指定被传送玩家ID"); }, true);
+            return -1;}
+        if (Radius == null){Radius = (int) (WorldBorder - 1e4);}
+        // ↑ 远离世界边界
+        Radius = Math.abs(Radius);
+        int Coordinate_X;
+        int Coordinate_Z;
+        if (Origin == null){
+            Coordinate_X = new SplittableRandom().nextInt(-Radius, Radius);
+            Coordinate_Z = new SplittableRandom().nextInt(-Radius, Radius);}
+        else{
+            Coordinate_X = new SplittableRandom().nextInt((int) Origin.x - Radius, (int) Origin.x + Radius);
+            Coordinate_Z = new SplittableRandom().nextInt((int) Origin.y - Radius, (int) 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();
+        for (var CurrentBlock = Source.getWorld().getBlockState(new BlockPos(Coordinate_X, Coordinate_Y, Coordinate_Z)).getBlock();
              // 从世界顶层往下找，直到遇到一个非空气方块
              Blocks.AIR == CurrentBlock ||
              Blocks.VOID_AIR == CurrentBlock ||
              Blocks.CAVE_AIR == CurrentBlock
-                ;CurrentBlock = Source.getWorld().getBlockState(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getBlock()){
+                ;CurrentBlock = Source.getWorld().getBlockState(new BlockPos(Coordinate_X, Coordinate_Y, Coordinate_Z)).getBlock()){
             Coordinate_Y--;}
             for (int x = -1; x <= 1; x++) {
                 for (int z = -1; z <= 1; z++) {
                     // 如果传送到的位置周围一圈是空气、水或岩浆，将其替换为玻璃
-                    var BlockPos = new BlockPos(Math.toIntExact(Coordinate_X - x), Coordinate_Y, Math.toIntExact(Coordinate_Z - z));
+                    var BlockPos = new BlockPos(Coordinate_X - x, Coordinate_Y, Coordinate_Z - z);
                     var CurrentBlock = Source.getWorld().getBlockState(BlockPos).getBlock();
                     if ( CurrentBlock == Blocks.AIR ||
                         CurrentBlock == Blocks.VOID_AIR ||
@@ -203,6 +254,9 @@ 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);
-        return 0;}
+        int finalCoordinate_Y = Coordinate_Y;
+        // ↑ "lambda 表达式中使用的变量应为 final 或有效 final"
+        final var FeedbackFallbackString = String.format("已将玩家%s传送到%d %d %d", entity.getName().getString(), Coordinate_X, finalCoordinate_Y, Coordinate_Z);
+        Source.sendFeedback(()->{ return  Text.translatableWithFallback("info.success", FeedbackFallbackString, entity.getName(), Coordinate_X, finalCoordinate_Y, Coordinate_Z); },true);
+        return 16;}
 }

src/main/java/xyz/thewhitedog9487/RandomTeleporter.java

@@ -16,7 +16,10 @@ public class RandomTeleporter implements ModInitializer {
 		// This code runs as soon as Minecraft is in a mod-load-ready state.
 		// However, some things (like resources) may still be uninitialized.
 		// Proceed with mild caution.
-		CommandRegister.Register();
 		LOGGER.info("RandomTeleporter Loading!");
+
+		CommandRegister.Register();
+
+		LOGGER.info("RandomTeleporter Loaded!");
 	}
 }

src/main/resources/assets/randomteleporter/lang/en_us.json

@@ -1,6 +1,7 @@
 {
   "modmenu.nameTranslation.randomteleporter": "RandomTeleporter",
   "modmenu.descriptionTranslation.randomteleporter": "Added two commands for random teleportation",
-  "bilibili": "Bilibili",
-  "blog": "Blog"
+  "info.success": "Teleported %s to %d %d %d",
+  "error.no_target": "There is no teleported target, and the teleported player ID is explicitly specified when executed by a non-player object",
+  "bilibili": "Bilibili"
 }

src/main/resources/assets/randomteleporter/lang/zh_cn.json

@@ -2,7 +2,6 @@
   "modmenu.nameTranslation.randomteleporter": "随机传送",
   "modmenu.descriptionTranslation.randomteleporter": "增加了两个用于随机传送的命令",
   "info.success": "已将玩家%s传送到%d %d %d",
-  "error.not_player": "执行命令的不是玩家",
-  "bilibili": "TheWhiteDog9487的哔哩哔哩主页",
-  "blog": "TheWhiteDog9487的博客"
+  "error.no_target": "不存在被传送目标，由非玩家物体执行命令时请显式指定被传送玩家ID",
+  "bilibili": "TheWhiteDog9487的哔哩哔哩主页"
 }

src/main/resources/fabric.mod.json

@@ -27,10 +27,10 @@
 		}
 	],
 	"depends": {
-		"fabricloader": ">=0.15.11",
-		"minecraft": "1.21.2",
+		"fabricloader": ">=0.16.9",
+		"minecraft": "1.21.4",
 		"java": ">=21",
-		"fabric-api": "*"
+		"fabric-api": ">=0.110.5"
 	},
 	"suggests": {
 		"another-mod": "*"
@@ -38,7 +38,6 @@
 	"custom": {
 		"modmenu": {
 			"links": {
-				"bilibili": "https://space.bilibili.com/401746666",
-				"blog": "www.thewhitedog9487.xyz"},
+				"bilibili": "https://space.bilibili.com/401746666"},
 			"update_checker": true}}
 }