Skip to content

Commit d3c1973

Browse files
456dev456dev
committed
fix formatting in changed files
1 parent d00cf80 commit d3c1973

2 files changed

Lines changed: 79 additions & 80 deletions

File tree

‎src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -172,43 +172,43 @@ public final MethodResult sendMessage(@NotNull IArguments arguments) throws LuaE
172172
String message = arguments.getString(0);
173173

174174
// check size while it represents bytes (in utf8 mode) as that is longer
175-
if (message.length() > APConfig.PERIPHERALS_CONFIG.chatBoxMessageSize.get()) {
176-
return MethodResult.of(null, "Message is too long");
177-
}
175+
if (message.length() > APConfig.PERIPHERALS_CONFIG.chatBoxMessageSize.get()) {
176+
return MethodResult.of(null, "Message is too long");
177+
}
178178

179-
if (useUTF8) {
180-
message = StringUtil.byteStringToUTF8(message);
181-
}
179+
if (useUTF8) {
180+
message = StringUtil.byteStringToUTF8(message);
181+
}
182182

183-
int maxRange = APConfig.PERIPHERALS_CONFIG.chatBoxMaxRange.get();
184-
int range = arguments.optInt(4, -1);
185-
ResourceKey<Level> dimension = getLevel().dimension();
183+
int maxRange = APConfig.PERIPHERALS_CONFIG.chatBoxMaxRange.get();
184+
int range = arguments.optInt(4, -1);
185+
ResourceKey<Level> dimension = getLevel().dimension();
186186

187-
Optional<String> brackets = arguments.optString(2);
188-
if (useUTF8) {
189-
brackets = brackets.map(StringUtil::byteStringToUTF8);
190-
}
187+
Optional<String> brackets = arguments.optString(2);
188+
if (useUTF8) {
189+
brackets = brackets.map(StringUtil::byteStringToUTF8);
190+
}
191191

192-
if (checkBrackets(brackets))
192+
if (checkBrackets(brackets))
193193
return MethodResult.of(null, "incorrect bracket string (e.g. [], {}, <>, ...)");
194194

195-
Optional<String> prefix = arguments.optString(1);
196-
if (useUTF8) {
197-
prefix = prefix.map(StringUtil::byteStringToUTF8);
198-
}
195+
Optional<String> prefix = arguments.optString(1);
196+
if (useUTF8) {
197+
prefix = prefix.map(StringUtil::byteStringToUTF8);
198+
}
199199

200-
String bracketColor = arguments.optString(3, "");
201-
if (useUTF8) {
202-
bracketColor = StringUtil.byteStringToUTF8(bracketColor);
203-
}
200+
String bracketColor = arguments.optString(3, "");
201+
if (useUTF8) {
202+
bracketColor = StringUtil.byteStringToUTF8(bracketColor);
203+
}
204204

205-
MutableComponent preparedMessage = appendPrefix(
205+
MutableComponent preparedMessage = appendPrefix(
206206
StringUtil.convertAndToSectionMark(prefix.orElseGet(APConfig.PERIPHERALS_CONFIG.defaultChatBoxPrefix)),
207207
brackets.orElse("[]"),
208208
StringUtil.convertAndToSectionMark(bracketColor)
209209
).append(message);
210210

211-
for (ServerPlayer player : ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayers()) {
211+
for (ServerPlayer player : ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayers()) {
212212
if (!APConfig.PERIPHERALS_CONFIG.chatBoxMultiDimensional.get() && player.level().dimension() != dimension)
213213
continue;
214214
if (CoordUtil.isInRange(getPos(), getLevel(), player, range, maxRange))
@@ -231,7 +231,7 @@ public final MethodResult sendFormattedMessageToPlayer(@NotNull IArguments argum
231231
return MethodResult.of(null, "Message is too long");
232232

233233
if (useUTF8) {
234-
message = StringUtil.byteStringToUTF8(message);
234+
message = StringUtil.byteStringToUTF8(message);
235235
}
236236

237237

@@ -289,23 +289,23 @@ public final MethodResult sendFormattedToastToPlayer(@NotNull IArguments argumen
289289
boolean useUTF8 = arguments.optBoolean(7, false);
290290

291291
String message = arguments.getString(0);
292-
// check size while it represents bytes (in utf8 mode) as that is longer
293-
if (message.length() > APConfig.PERIPHERALS_CONFIG.chatBoxMessageSize.get()) {
294-
return MethodResult.of(null, "Message is too long");
295-
}
292+
// check size while it represents bytes (in utf8 mode) as that is longer
293+
if (message.length() > APConfig.PERIPHERALS_CONFIG.chatBoxMessageSize.get()) {
294+
return MethodResult.of(null, "Message is too long");
295+
}
296296

297-
if (useUTF8) {
298-
message = StringUtil.byteStringToUTF8(message);
299-
}
297+
if (useUTF8) {
298+
message = StringUtil.byteStringToUTF8(message);
299+
}
300300

301301

302-
String title = arguments.getString(1);
302+
String title = arguments.getString(1);
303303

304-
// TODO: missing max length check?
304+
// TODO: missing max length check?
305305

306-
if (useUTF8) {
307-
title = StringUtil.byteStringToUTF8(title);
308-
}
306+
if (useUTF8) {
307+
title = StringUtil.byteStringToUTF8(title);
308+
}
309309

310310
String playerName = arguments.getString(2);
311311
int maxRange = APConfig.PERIPHERALS_CONFIG.chatBoxMaxRange.get();
@@ -326,14 +326,14 @@ public final MethodResult sendFormattedToastToPlayer(@NotNull IArguments argumen
326326
Optional<String> brackets = arguments.optString(4);
327327

328328
if (useUTF8) {
329-
brackets = brackets.map(StringUtil::byteStringToUTF8);
329+
brackets = brackets.map(StringUtil::byteStringToUTF8);
330330
}
331331

332-
if (checkBrackets(brackets))
332+
if (checkBrackets(brackets))
333333
return MethodResult.of(null, "incorrect bracket string (e.g. [], {}, <>, ,,,)");
334334

335335

336-
Optional<String> prefix = arguments.optString(3);
336+
Optional<String> prefix = arguments.optString(3);
337337
if (useUTF8) {
338338
prefix = prefix.map(StringUtil::byteStringToUTF8);
339339
}
@@ -386,26 +386,26 @@ public final MethodResult sendMessageToPlayer(@NotNull IArguments arguments) thr
386386
if (player == null)
387387
return MethodResult.of(null, "incorrect player name/uuid");
388388

389-
Optional<String> brackets = arguments.optString(3);
389+
Optional<String> brackets = arguments.optString(3);
390390

391-
if (useUTF8) {
392-
brackets = brackets.map(StringUtil::byteStringToUTF8);
393-
}
391+
if (useUTF8) {
392+
brackets = brackets.map(StringUtil::byteStringToUTF8);
393+
}
394394

395-
if (checkBrackets(brackets))
395+
if (checkBrackets(brackets))
396396
return MethodResult.of(null, "incorrect bracket string (e.g. [], {}, <>, ...)");
397397

398-
Optional<String> prefix = arguments.optString(2);
398+
Optional<String> prefix = arguments.optString(2);
399399

400-
if (useUTF8) {
401-
prefix = prefix.map(StringUtil::byteStringToUTF8);
402-
}
403-
String bracketColor = arguments.optString(4, "");
404-
if (useUTF8) {
405-
bracketColor = StringUtil.byteStringToUTF8(bracketColor);
406-
}
400+
if (useUTF8) {
401+
prefix = prefix.map(StringUtil::byteStringToUTF8);
402+
}
403+
String bracketColor = arguments.optString(4, "");
404+
if (useUTF8) {
405+
bracketColor = StringUtil.byteStringToUTF8(bracketColor);
406+
}
407407

408-
MutableComponent preparedMessage = appendPrefix(
408+
MutableComponent preparedMessage = appendPrefix(
409409
StringUtil.convertAndToSectionMark(prefix.orElseGet(APConfig.PERIPHERALS_CONFIG.defaultChatBoxPrefix)),
410410
brackets.orElse("[]"),
411411
StringUtil.convertAndToSectionMark(bracketColor)
@@ -452,25 +452,25 @@ public final MethodResult sendToastToPlayer(@NotNull IArguments arguments) throw
452452
if (player == null)
453453
return MethodResult.of(null, "incorrect player name/uuid");
454454

455-
Optional<String> brackets = arguments.optString(4);
455+
Optional<String> brackets = arguments.optString(4);
456456

457-
if (useUTF8) {
458-
brackets = brackets.map(StringUtil::byteStringToUTF8);
459-
}
457+
if (useUTF8) {
458+
brackets = brackets.map(StringUtil::byteStringToUTF8);
459+
}
460460

461-
if (checkBrackets(brackets))
461+
if (checkBrackets(brackets))
462462
return MethodResult.of(null, "incorrect bracket string (e.g. [], {}, <>, ...)");
463463

464-
Optional<String> prefix = arguments.optString(3);
464+
Optional<String> prefix = arguments.optString(3);
465465

466-
if (useUTF8) {
467-
prefix = prefix.map(StringUtil::byteStringToUTF8);
468-
}
466+
if (useUTF8) {
467+
prefix = prefix.map(StringUtil::byteStringToUTF8);
468+
}
469469

470-
String bracketColor = arguments.optString(5, "");
471-
if (useUTF8) {
472-
bracketColor = StringUtil.byteStringToUTF8(bracketColor);
473-
}
470+
String bracketColor = arguments.optString(5, "");
471+
if (useUTF8) {
472+
bracketColor = StringUtil.byteStringToUTF8(bracketColor);
473+
}
474474

475475
MutableComponent preparedMessage = appendPrefix(
476476
StringUtil.convertAndToSectionMark(prefix.orElseGet(APConfig.PERIPHERALS_CONFIG.defaultChatBoxPrefix)),
@@ -491,10 +491,10 @@ public final MethodResult sendToastToPlayer(@NotNull IArguments arguments) throw
491491

492492
public void update() {
493493
lastConsumedMessage = Events.traverseChatMessages(lastConsumedMessage, message -> {
494-
String byteString = StringUtil.utf8ToByteString(message.message());
495-
for (IComputerAccess computer : getConnectedComputers()) {
496-
computer.queueEvent("chat", message.username(), message.message(), message.uuid(), message.isHidden(),
497-
byteString);
494+
String byteString = StringUtil.utf8ToByteString(message.message());
495+
for (IComputerAccess computer : getConnectedComputers()) {
496+
computer.queueEvent("chat", message.username(), message.message(), message.uuid(), message.isHidden(),
497+
byteString);
498498
}
499499
});
500500
}

‎src/main/java/de/srendi/advancedperipherals/common/util/StringUtil.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ public static String toHexString(byte[] bytes) {
1818
/**
1919
* This method will convert "&[0-9a-z]" to "§[0-9a-z]", then we can make colored message in CC easier
2020
* If a '&' is behind reverse slash '\', it will be ignored.
21-
* Note: In CC, you need to use <code>"\\&"</code> to get an unescaped '&' character
21+
* Note: In CC, you need to use <code>"\\&"</code> to get an unescaped '&' character
2222
* If the character after '&' is not a digital number or lowercase letter, the & operator will not be escaped as well.
2323
*
2424
* Some convert example:
25-
* "&a" -> "§a"
26-
* "&" -> "&"
27-
* "\\&" -> "&"
28-
* "\\&a" -> "&a"
29-
* "&A" -> "&A"
30-
* "& a" -> "& a"
31-
* "&&a" -> "&§a"
25+
* "&a" -> "§a"
26+
* "&" -> "&"
27+
* "\\&" -> "&"
28+
* "\\&a" -> "&a"
29+
* "&A" -> "&A"
30+
* "& a" -> "& a"
31+
* "&&a" -> "&§a"
3232
*/
3333
public static String convertAndToSectionMark(String str) {
3434
return str == null ? null : str.replaceAll("(?<!\\\\)&(?=[0-9a-z])", "\u00a7").replaceAll("\\\\&", "&");
@@ -41,7 +41,6 @@ public static String convertAndToSectionMark(String str) {
4141
* To convert this to a UTF-8 string, we need to interpret the byte string as ISO-8859-1 to get each individual byte,
4242
* then convert that to a UTF-8 string.
4343
*
44-
*
4544
* @param asciiByteString the utf encoded string sourced from lua.
4645
* @return A String, with all characters correctly interpreted as UTF-8.
4746
*/

0 commit comments

Comments
 (0)