Skip to content

Commit 131c75d

Browse files
sharrlottesharrlotte
committed
refactor: replace List.of() with Arrays.asList() for mutable lists
Replace immutable List.of() with mutable Arrays.asList() in multiple files to allow modification of list contents where needed. This change affects ModMetaDto, HudHandler, HttpServer, EventHandler and ClientCommandHandler classes.
1 parent 0c80813 commit 131c75d

File tree

6 files changed

+44
-33
lines changed

6 files changed

+44
-33
lines changed

‎src/main/java/mindustrytool/handler/ClientCommandHandler.java‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.lang.ref.WeakReference;
44
import java.util.ArrayList;
5+
import java.util.Arrays;
56
import java.util.List;
67
import java.util.concurrent.TimeUnit;
78

@@ -198,7 +199,8 @@ public void registerCommands(CommandHandler handler) {
198199
}
199200

200201
session.votedVNW = true;
201-
int cur = context.get().sessionHandler.count(p -> p.votedVNW), req = Mathf.ceil(0.6f * Groups.player.size());
202+
int cur = context.get().sessionHandler.count(p -> p.votedVNW),
203+
req = Mathf.ceil(0.6f * Groups.player.size());
202204
Call.sendMessage(player.name + "[orange] has voted to "
203205
+ (waveVoted == 1 ? "send a new wave" : "skip [green]" + waveVoted + " waves") + ". [lightgray]("
204206
+ (req - cur) + " votes missing)");
@@ -308,38 +310,40 @@ public void sendRedirectServerList(Player player, int page) {
308310
sendRedirectServerList(p, (int) s);
309311
};
310312

311-
List<List<HudOption>> options = new ArrayList<>(List.of(
312-
List.of(HudHandler.option(invalid, "[#FFD700]Server name"),
313+
List<List<HudOption>> options = new ArrayList<>(Arrays.asList(
314+
Arrays.asList(HudHandler.option(invalid, "[#FFD700]Server name"),
313315
HudHandler.option(invalid, "[#FFD700]Players playing")),
314-
List.of(HudHandler.option(invalid, "[#87CEEB]Server Gamemode"),
316+
Arrays.asList(HudHandler.option(invalid, "[#87CEEB]Server Gamemode"),
315317
HudHandler.option(invalid, "[#FFA500]Map Playing")),
316-
List.of(HudHandler.option(invalid, "[#DA70D6]Server Mods")),
317-
List.of(HudHandler.option(invalid, "[#B0B0B0]Server Description"))));
318+
Arrays.asList(HudHandler.option(invalid, "[#DA70D6]Server Mods")),
319+
Arrays.asList(HudHandler.option(invalid, "[#B0B0B0]Server Description"))));
318320

319321
servers.forEach(server -> {
320322
PlayerPressCallback valid = (p, s) -> //
321323
onServerChoose(p, server.getId().toString(), server.getName());
322324

323-
options.add(List.of(HudHandler.option(invalid, "-----------------")));
324-
options.add(List.of(HudHandler.option(valid, "[#FFD700]%s".formatted(server.getName())),
325+
options.add(Arrays.asList(HudHandler.option(invalid, "-----------------")));
326+
options.add(Arrays.asList(HudHandler.option(valid, "[#FFD700]%s".formatted(server.getName())),
325327
HudHandler.option(valid, "[#32CD32]Players: %d".formatted(server.getPlayers()))));
326-
options.add(List.of(HudHandler.option(valid, "[#87CEEB]Gamemode: %s".formatted(server.getMode())),
328+
options.add(Arrays.asList(
329+
HudHandler.option(valid, "[#87CEEB]Gamemode: %s".formatted(server.getMode())),
327330
HudHandler.option(valid, "[#1E90FF]Map: %s".formatted(
328331
server.getMapName() != null ? server.getMapName() : "[#FF4500]Server offline"))));
329332

330333
if (server.getMods() != null && !server.getMods().isEmpty()) {
331-
options.add(List.of(HudHandler.option(valid,
334+
options.add(Arrays.asList(HudHandler.option(valid,
332335
"[#DA70D6]Mods: %s".formatted(String.join(", ", server.getMods())))));
333336
}
334337

335338
if (server.getDescription() != null && !server.getDescription().trim().isEmpty()) {
336339
options.add(
337-
List.of(HudHandler.option(valid, "[#B0B0B0]%s".formatted(server.getDescription()))));
340+
Arrays.asList(
341+
HudHandler.option(valid, "[#B0B0B0]%s".formatted(server.getDescription()))));
338342
}
339343

340344
});
341345

342-
options.add(List.of(//
346+
options.add(Arrays.asList(//
343347
page > 0//
344348
? HudHandler.option((p, state) -> {
345349
sendRedirectServerList(player, (int) state - 1);
@@ -353,7 +357,7 @@ public void sendRedirectServerList(Player player, int page) {
353357
}, "[green]Next")
354358
: HudHandler.option(invalid, "No more")));
355359

356-
options.add(List.of(HudHandler.option(
360+
options.add(Arrays.asList(HudHandler.option(
357361
(p, state) -> context.get().hudHandler.closeFollowDisplay(p, HudHandler.SERVERS_UI),
358362
"[red]Close")));
359363

‎src/main/java/mindustrytool/handler/EventHandler.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.lang.ref.WeakReference;
77
import java.net.InetAddress;
88
import java.util.ArrayList;
9+
import java.util.Arrays;
910
import java.util.Comparator;
1011
import java.util.HashMap;
1112
import java.util.List;
@@ -72,7 +73,7 @@ public EventHandler(WeakReference<ServerController> context) {
7273

7374
private ScheduledFuture<?> updateServerTask, updateServerCore;
7475

75-
private final List<String> icons = List.of(//
76+
private final List<String> icons = Arrays.asList(//
7677
"", "", "", "", "", "", "", "", "", "", //
7778
"", "", "", "", "", "", "", "", "", "", //
7879
"", "", "", "", "", "", "", "", "", "", //
@@ -527,7 +528,7 @@ public void onPlayerJoin(PlayerJoin event) {
527528
&& !serverData.getId().equals(ServerController.SERVER_ID)
528529
&& serverData.players > 0//
529530
) {
530-
var options = List.of(//
531+
var options = Arrays.asList(//
531532
HudHandler.option((p, state) -> {
532533
context.get().hudHandler.closeFollowDisplay(p, HudHandler.SERVER_REDIRECT);
533534
}, "[red]No"),
@@ -627,13 +628,13 @@ public void sendServerList(Player player, int page) {
627628
mods.removeIf(m -> m.trim().equalsIgnoreCase("mindustrytoolplugin"));
628629

629630
if (server.getMapName() == null) {
630-
options.add(List.of(HudHandler.option(valid, "[yellow]%s".formatted(server.getName())),
631+
options.add(Arrays.asList(HudHandler.option(valid, "[yellow]%s".formatted(server.getName())),
631632
HudHandler.option(valid, "[scarlet]Server offline.")));
632633
} else {
633-
options.add(List.of(HudHandler.option(valid, server.getName()),
634+
options.add(Arrays.asList(HudHandler.option(valid, server.getName()),
634635
HudHandler.option(valid, "[lime]Players:[] %d".formatted(server.getPlayers()))));
635636

636-
options.add(List.of(
637+
options.add(Arrays.asList(
637638
HudHandler.option(valid,
638639
"[cyan]Gamemode:[] %s".formatted(server.getMode().toLowerCase())),
639640
HudHandler.option(valid, "[blue]Map:[] %s".formatted(server.getMapName()))));
@@ -645,21 +646,22 @@ public void sendServerList(Player player, int page) {
645646
}
646647

647648
if (server.getDescription() != null && !server.getDescription().trim().isEmpty()) {
648-
options.add(List.of(HudHandler.option(valid, "[grey]%s".formatted(server.getDescription()))));
649+
options.add(Arrays.asList(HudHandler.option(valid, "[grey]%s".formatted(server.getDescription()))));
649650
}
650651

651-
options.add(List.of(HudHandler.option(invalid, "-----------------")));
652+
options.add(Arrays.asList(HudHandler.option(invalid, "-----------------")));
652653
});
653654

654-
options.add(List.of(page > 0 ? HudHandler.option((p, state) -> {
655+
options.add(Arrays.asList(page > 0 ? HudHandler.option((p, state) -> {
655656
sendServerList(player, (int) state - 1);
656657
}, "[orange]Previous") : HudHandler.option(invalid, "First page"),
657658
servers.size() == size ? HudHandler.option((p, state) -> {
658659
sendServerList(player, (int) state + 1);
659660
}, "[lime]Next") : HudHandler.option(invalid, "No more")));
660661

661-
options.add(List.of(
662-
HudHandler.option((p, state) -> context.get().hudHandler.closeFollowDisplay(p, HudHandler.SERVERS_UI),
662+
options.add(Arrays.asList(
663+
HudHandler.option(
664+
(p, state) -> context.get().hudHandler.closeFollowDisplay(p, HudHandler.SERVERS_UI),
663665
"[scarlet]Close")));
664666

665667
context.get().hudHandler.showFollowDisplays(player, HudHandler.SERVERS_UI, "List of all servers",

‎src/main/java/mindustrytool/handler/HttpServer.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.lang.ref.WeakReference;
44
import java.time.Instant;
55
import java.util.ArrayList;
6+
import java.util.Arrays;
67
import java.util.HashMap;
78
import java.util.List;
89
import java.util.Map;
@@ -278,7 +279,7 @@ public void init() {
278279
.setBanned(ban.banned)
279280
.setAdmin(ban.admin)
280281
.setLastKicked(ban.lastKicked))
281-
.toList();
282+
.collect(Collectors.toList());
282283
});
283284

284285
ctx.json(result);
@@ -301,7 +302,7 @@ public void init() {
301302

302303
app.get("commands", ctx -> {
303304
var commands = context.get().serverCommandHandler.getHandler() == null
304-
? List.of()
305+
? Arrays.asList()
305306
: context.get().serverCommandHandler.getHandler()//
306307
.getCommandList()
307308
.map(command -> new ServerCommandDto()
@@ -460,9 +461,9 @@ public void init() {
460461
"group",
461462
thread.getThreadGroup() == null ? "null" : thread.getThreadGroup().getName(),
462463
"stacktrace",
463-
List.of(thread.getStackTrace()).stream().map(stack -> stack.toString())
464-
.toList()))
465-
.toList());
464+
Arrays.asList(thread.getStackTrace()).stream().map(stack -> stack.toString())
465+
.collect(Collectors.toList())))
466+
.collect(Collectors.toList()));
466467

467468
data.put("activeRequest", activeRequests.values());
468469

@@ -555,7 +556,7 @@ private StatsDto getStats() {
555556
// var map = Vars.state.map;
556557
// String mapName = map != null ? map.name() : "";
557558
// List<ModDto> mods = Vars.mods == null //
558-
// ? List.of()
559+
// ? Arrays.asList()
559560
// : Vars.mods.list().map(mod -> new ModDto()//
560561
// .setFilename(mod.file.name())//
561562
// .setName(mod.name)

‎src/main/java/mindustrytool/handler/HudHandler.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212

1313
import java.lang.ref.WeakReference;
1414
import java.time.Duration;
15+
import java.util.Arrays;
1516
import java.util.LinkedList;
1617
import java.util.List;
18+
import java.util.stream.Collectors;
1719

1820
import mindustry.game.EventType.MenuOptionChooseEvent;
1921
import mindustry.game.EventType.PlayerLeave;
@@ -58,7 +60,7 @@ public static HudOption option(PlayerPressCallback callback, String text) {
5860
public void showFollowDisplay(Player player, int id, String title, String description, Object state,
5961
List<HudOption> options) {
6062
showFollowDisplays(player, id, title, description, state,
61-
options.stream().map(option -> List.of(option)).toList());
63+
options.stream().map(option -> Arrays.asList(option)).collect(Collectors.toList()));
6264
}
6365

6466
public synchronized void showFollowDisplays(Player player, int id, String title, String description,
@@ -75,7 +77,7 @@ public synchronized void showFollowDisplays(Player player, int id, String title,
7577

7678
var callbacks = options.stream()//
7779
.flatMap(option -> option.stream().map(l -> l.getCallback()))//
78-
.toList();
80+
.collect(Collectors.toList());
7981

8082
var userMenu = menus.get(player.uuid(), k -> new LinkedList<>());
8183

‎src/main/java/mindustrytool/type/ModMetaDto.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package mindustrytool.type;
22

3+
import java.util.ArrayList;
34
import java.util.List;
45

56
import lombok.Data;
@@ -12,7 +13,7 @@ public class ModMetaDto {
1213
private String internalName;
1314
private String minGameVersion = "0";
1415
private String displayName, author, description, subtitle, version, main, repo;
15-
private List<String> dependencies = List.of();
16+
private List<String> dependencies = new ArrayList<>();
1617
private boolean hidden;
1718
private boolean java;
1819
}

‎src/main/java/mindustrytool/workflow/nodes/WorkflowNode.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.ArrayList;
44
import java.util.List;
55
import java.util.regex.Pattern;
6+
import java.util.stream.Collectors;
67

78
import com.fasterxml.jackson.annotation.JsonIgnore;
89
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -245,7 +246,7 @@ public String asString(WorkflowEmitEvent event) {
245246
var result = new StringBuilder();
246247
int lastEnd = 0;
247248

248-
for (var match : matcher.results().toList()) {
249+
for (var match : matcher.results().collect(Collectors.toList())) {
249250
String path = match.group(1);
250251

251252
result.append(value, lastEnd, match.start());

0 commit comments

Comments
 (0)