From 4bad58a041a076c3b2e43fee3e5cd5d9d98ddf0b Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Mon, 27 May 2019 09:12:53 +0300
Subject: [PATCH] fix find files

---
 src/main/java/dmx/lwjake2/UnpackLoader.java | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/dmx/lwjake2/UnpackLoader.java b/src/main/java/dmx/lwjake2/UnpackLoader.java
index d8ffac0..fde9c6c 100644
--- a/src/main/java/dmx/lwjake2/UnpackLoader.java
+++ b/src/main/java/dmx/lwjake2/UnpackLoader.java
@@ -1,7 +1,6 @@
 package dmx.lwjake2;
 
 import lombok.Getter;
-import lombok.Setter;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
@@ -10,6 +9,7 @@ import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 
 @Slf4j
@@ -17,19 +17,25 @@ import java.nio.file.Paths;
 public class UnpackLoader {
 
     @Getter
-    @Setter
-    private static String rootPath;
+    private static Path rootPath;
 
     private static File getFile(String path) {
-        File file = new File(rootPath, path);
+        File file = rootPath.resolve(path).toFile();
         if (!file.exists()) {
-            log.warn("File '{}' not exists", file.getPath());
-            return null;
+            file = rootPath.getParent().resolve(path).toFile();
+            if (!file.exists()) {
+                log.warn("File '{}' not exists", file.getPath());
+                return null;
+            }
         }
 
         return file;
     }
 
+    public static void setRootPath(String rootPath) {
+        UnpackLoader.rootPath = Paths.get(rootPath);
+    }
+
     @Nullable
     public static byte[] loadFile(String path) {
         File file = getFile(path);
@@ -84,6 +90,6 @@ public class UnpackLoader {
     }
 
     public static boolean exists(String path) {
-        return Files.exists(Paths.get(rootPath, path));
+        return Files.exists(rootPath.resolve(path));
     }
 }