Merge remote-tracking branch 'upstream/master' into core-repackage

# Conflicts:
#	bungee/src/main/java/org/geysermc/floodgate/inject/bungee/BungeeInjector.java
#	bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java
#	bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageUtils.java
#	core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/FormChannel.java
#	core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/PacketChannel.java
#	core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/TransferChannel.java
#	core/src/main/java/org/geysermc/floodgate/core/util/Metrics.java
#	spigot/src/main/java/org/geysermc/floodgate/SpigotPlugin.java
#	spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataAddon.java
#	spigot/src/main/java/org/geysermc/floodgate/listener/PaperProfileListener.java
#	spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListener.java
#	spigot/src/main/java/org/geysermc/floodgate/module/PaperListenerModule.java
#	spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotPluginMessageRegistration.java
#	spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java
#	spigot/src/main/java/org/geysermc/floodgate/util/WhitelistUtils.java
#	velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListener.java
#	velocity/src/main/java/org/geysermc/floodgate/pluginmessage/VelocityPluginMessageUtils.java

Author: onebeastchris

.github/workflows/build.yml

@@ -1,6 +1,14 @@
 name: Build
 
-on: [push]
+on:
+  workflow_dispatch:
+  push:
+    paths-ignore:
+      - 'LICENSE'
+      - 'README.md'
+      - '.gitignore'
+      - '.idea/copyright/*.xml'
+      - '.github/workflows/pullrequest.yml'
 
 jobs:
   build:

README.md

@@ -1,14 +1,14 @@
 # Floodgate
 
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
-[![Build Status](https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/badge/icon)](https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/)
+[![Build Status](https://github.com/GeyserMC/Floodgate/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/GeyserMC/Floodgate/actions/workflows/build.yml?query=branch%3Amaster)
 [![Discord](https://img.shields.io/discord/613163671870242838.svg?color=%237289da&label=discord)](http://discord.geysermc.org/)
-[![HitCount](https://hits.dwyl.com/GeyserMC/Floodgate.svg)](http://hits.dwyl.com/GeyserMC/Floodgate)
+[![Hits](https://hitcount.dev/p/GeyserMC/Floodgate.svg)](https://hitcount.dev/p/GeyserMC/Floodgate)
 
-[Download](https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/)
+[Download](https://geysermc.org/download/?project=floodgate)
 
 Hybrid mode plugin to allow for connections from [Geyser](https://github.com/GeyserMC/Geyser) to join online mode servers.
 
 Geyser is an open collaboration project by [CubeCraft Games](https://cubecraft.net).
 
-See the [Floodgate](https://wiki.geysermc.org/floodgate/) section in the GeyserMC Wiki for more info about what Floodgate is, how you setup Floodgate and known issues/caveats. Additionally, it includes a more in-depth look into how Floodgate works and the Floodgate API.
+See the [Floodgate](https://geysermc.org/wiki/floodgate/) section in the GeyserMC Wiki for more info about what Floodgate is, how you setup Floodgate and known issues/caveats. Additionally, it includes a more in-depth look into how Floodgate works and the Floodgate API.

api/src/main/java/org/geysermc/floodgate/api/FloodgateApi.java

@@ -97,6 +97,8 @@ static FloodgateApi getInstance() {
 
     boolean sendForm(UUID uuid, FormBuilder<?, ?, ?> formBuilder);
 
+    boolean closeForm(UUID uuid);
+
     /**
      * @deprecated since Cumulus 1.1 and will be removed when Cumulus 2.0 releases. Please use the
      * new form classes instead.

api/src/main/java/org/geysermc/floodgate/api/InstanceHolder.java

@@ -38,9 +38,9 @@ public final class InstanceHolder {
     @Getter private static PlayerLink playerLink;
     @Getter private static FloodgateEventBus eventBus;
 
-    @Getter private static PlatformInjector injector;
-    @Getter private static PacketHandlers packetHandlers;
-    @Getter private static HandshakeHandlers handshakeHandlers;
+    private static PlatformInjector injector;
+    private static PacketHandlers packetHandlers;
+    private static HandshakeHandlers handshakeHandlers;
     private static UUID storedKey;
 
     public static boolean set(
@@ -68,4 +68,31 @@ public static boolean set(
         InstanceHolder.handshakeHandlers = handshakeHandlers;
         return true;
     }
+
+    /**
+     * @deprecated Injector addons will be removed with the launch of Floodgate 3.0. Please look at
+     * <a href="https://github.com/GeyserMC/Floodgate/issues/536">#536</a> for additional context.
+     */
+    @Deprecated
+    public static PlatformInjector getInjector() {
+        return InstanceHolder.injector;
+    }
+
+    /**
+     * @deprecated Packet handlers will be removed with the launch of Floodgate 3.0. Please look at
+     * <a href="https://github.com/GeyserMC/Floodgate/issues/536">#536</a> for additional context.
+     */
+    @Deprecated
+    public static PacketHandlers getPacketHandlers() {
+        return InstanceHolder.packetHandlers;
+    }
+
+    /**
+     * @deprecated Handshake handlers will be removed with the launch of Floodgate 3.0. Please look at
+     * <a href="https://github.com/GeyserMC/Floodgate/issues/536">#536</a> for additional context.
+     */
+    @Deprecated
+    public static HandshakeHandlers getHandshakeHandlers() {
+        return InstanceHolder.handshakeHandlers;
+    }
 }

api/src/main/java/org/geysermc/floodgate/api/handshake/HandshakeData.java

@@ -31,11 +31,8 @@
 import org.geysermc.floodgate.util.LinkedPlayer;
 
 /**
- * For advanced users only! You shouldn't play with this unless you know what you're doing.<br>
- * <br>
- * This class allows you change specific things of a Bedrock player before it is applied to the
- * server. Note that at the time I'm writing this that the HandshakeData is created after requesting
- * the player link. So the link is present here, if applicable.
+ * @deprecated Handshake handlers will be removed with the launch of Floodgate 3.0. Please look at
+ * <a href="https://github.com/GeyserMC/Floodgate/issues/536">#536</a> for additional context.
  */
 @Deprecated
 public interface HandshakeData {

api/src/main/java/org/geysermc/floodgate/api/handshake/HandshakeHandler.java

@@ -26,13 +26,8 @@
 package org.geysermc.floodgate.api.handshake;
 
 /**
- * This class allows you to change and/or get specific data of the Bedrock client before Floodgate
- * does something with this data. This means that Floodgate decrypts the data, then calls the
- * handshake handlers and then applies the data to the connection.<br>
- * <br>
- * /!\ Note that this class will be called for both Java and Bedrock connections, but {@link
- * HandshakeData#isFloodgatePlayer()} will be false and Floodgate related methods will return null
- * for Java players
+ * @deprecated Handshake handlers will be removed with the launch of Floodgate 3.0. Please look at
+ * <a href="https://github.com/GeyserMC/Floodgate/issues/536">#536</a> for additional context.
  */
 @Deprecated
 @FunctionalInterface

api/src/main/java/org/geysermc/floodgate/api/handshake/HandshakeHandlers.java

@@ -26,10 +26,8 @@
 package org.geysermc.floodgate.api.handshake;
 
 /**
- * @deprecated This system has been deprecated and will not be available in the new API that will be
- * introduced when Geyser will include Floodgate (and thus will have some common base API).
- * <br>
- * It might be replaced with an event (probably internal), but that isn't certain yet.
+ * @deprecated Handshake handlers will be removed with the launch of Floodgate 3.0. Please look at
+ * <a href="https://github.com/GeyserMC/Floodgate/issues/536">#536</a> for additional context.
  */
 @Deprecated
 public interface HandshakeHandlers {

api/src/main/java/org/geysermc/floodgate/api/inject/InjectorAddon.java

@@ -27,6 +27,11 @@
 
 import io.netty.channel.Channel;
 
+/**
+ * @deprecated Injector addons will be removed with the launch of Floodgate 3.0. Please look at
+ * <a href="https://github.com/GeyserMC/Floodgate/issues/536">#536</a> for additional context.
+ */
+@Deprecated
 public interface InjectorAddon {
     /**
      * Called when injecting a specific channel (every client that is connected to the server has

api/src/main/java/org/geysermc/floodgate/api/inject/PlatformInjector.java

@@ -26,12 +26,10 @@
 package org.geysermc.floodgate.api.inject;
 
 /**
- * The global interface of all the Platform Injectors. The injector can be used for various things.
- * It is used internally for getting Floodgate data out of the handshake packet and for debug mode,
- * but there is also an option to add your own addons. Note that every Floodgate platform that
- * supports netty should implement this, but the platform implementation isn't required to implement
- * this.
+ * @deprecated Injector addons will be removed with the launch of Floodgate 3.0. Please look at
+ * <a href="https://github.com/GeyserMC/Floodgate/issues/536">#536</a> for additional context.
  */
+@Deprecated
 public interface PlatformInjector {
     /**
      * Injects the server connection. This will allow various addons (like getting the Floodgate

api/src/main/java/org/geysermc/floodgate/api/packet/PacketHandler.java

@@ -28,8 +28,10 @@
 import io.netty.channel.ChannelHandlerContext;
 
 /**
- * For advanced users only! You shouldn't play with this unless you know what you're doing.
+ * @deprecated Packet handlers will be removed with the launch of Floodgate 3.0. Please look at
+ * <a href="https://github.com/GeyserMC/Floodgate/issues/536">#536</a> for additional context.
  */
+@Deprecated
 public interface PacketHandler {
     /**
      * Called when a registered packet has been seen.