Merge branch 'dev/3.0.0' into mc-update/1.21

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;
 
 /**
@@ -126,4 +127,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/event/player/CookieReceiveEvent.java

@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2024 Velocity Contributors
+ *
+ * The Velocity API is licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in the api top-level directory.
+ */
+
+package com.velocitypowered.api.event.player;
+
+import com.google.common.base.Preconditions;
+import com.velocitypowered.api.event.ResultedEvent;
+import com.velocitypowered.api.event.annotation.AwaitingEvent;
+import com.velocitypowered.api.proxy.Player;
+import java.util.Arrays;
+import net.kyori.adventure.key.Key;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * This event is fired when a cookie response from a client is received by the proxy.
+ * This usually happens after either a proxy plugin or a backend server requested a cookie.
+ * Velocity will wait on this event to finish firing before discarding the
+ * received cookie (if handled) or forwarding it to the backend server.
+ */
+@AwaitingEvent
+public final class CookieReceiveEvent implements ResultedEvent<CookieReceiveEvent.ForwardResult> {
+
+  private final Player player;
+  private final Key originalKey;
+  private final byte @Nullable [] originalData;
+  private ForwardResult result;
+
+  /**
+   * Creates a new instance.
+   *
+   * @param player the player who sent the cookie response
+   * @param key the identifier of the cookie
+   * @param data the data of the cookie
+   */
+  public CookieReceiveEvent(final Player player, final Key key, final byte @Nullable [] data) {
+    this.player = Preconditions.checkNotNull(player, "player");
+    this.originalKey = Preconditions.checkNotNull(key, "key");
+    this.originalData = data;
+    this.result = ForwardResult.forward();
+  }
+
+  @Override
+  public ForwardResult getResult() {
+    return result;
+  }
+
+  @Override
+  public void setResult(ForwardResult result) {
+    this.result = Preconditions.checkNotNull(result, "result");
+  }
+
+  public Player getPlayer() {
+    return player;
+  }
+
+  public Key getOriginalKey() {
+    return originalKey;
+  }
+
+  public byte @Nullable [] getOriginalData() {
+    return originalData;
+  }
+
+  @Override
+  public String toString() {
+    return "CookieReceiveEvent{"
+        + ", originalKey=" + originalKey
+        + ", originalData=" + Arrays.toString(originalData)
+        + ", result=" + result
+        + '}';
+  }
+
+  /**
+   * A result determining whether or not to forward the cookie response on.
+   */
+  public static final class ForwardResult implements ResultedEvent.Result {
+
+    private static final ForwardResult ALLOWED = new ForwardResult(true, null, null);
+    private static final ForwardResult DENIED = new ForwardResult(false, null, null);
+
+    private final boolean status;
+    private final Key key;
+    private final byte[] data;
+
+    private ForwardResult(final boolean status, final Key key, final byte[] data) {
+      this.status = status;
+      this.key = key;
+      this.data = data;
+    }
+
+    @Override
+    public boolean isAllowed() {
+      return status;
+    }
+
+    public Key getKey() {
+      return key;
+    }
+
+    public byte[] getData() {
+      return data;
+    }
+
+    @Override
+    public String toString() {
+      return status ? "forward to backend server" : "handled by proxy";
+    }
+
+    /**
+     * Allows the cookie response to be forwarded to the backend server.
+     *
+     * @return the forward result
+     */
+    public static ForwardResult forward() {
+      return ALLOWED;
+    }
+
+    /**
+     * Prevents the cookie response from being forwarded to the backend server, the cookie response
+     * is handled by the proxy.
+     *
+     * @return the handled result
+     */
+    public static ForwardResult handled() {
+      return DENIED;
+    }
+
+    /**
+     * Allows the cookie response to be forwarded to the backend server, but silently replaces the
+     * identifier of the cookie with another.
+     *
+     * @param key the identifier to use instead
+     * @return a result with a new key
+     */
+    public static ForwardResult key(final Key key) {
+      Preconditions.checkNotNull(key, "key");
+      return new ForwardResult(true, key, null);
+    }
+
+    /**
+     * Allows the cookie response to be forwarded to the backend server, but silently replaces the
+     * data of the cookie with another.
+     *
+     * @param data the data of the cookie to use instead
+     * @return a result with new data
+     */
+    public static ForwardResult data(final byte[] data) {
+      return new ForwardResult(true, null, data);
+    }
+  }
+}

api/src/main/java/com/velocitypowered/api/event/player/CookieRequestEvent.java

@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2024 Velocity Contributors
+ *
+ * The Velocity API is licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in the api top-level directory.
+ */
+
+package com.velocitypowered.api.event.player;
+
+import com.google.common.base.Preconditions;
+import com.velocitypowered.api.event.ResultedEvent;
+import com.velocitypowered.api.event.annotation.AwaitingEvent;
+import com.velocitypowered.api.proxy.Player;
+import net.kyori.adventure.key.Key;
+
+/**
+ * This event is fired when a cookie from a client is requested either by a proxy plugin or
+ * by a backend server. Velocity will wait on this event to finish firing before discarding the
+ * cookie request (if handled) or forwarding it to the client.
+ */
+@AwaitingEvent
+public final class CookieRequestEvent implements ResultedEvent<CookieRequestEvent.ForwardResult> {
+
+  private final Player player;
+  private final Key originalKey;
+  private ForwardResult result;
+
+  /**
+   * Creates a new instance.
+   *
+   * @param player the player from whom the cookies is requested
+   * @param key the identifier of the cookie
+   */
+  public CookieRequestEvent(final Player player, final Key key) {
+    this.player = Preconditions.checkNotNull(player, "player");
+    this.originalKey = Preconditions.checkNotNull(key, "key");
+    this.result = ForwardResult.forward();
+  }
+
+  @Override
+  public ForwardResult getResult() {
+    return result;
+  }
+
+  @Override
+  public void setResult(ForwardResult result) {
+    this.result = Preconditions.checkNotNull(result, "result");
+  }
+
+  public Player getPlayer() {
+    return player;
+  }
+
+  public Key getOriginalKey() {
+    return originalKey;
+  }
+
+  @Override
+  public String toString() {
+    return "CookieRequestEvent{"
+        + ", originalKey=" + originalKey
+        + ", result=" + result
+        + '}';
+  }
+
+  /**
+   * A result determining whether or not to forward the cookie request on.
+   */
+  public static final class ForwardResult implements Result {
+
+    private static final ForwardResult ALLOWED = new ForwardResult(true, null);
+    private static final ForwardResult DENIED = new ForwardResult(false, null);
+
+    private final boolean status;
+    private final Key key;
+
+    private ForwardResult(final boolean status, final Key key) {
+      this.status = status;
+      this.key = key;
+    }
+
+    @Override
+    public boolean isAllowed() {
+      return status;
+    }
+
+    public Key getKey() {
+      return key;
+    }
+
+    @Override
+    public String toString() {
+      return status ? "forward to client" : "handled by proxy";
+    }
+
+    /**
+     * Allows the cookie request to be forwarded to the client.
+     *
+     * @return the forward result
+     */
+    public static ForwardResult forward() {
+      return ALLOWED;
+    }
+
+    /**
+     * Prevents the cookie request from being forwarded to the client, the cookie request is
+     * handled by the proxy.
+     *
+     * @return the handled result
+     */
+    public static ForwardResult handled() {
+      return DENIED;
+    }
+
+    /**
+     * Allows the cookie request to be forwarded to the client, but silently replaces the
+     * identifier of the cookie with another.
+     *
+     * @param key the identifier to use instead
+     * @return a result with a new key
+     */
+    public static ForwardResult key(final Key key) {
+      Preconditions.checkNotNull(key, "key");
+      return new ForwardResult(true, key);
+    }
+  }
+}