0.2.5

突然发现Ved3d类型的方法里有一个计算两点间距离的，那我就把我自己的工具库撤了。
然后我把命令权限等级从4下降到了2，和原版的/tp同步。
（我记得原版的tp是4级啊？我最早还去源代码里看了一眼，咋回事呢？
传送过去生成的保护平台，现在是3x3的玻璃而不是1x1的石头，而且玩家会站在平台的正中心。
例行更新Fabric API和Fabric Loader

.gitattributes

@@ -1,9 +0,0 @@
-#
-# https://help.github.com/articles/dealing-with-line-endings/
-#
-# Linux start script should use lf
-/gradlew        text eol=lf
-
-# These are Windows script files and should use crlf
-*.bat           text eol=crlf
-

.github/workflows/build.yml

@@ -1,37 +0,0 @@
-# Automatically build the project and run any configured tests for every push
-# and submitted pull request. This can help catch issues that only occur on
-# certain platforms or Java versions, and provides a first line of defence
-# against bad commits.
-
-name: build
-on: [pull_request, push]
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        # Use these Java versions
-        java: [
-          21,    # Current Java LTS
-        ]
-    runs-on: ubuntu-22.04
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v4
-      - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v2
-      - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v4
-        with:
-          java-version: ${{ matrix.java }}
-          distribution: 'microsoft'
-      - name: make gradle wrapper executable
-        run: chmod +x ./gradlew
-      - name: build
-        run: ./gradlew build
-      - name: capture build artifacts
-        if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java
-        uses: actions/upload-artifact@v4
-        with:
-          name: Artifacts
-          path: build/libs/

README.md

@@ -31,19 +31,21 @@
 - /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作为随机半径的范围内的随机一点  
 
 ### 特别提示
@@ -71,9 +73,6 @@
     1. 服务器需要安装
     2. 客户端不需要
 
-**注意：情况2和3，如果其他玩家不安装本模组，他们看到的命令执行反馈就无法正确使用翻译，而在这种情况下默认显示中文文本。  
-如果有查看多语言翻译文本的需求 ，那建议还是都装一下吧。**  
-
 # 一些小彩蛋
 你可以使用 /随机传送 来替代 /rtp  
 没错，Minecraft的命令是可以存在非ASCII字符的，所以我就整了一个  

build.gradle

@@ -0,0 +1,91 @@
+plugins {
+	id 'fabric-loom' version '1.5-SNAPSHOT'
+	id 'maven-publish'
+}
+
+version = project.mod_version
+group = project.maven_group
+
+base {
+	archivesName = project.archives_base_name
+}
+
+repositories {
+	// Add repositories to retrieve artifacts from in here.
+	// You should only use this when depending on other mods because
+	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
+	// for more information about repositories.
+}
+
+loom {
+    splitEnvironmentSourceSets()
+
+	mods {
+		"randomteleporter" {
+			sourceSet sourceSets.main
+			sourceSet sourceSets.client
+		}
+	}
+
+}
+
+dependencies {
+	// To change the versions see the gradle.properties file
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	
+	// Uncomment the following line to enable the deprecated Fabric API modules. 
+	// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
+
+	// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
+}
+
+processResources {
+	inputs.property "version", project.version
+
+	filesMatching("fabric.mod.json") {
+		expand "version": project.version
+	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 17
+}
+
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
+
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
+}
+
+jar {
+	from("LICENSE") {
+		rename { "${it}_${project.base.archivesName.get()}"}
+	}
+}
+
+// configure the maven publication
+publishing {
+	publications {
+		mavenJava(MavenPublication) {
+			from components.java
+		}
+	}
+
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+	repositories {
+		// Add repositories to publish to here.
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
+	}
+}

build.gradle.kts

@@ -1,102 +0,0 @@
-plugins {
-    id("fabric-loom") version "1.10-SNAPSHOT"
-    id("maven-publish")
-}
-
-version = "${project.extra["mod_version"]}"
-group = project.extra["maven_group"] as String
-
-base {
-    archivesName.set(project.extra["archives_base_name"] as String)
-}
-
-repositories {
-    // Add repositories to retrieve artifacts from in here.
-    // You should only use this when depending on other mods because
-    // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-    // See https://docs.gradle.org/current/userguide/declaring_repositories.html
-    // for more information about repositories.
-    maven {
-        name = "Terraformers"
-        url = uri("https://maven.terraformersmc.com/") }
-}
-
-loom {
-    splitEnvironmentSourceSets()
-
-    mods {
-        create("randomteleporter") {
-            sourceSet(sourceSets["main"])
-            sourceSet(sourceSets["client"])
-        }
-    }
-}
-
-dependencies {
-    // To change the versions see the gradle.properties file
-    minecraft("com.mojang:minecraft:${project.extra["minecraft_version"]}")
-    mappings("net.fabricmc:yarn:${project.extra["yarn_mappings"]}:v2")
-    modImplementation("net.fabricmc:fabric-loader:${project.extra["loader_version"]}")
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
-    modImplementation("net.fabricmc.fabric-api:fabric-api:${project.extra["fabric_version"]}")
-
-    // Uncomment the following line to enable the deprecated Fabric API modules. 
-    // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
-    // "modImplementation"("net.fabricmc.fabric-api:fabric-api-deprecated:${project.extra["fabric_version"]}")
-
-    // ↓ 开发测试用
-    modRuntimeOnly("com.terraformersmc:modmenu:${project.extra["modmenu_version"]}")
-}
-
-tasks.processResources {
-    inputs.property("version", project.version)
-
-    filesMatching("fabric.mod.json") {
-        expand("version" to project.version)
-    }
-}
-
-tasks.withType<JavaCompile> {
-    options.release.set(21)
-}
-
-java {
-    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-    // if it is present.
-    // If you remove this line, sources will not be generated.
-    withSourcesJar()
-
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
-}
-
-tasks.jar {
-    from("LICENSE") {
-        rename { "${it}_${project.base.archivesName.get()}" } }
-}
-
-tasks.remapJar{
-    // https://docs.gradle.org/current/dsl/org.gradle.api.tasks.bundling.Jar.html#org.gradle.api.tasks.bundling.Jar:archiveFileName
-    // 用这个属性设置jar包的文件名格式
-    // 别用上面那个Jar任务的配置，会被remapJar覆盖掉
-    archiveFileName = "${project.base.archivesName.get()}-${project.version} mc${project.extra["minecraft_version"]}.jar"}
-tasks.remapSourcesJar{
-    archiveFileName = "${project.base.archivesName.get()}-${project.version} mc${project.extra["minecraft_version"]}-sources.jar"}
-
-// configure the maven publication
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-        // Notice: This block does NOT have the same function as the block in the top level.
-        // The repositories here will be used for publishing your artifact, not for
-        // retrieving dependencies.
-    }
-}

gradle.properties

@@ -4,18 +4,20 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.5
+minecraft_version=1.19.1
-yarn_mappings=1.21.5+build.1
+yarn_mappings=1.19.1+build.6
-loader_version=0.16.10
+loader_version=0.15.7
 
 # Mod Properties
-mod_version=0.3.5
+mod_version=0.2.5
 maven_group=xyz.thewhitedog9487
-archives_base_name=RandomTeleporter
+archives_base_name=randomteleporter
 
 # Dependencies
-fabric_version=0.119.5+1.21.5
+fabric_version=0.58.5+1.19.1
 
-# https://modrinth.com/mod/modmenu/versions
+loom_libraries_base=https://bmclapi2.bangbang93.com/maven/
-# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu
+loom_resources_base=https://bmclapi2.bangbang93.com/assets/
-modmenu_version=14.0.0-rc.2
+loom_version_manifests=https://bmclapi2.bangbang93.com/mc/game/version_manifest.json
+loom_experimental_versions=https://maven.fabricmc.net/net/minecraft/experimental_versions.json
+loom_fabric_repository=https://repository.hanbings.io/proxy/

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

@@ -0,0 +1,11 @@
+pluginManagement {
+	repositories {
+		maven {
+			name = 'Fabric'
+			url = 'https://maven.aliyun.com/repository/gradle-plugin'
+			url = 'https://maven.fabricmc.net/'
+		}
+		mavenCentral()
+		gradlePluginPortal()
+	}
+}

settings.gradle.kts

@@ -1,9 +0,0 @@
-pluginManagement {
-    repositories {
-        maven {
-            name = "Fabric"
-            url = uri("https://maven.fabricmc.net/") }
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}

src/client/resources/randomteleporter.client.mixins.json

@@ -1,7 +1,7 @@
 {
 	"required": false,
 	"package": "xyz.thewhitedog9487.mixin.client",
-	"compatibilityLevel": "JAVA_21",
+	"compatibilityLevel": "JAVA_17",
 	"client": [
 
 	],

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

@@ -1,48 +1,28 @@
 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.minecraft.block.Blocks;
 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.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec2f;
+import net.minecraft.util.math.Vec3d;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.HashSet;
 import java.util.SplittableRandom;
 
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
 
 public class CommandRegister {
-
+    // https://zh.minecraft.wiki/w/%E4%B8%96%E7%95%8C%E7%95%8C%E9%99%90
-    /**
+    // https://minecraft.wiki/w/World_boundary
-     * 世界边界
+    final static long WorldBoundary = (long) 2.9e7;
-     * <br>
+    static byte Retry = 0;
-     * @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>
+    static byte PermissionLevel = 2;
-     * @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
@@ -56,11 +36,11 @@ public class CommandRegister {
         CommandRegistrationCallback.EVENT
                 .register((dispatcher, registryAccess, environment) -> {
                     dispatcher.register(literal(Name)
-                            .then(argument("Radius(半径)", IntegerArgumentType.integer())
+                            .then(argument("Radius(半径)", LongArgumentType.longArg())
                                     .requires(source -> source.hasPermissionLevel(PermissionLevel))
                                     .executes(context -> execute_command(
                                             context.getSource(),
-                                            IntegerArgumentType.getInteger(context, "Radius(半径)"),
+                                            LongArgumentType.getLong(context, "Radius(半径)"),
                                             null,
                                             null))));});
 
@@ -80,12 +60,12 @@ public class CommandRegister {
         CommandRegistrationCallback.EVENT
                 .register((dispatcher, registryAccess, environment) -> {
                     dispatcher.register(literal(Name)
-                            .then(argument("Radius(半径)", IntegerArgumentType.integer())
+                            .then(argument("Radius(半径)", LongArgumentType.longArg())
                                     .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
                                             .requires(source -> source.hasPermissionLevel(PermissionLevel))
                                             .executes(context -> execute_command(
                                                     context.getSource(),
-                                                    IntegerArgumentType.getInteger(context, "Radius(半径)"),
+                                                    LongArgumentType.getLong(context, "Radius(半径)"),
                                                     EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
                                                     null)))));});
 
@@ -94,11 +74,11 @@ public class CommandRegister {
                 .register((dispatcher, registryAccess, environment) -> {
                     dispatcher.register(literal(Name)
                             .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
-                                .then(argument("Radius(半径)", IntegerArgumentType.integer())
+                                .then(argument("Radius(半径)", LongArgumentType.longArg())
                                             .requires(source -> source.hasPermissionLevel(PermissionLevel))
                                             .executes(context -> execute_command(
                                                     context.getSource(),
-                                                    IntegerArgumentType.getInteger(context, "Radius(半径)"),
+                                                    LongArgumentType.getLong(context, "Radius(半径)"),
                                                     EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
                                                     null)))));});
 
@@ -114,149 +94,119 @@ 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(半径)", IntegerArgumentType.integer())
+                            .then(argument("Radius(半径)", LongArgumentType.longArg())
-                                    .then(argument("OriginPos(随机中心，坐标)",Vec2ArgumentType.vec2())
+                                    .then(argument("OriginPos(随机中心，坐标)",Vec3ArgumentType.vec3())
                                             .requires(source -> source.hasPermissionLevel(PermissionLevel))
                                             .executes(context -> execute_command(
                                                     context.getSource(),
-                                                    IntegerArgumentType.getInteger(context, "Radius(半径)"),
+                                                    LongArgumentType.getLong(context, "Radius(半径)"),
                                                     null,
-                                                    Vec2ArgumentType.getVec2(context,"OriginPos(随机中心，坐标)"))))));});
+                                                    Vec3ArgumentType.getVec3(context,"OriginPos(随机中心，坐标)"))))));});
 
         // /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginEntity(随机中心，实体)>
         CommandRegistrationCallback.EVENT
                 .register((dispatcher, registryAccess, environment) -> {
                     dispatcher.register(literal(Name)
-                            .then(argument("Radius(半径)", IntegerArgumentType.integer())
+                            .then(argument("Radius(半径)", LongArgumentType.longArg())
                                     .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
                                             .then(argument("OriginEntity(随机中心，实体)",EntityArgumentType.entity())
                                                     .requires(source -> source.hasPermissionLevel(PermissionLevel))
-                                                    .executes(context -> execute_command(
+                                                    .executes(context -> execute_command_origin(
                                                             context.getSource(),
-                                                            IntegerArgumentType.getInteger(context, "Radius(半径)"),
+                                                            LongArgumentType.getLong(context, "Radius(半径)"),
                                                             EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
-                                                            new Vec2f( (float) EntityArgumentType.getEntity( context,"OriginEntity(随机中心，实体)").getPos().x,
+                                                            EntityArgumentType.getEntity(context,"OriginEntity(随机中心，实体)")))))));});
-                                                                    (float) EntityArgumentType.getEntity( context,"OriginEntity(随机中心，实体)").getPos().z )))))));});
 
         // /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginPos(随机中心，坐标)>
         CommandRegistrationCallback.EVENT
                 .register((dispatcher, registryAccess, environment) -> {
                     dispatcher.register(literal(Name)
-                            .then(argument("Radius(半径)", IntegerArgumentType.integer())
+                            .then(argument("Radius(半径)", LongArgumentType.longArg())
                                     .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
-                                            .then(argument("OriginPos(随机中心，坐标)",Vec2ArgumentType.vec2())
+                                            .then(argument("OriginPos(随机中心，坐标)",Vec3ArgumentType.vec3())
                                                     .requires(source -> source.hasPermissionLevel(PermissionLevel))
                                                     .executes(context -> execute_command(
                                                             context.getSource(),
-                                                            IntegerArgumentType.getInteger(context, "Radius(半径)"),
+                                                            LongArgumentType.getLong(context, "Radius(半径)"),
                                                             EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
-                                                            Vec2ArgumentType.getVec2(context,"OriginPos(随机中心，坐标)")))))));});
+                                                            Vec3ArgumentType.getVec3(context,"OriginPos(随机中心，坐标)")))))));});
 
         // /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginEntity(随机中心，实体)>
         CommandRegistrationCallback.EVENT
                 .register((dispatcher, registryAccess, environment) -> {
                     dispatcher.register(literal(Name)
                             .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
-                                    .then(argument("Radius(半径)", IntegerArgumentType.integer())
+                                    .then(argument("Radius(半径)", LongArgumentType.longArg())
                                             .then(argument("OriginEntity(随机中心，实体)",EntityArgumentType.entity())
                                                     .requires(source -> source.hasPermissionLevel(PermissionLevel))
-                                                    .executes(context -> execute_command(
+                                                    .executes(context -> execute_command_origin(
                                                             context.getSource(),
-                                                            IntegerArgumentType.getInteger(context, "Radius(半径)"),
+                                                            LongArgumentType.getLong(context, "Radius(半径)"),
                                                             EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
-                                                            new Vec2f( (float) EntityArgumentType.getEntity( context,"OriginEntity(随机中心，实体)").getPos().x,
+                                                            EntityArgumentType.getEntity(context,"OriginEntity(随机中心，实体)")))))));});
-                                                                    (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(半径)", IntegerArgumentType.integer())
+                                    .then(argument("Radius(半径)", LongArgumentType.longArg())
-                                            .then(argument("OriginPos(随机中心，坐标)",Vec2ArgumentType.vec2())
+                                            .then(argument("OriginPos(随机中心，坐标)",Vec3ArgumentType.vec3())
                                                     .requires(source -> source.hasPermissionLevel(PermissionLevel))
                                                     .executes(context -> execute_command(
                                                             context.getSource(),
-                                                            IntegerArgumentType.getInteger(context, "Radius(半径)"),
+                                                            LongArgumentType.getLong(context, "Radius(半径)"),
                                                             EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
-                                                            Vec2ArgumentType.getVec2(context,"OriginPos(随机中心，坐标)")))))));});}
+                                                            Vec3ArgumentType.getVec3(context,"OriginPos(随机中心，坐标)")))))));});}
-
-    /**
-     * 向游戏内注册命令
-     * <br>
-     * 是 {@link CommandRegister#Register(String)} 的包装器
-     * @see CommandRegister#Register(String)
-     */
     public static void Register(){
         Register("随机传送");
-        Register("rtp");
+        Register("rtp");}
-    }
+    static int execute_command(ServerCommandSource Source, @Nullable Long Radius, @Nullable Entity Player, @Nullable Vec3d Origin){
-
-    /**
-     *
-     * @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;
-        /*
-            ↑
-            Entity entity = null;
-            if (Player == null){
-                entity = Source.getPlayer();}
-            else{
-                entity = Player;}
-         */
         if (entity == null) {
-            Source.sendFeedback(()->{ return  Text.translatableWithFallback("error.no_target","不存在被传送目标，由非玩家物体执行命令时请显式指定被传送玩家ID"); }, true);
+            Source.sendFeedback(Text.translatable("error.twd.rtp.not_player"), true);
             return -1;}
-        if (Radius == null){Radius = (int) (WorldBorder - 1e4);}
+        if (Radius == null){Radius = WorldBoundary - (long) 1e4;}
-        // ↑ 远离世界边界
         Radius = Math.abs(Radius);
-        int Coordinate_X;
+        long Coordinate_X;
-        int Coordinate_Z;
+        long Coordinate_Z;
         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{
-            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;
-        for (var CurrentBlock = Source.getWorld().getBlockState(new BlockPos(Coordinate_X, Coordinate_Y, Coordinate_Z)).getBlock();
+        for (;
-             // 从世界顶层往下找，直到遇到一个非空气方块
+             Blocks.AIR == Source.getWorld().getBlockState(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getBlock() ||
-             Blocks.AIR == CurrentBlock ||
+             Blocks.VOID_AIR == Source.getWorld().getBlockState(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getBlock() ||
-             Blocks.VOID_AIR == CurrentBlock ||
+             Blocks.CAVE_AIR == Source.getWorld().getBlockState(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getBlock()
-             Blocks.CAVE_AIR == CurrentBlock
+                ;Coordinate_Y--){}
-                ;CurrentBlock = Source.getWorld().getBlockState(new BlockPos(Coordinate_X, Coordinate_Y, Coordinate_Z)).getBlock()){
+        if (Blocks.WATER == Source.getWorld().getBlockState(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getBlock() ||
-            Coordinate_Y--;}
+            Blocks.LAVA == Source.getWorld().getBlockState(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getBlock()){
             for (int x = -1; x <= 1; x++) {
                 for (int z = -1; z <= 1; z++) {
-                    // 如果传送到的位置周围一圈是空气、水或岩浆，将其替换为玻璃
+                    Source.getWorld().setBlockState(new BlockPos(Math.toIntExact(Coordinate_X - x), Coordinate_Y, Math.toIntExact(Coordinate_Z - z)), Blocks.GLASS.getDefaultState());}}}
-                    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 ||
-                        CurrentBlock == Blocks.CAVE_AIR ||
-                        CurrentBlock == Blocks.WATER ||
-                        CurrentBlock == Blocks.LAVA ){
-                        // 只替换空气、水和岩浆，其余保留
-                            Source.getWorld().setBlockState(BlockPos, Blocks.GLASS.getDefaultState());}}}
 //        if ( String.valueOf(entity.getWorld().getBiome(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getKey()).equals("minecraft:the_void") ) {
 //            Coordinate_Y++;}
         Coordinate_Y++;
-        // ↑ 高一层，人别站在土里了
+        Vec3d Coordinate = new Vec3d(Coordinate_X, Coordinate_Y, Coordinate_Z);
-        entity.teleport(Source.getWorld(),Coordinate_X + 0.5, Coordinate_Y, Coordinate_Z + 0.5, new HashSet<>(), entity.getYaw(), entity.getPitch(), false);
+        if (Radius == WorldBoundary && Retry < 126 && entity.getPos().distanceTo(Coordinate) < 1e5){
-        int finalCoordinate_Y = Coordinate_Y;
+            Retry++;
-        // ↑ "lambda 表达式中使用的变量应为 final 或有效 final"
+            execute_command(Source, Radius,null, Origin);
-        final var FeedbackFallbackString = String.format("已将玩家%s传送到%d %d %d", entity.getName().getString(), Coordinate_X, finalCoordinate_Y, Coordinate_Z);
+            return 0;}
-        Source.sendFeedback(()->{ return  Text.translatableWithFallback("info.success", FeedbackFallbackString, entity.getName(), Coordinate_X, finalCoordinate_Y, Coordinate_Z); },true);
+        if (Retry >= 126){
-        return 16;}
+            Source.sendFeedback(Text.translatable("warning.twd.rtp.retry"), true);}
+        entity.teleport(Coordinate_X + 0.5, Coordinate_Y, Coordinate_Z + 0.5);
+        final long FinalCoordinate_X = Coordinate_X;
+        final int FinalCoordinate_Y = Coordinate_Y;
+        final long FinalCoordinate_Z = Coordinate_Z;
+        Source.sendFeedback(Text.translatable("info.twd.rtp.success", entity.getName(), FinalCoordinate_X, FinalCoordinate_Y, FinalCoordinate_Z),true);
+        return 0;}
+    static int execute_command_origin(ServerCommandSource Source, @Nullable Long Radius, @Nullable Entity Player, Entity Origin){
+        return execute_command(Source, Radius, Player, Origin.getPos());}
 }

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

@@ -16,10 +16,7 @@ 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.
-		LOGGER.info("RandomTeleporter Loading!");
-
 		CommandRegister.Register();
-
+		LOGGER.info("Hello Fabric world!");
-		LOGGER.info("RandomTeleporter Loaded!");
 	}
 }

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

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

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

@@ -1,7 +1,9 @@
 {
   "modmenu.nameTranslation.randomteleporter": "随机传送",
   "modmenu.descriptionTranslation.randomteleporter": "增加了两个用于随机传送的命令",
-  "info.success": "已将玩家%s传送到%d %d %d",
+  "info.twd.rtp.success": "已将玩家%s传送到%d %d %d",
-  "error.no_target": "不存在被传送目标，由非玩家物体执行命令时请显式指定被传送玩家ID",
+  "error.twd.rtp.not_player": "执行命令的不是玩家",
-  "bilibili": "TheWhiteDog9487的哔哩哔哩主页"
+  "warning.twd.rtp.retry": "重试次数过大，为避免死循环将在本次传送中取消距离保护",
+  "twd.bilibili": "哔哩哔哩主页",
+  "twd.blog": "TheWhiteDog9487的博客"
 }

src/main/resources/fabric.mod.json

@@ -27,10 +27,10 @@
 		}
 	],
 	"depends": {
-		"fabricloader": ">=0.16.10",
+		"fabricloader": ">=0.15.7",
-		"minecraft": "1.21.5",
+		"minecraft": "~1.19.1",
-		"java": ">=21",
+		"java": ">=17",
-		"fabric-api": ">=0.119.5"
+		"fabric-api": "*"
 	},
 	"suggests": {
 		"another-mod": "*"
@@ -38,6 +38,7 @@
 	"custom": {
 		"modmenu": {
 			"links": {
-				"bilibili": "https://space.bilibili.com/401746666"},
+				"twd.bilibili": "https://space.bilibili.com/401746666",
+				"twd.blog": "www.thewhitedog9487.xyz"},
 			"update_checker": true}}
 }

src/main/resources/randomteleporter.mixins.json

@@ -1,7 +1,7 @@
 {
 	"required": false,
 	"package": "xyz.thewhitedog9487.mixin",
-	"compatibilityLevel": "JAVA_21",
+	"compatibilityLevel": "JAVA_17",
 	"mixins": [
 
 	],