improved scale support

Xiao-MoMi · Jan 25, 2025 · 28ccd91 · 28ccd91
1 parent 16976e6
commit 28ccd91
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 5 deletions.
diff --git a/...main/java/net/momirealms/customnameplates/api/placeholder/internal/AdaptiveImageText.java b/...main/java/net/momirealms/customnameplates/api/placeholder/internal/AdaptiveImageText.java
@@ -19,7 +19,9 @@
 
 import net.momirealms.customnameplates.api.CNPlayer;
 import net.momirealms.customnameplates.api.CustomNameplates;
+import net.momirealms.customnameplates.api.CustomNameplatesAPI;
 import net.momirealms.customnameplates.api.feature.AdaptiveImage;
+import net.momirealms.customnameplates.api.feature.OffsetFont;
 import net.momirealms.customnameplates.api.feature.PreParsedDynamicText;
 import net.momirealms.customnameplates.api.helper.AdventureHelper;
 import org.jetbrains.annotations.ApiStatus;
@@ -99,4 +101,9 @@ public String getImage(CNPlayer p1, CNPlayer p2) {
     public String getText(CNPlayer p1, CNPlayer p2) {
         return preParsedDynamicText.fastCreate(p1).render(p2);
     }
+
+    @NotNull
+    public String getTextOffsetCharacters(CNPlayer p1, CNPlayer p2) {
+        return OffsetFont.createOffsets(CustomNameplatesAPI.getInstance().getTextAdvance(preParsedDynamicText.fastCreate(p1).render(p2)));
+    }
 }
diff --git a/...main/java/net/momirealms/customnameplates/backend/placeholder/PlaceholderManagerImpl.java b/...main/java/net/momirealms/customnameplates/backend/placeholder/PlaceholderManagerImpl.java
@@ -512,6 +512,9 @@ private void loadBackgroundTextSection(Section section) {
                     Placeholder placeholder7 = this.registerSharedPlaceholder("%shared_np_background-image_" + id + "%", () -> adaptiveImageText.getImage(null, null));
                     Placeholder placeholder8 = this.registerPlayerPlaceholder("%np_background-image_" + id + "%", (p) -> adaptiveImageText.getImage(p, p));
                     Placeholder placeholder9 = this.registerRelationalPlaceholder("%rel_np_background-image_" + id + "%", adaptiveImageText::getImage);
+                    Placeholder placeholder40 = this.registerSharedPlaceholder("%shared_np_background-text-offset_" + id + "%", () -> adaptiveImageText.getTextOffsetCharacters(null, null));
+                    Placeholder placeholder50 = this.registerPlayerPlaceholder("%np_background-text-offset_" + id + "%", (p) -> adaptiveImageText.getTextOffsetCharacters(p, p));
+                    Placeholder placeholder60 = this.registerRelationalPlaceholder("%rel_np_background-text-offset_" + id + "%", adaptiveImageText::getTextOffsetCharacters);
                     childrenText.put(placeholder1, list);
                     childrenText.put(placeholder2, list);
                     childrenText.put(placeholder3, list);
@@ -521,6 +524,9 @@ private void loadBackgroundTextSection(Section section) {
                     childrenText.put(placeholder7, list);
                     childrenText.put(placeholder8, list);
                     childrenText.put(placeholder9, list);
+                    childrenText.put(placeholder40, list);
+                    childrenText.put(placeholder50, list);
+                    childrenText.put(placeholder60, list);
                 } else {
                     plugin.getPluginLogger().warn("Background [" + bgID + "] not exists");
                 }

diff --git a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitPlatform.java b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitPlatform.java
@@ -310,15 +310,46 @@ public BukkitPlatform(CustomNameplates plugin) {
                         Object attributeHolder = Reflections.field$ClientboundUpdateAttributesPacket$AttributeSnapshot$attribute.get(attributeSnapshot);
                         Object attribute = Reflections.method$Holder$value.invoke(attributeHolder);
                         String id = (String) Reflections.field$Attribute$id.get(attribute);
-                        if (id.equals("attribute.name.generic.scale") || id.equals("attribute.name.scale")) {
+                        if (id.endsWith("scale")) {
                             double baseValue = (double) Reflections.field$ClientboundUpdateAttributesPacket$AttributeSnapshot$base.get(attributeSnapshot);
                             @SuppressWarnings("unchecked")
                             Collection<Object> modifiers = (Collection<Object>) Reflections.field$ClientboundUpdateAttributesPacket$AttributeSnapshot$modifiers.get(attributeSnapshot);
-                            for (Object modifier : modifiers) {
-                                double amount = (double) Reflections.field$AttributeModifier$amount.get(modifier);
-                                baseValue += amount;
+                            int left = modifiers.size();
+                            if (left > 0) {
+                                for (Object modifier : modifiers) {
+                                    Object operation = Reflections.field$AttributeModifier$operation.get(modifier);
+                                    if (operation == Reflections.instance$AttributeModifier$Operation$ADD_VALUE) {
+                                        double amount = (double) Reflections.field$AttributeModifier$amount.get(modifier);
+                                        baseValue += amount;
+                                        left--;
+                                        if (left == 0) break;
+                                    }
+                                }
+                            }
+                            double finalValue = baseValue;
+                            if (left > 0) {
+                                for (Object modifier : modifiers) {
+                                    Object operation = Reflections.field$AttributeModifier$operation.get(modifier);
+                                    if (operation == Reflections.instance$AttributeModifier$Operation$ADD_MULTIPLIED_BASE) {
+                                        double amount = (double) Reflections.field$AttributeModifier$amount.get(modifier);
+                                        finalValue += amount * baseValue;
+                                        left--;
+                                        if (left == 0) break;
+                                    }
+                                }
+                            }
+                            if (left > 0) {
+                                for (Object modifier : modifiers) {
+                                    Object operation = Reflections.field$AttributeModifier$operation.get(modifier);
+                                    if (operation == Reflections.instance$AttributeModifier$Operation$ADD_MULTIPLIED_TOTAL) {
+                                        double amount = (double) Reflections.field$AttributeModifier$amount.get(modifier);
+                                        finalValue *= 1.0 + amount;
+                                        left--;
+                                        if (left == 0) break;
+                                    }
+                                }
                             }
-                            CustomNameplates.getInstance().getUnlimitedTagManager().onPlayerAttributeSet(another, player, baseValue);
+                            CustomNameplates.getInstance().getUnlimitedTagManager().onPlayerAttributeSet(another, player, finalValue);
                             return;
                         }
                     }

diff --git a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/util/Reflections.java b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/util/Reflections.java
@@ -1097,4 +1097,37 @@ public static Object allocateClientboundSetPassengersPacketInstance() throws Ins
         }
         field$ServerConnectionListener$channels = requireNonNull(f);
     }
+
+    public static final Class<?> clazz$AttributeModifier$Operation = requireNonNull(
+            ReflectionUtils.getClazz(
+                    BukkitReflectionUtils.assembleMCClass("world.entity.ai.attributes.AttributeModifier$Operation")
+            )
+    );
+
+    public static final Method method$AttributeModifier$Operation$values = requireNonNull(
+            ReflectionUtils.getStaticMethod(
+                    clazz$AttributeModifier$Operation, clazz$AttributeModifier$Operation.arrayType()
+            )
+    );
+
+    public static final Object instance$AttributeModifier$Operation$ADD_VALUE;
+    public static final Object instance$AttributeModifier$Operation$ADD_MULTIPLIED_BASE;
+    public static final Object instance$AttributeModifier$Operation$ADD_MULTIPLIED_TOTAL;
+
+    static {
+        try {
+            Object[] values = (Object[]) method$AttributeModifier$Operation$values.invoke(null);
+            instance$AttributeModifier$Operation$ADD_VALUE = values[0];
+            instance$AttributeModifier$Operation$ADD_MULTIPLIED_BASE = values[1];
+            instance$AttributeModifier$Operation$ADD_MULTIPLIED_TOTAL = values[2];
+        } catch (ReflectiveOperationException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    public static final Field field$AttributeModifier$operation = requireNonNull(
+            ReflectionUtils.getDeclaredField(
+                    clazz$AttributeModifier, clazz$AttributeModifier$Operation, 0
+            )
+    );
 }