Skip to content

fix: using UTF8 without quoted #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Itsusinn wants to merge 3 commits into from
Closed

fix: using UTF8 without quoted #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec55ba2
fix: using UTF8 without quoted
Itsusinn Mar 30, 2026
f9ad921
remove client side requirement of mod
Itsusinn Mar 30, 2026
cf713e6
fix client warning
Itsusinn Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...ava/org/AndrewElizabeth/teleportcommandsfabric/commands/admin/AdminConfigNodeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package org.AndrewElizabeth.teleportcommandsfabric.commands.admin;

import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;

import org.AndrewElizabeth.teleportcommandsfabric.utils.UnicodeStringArgumentType;

import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import net.minecraft.network.chat.Component;
Expand Down Expand Up @@ -97,9 +98,9 @@ static LiteralArgumentBuilder<CommandSourceStack> stringNode(
context.getSource(),
literalName,
Component.literal(getter.get())))
.then(Commands.argument(argName, StringArgumentType.string())
.then(Commands.argument(argName, UnicodeStringArgumentType.unicodeString())
.executes(context -> {
String value = StringArgumentType.getString(context, argName);
String value = UnicodeStringArgumentType.getString(context, argName);
return AdminMessages.setAndSave(
context,
() -> setter.accept(value),
Expand Down
41 changes: 21 additions & 20 deletions src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/home/home.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.BoolArgumentType;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;

import org.AndrewElizabeth.teleportcommandsfabric.utils.UnicodeStringArgumentType;

import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import net.minecraft.server.level.ServerPlayer;
Expand All @@ -27,9 +28,9 @@ public static void register(CommandDispatcher<CommandSourceStack> commandDispatc
private static LiteralArgumentBuilder<CommandSourceStack> buildSetNode() {
return Commands.literal("sethome")
.requires(source -> source.getPlayer() != null)
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.executes(context -> {
final String name = StringArgumentType.getString(context, "name");
final String name = UnicodeStringArgumentType.getString(context, "name");
final ServerPlayer player = context.getSource().getPlayerOrException();

if (!HomeMessages.ensureEnabled(player)) {
Expand Down Expand Up @@ -60,10 +61,10 @@ private static LiteralArgumentBuilder<CommandSourceStack> buildTeleportNode() {
"commands.teleport_commands.home.goError",
() -> HomeTeleportActions.goHome(player, ""));
})
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.suggests(new HomeSuggestionProvider())
.executes(context -> {
final String name = StringArgumentType.getString(context, "name");
final String name = UnicodeStringArgumentType.getString(context, "name");
final ServerPlayer player = context.getSource().getPlayerOrException();

if (!HomeMessages.ensureEnabled(player)) {
Expand All @@ -81,10 +82,10 @@ private static LiteralArgumentBuilder<CommandSourceStack> buildTeleportNode() {
private static LiteralArgumentBuilder<CommandSourceStack> buildDeleteNode() {
return Commands.literal("delhome")
.requires(source -> source.getPlayer() != null)
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.suggests(new HomeSuggestionProvider())
.executes(context -> {
final String name = StringArgumentType.getString(context, "name");
final String name = UnicodeStringArgumentType.getString(context, "name");
final ServerPlayer player = context.getSource().getPlayerOrException();

if (!HomeMessages.ensureEnabled(player)) {
Expand All @@ -102,12 +103,12 @@ private static LiteralArgumentBuilder<CommandSourceStack> buildDeleteNode() {
private static LiteralArgumentBuilder<CommandSourceStack> buildRenameNode() {
return Commands.literal("renamehome")
.requires(source -> source.getPlayer() != null)
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.suggests(new HomeSuggestionProvider())
.then(Commands.argument("newName", StringArgumentType.string())
.then(Commands.argument("newName", UnicodeStringArgumentType.unicodeString())
.executes(context -> {
final String name = StringArgumentType.getString(context, "name");
final String newName = StringArgumentType.getString(context, "newName");
final String name = UnicodeStringArgumentType.getString(context, "name");
final String newName = UnicodeStringArgumentType.getString(context, "newName");
final ServerPlayer player = context.getSource().getPlayerOrException();

if (!HomeMessages.ensureEnabled(player)) {
Expand All @@ -125,10 +126,10 @@ private static LiteralArgumentBuilder<CommandSourceStack> buildRenameNode() {
private static LiteralArgumentBuilder<CommandSourceStack> buildDefaultNode() {
return Commands.literal("defaulthome")
.requires(source -> source.getPlayer() != null)
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.suggests(new HomeSuggestionProvider())
.executes(context -> {
final String name = StringArgumentType.getString(context, "name");
final String name = UnicodeStringArgumentType.getString(context, "name");
final ServerPlayer player = context.getSource().getPlayerOrException();

if (!HomeMessages.ensureEnabled(player)) {
Expand Down Expand Up @@ -181,10 +182,10 @@ private static LiteralArgumentBuilder<CommandSourceStack> buildListNode() {
private static LiteralArgumentBuilder<CommandSourceStack> buildUpdateNode() {
return Commands.literal("updatehome")
.requires(source -> source.getPlayer() != null)
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.suggests(new HomeSuggestionProvider())
.executes(context -> {
final String name = StringArgumentType.getString(context, "name");
final String name = UnicodeStringArgumentType.getString(context, "name");
final ServerPlayer player = context.getSource().getPlayerOrException();

if (!HomeMessages.ensureEnabled(player)) {
Expand Down Expand Up @@ -224,12 +225,12 @@ private static LiteralArgumentBuilder<CommandSourceStack> buildPagePickerNode()
private static LiteralArgumentBuilder<CommandSourceStack> buildMapVisibilityNode() {
return Commands.literal("maphome")
.requires(source -> source.getPlayer() != null)
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.suggests(new HomeSuggestionProvider())
.then(Commands.argument("visible", BoolArgumentType.bool())
.executes(context -> {
final ServerPlayer player = context.getSource().getPlayerOrException();
final String homeName = StringArgumentType.getString(context, "name");
final String homeName = UnicodeStringArgumentType.getString(context, "name");
final boolean visible = BoolArgumentType.getBool(context, "visible");

return handleMapVisibility(player, homeName, visible);
Expand All @@ -239,19 +240,19 @@ private static LiteralArgumentBuilder<CommandSourceStack> buildMapVisibilityNode
private static LiteralArgumentBuilder<CommandSourceStack> buildSilentMapVisibilityNode() {
return Commands.literal("teleportcommandsfabric:maphome")
.requires(source -> source.getPlayer() != null)
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.then(Commands.argument("visible", BoolArgumentType.bool())
.executes(context -> {
final ServerPlayer player = context.getSource().getPlayerOrException();
final String homeName = StringArgumentType.getString(context, "name");
final String homeName = UnicodeStringArgumentType.getString(context, "name");
final boolean visible = BoolArgumentType.getBool(context, "visible");

return handleSilentMapVisibility(player, homeName, visible);
})
.then(Commands.argument("page", IntegerArgumentType.integer())
.executes(context -> {
final ServerPlayer player = context.getSource().getPlayerOrException();
final String homeName = StringArgumentType.getString(context, "name");
final String homeName = UnicodeStringArgumentType.getString(context, "name");
final boolean visible = BoolArgumentType.getBool(context, "visible");
final int page = IntegerArgumentType.getInteger(context, "page");

Expand Down
41 changes: 21 additions & 20 deletions src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/warp/warp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.BoolArgumentType;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;

import org.AndrewElizabeth.teleportcommandsfabric.utils.UnicodeStringArgumentType;

import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import net.minecraft.server.level.ServerPlayer;
Expand All @@ -28,9 +29,9 @@ public static void register(CommandDispatcher<CommandSourceStack> commandDispatc
private static LiteralArgumentBuilder<CommandSourceStack> buildSetNode() {
return Commands.literal("setwarp")
.requires(source -> source.permissions().hasPermission(Permissions.COMMANDS_ADMIN))
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.executes(context -> {
final String name = StringArgumentType.getString(context, "name");
final String name = UnicodeStringArgumentType.getString(context, "name");
final ServerPlayer player = context.getSource().getPlayerOrException();

if (!WarpMessages.ensureEnabled(player)) {
Expand All @@ -48,10 +49,10 @@ private static LiteralArgumentBuilder<CommandSourceStack> buildSetNode() {
private static LiteralArgumentBuilder<CommandSourceStack> buildTeleportNode() {
return Commands.literal("warp")
.requires(source -> source.getPlayer() != null)
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.suggests(new WarpSuggestionProvider())
.executes(context -> {
final String name = StringArgumentType.getString(context, "name");
final String name = UnicodeStringArgumentType.getString(context, "name");
final ServerPlayer player = context.getSource().getPlayerOrException();

if (!WarpMessages.ensureEnabled(player)) {
Expand All @@ -69,10 +70,10 @@ private static LiteralArgumentBuilder<CommandSourceStack> buildTeleportNode() {
private static LiteralArgumentBuilder<CommandSourceStack> buildDeleteNode() {
return Commands.literal("delwarp")
.requires(source -> source.permissions().hasPermission(Permissions.COMMANDS_ADMIN))
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.suggests(new WarpSuggestionProvider())
.executes(context -> {
final String name = StringArgumentType.getString(context, "name");
final String name = UnicodeStringArgumentType.getString(context, "name");
final ServerPlayer player = context.getSource().getPlayerOrException();

if (!WarpMessages.ensureEnabled(player)) {
Expand All @@ -90,12 +91,12 @@ private static LiteralArgumentBuilder<CommandSourceStack> buildDeleteNode() {
private static LiteralArgumentBuilder<CommandSourceStack> buildRenameNode() {
return Commands.literal("renamewarp")
.requires(source -> source.permissions().hasPermission(Permissions.COMMANDS_ADMIN))
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.suggests(new WarpSuggestionProvider())
.then(Commands.argument("newName", StringArgumentType.string())
.then(Commands.argument("newName", UnicodeStringArgumentType.unicodeString())
.executes(context -> {
final String name = StringArgumentType.getString(context, "name");
final String newName = StringArgumentType.getString(context, "newName");
final String name = UnicodeStringArgumentType.getString(context, "name");
final String newName = UnicodeStringArgumentType.getString(context, "newName");
final ServerPlayer player = context.getSource().getPlayerOrException();

if (!WarpMessages.ensureEnabled(player)) {
Expand Down Expand Up @@ -146,10 +147,10 @@ private static LiteralArgumentBuilder<CommandSourceStack> buildListNode() {
private static LiteralArgumentBuilder<CommandSourceStack> buildUpdateNode() {
return Commands.literal("updatewarp")
.requires(source -> source.permissions().hasPermission(Permissions.COMMANDS_ADMIN))
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.suggests(new WarpSuggestionProvider())
.executes(context -> {
final String name = StringArgumentType.getString(context, "name");
final String name = UnicodeStringArgumentType.getString(context, "name");
final ServerPlayer player = context.getSource().getPlayerOrException();

if (!WarpMessages.ensureEnabled(player)) {
Expand Down Expand Up @@ -187,12 +188,12 @@ private static LiteralArgumentBuilder<CommandSourceStack> buildPagePickerNode()
private static LiteralArgumentBuilder<CommandSourceStack> buildMapVisibilityNode() {
return Commands.literal("mapwarp")
.requires(source -> source.getPlayer() != null)
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.suggests(new WarpSuggestionProvider())
.then(Commands.argument("visible", BoolArgumentType.bool())
.executes(context -> {
final ServerPlayer player = context.getSource().getPlayerOrException();
final String warpName = StringArgumentType.getString(context, "name");
final String warpName = UnicodeStringArgumentType.getString(context, "name");
final boolean visible = BoolArgumentType.getBool(context, "visible");

return handleMapVisibility(player, warpName, visible);
Expand All @@ -202,19 +203,19 @@ private static LiteralArgumentBuilder<CommandSourceStack> buildMapVisibilityNode
private static LiteralArgumentBuilder<CommandSourceStack> buildSilentMapVisibilityNode() {
return Commands.literal("teleportcommandsfabric:mapwarp")
.requires(source -> source.getPlayer() != null)
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.then(Commands.argument("visible", BoolArgumentType.bool())
.executes(context -> {
final ServerPlayer player = context.getSource().getPlayerOrException();
final String warpName = StringArgumentType.getString(context, "name");
final String warpName = UnicodeStringArgumentType.getString(context, "name");
final boolean visible = BoolArgumentType.getBool(context, "visible");

return handleSilentMapVisibility(player, warpName, visible);
})
.then(Commands.argument("page", IntegerArgumentType.integer())
.executes(context -> {
final ServerPlayer player = context.getSource().getPlayerOrException();
final String warpName = StringArgumentType.getString(context, "name");
final String warpName = UnicodeStringArgumentType.getString(context, "name");
final boolean visible = BoolArgumentType.getBool(context, "visible");
final int page = IntegerArgumentType.getInteger(context, "page");

Expand All @@ -239,12 +240,12 @@ private static LiteralArgumentBuilder<CommandSourceStack> buildAdminMapListNode(
"commands.teleport_commands.gwarpmap.error",
() -> WarpCommandSupport.printAdminWarpMap(player));
})
.then(Commands.argument("name", StringArgumentType.string())
.then(Commands.argument("name", UnicodeStringArgumentType.unicodeString())
.suggests(new WarpSuggestionProvider())
.then(Commands.argument("visible", BoolArgumentType.bool())
.executes(context -> {
final ServerPlayer player = context.getSource().getPlayerOrException();
final String warpName = StringArgumentType.getString(context, "name");
final String warpName = UnicodeStringArgumentType.getString(context, "name");
final boolean visible = BoolArgumentType.getBool(context, "visible");

if (!WarpMessages.ensureEnabled(player)) {
Expand Down
28 changes: 28 additions & 0 deletions src/main/java/org/AndrewElizabeth/teleportcommandsfabric/mixin/ArgumentTypeInfosMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package org.AndrewElizabeth.teleportcommandsfabric.mixin;

import com.mojang.brigadier.arguments.ArgumentType;
import com.mojang.brigadier.arguments.StringArgumentType;
import net.minecraft.commands.synchronization.ArgumentTypeInfo;
import net.minecraft.commands.synchronization.ArgumentTypeInfos;
import org.AndrewElizabeth.teleportcommandsfabric.utils.UnicodeStringArgumentType;
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.CallbackInfoReturnable;

/**
* Mixin to make UnicodeStringArgumentType serialize as a vanilla StringArgumentType
* when the command tree is sent to clients. This allows the mod to work server-side only
* without requiring clients to install it.
*/
@Mixin(ArgumentTypeInfos.class)
public class ArgumentTypeInfosMixin {

@SuppressWarnings({"unchecked", "rawtypes"})
@Inject(method = "unpack", at = @At("HEAD"), cancellable = true)
private static void handleUnicodeStringType(ArgumentType argumentType, CallbackInfoReturnable cir) {
if (argumentType instanceof UnicodeStringArgumentType) {
cir.setReturnValue(ArgumentTypeInfos.unpack(StringArgumentType.greedyString()));
}
}
}
56 changes: 56 additions & 0 deletions ...main/java/org/AndrewElizabeth/teleportcommandsfabric/utils/UnicodeStringArgumentType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package org.AndrewElizabeth.teleportcommandsfabric.utils;

import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.arguments.ArgumentType;
import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;

import java.util.Collection;
import java.util.List;

/**
* A string argument type that supports Unicode characters (e.g., Chinese, Japanese, Korean)
* in unquoted strings. Brigadier's default StringArgumentType.string() only allows
* [0-9A-Za-z_\-.+] in unquoted strings, which rejects non-ASCII characters.
* <p>
* This type reads any non-whitespace characters as a single argument token,
* or a quoted string if it starts with a quote character.
*/
public class UnicodeStringArgumentType implements ArgumentType<String> {

private UnicodeStringArgumentType() {
}

public static UnicodeStringArgumentType unicodeString() {
return new UnicodeStringArgumentType();
}

public static String getString(CommandContext<?> context, String name) {
return context.getArgument(name, String.class);
}

@Override
public String parse(StringReader reader) throws CommandSyntaxException {
if (reader.canRead() && isQuote(reader.peek())) {
return reader.readQuotedString();
}
return readUnicodeUnquotedString(reader);
}

private static boolean isQuote(char c) {
return c == '"' || c == '\'';
}

private static String readUnicodeUnquotedString(StringReader reader) {
final int start = reader.getCursor();
while (reader.canRead() && reader.peek() != ' ') {
reader.skip();
}
return reader.getString().substring(start, reader.getCursor());
}

@Override
public Collection<String> getExamples() {
return List.of("word", "hello", "你好");
}
}
Loading
Loading