1.60

Author: MORIMORI0317

common/src/main/java/dev/felnull/fnjl/FNJLBuildIn.java

@@ -1,5 +1,5 @@
 package dev.felnull.fnjl;
 
 public class FNJLBuildIn {
-    protected static final String VERSION = "1.59";
+    protected static final String VERSION = "1.60";
 }

common/src/main/java/dev/felnull/fnjl/util/FNDataUtil.java

@@ -281,17 +281,43 @@ public static byte[] fileLoadToProgress(File file, Consumer<ProgressWriter.Write
 
     /**
      * リソースフォルダからデータを抽出
+     * {@link #resourceExtracted}を利用してください
      *
      * @param clazz リソースフォルダのクラス
      * @param path  リソースパス
      * @return InputStream
      */
     @Nullable
+    @Deprecated
     public static InputStream resourceExtractor(@NotNull Class<?> clazz, @NotNull String path) {
+        try {
+            return resourceBufferedExtracted(clazz, path);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * リソースフォルダからデータを抽出
+     *
+     * @param clazz リソースフォルダのクラス
+     * @param path  リソースパス
+     * @return InputStream
+     */
+    public static InputStream resourceExtracted(@NotNull Class<?> clazz, @NotNull String path) throws IOException {
         if (path.startsWith("/")) path = path.substring(1);
-        InputStream stream = clazz.getResourceAsStream("/" + path);
-        if (stream == null) stream = ClassLoader.getSystemResourceAsStream(path);
-        return stream;
+
+        try (InputStream stream = clazz.getResourceAsStream("/" + path)) {
+            if (stream != null)
+                return stream;
+        }
+
+        try (InputStream stream = ClassLoader.getSystemResourceAsStream(path)) {
+            if (stream != null)
+                return stream;
+        }
+
+        return null;
     }
 
     /**
@@ -303,8 +329,8 @@ public static InputStream resourceExtractor(@NotNull Class<?> clazz, @NotNull St
      * @throws IOException 例外
      */
     @Nullable
-    public static InputStream resourceBufferedExtractor(@NotNull Class<?> clazz, @NotNull String path) throws IOException {
-        try (InputStream stream = resourceExtractor(clazz, path)) {
+    public static InputStream resourceBufferedExtracted(@NotNull Class<?> clazz, @NotNull String path) throws IOException {
+        try (InputStream stream = resourceExtracted(clazz, path)) {
             if (stream != null) {
                 try (InputStream bufStream = new BufferedInputStream(stream)) {
                     return bufStream;

gradle.properties

@@ -1,3 +1,3 @@
 fnjl_group=dev.felnull
 fnjl_name=felnull-java-library
-fnjl_version=1.59
+fnjl_version=1.60

natives/src/main/java/dev/felnull/fnjln/FNJLNBuildIn.java

@@ -1,7 +1,7 @@
 package dev.felnull.fnjln;
 
 public class FNJLNBuildIn {
-    protected static final String VERSION = "1.59";
+    protected static final String VERSION = "1.60";
 
     protected static final int NATIVE_LIBRARY_VERSION = 1;
 }

natives/src/main/java/dev/felnull/fnjln/FelNullJavaLibraryNatives.java

@@ -3,7 +3,6 @@
 import dev.felnull.fnjl.os.OSs;
 import dev.felnull.fnjl.util.FNDataUtil;
 
-import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -64,19 +63,18 @@ public synchronized static void init(String libraryLocation, Path libraryPath) {
             return;
         }
 
-        InputStream stream = FNDataUtil.resourceExtractor(FelNullJavaLibraryNatives.class, libraryLocation + libName);
-        if (stream != null) {
-            stream = new BufferedInputStream(stream);
-            try {
+        try (InputStream stream = FNDataUtil.resourceBufferedExtracted(FelNullJavaLibraryNatives.class, libraryLocation + libName)) {
+            if (stream != null) {
                 byte[] data = FNDataUtil.streamToByteArray(stream);
                 outLibFIle.delete();
                 Files.write(outLibFIle.toPath(), data);
                 loaded = loadLibrary(outLibFIle);
-            } catch (IOException ex) {
-                ex.printStackTrace();
             }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            init = true;
         }
-        init = true;
     }
 
     private static boolean loadLibrary(File file) {