Fixed: resource pack

Author: Reider745

src/main/java/com/zhekasmirnov/horizon/util/FileUtils.java

@@ -133,9 +133,15 @@ public static void copy(File src, File dst) throws IOException {
 
 
     public static void copyFileTree(File srcDir, File dstDir, Object dialog, String prefix) throws IOException {
+        if(srcDir.isFile()) {
+            copy(srcDir, dstDir);
+            return;
+        }
+
         if (!dstDir.isDirectory() && !dstDir.mkdirs()) {
             throw new IOException("mkdirs failed: " + dstDir);
         }
+
         for (String name : srcDir.list()) {
             if (dialog != null) {
                 return;

src/main/java/com/zhekasmirnov/innercore/mod/build/ModLoader.java

@@ -115,8 +115,8 @@ public void startMods() {
 
 
 
-    private List<File> resourcePackDirs = new ArrayList<>();
-    private List<File> behaviorPackDirs = new ArrayList<>();
+    private final List<File> resourcePackDirs = new ArrayList<>();
+    private final List<File> behaviorPackDirs = new ArrayList<>();
 
     public static void addMinecraftResourcePack(File directory) {
         if (!instance.resourcePackDirs.contains(directory)) {
@@ -139,9 +139,7 @@ public static void addGlobalMinecraftPacks() {
         DirectorySetRequestHandler globalResourcePacks = ModPackContext.getInstance().getCurrentModPack().getRequestHandler(ModPackDirectory.DirectoryType.RESOURCE_PACKS);
         for (String location : globalResourcePacks.getAllLocations()) {
             File packDir = globalResourcePacks.get(location);
-            if (packDir.isDirectory()) {
-                addMinecraftResourcePack(packDir);
-            }
+            addMinecraftResourcePack(packDir);
         }
 
         DirectorySetRequestHandler globalBehaviorPacks = ModPackContext.getInstance().getCurrentModPack().getRequestHandler(ModPackDirectory.DirectoryType.BEHAVIOR_PACKS);
@@ -234,7 +232,6 @@ private void loadMinecraftPacksIntoDirectory(MinecraftPackType type, File target
             while (target.exists()) {
                 target = new File(targetDir, target.getName() + "-");
             }
-            target.mkdirs();
             try {
                 FileUtils.copyFileTree(file, target, null, null);
             } catch (IOException e) {

src/main/java/com/zhekasmirnov/innercore/modpack/ModPackFactory.java

@@ -1,16 +1,15 @@
 package com.zhekasmirnov.innercore.modpack;
 
 import com.zhekasmirnov.innercore.modpack.strategy.extract.*;
-import com.zhekasmirnov.innercore.modpack.strategy.request.ConfigDirectoryRequestStrategy;
-import com.zhekasmirnov.innercore.modpack.strategy.request.ConfigInModDirectoryRequestStrategy;
-import com.zhekasmirnov.innercore.modpack.strategy.request.DefaultDirectoryRequestStrategy;
-import com.zhekasmirnov.innercore.modpack.strategy.request.DirectoryRequestStrategy;
+import com.zhekasmirnov.innercore.modpack.strategy.request.*;
 import com.zhekasmirnov.innercore.modpack.strategy.update.CacheDirectoryUpdateStrategy;
 import com.zhekasmirnov.innercore.modpack.strategy.update.DirectoryDeniedUpdateStrategy;
 import com.zhekasmirnov.innercore.modpack.strategy.update.JsonMergeDirectoryUpdateStrategy;
 import com.zhekasmirnov.innercore.modpack.strategy.update.ResourceDirectoryUpdateStrategy;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 public class ModPackFactory {
     private final static ModPackFactory instance = new ModPackFactory();
@@ -37,8 +36,7 @@ public ModPack createFromDirectory(File root) {
                         "cache", new DefaultDirectoryRequestStrategy(), new CacheDirectoryUpdateStrategy(),
                         new AllIgnoredDirectoryExtractStrategy()))
                 .addDirectory(new ModPackDirectory(ModPackDirectory.DirectoryType.RESOURCE_PACKS,
-                        new File(root, "resource_packs"), "resource_packs", new DefaultDirectoryRequestStrategy(),
-                        new ResourceDirectoryUpdateStrategy(), new AllFilesDirectoryExtractStrategy()))
+                        new File(root, "resource_packs"), "resource_packs", new NukkitResourcePackRequestStrategy(), new ResourceDirectoryUpdateStrategy(), new AllFilesDirectoryExtractStrategy()))
                 .addDirectory(new ModPackDirectory(ModPackDirectory.DirectoryType.BEHAVIOR_PACKS,
                         new File(root, "behavior_packs"), "behavior_packs", new DefaultDirectoryRequestStrategy(),
                         new ResourceDirectoryUpdateStrategy(), new AllFilesDirectoryExtractStrategy()))
@@ -69,7 +67,7 @@ public ModPack createDefault(File root) {
                 .addDirectory(newDefaultPackDirectory(ModPackDirectory.DirectoryType.CACHE, root, "cache",
                         new DefaultDirectoryRequestStrategy(), new AllIgnoredDirectoryExtractStrategy()))
                 .addDirectory(newDefaultPackDirectory(ModPackDirectory.DirectoryType.RESOURCE_PACKS, root,
-                        "resource_packs", new DefaultDirectoryRequestStrategy()))
+                        "resource_packs", new NukkitResourcePackRequestStrategy()))
                 .addDirectory(newDefaultPackDirectory(ModPackDirectory.DirectoryType.BEHAVIOR_PACKS, root,
                         "behavior_packs", new DefaultDirectoryRequestStrategy()))
                 .addDirectory(new ModPackDirectory(ModPackDirectory.DirectoryType.TEXTURE_PACKS,

src/main/java/com/zhekasmirnov/innercore/modpack/strategy/request/NukkitResourcePackRequestStrategy.java

@@ -0,0 +1,19 @@
+package com.zhekasmirnov.innercore.modpack.strategy.request;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+public class NukkitResourcePackRequestStrategy extends DefaultDirectoryRequestStrategy {
+    @Override
+    public List<String> getAllLocations() {
+        List<String> result = new ArrayList<>();
+        File[] files = getAssignedDirectory().getLocation().listFiles();
+        if (files != null) {
+            for (File file : files) {
+                result.add(file.getName());
+            }
+        }
+        return result;
+    }
+}