1.61

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.60";
+    protected static final String VERSION = "1.61";
 }

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

@@ -281,63 +281,20 @@ 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);
-
-        try (InputStream stream = clazz.getResourceAsStream("/" + path)) {
-            if (stream != null)
-                return stream;
-        }
-
-        try (InputStream stream = ClassLoader.getSystemResourceAsStream(path)) {
-            if (stream != null)
-                return stream;
-        }
-
-        return null;
-    }
+        if (path.startsWith("/"))
+            path = path.substring(1);
 
-    /**
-     * リソースフォルダからデータを抽出(バッファ)
-     *
-     * @param clazz リソースフォルダのクラス
-     * @param path  リソースパス
-     * @return InputStream
-     * @throws IOException 例外
-     */
-    @Nullable
-    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;
-                }
-            }
-        }
-        return null;
+        InputStream stream = clazz.getResourceAsStream("/" + path);
+        if (stream == null)
+            stream = ClassLoader.getSystemResourceAsStream(path);
+        return stream != null ? new BufferedInputStream(stream) : null;
     }
 
     /**

gradle.properties

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

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.60";
+    protected static final String VERSION = "1.61";
 
     protected static final int NATIVE_LIBRARY_VERSION = 1;
 }

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

@@ -26,7 +26,7 @@ public class FelNullJavaLibraryNatives {
     public synchronized static void init() {
         String tempDir = System.getProperty("java.io.tmpdir");
         Path path = Paths.get(tempDir).resolve("fnjl_natives");
-        path.toFile().mkdirs();
+        FNDataUtil.wishMkdir(path.toFile());
         init(path);
     }
 
@@ -63,7 +63,7 @@ public synchronized static void init(String libraryLocation, Path libraryPath) {
             return;
         }
 
-        try (InputStream stream = FNDataUtil.resourceBufferedExtracted(FelNullJavaLibraryNatives.class, libraryLocation + libName)) {
+        try (InputStream stream = FNDataUtil.resourceExtractor(FelNullJavaLibraryNatives.class, libraryLocation + libName)) {
             if (stream != null) {
                 byte[] data = FNDataUtil.streamToByteArray(stream);
                 outLibFIle.delete();