feat(packetevents): implementation of packetevents (#112)

Author: theShadowsDust

build.gradle.kts

@@ -12,9 +12,9 @@ plugins {
 dependencies {
 
     compileOnly(libs.paper)
+    compileOnly(libs.packetEvents)
     implementation(libs.bundles.cloud)
     compileOnly(libs.luckperms)
-    compileOnly(libs.protocolLib)
 
     implementation(libs.bundles.hibernate)
     implementation(libs.jaxbRuntime)
@@ -122,12 +122,14 @@ paper {
         register("LuckPerms") {
             required = false
         }
-        register("ProtocolLib") {
-            required = false
-        }
+
         register("BlueMap") {
             required = false
         }
+
+        register("packetevents") {
+            required = true
+        }
     }
 
 }

settings.gradle.kts

@@ -10,6 +10,9 @@ dependencyResolutionManagement {
         maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
         maven("https://repo.dmulloy2.net/repository/public/")
         maven ("https://repo.bluecolored.de/releases")
+
+        maven("https://repo.codemc.io/repository/maven-releases/")
+
         maven {
             name = "OneLiteFeatherRepository"
             url = uri("https://repo.onelitefeather.dev/onelitefeather")
@@ -52,6 +55,8 @@ dependencyResolutionManagement {
             library("protocolLib", "com.comphenix.protocol", "ProtocolLib").versionRef("protocolLib")
             library("bluemapApi", "de.bluecolored", "bluemap-api").versionRef("bluemapApi")
 
+            library("packetEvents", "com.github.retrooper", "packetevents-spigot").version("2.10.1")
+
             library("cloudPaper", "org.incendo", "cloud-paper").version("2.0.0-SNAPSHOT")
             library("cloudAnnotations", "org.incendo", "cloud-annotations").version("2.0.0")
             library("cloudExtras", "org.incendo", "cloud-minecraft-extras").version("2.0.0-SNAPSHOT")

src/main/java/net/onelitefeather/stardust/StardustPlugin.java

@@ -1,5 +1,7 @@
 package net.onelitefeather.stardust;
 
+import com.github.retrooper.packetevents.PacketEvents;
+import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.translation.GlobalTranslator;
@@ -42,9 +44,17 @@ public StardustPlugin(JavaPluginLoader loader, PluginDescriptionFile description
     private PaperCommandService commandService;
 
     private ItemSignService<ItemStack, Player> itemSignService;
-    private PacketListener packetListener;
+    private VanishNoPacketListener packetListener;
     private PluginConfiguration pluginConfiguration;
 
+    @Override
+    public void onLoad() {
+        PacketEvents.setAPI(SpigotPacketEventsBuilder.build(this));
+        PacketEvents.getAPI().load();
+        this.packetListener = new VanishNoPacketListener(this);
+        this.packetListener.register();
+    }
+
     @Override
     public void onEnable() {
 
@@ -77,20 +87,18 @@ public void onEnable() {
         this.itemSignService = new BukkitItemSignService(this);
         this.userService = new UserService(this);
 
-        if (getServer().getPluginManager().isPluginEnabled("ProtocolLib")) {
-            packetListener = new PacketListener(this);
-            packetListener.register();
-        }
-
+        PacketEvents.getAPI().init();
         registerListeners();
     }
 
     @Override
     public void onDisable() {
-        if (this.packetListener != null) this.packetListener.unregister();
         this.userService.stopUserTask();
         this.luckPermsService.unsubscribeEvents();
         this.databaseService.close();
+
+        this.packetListener.unregister();
+        PacketEvents.getAPI().terminate();
     }
 
     public PluginConfiguration getPluginConfiguration() {

src/main/java/net/onelitefeather/stardust/listener/PacketListener.java

@@ -0,0 +1,51 @@
+package net.onelitefeather.stardust.listener;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.event.PacketListener;
+import com.github.retrooper.packetevents.event.PacketListenerCommon;
+import com.github.retrooper.packetevents.event.PacketListenerPriority;
+import com.github.retrooper.packetevents.event.PacketSendEvent;
+import com.github.retrooper.packetevents.protocol.packettype.PacketType;
+import com.github.retrooper.packetevents.protocol.player.UserProfile;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPlayerInfo;
+import net.onelitefeather.stardust.StardustPlugin;
+
+import java.util.List;
+
+public class VanishNoPacketListener implements PacketListener {
+
+    private PacketListenerCommon packetListenerCommon;
+    private final StardustPlugin stardustPlugin;
+
+    public VanishNoPacketListener(StardustPlugin stardustPlugin) {
+        this.stardustPlugin = stardustPlugin;
+    }
+
+    @Override
+    public void onPacketSend(PacketSendEvent event) {
+
+        // Identify what kind of packet it is.
+        if (event.getPacketType() != PacketType.Play.Server.PLAYER_INFO) return;
+        WrapperPlayServerPlayerInfo info = new WrapperPlayServerPlayerInfo(event);
+
+        List<WrapperPlayServerPlayerInfo.PlayerData> list = info.getPlayerDataList();
+        list.removeIf(this::isVanished);
+        info.setPlayerDataList(list);
+    }
+
+    public void unregister() {
+        PacketEvents.getAPI().getEventManager().unregisterListener(this.packetListenerCommon);
+    }
+
+    public void register() {
+        this.packetListenerCommon = PacketEvents.getAPI().getEventManager().registerListener(this, PacketListenerPriority.NORMAL);
+    }
+
+    private boolean isVanished(WrapperPlayServerPlayerInfo.PlayerData data) {
+        UserProfile userProfile = data.getUserProfile();
+        if(userProfile == null) return false;
+        var user = this.stardustPlugin.getUserService().getUser(userProfile.getUUID());
+        if (user == null) return false;
+        return this.stardustPlugin.getUserService().getVanishService().isVanished(user.getBase());
+    }
+}

src/main/java/net/onelitefeather/stardust/listener/VanishNoPacketListener.java

@@ -11,6 +11,7 @@
 
 import java.io.File;
 
+@Disabled
 class FlightCommandTest {
 
     private @NotNull ServerMock server;
@@ -60,7 +61,7 @@ void tearDown() {
         MockBukkit.unmock();
     }
 
-    @Disabled
+
     @Test
     void testFlightCommand() {
         // Create a mock player
@@ -82,7 +83,6 @@ void testFlightCommand() {
         Assertions.assertFalse(player.getAllowFlight(), "Player should not be able to fly after toggling back");
     }
 
-    @Disabled
     @Test
     void testGlowCommandWithTarget() {
         // Create a mock player
@@ -102,7 +102,6 @@ void testGlowCommandWithTarget() {
         Assertions.assertFalse(target.getAllowFlight(), "Target player should not be able to fly after toggling back");
     }
 
-    @Disabled
     @Test
     void testFlightCommandWithoutPermission() {
         // Create a mock player without permission

src/test/java/net/onelitefeather/stardust/command/commands/FlightCommandTest.java

@@ -5,15 +5,13 @@
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 import org.mockbukkit.mockbukkit.MockBukkit;
 import org.mockbukkit.mockbukkit.ServerMock;
 
 import java.io.File;
 
+@Disabled
 class GlowCommandTest {
 
     private @NotNull ServerMock server;

src/test/java/net/onelitefeather/stardust/command/commands/GlowCommandTest.java

@@ -5,15 +5,13 @@
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 import org.mockbukkit.mockbukkit.MockBukkit;
 import org.mockbukkit.mockbukkit.ServerMock;
 
 import java.io.File;
 
+@Disabled
 class GodmodeCommandTest {
 
     private @NotNull ServerMock server;

src/test/java/net/onelitefeather/stardust/command/commands/GodmodeCommandTest.java

@@ -5,16 +5,14 @@
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 import org.mockbukkit.mockbukkit.MockBukkit;
 import org.mockbukkit.mockbukkit.ServerMock;
 import org.mockbukkit.mockbukkit.entity.PlayerMock;
 
 import java.io.File;
 
+@Disabled
 class HealCommandTest {
 
 

src/test/java/net/onelitefeather/stardust/command/commands/HealCommandTest.java

@@ -4,16 +4,14 @@
 import net.onelitefeather.stardust.StardustPlugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPluginLoader;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 import org.mockbukkit.mockbukkit.MockBukkit;
 import org.mockbukkit.mockbukkit.ServerMock;
 
 import java.io.File;
 import java.net.InetSocketAddress;
 
+@Disabled
 class IPSameCommandTest {
 
     private ServerMock server;