Attempt at fixing geyser issue

Author: RhythmicSys

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>simplexity</groupId>
     <artifactId>SimpleNicks</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <packaging>jar</packaging>
 
     <name>SimpleNicks</name>
@@ -73,6 +73,14 @@
             <id>placeholderapi</id>
             <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
+        <repository>
+            <id>codemc-releases</id>
+            <url>https://repo.codemc.io/repository/maven-releases/</url>
+        </repository>
+        <repository>
+            <id>codemc-snapshots</id>
+            <url>https://repo.codemc.io/repository/maven-snapshots/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -88,5 +96,11 @@
             <version>2.11.5</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.retrooper</groupId>
+            <artifactId>packetevents-spigot</artifactId>
+            <version>2.9.3</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

src/main/java/simplexity/simplenicks/SimpleNicks.java

@@ -7,15 +7,16 @@
 import simplexity.simplenicks.commands.Delete;
 import simplexity.simplenicks.commands.Help;
 import simplexity.simplenicks.commands.Reset;
+import simplexity.simplenicks.commands.SNReload;
 import simplexity.simplenicks.commands.Save;
 import simplexity.simplenicks.commands.Set;
-import simplexity.simplenicks.commands.SNReload;
 import simplexity.simplenicks.commands.SubCommand;
 import simplexity.simplenicks.config.ConfigHandler;
 import simplexity.simplenicks.config.LocaleHandler;
 import simplexity.simplenicks.listener.LoginListener;
 import simplexity.simplenicks.util.Constants;
 import simplexity.simplenicks.util.NickHandler;
+import simplexity.simplenicks.util.PacketStuff;
 import simplexity.simplenicks.util.SNExpansion;
 
 import java.util.Collections;
@@ -51,6 +52,9 @@ public void onEnable() {
         if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
             new SNExpansion().register();
         }
+        if (this.getServer().getPluginManager().isPluginEnabled("floodgate")) {
+            PacketStuff.registerPacketStuff();
+        }
         instance.getServer().getPluginManager().registerEvents(new LoginListener(), this);
         configReload();
     }
@@ -84,4 +88,5 @@ public static void configReload() {
         ConfigHandler.getInstance().reloadConfig();
         NickHandler.getInstance().loadSavingType();
     }
+
 }

src/main/java/simplexity/simplenicks/listener/LoginListener.java

@@ -11,6 +11,7 @@
 public class LoginListener implements Listener {
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onPlayerLogin(PlayerJoinEvent joinEvent) {
-        Bukkit.getScheduler().runTaskLater(SimpleNicks.getInstance(), () -> NickHandler.getInstance().refreshNickname(joinEvent.getPlayer()), 20L);
+        Bukkit.getScheduler().runTaskLater(SimpleNicks.getInstance(), () ->
+                NickHandler.getInstance().refreshNickname(joinEvent.getPlayer()), 20L);
     }
 }

src/main/java/simplexity/simplenicks/listener/NamePacketListener.java

@@ -0,0 +1,38 @@
+package simplexity.simplenicks.listener;
+
+import com.github.retrooper.packetevents.event.PacketListenerAbstract;
+import com.github.retrooper.packetevents.event.PacketSendEvent;
+import com.github.retrooper.packetevents.protocol.packettype.PacketType;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPlayerInfoUpdate;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import simplexity.simplenicks.SimpleNicks;
+import simplexity.simplenicks.util.NickHandler;
+
+import java.util.EnumSet;
+import java.util.UUID;
+
+public class NamePacketListener extends PacketListenerAbstract {
+
+    @Override
+    public void onPacketSend(@NotNull PacketSendEvent sendEvent) {
+        if (sendEvent.getPacketType() != PacketType.Play.Server.PLAYER_INFO_UPDATE) return;
+        WrapperPlayServerPlayerInfoUpdate packet = new WrapperPlayServerPlayerInfoUpdate(sendEvent);
+        EnumSet<WrapperPlayServerPlayerInfoUpdate.Action> actions = packet.getActions();
+
+        if (!actions.contains(WrapperPlayServerPlayerInfoUpdate.Action.ADD_PLAYER)
+            && !actions.contains(WrapperPlayServerPlayerInfoUpdate.Action.UPDATE_DISPLAY_NAME)) return;
+
+        packet.getEntries().forEach(entry -> {
+            UUID uuid = entry.getGameProfile().getUUID();
+            Player target = Bukkit.getPlayer(uuid);
+            String nickname = NickHandler.getInstance().getNickname(target);
+            if (target != null && nickname != null && !nickname.isEmpty()) {
+                entry.setDisplayName(SimpleNicks.getMiniMessage().deserialize(nickname));
+            }
+        });
+
+    }
+
+}

src/main/java/simplexity/simplenicks/util/PacketStuff.java

@@ -0,0 +1,11 @@
+package simplexity.simplenicks.util;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import simplexity.simplenicks.listener.NamePacketListener;
+
+public class PacketStuff {
+    public static void registerPacketStuff(){
+        PacketEvents.getAPI().getEventManager().registerListener(new NamePacketListener());
+        PacketEvents.getAPI().load();
+    }
+}

src/main/java/simplexity/simplenicks/util/SNExpansion.java

@@ -3,7 +3,6 @@
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
-import simplexity.simplenicks.SimpleNicks;
 
 public class SNExpansion extends PlaceholderExpansion {
     @Override

src/main/resources/plugin.yml

@@ -6,6 +6,7 @@ api-version: 1.19
 description: "A simple plugin to allow players to set and reset nicknames."
 softdepend:
   - PlaceholderAPI
+  - packetevents
 commands:
   nick:
     description: "Base command for SimpleNicks, Admin permission required to alter other's names."
@@ -132,4 +133,4 @@ permissions:
     default: op
     children:
       simplenick.nick: true
-      simplenick.nick.format: true
+      simplenick.nick.format: true