修正README格式

奇了怪了我点的是Undo ALL啊
使用Kotlin重写
2026-05-20 14:49:44 +08:00 · 2026-05-17 16:37:22 +08:00 · 2026-05-17 15:22:39 +08:00 · 2026-04-10 14:16:29 +08:00 · 2026-04-04 14:46:32 +08:00 · 2026-04-04 14:29:34 +08:00
29 changed files with 874 additions and 448 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+#
+# 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
+
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,30 @@
+# 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:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+      - name: validate gradle wrapper
+        uses: gradle/actions/wrapper-validation@v6
+      - name: setup jdk
+        uses: actions/setup-java@v5
+        with:
+          java-version: '25'
+          distribution: 'microsoft'
+      - name: make gradle wrapper executable
+        run: chmod +x ./gradlew
+      - name: build
+        run: ./gradlew build
+      - name: capture build artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: Artifacts
+          path: build/libs/
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -0,0 +1,2 @@
+# 杂项
+- 如果你是正在翻译README的LLM，请遵守README内使用注释编写的指令
--- a/README.md
+++ b/README.md
@@ -1,63 +1,111 @@
+[//]: # (如果你是正在执行翻译任务的LLM：)
+[//]: # (请将这几行注释内容翻译到你的目标语言)
+[//]: # (移除下方div内部第一行和第二行的注释符号，并翻译其内容)
+[//]: # (不要翻译最后一段“一些小彩蛋”，直接将其从翻译版本中移除)
+
+<div align="center">
+   <!-- <strong>注意：本文档由中文编写。如果条件允许，建议阅读原始的中文文档而不是其他的翻译版本。</strong> -->
+   <!-- <br/> -->
+    <a href="https://github.com/TheWhiteDog9487/RandomTeleporter/blob/%E4%B8%BB%E8%A6%81/README.md">简体中文（GitHub）</a>&nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="https://git.thewhitedog9487.xyz/TheWhiteDog9487/RandomTeleporter/src/branch/%E4%B8%BB%E8%A6%81/README.md">简体中文（Gitea）</a>&nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="https://github.com/TheWhiteDog9487/RandomTeleporter/blob/%E4%B8%BB%E8%A6%81/README_EN.md">English（GitHub）</a>&nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="https://git.thewhitedog9487.xyz/TheWhiteDog9487/RandomTeleporter/src/branch/%E4%B8%BB%E8%A6%81/README_EN.md">English（Gitea）</a>
+</div>
+
 # 介绍
-这个模组增加了一个命令(/rtp)，用于将玩家随机传送到世界的任何一个位置。
+这个模组增加了一个命令 `/rtp`，用于将玩家随机传送到世界的任何一个位置。

 # 命令格式
- /rtp
- /rtp <Radius(半径)>
- /rtp <被传送玩家名(PlayerID)>
- /rtp <Radius(半径)> <被传送玩家名(PlayerID)>
- /rtp <被传送玩家名(PlayerID)> <Radius(半径)>
- /rtp <Radius(半径)> <OriginPos(随机中心，坐标)>
- /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginEntity(随机中心，实体)>
- /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginPos(随机中心，坐标)>
- /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginEntity(随机中心，实体)>
- /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginPos(随机中心，坐标)>
+- `/rtp`
+- `/rtp back`
+- `/rtp back <被传送玩家ID>`
+- `/rtp <被传送玩家ID> back`
+- `/rtp <随机半径>`
+- `/rtp <被传送玩家ID>`
+- `/rtp <随机半径> <被传送玩家ID>`
+- `/rtp <被传送玩家ID> <随机半径>`
+- `/rtp <随机半径> <随机中心点坐标>`
+- `/rtp <随机半径> <被传送玩家ID> <作为随机中心的实体>`
+- `/rtp <随机半径> <被传送玩家ID> <随机中心点坐标>`
+- `/rtp <被传送玩家ID> <随机半径> <作为随机中心的实体>`
+- `/rtp <被传送玩家ID> <随机半径> <随机中心点坐标>`
+- `/rtp <随机区域起点坐标> <随机区域终点坐标>`
+- `/rtp <随机区域起点坐标> <随机区域终点坐标> <被传送玩家ID>`
+- `/rtp <被传送玩家ID> <随机区域起点坐标> <随机区域终点坐标>`
+- `/rtp <随机区域起点实体> <随机区域终点实体>`
+- `/rtp <随机区域起点实体> <随机区域终点实体> <被传送玩家ID>`

 ## 命令示例
- /rtp  
-将执行命令的玩家随机传送到以(0,0)为中心点，2.9e7 - 1e4作为随机半径的范围内的随机一点  
-2.9e+7 = 2.9 x 10^7 = 29000000 = 两千九百万  
-1e4 = 10^4 = 10000 = 一万
+- `/rtp`  
+将执行命令的玩家随机传送到以`(0,0)`为中心点， $2.9 \times 10^7 - 10^4$ 作为随机半径的范围内的随机一点  
+$2.9 \times 10^7 = 29,000,000$ = 两千九百万  
+$10^4 = 10,000$ = 一万

- /rtp 1000  
-将执行命令的玩家随机传送到以(0,0)为中心点，1000作为随机半径的范围内的随机一点
+- `/rtp back`  
+将执行命令的玩家传送回最近一次使用随机传送前的位置  
+**注意：这个功能保存的上一次随机传送前的位置信息只会在游戏（服务器）运行期间存在，游戏（服务器）关闭后就会丢失**

- /rtp TheWhiteDog9487  
-将TheWhiteDog9487随机传送到以(0,0)为中心点，2.9e7 - 1e4作为随机半径的范围内的随机一点  
+- `/rtp back TheWhiteDog9487`  
+将TheWhiteDog9487传送回其最近一次使用随机传送前的位置

- /rtp TheWhiteDog9487 1000  
-将TheWhiteDog9487随机传送到以(0,0)为中心点，1000作为随机半径的范围内的随机一点  
+- `/rtp TheWhiteDog9487 back`  
+将TheWhiteDog9487传送回其最近一次使用随机传送前的位置

- /rtp 1000 TheWhiteDog9487  
-将TheWhiteDog9487随机传送到以(0,0)为中心点，1000作为随机半径的范围内的随机一点  
+- `/rtp 1000`  
+将执行命令的玩家随机传送到以`(0,0)`为中心点，1000作为随机半径的范围内的随机一点

- /rtp 1000 10000 ~ 10000  
-将执行命令的玩家随机传送到以(10000,10000)为中心点，1000作为随机半径的范围内的随机一点  
-提示：按照道理来说中心坐标是不需要高度（Y轴）的，但由于坐标的类型是Vec3d，所以还是要写高度的。  
-至于高度的具体数值，随便写，代码里也没用到过。  
+- `/rtp TheWhiteDog9487`  
+将TheWhiteDog9487随机传送到以`(0,0)`为中心点， $2.9 \times 10^7 - 10^4$ 作为随机半径的范围内的随机一点  

- /rtp 1000 TheWhiteDog9487 TheWhiteDog_CN  
+- `/rtp TheWhiteDog9487 1000`  
+将TheWhiteDog9487随机传送到以`(0,0)`为中心点，1000作为随机半径的范围内的随机一点  
+
+- `/rtp 1000 TheWhiteDog9487`  
+将TheWhiteDog9487随机传送到以`(0,0)`为中心点，1000作为随机半径的范围内的随机一点  
+
+- `/rtp 1000 10000 10000`  
+将执行命令的玩家随机传送到以`(10000,10000)`为中心点，1000作为随机半径的范围内的随机一点
+
+- `/rtp 1000 TheWhiteDog9487 TheWhiteDog_CN`  
 将TheWhiteDog9487随机传送到以TheWhiteDog_CN所在位置为中心点，1000作为随机半径的范围内的随机一点  

- /rtp 1000 TheWhiteDog9487 10000 ~ 10000  
-将TheWhiteDog9487随机传送到以(10000,10000)为中心点，1000作为随机半径的范围内的随机一点  
+- `/rtp 1000 TheWhiteDog9487 10000 10000`  
+将TheWhiteDog9487随机传送到以`(10000,10000)`为中心点，1000作为随机半径的范围内的随机一点  

- /rtp TheWhiteDog9487 1000 TheWhiteDog_CN  
+- `/rtp TheWhiteDog9487 1000 TheWhiteDog_CN`  
 将TheWhiteDog9487随机传送到以TheWhiteDog_CN所在位置为中心点，1000作为随机半径的范围内的随机一点  

- /rtp TheWhiteDog9487 1000 10000 ~ 10000  
-将TheWhiteDog9487随机传送到以(10000,10000)为中心点，1000作为随机半径的范围内的随机一点  
+- `/rtp TheWhiteDog9487 1000 10000 10000`  
+将TheWhiteDog9487随机传送到以`(10000,10000)`为中心点，1000作为随机半径的范围内的随机一点  
+
+- `/rtp 10000.0 10000.0 20000.0 20000.0`  
+将执行命令的玩家随机传送到以`(10000,10000)`,`(20000,10000)`,`(20000,20000)`,`(10000,20000)`四个顶点围成的长方形区域内的随机一点  
+您需要提供的坐标是这个长方形的任意一个顶点和这个顶点对应的斜对角顶点的位置
+
+- `/rtp TheWhiteDog9487 10000.0 10000.0 20000.0 20000.0`  
+将TheWhiteDog9487随机传送到以`(10000,10000)`,`(20000,10000)`,`(20000,20000)`,`(10000,20000)`四个顶点围成的长方形区域内的随机一点  
+
+- `/rtp 10000.0 10000.0 20000.0 20000.0 TheWhiteDog9487`  
+将TheWhiteDog9487随机传送到以`(10000,10000)`,`(20000,10000)`,`(20000,20000)`,`(10000,20000)`四个顶点围成的长方形区域内的随机一点
+
+- `/rtp TheWhiteDog9487 TheWhiteDog_CN`  
+将命令执行者传送到以TheWhiteDog9487和TheWhiteDog_CN当前所在位置为对角线的长方形区域内的随机一点
+
+- `/rtp TheWhiteDog9487 TheWhiteDog_CN TheWhiteDog4568`  
+将TheWhiteDog4568随机传送到以TheWhiteDog9487和TheWhiteDog_CN当前所在位置为对角线的长方形区域内的随机一点

 ### 特别提示
-/rtp <Radius(半径)> <Origin(随机中心，实体)> 这种格式不存在。  
+`/rtp <随机半径> <作为随机中心的实体>` 这种格式不存在。  
 因为第二个参数可能是被传送玩家名，也可能是做随机中心点的实体。  
 这两种都是实体类型，无法区分到底是哪一种，存在歧义。  
+同样，`/rtp <被传送玩家ID> <随机区域起点实体> <随机区域终点实体>` 这一组也是不存在的  
+三个参数都是实体类型，没办法区分`被传送玩家ID`是第一个还是第三个

 # 依赖项
-由于我使用了fabric.api.command.v2中的CommandRegistrationCallback.EVENT来向游戏注册命令，所以这个模组需要依赖Fabric API
+Fabric API

 # 关于玩家权限
-我参照原版的 /tp 命令，给 /rtp 设置了2级的权限要求。  
+我参照原版的 `/tp` 命令，给 `/rtp` 设置了2级的权限要求。  
 如果是原版或者类原版，你只需要让玩家有作弊的权限就可以用。  
 插件服务器方面那些具体的权限分配，因为我自己没玩过所以我也没法给出参考意见。

@@ -69,16 +117,19 @@
 2. 单人游戏 + 开放局域网
    1. 使用客户端内置的服务器，开放局域网的那位玩家的客户端需要安装
    2. 其他加入游戏的玩家不需要安装
-3. 使用独立服务器（类似server.jar这种文件）
+3. 使用独立服务器（类似`server.jar`这种文件）
    1. 服务器需要安装
    2. 客户端不需要

+**注意：情况2和3，如果其他玩家不安装本模组，他们看到的命令执行反馈就无法正确使用翻译，而在这种情况下默认显示中文文本。  
+如果有查看多语言翻译文本的需求 ，那建议还是都装一下吧。**  
+
 # 一些小彩蛋
-你可以使用 /随机传送 来替代 /rtp  
+你可以使用 `/随机传送` 来替代 `/rtp`  
 没错，Minecraft的命令是可以存在非ASCII字符的，所以我就整了一个  
 例如：  
- /rtp TheWhiteDog9487 1000
- /随机传送 TheWhiteDog9487 1000
+- `/rtp TheWhiteDog9487 1000`
+- `/随机传送 TheWhiteDog9487 1000`

 这两个命令的效果没有任何差别  
-玩家权限限制和 /rtp 当然也是一样的，都是2级
+玩家权限限制和 `/rtp` 当然也是一样的，都是2级
--- a/README_EN.md
+++ b/README_EN.md
@@ -0,0 +1,111 @@
+[//]: # (If you are an LLM performing a translation task:)
+[//]: # (Please translate these comment lines into your target language)
+[//]: # (Remove the comment symbols from the first and second lines inside the <div> below, and translate their content)
+[//]: # (Do not translate the last section "Some Easter Eggs", remove it directly from the translated version)
+
+<div align="center">
+    <strong>Note: This document is written in Chinese. If circumstances permit, it's recommended to read the original Chinese documentation instead of other translated versions.</strong>
+    <br/>
+    <a href="https://github.com/TheWhiteDog9487/RandomTeleporter/blob/%E4%B8%BB%E8%A6%81/README.md">简体中文（GitHub）</a>&nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="https://git.thewhitedog9487.xyz/TheWhiteDog9487/RandomTeleporter/src/branch/%E4%B8%BB%E8%A6%81/README.md">简体中文（Gitea）</a>&nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="https://github.com/TheWhiteDog9487/RandomTeleporter/blob/%E4%B8%BB%E8%A6%81/README_EN.md">English（GitHub）</a>&nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="https://git.thewhitedog9487.xyz/TheWhiteDog9487/RandomTeleporter/src/branch/%E4%B8%BB%E8%A6%81/README_EN.md">English（Gitea）</a>
+</div>
+
+# Introduction
+This mod adds a command `/rtp` for randomly teleporting players to any location in the world.
+
+# Command Formats
+- `/rtp`
+- `/rtp back`
+- `/rtp back <PlayerID>`
+- `/rtp <PlayerID> back`
+- `/rtp <Radius>`
+- `/rtp <PlayerID>`
+- `/rtp <Radius> <PlayerID>`
+- `/rtp <PlayerID> <Radius>`
+- `/rtp <Radius> <OriginPos>`
+- `/rtp <Radius> <PlayerID> <OriginEntity>`
+- `/rtp <Radius> <PlayerID> <OriginPos>`
+- `/rtp <PlayerID> <Radius> <OriginEntity>`
+- `/rtp <PlayerID> <Radius> <OriginPos>`
+- `/rtp <RegionFromPos> <RegionToPos>`
+- `/rtp <RegionFromPos> <RegionToPos> <PlayerID>`
+- `/rtp <PlayerID> <RegionFromPos> <RegionToPos>`
+- `/rtp <RegionFromEntity> <RegionToEntity>`
+- `/rtp <RegionFromEntity> <RegionToEntity> <PlayerID>`
+
+## Command Examples
+- `/rtp`  
+Teleports the player executing the command to a random point within a radius of $2.9 \times 10^7 - 10^4$ centered at `(0,0)`.  
+$2.9 \times 10^7 = 29,000,000$
+$10^4 = 10,000$
+
+- `/rtp back`  
+Teleports the player back to their position before the last random teleport.  
+**Note: The previous position information is only stored during the game (server) session and will be lost after the game (server) is closed.**
+
+- `/rtp back TheWhiteDog9487`  
+Teleports `TheWhiteDog9487` back to their position before their last random teleport.
+
+- `/rtp TheWhiteDog9487 back`  
+Teleports `TheWhiteDog9487` back to their position before their last random teleport.
+
+- `/rtp 1000`  
+Teleports the player to a random point within a radius of `1000` centered at `(0,0)`.
+
+- `/rtp TheWhiteDog9487`  
+Teleports `TheWhiteDog9487` to a random point within a radius of $2.9 \times 10^7 - 10^4$ centered at `(0,0)`.
+
+- `/rtp TheWhiteDog9487 1000`  
+Teleports `TheWhiteDog9487` to a random point within a radius of `1000` centered at `(0,0)`.
+
+- `/rtp 1000 TheWhiteDog9487`  
+Teleports `TheWhiteDog9487` to a random point within a radius of `1000` centered at `(0,0)`.
+
+- `/rtp 1000 10000 10000`  
+Teleports the player to a random point within a radius of `1000` centered at `(10000,10000)`.
+
+- `/rtp 1000 TheWhiteDog9487 TheWhiteDog_CN`  
+Teleports `TheWhiteDog9487` to a random point within a radius of `1000` centered at `TheWhiteDog_CN`'s location.
+
+- `/rtp 1000 TheWhiteDog9487 10000 10000`  
+Teleports `TheWhiteDog9487` to a random point within a radius of `1000` centered at `(10000,10000)`.
+
+- `/rtp TheWhiteDog9487 1000 TheWhiteDog_CN`  
+Teleports `TheWhiteDog9487` to a random point within a radius of `1000` centered at `TheWhiteDog_CN`'s location.
+
+- `/rtp TheWhiteDog9487 1000 10000 10000`  
+Teleports `TheWhiteDog9487` to a random point within a radius of `1000` centered at `(10000,10000)`.
+
+- `/rtp 10000.0 10000.0 20000.0 20000.0`  
+Teleports the player to a random point within a rectangular region formed by vertices `(10000,10000)`, `(20000,10000)`, `(20000,20000)`, and `(10000,20000)`.  
+You need to provide any vertex and its diagonally opposite vertex of this rectangle.
+
+- `/rtp TheWhiteDog9487 10000.0 10000.0 20000.0 20000.0`  
+Teleports `TheWhiteDog9487` to a random point within the same rectangular region described above.
+
+- `/rtp 10000.0 10000.0 20000.0 20000.0 TheWhiteDog9487`  
+Teleports `TheWhiteDog9487` to a random point within the same rectangular region described above.
+
+- `/rtp TheWhiteDog9487 TheWhiteDog_CN`  
+Teleports the command executor to a random point within a rectangular region where `TheWhiteDog9487` and `TheWhiteDog_CN`'s current positions are diagonals.
+
+- `/rtp TheWhiteDog9487 TheWhiteDog_CN TheWhiteDog4568`  
+Teleports `TheWhiteDog4568` to a random point within a rectangular region where `TheWhiteDog9487` and `TheWhiteDog_CN`'s current positions are diagonals.
+
+### Special Notes
+The format `/rtp <Radius> <OriginEntity>` does not exist because the second parameter could be either the teleported player's name or the entity serving as the random center. Both are entity types, leading to ambiguity. Similarly, `/rtp <PlayerID> <RegionFromEntity> <RegionToEntity>` is also absent as all three parameters are entity types, making it impossible to distinguish the player ID.
+
+# Dependencies
+Fabric API
+
+# Player Permissions
+Following the standard `/tp` command, `/rtp` requires a permission level of `2`. For vanilla or vanilla-like servers, players only need "cheats" enabled. For plugin-based servers, specific permission management depends on your setup.
+
+# Installation: Client or Server?
+- **Singleplayer**: Install on the client.
+- **Singleplayer + Open to LAN**: Install on the host client. Other players do not need to install it.
+- **Dedicated Server**: Install on the server. Clients do not strictly need to install it.
+
+**Note**: In multiplayer scenarios, if clients do not have the mod installed, they will see command feedback in the server's default language (currently Chinese). Installing the mod on both sides is recommended for full multi-language support.
--- a/build.gradle
+++ b/build.gradle
@@ -1,91 +0,0 @@
-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.
-	}
-}
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -0,0 +1,106 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    id("net.fabricmc.fabric-loom")
+    `maven-publish`
+    id("org.jetbrains.kotlin.jvm") version "2.3.21"
+}
+
+version = providers.gradleProperty("mod_version").get()
+group = providers.gradleProperty("maven_group").get()
+
+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 {
+        register("randomteleporter") {
+            sourceSet(sourceSets.main.get())
+            sourceSet(sourceSets.getByName("client"))
+        }
+    }
+}
+
+dependencies {
+    // To change the versions see the gradle.properties file
+    minecraft("com.mojang:minecraft:${providers.gradleProperty("minecraft_version").get()}")
+
+    implementation("net.fabricmc:fabric-loader:${providers.gradleProperty("loader_version").get()}")
+
+    // Fabric API. This is technically optional, but you probably want it anyway.
+    implementation("net.fabricmc.fabric-api:fabric-api:${providers.gradleProperty("fabric_api_version").get()}")
+    implementation("net.fabricmc:fabric-language-kotlin:${providers.gradleProperty("fabric_kotlin_version").get()}")
+
+    // 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"]}")
+
+    // ↓ 开发测试用
+//    runtimeOnly("com.terraformersmc:modmenu:${project.extra["modmenu_version"]}")
+}
+
+
+tasks.processResources {
+    val version = version
+    inputs.property("version", version)
+
+    filesMatching("fabric.mod.json") {
+        expand("version" to version)
+    }
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    options.release = 25 }
+
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_25 } }
+
+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_25
+    targetCompatibility = JavaVersion.VERSION_25 }
+
+tasks.jar {
+    val projectName = project.name
+    inputs.property("projectName", projectName)
+
+    from("LICENSE") {
+        rename { "${it}_$projectName" } }
+
+    // https://docs.gradle.org/current/dsl/org.gradle.api.tasks.bundling.Jar.html#org.gradle.api.tasks.bundling.Jar:archiveFileName
+    archiveFileName = "RandomTeleporter-${project.version} mc${project.extra["minecraft_version"]}.jar"}
+
+tasks.named<Jar>("sourcesJar") {
+    archiveFileName = "RandomTeleporter-${project.version} mc${project.extra["minecraft_version"]}-sources.jar"}
+
+// configure the maven publication
+publishing {
+    publications {
+        register<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.
+    }
+}
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,20 +4,18 @@ org.gradle.parallel=true

 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.3
-loader_version=0.15.7
+minecraft_version=26.1.2
+loader_version=0.18.6
+loom_version=1.16-SNAPSHOT
+fabric_kotlin_version=1.13.11+kotlin.2.3.21

 # Mod Properties
-mod_version=0.2.5
+mod_version=0.5.2
 maven_group=xyz.thewhitedog9487
-archives_base_name=randomteleporter

 # Dependencies
-fabric_version=0.96.1+1.20.4
+fabric_api_version=0.145.4+26.1.2

-loom_libraries_base=https://bmclapi2.bangbang93.com/maven/
-loom_resources_base=https://bmclapi2.bangbang93.com/assets/
-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/
+# https://modrinth.com/mod/modmenu/versions
+# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu
+modmenu_version=18.0.0-alpha.8
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/27
+++ b/27
@@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#

 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,6 @@ case "$( uname )" in                #(
  NONSTOP* )        nonstop=true ;;
 esac

-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


 # Determine the Java command to use to start the JVM.
@@ -145,7 +146,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
@@ -153,7 +154,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
      '' | soft) :;; #(
      *)
        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -170,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

    JAVACMD=$( cygpath --unix "$JAVACMD" )

@@ -202,16 +202,15 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
        "$@"

 # Stop when "xargs" is not available.
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute

-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2

 goto fail

@@ -57,22 +59,21 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 if exist "%JAVA_EXE%" goto execute

-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2

 goto fail

 :execute
@rem Setup the command line

-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*

 :end
@rem End local scope for the variables with windows NT shell
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,11 +0,0 @@
-pluginManagement {
-	repositories {
-		maven {
-			name = 'Fabric'
-			url = 'https://maven.aliyun.com/repository/gradle-plugin'
-			url = 'https://maven.fabricmc.net/'
-		}
-		mavenCentral()
-		gradlePluginPortal()
-	}
-}
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -0,0 +1,16 @@
+pluginManagement {
+    repositories {
+        maven {
+            name = "Fabric"
+            url = uri("https://maven.fabricmc.net/") }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+    plugins {
+        id("net.fabricmc.fabric-loom") version providers.gradleProperty("loom_version")
+    }
+}
+
+// Should match your modid
+rootProject.name = "randomteleporter"
--- a/src/client/java/xyz/thewhitedog9487/RandomTeleporterClient.java
+++ b/src/client/java/xyz/thewhitedog9487/RandomTeleporterClient.java
@@ -1,10 +0,0 @@
-package xyz.thewhitedog9487;
-
-import net.fabricmc.api.ClientModInitializer;
-
-public class RandomTeleporterClient implements ClientModInitializer {
-	@Override
-	public void onInitializeClient() {
-		// This entrypoint is suitable for setting up client-specific logic, such as rendering.
-	}
-}
--- a/src/client/java/xyz/thewhitedog9487/client/mixin/ExampleClientMixin.java
+++ b/src/client/java/xyz/thewhitedog9487/client/mixin/ExampleClientMixin.java
@@ -1,12 +1,12 @@
-package xyz.thewhitedog9487.mixin.client;
+package xyz.thewhitedog9487.client.mixin;

-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Minecraft;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

-@Mixin(MinecraftClient.class)
+@Mixin(Minecraft.class)
 public class ExampleClientMixin {
 	@Inject(at = @At("HEAD"), method = "run")
 	private void run(CallbackInfo info) {
--- a/src/client/kotlin/xyz/thewhitedog9487/client/RandomTeleporterClient.kt
+++ b/src/client/kotlin/xyz/thewhitedog9487/client/RandomTeleporterClient.kt
@@ -0,0 +1,9 @@
+package xyz.thewhitedog9487.client
+
+import net.fabricmc.api.ClientModInitializer
+
+object RandomTeleporterClient : ClientModInitializer {
+	override fun onInitializeClient() {
+		// This entrypoint is suitable for setting up client-specific logic, such as rendering.
+	}
+}
--- a/src/client/resources/randomteleporter.client.mixins.json
+++ b/src/client/resources/randomteleporter.client.mixins.json
@@ -1,11 +1,14 @@
 {
-	"required": false,
-	"package": "xyz.thewhitedog9487.mixin.client",
-	"compatibilityLevel": "JAVA_17",
+	"required": true,
+	"package": "xyz.thewhitedog9487.client.mixin",
+	"compatibilityLevel": "JAVA_25",
 	"client": [
-
+		"ExampleClientMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1
+	},
+	"overwrites": {
+		"requireAnnotations": true
 	}
 }
--- a/src/main/java/xyz/thewhitedog9487/CommandRegister.java
+++ b/src/main/java/xyz/thewhitedog9487/CommandRegister.java
@@ -1,210 +0,0 @@
-package xyz.thewhitedog9487;
-
-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.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 org.jetbrains.annotations.Nullable;
-
-import java.util.SplittableRandom;
-
-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 Retry = 0;
-    static byte PermissionLevel = 2;
-    public static void Register(String Name){
-        // /rtp
-        CommandRegistrationCallback.EVENT
-                .register((dispatcher, registryAccess, environment) ->{
-                    dispatcher.register(literal(Name)
-                            .requires(source -> source.hasPermissionLevel(PermissionLevel))
-                            .executes(context -> execute_command(
-                                    context.getSource(),null,null, null)));});
-
-        // /rtp <Radius(半径)>
-        CommandRegistrationCallback.EVENT
-                .register((dispatcher, registryAccess, environment) -> {
-                    dispatcher.register(literal(Name)
-                            .then(argument("Radius(半径)", LongArgumentType.longArg())
-                                    .requires(source -> source.hasPermissionLevel(PermissionLevel))
-                                    .executes(context -> execute_command(
-                                            context.getSource(),
-                                            LongArgumentType.getLong(context, "Radius(半径)"),
-                                            null,
-                                            null))));});
-
-        // /rtp <被传送玩家名(PlayerID)>
-        CommandRegistrationCallback.EVENT
-                .register((dispatcher, registryAccess, environment) -> {
-                    dispatcher.register(literal(Name)
-                            .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
-                                    .requires(source -> source.hasPermissionLevel(PermissionLevel))
-                                    .executes(context -> execute_command(
-                                            context.getSource(),
-                                            null,
-                                            EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
-                                            null))));});
-
-        // /rtp <Radius(半径)> <被传送玩家名(PlayerID)>
-        CommandRegistrationCallback.EVENT
-                .register((dispatcher, registryAccess, environment) -> {
-                    dispatcher.register(literal(Name)
-                            .then(argument("Radius(半径)", LongArgumentType.longArg())
-                                    .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
-                                            .requires(source -> source.hasPermissionLevel(PermissionLevel))
-                                            .executes(context -> execute_command(
-                                                    context.getSource(),
-                                                    LongArgumentType.getLong(context, "Radius(半径)"),
-                                                    EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
-                                                    null)))));});
-
-        // /rtp <被传送玩家名(PlayerID)> <Radius(半径)>
-        CommandRegistrationCallback.EVENT
-                .register((dispatcher, registryAccess, environment) -> {
-                    dispatcher.register(literal(Name)
-                            .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
-                                .then(argument("Radius(半径)", LongArgumentType.longArg())
-                                            .requires(source -> source.hasPermissionLevel(PermissionLevel))
-                                            .executes(context -> execute_command(
-                                                    context.getSource(),
-                                                    LongArgumentType.getLong(context, "Radius(半径)"),
-                                                    EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
-                                                    null)))));});
-
-//        // /rtp <Radius(半径)> <Origin(随机中心)>
-//        CommandRegistrationCallback.EVENT
-//                .register((dispatcher, registryAccess, environment) -> {
-//                    dispatcher.register(literal(Name)
-//                            .then(argument("Radius(半径)", LongArgumentType.longArg())
-//                                    .then(argument("Origin(随机中心)",EntityArgumentType.player())
-//                                        .requires(source -> source.hasPermissionLevel(PermissionLevel))
-//                                        .executes(context -> execute_command_origin(
-//                                                context.getSource(),
-//                                                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())
-                                            .requires(source -> source.hasPermissionLevel(PermissionLevel))
-                                            .executes(context -> execute_command(
-                                                    context.getSource(),
-                                                    LongArgumentType.getLong(context, "Radius(半径)"),
-                                                    null,
-                                                    Vec3ArgumentType.getVec3(context,"OriginPos(随机中心，坐标)"))))));});
-
-        // /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginEntity(随机中心，实体)>
-        CommandRegistrationCallback.EVENT
-                .register((dispatcher, registryAccess, environment) -> {
-                    dispatcher.register(literal(Name)
-                            .then(argument("Radius(半径)", LongArgumentType.longArg())
-                                    .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
-                                            .then(argument("OriginEntity(随机中心，实体)",EntityArgumentType.entity())
-                                                    .requires(source -> source.hasPermissionLevel(PermissionLevel))
-                                                    .executes(context -> execute_command_origin(
-                                                            context.getSource(),
-                                                            LongArgumentType.getLong(context, "Radius(半径)"),
-                                                            EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
-                                                            EntityArgumentType.getEntity(context,"OriginEntity(随机中心，实体)")))))));});
-
-        // /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginPos(随机中心，坐标)>
-        CommandRegistrationCallback.EVENT
-                .register((dispatcher, registryAccess, environment) -> {
-                    dispatcher.register(literal(Name)
-                            .then(argument("Radius(半径)", LongArgumentType.longArg())
-                                    .then(argument("被传送玩家名(PlayerID)", EntityArgumentType.entity())
-                                            .then(argument("OriginPos(随机中心，坐标)",Vec3ArgumentType.vec3())
-                                                    .requires(source -> source.hasPermissionLevel(PermissionLevel))
-                                                    .executes(context -> execute_command(
-                                                            context.getSource(),
-                                                            LongArgumentType.getLong(context, "Radius(半径)"),
-                                                            EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
-                                                            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(半径)", LongArgumentType.longArg())
-                                            .then(argument("OriginEntity(随机中心，实体)",EntityArgumentType.entity())
-                                                    .requires(source -> source.hasPermissionLevel(PermissionLevel))
-                                                    .executes(context -> execute_command_origin(
-                                                            context.getSource(),
-                                                            LongArgumentType.getLong(context, "Radius(半径)"),
-                                                            EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
-                                                            EntityArgumentType.getEntity(context,"OriginEntity(随机中心，实体)")))))));});
-
-        // /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())
-                                                    .requires(source -> source.hasPermissionLevel(PermissionLevel))
-                                                    .executes(context -> execute_command(
-                                                            context.getSource(),
-                                                            LongArgumentType.getLong(context, "Radius(半径)"),
-                                                            EntityArgumentType.getEntity(context,"被传送玩家名(PlayerID)"),
-                                                            Vec3ArgumentType.getVec3(context,"OriginPos(随机中心，坐标)")))))));});}
-    public static void Register(){
-        Register("随机传送");
-        Register("rtp");}
-    static int execute_command(ServerCommandSource Source, @Nullable Long Radius, @Nullable Entity Player, @Nullable Vec3d Origin){
-        Entity entity = Player == null ? Source.getPlayer() : Player;
-        if (entity == null) {
-            Source.sendFeedback(()->{ return  Text.translatable("error.twd.rtp.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);}
-        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));}
-        int Coordinate_Y = 320;
-        for (;
-             Blocks.AIR == Source.getWorld().getBlockState(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getBlock() ||
-             Blocks.VOID_AIR == Source.getWorld().getBlockState(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getBlock() ||
-             Blocks.CAVE_AIR == Source.getWorld().getBlockState(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getBlock()
-                ;Coordinate_Y--){}
-        if (Blocks.WATER == Source.getWorld().getBlockState(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getBlock() ||
-            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());}}}
-//        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);
-        if (Radius == WorldBorder && Retry < 126 && entity.getPos().distanceTo(Coordinate) < 1e5){
-            Retry++;
-            execute_command(Source, Radius,null, Origin);
-            return 0;}
-        if (Retry >= 126){
-            Source.sendFeedback(()->{ return  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(()->{ return  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());}
-}
--- a/src/main/java/xyz/thewhitedog9487/RandomTeleporter.java
+++ b/src/main/java/xyz/thewhitedog9487/RandomTeleporter.java
@@ -1,22 +0,0 @@
-package xyz.thewhitedog9487;
-
-import net.fabricmc.api.ModInitializer;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class RandomTeleporter implements ModInitializer {
-	// This logger is used to write text to the console and the log file.
-	// It is considered best practice to use your mod id as the logger's name.
-	// That way, it's clear which mod wrote info, warnings, and errors.
-    public static final Logger LOGGER = LoggerFactory.getLogger("randomteleporter");
-
-	@Override
-	public void onInitialize() {
-		// 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("Hello Fabric world!");
-	}
-}
--- a/src/main/java/xyz/thewhitedog9487/mixin/ExampleMixin.java
+++ b/src/main/java/xyz/thewhitedog9487/mixin/ExampleMixin.java
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(MinecraftServer.class)
 public class ExampleMixin {
-	@Inject(at = @At("HEAD"), method = "loadWorld")
+	@Inject(at = @At("HEAD"), method = "loadLevel")
 	private void init(CallbackInfo info) {
 		// This code is injected into the start of MinecraftServer.loadWorld()V
 	}
--- a/src/main/kotlin/xyz/thewhitedog9487/CommandRegister.kt
+++ b/src/main/kotlin/xyz/thewhitedog9487/CommandRegister.kt
@@ -0,0 +1,331 @@
+package xyz.thewhitedog9487
+
+import com.mojang.brigadier.Command
+import com.mojang.brigadier.arguments.IntegerArgumentType
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback
+import net.minecraft.commands.CommandSourceStack
+import net.minecraft.commands.Commands
+import net.minecraft.commands.arguments.EntityArgument
+import net.minecraft.commands.arguments.coordinates.Vec2Argument
+import net.minecraft.core.BlockPos
+import net.minecraft.network.chat.Component
+import net.minecraft.server.commands.TeleportCommand
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.world.entity.Entity
+import net.minecraft.world.level.block.Block
+import net.minecraft.world.level.block.Blocks
+import net.minecraft.world.level.chunk.status.ChunkStatus
+import net.minecraft.world.level.levelgen.Heightmap.Types.MOTION_BLOCKING_NO_LEAVES
+import net.minecraft.world.phys.Vec2
+import net.minecraft.world.phys.Vec3
+import java.util.*
+import kotlin.math.absoluteValue
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.random.Random
+import kotlin.random.nextInt
+
+/**
+ * 传送后用于生成保护平台的方块
+ */
+val TargetBlock = Blocks.GLASS
+
+/**
+ * 传送后会被 [TargetBlock] 替换掉的方块
+ * <br></br>
+ * 替换中心：被传送目标脚下方块
+ * <br></br>
+ * 替换范围：替换中心周围半径为一的正方形区域
+ */
+val ReplaceToTargetBlock = setOf<Block?>(
+    Blocks.AIR,
+    Blocks.VOID_AIR,
+    Blocks.CAVE_AIR,
+    Blocks.WATER,
+    Blocks.LAVA,
+    Blocks.SHORT_GRASS,
+    Blocks.VINE )
+
+/**
+ * 世界边界
+ * <br></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>
+ **/
+const val WorldBorder = 2.9e7.toInt()
+
+/**
+ * 执行命令所需权限等级
+ * @see TeleportCommand
+ * @see Commands
+ * @see <a href="https://zh.minecraft.wiki/w/%E6%9D%83%E9%99%90%E7%AD%89%E7%BA%A7">Minecraft Wiki (中文)</a>
+ * @see <a href="https://minecraft.wiki/w/Permission_level">Minecraft Wiki (English)</a>
+ */
+val PermissionLevel = Commands.LEVEL_GAMEMASTERS
+
+/**
+ * 在传送之前记录当前位置，以支持传送回去
+ */
+var OldPositions: MutableMap<UUID, Vec3> = HashMap<UUID, Vec3>()
+
+/**
+ * 命令执行失败时的返回值
+ * @see <a href="https://zh.minecraft.wiki/w/%E5%91%BD%E4%BB%A4#%E7%BB%93%E6%9E%9C">Minecraft Wiki (中文)</a>
+ * @see <a href="https://minecraft.wiki/w/Commands">Minecraft Wiki (English)</a>
+ */
+const val CommandExecuteFailure = 0
+
+/**
+ * 根命令名
+ */
+val CommandRootNodeName = setOf(
+    "随机传送",
+    "rtp" )
+/**
+ * 使用Fabric API向游戏内注册命令
+ * <br>
+ * @see <a href="https://docs.fabricmc.net/zh_cn/develop/commands/basics">Fabric Docs (中文)</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 Docs (English)</a>
+ * @see <a href="https://wiki.fabricmc.net/tutorial:commands">Fabric Wiki (English)</a>
+ */
+fun CommandRegister() {
+    for (RootNodeName in CommandRootNodeName) {
+        CommandRegistrationCallback.EVENT.register { dispatcher, context, selection ->
+            dispatcher.register(Commands.literal(RootNodeName)
+                // /rtp
+                .requires(Commands.hasPermission(PermissionLevel))
+                .executes{ commandContext -> ExecuteCommand(commandContext.source) }
+
+                // /rtp back
+                .then(Commands.literal("back")
+                    .requires(Commands.hasPermission(PermissionLevel))
+                    .executes { commandContext -> TeleportBack(commandContext.source) } )
+
+                // /rtp back <PlayerID(被传送玩家名)>
+                .then(Commands.literal("back")
+                    .then(Commands.argument(CommandArgumentName_Target, EntityArgument.entity())
+                        .requires(Commands.hasPermission(PermissionLevel))
+                        .executes { commandContext -> TeleportBack(commandContext.source,
+                            EntityArgument.getEntity(commandContext, CommandArgumentName_Target)) } ) )
+
+                // /rtp <PlayerID(被传送玩家名)> back
+                .then(Commands.argument(CommandArgumentName_Target, EntityArgument.entity())
+                    .then(Commands.literal("back")
+                        .requires(Commands.hasPermission(PermissionLevel))
+                        .executes { commandContext -> TeleportBack(commandContext.source,
+                            EntityArgument.getEntity(commandContext, CommandArgumentName_Target)) } ) )
+
+                // /rtp <Radius(半径)>
+                .then(Commands.argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
+                    .requires(Commands.hasPermission(PermissionLevel))
+                    .executes { commandContext -> ExecuteCommand(commandContext.source,
+                        Radius = IntegerArgumentType.getInteger(commandContext, CommandArgumentName_Radius)) } )
+
+                // /rtp <PlayerID(被传送玩家名)>
+                .then(Commands.argument(CommandArgumentName_Target, EntityArgument.entity())
+                    .requires(Commands.hasPermission(PermissionLevel))
+                    .executes { commandContext -> ExecuteCommand(commandContext.source,
+                        Entity = EntityArgument.getEntity(commandContext, CommandArgumentName_Target)) } )
+
+                // /rtp <Radius(半径)> <PlayerID(被传送玩家名)>
+                .then(Commands.argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
+                    .then(Commands.argument(CommandArgumentName_Target, EntityArgument.entity())
+                        .requires(Commands.hasPermission(PermissionLevel))
+                        .executes { commandContext -> ExecuteCommand(commandContext.source,
+                            Radius = IntegerArgumentType.getInteger(commandContext, CommandArgumentName_Radius),
+                            Entity = EntityArgument.getEntity(commandContext, CommandArgumentName_Target)) } ) )
+
+                // /rtp <PlayerID(被传送玩家名)> <Radius(半径)>
+                .then(Commands.argument(CommandArgumentName_Target, EntityArgument.entity())
+                    .then(Commands.argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
+                        .requires(Commands.hasPermission(PermissionLevel))
+                        .executes { commandContext -> ExecuteCommand(commandContext.source,
+                            Radius = IntegerArgumentType.getInteger(commandContext, CommandArgumentName_Radius),
+                            Entity = EntityArgument.getEntity(commandContext, CommandArgumentName_Target)) } ) )
+
+                // /rtp <Radius(半径)> <OriginPos(随机中心，坐标)>
+                .then(Commands.argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
+                    .then(Commands.argument(CommandArgumentName_OriginPosition, Vec2Argument.vec2())
+                        .requires(Commands.hasPermission(PermissionLevel))
+                        .executes { commandContext -> ExecuteCommand(commandContext.source,
+                            Radius = IntegerArgumentType.getInteger(commandContext, CommandArgumentName_Radius),
+                            Origin = Vec2Argument.getVec2(commandContext, CommandArgumentName_OriginPosition)) } ) )
+
+                // /rtp <Radius(半径)> <PlayerID(被传送玩家名)> <OriginEntity(随机中心，实体)>
+                .then(Commands.argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
+                    .then(Commands.argument(CommandArgumentName_Target, EntityArgument.entity())
+                        .then(Commands.argument(CommandArgumentName_OriginEntity, EntityArgument.entity())
+                            .requires(Commands.hasPermission(PermissionLevel))
+                            .executes { commandContext -> ExecuteCommand(commandContext.source,
+                                Radius = IntegerArgumentType.getInteger(commandContext, CommandArgumentName_Radius),
+                                Entity = EntityArgument.getEntity(commandContext, CommandArgumentName_Target),
+                                Origin = Vec2(
+                                    EntityArgument.getEntity(commandContext, CommandArgumentName_OriginEntity).position().x.toFloat(),
+                                    EntityArgument.getEntity(commandContext, CommandArgumentName_OriginEntity).position().z.toFloat() ) ) } ) ) )
+
+                // /rtp <Radius(半径)> <PlayerID(被传送玩家名)> <OriginPos(随机中心，坐标)>
+                .then(Commands.argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
+                    .then(Commands.argument(CommandArgumentName_Target, EntityArgument.entity())
+                        .then(Commands.argument(CommandArgumentName_OriginPosition, Vec2Argument.vec2())
+                            .requires(Commands.hasPermission(PermissionLevel))
+                            .executes { commandContext -> ExecuteCommand(commandContext.source,
+                                Radius = IntegerArgumentType.getInteger(commandContext, CommandArgumentName_Radius),
+                                Entity = EntityArgument.getEntity(commandContext, CommandArgumentName_Target),
+                                Origin = Vec2Argument.getVec2(commandContext, CommandArgumentName_OriginPosition) ) } ) ) )
+
+                // /rtp <PlayerID(被传送玩家名)> <Radius(半径)> <OriginEntity(随机中心，实体)>
+                .then(Commands.argument(CommandArgumentName_Target, EntityArgument.entity())
+                    .then(Commands.argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
+                        .then(Commands.argument(CommandArgumentName_OriginEntity, EntityArgument.entity())
+                            .requires(Commands.hasPermission(PermissionLevel))
+                            .executes { commandContext -> ExecuteCommand(commandContext.source,
+                                Radius = IntegerArgumentType.getInteger(commandContext, CommandArgumentName_Radius),
+                                Entity = EntityArgument.getEntity(commandContext, CommandArgumentName_Target),
+                                Origin = Vec2(
+                                    EntityArgument.getEntity(commandContext, CommandArgumentName_OriginEntity).position().x.toFloat(),
+                                    EntityArgument.getEntity(commandContext, CommandArgumentName_OriginEntity).position().z.toFloat() ) ) } ) ) )
+
+                // /rtp <PlayerID(被传送玩家名)> <Radius(半径)> <OriginPos(随机中心，坐标)>
+                .then(Commands.argument(CommandArgumentName_Target, EntityArgument.entity())
+                    .then(Commands.argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
+                        .then(Commands.argument(CommandArgumentName_OriginPosition, Vec2Argument.vec2())
+                            .requires(Commands.hasPermission(PermissionLevel))
+                            .executes { commandContext -> ExecuteCommand(commandContext.source,
+                                Radius = IntegerArgumentType.getInteger(commandContext, CommandArgumentName_Radius),
+                                Entity = EntityArgument.getEntity(commandContext, CommandArgumentName_Target),
+                                Origin = Vec2Argument.getVec2(commandContext, CommandArgumentName_OriginPosition) ) } ) ) )
+
+                // /rtp <RegionFrom(随机区域起点，坐标)> <RegionTo(随机区域终点，坐标)>
+                .then(Commands.argument(CommandArgumentName_RegionFromPosition, Vec2Argument.vec2())
+                    .then(Commands.argument(CommandArgumentName_RegionToPosition, Vec2Argument.vec2())
+                        .requires(Commands.hasPermission(PermissionLevel))
+                        .executes { commandContext -> ExecuteCommand(commandContext.source,
+                            RegionFrom = Vec2Argument.getVec2(commandContext, CommandArgumentName_RegionFromPosition),
+                            RegionTo = Vec2Argument.getVec2(commandContext, CommandArgumentName_RegionToPosition) ) } ) )
+
+                // /rtp <RegionFrom(随机区域起点，坐标)> <RegionTo(随机区域终点，坐标)> <PlayerID(被传送玩家名)>
+                .then(Commands.argument(CommandArgumentName_RegionFromPosition, Vec2Argument.vec2())
+                    .then(Commands.argument(CommandArgumentName_RegionToPosition, Vec2Argument.vec2())
+                        .then(Commands.argument(CommandArgumentName_Target, EntityArgument.entity())
+                            .requires(Commands.hasPermission(PermissionLevel))
+                            .executes { commandContext -> ExecuteCommand(commandContext.source,
+                                Entity = EntityArgument.getEntity(commandContext, CommandArgumentName_Target),
+                                RegionFrom = Vec2Argument.getVec2(commandContext, CommandArgumentName_RegionFromPosition),
+                                RegionTo = Vec2Argument.getVec2(commandContext, CommandArgumentName_RegionToPosition) ) } ) ) )
+
+                // /rtp <PlayerID(被传送玩家名)> <RegionFrom(随机区域起点，坐标)> <RegionTo(随机区域终点，坐标)>
+                .then(Commands.argument(CommandArgumentName_Target, EntityArgument.entity())
+                    .then(Commands.argument(CommandArgumentName_RegionFromPosition, Vec2Argument.vec2())
+                        .then(Commands.argument(CommandArgumentName_RegionToPosition, Vec2Argument.vec2())
+                            .requires(Commands.hasPermission(PermissionLevel))
+                            .executes { commandContext -> ExecuteCommand(commandContext.source,
+                                Entity = EntityArgument.getEntity(commandContext, CommandArgumentName_Target),
+                                RegionFrom = Vec2Argument.getVec2(commandContext, CommandArgumentName_RegionFromPosition),
+                                RegionTo = Vec2Argument.getVec2(commandContext, CommandArgumentName_RegionToPosition) ) } ) ) )
+
+                // /rtp <RegionFrom(随机区域起点，实体)> <RegionTo(随机区域终点，实体)>
+                .then(Commands.argument(CommandArgumentName_RegionFromEntity, EntityArgument.entity())
+                    .then(Commands.argument(CommandArgumentName_RegionToEntity, EntityArgument.entity())
+                        .requires(Commands.hasPermission(PermissionLevel))
+                        .executes { commandContext -> ExecuteCommand(commandContext.source,
+                            RegionFrom = Vec2(
+                                EntityArgument.getEntity(commandContext, CommandArgumentName_RegionFromEntity).position().x.toFloat(),
+                                EntityArgument.getEntity(commandContext, CommandArgumentName_RegionFromEntity).position().z.toFloat() ),
+                            RegionTo = Vec2(
+                                EntityArgument.getEntity(commandContext, CommandArgumentName_RegionToEntity).position().x.toFloat(),
+                                EntityArgument.getEntity(commandContext, CommandArgumentName_RegionToEntity).position().z.toFloat() ) ) } ) )
+
+                // /rtp <RegionFrom(随机区域起点，实体)> <RegionTo(随机区域终点，实体)> <PlayerID(被传送玩家名)>
+                .then(Commands.argument(CommandArgumentName_RegionFromEntity, EntityArgument.entity())
+                    .then(Commands.argument(CommandArgumentName_RegionToEntity, EntityArgument.entity())
+                        .then(Commands.argument(CommandArgumentName_Target, EntityArgument.entity())
+                            .requires(Commands.hasPermission(PermissionLevel))
+                            .executes { commandContext -> ExecuteCommand(commandContext.source,
+                                Entity = EntityArgument.getEntity(commandContext, CommandArgumentName_Target),
+                                RegionFrom = Vec2(
+                                    EntityArgument.getEntity(commandContext, CommandArgumentName_RegionFromEntity).position().x.toFloat(),
+                                    EntityArgument.getEntity(commandContext, CommandArgumentName_RegionFromEntity).position().z.toFloat() ),
+                                RegionTo = Vec2(
+                                    EntityArgument.getEntity(commandContext, CommandArgumentName_RegionToEntity).position().x.toFloat(),
+                                    EntityArgument.getEntity(commandContext, CommandArgumentName_RegionToEntity).position().z.toFloat() ) ) } ) ) )
+            ) } } }
+
+fun ExecuteCommand(
+    Source: CommandSourceStack,
+    Radius: Int = WorldBorder - 1e4.toInt(),
+    Entity: Entity? = Source.player,
+    Origin: Vec2? = null,
+    RegionFrom: Vec2? = null,
+    RegionTo: Vec2? = null ): Int {
+
+    val TargetEntity = Entity ?: run {
+            Source.sendFailure( Component.translatableWithFallback("error.no_target","不存在被传送目标，由非玩家物体执行命令时请显式指定被传送玩家ID") )
+            return CommandExecuteFailure }
+    val RandomRadius = Radius.absoluteValue.toFloat()
+
+    var (RandomRegionFrom, RandomRegionTo) = if (RegionFrom == null && RegionTo == null) Pair(
+        Vec2(-RandomRadius, -RandomRadius), Vec2(RandomRadius, RandomRadius) )
+    else Pair(
+        Vec2(min(RegionFrom!!.x, RegionTo!!.x), min(RegionFrom.y, RegionTo.y)),
+        Vec2(max(RegionFrom.x, RegionTo.x), max(RegionFrom.y, RegionTo.y)))
+
+    if (Origin != null) {
+        RandomRegionFrom = Vec2(Origin.x - RandomRadius, Origin.y - RandomRadius)
+        RandomRegionTo = Vec2(Origin.x + RandomRadius, Origin.y + RandomRadius) }
+
+    var (TargetX, TargetZ) = Pair(
+        Random.nextInt(RandomRegionFrom.x.toInt() until RandomRegionTo.x.toInt() + 1),
+        Random.nextInt(RandomRegionFrom.y.toInt() until RandomRegionTo.y.toInt() + 1) )
+    TargetX = Math.clamp(TargetX.toLong(), -(WorldBorder - 1e4).toInt(), WorldBorder - 1e4.toInt() )
+    TargetZ = Math.clamp(TargetZ.toLong(), -(WorldBorder - 1e4).toInt(), WorldBorder - 1e4.toInt() )
+
+    val EntityWorld = TargetEntity.level()
+    EntityWorld.getChunk(TargetX shr 4, TargetZ shr 4, ChunkStatus.FULL, true)
+    val TargetY = EntityWorld.getHeight(MOTION_BLOCKING_NO_LEAVES, TargetX, TargetZ)
+    val BlockPosInstance = BlockPos.MutableBlockPos()
+    for (x in -1..1) {
+        for (z in -1..1) {
+            BlockPosInstance.set(TargetX - x, TargetY - 1, TargetZ - z)
+            val CurrentBlock = EntityWorld.getBlockState(BlockPosInstance).block
+            if (ReplaceToTargetBlock.contains(CurrentBlock)) {
+                EntityWorld.setBlockAndUpdate(BlockPosInstance, TargetBlock.defaultBlockState()) } } }
+    OldPositions[TargetEntity.uuid] = TargetEntity.position()
+    TargetEntity.teleportTo(EntityWorld as ServerLevel, TargetX + 0.5, TargetY.toDouble(), TargetZ + 0.5, setOf(), TargetEntity.yRot, TargetEntity.xRot, false)
+    val FeedbackFallbackString = String.format("已将玩家%s传送到%d %d %d", TargetEntity.name.string, TargetX, TargetY, TargetZ)
+    Source.sendSuccess({ Component.translatableWithFallback("info.success", FeedbackFallbackString, TargetEntity.name, TargetX, TargetY, TargetZ) }, true)
+    return Command.SINGLE_SUCCESS }
+
+fun TeleportBack(Source: CommandSourceStack,
+                 TargetEntity: Entity? = Source.player): Int {
+
+    if (TargetEntity == null) {
+        Source.sendFailure(
+            Component.translatableWithFallback(
+                "error.no_target",
+                "不存在被传送目标，由非玩家物体执行命令时请显式指定被传送玩家ID"))
+        return CommandExecuteFailure }
+    OldPositions[TargetEntity.uuid].also {
+        if (it == null) {
+            Source.sendFailure(
+                Component.translatableWithFallback(
+                    "error.no_old_position",
+                    "%s还未使用过随机传送，因此无法回溯",
+                    TargetEntity.name.string ) )
+            return@TeleportBack CommandExecuteFailure }
+
+        TargetEntity.teleportTo(
+            TargetEntity.level() as ServerLevel,
+            it.x,
+            it.y,
+            it.z,
+            setOf(),
+            TargetEntity.yRot,
+            TargetEntity.xRot,
+            false)
+        Source.sendSuccess({
+            Component.translatableWithFallback(
+                "info.success.back",
+                "已将玩家%s传送回原位置",
+                TargetEntity.name.string ) }, true)
+        return@TeleportBack Command.SINGLE_SUCCESS } }
--- a/src/main/kotlin/xyz/thewhitedog9487/RandomTeleporter.kt
+++ b/src/main/kotlin/xyz/thewhitedog9487/RandomTeleporter.kt
@@ -0,0 +1,25 @@
+package xyz.thewhitedog9487
+
+import net.fabricmc.api.ModInitializer
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+const val ModID: String = "randomteleporter"
+val ModLogger: Logger = LoggerFactory.getLogger(ModID)
+
+object RandomTeleporter : ModInitializer {
+
+	override fun onInitialize() {
+		// 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.
+
+		// 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.
+
+		ServerLifecycleListenerRegister()
+		ResourceReloaderListenerRegister()
+		CommandRegister()
+		ModLogger.info("RandomTeleporter已写入命令注册回调，目标命令将会在该注册的时候被注册")	}
+}
--- a/src/main/kotlin/xyz/thewhitedog9487/ResourceReloaderListener.kt
+++ b/src/main/kotlin/xyz/thewhitedog9487/ResourceReloaderListener.kt
@@ -0,0 +1,45 @@
+package xyz.thewhitedog9487
+
+import net.fabricmc.fabric.api.resource.v1.ResourceLoader
+import net.fabricmc.fabric.api.resource.v1.reloader.SimpleReloadListener
+import net.minecraft.network.chat.Component
+import net.minecraft.resources.Identifier
+import net.minecraft.server.packs.PackType
+import net.minecraft.server.packs.resources.PreparableReloadListener
+
+var CommandArgumentName_Radius = "Radius(半径)"
+var CommandArgumentName_Target = "PlayerID(被传送玩家名)"
+var CommandArgumentName_OriginPosition = "OriginPos(随机中心，坐标)"
+var CommandArgumentName_OriginEntity = "OriginEntity(随机中心，实体)"
+var CommandArgumentName_RegionFromPosition = "RegionFrom(随机范围起始位置，坐标)"
+var CommandArgumentName_RegionToPosition = "RegionTo(随机范围结束位置，坐标)"
+var CommandArgumentName_RegionFromEntity = "RegionFrom(随机范围起始位置，实体)"
+var CommandArgumentName_RegionToEntity = "RegionTo(随机范围结束位置，实体)"
+
+fun ResourceReloaderListenerRegister() {
+    ResourceLoader.get(PackType.CLIENT_RESOURCES).registerReloadListener(
+        Identifier.fromNamespaceAndPath(ModID,
+            "translate_text_apply"), object: SimpleReloadListener<Unit>() {
+            override fun prepare(p0: PreparableReloadListener.SharedState) {}
+
+            override fun apply(p0: Unit, p1: PreparableReloadListener.SharedState) {
+                CommandArgumentName_Radius =
+                    Component.translatableWithFallback("command.argument.radius", "Radius(半径)").string
+                CommandArgumentName_Target =
+                    Component.translatableWithFallback("command.argument.target", "PlayerID(被传送玩家名)").string
+                CommandArgumentName_OriginPosition =
+                    Component.translatableWithFallback("command.argument.origin_pos", "OriginPos(随机中心，坐标)").string
+                CommandArgumentName_OriginEntity =
+                    Component.translatableWithFallback("command.argument.origin_entity", "OriginEntity(随机中心，实体)").string
+                CommandArgumentName_RegionFromPosition = Component.translatableWithFallback(
+                    "command.argument.region_from_pos",
+                    "RegionFrom(随机范围起始位置，坐标)").string
+                CommandArgumentName_RegionToPosition = Component.translatableWithFallback(
+                    "command.argument.region_to_pos",
+                    "RegionTo(随机范围结束位置，坐标)").string
+                CommandArgumentName_RegionFromEntity = Component.translatableWithFallback(
+                    "command.argument.region_from_entity",
+                    "RegionFrom(随机范围起始位置，实体)").string
+                CommandArgumentName_RegionToEntity = Component.translatableWithFallback(
+                    "command.argument.region_to_entity",
+                    "RegionTo(随机范围结束位置，实体)").string } } ) }
--- a/src/main/kotlin/xyz/thewhitedog9487/ServerLifecycleListener.kt
+++ b/src/main/kotlin/xyz/thewhitedog9487/ServerLifecycleListener.kt
@@ -0,0 +1,8 @@
+package xyz.thewhitedog9487
+
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents
+
+fun ServerLifecycleListenerRegister() {
+    ServerLifecycleEvents.SERVER_STARTED.register { server ->
+        OldPositions.clear()
+        ModLogger.info("已清空传送历史记录") } }
--- a/src/main/resources/assets/randomteleporter/lang/en_us.json
+++ b/src/main/resources/assets/randomteleporter/lang/en_us.json
@@ -1,6 +1,17 @@
 {
  "modmenu.nameTranslation.randomteleporter": "RandomTeleporter",
  "modmenu.descriptionTranslation.randomteleporter": "Added two commands for random teleportation",
-  "twd.bilibili": "Bilibili",
-  "twd.blog": "Blog"
+  "info.success": "Teleported %s to %d %d %d",
+  "info.success.back": "Teleported %s back to original position",
+  "error.no_target": "There is no teleported target, and the teleported player ID is explicitly specified when executed by a non-player object",
+  "error.no_old_position": "%s has not used random teleport yet, so it cannot be traced back",
+  "bilibili": "Bilibili",
+  "command.argument.radius": "radius",
+  "command.argument.target": "teleported entity",
+  "command.argument.origin_pos": "origin(pos)",
+  "command.argument.origin_entity": "origin(entity)",
+  "command.argument.region_from_pos": "region start(pos)",
+  "command.argument.region_to_pos": "region end(pos)",
+  "command.argument.region_from_entity": "region start(entity)",
+  "command.argument.region_to_entity": "region end(entity)"
 }
--- a/src/main/resources/assets/randomteleporter/lang/zh_cn.json
+++ b/src/main/resources/assets/randomteleporter/lang/zh_cn.json
@@ -1,9 +1,17 @@
 {
  "modmenu.nameTranslation.randomteleporter": "随机传送",
  "modmenu.descriptionTranslation.randomteleporter": "增加了两个用于随机传送的命令",
-  "info.twd.rtp.success": "已将玩家%s传送到%d %d %d",
-  "error.twd.rtp.not_player": "执行命令的不是玩家",
-  "warning.twd.rtp.retry": "重试次数过大，为避免死循环将在本次传送中取消距离保护",
-  "twd.bilibili": "哔哩哔哩主页",
-  "twd.blog": "TheWhiteDog9487的博客"
+  "info.success": "已将玩家%s传送到%d %d %d",
+  "info.success.back": "已将玩家%s传送回原位置",
+  "error.no_target": "不存在被传送目标，由非玩家物体执行命令时请显式指定被传送玩家ID",
+  "error.no_old_position": "%s还未使用过随机传送，因此无法回溯",
+  "bilibili": "TheWhiteDog9487的哔哩哔哩主页",
+  "command.argument.radius": "半径",
+  "command.argument.target": "被传送实体",
+  "command.argument.origin_pos": "随机中心（坐标）",
+  "command.argument.origin_entity": "随机中心（实体）",
+  "command.argument.region_from_pos": "坐标选取区域起点（坐标）",
+  "command.argument.region_to_pos": "坐标选取区域终点（坐标）",
+  "command.argument.region_from_entity": "坐标选取区域起点（实体）",
+  "command.argument.region_to_entity": "坐标选取区域终点（实体）"
 }
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -17,7 +17,11 @@
 	"environment": "*",
 	"entrypoints": {
 		"main": [
-			"xyz.thewhitedog9487.RandomTeleporter"]
+			{
+				"value": "xyz.thewhitedog9487.RandomTeleporter",
+				"adapter": "kotlin"
+			}
+		]
 	},
 	"mixins": [
 		"randomteleporter.mixins.json",
@@ -27,10 +31,11 @@
 		}
 	],
 	"depends": {
-		"fabricloader": ">=0.15.6",
-		"minecraft": "~1.20.4",
-		"java": ">=17",
-		"fabric-api": "*"
+		"fabricloader": ">=0.18.6",
+		"minecraft": "26.1.2",
+		"java": ">=25",
+		"fabric-api": ">=0.145.4",
+		"fabric-language-kotlin": "*"
 	},
 	"suggests": {
 		"another-mod": "*"
@@ -38,7 +43,6 @@
 	"custom": {
 		"modmenu": {
 			"links": {
-				"twd.bilibili": "https://space.bilibili.com/401746666",
-				"twd.blog": "www.thewhitedog9487.xyz"},
+				"bilibili": "https://space.bilibili.com/401746666"},
 			"update_checker": true } }
 }
--- a/src/main/resources/randomteleporter.mixins.json
+++ b/src/main/resources/randomteleporter.mixins.json
@@ -1,11 +1,14 @@
 {
-	"required": false,
+	"required": true,
 	"package": "xyz.thewhitedog9487.mixin",
-	"compatibilityLevel": "JAVA_17",
+	"compatibilityLevel": "JAVA_25",
 	"mixins": [

 	],
 	"injectors": {
 		"defaultRequire": 1
+	},
+	"overwrites": {
+		"requireAnnotations": true
 	}
 }
Author	SHA1	Message	Date
TheWhiteDog9487	f83911a27e	修正README格式奇了怪了我点的是Undo ALL啊	2026-05-17 16:37:22 +08:00
TheWhiteDog9487	7254230a2c	使用Kotlin重写	2026-05-17 15:22:39 +08:00
TheWhiteDog9487	5f5172f65c	更新到Minecraft 26.1.2	2026-04-10 14:16:29 +08:00
TheWhiteDog9487	e8d7f56150	修复README的LaTeX不正确显示的问题行内LaTeX左右都需要空格	2026-04-04 14:46:32 +08:00
TheWhiteDog9487	6dff863d3f	0.5.2 支持Minecraft 26.1.1 增加回溯到随机传送前的位置的功能（愚人节OTA正式版，那相当有操作了（ AI写代码未必靠谱，但是翻译还是很不错的	2026-04-04 14:29:34 +08:00
TheWhiteDog9487	4137a166ae	0.5.1 支持Minecraft 26.1	2026-03-26 10:13:37 +08:00
TheWhiteDog9487	8b03098280	0.5.0 支持通过对角线坐标设置随机坐标选取范围远离边界这个保护的实现有问题，然后地狱末地什么玩意的也不对，重试机制也不存在，这些之后再鸽	2026-02-11 18:12:06 +08:00
TheWhiteDog9487	a0a6e1c35d	？为啥你是反过来的	2026-02-11 18:08:00 +08:00
TheWhiteDog9487	5f3ca6c68f	更新依赖项	2026-02-11 18:08:00 +08:00
TheWhiteDog9487	5788f78a4d	更新到Minecraft 1.21.11 再见了传奇耐更王，再见了Yarn 下一次相见时，就是没有源码混淆的Minecraft 26.1了	2026-02-11 18:08:00 +08:00
TheWhiteDog9487	2f5e154cc4	更换到Mojang官方反混淆表 https://fabricmc.net/2025/10/31/obfuscation.html	2026-02-11 18:07:59 +08:00
TheWhiteDog9487	c579c266a5	更新到Minecraft 1.21.10	2026-02-11 18:07:59 +08:00
TheWhiteDog9487	62c8267311	0.4.0 将命令参数文本抽离到各个文字的翻译文件内，现在只会显示当前语言的提示文字了但是单人游戏内切换语言后必须重进世界才能完成游戏内热更新，并且独立服务器用不了这个特性，开放局域网的话应该是跟随主机的语言配置	2026-02-11 18:07:58 +08:00
TheWhiteDog9487	74046be828	使用Minecraft内部方法搜索指定坐标内可传送玩家的合适Y 更换大量new BlockPos为BlockPos.Mutable	2025-10-05 14:18:43 +08:00
TheWhiteDog9487	33e01b3d35	现在被传送实体会在自己所在世界内被传送，不会受到命令执行方所在世界和自己不一致的影响重命名函数和变量	2025-10-05 14:14:16 +08:00
TheWhiteDog9487	e7f9ac069a	将随机数生成器需要被替换的方块列表和替换目标方块提取到静态常量并且让随机数的上界+1以使随机范围成为完整闭区间	2025-10-05 14:11:00 +08:00
TheWhiteDog9487	eb85fff326	使单个根名称的命令树一次性完成注册并且现在由Minecraft自己的命令解析器确保用户输入的随机半径>=0 返回标准Command.SINGLE_SUCCESS	2025-10-05 14:09:11 +08:00
TheWhiteDog9487	48a5027cce	更新至Minecraft 1.21.9	2025-10-03 16:51:17 +08:00
TheWhiteDog9487	62c3484c5e	更新Gradle到9.1.0	2025-10-03 16:50:50 +08:00
TheWhiteDog9487	d47907cdf4	更新至Minecraft 1.21.8 Feature Drop和Bugfix混用小版本号的话，年底，不，甚至暑假结束之前有望突破1.21.10	2025-07-18 11:19:41 +08:00
TheWhiteDog9487	8c55311f27	更新至Minecraft 1.21.7 La-la-la-lava, ch-ch-ch-chicken Steve's Lava Chicken, yeah, it's tasty as hell Ooh, mamacita, now you're ringin' the bell Crispy and juicy, now you're havin' a snack Ooh, super spicy, it's a lava attack	2025-07-01 08:49:58 +08:00
TheWhiteDog9487	35ac4dd842	0.3.6 小更改，正常用应该是感受不到的。当随机半径被设置为0的时候不会再抛出异常而导致命令运行失败了。手动处理了这个部分，向玩家发送警告并根据随机中心点是否被设置而决定是否进行传送。	2025-06-18 12:24:29 +08:00
TheWhiteDog9487	34ea09dfd9	依赖项更新至Minecraft 1.21.6	2025-06-18 10:31:14 +08:00
TheWhiteDog9487	ad014a2b1b	更新Gradle至8.14	2025-06-18 10:30:20 +08:00
TheWhiteDog9487	4de867d6aa	Fabric模组模板那边新的文件	2025-03-26 10:28:21 +08:00
TheWhiteDog9487	9770b72448	移除BMCLAPI镜像这个东西可以在`~/.gradle/gradle.properties`里面全局配置，没必要每个项目都写一份，而且这样子还不会影响其他非大陆贡献者	2025-03-26 10:27:40 +08:00
TheWhiteDog9487	66a1529132	更新开发环境Minecraft和Fabric版本	2025-03-26 10:26:02 +08:00
TheWhiteDog9487	96a69f3262	更新Gradle版本以后跟大版本算了，这东西更新速度太恐怖了，小版本我就不跟了	2025-03-26 10:23:23 +08:00
TheWhiteDog9487	da6802f605	0.3.5 适配Minecraft 1.21.4 修正了一个严重Bug，同样是由0.3.3的Vec3d → Vec2f引入。具体表现就是当传送中心被设置为一个实体时，传送中心点的Z轴坐标被错误地设置为给定实体的Y轴（表示高度的那个轴）坐标。可能是我测试的时候没用到这个格式所以没发现问题？反正现在修了，已经没事了。更换Text.translatable成Text.translatableWithFallback，确保未安装模组时至少有人类可读文字，而不是翻译键。补充英语翻译。 ModMenu显示的详细信息中移除掉博客链接。增加了一大堆的JavaDoc.	2024-12-05 16:00:25 +08:00
TheWhiteDog9487	7376393f37	0.3.4 偶然间观测到一个在极端条件下出现的Bug，由上一个版本更新的 Vec3d → Vec2f 引入，赶紧给它修了这是一个可以复现的例子：/rtp @s 1 -23604356.50 23511080.50 这个版本已经没问题了	2024-10-25 14:53:42 +08:00
TheWhiteDog9487	c442f12de4	0.3.3 适配Minecraft 1.21.3 ( 什么连夜OTA正式版坐标类型由Vec3d改为Vec2f，高度一边凉快去根本用不到修正上一个版本命令反馈消息的坐标显示错误，一路Ctrl V没发现问题，红豆泥私密马赛，已经修改好了输出文件名改成首字母大写了	2024-10-25 13:49:09 +08:00
TheWhiteDog9487	e7c99c2364	0.3.2 修改了一下传送落地之后玻璃的放置规则。 - 以前只要脚下是水或岩浆就无条件替换，在极小概率之下可能出现一些麻烦，所以我给改掉了。 - 现在是落地就准备替换，但是只会替换水、岩浆和空气，其他所有都会保留不变。当然最重要的是适配Minecraft 1.21.2 另外针对开发者侧，Gradle语法从Groovy换到了Kotlin，看起来舒服多了。	2024-10-24 09:54:11 +08:00
TheWhiteDog9487	6d3af41b34	更换Gradle语法到Kotlin DSL	2024-10-23 18:16:09 +08:00
TheWhiteDog9487	da8e07baea	模组版本0.3.1对1.21.1构建	2024-10-23 17:21:12 +08:00
TheWhiteDog9487	3d23f397f7	0.3.1 这个版本同时会出1.21和1.21.1两个版本的构建。那个ModMenu内链接名字显示不正常的问题修掉了，改翻译键没改完导致的。输出文件名改掉了，不然两个不同的游戏版本同时发一个模组版本不好弄。那个从来就没有正常工作过的过近距离保护直接下了，可能之后再加回来吧，反正现在那个就没正常过。其他都是开发侧的小改动，用户侧无感知。	2024-08-09 16:34:00 +08:00
TheWhiteDog9487	6eb98f1f94	0.3.0 升级游戏兼容性到1.21 移除翻译键中手动添加的命名空间编译版本升级至JDK21	2024-06-14 14:33:33 +08:00