3.5.2

.github/workflows/maven.yml

@@ -25,10 +25,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 21
+    - name: Set up JDK 25
       uses: actions/setup-java@v4
       with:
-        java-version: '21'
+        java-version: '25'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven

.github/workflows/modrinth.yml

@@ -15,8 +15,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v5
         with:
-          java-version: 21
-          distribution: temurin
+          java-version: '25'
+          distribution: 'temurin'
           cache: maven
 
       - name: Set version from release tag
@@ -35,9 +35,8 @@ jobs:
           changelog: ${{ github.event.release.body }}
           loaders: |-
             paper
-            spigot
-            bukkit
           game-versions: |-
             1.20.x
             1.21.x
+            26.1.x
           files: plugin/target/displayentityutils-${{ github.event.release.tag_name }}.jar

api/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.donnypz.displayentityutils</groupId>
         <artifactId>deu</artifactId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
 
     <artifactId>api</artifactId>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.21.10-R0.1-SNAPSHOT</version>
+            <version>26.1.2.build.53-stable</version>
             <scope>provided</scope>
         </dependency>
 

api/src/main/java/net/donnypz/displayentityutils/DisplayAPI.java

@@ -45,6 +45,7 @@ public final class DisplayAPI {
     static boolean isSkriptInstalled;
     static boolean isWorldEditInstalled;
     static boolean isPAPIInstalled;
+    static boolean isEssentialsInstalled;
 
     private static final String legacyPartTagPrefix = "deu.parttag_";
 
@@ -198,6 +199,14 @@ public static boolean isPAPIInstalled() {
         return isPAPIInstalled;
     }
 
+    /**
+     * Get whether EssentialsX is installed on this server
+     * @return true if EssentialsX is present
+     */
+    public static boolean isEssentialsInstalled() {
+        return isEssentialsInstalled;
+    }
+
     public static DisplayStorage getStorage(@NotNull LoadMethod method){
         switch(method){
             case LOCAL -> {

api/src/main/java/net/donnypz/displayentityutils/utils/ConversionUtils.java

@@ -83,7 +83,7 @@ public static String getExecuteCommandWorldName(@NotNull World w){
             worldName = "overworld";
         }
         else{
-            worldName = w.getName();
+            worldName = w.getKey().toString();
         }
         return worldName;
     }

api/src/main/java/net/donnypz/displayentityutils/utils/DisplayEntities/ActiveGroup.java

@@ -1,6 +1,7 @@
 package net.donnypz.displayentityutils.utils.DisplayEntities;
 
 import net.donnypz.displayentityutils.DisplayAPI;
+import net.donnypz.displayentityutils.DisplayConfig;
 import net.donnypz.displayentityutils.events.AnimationStateChangeEvent;
 import net.donnypz.displayentityutils.managers.DEUUser;
 import net.donnypz.displayentityutils.managers.DisplayAnimationManager;
@@ -120,6 +121,21 @@ public boolean hasTag(){
      */
     public abstract @NotNull MultiPartSelection<T> createPartSelection(@NotNull PartFilter partFilter);
 
+    /**
+     * Attempt to automatically set the culling bounds for all parts within this group, using config culling values.
+     * @param includeRideOffset whether the group's rideOffset should be included in calculation
+     */
+    public void autoCull(boolean includeRideOffset){
+        float widthAdder = DisplayConfig.widthCullingAdder();
+        float heightAdder = DisplayConfig.heightCullingAdder();
+        if (includeRideOffset){
+            widthAdder += (float) Math.max(Math.abs(rideOffset.getX()), Math.abs(rideOffset.getZ()));
+            heightAdder += (float) Math.abs(rideOffset.getY());
+        }
+
+        autoCull(widthAdder, heightAdder);
+    }
+
     /**
      * Attempt to automatically set the culling bounds for all parts within this group.
      * @param widthAdder The amount of width to be added to the culling range
@@ -783,15 +799,35 @@ public boolean hasAnimated(){
      * @param animation the animation this group should play
      * @return the {@link DisplayAnimator} that will control the playing of the given animation
      */
-    public abstract @NotNull DisplayAnimator animate(@NotNull SpawnedDisplayAnimation animation);
+    public @NotNull DisplayAnimator animate(@NotNull SpawnedDisplayAnimation animation){
+        return animate(animation, true);
+    }
+
+    /**
+     * Make a group perform an animation
+     * @param animation the animation this group should play
+     * @param allowDataChanges whether block/item display textures and text display text should change based on animation frame data
+     * @return the {@link DisplayAnimator} that will control the playing of the given animation
+     */
+    public abstract @NotNull DisplayAnimator animate(@NotNull SpawnedDisplayAnimation animation, boolean allowDataChanges);
 
 
     /**
      * Make a group perform a looping animation.
      * @param animation the animation this group should play
      * @return the {@link DisplayAnimator} that will control the playing of the given animation
      */
-    public abstract @NotNull DisplayAnimator animateLooping(@NotNull SpawnedDisplayAnimation animation);
+    public @NotNull DisplayAnimator animateLooping(@NotNull SpawnedDisplayAnimation animation){
+        return animateLooping(animation, true);
+    }
+
+    /**
+     * Make a group perform a looping animation.
+     * @param animation the animation this group should play
+     * @param allowDataChanges whether block/item display textures and text display text should change based on animation frame data
+     * @return the {@link DisplayAnimator} that will control the playing of the given animation
+     */
+    public abstract @NotNull DisplayAnimator animateLooping(@NotNull SpawnedDisplayAnimation animation, boolean allowDataChanges);
 
     /**
      * Manually stop an animation from playing on this group
@@ -1084,44 +1120,13 @@ static int next() {
 
     @Override
     public boolean equals(Object o) {
-        if (!(o instanceof ActiveGroup<?> group)) return false;
-        return ID == group.ID
-                && Float.compare(scaleMultiplier, group.scaleMultiplier) == 0
-                && lastAnimatedTick == group.lastAnimatedTick
-                && Objects.equals(masterPart, group.masterPart)
-                && Objects.equals(groupParts, group.groupParts)
-                && Objects.equals(tag, group.tag)
-                && Objects.equals(followers, group.followers)
-                && Objects.equals(followerLock, group.followerLock)
-                && Objects.equals(defaultFollower, group.defaultFollower)
-                && Objects.equals(animatorLock, group.animatorLock)
-                && Objects.equals(activeAnimators, group.activeAnimators)
-                && Objects.equals(spawnAnimationTag, group.spawnAnimationTag)
-                && spawnAnimationLoadMethod == group.spawnAnimationLoadMethod
-                && spawnAnimationType == group.spawnAnimationType
-                && Objects.equals(currentMachineState, group.currentMachineState)
-                && Objects.equals(rideOffset, group.rideOffset);
+        if (this == o) return true;
+        if (!(o instanceof ActiveGroup<?> other)) return false;
+        return ID == other.ID;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(
-                ID,
-                masterPart,
-                groupParts,
-                tag,
-                followers,
-                followerLock,
-                defaultFollower,
-                animatorLock,
-                activeAnimators,
-                spawnAnimationTag,
-                spawnAnimationLoadMethod,
-                spawnAnimationType,
-                currentMachineState,
-                scaleMultiplier,
-                rideOffset,
-                lastAnimatedTick
-        );
+        return Integer.hashCode(ID);
     }
 }

api/src/main/java/net/donnypz/displayentityutils/utils/DisplayEntities/ActivePart.java

@@ -32,7 +32,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 public abstract class ActivePart implements Active{
-    protected static final ConcurrentHashMap<Integer, ActivePart> partsById = new ConcurrentHashMap<>();
+
     protected SpawnedDisplayEntityPart.PartType type;
     protected UUID partUUID;
     private int entityId;
@@ -43,12 +43,12 @@ public abstract class ActivePart implements Active{
     protected ActivePart(int entityId, boolean autoMap){
         this.entityId = entityId;
         if (autoMap) {
-            partsById.put(entityId, this);
+            ActivePartRegistry.register(this);
         }
     }
 
     protected synchronized void unregister(){
-        partsById.remove(entityId);
+        ActivePartRegistry.unregister(this);
         valid = false;
     }
 
@@ -66,7 +66,7 @@ public boolean isValid(){
      * @return an {@link ActivePart} or null
      */
     public static @Nullable ActivePart getPart(int entityId){
-        return partsById.get(entityId);
+        return ActivePartRegistry.getPart(entityId);
     }
 
     public boolean isAnimatingForPlayers(){
@@ -113,10 +113,8 @@ public int getEntityId(){
         return entityId;
     }
 
-    protected synchronized void refreshEntityId(int newEntityId){
-        partsById.remove(entityId);
-        entityId = newEntityId;
-        partsById.put(newEntityId, this);
+    void setEntityId(int entityId){
+        this.entityId = entityId;
     }
 
 

api/src/main/java/net/donnypz/displayentityutils/utils/DisplayEntities/ActivePartRegistry.java

@@ -0,0 +1,39 @@
+package net.donnypz.displayentityutils.utils.DisplayEntities;
+
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+class ActivePartRegistry {
+
+    private static final ConcurrentHashMap<UUID, SpawnedDisplayEntityPart> partsByUUID = new ConcurrentHashMap<>();
+    private static final ConcurrentHashMap<Integer, ActivePart> partsByEntityId = new ConcurrentHashMap<>();
+
+    static void register(ActivePart activePart){
+        partsByEntityId.put(activePart.getEntityId(), activePart);
+        if (activePart instanceof SpawnedDisplayEntityPart spawnedPart){
+            partsByUUID.put(spawnedPart.getEntity().getUniqueId(), spawnedPart);
+        }
+    }
+
+    static void updateEntityId(SpawnedDisplayEntityPart spawnedPart, int newEntityId){
+        partsByEntityId.remove(spawnedPart.getEntityId());
+        spawnedPart.setEntityId(newEntityId);
+        partsByEntityId.put(newEntityId, spawnedPart);
+
+    }
+
+    static SpawnedDisplayEntityPart getPart(UUID entityUUID){
+        return partsByUUID.get(entityUUID);
+    }
+
+    static ActivePart getPart(int entityID){
+        return partsByEntityId.get(entityID);
+    }
+
+    static void unregister(ActivePart part){
+        if (part instanceof SpawnedDisplayEntityPart sp){
+            partsByUUID.remove(sp.getEntity().getUniqueId());
+        }
+        partsByEntityId.remove(part.getEntityId());
+    }
+}