updatesQueue = new PriorityBlockingQueue<>(11, Comparator.comparingInt(NameTagUpdate::getPriority).reversed());
private volatile boolean running = true;
private final NameTagHandler handler;
private final long ticks;
- public NameTagThread(NameTagHandler nameTagHandler, long ticks) {
- super(nameTagHandler.getPlugin().getName() + " - NameTag Thread");
+ // Executor services for scheduling and update processing
+ private final ScheduledExecutorService scheduler;
+ private final ExecutorService updateExecutor;
+ public NameTagThread(NameTagHandler nameTagHandler, long ticks) {
this.handler = nameTagHandler;
this.ticks = ticks;
+
+ ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat("Bolt - NameTag-%d")
+ .setPriority(Thread.NORM_PRIORITY - 1)
+ .setDaemon(true)
+ .setUncaughtExceptionHandler((a, e) -> {
+ log.fatal("[{}] There was an error in the Thread {}.", handler.getPlugin().getName(), a.getName());
+ log.error(e);
+ })
+ .build();
+
+ this.scheduler = Executors.newSingleThreadScheduledExecutor(threadFactory);
+ this.updateExecutor = Executors.newFixedThreadPool(2, threadFactory);
+
+ // Schedule the periodic task to process updates
+ scheduler.scheduleAtFixedRate(this::tick, 0, ticks * 50, TimeUnit.MILLISECONDS);
}
/**
@@ -43,39 +64,31 @@ public void addUpdate(NameTagUpdate update) {
this.updatesQueue.add(update);
}
- /**
- * Tick this thread to start running the queued updates.
- */
- private void tick() {
- while (this.updatesQueue.size() > 0) {
- NameTagUpdate pendingUpdate = this.updatesQueue.poll();
-
- try {
- pendingUpdate.update(handler);
- } catch (Exception e) {
- log.fatal("[{}] There was an error issuing NameTagUpdate.", handler.getPlugin().getName());
- log.error(e);
- e.printStackTrace();
- }
- }
- }
-
/**
* Stop executing this thread.
*/
public void stopExecuting() {
this.running = false;
+ scheduler.shutdown();
+ updateExecutor.shutdown();
}
- @Override
- public void run() {
- while (running) {
- try {
- this.tick();
- Thread.sleep(ticks * 50);
- } catch (InterruptedException e) {
- this.stopExecuting();
+ /**
+ * Tick this thread to start running the queued updates.
+ */
+ private void tick() {
+ while (running && !updatesQueue.isEmpty()) {
+ NameTagUpdate pendingUpdate = updatesQueue.poll();
+ if (pendingUpdate != null) {
+ updateExecutor.submit(() -> {
+ try {
+ pendingUpdate.update(handler);
+ } catch (Exception e) {
+ log.fatal("[{}] There was an error issuing NameTagUpdate.", handler.getPlugin().getName());
+ log.error(e);
+ }
+ });
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/xyz/refinedev/api/nametag/update/NameTagUpdate.java b/src/main/java/xyz/refinedev/api/nametag/update/NameTagUpdate.java
index 64b792d..031fdb5 100644
--- a/src/main/java/xyz/refinedev/api/nametag/update/NameTagUpdate.java
+++ b/src/main/java/xyz/refinedev/api/nametag/update/NameTagUpdate.java
@@ -20,4 +20,6 @@ public interface NameTagUpdate {
*/
void update(NameTagHandler nameTagHandler);
+ int getPriority();
+
}
diff --git a/src/main/java/xyz/refinedev/api/nametag/update/impl/NameTagInitiate.java b/src/main/java/xyz/refinedev/api/nametag/update/impl/NameTagInitiate.java
new file mode 100644
index 0000000..9b17184
--- /dev/null
+++ b/src/main/java/xyz/refinedev/api/nametag/update/impl/NameTagInitiate.java
@@ -0,0 +1,38 @@
+package xyz.refinedev.api.nametag.update.impl;
+
+import lombok.RequiredArgsConstructor;
+import org.bukkit.entity.Player;
+import xyz.refinedev.api.nametag.NameTagHandler;
+import xyz.refinedev.api.nametag.update.NameTagUpdate;
+
+/**
+ *
+ * This Project is property of Refine Development.
+ * Copyright © 2024, All Rights Reserved.
+ * Redistribution of this Project is not allowed.
+ *
+ *
+ * @author Drizzy
+ * @version NameTagAPI
+ * @since 9/16/2024
+ */
+
+@RequiredArgsConstructor
+public class NameTagInitiate implements NameTagUpdate {
+
+ private final Player target;
+
+ /**
+ * Apply this name-tag update.
+ */
+ public void update(NameTagHandler nameTagHandler) {
+ nameTagHandler.initiatePlayer(target);
+ nameTagHandler.reloadPlayer(target);
+ nameTagHandler.reloadOthersFor(target);
+ }
+
+ @Override
+ public int getPriority() {
+ return 69;
+ }
+}
diff --git a/src/main/java/xyz/refinedev/api/nametag/update/impl/NameTagRefresh.java b/src/main/java/xyz/refinedev/api/nametag/update/impl/NameTagRefresh.java
index 06a19c7..9411684 100644
--- a/src/main/java/xyz/refinedev/api/nametag/update/impl/NameTagRefresh.java
+++ b/src/main/java/xyz/refinedev/api/nametag/update/impl/NameTagRefresh.java
@@ -44,4 +44,8 @@ public NameTagRefresh(Player toRefresh, Player refreshFor) {
public void update(NameTagHandler nameTagHandler) {
nameTagHandler.applyUpdate(this);
}
+
+ public int getPriority() {
+ return 5;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/xyz/refinedev/api/nametag/update/impl/NameTagRemove.java b/src/main/java/xyz/refinedev/api/nametag/update/impl/NameTagRemove.java
index 5ea6f69..af571e5 100644
--- a/src/main/java/xyz/refinedev/api/nametag/update/impl/NameTagRemove.java
+++ b/src/main/java/xyz/refinedev/api/nametag/update/impl/NameTagRemove.java
@@ -29,4 +29,9 @@ public class NameTagRemove implements NameTagUpdate {
public void update(NameTagHandler nameTagHandler) {
nameTagHandler.getTeamMap().remove(toRemove);
}
+
+ @Override
+ public int getPriority() {
+ return 1;
+ }
}
diff --git a/src/main/java/xyz/refinedev/api/nametag/util/chat/ColorUtil.java b/src/main/java/xyz/refinedev/api/nametag/util/chat/ColorUtil.java
index ac0fc56..a860f2f 100644
--- a/src/main/java/xyz/refinedev/api/nametag/util/chat/ColorUtil.java
+++ b/src/main/java/xyz/refinedev/api/nametag/util/chat/ColorUtil.java
@@ -148,7 +148,7 @@ public String color(String text) {
* @return {@link Component}
*/
public Component translate(String string) {
- return AdventureSerializer.fromLegacyFormat(color(string));
+ return Component.text(color(string));
}
public String getRaw(String string) {
diff --git a/src/main/java/xyz/refinedev/api/nametag/util/collection/CachedSizeConcurrentLinkedQueue.java b/src/main/java/xyz/refinedev/api/nametag/util/collection/CachedSizeConcurrentLinkedQueue.java
deleted file mode 100644
index 1734f3e..0000000
--- a/src/main/java/xyz/refinedev/api/nametag/util/collection/CachedSizeConcurrentLinkedQueue.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package xyz.refinedev.api.nametag.util.collection;
-
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.LongAdder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class CachedSizeConcurrentLinkedQueue extends ConcurrentLinkedQueue {
-
- private final AtomicLong cachedSize = new AtomicLong();
-
- @Override
- public boolean add(@NotNull E e) {
- boolean result = super.add(e);
- if (result) {
- cachedSize.incrementAndGet();
- }
- return result;
- }
-
- @Nullable
- @Override
- public E poll() {
- E result = super.poll();
- if (result != null) {
- cachedSize.decrementAndGet();
- }
- return result;
- }
-
- @Override
- public int size() {
- return cachedSize.intValue();
- }
-
- @Override
- public void clear() {
- super.clear();
- cachedSize.set(0);
- }
-}
\ No newline at end of file
diff --git a/src/main/java/xyz/refinedev/api/nametag/util/packet/ScoreboardPacket.java b/src/main/java/xyz/refinedev/api/nametag/util/packet/ScoreboardPacket.java
deleted file mode 100644
index 2ef33af..0000000
--- a/src/main/java/xyz/refinedev/api/nametag/util/packet/ScoreboardPacket.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package xyz.refinedev.api.nametag.util.packet;
-
-import lombok.Getter;
-
-import net.minecraft.server.v1_8_R3.EntityPlayer;
-import net.minecraft.server.v1_8_R3.Packet;
-import net.minecraft.server.v1_8_R3.PacketPlayOutScoreboardTeam;
-
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-import xyz.refinedev.api.nametag.util.chat.ColorUtil;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.reflect.Field;
-import java.util.Collection;
-
-/**
- * This Project is property of Refine Development.
- * Copyright © 2023, All Rights Reserved.
- * Redistribution of this Project is not allowed.
- *
- * @author Drizzy
- * @since 9/12/2023
- * @version NameTagAPI
- */
-
-@Getter
-public class ScoreboardPacket {
-
- // 0 - create
- // 1 - remove
- // 2 - update
- // 3 - add entities
- // 4 - remove entities
-
- public static Object creationPacket(String name, String prefix, String suffix) {
- if (prefix.length() > 16) {
- prefix = prefix.substring(0, 16);
- }
- if (suffix.length() > 16) {
- suffix = suffix.substring(0, 16);
- }
-
- PacketPlayOutScoreboardTeam packet = new PacketPlayOutScoreboardTeam();
-
- try {
- protocolValue.invokeExact(packet, 0);
-
- teamName.invokeExact(packet, name);
- teamDisplayName.invokeExact(packet, name);
- teamPrefix.invokeExact(packet, ColorUtil.color(prefix));
- teamSuffix.invokeExact(packet, ColorUtil.color(suffix));
- nameTagRule.invokeExact(packet, "always");
- optionData.invokeExact(packet, 1);
- } catch (Throwable e) {
- Bukkit.getLogger().info("[NameTagAPI] Failed to create packet for removing!");
- e.printStackTrace();
- }
-
- return packet;
- }
-
- public static Object additionPacket(String name, Collection players) {
- PacketPlayOutScoreboardTeam packet = new PacketPlayOutScoreboardTeam();
-
- try {
- teamName.invokeExact(packet, name);
- protocolValue.invokeExact(packet, 3);
- playerNames.invokeExact(packet, players);
- } catch (Throwable e) {
- Bukkit.getLogger().info("[NameTagAPI] Failed to create packet for removing!");
- e.printStackTrace();
- }
-
- return packet;
- }
-
- public static Object removalPacket(String name) {
- PacketPlayOutScoreboardTeam packet = new PacketPlayOutScoreboardTeam();
-
- try {
- teamName.invokeExact(packet, name);
- protocolValue.invoke(packet, 1);
- } catch (Throwable e) {
- Bukkit.getLogger().info("[NameTagAPI] Failed to create packet for removing!");
- e.printStackTrace();
- }
-
- return packet;
- }
-
- public static void deliverPacket(Player target, Object object) {
- if (!(object instanceof Packet)) {
- throw new IllegalStateException("[NameTagAPI] Tried to send an invalid object as packet!");
- }
-
- EntityPlayer entityPlayer = ((CraftPlayer)target).getHandle();
- entityPlayer.playerConnection.sendPacket((Packet) object);
- }
-
- private static final boolean SUPPORTED;
- private static final Class PACKET_CLASS;
- private static final MethodHandle protocolValue;
- private static final MethodHandle teamName, teamDisplayName, teamPrefix, teamSuffix;
- private static final MethodHandle nameTagRule, optionData;
- private static final MethodHandle playerNames;
-
- static {
- try {
- PACKET_CLASS = PacketPlayOutScoreboardTeam.class;
-
- MethodHandles.Lookup lookup = MethodHandles.publicLookup();
-
- Field name = PACKET_CLASS.getDeclaredField("a");
- name.setAccessible(true);
-
- Field displayName = PACKET_CLASS.getDeclaredField("b");
- displayName.setAccessible(true);
-
- Field prefix = PACKET_CLASS.getDeclaredField("c");
- prefix.setAccessible(true);
-
- Field suffix = PACKET_CLASS.getDeclaredField("d");
- suffix.setAccessible(true);
-
- Field nameTag = PACKET_CLASS.getDeclaredField("e");
- nameTag.setAccessible(true);
-
- Field protocol = PACKET_CLASS.getDeclaredField("h");
- protocol.setAccessible(true);
-
- Field list = PACKET_CLASS.getDeclaredField("g");
- list.setAccessible(true);
-
- Field data = PACKET_CLASS.getDeclaredField("i");
- data.setAccessible(true);
-
- teamName = lookup.unreflectSetter(name);
- teamDisplayName = lookup.unreflectSetter(displayName);
- teamPrefix = lookup.unreflectSetter(prefix);
- teamSuffix = lookup.unreflectSetter(suffix);
- nameTagRule = lookup.unreflectSetter(nameTag);
- protocolValue = lookup.unreflectSetter(protocol);
- playerNames = lookup.unreflectSetter(list);
- optionData = lookup.unreflectSetter(data);
-
- SUPPORTED = true;
- } catch (Exception e) {
- throw new IllegalArgumentException(e);
- }
- }
-}