diff --git a/build.gradle b/build.gradle index 044bb37..f10fcc6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,4 @@ +//file:noinspection GroovyAssignabilityCheck buildscript { repositories { maven { url = 'https://repo.spongepowered.org/repository/maven-public/' } @@ -127,6 +128,9 @@ dependencies { implementation fg.deobf("dev.kosmx.player-anim:player-animation-lib-forge:1.0.2-rc1+1.20") implementation fg.deobf("io.github.kosmx.bendy-lib:bendy-lib-forge:4.0.0") + +// implementation fg.deobf("curse.maven:cloth-config-348521:5729105") +// implementation fg.deobf("curse.maven:better-combat-by-daedelus-639842:5625757") // implementation fg.deobf("curse.maven:freecam-by-zergatul-618947:5402097") } diff --git a/gradle.properties b/gradle.properties index 16156dc..23ed6c0 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.0.7-hotfix +mod_version=1.20.1-0.0.8 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 c68d02f..0e0b2ef 100644 --- a/src/main/java/com/linearpast/sccore/animation/register/AnimationRegistry.java +++ b/src/main/java/com/linearpast/sccore/animation/register/AnimationRegistry.java @@ -261,19 +261,8 @@ public class AnimationRegistry { ArrayList> oldArrayList = (ArrayList>) layersField.get(oldAnimationStack); ArrayList> newArrayList = (ArrayList>) layersField.get(newAnimationStack); ArrayList> result = new ArrayList<>(); - ArrayList> newListCopy = new ArrayList<>(newArrayList); - for (Pair oldPair : oldArrayList) { - newListCopy.removeIf(pair -> { - if(pair.getLeft().equals(oldPair.getLeft())) { - result.add(pair); - return true; - } else { - result.add(oldPair); - return false; - } - }); - } - result.addAll(newListCopy); + result.addAll(oldArrayList); + result.addAll(newArrayList); layersField.set(newAnimationStack, result); animationStackField.set(player, newAnimationStack); Field animationApplierField = playerClass.getDeclaredField("animationApplier");