nna

Author: MORIMORI0317

build.gradle

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

…/main/java/dev/felnull/fnjl/BuildIn.java …n/java/dev/felnull/fnjl/FNJLBuildIn.javasrc/main/java/dev/felnull/fnjl/BuildIn.java renamed to src/main/java/dev/felnull/fnjl/FNJLBuildIn.java src/main/java/dev/felnull/fnjl/BuildIn.java renamed to src/main/java/dev/felnull/fnjl/FNJLBuildIn.java

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

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

@@ -13,7 +13,7 @@ public class FelNullJavaLibrary {
      * @return FelNullJavaLibraryのバージョン
      */
     public static String getVersion() {
-        return BuildIn.VERSION;
+        return FNJLBuildIn.VERSION;
     }
 
     /**
@@ -22,7 +22,7 @@ public static String getVersion() {
      * @return バージョン
      */
     public static int getNativeLibVersion() {
-        return BuildIn.NATIVE_LIB_VERSION;
+        return FNJLBuildIn.NATIVE_LIB_VERSION;
     }
 
 }

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

@@ -21,7 +21,6 @@ public class NativeLibraryManager {
     private static boolean inited;
     private static boolean load;
     private static Path libraryFolder;
-    private static String relocatePath;
 
     /**
      * JNIライブラリを読み込む
@@ -40,15 +39,6 @@ public static void loadLibrary() {
         }
     }
 
-    /**
-     * ShadowJarなどでNativeライブラリの場所を変更してる場合に指定
-     *
-     * @param relocatePath 移動パス
-     */
-    public static void setRelocatePath(String relocatePath) {
-        NativeLibraryManager.relocatePath = relocatePath;
-    }
-
     /**
      * 読み込みに失敗したかどうか
      *
@@ -101,15 +91,17 @@ private static boolean loadExtractLibrary(OSs.Type os, String aarch) throws IOEx
 
     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;
-
+  /*      String cn = FelNullJavaLibrary.class.getSimpleName();
+        String pn = FelNullJavaLibrary.class.getName();
+        String ppa = pn.substring(0, pn.length() - cn.length() - 1).replace(".", "/");
+        String pp = ppa + "/natives/" + libname;
+        */
+        String pp = "dev/felnull/fnjl/natives/" + libname;
+        //dev/felnull/imp/libs/dev/felnull/fnjl/dev/felnull/imp/libs/natives/FNJLx64.dll:
         InputStream stream = loadResource(pp);
 
-        if (stream == null && relocatePath != null)
-            stream = loadResource(relocatePath + "/" + pp);
-
         if (stream == null)
-            throw new IOException("Library does not exist: " + pp + (relocatePath != null ? (" and " + relocatePath + "/" + pp) : ""));
+            throw new IOException("Library does not exist: " + pp);
 
         String name = "FNJL" + FelNullJavaLibrary.getNativeLibVersion() + aarch + "." + os.getLibName();
         Path path = getNativeLibraryFolder().resolve(name);