fix: model load and keyframe (#180)

Author: toxicity188

.idea/kotlinc.xml

@@ -150,7 +150,7 @@ private boolean updateKeyframe(@NotNull Iterator<TreeIterator> iterator, @NotNul
     }
 
     private boolean setAfterKeyframe(@Nullable KeyframeData next) {
-        if (value(afterKeyframe) == value(next)) return false;
+        if (equals(afterKeyframe, next)) return false;
         setConsumer.accept(
                 value(beforeKeyframe = afterKeyframe),
                 value(afterKeyframe = next)
@@ -159,6 +159,12 @@ private boolean setAfterKeyframe(@Nullable KeyframeData next) {
         return true;
     }
 
+    private boolean equals(@Nullable KeyframeData from, @Nullable KeyframeData to) {
+        if (from == null && to == null) return true;
+        if (from == null || to == null) return false;
+        return from.value == to.value && from.realTime == to.realTime;
+    }
+
     private @Nullable T value(@Nullable KeyframeData data) {
         return data == null ? null : data.value;
     }

api/src/main/java/kr/toxicity/model/api/animation/AnimationStateHandler.java

@@ -51,4 +51,9 @@ public boolean equals(Object o) {
     public int hashCode() {
         return rawName.hashCode();
     }
+
+    @Override
+    public @NotNull String toString() {
+        return rawName;
+    }
 }

api/src/main/java/kr/toxicity/model/api/bone/BoneName.java

@@ -25,6 +25,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static kr.toxicity.model.api.util.CollectionUtil.associate;
 
@@ -49,12 +50,20 @@ public record ModelAnimation(
     /**
      * Converts raw animation to blueprint animation
      * @param meta meta
+     * @param availableUUIDs available uuids
      * @param children children
      * @param placeholder placeholder
      * @return converted animation
      */
-    public @NotNull BlueprintAnimation toBlueprint(@NotNull ModelMeta meta, @NotNull List<BlueprintChildren> children, @NotNull ModelPlaceholder placeholder) {
-        var map = new HashMap<>(animators());
+    public @NotNull BlueprintAnimation toBlueprint(
+            @NotNull ModelMeta meta,
+            @NotNull Set<String> availableUUIDs,
+            @NotNull List<BlueprintChildren> children,
+            @NotNull ModelPlaceholder placeholder
+    ) {
+        var map = animators().entrySet().stream()
+                .filter(e -> availableUUIDs.contains(e.getKey()))
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
         var script = Optional.ofNullable(map.remove("effects"))
                 .filter(ModelAnimator::isNotEmpty)
                 .map(a -> toScript(a, placeholder))

api/src/main/java/kr/toxicity/model/api/data/raw/ModelAnimation.java

@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Stream;
 
 import static kr.toxicity.model.api.util.CollectionUtil.filterIsInstance;
 import static kr.toxicity.model.api.util.CollectionUtil.mapToList;
@@ -55,6 +56,18 @@ else if (json.isJsonObject()) {
             @NotNull Map<String, ModelGroup> groupMap
     );
 
+    /**
+     * Flattens this children tree
+     * @return flatten stream
+     */
+    @NotNull Stream<ModelChildren> flatten();
+
+    /**
+     * Gets uuid
+     * @return uuid
+     */
+    @NotNull String uuid();
+
     /**
      * A raw element's uuid.
      * @param uuid uuid
@@ -67,6 +80,11 @@ record ModelUUID(@NotNull String uuid) implements ModelChildren {
         ) {
             return new BlueprintChildren.BlueprintElement(Objects.requireNonNull(elementMap.get(uuid())));
         }
+
+        @Override
+        public @NotNull Stream<ModelChildren> flatten() {
+            return Stream.of(this);
+        }
     }
 
     /**
@@ -86,7 +104,7 @@ record ModelOutliner(
         ) {
             var child = mapToList(children, c -> c.toBlueprint(elementMap, groupMap));
             var filtered = filterIsInstance(child, BlueprintChildren.BlueprintElement.class).toList();
-            var selectedGroup = groupMap.getOrDefault(group.uuid(), group);
+            var selectedGroup = groupMap.getOrDefault(uuid(), group);
             return new BlueprintChildren.BlueprintGroup(
                     BoneTagRegistry.parse(selectedGroup.name()),
                     selectedGroup.origin(),
@@ -95,5 +113,18 @@ record ModelOutliner(
                     filtered.isEmpty() ? selectedGroup.visibility() : filtered.stream().anyMatch(element -> element.element().visibility())
             );
         }
+
+        @Override
+        public @NotNull Stream<ModelChildren> flatten() {
+            return Stream.concat(
+                    Stream.of(this),
+                    children.stream().flatMap(ModelChildren::flatten)
+            );
+        }
+
+        @Override
+        public @NotNull String uuid() {
+            return group.uuid();
+        }
     }
 }

api/src/main/java/kr/toxicity/model/api/data/raw/ModelChildren.java

@@ -18,8 +18,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import static kr.toxicity.model.api.util.CollectionUtil.associate;
-import static kr.toxicity.model.api.util.CollectionUtil.mapToList;
+import static kr.toxicity.model.api.util.CollectionUtil.*;
 
 /**
  * Raw BlockBench model's data.
@@ -65,12 +64,16 @@ public record ModelData(
         var elementMap = associate(elements(), ModelElement::uuid);
         var groupMap = associate(groups(), ModelGroup::uuid);
         var group = mapToList(outliner(), children -> children.toBlueprint(elementMap, groupMap));
+        var availableUUIDs = mapToSet(
+                filterIsInstance(outliner().stream().flatMap(ModelChildren::flatten), ModelChildren.ModelOutliner.class),
+                ModelChildren.ModelOutliner::uuid
+        );
         return new ModelBlueprint(
                 name,
                 resolution(),
                 mapToList(textures(), ModelTexture::toBlueprint),
                 group,
-                associate(animations().stream().map(raw -> raw.toBlueprint(meta, group, placeholder)), BlueprintAnimation::name)
+                associate(animations().stream().map(raw -> raw.toBlueprint(meta, availableUUIDs, group, placeholder)), BlueprintAnimation::name)
         );
     }
 

api/src/main/java/kr/toxicity/model/api/data/raw/ModelData.java

@@ -96,7 +96,7 @@ public Set<PackByte> overlays(@NotNull PackOverlay overlay) {
         return get != null ? Collections.unmodifiableSet(get) : Collections.emptySet();
     }
 
-    public Stream<PackByte> stream() {
+    public @NotNull Stream<PackByte> stream() {
         return Stream.concat(
                 overlays.values().stream().flatMap(Collection::stream),
                 assets.stream()

api/src/main/java/kr/toxicity/model/api/pack/PackResult.java

@@ -15,10 +15,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -79,6 +76,34 @@ public static <E, R> List<R> mapToList(@NotNull Stream<E> stream, @NotNull Funct
         return stream.map(mapper).toList();
     }
 
+    /**
+     * Maps stream to set
+     * @param collection collection
+     * @param mapper mapper
+     * @return unmodifiable set
+     * @param <E> element
+     * @param <R> return value
+     */
+    @NotNull
+    @Unmodifiable
+    public static <E, R> Set<R> mapToSet(@NotNull Collection<E> collection, @NotNull Function<E, R> mapper) {
+        return collection.isEmpty() ? Collections.emptySet() : mapToSet(collection.stream(), mapper);
+    }
+
+    /**
+     * Maps stream to set
+     * @param stream stream
+     * @param mapper mapper
+     * @return unmodifiable set
+     * @param <E> element
+     * @param <R> return value
+     */
+    @NotNull
+    @Unmodifiable
+    public static <E, R> Set<R> mapToSet(@NotNull Stream<E> stream, @NotNull Function<E, R> mapper) {
+        return stream.map(mapper).collect(Collectors.toUnmodifiableSet());
+    }
+
     /**
      * Maps stream to JSON
      * @param collection collection

api/src/main/java/kr/toxicity/model/api/util/CollectionUtil.java

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.2.20"
+kotlin = "2.2.21"
 paperweight = "2.0.0-beta.19"
 resourcefactory = "1.3.1"