Merge pull request #72 from KosmX/dev

Small performance tweak backport

build.gradle

@@ -1,10 +1,11 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.0.+" apply false
+    id "dev.architectury.loom" version "1.3.+" apply false
 
     //Publishing
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
-    id "com.modrinth.minotaur" version "2.4.3" apply false
+    id "com.modrinth.minotaur" version "2.8.7" apply false
+    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
 
 architectury {

coreLib/src/main/java/dev/kosmx/playerAnim/core/data/KeyframeAnimation.java

@@ -449,9 +449,14 @@ public int length() {
              * @return given keyframe
              */
             public int findAtTick(int tick) {
-                int i = -1;
-                while (this.keyFrames.size() > i + 1 && this.keyFrames.get(i + 1).tick <= tick) {
-                    i++;
+                int i = Collections.binarySearch(this.keyFrames, null, (frame, ignore) -> Integer.compare(frame.tick, tick));
+                if (i < 0) {
+                    i = -i - 2;
+                }
+
+                // small correction for edge-case: it is possible to have two keyframes with the same tick in the array, in that case, I should return the later one.
+                if (i + 1 < keyFrames.size() && keyFrames.get(i + 1).tick == tick) {
+                    return i + 1;
                 }
                 return i;
             }

coreLib/src/main/java/dev/kosmx/playerAnim/core/util/Ease.java

@@ -1,5 +1,7 @@
 package dev.kosmx.playerAnim.core.util;
 
+import lombok.Getter;
+
 /**
  * Easings form <a href="https://easings.net/">easings.net</a><br>
  * + constant + linear
@@ -17,6 +19,7 @@ public enum Ease {
     INELASTIC(30, Easing::inElastic), OUTELASTIC(31, Easing::outElastic), INOUTELASTIC(32, Easing::inOutElastic),
     INBOUNCE(33, Easing::inBounce), OUTBOUNCE(34, Easing::outBack), INOUTBOUNCE(35, Easing::inOutBounce);
 
+    @Getter
     final byte id;
     private final _F impl;
 
@@ -37,10 +40,6 @@ public enum Ease {
         this((byte) id, impl);
     }
 
-    public byte getId() {
-        return id;
-    }
-
     /**
      * Run the easing
      * @param f float between 0 and 1

coreLib/src/test/java/dev/kosmx/playerAnim/core/data/KeyframeAnimationTest.java

@@ -0,0 +1,48 @@
+package dev.kosmx.playerAnim.core.data;
+
+import dev.kosmx.playerAnim.core.util.Ease;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.Random;
+
+public class KeyframeAnimationTest {
+    @Test
+    public void testKeyframeAnimation() {
+        KeyframeAnimation.StateCollection.State state = new KeyframeAnimation.StateCollection(0).x;
+        // Easy case
+        state.addKeyFrame(1, 0, Ease.CONSTANT);
+        state.addKeyFrame(5, 0, Ease.CONSTANT);
+        state.addKeyFrame(10, 10, Ease.CONSTANT);
+        state.addKeyFrame(10, 10, Ease.CONSTANT);
+
+        state.addKeyFrame(15, 10, Ease.CONSTANT);
+
+        verify(state);
+        state.getKeyFrames().clear();
+
+
+        // random case
+        Random random = new Random();
+
+        for (int i = 0; i < 10000; i += random.nextInt(100)) {
+            state.addKeyFrame(i, i, Ease.CONSTANT);
+        }
+
+        verify(state);
+    }
+
+    public static void verify(KeyframeAnimation.StateCollection.State state) {
+
+        for (int t = 0; t < state.getKeyFrames().size(); t++) {
+            // Iterative, 100% works algorithm
+
+            int i = -1;
+            while (state.getKeyFrames().size() > i + 1 && state.getKeyFrames().get(i + 1).tick <= t) {
+                i++;
+            }
+
+            Assertions.assertEquals(i, state.findAtTick(t), "KeyframeAnimationTest failed at tick " + t);
+        }
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

minecraft/common/src/main/java/dev/kosmx/playerAnim/impl/animation/BendHelper.java

@@ -14,8 +14,13 @@ public class BendHelper implements IBendHelper {
 
 
     @Override
-    public void bend(ModelPart modelPart, float a, float b){
-        ModelPartAccessor.optionalGetCuboid(modelPart, 0).ifPresent(mutableCuboid -> ((BendableCuboid)mutableCuboid.getAndActivateMutator("bend")).applyBend(a, b));
+    public void bend(ModelPart modelPart, float axis, float rotation){
+        // Don't enable bend until rotation is bigger than epsilon. This should avoid unnecessary heavy calculations.
+        if (Math.abs(rotation) >= 0.0001f) {
+            ModelPartAccessor.optionalGetCuboid(modelPart, 0).ifPresent(mutableCuboid -> ((BendableCuboid) mutableCuboid.getAndActivateMutator("bend")).applyBend(axis, rotation));
+        } else {
+            ModelPartAccessor.optionalGetCuboid(modelPart, 0).ifPresent(mutableCuboid -> mutableCuboid.getAndActivateMutator(null));
+        }
     }
 
     @Override

minecraft/fabric/build.gradle

@@ -1,7 +1,5 @@
-plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
-}
 
+apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'com.modrinth.minotaur'
 apply plugin: 'com.matthewprenger.cursegradle'
 
@@ -79,18 +77,18 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    archiveClassifier.set("dev-shadow")
 }
 
 remapJar {
     injectAccessWidener = true
     inputFile.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
+    archiveClassifier.set(null)
 }
 
 jar {
-    classifier "dev"
+    archiveClassifier.set("dev")
 }
 
 sourcesJar {

minecraft/fabric/src/main/resources/assets/player-animator/lang/tt_ru.json

@@ -0,0 +1,3 @@
+{
+  "modmenu.descriptionTranslation.player-animator": "Уенчыны гади анимацияләү өчен җиңел (авырлык буенча) китапханә"
+}

minecraft/fabric/src/testmod/java/dev/kosmx/animatorTestmod/CodedAnimation.java

@@ -0,0 +1,2 @@
+package dev.kosmx.animatorTestmod;public class CodedAnimation {
+}

minecraft/fabric/src/testmod/java/dev/kosmx/animatorTestmod/mixin/AbstractClientPlayerMixin.java

@@ -0,0 +1,2 @@
+package dev.kosmx.animatorTestmod.mixin;public class AbstractClientPlayerMixin {
+}

minecraft/forge/build.gradle

@@ -1,7 +1,5 @@
-plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
-}
 
+apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'com.modrinth.minotaur'
 apply plugin: 'com.matthewprenger.cursegradle'
 
@@ -61,17 +59,17 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    archiveClassifier.set("dev-shadow")
 }
 
 remapJar {
     inputFile.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
+    archiveClassifier.set(null)
 }
 
 jar {
-    classifier "dev"
+    archiveClassifier.set("dev")
 }
 
 sourcesJar {