diff --git a/build.gradle.kts b/build.gradle.kts index 3106b64..e3317fe 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,12 +24,12 @@ dependencies { implementation("dev.jorel:commandapi-bukkit-shade-mojang-mapped:10.1.2") compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.9") - compileOnly("io.github.toxicity188:bettermodel:1.11.4") + compileOnly("io.github.toxicity188:bettermodel:1.13.4") compileOnly(files("libs/geyserutils-spigot-1.0-SNAPSHOT.jar")) compileOnly("org.geysermc.floodgate:api:2.2.4-SNAPSHOT") - implementation("com.github.retrooper:packetevents-spigot:2.9.6") + implementation("com.github.retrooper:packetevents-spigot:2.10.0") implementation("org.bstats:bstats-bukkit:3.0.2") implementation("org.reflections:reflections:0.10.2") diff --git a/pom.xml b/pom.xml deleted file mode 100644 index b608ef3..0000000 --- a/pom.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - 4.0.0 - - re.imc - GeyserModelEngine - 1.0-SNAPSHOT - jar - - GeyserModelEngine - - - 1.8 - UTF-8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 16 - 16 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.4.1 - - - - com.github.retrooper.packetevents - re.imc.geysermodelengine.libs.com.github.retrooper.packetevents - - - io.github.retrooper.packetevents - re.imc.geysermodelengine.libs.io.github.retrooper.packetevents - - - - - - package - - shade - - - false - - - - - - - - src/main/resources - true - - - - - - - papermc-repo - https://repo.papermc.io/repository/maven-public/ - - - sonatype - https://oss.sonatype.org/content/groups/public/ - - - nexus - Lumine Public - https://mvn.lumine.io/repository/maven-public/ - - - md_5-public - https://repo.md-5.net/content/groups/public/ - - - opencollab-release-repo - https://repo.opencollab.dev/maven-releases/ - - true - - - true - - - - opencollab-snapshot-repo - https://repo.opencollab.dev/maven-snapshots/ - - false - - - true - - - - dmulloy2-repo - https://repo.dmulloy2.net/repository/public/ - - - codemc-releases - https://repo.codemc.io/repository/maven-releases/ - - - codemc-snapshots - https://repo.codemc.io/repository/maven-snapshots/ - - - - - - io.papermc.paper - paper-api - 1.20.4-R0.1-SNAPSHOT - provided - - - com.ticxo.modelengine - ModelEngine - R4.0.4 - provided - - - com.github.geyserextensionists - geyserutils-spigot - 1.0.0 - system - ${project.basedir}/libs/geyserutils-spigot-1.0-SNAPSHOT.jar - - - org.geysermc.floodgate - api - 2.2.2-SNAPSHOT - provided - - - com.github.retrooper - packetevents-spigot - 2.8.0 - compile - - - diff --git a/src/main/java/re/imc/geysermodelengine/managers/model/PropertyHandler/BetterModelPropertyHandler.java b/src/main/java/re/imc/geysermodelengine/managers/model/PropertyHandler/BetterModelPropertyHandler.java index e457d69..379f1e5 100644 --- a/src/main/java/re/imc/geysermodelengine/managers/model/PropertyHandler/BetterModelPropertyHandler.java +++ b/src/main/java/re/imc/geysermodelengine/managers/model/PropertyHandler/BetterModelPropertyHandler.java @@ -77,7 +77,7 @@ public class BetterModelPropertyHandler implements PropertyHandler { for (RenderedBone renderedBone : handler.bones()) { if (model.getTracker().bone(renderedBone.name()).runningAnimation() != null) { - BlueprintAnimation anim = model.getTracker().renderer().animationMap().get(renderedBone.runningAnimation().name()); + BlueprintAnimation anim = model.getTracker().renderer().animations().get(renderedBone.runningAnimation().name()); anims.add(renderedBone.runningAnimation().name()); if (anim.override() && anim.loop() == AnimationIterator.Type.PLAY_ONCE) { @@ -86,7 +86,7 @@ public class BetterModelPropertyHandler implements PropertyHandler { } } - for (String id : handler.getParent().animations()) { + for (String id : handler.getParent().animations().keySet()) { if (anims.contains(id)) { animUpdates.put(id, true); } else {