a-ikiso

Author: MORIMORI0317

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

@@ -2,6 +2,4 @@
 
 public class FNJLBuildIn {
     protected static final String VERSION = "1.32";
-
-    protected static final int NATIVE_LIB_VERSION = 3;
 }

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

@@ -15,14 +15,4 @@ public class FelNullJavaLibrary {
     public static String getVersion() {
         return FNJLBuildIn.VERSION;
     }
-
-    /**
-     * ネイティブライブラリのバージョン
-     *
-     * @return バージョン
-     */
-    public static int getNativeLibVersion() {
-        return FNJLBuildIn.NATIVE_LIB_VERSION;
-    }
-
 }

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

@@ -104,4 +104,8 @@ public String toString() {
                 ", imag=" + imag +
                 '}';
     }
+
+    public FNVec2d convertVec2d() {
+        return new FNVec2d(real, imag);
+    }
 }

common/src/main/java/dev/felnull/fnjl/jni/windows/WindowsNative.java

@@ -63,4 +63,12 @@ public String toString() {
                 ", y=" + y +
                 '}';
     }
+
+    public FNVec2f convertFloat() {
+        return new FNVec2f((float) x, (float) y);
+    }
+
+    public FNVec2i convertInt() {
+        return new FNVec2i((int) x, (int) y);
+    }
 }

common/src/main/java/dev/felnull/fnjl/math/FNComplex.java

@@ -63,4 +63,12 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(x, y);
     }
+
+    public FNVec2d convertDouble() {
+        return new FNVec2d(x, y);
+    }
+
+    public FNVec2i convertInt() {
+        return new FNVec2i((int) x, (int) y);
+    }
 }

common/src/main/java/dev/felnull/fnjl/math/FNVec2d.java

@@ -63,4 +63,12 @@ public String toString() {
                 ", y=" + y +
                 '}';
     }
+
+    public FNVec2f convertFloat() {
+        return new FNVec2f(x, y);
+    }
+
+    public FNVec2d convertDouble() {
+        return new FNVec2d(x, y);
+    }
 }

common/src/main/java/dev/felnull/fnjl/math/FNVec2f.java

@@ -6,6 +6,7 @@
 
 public class FNRuntimeUtil {
     private static final Map<Runnable, Long> lastTimes = new HashMap<>();
+    private static final List<Timer> timers = new ArrayList<>();
 
     public static void oneDayClockTimer(int hours, int minutes, Runnable runnable) {
         oneDayClockTimer(hours, minutes, runnable, false);
@@ -30,6 +31,7 @@ public void run() {
             }
         };
         timer.schedule(task, 0, 1000);
+        timers.add(timer);
     }
 
     /**
@@ -130,4 +132,16 @@ public static CompletableFuture<Void> multipleRun(String threadName, int max, Ru
         });
     }
 
+    /**
+     * このクラスで登録したタスクをすべて停止
+     */
+    public static void kill() {
+        for (Timer timer : timers) {
+            timer.cancel();
+            timer.purge();
+        }
+        timers.clear();
+        lastTimes.clear();
+    }
+
 }