1.66

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

common/src/main/java/dev/felnull/fnjl/concurrent/InvokeExecutor.java

@@ -26,4 +26,13 @@ public void runTasks() {
         while (!tasks.isEmpty())
             tasks.poll().run();
     }
+
+    /**
+     * 現在の実行待ちタスクの数
+     *
+     * @return タスク数
+     */
+    public int getTaskCount() {
+        return tasks.size();
+    }
 }

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

@@ -21,6 +21,7 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
@@ -618,13 +619,11 @@ public static void readZipStreamed(InputStream zipStream, BiConsumer<ZipEntry, I
     @NotNull
     public static <T, M> Function<T, M> memoize(@NotNull final Function<T, M> function) {
         return new Function<T, M>() {
-            private final Map<T, M> cache = new HashMap<>();
+            private final Map<T, M> cache = new ConcurrentHashMap<>();
 
             @Override
             public M apply(T t) {
-                synchronized (cache) {
-                    return cache.computeIfAbsent(t, function);
-                }
+                return cache.computeIfAbsent(t, function);
             }
         };
     }

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

@@ -1,5 +1,9 @@
 package dev.felnull.fnjl.util;
 
+import dev.felnull.fnjl.math.FNVec3f;
+import dev.felnull.fnjl.tuple.FNPair;
+
+import java.util.function.Consumer;
 import java.util.function.IntConsumer;
 
 /**
@@ -34,4 +38,32 @@ public static void forMinToMaxDownwards(int start, int end, IntConsumer action)
             action.accept(i);
         }
     }
+
+    /**
+     * 箱の指定から縁の繰り返す
+     *
+     * @param stX    箱の開始地点x
+     * @param stY    箱の開始地点y
+     * @param stZ    箱の開始地点z
+     * @param enX    箱の終了地点x
+     * @param enY    箱の終了地点y
+     * @param enZ    箱の終了地点z
+     * @param action 実行
+     */
+    public static void forBoxEdge(float stX, float stY, float stZ, float enX, float enY, float enZ, Consumer<FNPair<FNVec3f, FNVec3f>> action) {
+        action.accept(FNPair.of(new FNVec3f(stX, stY, stZ), new FNVec3f(stX, enY, stZ)));
+        action.accept(FNPair.of(new FNVec3f(enX, stY, stZ), new FNVec3f(enX, enY, stZ)));
+        action.accept(FNPair.of(new FNVec3f(stX, stY, enZ), new FNVec3f(stX, enY, enZ)));
+        action.accept(FNPair.of(new FNVec3f(enX, stY, enZ), new FNVec3f(enX, enY, enZ)));
+
+        action.accept(FNPair.of(new FNVec3f(stX, stY, stZ), new FNVec3f(enX, stY, stZ)));
+        action.accept(FNPair.of(new FNVec3f(stX, stY, enZ), new FNVec3f(enX, stY, enZ)));
+        action.accept(FNPair.of(new FNVec3f(stX, enY, stZ), new FNVec3f(enX, enY, stZ)));
+        action.accept(FNPair.of(new FNVec3f(stX, enY, enZ), new FNVec3f(enX, enY, enZ)));
+
+        action.accept(FNPair.of(new FNVec3f(stX, stY, stZ), new FNVec3f(stX, stY, enZ)));
+        action.accept(FNPair.of(new FNVec3f(enX, stY, stZ), new FNVec3f(enX, stY, enZ)));
+        action.accept(FNPair.of(new FNVec3f(stX, enY, stZ), new FNVec3f(stX, enY, enZ)));
+        action.accept(FNPair.of(new FNVec3f(enX, enY, stZ), new FNVec3f(enX, enY, enZ)));
+    }
 }

common/src/test/java/dev/felnull/fnjltest/Main.java

@@ -2,5 +2,6 @@
 
 public class Main {
     public static void main(String[] args) throws Exception {
+
     }
 }

gradle.properties

@@ -1,3 +1,3 @@
 fnjl_group=dev.felnull
 fnjl_name=felnull-java-library
-fnjl_version=1.65
+fnjl_version=1.66

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