1.26

Author: MORIMORI0317

build.gradle

@@ -6,7 +6,7 @@ plugins {
 
 group 'dev.felnull'
 archivesBaseName = "felnull-java-library"
-version '1.25'
+version '1.26'
 
 repositories {
     mavenCentral()

src/main/java/dev/felnull/fnjl/BuildIn.java

@@ -1,7 +1,7 @@
 package dev.felnull.fnjl;
 
 public class BuildIn {
-    protected static final String VERSION = "1.25";
+    protected static final String VERSION = "1.26";
 
     protected static final int NATIVE_LIB_VERSION = 3;
 }

src/main/java/dev/felnull/fnjl/jni/NativeLibraryManager.java

@@ -21,6 +21,7 @@ public class NativeLibraryManager {
     private static boolean inited;
     private static boolean load;
     private static Path libraryFolder;
+    private static String relocatePath;
 
     /**
      * JNIライブラリを読み込む
@@ -39,6 +40,15 @@ public static void loadLibrary() {
         }
     }
 
+    /**
+     * ShadowJarなどでNativeライブラリの場所を変更してる場合に指定
+     *
+     * @param relocatePath 移動パス
+     */
+    public static void setRelocatePath(String relocatePath) {
+        NativeLibraryManager.relocatePath = relocatePath;
+    }
+
     /**
      * 読み込みに失敗したかどうか
      *
@@ -93,10 +103,10 @@ private static void extractLibrary(OSs.Type os, String aarch) throws IOException
         String libname = "FNJL" + aarch + "." + os.getLibName();
         String pp = FelNullJavaLibrary.class.getPackage().getName().replace(".", "/") + "/natives/" + libname;
 
-        InputStream stream = NativeLibraryManager.class.getResourceAsStream("/" + pp);
+        InputStream stream = loadResource(pp);
 
-        if (stream == null)
-            stream = ClassLoader.getSystemResourceAsStream(pp);
+        if (stream == null && relocatePath != null)
+            stream = loadResource(relocatePath + "/" + libname);
 
         if (stream == null)
             throw new IOException("Library does not exist");
@@ -106,4 +116,12 @@ private static void extractLibrary(OSs.Type os, String aarch) throws IOException
 
         Files.write(path, FNDataUtil.streamToByteArray(stream));
     }
+
+    private static InputStream loadResource(String path) {
+        InputStream stream = NativeLibraryManager.class.getResourceAsStream("/" + path);
+        if (stream == null)
+            stream = ClassLoader.getSystemResourceAsStream(path);
+        return stream;
+    }
+
 }