Add interpolation duration to display hologram data

FancyMcPlugins · Nov 21, 2024 · 837370c · 837370c
1 parent cd0c85b
commit 837370c
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 18 deletions.
diff --git a/api/src/main/java/de/oliver/fancyholograms/api/data/DisplayHologramData.java b/api/src/main/java/de/oliver/fancyholograms/api/data/DisplayHologramData.java
@@ -16,13 +16,15 @@ public class DisplayHologramData extends HologramData {
     public static final Vector3f DEFAULT_TRANSLATION = new Vector3f(0, 0, 0);
     public static final float DEFAULT_SHADOW_RADIUS = 0.0f;
     public static final float DEFAULT_SHADOW_STRENGTH = 1.0f;
+    public static final int DEFAULT_INTERPOLATION_DURATION = 0;
 
     private Display.Billboard billboard = DEFAULT_BILLBOARD;
     private Vector3f scale = new Vector3f(DEFAULT_SCALE);
     private Vector3f translation = new Vector3f(DEFAULT_TRANSLATION);
     private Display.Brightness brightness;
     private float shadowRadius = DEFAULT_SHADOW_RADIUS;
     private float shadowStrength = DEFAULT_SHADOW_STRENGTH;
+    private int interpolationDuration = DEFAULT_INTERPOLATION_DURATION;
 
     /**
      * @param name     Name of hologram
@@ -112,6 +114,19 @@ public DisplayHologramData setShadowStrength(float shadowStrength) {
         return this;
     }
 
+    public int getInterpolationDuration() {
+        return interpolationDuration;
+    }
+
+    public DisplayHologramData setInterpolationDuration(int interpolationDuration) {
+        if (this.interpolationDuration != interpolationDuration) {
+            this.interpolationDuration = interpolationDuration;
+            setHasChanges(true);
+        }
+
+        return this;
+    }
+
     @Override
     public boolean read(ConfigurationSection section, String name) {
         super.read(section, name);

diff --git a/...tation_1_19_4/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_19_4.java b/...tation_1_19_4/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_19_4.java
@@ -65,11 +65,13 @@ public void create() {
             case ITEM -> this.display = new Display.ItemDisplay(EntityType.ITEM_DISPLAY, world);
         }
 
-        final var DATA_INTERPOLATION_DURATION_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_19_4.DATA_INTERPOLATION_DURATION_ID.getMapping());
-        display.getEntityData().set((EntityDataAccessor<Integer>) DATA_INTERPOLATION_DURATION_ID, 1);
+        if (data instanceof DisplayHologramData dd) {
+            final var DATA_INTERPOLATION_DURATION_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_19_4.DATA_INTERPOLATION_DURATION_ID.getMapping());
+            display.getEntityData().set((EntityDataAccessor<Integer>) DATA_INTERPOLATION_DURATION_ID, dd.getInterpolationDuration());
 
-        final var DATA_INTERPOLATION_START_DELTA_TICKS_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_19_4.DATA_INTERPOLATION_START_DELTA_TICKS_ID.getMapping());
-        display.getEntityData().set((EntityDataAccessor<Integer>) DATA_INTERPOLATION_START_DELTA_TICKS_ID, 0);
+            final var DATA_INTERPOLATION_START_DELTA_TICKS_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_19_4.DATA_INTERPOLATION_START_DELTA_TICKS_ID.getMapping());
+            display.getEntityData().set((EntityDataAccessor<Integer>) DATA_INTERPOLATION_START_DELTA_TICKS_ID, 0);
+        }
 
         update();
     }

diff --git a/...tation_1_20_1/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_1.java b/...tation_1_20_1/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_1.java
@@ -65,11 +65,13 @@ public void create() {
             case ITEM -> this.display = new Display.ItemDisplay(EntityType.ITEM_DISPLAY, world);
         }
 
-        final var DATA_INTERPOLATION_DURATION_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_20_1.DATA_INTERPOLATION_DURATION_ID.getMapping());
-        display.getEntityData().set((EntityDataAccessor<Integer>) DATA_INTERPOLATION_DURATION_ID, 1);
+        if (data instanceof DisplayHologramData dd){
+            final var DATA_INTERPOLATION_DURATION_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_20_1.DATA_INTERPOLATION_DURATION_ID.getMapping());
+            display.getEntityData().set((EntityDataAccessor<Integer>) DATA_INTERPOLATION_DURATION_ID, dd.getInterpolationDuration());
 
-        final var DATA_INTERPOLATION_START_DELTA_TICKS_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_20_1.DATA_INTERPOLATION_START_DELTA_TICKS_ID.getMapping());
-        display.getEntityData().set((EntityDataAccessor<Integer>) DATA_INTERPOLATION_START_DELTA_TICKS_ID, 0);
+            final var DATA_INTERPOLATION_START_DELTA_TICKS_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_20_1.DATA_INTERPOLATION_START_DELTA_TICKS_ID.getMapping());
+            display.getEntityData().set((EntityDataAccessor<Integer>) DATA_INTERPOLATION_START_DELTA_TICKS_ID, 0);
+        }
 
         update();
     }

diff --git a/...tation_1_20_2/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_2.java b/...tation_1_20_2/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_2.java
@@ -65,11 +65,13 @@ public void create() {
             case ITEM -> this.display = new Display.ItemDisplay(EntityType.ITEM_DISPLAY, world);
         }
 
-        final var DATA_INTERPOLATION_DURATION_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_20_2.DATA_INTERPOLATION_DURATION_ID.getMapping());
-        display.getEntityData().set((EntityDataAccessor<Integer>) DATA_INTERPOLATION_DURATION_ID, 1);
+        if (data instanceof DisplayHologramData dd) {
+            final var DATA_INTERPOLATION_DURATION_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_20_2.DATA_INTERPOLATION_DURATION_ID.getMapping());
+            display.getEntityData().set((EntityDataAccessor<Integer>) DATA_INTERPOLATION_DURATION_ID, dd.getInterpolationDuration());
 
-        final var DATA_INTERPOLATION_START_DELTA_TICKS_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_20_2.DATA_INTERPOLATION_START_DELTA_TICKS_ID.getMapping());
-        display.getEntityData().set((EntityDataAccessor<Integer>) DATA_INTERPOLATION_START_DELTA_TICKS_ID, 0);
+            final var DATA_INTERPOLATION_START_DELTA_TICKS_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_20_2.DATA_INTERPOLATION_START_DELTA_TICKS_ID.getMapping());
+            display.getEntityData().set((EntityDataAccessor<Integer>) DATA_INTERPOLATION_START_DELTA_TICKS_ID, 0);
+        }
 
         update();
     }

diff --git a/...tation_1_20_4/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_4.java b/...tation_1_20_4/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_4.java
@@ -65,11 +65,13 @@ public void create() {
             case ITEM -> this.display = new Display.ItemDisplay(EntityType.ITEM_DISPLAY, world);
         }
 
-        final var DATA_TRANSFORMATION_INTERPOLATION_DURATION_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_20_4.DISPLAY__DATA_TRANSFORMATION_INTERPOLATION_DURATION_ID.getMapping());
-        display.getEntityData().set((EntityDataAccessor<Integer>) DATA_TRANSFORMATION_INTERPOLATION_DURATION_ID, 1);
+        if (data instanceof DisplayHologramData dd) {
+            final var DATA_TRANSFORMATION_INTERPOLATION_DURATION_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_20_4.DISPLAY__DATA_TRANSFORMATION_INTERPOLATION_DURATION_ID.getMapping());
+            display.getEntityData().set((EntityDataAccessor<Integer>) DATA_TRANSFORMATION_INTERPOLATION_DURATION_ID, dd.getInterpolationDuration());
 
-        final var DATA_TRANSFORMATION_INTERPOLATION_START_DELTA_TICKS_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_20_4.DISPLAY__DATA_TRANSFORMATION_INTERPOLATION_START_DELTA_TICKS_ID.getMapping());
-        display.getEntityData().set((EntityDataAccessor<Integer>) DATA_TRANSFORMATION_INTERPOLATION_START_DELTA_TICKS_ID, 0);
+            final var DATA_TRANSFORMATION_INTERPOLATION_START_DELTA_TICKS_ID = ReflectionUtils.getStaticValue(Display.class, MappingKeys1_20_4.DISPLAY__DATA_TRANSFORMATION_INTERPOLATION_START_DELTA_TICKS_ID.getMapping());
+            display.getEntityData().set((EntityDataAccessor<Integer>) DATA_TRANSFORMATION_INTERPOLATION_START_DELTA_TICKS_ID, 0);
+        }
 
         update();
     }

diff --git a/src/main/java/de/oliver/fancyholograms/hologram/version/HologramImpl.java b/src/main/java/de/oliver/fancyholograms/hologram/version/HologramImpl.java
@@ -37,8 +37,10 @@ public void create() {
             case BLOCK -> this.fsDisplay = new FS_BlockDisplay();
         }
 
-        fsDisplay.setTransformationInterpolationDuration(1);
-        fsDisplay.setTransformationInterpolationStartDeltaTicks(0);
+        if (data instanceof DisplayHologramData dd) {
+            fsDisplay.setTransformationInterpolationDuration(dd.getInterpolationDuration());
+            fsDisplay.setTransformationInterpolationStartDeltaTicks(0);
+        }
 
         update();
     }