Try to add support for directory resource packs.

Author: leMaik

chunky/src/java/se/llbit/chunky/block/jsonmodels/ResourcepackBlockProvider.java

@@ -7,6 +7,7 @@
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -27,6 +28,7 @@
 import se.llbit.chunky.renderer.scene.Scene;
 import se.llbit.chunky.resources.AnimatedTexture;
 import se.llbit.chunky.resources.BitmapImage;
+import se.llbit.chunky.resources.ResourcePackLoader;
 import se.llbit.chunky.resources.Texture;
 import se.llbit.chunky.world.Material;
 import se.llbit.chunky.world.material.TextureMaterial;
@@ -45,6 +47,7 @@
 import se.llbit.nbt.Tag;
 import se.llbit.resources.ImageLoader;
 import se.llbit.util.FileSystemUtil;
+import se.llbit.util.Pair;
 
 public class ResourcepackBlockProvider implements BlockProvider {
   private final Map<String, BlockVariants> blocks = new HashMap<>();
@@ -57,16 +60,16 @@ public void loadBlocks(List<File> files) throws IOException {
                .map(
                  f -> {
                    try {
-                     return FileSystemUtil.getZipFileSystem(f);
+                     return new Pair(f, ResourcePackLoader.getPackFileSystem(f));
                    } catch (IOException e) {
                      throw new RuntimeException("Could not open resource pack " + f, e);
                    }
                  })
-               .toArray(FileSystem[]::new))) {
+               .toArray(Pair[]::new))) {
 
-      for (FileSystem resourcePack : effectiveResources.fileSystems) {
+      for (Pair<File, FileSystem> resourcePack : effectiveResources.fileSystems) {
         JsonModelLoader modelLoader = new JsonModelLoader();
-        Files.list(resourcePack.getPath("assets"))
+        Files.list(ResourcePackLoader.getPackRootPath(resourcePack.thing1, resourcePack.thing2).resolve("assets"))
           .filter(Files::isDirectory)
           .map(assetProvider -> assetProvider.resolve("blockstates"))
           .filter(Files::isDirectory)
@@ -84,6 +87,7 @@ public void loadBlocks(List<File> files) throws IOException {
                       String fqBlockName = assetsName + ":" + blockName;
 
                       if (blocks.containsKey(fqBlockName)) {
+                        System.out.println("Block " + fqBlockName + " already provided");
                         // this block was already provided by a different resource pack
                         return;
                       }
@@ -190,13 +194,13 @@ public void loadBlocks(List<File> files) throws IOException {
                           "Could not load block "
                             + fqBlockName
                             + " from "
-                            + resourcePack.getFileStores().iterator().next().name());
+                            + resourcePack.thing2.getFileStores().iterator().next().name());
                       }
                     });
               } catch (IOException e) {
                 System.out.println(
                   "Could not read resource pack "
-                    + resourcePack.getFileStores().iterator().next().name());
+                    + resourcePack.thing2.getFileStores().iterator().next().name());
               }
             });
       }
@@ -1101,16 +1105,16 @@ public JsonValue toJson() {
   }
 
   public static class MultiFileSystem implements AutoCloseable {
-    private FileSystem[] fileSystems;
+    private final Pair<File, FileSystem>[] fileSystems;
 
-    MultiFileSystem(FileSystem... fileSystems) {
+    MultiFileSystem(Pair<File, FileSystem>... fileSystems) {
       this.fileSystems = fileSystems;
     }
 
     InputStream getInputStream(String... path) throws IOException {
-      for (FileSystem fs : fileSystems) {
+      for (Pair<File, FileSystem> fs : fileSystems) {
         try {
-          return Files.newInputStream(fs.getPath("", path));
+          return Files.newInputStream(ResourcePackLoader.getPackRootPath(fs.thing1, fs.thing2).resolve(String.join(fs.thing2.getSeparator(), path)));
         } catch (NoSuchFileException ignore) {
         }
       }
@@ -1119,9 +1123,9 @@ InputStream getInputStream(String... path) throws IOException {
 
     @Override
     public void close() {
-      for (FileSystem fs : fileSystems) {
+      for (Pair<File, FileSystem> fs : fileSystems) {
         try {
-          fs.close();
+          fs.thing2.close();
         } catch (IOException e) {
         }
       }

chunky/src/java/se/llbit/chunky/main/Chunky.java

@@ -105,7 +105,7 @@ public static String getMainWindowTitle() {
 
   public Chunky(ChunkyOptions options) {
     this.options = options;
-    registerBlockProvider(new MinecraftBlockProvider());
+    // registerBlockProvider(new MinecraftBlockProvider());
     // registerBlockProvider(new LegacyMinecraftBlockProvider());
     registerBlockProvider(new ResourcepackBlockProvider());
   }