summaryrefslogtreecommitdiff
path: root/enigma-server
diff options
context:
space:
mode:
authorGravatar YanisBft2021-05-23 23:51:38 +0200
committerGravatar GitHub2021-05-23 22:51:38 +0100
commitb5fad1e215321505240b567f9cdf69e56eacadf4 (patch)
tree63efb626ebd61b4889d32fb5a39e55160cb88b8f /enigma-server
parentUpdate to Java 16 (#390) (diff)
downloadenigma-b5fad1e215321505240b567f9cdf69e56eacadf4.tar.gz
enigma-b5fad1e215321505240b567f9cdf69e56eacadf4.tar.xz
enigma-b5fad1e215321505240b567f9cdf69e56eacadf4.zip
Cleanup with Java 16 (#394)
* Cleanup using Java 16 * use Stream.toList()
Diffstat (limited to 'enigma-server')
-rw-r--r--enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java3
-rw-r--r--enigma-server/src/main/java/cuchaz/enigma/network/packet/SyncMappingsS2CPacket.java3
2 files changed, 2 insertions, 4 deletions
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;
9import cuchaz.enigma.network.Message; 9import cuchaz.enigma.network.Message;
10import cuchaz.enigma.network.ServerPacketHandler; 10import cuchaz.enigma.network.ServerPacketHandler;
11import cuchaz.enigma.translation.representation.entry.Entry; 11import cuchaz.enigma.translation.representation.entry.Entry;
12import cuchaz.enigma.utils.Utils;
13import cuchaz.enigma.utils.validation.PrintValidatable; 12import cuchaz.enigma.utils.validation.PrintValidatable;
14import cuchaz.enigma.utils.validation.ValidationContext; 13import cuchaz.enigma.utils.validation.ValidationContext;
15 14
@@ -54,7 +53,7 @@ public class ChangeDocsC2SPacket implements Packet<ServerPacketHandler> {
54 if (mapping == null) { 53 if (mapping == null) {
55 mapping = new EntryMapping(handler.getServer().getMappings().deobfuscate(entry).getName()); 54 mapping = new EntryMapping(handler.getServer().getMappings().deobfuscate(entry).getName());
56 } 55 }
57 handler.getServer().getMappings().mapFromObf(vc, entry, mapping.withDocs(Utils.isBlank(newDocs) ? null : newDocs)); 56 handler.getServer().getMappings().mapFromObf(vc, entry, mapping.withDocs(newDocs.isBlank() ? null : newDocs));
58 57
59 if (!vc.canProceed()) return; 58 if (!vc.canProceed()) return;
60 59
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;
13import java.io.IOException; 13import java.io.IOException;
14import java.util.Collection; 14import java.util.Collection;
15import java.util.List; 15import java.util.List;
16import java.util.stream.Collectors;
17 16
18public class SyncMappingsS2CPacket implements Packet<ClientPacketHandler> { 17public class SyncMappingsS2CPacket implements Packet<ClientPacketHandler> {
19 private EntryTree<EntryMapping> mappings; 18 private EntryTree<EntryMapping> mappings;
@@ -55,7 +54,7 @@ public class SyncMappingsS2CPacket implements Packet<ClientPacketHandler> {
55 54
56 @Override 55 @Override
57 public void write(DataOutput output) throws IOException { 56 public void write(DataOutput output) throws IOException {
58 List<EntryTreeNode<EntryMapping>> roots = mappings.getRootNodes().collect(Collectors.toList()); 57 List<EntryTreeNode<EntryMapping>> roots = mappings.getRootNodes().toList();
59 output.writeInt(roots.size()); 58 output.writeInt(roots.size());
60 for (EntryTreeNode<EntryMapping> node : roots) { 59 for (EntryTreeNode<EntryMapping> node : roots) {
61 writeEntryTreeNode(output, node); 60 writeEntryTreeNode(output, node);