From 6a14c7e76849b0ef22ff36e2876fe9c588b8311b Mon Sep 17 00:00:00 2001
From: LostInLinearPast <1283411677@qq.com>
Date: Thu, 4 Dec 2025 19:44:07 +0800
Subject: [PATCH] version 0.1.2

---
 gradle.properties                             |  2 +-
 .../animation/register/AnimationRegistry.java | 22 ++++++--
 .../service/RawAnimationService.java          |  2 +-
 .../example/animation/ModAnimation.java       | 52 +++++++++----------
 4 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index a3090cb..331514d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ mapping_version=2023.09.03-1.20.1
 mod_id=sccore
 mod_name=SnowyCrescentCore
 mod_license=GNU AGPL 3.0
-mod_version=1.20.1-0.1.1.4
+mod_version=1.20.1-0.1.2
 mod_group_id=com.linearpast
 mod_authors=LostInLinearPast
 mod_description=A lib about capability and player animator.
diff --git a/src/main/java/com/linearpast/sccore/animation/register/AnimationRegistry.java b/src/main/java/com/linearpast/sccore/animation/register/AnimationRegistry.java
index 39d55e8..1d7eb87 100644
--- a/src/main/java/com/linearpast/sccore/animation/register/AnimationRegistry.java
+++ b/src/main/java/com/linearpast/sccore/animation/register/AnimationRegistry.java
@@ -224,6 +224,7 @@ public class AnimationRegistry {
         public static boolean isAnimationRegistered = false;
         private static final Map<ResourceLocation, GenericAnimationData> animationsCache = new HashMap<>();
         private static final Map<ResourceLocation, Integer> layersCache = new HashMap<>();
+        private static final Map<ResourceLocation, IAnimation> modifierLayers = new HashMap<>();
 
         public static void cacheAddAnimation(ResourceLocation location, GenericAnimationData animation) {
             animationsCache.put(location, animation);
@@ -249,10 +250,14 @@ public class AnimationRegistry {
                 }
                 case LAYER_REGISTER -> {
                     registerLayers(layersCache);
-                    layersCache.forEach((key, value) ->
-                            PlayerAnimationFactory.ANIMATION_DATA_FACTORY.registerFactory(
-                                    key, value, ClientCache::registerPlayerAnimation
-                            )
+                    layersCache.forEach((key, value) -> PlayerAnimationFactory.ANIMATION_DATA_FACTORY.registerFactory(
+                            key, value, player -> {
+                                Optional<ResourceLocation> optional = modifierLayers.keySet().stream().filter(key::equals).findFirst();
+                                if(optional.isPresent()) return modifierLayers.get(optional.get());
+                                IAnimation iAnimation = ClientCache.registerPlayerAnimation(player);
+                                modifierLayers.put(key, iAnimation);
+                                return iAnimation;
+                            })
                     );
                     ClientLevel level = Minecraft.getInstance().level;
                     if(level == null) {
@@ -279,8 +284,17 @@ public class AnimationRegistry {
                                 ArrayList<Pair<Integer, IAnimation>> oldArrayList = (ArrayList<Pair<Integer, IAnimation>>) layersField.get(oldAnimationStack);
                                 ArrayList<Pair<Integer, IAnimation>> newArrayList = (ArrayList<Pair<Integer, IAnimation>>) layersField.get(newAnimationStack);
                                 ArrayList<Pair<Integer, IAnimation>> result = new ArrayList<>();
+                                for (Pair<Integer, IAnimation> integerIAnimationPair : oldArrayList) {
+                                    for (Pair<Integer, IAnimation> iAnimationPair : List.copyOf(newArrayList)) {
+                                        if(Objects.equals(iAnimationPair.getLeft(), integerIAnimationPair.getLeft())
+                                            && Objects.equals(iAnimationPair.getRight(), integerIAnimationPair.getRight())) {
+                                            newArrayList.remove(iAnimationPair);
+                                        }
+                                    }
+                                }
                                 result.addAll(oldArrayList);
                                 result.addAll(newArrayList);
+
                                 layersField.set(newAnimationStack, result);
                                 animationStackField.set(player, newAnimationStack);
                                 Field animationApplierField = playerClass.getDeclaredField("animationApplier");
diff --git a/src/main/java/com/linearpast/sccore/animation/service/RawAnimationService.java b/src/main/java/com/linearpast/sccore/animation/service/RawAnimationService.java
index 34b1725..befa8f5 100644
--- a/src/main/java/com/linearpast/sccore/animation/service/RawAnimationService.java
+++ b/src/main/java/com/linearpast/sccore/animation/service/RawAnimationService.java
@@ -42,7 +42,7 @@ public class RawAnimationService implements IAnimationService<RawAnimationData,
         if(FMLEnvironment.dist == Dist.CLIENT) {
             return RawAnimationRegistry.getAnimations().getOrDefault(location, null);
         } else {
-            return null;
+            return RawAnimationData.create(location);
         }
     }
 
diff --git a/src/main/java/com/linearpast/sccore/example/animation/ModAnimation.java b/src/main/java/com/linearpast/sccore/example/animation/ModAnimation.java
index e081101..7df722f 100644
--- a/src/main/java/com/linearpast/sccore/example/animation/ModAnimation.java
+++ b/src/main/java/com/linearpast/sccore/example/animation/ModAnimation.java
@@ -1,7 +1,7 @@
 package com.linearpast.sccore.example.animation;
 
 import com.linearpast.sccore.SnowyCrescentCore;
-import com.linearpast.sccore.animation.data.RawAnimationData;
+import com.linearpast.sccore.animation.data.GenericAnimationData;
 import com.linearpast.sccore.animation.data.Ride;
 import com.linearpast.sccore.animation.event.create.AnimationRegisterEvent;
 import com.linearpast.sccore.animation.service.AnimationService;
@@ -47,38 +47,38 @@ public class ModAnimation {
      */
     public static void onAnimationRegister(AnimationRegisterEvent.Animation event) {
         //You must define corresponding Animation to invite
-//        Animation amLTRL = Animation.create(AmLyingToRightLying)
-//                .withLyingType(Animation.LyingType.RIGHT)
-//                .withName("Lying-to-Right-Lying");
-//        Animation amSTL = Animation.create(AmStandToLying)
-//                .withName("Stand-to-Lying")
-//                .withLyingType(Animation.LyingType.FRONT);
-//        Animation waltzGentleman = Animation.create(WaltzGentleman)
-//                .withName("Waltz-Gentleman")
-//                .withRide(Ride.create().addComponentAnimation(WaltzLady));
-//        Animation waltzLady = Animation.create(WaltzLady)
-//                .withName("Waltz-Lady")
-//                .withCamYaw(180)
-//                .withRide(Ride.create().addComponentAnimation(WaltzGentleman));
-//
-//        //You can use it to invite an Animation
-//        event.registerAnimation(AmLyingToRightLying, amLTRL);
-//        event.registerAnimation(AmStandToLying, amSTL);
-//        event.registerAnimation(WaltzGentleman, waltzGentleman);
-//        event.registerAnimation(WaltzLady, waltzLady);
-    }
+        GenericAnimationData amLTRL = GenericAnimationData.create(AmLyingToRightLying)
+                .withLyingType(GenericAnimationData.LyingType.RIGHT)
+                .withName("Lying-to-Right-Lying");
+        GenericAnimationData amSTL = GenericAnimationData.create(AmStandToLying)
+                .withName("Stand-to-Lying")
+                .withLyingType(GenericAnimationData.LyingType.FRONT);
+        GenericAnimationData waltzGentleman = GenericAnimationData.create(WaltzGentleman)
+                .withName("Waltz-Gentleman")
+                .withRide(Ride.create().addComponentAnimation(WaltzLady));
+        GenericAnimationData waltzLady = GenericAnimationData.create(WaltzLady)
+                .withName("Waltz-Lady")
+                .withCamYaw(180)
+                .withRide(Ride.create().addComponentAnimation(WaltzGentleman));
 
-    public static void onRawAnimationRegister(AnimationRegisterEvent.RawAnimation event) {
-        RawAnimationData amSTL = RawAnimationData.create(AmStandToLying).withRide(Ride.create().withExistTick(100));
-        RawAnimationData amLTRL = RawAnimationData.create(AmLyingToRightLying).withRide(Ride.create().withExistTick(100));
-        RawAnimationData waltzGentleman = RawAnimationData.create(WaltzGentleman).withRide(Ride.create().withExistTick(100).addComponentAnimation(WaltzLady));
-        RawAnimationData waltzLady = RawAnimationData.create(WaltzLady).withRide(Ride.create().withExistTick(100).addComponentAnimation(WaltzGentleman));
+        //You can use it to invite an Animation
         event.registerAnimation(AmLyingToRightLying, amLTRL);
         event.registerAnimation(AmStandToLying, amSTL);
         event.registerAnimation(WaltzGentleman, waltzGentleman);
         event.registerAnimation(WaltzLady, waltzLady);
     }
 
+    public static void onRawAnimationRegister(AnimationRegisterEvent.RawAnimation event) {
+//        RawAnimationData amSTL = RawAnimationData.create(AmStandToLying).withRide(Ride.create().withExistTick(100));
+//        RawAnimationData amLTRL = RawAnimationData.create(AmLyingToRightLying).withRide(Ride.create().withExistTick(100));
+//        RawAnimationData waltzGentleman = RawAnimationData.create(WaltzGentleman).withRide(Ride.create().withExistTick(100).addComponentAnimation(WaltzLady));
+//        RawAnimationData waltzLady = RawAnimationData.create(WaltzLady).withRide(Ride.create().withExistTick(100).addComponentAnimation(WaltzGentleman));
+//        event.registerAnimation(AmLyingToRightLying, amLTRL);
+//        event.registerAnimation(AmStandToLying, amSTL);
+//        event.registerAnimation(WaltzGentleman, waltzGentleman);
+//        event.registerAnimation(WaltzLady, waltzLady);
+    }
+
     public static void register(IEventBus forgeBus, IEventBus modBus) {
         //Register by event
         //Or use AnimationUtils.registerAnimationLayer(ResourceLocation layer, int priority);