Modify pack screen to load faster

Co-Authored-By: IMS <[email protected]>
Asek3 · Nov 21, 2023 · 15f3255 · 15f3255
1 parent 7396ee6
commit 15f3255
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/net/coderbot/iris/Iris.java b/src/main/java/net/coderbot/iris/Iris.java
@@ -284,6 +284,11 @@ private static boolean loadExternalShaderpack(String name) {
 			return false;
 		}
 
+		if (!isValidShaderpack(shaderPackRoot)) {
+			logger.error("Pack \"{}\" is not valid! Can't load it.", name);
+			return false;
+		}
+
 		Path shaderPackPath;
 
 		if (shaderPackRoot.toString().endsWith(".zip")) {
@@ -461,6 +466,10 @@ private static void tryUpdateConfigPropertiesFile(Path path, Properties properti
 		}
 	}
 
+	public static boolean isValidToShowPack(Path pack) {
+		return Files.isDirectory(pack) || pack.toString().endsWith(".zip");
+	}
+
 	public static boolean isValidShaderpack(Path pack) {
 		if (Files.isDirectory(pack)) {
 			// Sometimes the shaderpack directory itself can be

diff --git a/src/main/java/net/coderbot/iris/shaderpack/discovery/ShaderpackDirectoryManager.java b/src/main/java/net/coderbot/iris/shaderpack/discovery/ShaderpackDirectoryManager.java
@@ -71,7 +71,7 @@ public Collection<String> enumerate() throws IOException {
 		};
 
 		try (Stream<Path> list = Files.list(root)) {
-			return list.filter(Iris::isValidShaderpack)
+			return list.filter(Iris::isValidToShowPack)
 				.map(path -> path.getFileName().toString())
 				.sorted(comparator).collect(Collectors.toList());
 		}