From 5b5c4c293c714bb82f5949d12e6b3706f13a0f93 Mon Sep 17 00:00:00 2001 From: zyxkad Date: Thu, 12 Oct 2023 22:42:11 -0600 Subject: [PATCH 1/2] fix #522 --- .../addons/computercraft/peripheral/ChatBoxPeripheral.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java index 167907970..2a966feb3 100644 --- a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java +++ b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java @@ -152,7 +152,7 @@ public final MethodResult sendFormattedMessageToPlayer(@NotNull IArguments argum String message = arguments.getString(0); String playerName = arguments.getString(1); int maxRange = APConfig.PERIPHERALS_CONFIG.chatBoxMaxRange.get(); - int range = arguments.optInt(4, maxRange); + int range = arguments.optInt(5, maxRange); range = maxRange == -1 ? range : Math.min(range, APConfig.PERIPHERALS_CONFIG.chatBoxMaxRange.get()); ResourceKey dimension = getLevel().dimension(); ServerPlayer player = getPlayer(playerName); @@ -182,7 +182,7 @@ public final MethodResult sendMessageToPlayer(@NotNull IArguments arguments) thr String message = arguments.getString(0); String playerName = arguments.getString(1); int maxRange = APConfig.PERIPHERALS_CONFIG.chatBoxMaxRange.get(); - int range = arguments.optInt(4, maxRange); + int range = arguments.optInt(5, maxRange); range = maxRange == -1 ? range : Math.min(range, APConfig.PERIPHERALS_CONFIG.chatBoxMaxRange.get()); ResourceKey dimension = getLevel().dimension(); ServerPlayer player = getPlayer(playerName); From 5aa93f3a035b094457b85338599ce1ada17cdc18 Mon Sep 17 00:00:00 2001 From: zyxkad Date: Fri, 13 Oct 2023 15:07:18 -0600 Subject: [PATCH 2/2] fix #524 --- .../peripheral/ChatBoxPeripheral.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java index 2a966feb3..2286711fc 100644 --- a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java +++ b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java @@ -113,7 +113,11 @@ public final MethodResult sendFormattedMessage(@NotNull IArguments arguments) th if (checkBrackets(arguments.optString(2))) return MethodResult.of(null, "incorrect bracket string (e.g. [], {}, <>, ...)"); - MutableComponent preparedMessage = appendPrefix(arguments.optString(1, APConfig.PERIPHERALS_CONFIG.defaultChatBoxPrefix.get()), arguments.optString(2, "[]"), arguments.optString(3, "")).append(component); + MutableComponent preparedMessage = appendPrefix( + arguments.optString(1, APConfig.PERIPHERALS_CONFIG.defaultChatBoxPrefix.get()), + arguments.optString(2, "[]"), + arguments.optString(3, "").replaceAll("&", "\u00a7") + ).append(component); for (ServerPlayer player : ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayers()) { if (!APConfig.PERIPHERALS_CONFIG.chatBoxMultiDimensional.get() && player.getLevel().dimension() != dimension) continue; @@ -135,7 +139,11 @@ public final MethodResult sendMessage(@NotNull IArguments arguments) throws LuaE if (checkBrackets(arguments.optString(2))) return MethodResult.of(null, "incorrect bracket string (e.g. [], {}, <>, ...)"); - MutableComponent preparedMessage = appendPrefix(arguments.optString(1, APConfig.PERIPHERALS_CONFIG.defaultChatBoxPrefix.get()), arguments.optString(2, "[]"), arguments.optString(3, "")).append(message); + MutableComponent preparedMessage = appendPrefix( + arguments.optString(1, APConfig.PERIPHERALS_CONFIG.defaultChatBoxPrefix.get()), + arguments.optString(2, "[]"), + arguments.optString(3, "").replaceAll("&", "\u00a7") + ).append(message); for (ServerPlayer player : ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayers()) { if (!APConfig.PERIPHERALS_CONFIG.chatBoxMultiDimensional.get() && player.getLevel().dimension() != dimension) continue; @@ -166,7 +174,11 @@ public final MethodResult sendFormattedMessageToPlayer(@NotNull IArguments argum if (checkBrackets(arguments.optString(3))) return MethodResult.of(null, "incorrect bracket string (e.g. [], {}, <>, ...)"); - MutableComponent preparedMessage = appendPrefix(arguments.optString(2, APConfig.PERIPHERALS_CONFIG.defaultChatBoxPrefix.get()), arguments.optString(3, "[]"), arguments.optString(4, "")).append(component); + MutableComponent preparedMessage = appendPrefix( + arguments.optString(2, APConfig.PERIPHERALS_CONFIG.defaultChatBoxPrefix.get()), + arguments.optString(3, "[]"), + arguments.optString(4, "").replaceAll("&", "\u00a7") + ).append(component); if (!APConfig.PERIPHERALS_CONFIG.chatBoxMultiDimensional.get() && player.getLevel().dimension() != dimension) return MethodResult.of(false, "NOT_SAME_DIMENSION"); @@ -192,7 +204,11 @@ public final MethodResult sendMessageToPlayer(@NotNull IArguments arguments) thr if (checkBrackets(arguments.optString(3))) return MethodResult.of(null, "incorrect bracket string (e.g. [], {}, <>, ...)"); - MutableComponent preparedMessage = appendPrefix(arguments.optString(2, APConfig.PERIPHERALS_CONFIG.defaultChatBoxPrefix.get()), arguments.optString(3, "[]"), arguments.optString(4, "")).append(message); + MutableComponent preparedMessage = appendPrefix( + arguments.optString(2, APConfig.PERIPHERALS_CONFIG.defaultChatBoxPrefix.get()), + arguments.optString(3, "[]"), + arguments.optString(4, "").replaceAll("&", "\u00a7") + ).append(message); if (!APConfig.PERIPHERALS_CONFIG.chatBoxMultiDimensional.get() && player.getLevel().dimension() != dimension) return MethodResult.of(false, "NOT_SAME_DIMENSION");