Fix splitting lines on windows

AlexProgrammerDE · Sep 18, 2023 · 41046f8 · 41046f8
1 parent df99e3b
commit 41046f8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/src/main/java/net/pistonmaster/serverwrecker/auth/AccountRegistry.java b/src/main/java/net/pistonmaster/serverwrecker/auth/AccountRegistry.java
@@ -64,9 +64,7 @@ public void loadFromString(String file, AuthType authType) {
                 throw new IllegalArgumentException("Invalid JSON!");
             }
         } else {
-            String[] accountLines = file.split("\n");
-
-            Arrays.stream(accountLines)
+            file.lines()
                     .filter(line -> !line.isBlank())
                     .distinct()
                     .map(account -> fromString(account, authType))

diff --git a/src/main/java/net/pistonmaster/serverwrecker/data/BlockShapeType.java b/src/main/java/net/pistonmaster/serverwrecker/data/BlockShapeType.java
@@ -34,9 +34,7 @@ public record BlockShapeType(int id, List<BlockShape> blockShapes) {
                 throw new IllegalStateException("blockshapes.txt not found!");
             }
 
-            String[] lines = new String(inputStream.readAllBytes()).split("\n");
-
-            for (String line : lines) {
+            new String(inputStream.readAllBytes()).lines().forEach(line -> {
                 String[] parts = line.split("\\|");
 
                 int id = Integer.parseInt(parts[0]);
@@ -58,7 +56,7 @@ public record BlockShapeType(int id, List<BlockShape> blockShapes) {
                 }
 
                 VALUES.add(new BlockShapeType(id, blockShapes));
-            }
+            });
         } catch (IOException e) {
             throw new IllegalStateException(e);
         }

diff --git a/src/main/java/net/pistonmaster/serverwrecker/data/BlockStateLoader.java b/src/main/java/net/pistonmaster/serverwrecker/data/BlockStateLoader.java
@@ -35,9 +35,7 @@ public class BlockStateLoader {
                 throw new IllegalStateException("blockstates.txt not found!");
             }
 
-            String[] lines = new String(inputStream.readAllBytes()).split("\n");
-
-            for (String line : lines) {
+            new String(inputStream.readAllBytes()).lines().forEach(line -> {
                 String[] parts = line.split("\\|");
                 String name = parts[0];
 
@@ -55,7 +53,7 @@ public class BlockStateLoader {
                 }
 
                 BLOCK_SHAPES.put(name, blockShapeTypes);
-            }
+            });
         } catch (IOException e) {
             throw new IllegalStateException(e);
         }

diff --git a/src/main/java/net/pistonmaster/serverwrecker/proxy/ProxyRegistry.java b/src/main/java/net/pistonmaster/serverwrecker/proxy/ProxyRegistry.java
@@ -44,9 +44,7 @@ public void loadFromFile(Path file, ProxyType proxyType) throws IOException {
     public void loadFromString(String file, ProxyType proxyType) {
         List<SWProxy> newProxies = new ArrayList<>();
 
-        String[] proxyLines = file.split("\n");
-
-        Arrays.stream(proxyLines)
+        file.lines()
                 .filter(line -> !line.isBlank())
                 .distinct()
                 .map(line -> fromString(line, proxyType))