fix: position convert in BlockBench 5.0

Author: toxicity188

api/src/main/java/kr/toxicity/model/api/data/blueprint/BlueprintTexture.java

@@ -95,9 +95,10 @@ public boolean canBeRendered() {
 
     /**
      * Gets model resolution
+     * @param resolution parent resolution
      * @return resolution
      */
-    public @NotNull ModelResolution resolution() {
-        return new ModelResolution(uvWidth, uvHeight);
+    public @NotNull ModelResolution resolution(@NotNull ModelResolution resolution) {
+        return resolution.width() == image.getWidth() && resolution.height() == image.getHeight() ? new ModelResolution(image.getWidth(), image.getHeight()) : new ModelResolution(uvWidth, uvHeight);
     }
 }

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

@@ -14,6 +14,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.Locale;
 
 import static java.util.Optional.ofNullable;
 
@@ -62,7 +63,7 @@ public boolean hasPoint() {
      */
     public @NotNull VectorInterpolator findInterpolator() {
         if (interpolation == null) return VectorInterpolator.defaultInterpolator();
-        return switch (interpolation.toLowerCase()) {
+        return switch (interpolation.toLowerCase(Locale.ROOT)) {
             case "linear" -> LinearInterpolator.INSTANCE;
             case "catmullrom" -> CatmullRomInterpolator.INSTANCE;
             case "step" -> StepInterpolator.INSTANCE;

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

@@ -47,6 +47,7 @@ public enum FormatVersion {
 
             @Override
             public @NotNull Vector3f convertAnimationPosition(@NotNull Vector3f vector) {
+                vector.x = -vector.x;
                 vector.z = -vector.z;
                 return vector.div(MathUtil.MODEL_TO_BLOCK_MULTIPLIER);
             }

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

@@ -7,7 +7,6 @@
 package kr.toxicity.model.api.data.raw;
 
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * A texture resolution of a model
@@ -19,15 +18,4 @@ public record ModelResolution(
         int width,
         int height
 ) {
-    /**
-     * Selects correct resolution to use
-     * @param other another resolution
-     * @return correct resolution
-     */
-    public @NotNull ModelResolution then(@NotNull ModelResolution other) {
-        return new ModelResolution(
-                Math.max(width, other.width),
-                Math.max(height, other.height)
-        );
-    }
 }

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

@@ -20,7 +20,7 @@
 public record ModelUV(
         @NotNull Float4 uv,
         float rotation,
-        @Nullable String texture
+        @Nullable Integer texture
 ) {
     /**
      * Gets json data of uv
@@ -31,12 +31,10 @@ public record ModelUV(
     public @NotNull JsonObject toJson(@NotNull ModelBlueprint parent, int tint) {
         var object = new JsonObject();
         if (texture == null) return object;
-        int textureIndex = Integer.parseInt(texture);
-        object.add("uv", uv.div(parent.resolution()
-                .then(parent.textures().get(textureIndex).resolution())).toJson());
+        object.add("uv", uv.div(parent.textures().get(texture).resolution(parent.resolution())).toJson());
         if (rotation != 0) object.addProperty("rotation", rotation);
         object.addProperty("tintindex", tint);
-        object.addProperty("texture", "#" + textureIndex);
+        object.addProperty("texture", "#" + texture);
         return object;
     }
 }

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

@@ -62,7 +62,7 @@ public static <E, R> Stream<R> filterIsInstance(@NotNull Collection<E> collectio
     @NotNull
     @Unmodifiable
     public static <E, R> List<R> mapToList(@NotNull Collection<E> collection, @NotNull Function<E, R> mapper) {
-        return mapToList(collection.stream(), mapper);
+        return collection.isEmpty() ? Collections.emptyList() : mapToList(collection.stream(), mapper);
     }
 
     /**
@@ -89,7 +89,7 @@ public static <E, R> List<R> mapToList(@NotNull Stream<E> stream, @NotNull Funct
      */
     @NotNull
     public static <E, R extends JsonElement> JsonArray mapToJson(@NotNull Collection<E> collection, @NotNull Function<E, R> mapper) {
-        return mapToJson(collection.size(), collection.stream(), mapper);
+        return collection.isEmpty() ? new JsonArray() : mapToJson(collection.size(), collection.stream(), mapper);
     }
 
     /**
@@ -234,7 +234,7 @@ public static <K, V, R> Map<K, R> mapValue(@NotNull Map<K, V> original, @NotNull
     @NotNull
     @Unmodifiable
     public static <E, K, V> Map<K, V> associate(@NotNull Collection<E> collection, @NotNull Function<E, K> keyMapper, @NotNull Function<E, V> valueMapper) {
-        return associate(collection.stream(), keyMapper, valueMapper);
+        return collection.isEmpty() ? Collections.emptyMap() : associate(collection.stream(), keyMapper, valueMapper);
     }
 
     /**
@@ -265,7 +265,7 @@ public static <T> Predicate<T> filterWithWarning(@NotNull Predicate<T> predicate
     @NotNull
     @Unmodifiable
     public static <E, K> Map<K, E> associate(@NotNull Collection<E> collection, @NotNull Function<E, K> keyMapper) {
-        return associate(collection.stream(), keyMapper);
+        return collection.isEmpty() ? Collections.emptyMap() : associate(collection.stream(), keyMapper);
     }
 
     /**