nametag listener attempt #2

Author: taylorberg

.idea/compiler.xml

@@ -10,9 +10,15 @@ plugins {
 group 'university.quaranteen'
 version '1.0-SNAPSHOT'
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 repositories {
     mavenCentral()
     enginehub()
+    protocolLib()
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     maven { url 'https://oss.sonatype.org/content/repositories/central' }
     maven { url 'https://ci.mg-dev.eu/plugin/repository/everything' }
@@ -23,7 +29,7 @@ spigot {
     authors = ['Quaranteen University Team']
     apiVersion = '1.15'
     load = Load.POST_WORLD
-    depends = ['BKCommonLib', 'WorldGuard']
+    depends = ['BKCommonLib', 'WorldGuard', 'ProtocolLib', 'Citizens']
     name = 'GradCraft'
     description = 'A plugin for QU'
     website = 'https://quaranteen.university/'
@@ -104,6 +110,7 @@ dependencies {
     compileOnly 'com.bergerkiller.bukkit:BKCommonLib:1.15.2-v4-SNAPSHOT'
     compileOnly worldedit()
     compileOnly worldguard()
+    compileOnly protocolLib()
     implementation 'mysql:mysql-connector-java:8.0.20'
     implementation 'com.zaxxer:HikariCP:3.4.5'
     compileOnly 'net.citizensnpcs:citizens:2.0.26-SNAPSHOT'

.idea/jarRepositories.xml

@@ -0,0 +1,114 @@
+/**
+ * PacketWrapper - ProtocolLib wrappers for Minecraft packets
+ * Copyright (C) dmulloy2 <http://dmulloy2.net>
+ * Copyright (C) Kristian S. Strangeland
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.comphenix.packetwrapper;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.bukkit.entity.Player;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.events.PacketContainer;
+import com.google.common.base.Objects;
+
+public abstract class AbstractPacket {
+	// The packet we will be modifying
+	protected PacketContainer handle;
+
+	/**
+	 * Constructs a new strongly typed wrapper for the given packet.
+	 * 
+	 * @param handle - handle to the raw packet data.
+	 * @param type - the packet type.
+	 */
+	protected AbstractPacket(PacketContainer handle, PacketType type) {
+		// Make sure we're given a valid packet
+		if (handle == null)
+			throw new IllegalArgumentException("Packet handle cannot be NULL.");
+		if (!Objects.equal(handle.getType(), type))
+			throw new IllegalArgumentException(handle.getHandle()
+					+ " is not a packet of type " + type);
+
+		this.handle = handle;
+	}
+
+	/**
+	 * Retrieve a handle to the raw packet data.
+	 * 
+	 * @return Raw packet data.
+	 */
+	public PacketContainer getHandle() {
+		return handle;
+	}
+
+	/**
+	 * Send the current packet to the given receiver.
+	 * 
+	 * @param receiver - the receiver.
+	 * @throws RuntimeException If the packet cannot be sent.
+	 */
+	public void sendPacket(Player receiver) {
+		try {
+			ProtocolLibrary.getProtocolManager().sendServerPacket(receiver,
+					getHandle());
+		} catch (InvocationTargetException e) {
+			throw new RuntimeException("Cannot send packet.", e);
+		}
+	}
+
+	/**
+	 * Send the current packet to all online players.
+	 */
+	public void broadcastPacket() {
+		ProtocolLibrary.getProtocolManager().broadcastServerPacket(getHandle());
+	}
+
+	/**
+	 * Simulate receiving the current packet from the given sender.
+	 * 
+	 * @param sender - the sender.
+	 * @throws RuntimeException If the packet cannot be received.
+	 * @deprecated Misspelled. recieve to receive
+	 * @see #receivePacket(Player)
+	 */
+	@Deprecated
+	public void recievePacket(Player sender) {
+		try {
+			ProtocolLibrary.getProtocolManager().recieveClientPacket(sender,
+					getHandle());
+		} catch (Exception e) {
+			throw new RuntimeException("Cannot recieve packet.", e);
+		}
+	}
+
+	/**
+	 * Simulate receiving the current packet from the given sender.
+	 * 
+	 * @param sender - the sender.
+	 * @throws RuntimeException if the packet cannot be received.
+	 */
+	public void receivePacket(Player sender) {
+		try {
+			ProtocolLibrary.getProtocolManager().recieveClientPacket(sender,
+					getHandle());
+		} catch (Exception e) {
+			throw new RuntimeException("Cannot receive packet.", e);
+		}
+	}
+}

.idea/misc.xml

@@ -0,0 +1,55 @@
+/**
+ * PacketWrapper - ProtocolLib wrappers for Minecraft packets
+ * Copyright (C) dmulloy2 <http://dmulloy2.net>
+ * Copyright (C) Kristian S. Strangeland
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.comphenix.packetwrapper;
+
+import java.util.List;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.wrappers.EnumWrappers.PlayerInfoAction;
+import com.comphenix.protocol.wrappers.PlayerInfoData;
+
+public class WrapperPlayServerPlayerInfo extends AbstractPacket {
+	public static final PacketType TYPE = PacketType.Play.Server.PLAYER_INFO;
+
+	public WrapperPlayServerPlayerInfo() {
+		super(new PacketContainer(TYPE), TYPE);
+		handle.getModifier().writeDefaults();
+	}
+
+	public WrapperPlayServerPlayerInfo(PacketContainer packet) {
+		super(packet, TYPE);
+	}
+
+	public PlayerInfoAction getAction() {
+		return handle.getPlayerInfoAction().read(0);
+	}
+
+	public void setAction(PlayerInfoAction value) {
+		handle.getPlayerInfoAction().write(0, value);
+	}
+
+	public List<PlayerInfoData> getData() {
+		return handle.getPlayerInfoDataLists().read(0);
+	}
+
+	public void setData(List<PlayerInfoData> value) {
+		handle.getPlayerInfoDataLists().write(0, value);
+	}
+}

GradCraft/build.gradle

@@ -2,6 +2,7 @@
 
 import com.bergerkiller.bukkit.common.Common;
 import com.bergerkiller.bukkit.common.PluginBase;
+import com.comphenix.protocol.ProtocolLibrary;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import kr.entree.spigradle.Plugin;
@@ -31,7 +32,8 @@ public class GradCraftPlugin extends PluginBase {
     public ActiveCeremony ceremony;
 
     public BukkitTask ceremonyTimerTask;
-    public GraduateNPC currentGraduateNPC = null;
+
+    private NametagListener nametagListener;
 
     @Override
     public int getMinimumLibVersion() {
@@ -75,7 +77,9 @@ public void enable() {
 
         this.getServer().getScheduler().runTaskTimer(this, new CeremonyTimer(this), 20, 20);
 
-        this.register(new NametagListener(this));
+        nametagListener = new NametagListener(this);
+        this.register(nametagListener);
+        ProtocolLibrary.getProtocolManager().addPacketListener(nametagListener);
 
         // Register your trait with Citizens
         CitizensAPI.getTraitFactory().registerTrait(TraitInfo.create(GraduateTrait.class).withName("graduate"));
@@ -89,6 +93,9 @@ public void disable() {
             this.getServer().getScheduler().cancelTask(ceremonyTimerTask.getTaskId());
         if (db != null)
             db.close();
+
+        CitizensAPI.getTraitFactory().deregisterTrait(TraitInfo.create(GraduateTrait.class).withName("graduate"));
+        CitizensAPI.getTraitFactory().deregisterTrait(TraitInfo.create(ProfessorTrait.class).withName("professor"));
     }
 
     @Override