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

0.3.4

Browse Source 
偶然间观测到一个在极端条件下出现的Bug，由上一个版本更新的 Vec3d → Vec2f 引入，赶紧给它修了
这是一个可以复现的例子：/rtp @s 1 -23604356.50 23511080.50
这个版本已经没问题了
This commit is contained in:
TheWhiteDog9487
2024-10-25 14:53:42 +08:00
parent c442f12de4
commit 7376393f37
2 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -9,7 +9,7 @@ yarn_mappings=1.21.3+build.2
loader_version=0.16.7
# Mod Properties
mod_version=0.3.3
mod_version=0.3.4
maven_group=xyz.thewhitedog9487
archives_base_name=RandomTeleporter

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

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