mirror of
https://github.com/TheWhiteDog9487/RandomTeleporter.git
synced 2025-12-17 12:32:05 +08:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a903dda82e | ||
|
|
8f40dddc2a |
@@ -1,5 +1,5 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id("fabric-loom") version "1.11-SNAPSHOT"
|
id("fabric-loom") version "1.14-SNAPSHOT"
|
||||||
id("maven-publish")
|
id("maven-publish")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -25,17 +25,16 @@ loom {
|
|||||||
splitEnvironmentSourceSets()
|
splitEnvironmentSourceSets()
|
||||||
|
|
||||||
mods {
|
mods {
|
||||||
create("randomteleporter") {
|
val mod = create("randomteleporter")
|
||||||
sourceSet(sourceSets["main"])
|
mod.sourceSet("main")
|
||||||
sourceSet(sourceSets["client"])
|
mod.sourceSet("client")
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// To change the versions see the gradle.properties file
|
// To change the versions see the gradle.properties file
|
||||||
minecraft("com.mojang:minecraft:${project.extra["minecraft_version"]}")
|
minecraft("com.mojang:minecraft:${project.extra["minecraft_version"]}")
|
||||||
mappings("net.fabricmc:yarn:${project.extra["yarn_mappings"]}:v2")
|
mappings(loom.officialMojangMappings())
|
||||||
modImplementation("net.fabricmc:fabric-loader:${project.extra["loader_version"]}")
|
modImplementation("net.fabricmc:fabric-loader:${project.extra["loader_version"]}")
|
||||||
|
|
||||||
// Fabric API. This is technically optional, but you probably want it anyway.
|
// Fabric API. This is technically optional, but you probably want it anyway.
|
||||||
|
|||||||
@@ -4,9 +4,8 @@ org.gradle.parallel=true
|
|||||||
|
|
||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check these on https://fabricmc.net/develop
|
# check these on https://fabricmc.net/develop
|
||||||
minecraft_version=1.21.10
|
minecraft_version=1.21.11
|
||||||
yarn_mappings=1.21.10+build.1
|
loader_version=0.18.2
|
||||||
loader_version=0.17.2
|
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version=0.4.0
|
mod_version=0.4.0
|
||||||
@@ -14,8 +13,8 @@ maven_group=xyz.thewhitedog9487
|
|||||||
archives_base_name=RandomTeleporter
|
archives_base_name=RandomTeleporter
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
fabric_version=0.134.1+1.21.10
|
fabric_version=0.139.4+1.21.11
|
||||||
|
|
||||||
# https://modrinth.com/mod/modmenu/versions
|
# https://modrinth.com/mod/modmenu/versions
|
||||||
# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu
|
# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu
|
||||||
modmenu_version=16.0.0-rc.1
|
modmenu_version=17.0.0-alpha.1
|
||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https://services.gradle.org/distributions/gradle-9.1.0-bin.zip
|
distributionUrl=https://services.gradle.org/distributions/gradle-9.2.0-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
package xyz.thewhitedog9487.mixin.client;
|
package xyz.thewhitedog9487.mixin.client;
|
||||||
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.Minecraft;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
@Mixin(MinecraftClient.class)
|
@Mixin(Minecraft.class)
|
||||||
public class ExampleClientMixin {
|
public class ExampleClientMixin {
|
||||||
@Inject(at = @At("HEAD"), method = "run")
|
@Inject(at = @At("HEAD"), method = "run")
|
||||||
private void run(CallbackInfo info) {
|
private void run(CallbackInfo info) {
|
||||||
|
|||||||
@@ -3,27 +3,30 @@ package xyz.thewhitedog9487;
|
|||||||
import com.mojang.brigadier.Command;
|
import com.mojang.brigadier.Command;
|
||||||
import com.mojang.brigadier.arguments.IntegerArgumentType;
|
import com.mojang.brigadier.arguments.IntegerArgumentType;
|
||||||
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
|
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.commands.Commands;
|
||||||
import net.minecraft.block.Blocks;
|
import net.minecraft.server.commands.TeleportCommand;
|
||||||
import net.minecraft.command.argument.EntityArgumentType;
|
import net.minecraft.server.permissions.PermissionCheck;
|
||||||
import net.minecraft.command.argument.Vec2ArgumentType;
|
import net.minecraft.world.level.block.Block;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.world.level.block.Blocks;
|
||||||
import net.minecraft.server.command.ServerCommandSource;
|
import net.minecraft.commands.arguments.EntityArgument;
|
||||||
import net.minecraft.server.world.ServerWorld;
|
import net.minecraft.commands.arguments.coordinates.Vec2Argument;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.world.entity.Entity;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.commands.CommandSourceStack;
|
||||||
import net.minecraft.util.math.Vec2f;
|
import net.minecraft.server.level.ServerLevel;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.world.chunk.ChunkStatus;
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.world.phys.Vec2;
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
|
import net.minecraft.world.level.chunk.status.ChunkStatus;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.SplittableRandom;
|
import java.util.SplittableRandom;
|
||||||
|
|
||||||
import static net.minecraft.server.command.CommandManager.argument;
|
import static net.minecraft.commands.Commands.argument;
|
||||||
import static net.minecraft.server.command.CommandManager.literal;
|
import static net.minecraft.commands.Commands.literal;
|
||||||
import static net.minecraft.world.Heightmap.Type.MOTION_BLOCKING_NO_LEAVES;
|
import static net.minecraft.world.level.levelgen.Heightmap.Types.MOTION_BLOCKING_NO_LEAVES;
|
||||||
import static xyz.thewhitedog9487.ResourceReloaderListener.*;
|
import static xyz.thewhitedog9487.ResourceReloaderListener.*;
|
||||||
|
|
||||||
public class CommandRegister {
|
public class CommandRegister {
|
||||||
@@ -64,9 +67,9 @@ public class CommandRegister {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 执行命令所需权限等级
|
* 执行命令所需权限等级
|
||||||
* @see net.minecraft.server.command.TeleportCommand
|
* @see TeleportCommand
|
||||||
*/
|
*/
|
||||||
final static byte PermissionLevel = 2;
|
final static PermissionCheck PermissionLevel = Commands.LEVEL_GAMEMASTERS;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 使用Fabric API向游戏内注册命令
|
* 使用Fabric API向游戏内注册命令
|
||||||
@@ -83,47 +86,47 @@ public class CommandRegister {
|
|||||||
.register((dispatcher, registryAccess, environment) ->{
|
.register((dispatcher, registryAccess, environment) ->{
|
||||||
dispatcher.register(literal(Name)
|
dispatcher.register(literal(Name)
|
||||||
// /rtp
|
// /rtp
|
||||||
.requires(source -> source.hasPermissionLevel(PermissionLevel))
|
.requires(Commands.hasPermission(PermissionLevel))
|
||||||
.executes(context -> ExecuteCommand(
|
.executes(context -> ExecuteCommand(
|
||||||
context.getSource(),null,null, null))
|
context.getSource(),null,null, null))
|
||||||
// /rtp <Radius(半径)>
|
// /rtp <Radius(半径)>
|
||||||
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
||||||
.requires(source -> source.hasPermissionLevel(PermissionLevel))
|
.requires(Commands.hasPermission(PermissionLevel))
|
||||||
.executes(context -> ExecuteCommand(
|
.executes(context -> ExecuteCommand(
|
||||||
context.getSource(),
|
context.getSource(),
|
||||||
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
||||||
null,
|
null,
|
||||||
null)))
|
null)))
|
||||||
// /rtp <被传送玩家名(PlayerID)>
|
// /rtp <被传送玩家名(PlayerID)>
|
||||||
.then(argument(CommandArgumentName_Target, EntityArgumentType.entity())
|
.then(argument(CommandArgumentName_Target, EntityArgument.entity())
|
||||||
.requires(source -> source.hasPermissionLevel(PermissionLevel))
|
.requires(Commands.hasPermission(PermissionLevel))
|
||||||
.executes(context -> ExecuteCommand(
|
.executes(context -> ExecuteCommand(
|
||||||
context.getSource(),
|
context.getSource(),
|
||||||
null,
|
null,
|
||||||
EntityArgumentType.getEntity(context,CommandArgumentName_Target),
|
EntityArgument.getEntity(context,CommandArgumentName_Target),
|
||||||
null)))
|
null)))
|
||||||
// /rtp <Radius(半径)> <被传送玩家名(PlayerID)>
|
// /rtp <Radius(半径)> <被传送玩家名(PlayerID)>
|
||||||
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
||||||
.then(argument(CommandArgumentName_Target, EntityArgumentType.entity())
|
.then(argument(CommandArgumentName_Target, EntityArgument.entity())
|
||||||
.requires(source -> source.hasPermissionLevel(PermissionLevel))
|
.requires(Commands.hasPermission(PermissionLevel))
|
||||||
.executes(context -> ExecuteCommand(
|
.executes(context -> ExecuteCommand(
|
||||||
context.getSource(),
|
context.getSource(),
|
||||||
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
||||||
EntityArgumentType.getEntity(context,CommandArgumentName_Target),
|
EntityArgument.getEntity(context,CommandArgumentName_Target),
|
||||||
null))))
|
null))))
|
||||||
// /rtp <被传送玩家名(PlayerID)> <Radius(半径)>
|
// /rtp <被传送玩家名(PlayerID)> <Radius(半径)>
|
||||||
.then(argument(CommandArgumentName_Target, EntityArgumentType.entity())
|
.then(argument(CommandArgumentName_Target, EntityArgument.entity())
|
||||||
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
||||||
.requires(source -> source.hasPermissionLevel(PermissionLevel))
|
.requires(Commands.hasPermission(PermissionLevel))
|
||||||
.executes(context -> ExecuteCommand(
|
.executes(context -> ExecuteCommand(
|
||||||
context.getSource(),
|
context.getSource(),
|
||||||
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
||||||
EntityArgumentType.getEntity(context,CommandArgumentName_Target),
|
EntityArgument.getEntity(context,CommandArgumentName_Target),
|
||||||
null))))
|
null))))
|
||||||
// // /rtp <Radius(半径)> <Origin(随机中心)>
|
// // /rtp <Radius(半径)> <Origin(随机中心)>
|
||||||
// .then(argument("Radius(半径)", LongArgumentType.longArg())
|
// .then(argument("Radius(半径)", LongArgumentType.longArg())
|
||||||
// .then(argument("Origin(随机中心)",EntityArgumentType.player())
|
// .then(argument("Origin(随机中心)",EntityArgumentType.player())
|
||||||
// .requires(source -> source.hasPermissionLevel(PermissionLevel))
|
// .requires(Commands.hasPermission(PermissionLevel))
|
||||||
// .executes(context -> execute_command_origin(
|
// .executes(context -> execute_command_origin(
|
||||||
// context.getSource(),
|
// context.getSource(),
|
||||||
// LongArgumentType.getLong(context, "Radius(半径)"),
|
// LongArgumentType.getLong(context, "Radius(半径)"),
|
||||||
@@ -131,55 +134,55 @@ public class CommandRegister {
|
|||||||
// EntityArgumentType.getEntity(context,"Origin(随机中心)")))))
|
// EntityArgumentType.getEntity(context,"Origin(随机中心)")))))
|
||||||
// /rtp <Radius(半径)> <OriginPos(随机中心,坐标)>
|
// /rtp <Radius(半径)> <OriginPos(随机中心,坐标)>
|
||||||
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
||||||
.then(argument(CommandArgumentName_OriginPosition,Vec2ArgumentType.vec2())
|
.then(argument(CommandArgumentName_OriginPosition, Vec2Argument.vec2())
|
||||||
.requires(source -> source.hasPermissionLevel(PermissionLevel))
|
.requires(Commands.hasPermission(PermissionLevel))
|
||||||
.executes(context -> ExecuteCommand(
|
.executes(context -> ExecuteCommand(
|
||||||
context.getSource(),
|
context.getSource(),
|
||||||
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
||||||
null,
|
null,
|
||||||
Vec2ArgumentType.getVec2(context,CommandArgumentName_OriginPosition)))))
|
Vec2Argument.getVec2(context,CommandArgumentName_OriginPosition)))))
|
||||||
// /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginEntity(随机中心,实体)>
|
// /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginEntity(随机中心,实体)>
|
||||||
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
||||||
.then(argument(CommandArgumentName_Target, EntityArgumentType.entity())
|
.then(argument(CommandArgumentName_Target, EntityArgument.entity())
|
||||||
.then(argument(CommandArgumentName_OriginEntity,EntityArgumentType.entity())
|
.then(argument(CommandArgumentName_OriginEntity, EntityArgument.entity())
|
||||||
.requires(source -> source.hasPermissionLevel(PermissionLevel))
|
.requires(Commands.hasPermission(PermissionLevel))
|
||||||
.executes(context -> ExecuteCommand(
|
.executes(context -> ExecuteCommand(
|
||||||
context.getSource(),
|
context.getSource(),
|
||||||
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
||||||
EntityArgumentType.getEntity(context,CommandArgumentName_Target),
|
EntityArgument.getEntity(context,CommandArgumentName_Target),
|
||||||
new Vec2f( (float) EntityArgumentType.getEntity( context,CommandArgumentName_OriginEntity).getEntityPos().x,
|
new Vec2( (float) EntityArgument.getEntity( context,CommandArgumentName_OriginEntity).position().x,
|
||||||
(float) EntityArgumentType.getEntity( context,CommandArgumentName_OriginEntity).getEntityPos().z ))))))
|
(float) EntityArgument.getEntity( context,CommandArgumentName_OriginEntity).position().z ))))))
|
||||||
// /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginPos(随机中心,坐标)>
|
// /rtp <Radius(半径)> <被传送玩家名(PlayerID)> <OriginPos(随机中心,坐标)>
|
||||||
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
||||||
.then(argument(CommandArgumentName_Target, EntityArgumentType.entity())
|
.then(argument(CommandArgumentName_Target, EntityArgument.entity())
|
||||||
.then(argument(CommandArgumentName_OriginPosition,Vec2ArgumentType.vec2())
|
.then(argument(CommandArgumentName_OriginPosition, Vec2Argument.vec2())
|
||||||
.requires(source -> source.hasPermissionLevel(PermissionLevel))
|
.requires(Commands.hasPermission(PermissionLevel))
|
||||||
.executes(context -> ExecuteCommand(
|
.executes(context -> ExecuteCommand(
|
||||||
context.getSource(),
|
context.getSource(),
|
||||||
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
||||||
EntityArgumentType.getEntity(context,CommandArgumentName_Target),
|
EntityArgument.getEntity(context,CommandArgumentName_Target),
|
||||||
Vec2ArgumentType.getVec2(context,CommandArgumentName_OriginPosition))))))
|
Vec2Argument.getVec2(context,CommandArgumentName_OriginPosition))))))
|
||||||
// /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginEntity(随机中心,实体)>
|
// /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginEntity(随机中心,实体)>
|
||||||
.then(argument(CommandArgumentName_Target, EntityArgumentType.entity())
|
.then(argument(CommandArgumentName_Target, EntityArgument.entity())
|
||||||
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
||||||
.then(argument(CommandArgumentName_OriginEntity,EntityArgumentType.entity())
|
.then(argument(CommandArgumentName_OriginEntity, EntityArgument.entity())
|
||||||
.requires(source -> source.hasPermissionLevel(PermissionLevel))
|
.requires(Commands.hasPermission(PermissionLevel))
|
||||||
.executes(context -> ExecuteCommand(
|
.executes(context -> ExecuteCommand(
|
||||||
context.getSource(),
|
context.getSource(),
|
||||||
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
||||||
EntityArgumentType.getEntity(context,CommandArgumentName_Target),
|
EntityArgument.getEntity(context,CommandArgumentName_Target),
|
||||||
new Vec2f( (float) EntityArgumentType.getEntity( context,CommandArgumentName_OriginEntity).getEntityPos().x,
|
new Vec2( (float) EntityArgument.getEntity( context,CommandArgumentName_OriginEntity).position().x,
|
||||||
(float) EntityArgumentType.getEntity( context,CommandArgumentName_OriginEntity).getEntityPos().z ))))))
|
(float) EntityArgument.getEntity( context,CommandArgumentName_OriginEntity).position().z ))))))
|
||||||
// /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginPos(随机中心,坐标)>
|
// /rtp <被传送玩家名(PlayerID)> <Radius(半径)> <OriginPos(随机中心,坐标)>
|
||||||
.then(argument(CommandArgumentName_Target, EntityArgumentType.entity())
|
.then(argument(CommandArgumentName_Target, EntityArgument.entity())
|
||||||
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
.then(argument(CommandArgumentName_Radius, IntegerArgumentType.integer(0))
|
||||||
.then(argument(CommandArgumentName_OriginPosition,Vec2ArgumentType.vec2())
|
.then(argument(CommandArgumentName_OriginPosition, Vec2Argument.vec2())
|
||||||
.requires(source -> source.hasPermissionLevel(PermissionLevel))
|
.requires(Commands.hasPermission(PermissionLevel))
|
||||||
.executes(context -> ExecuteCommand(
|
.executes(context -> ExecuteCommand(
|
||||||
context.getSource(),
|
context.getSource(),
|
||||||
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
IntegerArgumentType.getInteger(context, CommandArgumentName_Radius),
|
||||||
EntityArgumentType.getEntity(context,CommandArgumentName_Target),
|
EntityArgument.getEntity(context,CommandArgumentName_Target),
|
||||||
Vec2ArgumentType.getVec2(context,CommandArgumentName_OriginPosition)))))) );});}
|
Vec2Argument.getVec2(context,CommandArgumentName_OriginPosition)))))) );});}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 向游戏内注册命令
|
* 向游戏内注册命令
|
||||||
@@ -200,7 +203,7 @@ public class CommandRegister {
|
|||||||
* @param Origin 随机选择的目的坐标的中心
|
* @param Origin 随机选择的目的坐标的中心
|
||||||
* @return 命令运行是否成功
|
* @return 命令运行是否成功
|
||||||
*/
|
*/
|
||||||
static int ExecuteCommand(ServerCommandSource Source, @Nullable Integer Radius, @Nullable Entity Entity, @Nullable Vec2f Origin){
|
static int ExecuteCommand(CommandSourceStack Source, @Nullable Integer Radius, @Nullable Entity Entity, @Nullable Vec2 Origin){
|
||||||
Entity TargetEntity = Entity == null ? Source.getPlayer() : Entity;
|
Entity TargetEntity = Entity == null ? Source.getPlayer() : Entity;
|
||||||
/*
|
/*
|
||||||
↑
|
↑
|
||||||
@@ -211,7 +214,7 @@ public class CommandRegister {
|
|||||||
TargetEntity = Entity;}
|
TargetEntity = Entity;}
|
||||||
*/
|
*/
|
||||||
if (TargetEntity == null) {
|
if (TargetEntity == null) {
|
||||||
Source.sendFeedback(()->{ return Text.translatableWithFallback("error.no_target","不存在被传送目标,由非玩家物体执行命令时请显式指定被传送玩家ID"); }, true);
|
Source.sendSuccess(()->{ return Component.translatableWithFallback("error.no_target","不存在被传送目标,由非玩家物体执行命令时请显式指定被传送玩家ID"); }, true);
|
||||||
return -1;}
|
return -1;}
|
||||||
if (Radius == null){Radius = (int) (WorldBorder - 1e4);}
|
if (Radius == null){Radius = (int) (WorldBorder - 1e4);}
|
||||||
// ↑ 远离世界边界
|
// ↑ 远离世界边界
|
||||||
@@ -227,7 +230,7 @@ public class CommandRegister {
|
|||||||
catch (IllegalArgumentException e) {
|
catch (IllegalArgumentException e) {
|
||||||
// 半径为零
|
// 半径为零
|
||||||
if (Origin == null) {
|
if (Origin == null) {
|
||||||
Source.sendFeedback(()->{ return Text.translatableWithFallback("warning.radius_equal_zero_no_target", "由于你设置的随机半径为0,并且未设置随机中心点坐标,因此什么都不会发生"); },true);
|
Source.sendSuccess(()->{ return Component.translatableWithFallback("warning.radius_equal_zero_no_target", "由于你设置的随机半径为0,并且未设置随机中心点坐标,因此什么都不会发生"); },true);
|
||||||
return -1;}
|
return -1;}
|
||||||
else {
|
else {
|
||||||
Coordinate_X = (int) Origin.x;
|
Coordinate_X = (int) Origin.x;
|
||||||
@@ -235,13 +238,13 @@ public class CommandRegister {
|
|||||||
int finalCoordinate_X1 = Coordinate_X;
|
int finalCoordinate_X1 = Coordinate_X;
|
||||||
int finalCoordinate_Z1 = Coordinate_Z;
|
int finalCoordinate_Z1 = Coordinate_Z;
|
||||||
// ↑ "lambda 表达式中使用的变量应为 final 或有效 final"
|
// ↑ "lambda 表达式中使用的变量应为 final 或有效 final"
|
||||||
Source.sendFeedback(()->{ return Text.translatableWithFallback("warning.radius_equal_zero", "警告:由于你设置的随机半径为0,因此在选择出合适高度之后将直接把你传送至%d %d", finalCoordinate_X1, finalCoordinate_Z1); },true);}}
|
Source.sendSuccess(()->{ return Component.translatableWithFallback("warning.radius_equal_zero", "警告:由于你设置的随机半径为0,因此在选择出合适高度之后将直接把你传送至%d %d", finalCoordinate_X1, finalCoordinate_Z1); },true);}}
|
||||||
World EntityWorld = TargetEntity.getEntityWorld();
|
Level EntityWorld = TargetEntity.level();
|
||||||
EntityWorld.getChunk(Coordinate_X >> 4, Coordinate_Z >> 4, ChunkStatus.FULL, true);
|
EntityWorld.getChunk(Coordinate_X >> 4, Coordinate_Z >> 4, ChunkStatus.FULL, true);
|
||||||
// ↑ 加载目标区块,不然下面获取到的Coordinate_Y一定是-64
|
// ↑ 加载目标区块,不然下面获取到的Coordinate_Y一定是-64
|
||||||
// 必须是 >> 4 ,不能是 / 16
|
// 必须是 >> 4 ,不能是 / 16
|
||||||
int Coordinate_Y = EntityWorld.getTopY(MOTION_BLOCKING_NO_LEAVES, Coordinate_X, Coordinate_Z);
|
int Coordinate_Y = EntityWorld.getHeight(MOTION_BLOCKING_NO_LEAVES, Coordinate_X, Coordinate_Z);
|
||||||
BlockPos.Mutable BlockPos = new BlockPos.Mutable();
|
BlockPos.MutableBlockPos BlockPos = new BlockPos.MutableBlockPos();
|
||||||
for (int x = -1; x <= 1; x++) {
|
for (int x = -1; x <= 1; x++) {
|
||||||
for (int z = -1; z <= 1; z++) {
|
for (int z = -1; z <= 1; z++) {
|
||||||
// 如果传送到的位置周围一圈是ReplaceToTargetBlock的方块,将其替换为TargetBlock
|
// 如果传送到的位置周围一圈是ReplaceToTargetBlock的方块,将其替换为TargetBlock
|
||||||
@@ -249,14 +252,14 @@ public class CommandRegister {
|
|||||||
var CurrentBlock = EntityWorld.getBlockState(BlockPos).getBlock();
|
var CurrentBlock = EntityWorld.getBlockState(BlockPos).getBlock();
|
||||||
if ( ReplaceToTargetBlock.contains(CurrentBlock) ) {
|
if ( ReplaceToTargetBlock.contains(CurrentBlock) ) {
|
||||||
// 只替换ReplaceToTargetBlock内的方块,其余保留
|
// 只替换ReplaceToTargetBlock内的方块,其余保留
|
||||||
EntityWorld.setBlockState(BlockPos, TargetBlock.getDefaultState());}}}
|
EntityWorld.setBlockAndUpdate(BlockPos, TargetBlock.defaultBlockState());}}}
|
||||||
// if ( String.valueOf(TargetEntity.getWorld().getBiome(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getKey()).equals("minecraft:the_void") ) {
|
// if ( String.valueOf(TargetEntity.getWorld().getBiome(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getKey()).equals("minecraft:the_void") ) {
|
||||||
// Coordinate_Y++;}
|
// Coordinate_Y++;}
|
||||||
TargetEntity.teleport((ServerWorld) EntityWorld,Coordinate_X + 0.5, Coordinate_Y, Coordinate_Z + 0.5, new HashSet<>(), TargetEntity.getYaw(), TargetEntity.getPitch(), false);
|
TargetEntity.teleportTo((ServerLevel) EntityWorld,Coordinate_X + 0.5, Coordinate_Y, Coordinate_Z + 0.5, new HashSet<>(), TargetEntity.getYRot(), TargetEntity.getXRot(), false);
|
||||||
int finalCoordinate_X = Coordinate_X;
|
int finalCoordinate_X = Coordinate_X;
|
||||||
int finalCoordinate_Z = Coordinate_Z;
|
int finalCoordinate_Z = Coordinate_Z;
|
||||||
// ↑ "lambda 表达式中使用的变量应为 final 或有效 final"
|
// ↑ "lambda 表达式中使用的变量应为 final 或有效 final"
|
||||||
final var FeedbackFallbackString = String.format("已将玩家%s传送到%d %d %d", TargetEntity.getName().getString(), Coordinate_X, Coordinate_Y, Coordinate_Z);
|
final var FeedbackFallbackString = String.format("已将玩家%s传送到%d %d %d", TargetEntity.getName().getString(), Coordinate_X, Coordinate_Y, Coordinate_Z);
|
||||||
Source.sendFeedback(()->{ return Text.translatableWithFallback("info.success", FeedbackFallbackString, TargetEntity.getName(), finalCoordinate_X, Coordinate_Y, finalCoordinate_Z); },true);
|
Source.sendSuccess(()->{ return Component.translatableWithFallback("info.success", FeedbackFallbackString, TargetEntity.getName(), finalCoordinate_X, Coordinate_Y, finalCoordinate_Z); },true);
|
||||||
return Command.SINGLE_SUCCESS;}
|
return Command.SINGLE_SUCCESS;}
|
||||||
}
|
}
|
||||||
@@ -2,10 +2,10 @@ package xyz.thewhitedog9487;
|
|||||||
|
|
||||||
import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
|
import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
|
||||||
import net.fabricmc.fabric.api.resource.v1.reloader.SimpleResourceReloader;
|
import net.fabricmc.fabric.api.resource.v1.reloader.SimpleResourceReloader;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.resources.Identifier;
|
||||||
|
|
||||||
import static net.minecraft.resource.ResourceType.CLIENT_RESOURCES;
|
import static net.minecraft.server.packs.PackType.CLIENT_RESOURCES;
|
||||||
import static xyz.thewhitedog9487.RandomTeleporter.MOD_ID;
|
import static xyz.thewhitedog9487.RandomTeleporter.MOD_ID;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -18,17 +18,17 @@ public class ResourceReloaderListener {
|
|||||||
public static String CommandArgumentName_OriginEntity = "OriginEntity(随机中心,实体)";
|
public static String CommandArgumentName_OriginEntity = "OriginEntity(随机中心,实体)";
|
||||||
|
|
||||||
public static void Register(){
|
public static void Register(){
|
||||||
ResourceLoader.get(CLIENT_RESOURCES).registerReloader(Identifier.of(MOD_ID, "translate_text_apply"), new SimpleResourceReloader<Void>() {
|
ResourceLoader.get(CLIENT_RESOURCES).registerReloader(Identifier.fromNamespaceAndPath(MOD_ID, "translate_text_apply"), new SimpleResourceReloader<Void>() {
|
||||||
/**
|
/**
|
||||||
* 用不到,不用管
|
* 用不到,不用管
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
protected Void prepare(Store store) {
|
protected Void prepare(SharedState store) {
|
||||||
return null; }
|
return null; }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void apply(Void prepared, Store store) {
|
protected void apply(Void prepared, SharedState store) {
|
||||||
CommandArgumentName_Radius = Text.translatableWithFallback("command.argument.radius", "Radius(半径)").getString();
|
CommandArgumentName_Radius = Component.translatableWithFallback("command.argument.radius", "Radius(半径)").getString();
|
||||||
CommandArgumentName_Target = Text.translatableWithFallback("command.argument.target", "被传送玩家名(PlayerID)").getString();
|
CommandArgumentName_Target = Component.translatableWithFallback("command.argument.target", "被传送玩家名(PlayerID)").getString();
|
||||||
CommandArgumentName_OriginPosition = Text.translatableWithFallback("command.argument.origin_pos", "OriginPos(随机中心,坐标)").getString();
|
CommandArgumentName_OriginPosition = Component.translatableWithFallback("command.argument.origin_pos", "OriginPos(随机中心,坐标)").getString();
|
||||||
CommandArgumentName_OriginEntity = Text.translatableWithFallback("command.argument.origin_entity", "OriginEntity(随机中心,实体)").getString(); } } ); } }
|
CommandArgumentName_OriginEntity = Component.translatableWithFallback("command.argument.origin_entity", "OriginEntity(随机中心,实体)").getString(); } } ); } }
|
||||||
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||||||
|
|
||||||
@Mixin(MinecraftServer.class)
|
@Mixin(MinecraftServer.class)
|
||||||
public class ExampleMixin {
|
public class ExampleMixin {
|
||||||
@Inject(at = @At("HEAD"), method = "loadWorld")
|
@Inject(at = @At("HEAD"), method = "loadLevel")
|
||||||
private void init(CallbackInfo info) {
|
private void init(CallbackInfo info) {
|
||||||
// This code is injected into the start of MinecraftServer.loadWorld()V
|
// This code is injected into the start of MinecraftServer.loadWorld()V
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,10 +27,10 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.17.2",
|
"fabricloader": ">=0.18.2",
|
||||||
"minecraft": "1.21.10",
|
"minecraft": "1.21.11",
|
||||||
"java": ">=21",
|
"java": ">=21",
|
||||||
"fabric-api": ">=0.134.1"
|
"fabric-api": ">=0.139.4"
|
||||||
},
|
},
|
||||||
"suggests": {
|
"suggests": {
|
||||||
"another-mod": "*"
|
"another-mod": "*"
|
||||||
|
|||||||
Reference in New Issue
Block a user