Merge pull request #25 from Matt-MX/dev

🔥 Bump versions and fix groups bug
Matt-MX · Nov 6, 2024 · 730d1b0 · 730d1b0
2 parents 1b8b049 + 4768ecd
commit 730d1b0
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 40 deletions.
diff --git a/.idea/discord.xml b/.idea/discord.xml
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ kotlin.code.style=official
 # Project configuration
 group_name = com.mattmx
 id = nametags
-version = 1.2
+version = 1.3
 
 plugin_name = NameTags
 plugin_main_class_name = NameTags

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,8 +9,8 @@ placeholderapi = "2.11.6"
 ktgui = "2.4.2-alpha"
 runPaper = "2.2.4"
 
-packetEvents = "2.4.0"
-entityLib = "2.4.9-SNAPSHOT"
+packetEvents = "2.6.0"
+entityLib = "2.4.11-SNAPSHOT"
 tab = "4.1.8"
 
 [libraries]

diff --git a/run/plugins/packetevents-spigot-2.4.0 (3).jar b/run/plugins/packetevents-spigot-2.4.0 (3).jar
diff --git a/src/main/java/com/mattmx/nametags/config/ConfigDefaultsListener.java b/src/main/java/com/mattmx/nametags/config/ConfigDefaultsListener.java
@@ -1,6 +1,7 @@
 package com.mattmx.nametags.config;
 
 import com.mattmx.nametags.NameTags;
+import com.mattmx.nametags.entity.NameTagEntity;
 import com.mattmx.nametags.entity.trait.RefreshTrait;
 import com.mattmx.nametags.entity.trait.SneakTrait;
 import com.mattmx.nametags.event.NameTagEntityCreateEvent;
@@ -10,8 +11,12 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.List;
+import java.util.Map;
+
 public class ConfigDefaultsListener implements Listener {
     private final @NotNull NameTags plugin;
 
@@ -46,47 +51,65 @@ public void onCreate(@NotNull NameTagEntityCreateEvent event) {
             return;
         }
 
-        event.getNameTag()
-            .getTraits()
-            .getOrAddTrait(RefreshTrait.class, () ->
-                RefreshTrait.ofMillis(
-                    plugin,
-                    refreshMillis,
-                    (entity) -> {
-                        synchronized (entity) {
-
-                            // TODO we need to change the text based off the player the packet is being sent to.
-                            TextDisplayMetaConfiguration.applyMeta(defaultSection(), entity.getMeta());
-                            TextDisplayMetaConfiguration.applyTextMeta(defaultSection(), entity.getMeta(), player, player);
-
-                            // TODO we should cache this stuff
-                            plugin.getGroups()
-                                .entrySet()
-                                .stream()
-                                .filter((e) -> player.hasPermission(e.getKey()))
-                                .forEach((e) -> {
-                                    TextDisplayMetaConfiguration.applyMeta(e.getValue(), entity.getMeta());
-                                    TextDisplayMetaConfiguration.applyTextMeta(e.getValue(), entity.getMeta(), player, player);
-                                });
-
-
-                            if (entity.getMeta().getBillboardConstraints() == AbstractDisplayMeta.BillboardConstraints.CENTER) {
-                                // Look passenger down to remove debug getting in the way
-                                entity.getPassenger().rotateHead(0f, 90f);
+        registerDefaultRefreshListener(event.getNameTag(), refreshMillis);
+    }
+
+    public void registerDefaultRefreshListener(@NotNull NameTagEntity tag, long refreshMillis) {
+        Player player = (Player) tag.getBukkitEntity();
+
+        tag.getTraits().getOrAddTrait(RefreshTrait.class, () ->
+            RefreshTrait.ofMillis(
+                plugin,
+                refreshMillis,
+                (entity) -> {
+                    synchronized (entity) {
+
+                        // TODO we need to change the text based off the player the packet is being sent to.
+                        TextDisplayMetaConfiguration.applyMeta(defaultSection(), entity.getMeta());
+                        TextDisplayMetaConfiguration.applyTextMeta(defaultSection(), entity.getMeta(), player, player);
+
+                        // TODO we should cache this stuff
+                        List<Map.Entry<String, ConfigurationSection>> groups = plugin.getGroups()
+                            .entrySet()
+                            .stream()
+                            .filter((e) -> player.hasPermission(e.getKey()))
+                            .toList();
+
+                        long recentRefreshEvery = plugin.getConfig().getLong("defaults.refresh-every", 50);
+                        if (!groups.isEmpty()) {
+                            Map.Entry<String, ConfigurationSection> highest = groups.getLast();
+
+                            TextDisplayMetaConfiguration.applyMeta(highest.getValue(), entity.getMeta());
+                            TextDisplayMetaConfiguration.applyTextMeta(highest.getValue(), entity.getMeta(), player, player);
+
+                            long groupRefresh = highest.getValue().getLong("refresh-every", -1);
+                            if (groupRefresh > 0) {
+                                recentRefreshEvery = groupRefresh;
                             }
+                        }
 
-                            // Preserve background color for sneaking
-                            // Maybe we should introduce an `afterRefresh` callback?
-                            entity.getTraits()
-                                .getTrait(SneakTrait.class)
-                                .ifPresent(SneakTrait::manuallyUpdateSneakingOpacity);
+                        if (recentRefreshEvery != refreshMillis) {
+                            entity.getTraits().removeTrait(RefreshTrait.class);
+                            registerDefaultRefreshListener(tag, recentRefreshEvery);
+                        }
 
-                            entity.updateVisibility();
-                            entity.getPassenger().refresh();
+                        if (entity.getMeta().getBillboardConstraints() == AbstractDisplayMeta.BillboardConstraints.CENTER) {
+                            // Look passenger down to remove debug getting in the way
+                            entity.getPassenger().rotateHead(0f, 90f);
                         }
+
+                        // Preserve background color for sneaking
+                        // Maybe we should introduce an `afterRefresh` callback?
+                        entity.getTraits()
+                            .getTrait(SneakTrait.class)
+                            .ifPresent(SneakTrait::manuallyUpdateSneakingOpacity);
+
+                        entity.updateVisibility();
+                        entity.getPassenger().refresh();
                     }
-                )
-            );
+                }
+            )
+        );
     }
 
 }