diff --git a/patches/api/Add-EntityZapEvent.patch b/patches/api/Add-EntityZapEvent.patch
index f9ade6900a..f6a5afa2e5 100644
--- a/patches/api/Add-EntityZapEvent.patch
+++ b/patches/api/Add-EntityZapEvent.patch
@@ -12,12 +12,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
 +package com.destroystokyo.paper.event.entity;
 +
-+import org.apache.commons.lang.Validate;
++import com.google.common.base.Preconditions;
 +import org.bukkit.entity.Entity;
 +import org.bukkit.entity.LightningStrike;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
-+import org.bukkit.event.entity.EntityEvent;
 +import org.bukkit.event.entity.EntityTransformEvent;
 +
 +import java.util.Collections;
@@ -33,8 +32,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +    public EntityZapEvent(@NotNull final Entity entity, @NotNull final LightningStrike bolt, @NotNull final Entity replacementEntity) {
 +        super(entity, Collections.singletonList(replacementEntity), TransformReason.LIGHTNING);
-+        Validate.notNull(bolt);
-+        Validate.notNull(replacementEntity);
++        Preconditions.checkNotNull(bolt);
++        Preconditions.checkNotNull(replacementEntity);
 +        this.bolt = bolt;
 +    }
 +
diff --git a/patches/api/Add-exception-reporting-event.patch b/patches/api/Add-exception-reporting-event.patch
index 13c271dbf6..c384bb42c9 100644
--- a/patches/api/Add-exception-reporting-event.patch
+++ b/patches/api/Add-exception-reporting-event.patch
@@ -286,11 +286,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
 +package com.destroystokyo.paper.exception;
 +
-+import com.google.common.base.Preconditions;
-+import org.apache.commons.lang.Validate;
 +import org.bukkit.plugin.Plugin;
 +
-+import static com.google.common.base.Preconditions.*;
++import static com.google.common.base.Preconditions.checkNotNull;
 +
 +/**
 + * Wrapper exception for all cases to which a plugin can be immediately blamed for
diff --git a/patches/api/Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/api/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index ea17617eed..b0b6eae3c8 100644
--- a/patches/api/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/api/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -13,10 +13,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
 +package com.destroystokyo.paper.event.player;
 +
++import com.google.common.base.Preconditions;
 +import net.kyori.adventure.text.Component;
 +import net.kyori.adventure.text.format.NamedTextColor;
 +import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-+import org.apache.commons.lang.Validate;
++import org.apache.commons.lang3.Validate;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
@@ -273,7 +274,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    @Deprecated
 +    public void setFailMessage(@NotNull String failMessage) {
-+        Validate.notEmpty(failMessage, "fail message cannot be null or empty");
++        Preconditions.checkArgument(failMessage != null && failMessage.isEmpty(), "fail message cannot be null or empty");
 +        this.failMessage(LegacyComponentSerializer.legacySection().deserialize(failMessage));
 +    }
 +
diff --git a/patches/api/Timings-v2.patch b/patches/api/Timings-v2.patch
index ec8332b3f2..55a514b5ea 100644
--- a/patches/api/Timings-v2.patch
+++ b/patches/api/Timings-v2.patch
@@ -1289,7 +1289,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import com.google.common.base.Preconditions;
 +import com.google.common.collect.EvictingQueue;
 +import com.google.common.collect.Lists;
-+import org.apache.commons.lang.Validate;
 +import org.bukkit.Bukkit;
 +import org.bukkit.command.CommandSender;
 +import org.bukkit.plugin.Plugin;
@@ -1523,7 +1522,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param sender The listener to send responses too.
 +     */
 +    public static void generateReport(@NotNull TimingsReportListener sender) {
-+        Validate.notNull(sender);
++        Preconditions.checkNotNull(sender);
 +        requestingReport.add(sender);
 +    }
 +
@@ -1588,9 +1587,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + */
 +package co.aikar.timings;
 +
++import com.google.common.base.Preconditions;
 +import com.google.common.collect.ImmutableList;
 +import net.kyori.adventure.text.format.NamedTextColor;
-+import org.apache.commons.lang.Validate;
 +import org.bukkit.command.CommandSender;
 +import org.bukkit.command.defaults.BukkitCommand;
 +import org.bukkit.util.StringUtil;
@@ -1672,9 +1671,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    @NotNull
 +    @Override
 +    public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) {
-+        Validate.notNull(sender, "Sender cannot be null");
-+        Validate.notNull(args, "Arguments cannot be null");
-+        Validate.notNull(alias, "Alias cannot be null");
++        Preconditions.checkNotNull(sender, "Sender cannot be null");
++        Preconditions.checkNotNull(args, "Arguments cannot be null");
++        Preconditions.checkNotNull(alias, "Alias cannot be null");
 +
 +        if (args.length == 1) {
 +            return StringUtil.copyPartialMatches(args[0], TIMINGS_SUBCOMMANDS,
@@ -1885,19 +1884,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
 +package co.aikar.timings;
 +
++import com.google.common.base.Preconditions;
 +import com.google.common.collect.Lists;
-+import org.apache.commons.lang.Validate;
 +import org.bukkit.Bukkit;
 +import org.bukkit.command.CommandSender;
 +import org.bukkit.command.ConsoleCommandSender;
 +import org.bukkit.command.MessageCommandSender;
 +import org.bukkit.command.RemoteConsoleCommandSender;
-+
-+import java.util.List;
-+
 +import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
 +
++import java.util.List;
++
 +@SuppressWarnings("WeakerAccess")
 +public class TimingsReportListener implements net.kyori.adventure.audience.ForwardingAudience, MessageCommandSender {
 +    private final List<CommandSender> senders;
@@ -1914,8 +1912,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        this(senders, null);
 +    }
 +    public TimingsReportListener(@NotNull List<CommandSender> senders, @Nullable Runnable onDone) {
-+        Validate.notNull(senders);
-+        Validate.notEmpty(senders);
++        Preconditions.checkNotNull(senders);
++        Preconditions.checkArgument(!senders.isEmpty(), "senders is empty");
 +
 +        this.senders = Lists.newArrayList(senders);
 +        this.onDone = onDone;
@@ -2947,7 +2945,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
 +package org.bukkit.command;
 +
-+import org.apache.commons.lang.NotImplementedException;
 +import org.bukkit.Bukkit;
 +import org.bukkit.Server;
 +import org.bukkit.permissions.Permission;
@@ -2994,90 +2991,90 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper start
 +    @Override
 +    default net.kyori.adventure.text.@org.jetbrains.annotations.NotNull Component name() {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +    // Paper end
 +
 +    @NotNull
 +    @Override
 +    default String getName() {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +    @Override
 +    default boolean isOp() {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +    @Override
 +    default void setOp(boolean value) {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +    @Override
 +    default boolean isPermissionSet(@NotNull String name) {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +    @Override
 +    default boolean isPermissionSet(@NotNull Permission perm) {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +    @Override
 +    default boolean hasPermission(@NotNull String name) {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +    @Override
 +    default boolean hasPermission(@NotNull Permission perm) {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +    @NotNull
 +    @Override
 +    default PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +    @NotNull
 +    @Override
 +    default PermissionAttachment addAttachment(@NotNull Plugin plugin) {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +    @NotNull
 +    @Override
 +    default PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +    @NotNull
 +    @Override
 +    default PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +    @Override
 +    default void removeAttachment(@NotNull PermissionAttachment attachment) {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +    @Override
 +    default void recalculatePermissions() {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +    @NotNull
 +    @Override
 +    default Set<PermissionAttachmentInfo> getEffectivePermissions() {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +    @NotNull
 +    @Override
 +    default Spigot spigot() {
-+        throw new NotImplementedException();
++        throw new UnsupportedOperationException();
 +    }
 +
 +}