Merge branch 'dev/3.0.0' into ping-passthrough-dev

Author: TheMiningTeamYT

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,69 @@
+name: Bug Report
+description: Report issues with Velocity not working properly.
+labels: ["type: bug"]
+body:
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: What you expected to work and how.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Actual Behavior
+      description: What actually happens.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to Reproduce
+      description: Information on how we can reproduce this bug on our own, this can be e.g. just an explanation, a video or your Velocity config.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Plugin List
+      description: |
+        All plugins running on your proxy and the backend server you're experiencing this issue on.
+        Use `/velocity plugins` to list plugins on Velocity and `/plugins` to list plugins on your backend server.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Velocity Version
+      description: |
+        The full, unmodified output of running `/velocity info`.
+        *"Latest"* is not a version. We require you to paste the text, not a screenshot.
+        <details>
+        <summary>Example</summary>
+        
+        ```
+        [17:44:10 INFO]: Velocity 3.3.0-SNAPSHOT (git-9d25d309-b400)  
+        [17:44:10 INFO]: Copyright 2018-2023 Velocity Contributors. Velocity is licensed under the terms of the GNU General Public License v3.  
+        [17:44:10 INFO]: PaperMC - GitHub  
+        ```
+        </details>
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional Information
+      description: Anything else you think is helpful.
+    validations:
+      required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        Before submitting this issue, please ensure the following:
+
+        1. You are running the latest version of Velocity from [our downloads page](https://papermc.io/downloads/velocity).
+        2. You searched for and ensured there isn't already an open issue regarding this.
+
+        If you think you have a bug, but are not sure, feel free to ask in the `#velocity-help` channel on our
+        [Discord](https://discord.gg/papermc).

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,10 @@
+blank_issues_enabled: false
+contact_links:
+  - name: PaperMC Discord
+    url: https://discord.gg/papermc
+    about: If you are having issues with the proxy not connecting to servers or have other minor issues, come ask us on our Discord server!
+  - name: Exploit Report
+    url: https://discord.gg/papermc
+    about: |
+      Due to GitHub not currently allowing private issues, exploit reports are currently handled via our Discord.
+      To report an exploit, see the #paper-exploit-report channel.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,48 @@
+name: Feature Request
+description: Request for a feature to be implemented into Velocity.
+labels: ["type: feature"]
+body:
+  - type: textarea
+    attributes:
+      label: Requested Feature
+      description: |
+        Please describe as best as you can what you'd like to be added to Velocity.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Why is this needed?
+      description: |
+        Please describe why do you need this feature.
+        Do you think it could be useful? Is it due to another problem?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Alternative Solutions
+      description: |
+        Are there any alternative solutions to implementing a new feature?
+        What have you tried instead?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional Information
+      description: Anything else you want to add.
+    validations:
+      required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        Before submitting this request, please ensure the following:
+        
+        1. You are running the latest version of Velocity from [our downloads page](https://papermc.io/downloads/velocity).
+        2. You searched for and ensured there isn't already an open issue regarding this.
+        3. The feature you're requesting has to be implemented on Velocity and not on the backend server.
+        
+        If you are unsure whether your problem can already be fixed in another way, feel free to ask in the `#velocity-help` channel on our
+        [Discord](https://discord.gg/papermc).

.github/workflows/gradle.yml

@@ -2,20 +2,22 @@
 # For more information see: https://docs.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
 name: Java CI with Gradle
-
 on: [push, pull_request]
 
 jobs:
-  build-17:
-    runs-on: ubuntu-latest
+  build:
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
-    - uses: gradle/wrapper-validation-action@v2
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+    - name: Set up Gradle
+      uses: gradle/actions/setup-gradle@v4
     - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'temurin'
-        cache: 'gradle'
     - name: Build with Gradle
       run: ./gradlew build

api/build.gradle.kts

@@ -61,13 +61,16 @@ tasks {
         o.encoding = "UTF-8"
         o.source = "17"
 
+        o.use()
         o.links(
             "https://www.slf4j.org/apidocs/",
             "https://guava.dev/releases/${libs.guava.get().version}/api/docs/",
             "https://google.github.io/guice/api-docs/${libs.guice.get().version}/javadoc/",
             "https://docs.oracle.com/en/java/javase/17/docs/api/",
             "https://jd.advntr.dev/api/${libs.adventure.bom.get().version}/",
-            "https://javadoc.io/doc/com.github.ben-manes.caffeine/caffeine"
+            "https://jd.advntr.dev/text-minimessage/${libs.adventure.bom.get().version}/",
+            "https://jd.advntr.dev/key/${libs.adventure.bom.get().version}/",
+            "https://javadoc.io/doc/com.github.ben-manes.caffeine/caffeine/${libs.caffeine.get().version}/",
         )
 
         o.tags(

api/src/ap/resources/META-INF/gradle/incremental.annotation.processors

@@ -0,0 +1 @@
+com.velocitypowered.api.plugin.ap.PluginAnnotationProcessor,isolating

api/src/main/java/com/velocitypowered/api/command/CommandManager.java

@@ -10,6 +10,7 @@
 import com.velocitypowered.api.event.command.CommandExecuteEvent;
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Predicate;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
@@ -43,8 +44,10 @@ public interface CommandManager {
    * @param otherAliases additional aliases
    * @throws IllegalArgumentException if one of the given aliases is already registered, or
    *         the given command does not implement a registrable {@link Command} subinterface
-   * @see Command for a list of registrable {@link Command} subinterfaces
+   * @see Command for a list of registrable Command subinterfaces
+   * @deprecated use {@link #register(CommandMeta, Command)} instead with a plugin specified
    */
+  @Deprecated
   default void register(String alias, Command command, String... otherAliases) {
     register(metaBuilder(alias).aliases(otherAliases).build(), command);
   }
@@ -54,7 +57,9 @@ default void register(String alias, Command command, String... otherAliases) {
    *
    * @param command the command to register
    * @throws IllegalArgumentException if the node alias is already registered
+   * @deprecated use {@link #register(CommandMeta, Command)} instead with a plugin specified
    */
+  @Deprecated
   void register(BrigadierCommand command);
 
   /**
@@ -64,7 +69,7 @@ default void register(String alias, Command command, String... otherAliases) {
    * @param command the command to register
    * @throws IllegalArgumentException if one of the given aliases is already registered, or
    *         the given command does not implement a registrable {@link Command} subinterface
-   * @see Command for a list of registrable {@link Command} subinterfaces
+   * @see Command for a list of registrable Command subinterfaces
    */
   void register(CommandMeta meta, Command command);
 
@@ -126,4 +131,15 @@ default void register(String alias, Command command, String... otherAliases) {
    * @return true if the alias is registered; false otherwise
    */
   boolean hasCommand(String alias);
+
+  /**
+   * Returns whether the given alias is registered on this manager
+   * and can be used by the given {@link CommandSource}.
+   * See {@link com.mojang.brigadier.builder.ArgumentBuilder#requires(Predicate)}
+   *
+   * @param alias the command alias to check
+   * @param source the command source
+   * @return true if the alias is registered and usable; false otherwise
+   */
+  boolean hasCommand(String alias, CommandSource source);
 }

api/src/main/java/com/velocitypowered/api/command/CommandSource.java

@@ -27,7 +27,7 @@ public interface CommandSource extends Audience, PermissionSubject {
    *      for more information on the format.
    **/
   default void sendRichMessage(final @NotNull String message) {
-    this.sendMessage(MiniMessage.miniMessage().deserialize(message));
+    this.sendMessage(MiniMessage.miniMessage().deserialize(message, this));
   }
 
   /**
@@ -43,7 +43,7 @@ default void sendRichMessage(
           final @NotNull String message,
           final @NotNull TagResolver @NotNull... resolvers
   ) {
-    this.sendMessage(MiniMessage.miniMessage().deserialize(message, resolvers));
+    this.sendMessage(MiniMessage.miniMessage().deserialize(message, this, resolvers));
   }
 
   /**

api/src/main/java/com/velocitypowered/api/event/EventManager.java

@@ -45,10 +45,28 @@ default <E> void register(Object plugin, Class<E> eventClass, EventHandler<E> ha
    * @param postOrder the order in which events should be posted to the handler
    * @param handler the handler to register
    * @param <E> the event type to handle
+   * @deprecated use {@link #register(Object, Class, short, EventHandler)} instead
    */
+  @Deprecated
   <E> void register(Object plugin, Class<E> eventClass, PostOrder postOrder,
       EventHandler<E> handler);
 
+  /**
+   * Requests that the specified {@code handler} listen for events and associate it with the {@code
+   * plugin}.
+   *
+   * <p>Note that this method will register a non-asynchronous listener by default. If you want to
+   * use an asynchronous event handler, return {@link EventTask#async(Runnable)} from the handler.</p>
+   *
+   * @param plugin the plugin to associate with the handler
+   * @param eventClass the class for the event handler to register
+   * @param postOrder the relative order in which events should be posted to the handler
+   * @param handler the handler to register
+   * @param <E> the event type to handle
+   */
+  <E> void register(Object plugin, Class<E> eventClass, short postOrder,
+      EventHandler<E> handler);
+
   /**
    * Fires the specified event to the event bus asynchronously. This allows Velocity to continue
    * servicing connections while a plugin handles a potentially long-running operation such as a

api/src/main/java/com/velocitypowered/api/event/PostOrder.java

@@ -12,6 +12,14 @@
  */
 public enum PostOrder {
 
-  FIRST, EARLY, NORMAL, LATE, LAST
+  FIRST, EARLY, NORMAL, LATE, LAST,
+
+  /**
+   * Previously used to specify that {@link Subscribe#priority()} should be used.
+   *
+   * @deprecated No longer required, you only need to specify {@link Subscribe#priority()}.
+   */
+  @Deprecated
+  CUSTOM
 
 }