From 6285b7646bb9a6df94177a2b5db68972d9b2ddca Mon Sep 17 00:00:00 2001 From: dfsek Date: Tue, 20 Jul 2021 21:05:55 -0700 Subject: [PATCH] dont exclude pack.yml --- .../java/com/dfsek/terra/config/fileloaders/FolderLoader.java | 1 - .../main/java/com/dfsek/terra/config/fileloaders/ZIPLoader.java | 1 - 2 files changed, 2 deletions(-) diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/FolderLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/FolderLoader.java index b1ebb1aea..5d846c5f6 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/FolderLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/FolderLoader.java @@ -31,7 +31,6 @@ public class FolderLoader extends LoaderImpl { paths.filter(Files::isRegularFile).filter(file -> file.toString().toLowerCase().endsWith(extension)).forEach(file -> { try { String rel = newPath.toPath().relativize(file).toString(); - if(rel.equals("pack.yml")) return; streams.put(rel, new FileInputStream(file.toFile())); } catch(FileNotFoundException e) { e.printStackTrace(); diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/ZIPLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/ZIPLoader.java index 573494354..59e25cbcc 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/ZIPLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/ZIPLoader.java @@ -27,7 +27,6 @@ public class ZIPLoader extends LoaderImpl { Enumeration entries = file.entries(); while(entries.hasMoreElements()) { ZipEntry entry = entries.nextElement(); - if(entry.getName().equals("pack.yml")) continue; if(!entry.isDirectory() && entry.getName().startsWith(directory) && entry.getName().endsWith(extension)) { try { String rel = entry.getName().substring(directory.length());