Merge remote-tracking branch 'origin/main'

Author: burdoto

src/main/java/org/comroid/api/attr/NativeObjectContainer.java

@@ -0,0 +1,8 @@
+package org.comroid.api.attr;
+
+import lombok.Data;
+
+@Data
+public class NativeObjectContainer<T> {
+    protected T nativeObject;
+}

src/main/java/org/comroid/api/data/Vector.java

@@ -6,6 +6,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.Value;
 import lombok.experimental.FieldDefaults;
 import org.comroid.api.info.Assert;
@@ -68,6 +69,22 @@ static Vector of(double... dim) {
 
     Vector setW(double value);
 
+    default Vector intCast() {
+        return map(x -> (int) x);
+    }
+
+    default Vector intRound() {
+        return map(Math::round);
+    }
+
+    default Vector intFloor() {
+        return map(Math::floor);
+    }
+
+    default Vector intCeil() {
+        return map(Math::ceil);
+    }
+
     default DoubleStream stream() {
         return Arrays.stream(toArray());
     }
@@ -278,8 +295,8 @@ public final String toString() {
     @FieldDefaults(level = AccessLevel.PROTECTED)
     class N3 extends N2 {
         public static final N3 Zero = new N3();
-        public static final N3 One = new N3(1, 1, 1);
-        double z;
+        public static final N3 One  = new N3(1, 1, 1);
+        @Setter             double z;
 
         public N3(double x, double y, double z) {
             super(x, y);
@@ -336,9 +353,9 @@ public N3 convertToEntityAttribute(byte[] dbData) {
     @EqualsAndHashCode(callSuper = true)
     @FieldDefaults(level = AccessLevel.PROTECTED)
     class N4 extends N3 {
-        public static final N4 Zero = new N4();
-        public static final N4 One = new N4(1, 1, 1, 1);
-        double w;
+        public static final N4     Zero = new N4();
+        public static final N4     One  = new N4(1, 1, 1, 1);
+        @Setter             double w;
 
         public N4(double x, double y, double z, double w) {
             super(x, y, z);

src/main/java/org/comroid/api/func/util/Command.java

@@ -171,11 +171,11 @@ public static class Listener<T> extends Container.Base implements Predicate<Even
         @NonFinal                   boolean active   = true;
 
         private Listener(@Nullable String key, @NotNull Bus<T> bus, Predicate<Event<T>> requirement, Consumer<Event<T>> action) {
-            this.name     = key;
-            this.bus      = bus;
+            this.name        = key;
+            this.bus         = bus;
             this.requirement = requirement;
-            this.action   = action;
-            this.location = caller(2);
+            this.action      = action;
+            this.location    = caller(2);
         }
 
         @Override
@@ -327,7 +327,7 @@ private <I> Bus<T> setDependent(
         ) {
             if (cleanup && this.upstream != null) this.upstream.downstream.remove(this);
             this.upstream    = parent;
-            this.function = uncheckedCast(function);
+            this.function    = uncheckedCast(function);
             this.keyFunction = keyFunction;
             this.upstream.downstream.add(this);
             return this;
@@ -407,7 +407,7 @@ public Event<T> publish(@Nullable String key, @Nullable T data) {
         @Builder(builderClassName = "Publisher", buildMethodName = "publish", builderMethodName = "publisher")
         public Event<T> publish(@Nullable String key, @Nullable Long flag_, @Nullable T data) {
             if (!active) return null;
-            final var flag = flag_ == null ? Subscriber.DefaultFlag : flag_;
+            final var flag  = flag_ == null ? Subscriber.DefaultFlag : flag_;
             final var event = factory.apply(data, key, flag);
             accept(event);
             return event;
@@ -454,7 +454,7 @@ private void publish(Event<T> event) {
         private <P> void $publishDownstream(final Event<P> data) {
             if (function == null) return;
             Function<@NotNull Event<P>, @Nullable Event<T>> func = uncheckedCast(function);
-            var it = func.apply(data);
+            var                                             it   = func.apply(data);
             if (it == null) return;
             accept(it);
         }
@@ -464,7 +464,7 @@ private class SubscriberImpl implements Predicate<Event<T>>, BiConsumer<@Nullabl
             String              key;
             long                flag;
             Subscriber.FlagMode mode;
-            Invocable<?> delegate;
+            Invocable<?>        delegate;
 
             @Override
             public boolean test(Event<T> event) {
@@ -499,7 +499,7 @@ private class SubscriberListener extends Listener<T> {
 
             public SubscriberListener(@Nullable Object target, Collection<SubscriberImpl> subscribers) {
                 super(null, Bus.this, $ -> true, $ -> {});
-                this.target = target;
+                this.target      = target;
                 this.subscribers = subscribers;
             }
 

src/main/java/org/comroid/api/func/util/Event.java

@@ -0,0 +1,39 @@
+package org.comroid.api.info;
+
+import lombok.Setter;
+import lombok.Value;
+import lombok.With;
+import lombok.experimental.NonFinal;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.stream.IntStream;
+
+@Value
+@Setter
+public class Range<T extends Number> {
+    @With @Nullable T start, end;
+    @NonFinal @Nullable T lowerBound, upperBound;
+
+    @SuppressWarnings("unchecked")
+    public Range(@Nullable T start, @Nullable T end) {
+        this(start, end, (T) (Integer) 0, (T) (Integer) 64);
+    }
+
+    public Range(@Nullable T start, @Nullable T end, @Nullable T lowerBound, @Nullable T upperBound) {
+        this.start      = start;
+        this.end        = end;
+        this.lowerBound = lowerBound;
+        this.upperBound = upperBound;
+    }
+
+    public IntStream asIndices() {
+        var low  = Objects.requireNonNullElse(start, lowerBound);
+        var high = Objects.requireNonNullElse(end, upperBound);
+        return IntStream.range((int) low, (int) high);
+    }
+
+    public IntStream asEntries() {
+        return asIndices().map(x -> x + 1);
+    }
+}

src/main/java/org/comroid/api/info/Range.java

@@ -31,10 +31,8 @@ static ResourceLoader ofCallerClassLoader() {
     }
 
     static ResourceLoader ofDirectory(final File dir) {
-        if (!dir.isDirectory())
-            throw new IllegalArgumentException("File is not a directory: " + dir);
-        if (!dir.exists())
-            throw new IllegalArgumentException("Directory does not exist");
+        if (!dir.isDirectory()) throw new IllegalArgumentException("File is not a directory: " + dir);
+        if (!dir.exists()) throw new IllegalArgumentException("Directory does not exist");
         return name -> {
             try {
                 return new FileInputStream(new File(dir, name));
@@ -45,23 +43,20 @@ static ResourceLoader ofDirectory(final File dir) {
     }
 
     static InputStream fromResourceString(String string) throws FileNotFoundException {
-        if (string.startsWith("@:"))
-            return ClassLoader.getSystemClassLoader()
-                    .getResourceAsStream(PathUtil.sanitize(string.substring(2)));
-        if (string.startsWith("@"))
-            return new FileInputStream(PathUtil.sanitize(string.substring(1)));
+        if (string.startsWith("@:")) return ClassLoader.getSystemClassLoader().getResourceAsStream(PathUtil.sanitize(string.substring(2)));
+        if (string.startsWith("@")) return new FileInputStream(PathUtil.sanitize(string.substring(1)));
         return new ByteArrayInputStream(PathUtil.sanitize(string).getBytes());
     }
 
     static void assertFile(Class<?> resourceContext, String resource, File file, @Nullable Supplier<String> fallback) throws IOException {
-        if (file.exists()) return;
+        var dir = file.getParentFile();
+        if (!dir.exists() && !dir.mkdirs()) return;
+        if (file.exists() || !file.createNewFile()) return;
         try (
-                var res = resourceContext.getResourceAsStream(resource);
-                var fos = new FileOutputStream(file)
+                var res = resourceContext.getResourceAsStream(resource); var fos = new FileOutputStream(file, false)
         ) {
             if (res == null) {
-                if (fallback != null)
-                    fos.write(fallback.get().getBytes(StandardCharsets.US_ASCII));
+                if (fallback != null) fos.write(fallback.get().getBytes(StandardCharsets.US_ASCII));
             } else res.transferTo(fos);
         }
     }