feat(spigot): add experimental packetevents support

Author: diogotcorreia

core/loader/src/main/java/com/rexcantor64/triton/loader/utils/LoaderBootstrap.java

@@ -5,8 +5,13 @@
  */
 public interface LoaderBootstrap {
 
-    default void onEnable() {}
+    default void onLoad() {
+    }
 
-    default void onDisable() {}
+    default void onEnable() {
+    }
+
+    default void onDisable() {
+    }
 
 }

core/src/main/java/com/rexcantor64/triton/Triton.java

@@ -95,7 +95,7 @@ public static boolean isSpigot() {
         return instance;
     }
 
-    protected void onEnable() {
+    public void onLoad() {
         instance = this;
         TritonAPIUtils.register(instance);
 
@@ -104,15 +104,8 @@ protected void onEnable() {
         logger = loader.getTritonLogger();
 
         config = new MainConfig(this);
-        languageManager = new LanguageManager(this);
-        messagesConfig = new MessagesConfig();
-        translationManager = new TranslationManager(this);
-
-        LanguageMigration.migrate();
-
-        reload();
-
-        twinManager = new TwinManager(this);
+        configYAML = loadYAML("config", getConfigFileName());
+        config.setup();
 
         if (config.isUsePacketEvents()) {
             val dependencyManager = Triton.get().getLoader().getDependencyManager();
@@ -125,14 +118,27 @@ protected void onEnable() {
         }
 
         if (this.packetEventsManager != null) {
-            // TODO: when spigot is supported, onLoad needs to be called earlier
             this.packetEventsManager.onLoad();
+        }
+    }
+
+    public void onEnable() {
+        languageManager = new LanguageManager(this);
+        messagesConfig = new MessagesConfig();
+        translationManager = new TranslationManager(this);
+
+        LanguageMigration.migrate();
+
+        reload();
+
+        twinManager = new TwinManager(this);
+
+        if (this.packetEventsManager != null) {
             this.packetEventsManager.onEnable();
         }
     }
 
-    protected void onDisable() {
-        // TODO: this should be called at some point
+    public void onDisable() {
         if (this.packetEventsManager != null) {
             this.packetEventsManager.onDisable();
         }

core/src/main/java/com/rexcantor64/triton/dependencies/Dependency.java

@@ -136,6 +136,14 @@ public enum Dependency {
             relocate("com{}github{}retrooper{}packetevents", "packetevents{}api"),
             relocate("io{}github{}retrooper{}packetevents", "packetevents{}impl")
     ),
+    PACKET_EVENTS_SPIGOT(
+            "com{}github{}retrooper",
+            "packetevents-spigot",
+            "2.10.0",
+            "DFb6juVlnwbbNIvGYUXDIRfjXFWQ+isuU/iVuwn56Yw=",
+            relocate("com{}github{}retrooper{}packetevents", "packetevents{}api"),
+            relocate("io{}github{}retrooper{}packetevents", "packetevents{}impl")
+    ),
     PACKET_EVENTS_VELOCITY(
             "com{}github{}retrooper",
             "packetevents-velocity",

core/src/main/java/com/rexcantor64/triton/packetinterceptor/PacketEventsManager.java

@@ -31,7 +31,6 @@ public void onLoad() {
 
             initPacketEventsPlatform();
         }
-        this.packetEventsListener.setupHandlers();
         PacketEvents.getAPI().load();
         if (isPacketEventsVendored) {
             // Don't check for PacketEvents updates if it's vendored (the user can't do anything)
@@ -40,10 +39,11 @@ public void onLoad() {
             // We can't do this when not vendored, since it might affect other plugins.
             PacketEvents.getAPI().getSettings().reEncodeByDefault(false);
         }
-        PacketEvents.getAPI().getEventManager().registerListener(this.packetEventsListener, PacketListenerPriority.HIGHEST);
     }
 
     public void onEnable() {
+        this.packetEventsListener.setupHandlers();
+        PacketEvents.getAPI().getEventManager().registerListener(this.packetEventsListener, PacketListenerPriority.HIGHEST);
         PacketEvents.getAPI().init();
     }
 

triton-bungeecord/loader/src/main/java/com/rexcantor64/triton/loader/BungeeLoader.java

@@ -24,6 +24,11 @@ public BungeeLoader() {
                 .loadPlugin();
     }
 
+    @Override
+    public void onLoad() {
+        this.plugin.onLoad();
+    }
+
     @Override
     public void onEnable() {
         this.plugin.onEnable();

triton-bungeecord/src/main/java/com/rexcantor64/triton/bungeecord/plugin/BungeePlugin.java

@@ -32,20 +32,27 @@ public class BungeePlugin implements PluginLoader, LoaderBootstrap {
     private DependencyManager dependencyManager;
 
     @Override
-    public void onEnable() {
+    public void onLoad() {
         this.logger = new JavaLogger(this.getPlugin().getLogger());
         this.dependencyManager = new DependencyManager(new BungeeLibraryManager(this.getPlugin()), loaderFlags);
 
         this.dependencyManager.init();
+
+        new BungeeTriton(this).onLoad();
+    }
+
+    @Override
+    public void onEnable() {
         this.dependencyManager.loadDependency(Dependency.ADVENTURE_TEXT_SERIALIZER_BUNGEECORD);
 
-        new BungeeTriton(this).onEnable();
+        Triton.get().onEnable();
     }
 
     @Override
     public void onDisable() {
         // Set the formatter back to default
         try {
+            Triton.get().onDisable();
             if (Triton.get().getConfig().isTerminal()) {
                 BungeeTerminalManager.uninjectTerminalFormatter();
             }

triton-spigot/build.gradle

@@ -24,6 +24,8 @@ dependencies {
     compileOnly 'com.comphenix.protocol:ProtocolLib:5.4.0-SNAPSHOT'
     compileOnly 'me.clip:placeholderapi:2.11.6'
 
+    compileOnly 'com.github.retrooper:packetevents-spigot:2.10.0'
+
     // Libraries available on Spigot
     compileOnly 'org.fusesource.jansi:jansi:2.4.0' // Used for terminal translation
 

triton-spigot/loader/src/main/java/com/rexcantor64/triton/loader/SpigotLoader.java

@@ -28,6 +28,7 @@ public SpigotLoader() {
                 builder.flag(LoaderFlag.RELOCATE_ADVENTURE);
             }
         }
+        builder.flag(LoaderFlag.VENDOR_PACKET_EVENTS);
 
         this.plugin = builder
                 .build()
@@ -75,6 +76,11 @@ private boolean shouldRelocateAdventure() {
         }
     }
 
+    @Override
+    public void onLoad() {
+        this.plugin.onLoad();
+    }
+
     @Override
     public void onEnable() {
         this.plugin.onEnable();

triton-spigot/src/main/java/com/rexcantor64/triton/spigot/SpigotTriton.java

@@ -16,6 +16,7 @@
 import com.rexcantor64.triton.spigot.packetinterceptor.HandlerFunction;
 import com.rexcantor64.triton.spigot.packetinterceptor.MotdPacketHandler;
 import com.rexcantor64.triton.spigot.packetinterceptor.ProtocolLibListener;
+import com.rexcantor64.triton.spigot.packetinterceptor.SpigotPacketEventsManager;
 import com.rexcantor64.triton.spigot.placeholderapi.TritonPlaceholderHook;
 import com.rexcantor64.triton.spigot.player.SpigotLanguagePlayer;
 import com.rexcantor64.triton.spigot.plugin.SpigotPlugin;
@@ -98,7 +99,9 @@ public void onEnable() {
         Bukkit.getPluginManager().registerEvents(guiManager = new GuiManager(), getJavaPlugin());
         Bukkit.getPluginManager().registerEvents(new BukkitListener(), getJavaPlugin());
 
-        registerProtocolLibListeners();
+        if (!this.getConfig().isUsePacketEvents()) {
+            registerProtocolLibListeners();
+        }
 
         if (getConfig().isBungeecord()) {
             if (!isSpigotProxyMode() && !isPaperProxyMode()) {
@@ -170,7 +173,7 @@ public void reload() {
 
     @Override
     protected void initPacketEventsManager() {
-        // TODO: triton does not support packetevents on this platform yet
+        this.packetEventsManager = new SpigotPacketEventsManager();
     }
 
     @Override

triton-spigot/src/main/java/com/rexcantor64/triton/spigot/packetinterceptor/SpigotPacketEventsManager.java

@@ -0,0 +1,22 @@
+package com.rexcantor64.triton.spigot.packetinterceptor;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.rexcantor64.triton.dependencies.Dependency;
+import com.rexcantor64.triton.packetinterceptor.PacketEventsManager;
+import com.rexcantor64.triton.spigot.SpigotTriton;
+import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
+import lombok.NonNull;
+import lombok.val;
+
+public class SpigotPacketEventsManager extends PacketEventsManager {
+    @Override
+    protected void initPacketEventsPlatform() {
+        val loader = SpigotTriton.asSpigot().getLoader();
+        PacketEvents.setAPI(SpigotPacketEventsBuilder.build(loader.getPlugin()));
+    }
+
+    @Override
+    protected @NonNull Dependency getPlatformPacketEventsDependency() {
+        return Dependency.PACKET_EVENTS_SPIGOT;
+    }
+}