Skip to content

Commit 7e81ed4

Browse files
committed
refactor: change Formatting and Commands arguments (forgot to add this)
changed Formatting to ChatFormatting and Command arguments has its own built-in entities suggestions
1 parent 983d2fc commit 7e81ed4

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

src/main/java/me/imgalvin/playerfinder/PlayerFinder.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
import com.mojang.brigadier.arguments.StringArgumentType;
44
import net.fabricmc.api.ModInitializer;
55
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
6+
import net.minecraft.ChatFormatting;
7+
import net.minecraft.commands.Commands;
8+
import net.minecraft.commands.arguments.EntityArgument;
69
import net.minecraft.entity.player.PlayerEntity;
710
import net.minecraft.registry.RegistryKey;
811
import net.minecraft.server.command.CommandManager;
912
import net.minecraft.text.Text;
10-
import net.minecraft.util.Formatting;
1113
import net.minecraft.util.math.BlockPos;
1214
import net.minecraft.world.World;
1315

@@ -17,9 +19,8 @@ public class PlayerFinder implements ModInitializer {
1719
@Override
1820
public void onInitialize() {
1921
CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
20-
dispatcher.register(CommandManager.literal("findplayer")
21-
.then(CommandManager.argument("player", StringArgumentType.string())
22-
.suggests(new PlayerSuggestionProvider())
22+
dispatcher.register(Commands.literal("findplayer")
23+
.then(Commands.argument("player", EntityArgument.entity())
2324
.executes(context -> {
2425
String playerName = StringArgumentType.getString(context, "player");
2526
PlayerEntity targetPlayer = context.getSource().getServer().getPlayerManager().getPlayer(playerName);
@@ -35,17 +36,17 @@ public void onInitialize() {
3536

3637
boolean isSameDimension = sourceDimension == playerDimension;
3738

38-
context.getSource().sendFeedback(() -> (Text) Text.literal(playerName + " is at ")
39+
context.getSource().sendChatMessage(() -> (Text) Text.literal(playerName + " is at ")
3940
.append(Text.literal(targetBlockPos.getX() + ", " + targetBlockPos.getY() + ", " + targetBlockPos.getZ())
4041
.formatted(utils.getDimensionColor(playerDimension)))
4142
.append(Text.literal(" in the ")
42-
.formatted(Formatting.WHITE))
43+
.formatted(ChatFormatting.WHITE))
4344
.append(Text.literal(utils.getDimensionText(playerDimension))
4445
.formatted(utils.getDimensionColor(playerDimension)))
4546
.append(Text.literal(isSameDimension
4647
? " (" + utils.getDistance(sourceBlockPos, targetBlockPos) + " blocks away)"
4748
: " (Player is in a different dimension)")
48-
.formatted(isSameDimension ? Formatting.GREEN : Formatting.RED)), false);
49+
.formatted(isSameDimension ? ChatFormatting.GREEN : ChatFormatting.RED)), false);
4950
return 1;
5051
})
5152
)

src/main/java/me/imgalvin/playerfinder/PlayerFinderUtils.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package me.imgalvin.playerfinder;
22

3+
import net.minecraft.ChatFormatting;
34
import net.minecraft.registry.RegistryKey;
4-
import net.minecraft.util.Formatting;
55
import net.minecraft.util.math.BlockPos;
66
import net.minecraft.world.World;
77
import org.jetbrains.annotations.NotNull;
88

99
public class PlayerFinderUtils {
10-
public Formatting getDimensionColor(@NotNull RegistryKey<World> playerDimension) {
11-
return playerDimension.equals(World.OVERWORLD) ? Formatting.GREEN :
12-
playerDimension.equals(World.NETHER) ? Formatting.RED :
13-
playerDimension.equals(World.END) ? Formatting.LIGHT_PURPLE :
14-
Formatting.GRAY; // Fallback color for custom or unknown dimensions
10+
public ChatFormatting getDimensionColor(@NotNull RegistryKey<World> playerDimension) {
11+
return playerDimension.equals(World.OVERWORLD) ? ChatFormatting.GREEN :
12+
playerDimension.equals(World.NETHER) ? ChatFormatting.RED :
13+
playerDimension.equals(World.END) ? ChatFormatting.LIGHT_PURPLE :
14+
ChatFormatting.GRAY; // Fallback colour for custom or unknown dimensions
1515
}
1616

1717
public String getDimensionText(@NotNull RegistryKey<World> playerDimension) {

0 commit comments

Comments
 (0)