Skip to content

Fix Chatbox peripheral methods #526

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

Merged
merged 3 commits into from
Oct 29, 2023
Merged

Fix Chatbox peripheral methods #526

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b5c4c2
fix #522
zyxkad Oct 13, 2023
5aa93f3
fix #524
zyxkad Oct 13, 2023
c0525d5
Merge branch '1.19.2' of https://github.com/SirEndii/AdvancedPeripher…
zyxkad Oct 17, 2023
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
28 changes: 22 additions & 6 deletions .../srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -152,7 +160,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<Level> dimension = getLevel().dimension();
ServerPlayer player = getPlayer(playerName);
Expand All @@ -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");

Expand All @@ -182,7 +194,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<Level> dimension = getLevel().dimension();
ServerPlayer player = getPlayer(playerName);
Expand All @@ -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");

Expand Down