From b5fad1e215321505240b567f9cdf69e56eacadf4 Mon Sep 17 00:00:00 2001
From: YanisBft
Date: Sun, 23 May 2021 23:51:38 +0200
Subject: Cleanup with Java 16 (#394)

* Cleanup using Java 16

* use Stream.toList()---
 .../main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java    | 3 +--
 .../main/java/cuchaz/enigma/network/packet/SyncMappingsS2CPacket.java  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'enigma-server')

diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java
index 23ffe993..f3e07c2d 100644
--- a/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java
@@ -9,7 +9,6 @@ import cuchaz.enigma.network.EnigmaServer;
 import cuchaz.enigma.network.Message;
 import cuchaz.enigma.network.ServerPacketHandler;
 import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.utils.Utils;
 import cuchaz.enigma.utils.validation.PrintValidatable;
 import cuchaz.enigma.utils.validation.ValidationContext;
 
@@ -54,7 +53,7 @@ public class ChangeDocsC2SPacket implements Packet<ServerPacketHandler> {
 		if (mapping == null) {
 			mapping = new EntryMapping(handler.getServer().getMappings().deobfuscate(entry).getName());
 		}
-		handler.getServer().getMappings().mapFromObf(vc, entry, mapping.withDocs(Utils.isBlank(newDocs) ? null : newDocs));
+		handler.getServer().getMappings().mapFromObf(vc, entry, mapping.withDocs(newDocs.isBlank() ? null : newDocs));
 
 		if (!vc.canProceed()) return;
 
diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/packet/SyncMappingsS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/SyncMappingsS2CPacket.java
index 76ecbc7d..92a78748 100644
--- a/enigma-server/src/main/java/cuchaz/enigma/network/packet/SyncMappingsS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/SyncMappingsS2CPacket.java
@@ -13,7 +13,6 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class SyncMappingsS2CPacket implements Packet<ClientPacketHandler> {
 	private EntryTree<EntryMapping> mappings;
@@ -55,7 +54,7 @@ public class SyncMappingsS2CPacket implements Packet<ClientPacketHandler> {
 
 	@Override
 	public void write(DataOutput output) throws IOException {
-		List<EntryTreeNode<EntryMapping>> roots = mappings.getRootNodes().collect(Collectors.toList());
+		List<EntryTreeNode<EntryMapping>> roots = mappings.getRootNodes().toList();
 		output.writeInt(roots.size());
 		for (EntryTreeNode<EntryMapping> node : roots) {
 			writeEntryTreeNode(output, node);
-- 
cgit v1.2.3