diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index ee701aa325..49b0841e1c 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -3,25 +3,425 @@ From: Riley Park <rileysebastianpark@gmail.com>
 Date: Fri, 29 Jan 2021 17:54:03 +0100
 Subject: [PATCH] Adventure
 
+== AT ==
+public net.minecraft.network.chat.HoverEvent$ItemStackInfo item
+public net.minecraft.network.chat.HoverEvent$ItemStackInfo count
+public net.minecraft.network.chat.HoverEvent$ItemStackInfo tag
+public net.minecraft.network.chat.contents.TranslatableContents filterAllowedArguments(Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+
 Co-authored-by: zml <zml@stellardrift.ca>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
-diff --git a/src/main/java/io/papermc/paper/adventure/AdventureComponent.java b/src/main/java/io/papermc/paper/adventure/AdventureComponent.java
+diff --git a/src/main/java/io/papermc/paper/adventure/AdventureCodecs.java b/src/main/java/io/papermc/paper/adventure/AdventureCodecs.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..fbf7804f8e02fc76cadae661083dbcc5b1c21881
+index 0000000000000000000000000000000000000000..89d24905a91b3844ff95fe1d9252464a896906a7
 --- /dev/null
-+++ b/src/main/java/io/papermc/paper/adventure/AdventureComponent.java
-@@ -0,0 +1,90 @@
++++ b/src/main/java/io/papermc/paper/adventure/AdventureCodecs.java
+@@ -0,0 +1,393 @@
++package io.papermc.paper.adventure;
++
++import com.mojang.brigadier.exceptions.CommandSyntaxException;
++import com.mojang.datafixers.util.Either;
++import com.mojang.serialization.Codec;
++import com.mojang.serialization.DataResult;
++import com.mojang.serialization.Encoder;
++import com.mojang.serialization.MapCodec;
++import com.mojang.serialization.codecs.RecordCodecBuilder;
++import java.io.IOException;
++import java.util.Collections;
++import java.util.List;
++import java.util.Optional;
++import java.util.UUID;
++import java.util.function.Consumer;
++import java.util.function.Function;
++import java.util.function.Predicate;
++import net.kyori.adventure.key.Key;
++import net.kyori.adventure.nbt.api.BinaryTagHolder;
++import net.kyori.adventure.text.BlockNBTComponent;
++import net.kyori.adventure.text.Component;
++import net.kyori.adventure.text.EntityNBTComponent;
++import net.kyori.adventure.text.KeybindComponent;
++import net.kyori.adventure.text.NBTComponent;
++import net.kyori.adventure.text.NBTComponentBuilder;
++import net.kyori.adventure.text.ScoreComponent;
++import net.kyori.adventure.text.SelectorComponent;
++import net.kyori.adventure.text.StorageNBTComponent;
++import net.kyori.adventure.text.TextComponent;
++import net.kyori.adventure.text.TranslatableComponent;
++import net.kyori.adventure.text.event.ClickEvent;
++import net.kyori.adventure.text.event.HoverEvent;
++import net.kyori.adventure.text.format.NamedTextColor;
++import net.kyori.adventure.text.format.Style;
++import net.kyori.adventure.text.format.TextColor;
++import net.kyori.adventure.text.format.TextDecoration;
++import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
++import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
++import net.minecraft.core.UUIDUtil;
++import net.minecraft.core.registries.BuiltInRegistries;
++import net.minecraft.nbt.CompoundTag;
++import net.minecraft.nbt.TagParser;
++import net.minecraft.network.chat.ComponentSerialization;
++import net.minecraft.network.chat.contents.KeybindContents;
++import net.minecraft.network.chat.contents.ScoreContents;
++import net.minecraft.network.chat.contents.TranslatableContents;
++import net.minecraft.util.ExtraCodecs;
++import net.minecraft.util.StringRepresentable;
++import net.minecraft.world.item.Item;
++import net.minecraft.world.item.ItemStack;
++import org.checkerframework.checker.nullness.qual.NonNull;
++import org.checkerframework.checker.nullness.qual.Nullable;
++import org.checkerframework.framework.qual.DefaultQualifier;
++import org.intellij.lang.annotations.Subst;
++
++import static com.mojang.serialization.codecs.RecordCodecBuilder.mapCodec;
++import static java.util.function.Function.identity;
++import static net.kyori.adventure.text.Component.text;
++import static net.minecraft.util.ExtraCodecs.recursive;
++import static net.minecraft.util.ExtraCodecs.strictOptionalField;
++
++@DefaultQualifier(NonNull.class)
++public final class AdventureCodecs {
++
++    public static final Codec<Component> COMPONENT_CODEC = recursive("adventure Component",  AdventureCodecs::createCodec);
++
++    static final Codec<TextColor> TEXT_COLOR_CODEC = Codec.STRING.comapFlatMap(s -> {
++        if (s.startsWith("#")) {
++            @Nullable TextColor value = TextColor.fromHexString(s);
++            return value != null ? DataResult.success(value) : DataResult.error(() -> "Cannot convert " + s + " to adventure TextColor");
++        } else {
++            final @Nullable NamedTextColor value = NamedTextColor.NAMES.value(s);
++            return value != null ? DataResult.success(value) : DataResult.error(() -> "Cannot convert " + s + " to adventure NamedTextColor");
++        }
++    }, textColor -> {
++        if (textColor instanceof NamedTextColor named) {
++            return NamedTextColor.NAMES.keyOrThrow(named);
++        } else {
++            return textColor.asHexString();
++        }
++    });
++
++    static final Codec<Key> KEY_CODEC = Codec.STRING.comapFlatMap(s -> {
++        return Key.parseable(s) ? DataResult.success(Key.key(s)) : DataResult.error(() -> "Cannot convert " + s + " to adventure Key");
++    }, Key::asString);
++
++    static final Codec<ClickEvent.Action> CLICK_EVENT_ACTION_CODEC = Codec.STRING.comapFlatMap(s -> {
++        final ClickEvent.@Nullable Action value = ClickEvent.Action.NAMES.value(s);
++        return value != null ? DataResult.success(value) : DataResult.error(() -> "Cannot convert " + s + " to adventure ClickEvent$Action");
++    }, ClickEvent.Action.NAMES::keyOrThrow);
++    static final Codec<ClickEvent> CLICK_EVENT_CODEC = RecordCodecBuilder.create((instance) -> {
++        return instance.group(
++            CLICK_EVENT_ACTION_CODEC.fieldOf("action").forGetter(ClickEvent::action),
++            Codec.STRING.fieldOf("value").forGetter(ClickEvent::value)
++        ).apply(instance, ClickEvent::clickEvent);
++    });
++
++    static Codec<HoverEvent.ShowEntity> showEntityCodec(final Codec<Component> componentCodec) {
++        return RecordCodecBuilder.create((instance) -> {
++            return instance.group(
++                KEY_CODEC.fieldOf("type").forGetter(HoverEvent.ShowEntity::type),
++                UUIDUtil.LENIENT_CODEC.fieldOf("id").forGetter(HoverEvent.ShowEntity::id),
++                strictOptionalField(componentCodec, "name").forGetter(he -> Optional.ofNullable(he.name()))
++            ).apply(instance, (key, uuid, component) -> {
++                return HoverEvent.ShowEntity.showEntity(key, uuid, component.orElse(null));
++            });
++        });
++    }
++
++    static Codec<HoverEvent.ShowItem> showItemCodec(final Codec<Component> componentCodec) {
++        return net.minecraft.network.chat.HoverEvent.ItemStackInfo.CODEC.xmap(isi -> {
++            @Subst("key") final String typeKey = BuiltInRegistries.ITEM.getKey(isi.item).toString();
++            return HoverEvent.ShowItem.showItem(Key.key(typeKey), isi.count, PaperAdventure.asBinaryTagHolder(isi.tag.orElse(null)));
++        }, si -> {
++            final Item itemType = BuiltInRegistries.ITEM.get(PaperAdventure.asVanilla(si.item()));
++            final ItemStack stack;
++            try {
++                final @Nullable CompoundTag tag = si.nbt() != null ? si.nbt().get(PaperAdventure.NBT_CODEC) : null;
++                stack = new ItemStack(BuiltInRegistries.ITEM.wrapAsHolder(itemType), si.count(), Optional.ofNullable(tag));
++            } catch (final IOException e) {
++                throw new RuntimeException(e);
++            }
++            return new net.minecraft.network.chat.HoverEvent.ItemStackInfo(stack);
++        });
++    }
++
++    static final HoverEventType<HoverEvent.ShowEntity> SHOW_ENTITY_HOVER_EVENT_TYPE = new HoverEventType<>(AdventureCodecs::showEntityCodec, HoverEvent.Action.SHOW_ENTITY, "show_entity", AdventureCodecs::legacyDeserializeEntity);
++    static final HoverEventType<HoverEvent.ShowItem> SHOW_ITEM_HOVER_EVENT_TYPE = new HoverEventType<>(AdventureCodecs::showItemCodec, HoverEvent.Action.SHOW_ITEM, "show_item", AdventureCodecs::legacyDeserializeItem);
++    static final HoverEventType<Component> SHOW_TEXT_HOVER_EVENT_TYPE = new HoverEventType<>(identity(), HoverEvent.Action.SHOW_TEXT, "show_text", DataResult::success);
++    static final Codec<HoverEventType<?>> HOVER_EVENT_TYPE_CODEC = StringRepresentable.fromValues(() -> new HoverEventType<?>[]{ SHOW_ENTITY_HOVER_EVENT_TYPE, SHOW_ITEM_HOVER_EVENT_TYPE, SHOW_TEXT_HOVER_EVENT_TYPE });
++
++    static DataResult<HoverEvent.ShowEntity> legacyDeserializeEntity(final Component text) {
++        try {
++            final CompoundTag tag = TagParser.parseTag(PlainTextComponentSerializer.plainText().serialize(text));
++            final @Nullable Component entityName = GsonComponentSerializer.gson().deserializeOrNull(tag.getString("name"));
++            @Subst("key") final String keyString = tag.getString("type");
++            final UUID entityUUID = UUID.fromString(tag.getString("id"));
++            return DataResult.success(HoverEvent.ShowEntity.showEntity(Key.key(keyString), entityUUID, entityName));
++        } catch (final Exception ex) {
++            return DataResult.error(() -> "Failed to parse tooltip: " + ex.getMessage());
++        }
++    }
++
++    static DataResult<HoverEvent.ShowItem> legacyDeserializeItem(final Component text) {
++        try {
++            final ItemStack stack = ItemStack.of(TagParser.parseTag(PlainTextComponentSerializer.plainText().serialize(text)));
++            @Subst("key") final String keyString = BuiltInRegistries.ITEM.getKey(stack.getItem()).toString();
++            return DataResult.success(HoverEvent.ShowItem.showItem(Key.key(keyString), stack.getCount(), stack.getTag() != null ? BinaryTagHolder.encode(stack.getTag(), PaperAdventure.NBT_CODEC) : null));
++        } catch (final CommandSyntaxException | IOException ex) {
++            return DataResult.error(() -> "Failed to parse item tag: " + ex.getMessage());
++        }
++    }
++
++    record HoverEventType<V>(Function<Codec<Component>, Codec<HoverEvent<V>>> codec, String id, Function<Codec<Component>, Codec<HoverEvent<V>>> legacyCodec) implements StringRepresentable {
++        HoverEventType(final Function<Codec<Component>, Codec<V>> contentCodec, final HoverEvent.Action<V> action, final String id, final Function<Component, DataResult<V>> legacyDeserializer) {
++            this(cc -> contentCodec.apply(cc).xmap(v -> HoverEvent.hoverEvent(action, v), HoverEvent::value).fieldOf("contents").codec(),
++                id,
++                codec -> Codec.of(
++                    Encoder.error("Can't encode in legacy format"),
++                    codec.flatMap(legacyDeserializer).map(text -> HoverEvent.hoverEvent(action, text))
++                )
++            );
++        }
++        @Override
++        public String getSerializedName() {
++            return this.id;
++        }
++    }
++
++    private static final Function<HoverEvent<?>, HoverEventType<?>> GET_HOVER_EVENT_TYPE = he -> {
++        if (he.action() == HoverEvent.Action.SHOW_ENTITY) {
++            return SHOW_ENTITY_HOVER_EVENT_TYPE;
++        } else if (he.action() == HoverEvent.Action.SHOW_ITEM) {
++            return SHOW_ITEM_HOVER_EVENT_TYPE;
++        } else if (he.action() == HoverEvent.Action.SHOW_TEXT) {
++            return SHOW_TEXT_HOVER_EVENT_TYPE;
++        } else {
++            throw new IllegalStateException();
++        }
++    };
++    static final Codec<HoverEvent<?>> HOVER_EVENT_CODEC = Codec.either(
++        HOVER_EVENT_TYPE_CODEC.<HoverEvent<?>>dispatchMap("action", GET_HOVER_EVENT_TYPE, het -> het.codec.apply(COMPONENT_CODEC)).codec(),
++        HOVER_EVENT_TYPE_CODEC.<HoverEvent<?>>dispatchMap("action", GET_HOVER_EVENT_TYPE, het -> het.legacyCodec.apply(COMPONENT_CODEC)).codec()
++    ).xmap(either -> either.map(identity(), identity()), Either::left);
++
++    public static final MapCodec<Style> STYLE_MAP_CODEC = mapCodec((instance) -> {
++        return instance.group(
++            strictOptionalField(TEXT_COLOR_CODEC, "color").forGetter(nullableGetter(Style::color)),
++            strictOptionalField(Codec.BOOL, "bold").forGetter(decorationGetter(TextDecoration.BOLD)),
++            strictOptionalField(Codec.BOOL, "italic").forGetter(decorationGetter(TextDecoration.ITALIC)),
++            strictOptionalField(Codec.BOOL, "underlined").forGetter(decorationGetter(TextDecoration.UNDERLINED)),
++            strictOptionalField(Codec.BOOL, "strikethrough").forGetter(decorationGetter(TextDecoration.STRIKETHROUGH)),
++            strictOptionalField(Codec.BOOL, "obfuscated").forGetter(decorationGetter(TextDecoration.OBFUSCATED)),
++            strictOptionalField(CLICK_EVENT_CODEC, "clickEvent").forGetter(nullableGetter(Style::clickEvent)),
++            strictOptionalField(HOVER_EVENT_CODEC, "hoverEvent").forGetter(nullableGetter(Style::hoverEvent)),
++            strictOptionalField(Codec.STRING, "insertion").forGetter(nullableGetter(Style::insertion)),
++            strictOptionalField(KEY_CODEC, "font").forGetter(nullableGetter(Style::font))
++        ).apply(instance, (textColor, bold, italic, underlined, strikethrough, obfuscated, clickEvent, hoverEvent, insertion, font) -> {
++            return Style.style(builder -> {
++                textColor.ifPresent(builder::color);
++                bold.ifPresent(styleBooleanConsumer(builder, TextDecoration.BOLD));
++                italic.ifPresent(styleBooleanConsumer(builder, TextDecoration.ITALIC));
++                underlined.ifPresent(styleBooleanConsumer(builder, TextDecoration.UNDERLINED));
++                strikethrough.ifPresent(styleBooleanConsumer(builder, TextDecoration.STRIKETHROUGH));
++                obfuscated.ifPresent(styleBooleanConsumer(builder, TextDecoration.OBFUSCATED));
++                clickEvent.ifPresent(builder::clickEvent);
++                hoverEvent.ifPresent(builder::hoverEvent);
++                insertion.ifPresent(builder::insertion);
++                font.ifPresent(builder::font);
++            });
++        });
++    });
++    static Consumer<Boolean> styleBooleanConsumer(final Style.Builder builder, final TextDecoration decoration) {
++        return b -> builder.decoration(decoration, b);
++    }
++
++    static Function<Style, Optional<Boolean>> decorationGetter(final TextDecoration decoration) {
++        return style -> Optional.ofNullable(style.decoration(decoration) == TextDecoration.State.NOT_SET ? null : style.decoration(decoration) == TextDecoration.State.TRUE);
++    }
++
++    static <R, T> Function<R, Optional<T>> nullableGetter(final Function<R, @Nullable T> getter) {
++        return style -> Optional.ofNullable(getter.apply(style));
++    }
++
++    static final MapCodec<TextComponent> TEXT_COMPONENT_MAP_CODEC = mapCodec((instance) -> {
++        return instance.group(Codec.STRING.fieldOf("text").forGetter(TextComponent::content)).apply(instance, Component::text);
++    });
++    static final Codec<Object> PRIMITIVE_ARG_CODEC = ExtraCodecs.validate(ExtraCodecs.JAVA, TranslatableContents::filterAllowedArguments);
++    static final Codec<Component> ARG_CODEC = Codec.either(PRIMITIVE_ARG_CODEC, COMPONENT_CODEC).xmap((primitiveOrComponent) -> {
++        // just toString all primitives (not 100% correct to vanilla spec)
++        // vanilla allows primitive translatable args, but adventure doesn't (in 4.14)
++        return primitiveOrComponent.map(o -> text(String.valueOf(o)), identity());
++    }, Either::right);
++    static final MapCodec<TranslatableComponent> TRANSLATABLE_COMPONENT_MAP_CODEC = mapCodec((instance) -> {
++        return instance.group(
++            Codec.STRING.fieldOf("translate").forGetter(TranslatableComponent::key),
++            Codec.STRING.optionalFieldOf("fallback").forGetter(nullableGetter(TranslatableComponent::fallback)),
++            strictOptionalField(ARG_CODEC.listOf(), "with").forGetter(c -> c.args().isEmpty() ? Optional.empty() : Optional.of(c.args()))
++        ).apply(instance, (key, fallback, components) -> {
++            return Component.translatable(key, components.orElse(Collections.emptyList())).fallback(fallback.orElse(null));
++        });
++    });
++
++    static final MapCodec<KeybindComponent> KEYBIND_COMPONENT_MAP_CODEC = KeybindContents.CODEC.xmap(k -> Component.keybind(k.getName()), k -> new KeybindContents(k.keybind()));
++    static final MapCodec<ScoreComponent> SCORE_COMPONENT_INNER_MAP_CODEC = ScoreContents.INNER_CODEC.xmap(s -> Component.score(s.getName(), s.getObjective()), s -> new ScoreContents(s.name(), s.objective()));
++    static final MapCodec<ScoreComponent> SCORE_COMPONENT_MAP_CODEC = SCORE_COMPONENT_INNER_MAP_CODEC.fieldOf("score");
++    static final MapCodec<SelectorComponent> SELECTOR_COMPONENT_MAP_CODEC = mapCodec((instance) -> {
++        return instance.group(
++            Codec.STRING.fieldOf("selector").forGetter(SelectorComponent::pattern),
++            strictOptionalField(COMPONENT_CODEC, "separator").forGetter(nullableGetter(SelectorComponent::separator))
++        ).apply(instance, (selector, component) -> Component.selector(selector, component.orElse(null)));
++    });
++
++    interface NbtComponentDataSource {
++        NBTComponentBuilder<?, ?> builder();
++
++        DataSourceType<?> type();
++    }
++
++    record StorageDataSource(Key storage) implements NbtComponentDataSource {
++        @Override
++        public NBTComponentBuilder<?, ?> builder() {
++            return Component.storageNBT().storage(this.storage());
++        }
++
++        @Override
++        public DataSourceType<?> type() {
++            return STORAGE_DATA_SOURCE_TYPE;
++        }
++    }
++
++    record BlockDataSource(String posPattern) implements NbtComponentDataSource {
++        @Override
++        public NBTComponentBuilder<?, ?> builder() {
++            return Component.blockNBT().pos(BlockNBTComponent.Pos.fromString(this.posPattern));
++        }
++
++        @Override
++        public DataSourceType<?> type() {
++            return BLOCK_DATA_SOURCE_TYPE;
++        }
++    }
++
++    record EntityDataSource(String selectorPattern) implements NbtComponentDataSource {
++        @Override
++        public NBTComponentBuilder<?, ?> builder() {
++            return Component.entityNBT().selector(this.selectorPattern());
++        }
++
++        @Override
++        public DataSourceType<?> type() {
++            return ENTITY_DATA_SOURCE_TYPE;
++        }
++    }
++
++    static final DataSourceType<StorageDataSource> STORAGE_DATA_SOURCE_TYPE = new DataSourceType<>(mapCodec((instance) -> instance.group(KEY_CODEC.fieldOf("storage").forGetter(StorageDataSource::storage)).apply(instance, StorageDataSource::new)), "storage");
++    static final DataSourceType<BlockDataSource> BLOCK_DATA_SOURCE_TYPE = new DataSourceType<>(mapCodec((instance) -> instance.group(Codec.STRING.fieldOf("block").forGetter(BlockDataSource::posPattern)).apply(instance, BlockDataSource::new)), "block");
++    static final DataSourceType<EntityDataSource> ENTITY_DATA_SOURCE_TYPE = new DataSourceType<>(mapCodec((instance) -> instance.group(Codec.STRING.fieldOf("entity").forGetter(EntityDataSource::selectorPattern)).apply(instance, EntityDataSource::new)), "entity");
++
++    static final MapCodec<NbtComponentDataSource> NBT_COMPONENT_DATA_SOURCE_CODEC = ComponentSerialization.createLegacyComponentMatcher(new DataSourceType<?>[]{ENTITY_DATA_SOURCE_TYPE, BLOCK_DATA_SOURCE_TYPE, STORAGE_DATA_SOURCE_TYPE}, DataSourceType::codec, NbtComponentDataSource::type, "source");
++
++    record DataSourceType<D extends NbtComponentDataSource>(MapCodec<D> codec, String id) implements StringRepresentable {
++        @Override
++        public String getSerializedName() {
++            return this.id();
++        }
++    }
++
++    static final MapCodec<NBTComponent<?, ?>> NBT_COMPONENT_MAP_CODEC = mapCodec((instance) -> {
++        return instance.group(
++            Codec.STRING.fieldOf("nbt").forGetter(NBTComponent::nbtPath),
++            Codec.BOOL.optionalFieldOf("interpret", false).forGetter(NBTComponent::interpret),
++            COMPONENT_CODEC.optionalFieldOf("separator").forGetter(nullableGetter(NBTComponent::separator)),
++            NBT_COMPONENT_DATA_SOURCE_CODEC.forGetter(nbtComponent -> {
++                if (nbtComponent instanceof final EntityNBTComponent entityNBTComponent) {
++                    return new EntityDataSource(entityNBTComponent.selector());
++                } else if (nbtComponent instanceof final BlockNBTComponent blockNBTComponent) {
++                    return new BlockDataSource(blockNBTComponent.pos().asString());
++                } else if (nbtComponent instanceof final StorageNBTComponent storageNBTComponent) {
++                    return new StorageDataSource(storageNBTComponent.storage());
++                } else {
++                    throw new IllegalArgumentException(nbtComponent + " isn't a valid nbt component");
++                }
++            })
++        ).apply(instance, (nbtPath, interpret, separator, dataSource) -> {
++            return dataSource.builder().nbtPath(nbtPath).interpret(interpret).separator(separator.orElse(null)).build();
++        });
++    });
++
++    @SuppressWarnings("NonExtendableApiUsage")
++    record ComponentType<C extends Component>(MapCodec<C> codec, Predicate<Component> test, String id) implements StringRepresentable {
++        @Override
++        public String getSerializedName() {
++            return this.id;
++        }
++    }
++
++    static final ComponentType<TextComponent> PLAIN = new ComponentType<>(TEXT_COMPONENT_MAP_CODEC, TextComponent.class::isInstance, "text");
++    static final ComponentType<TranslatableComponent> TRANSLATABLE = new ComponentType<>(TRANSLATABLE_COMPONENT_MAP_CODEC, TranslatableComponent.class::isInstance, "translatable");
++    static final ComponentType<KeybindComponent> KEYBIND = new ComponentType<>(KEYBIND_COMPONENT_MAP_CODEC, KeybindComponent.class::isInstance, "keybind");
++    static final ComponentType<ScoreComponent> SCORE = new ComponentType<>(SCORE_COMPONENT_MAP_CODEC, ScoreComponent.class::isInstance, "score");
++    static final ComponentType<SelectorComponent> SELECTOR = new ComponentType<>(SELECTOR_COMPONENT_MAP_CODEC, SelectorComponent.class::isInstance, "selector");
++    static final ComponentType<NBTComponent<?, ?>> NBT = new ComponentType<>(NBT_COMPONENT_MAP_CODEC, NBTComponent.class::isInstance, "nbt");
++
++    static Codec<Component> createCodec(final Codec<Component> selfCodec) {
++        final ComponentType<?>[] types = new ComponentType<?>[]{PLAIN, TRANSLATABLE, KEYBIND, SCORE, SELECTOR, NBT};
++        final MapCodec<Component> legacyCodec = ComponentSerialization.createLegacyComponentMatcher(types, ComponentType::codec, component -> {
++            for (final ComponentType<?> type : types) {
++                if (type.test().test(component)) {
++                    return type;
++                }
++            }
++            throw new IllegalStateException("Unexpected component type " + component);
++        }, "type");
++
++        final Codec<Component> directCodec = RecordCodecBuilder.create((instance) -> {
++            return instance.group(
++                legacyCodec.forGetter(identity()),
++                strictOptionalField(ExtraCodecs.nonEmptyList(selfCodec.listOf()), "extra", List.of()).forGetter(Component::children),
++                STYLE_MAP_CODEC.forGetter(Component::style)
++            ).apply(instance, (component, children, style) -> {
++                return component.style(style).children(children);
++            });
++        });
++
++        return Codec.either(Codec.either(Codec.STRING, ExtraCodecs.nonEmptyList(selfCodec.listOf())), directCodec).xmap((stringOrListOrComponent) -> {
++            return stringOrListOrComponent.map((stringOrList) -> stringOrList.map(Component::text, AdventureCodecs::createFromList), identity());
++        }, (text) -> {
++            final @Nullable String string = tryCollapseToString(text);
++            return string != null ? Either.left(Either.left(string)) : Either.right(text);
++        });
++    }
++
++    static @Nullable String tryCollapseToString(final Component component) {
++        if (component instanceof final TextComponent textComponent) {
++            if (component.children().isEmpty() && component.style().isEmpty()) {
++                return textComponent.content();
++            }
++        }
++        return null;
++    }
++
++    static Component createFromList(final List<? extends Component> components) {
++        Component component = components.get(0);
++        for (int i = 1; i < components.size(); i++) {
++            component = component.append(components.get(i));
++        }
++        return component;
++    }
++
++    private AdventureCodecs() {
++    }
++}
+diff --git a/src/main/java/io/papermc/paper/adventure/AdventureComponent.java b/src/main/java/io/papermc/paper/adventure/AdventureComponent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..4b01e1249276a26aa82eb2d70f4b1223a7c8008f
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/adventure/AdventureComponent.java
+@@ -0,0 +1,78 @@
 +package io.papermc.paper.adventure;
 +
-+import com.google.gson.JsonElement;
-+import com.google.gson.JsonSerializationContext;
-+import com.google.gson.JsonSerializer;
-+import java.lang.reflect.Type;
 +import java.util.List;
 +import net.kyori.adventure.text.Component;
 +import net.kyori.adventure.text.TextComponent;
-+import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 +import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 +import net.minecraft.network.chat.ComponentContents;
 +import net.minecraft.network.chat.MutableComponent;
@@ -94,13 +494,6 @@ index 0000000000000000000000000000000000000000..fbf7804f8e02fc76cadae661083dbcc5
 +    public Component adventure$component() {
 +        return this.adventure;
 +    }
-+
-+    public static class Serializer implements JsonSerializer<AdventureComponent> {
-+        @Override
-+        public JsonElement serialize(final AdventureComponent src, final Type type, final JsonSerializationContext context) {
-+            return GsonComponentSerializer.gson().serializer().toJsonTree(src.adventure, Component.class);
-+        }
-+    }
 +}
 diff --git a/src/main/java/io/papermc/paper/adventure/BossBarImplementationImpl.java b/src/main/java/io/papermc/paper/adventure/BossBarImplementationImpl.java
 new file mode 100644
@@ -828,10 +1221,10 @@ index 0000000000000000000000000000000000000000..2fd6c3e65354071af71c7d8ebb97b559
 +}
 diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..3dc613116c086444ece88bcb0a569eeea953074f
+index 0000000000000000000000000000000000000000..1fb9b0ea9f2dbff12d8d2fbc2ad2f4d88ca9f7ad
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-@@ -0,0 +1,390 @@
+@@ -0,0 +1,394 @@
 +package io.papermc.paper.adventure;
 +
 +import com.mojang.brigadier.exceptions.CommandSyntaxException;
@@ -840,7 +1233,9 @@ index 0000000000000000000000000000000000000000..3dc613116c086444ece88bcb0a569eee
 +import java.util.ArrayList;
 +import java.util.List;
 +import java.util.Locale;
++import java.util.Map;
 +import java.util.Optional;
++import java.util.concurrent.ConcurrentHashMap;
 +import java.util.function.BiConsumer;
 +import java.util.regex.Matcher;
 +import java.util.regex.Pattern;
@@ -941,7 +1336,7 @@ index 0000000000000000000000000000000000000000..3dc613116c086444ece88bcb0a569eee
 +    public static final AttributeKey<Locale> LOCALE_ATTRIBUTE = AttributeKey.valueOf("adventure:locale"); // init after FLATTENER because classloading triggered here might create a logger
 +    @Deprecated
 +    public static final PlainComponentSerializer PLAIN = PlainComponentSerializer.builder().flattener(FLATTENER).build();
-+    private static final Codec<CompoundTag, String, IOException, IOException> NBT_CODEC = new Codec<CompoundTag, String, IOException, IOException>() {
++    static final Codec<CompoundTag, String, IOException, IOException> NBT_CODEC = new Codec<CompoundTag, String, IOException, IOException>() {
 +        @Override
 +        public @NotNull CompoundTag decode(final @NotNull String encoded) throws IOException {
 +            try {
@@ -977,7 +1372,7 @@ index 0000000000000000000000000000000000000000..3dc613116c086444ece88bcb0a569eee
 +    // Component
 +
 +    public static Component asAdventure(final net.minecraft.network.chat.Component component) {
-+        return component == null ? Component.empty() : GsonComponentSerializer.gson().serializer().fromJson(net.minecraft.network.chat.Component.Serializer.toJsonTree(component), Component.class);
++        return component == null ? Component.empty() : WRAPPER_AWARE_SERIALIZER.deserialize(component);
 +    }
 +
 +    public static ArrayList<Component> asAdventure(final List<net.minecraft.network.chat.Component> vanillas) {
@@ -1007,7 +1402,7 @@ index 0000000000000000000000000000000000000000..3dc613116c086444ece88bcb0a569eee
 +    public static net.minecraft.network.chat.Component asVanilla(final Component component) {
 +        if (component == null) return null;
 +        if (true) return new AdventureComponent(component);
-+        return net.minecraft.network.chat.Component.Serializer.fromJson(GsonComponentSerializer.gson().serializer().toJsonTree(component));
++        return WRAPPER_AWARE_SERIALIZER.serialize(component);
 +    }
 +
 +    public static List<net.minecraft.network.chat.Component> asVanilla(final List<Component> adventures) {
@@ -1022,11 +1417,13 @@ index 0000000000000000000000000000000000000000..3dc613116c086444ece88bcb0a569eee
 +        return GsonComponentSerializer.gson().serialize(translated(component, locale));
 +    }
 +
-+    public static String asJsonString(final net.minecraft.network.chat.Component component, final Locale locale) {
-+        if (component instanceof AdventureComponent) {
-+            return asJsonString(((AdventureComponent) component).adventure, locale);
-+        }
-+        return net.minecraft.network.chat.Component.Serializer.toJson(component);
++    private static final Map<Locale, com.mojang.serialization.Codec<Component>> LOCALIZED_CODECS = new ConcurrentHashMap<>();
++
++    public static com.mojang.serialization.Codec<Component> localizedCodec(final Locale l) {
++        return LOCALIZED_CODECS.computeIfAbsent(l, locale -> AdventureCodecs.COMPONENT_CODEC.xmap(
++            component -> component, // decode
++            component -> translated(component, locale) // encode
++        ));
 +    }
 +
 +    public static String asPlain(final Component component, final Locale locale) {
@@ -1224,15 +1621,19 @@ index 0000000000000000000000000000000000000000..3dc613116c086444ece88bcb0a569eee
 +}
 diff --git a/src/main/java/io/papermc/paper/adventure/WrapperAwareSerializer.java b/src/main/java/io/papermc/paper/adventure/WrapperAwareSerializer.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..2a08e0461db4e699b7e6a1558a4419c848fc7f4f
+index 0000000000000000000000000000000000000000..49809d4fa42d1054119cf38babba5a6161b5ee97
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/adventure/WrapperAwareSerializer.java
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,40 @@
 +package io.papermc.paper.adventure;
 +
++import com.mojang.datafixers.util.Pair;
++import java.util.function.Function;
 +import net.kyori.adventure.text.Component;
 +import net.kyori.adventure.text.serializer.ComponentSerializer;
-+import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
++import net.minecraft.nbt.NbtOps;
++import net.minecraft.nbt.Tag;
++import net.minecraft.network.chat.ComponentSerialization;
 +
 +final class WrapperAwareSerializer implements ComponentSerializer<Component, Component, net.minecraft.network.chat.Component> {
 +    @Override
@@ -1240,12 +1641,28 @@ index 0000000000000000000000000000000000000000..2a08e0461db4e699b7e6a1558a4419c8
 +        if (input instanceof AdventureComponent) {
 +            return ((AdventureComponent) input).adventure;
 +        }
-+        return GsonComponentSerializer.gson().serializer().fromJson(net.minecraft.network.chat.Component.Serializer.toJsonTree(input), Component.class);
++        final Tag tag = ComponentSerialization.CODEC.encodeStart(NbtOps.INSTANCE, input)
++            .get().map(Function.identity(), partial -> {
++                throw new RuntimeException("Failed to encode Minecraft Component: " + input + "; " + partial.message());
++            });
++        final Pair<Component, Tag> converted = AdventureCodecs.COMPONENT_CODEC.decode(NbtOps.INSTANCE, tag)
++            .get().map(Function.identity(), partial -> {
++                throw new RuntimeException("Failed to decode to adventure Component: " + tag + "; " + partial.message());
++            });
++        return converted.getFirst();
 +    }
 +
 +    @Override
 +    public net.minecraft.network.chat.Component serialize(final Component component) {
-+        return net.minecraft.network.chat.Component.Serializer.fromJson(GsonComponentSerializer.gson().serializer().toJsonTree(component));
++        final Tag tag = AdventureCodecs.COMPONENT_CODEC.encodeStart(NbtOps.INSTANCE, component)
++            .get().map(Function.identity(), partial -> {
++                throw new RuntimeException("Failed to encode adventure Component: " + component + "; " + partial.message());
++            });
++        final Pair<net.minecraft.network.chat.Component, Tag> converted = ComponentSerialization.CODEC.decode(NbtOps.INSTANCE, tag)
++            .get().map(Function.identity(), partial -> {
++                throw new RuntimeException("Failed to decode to Minecraft Component: " + tag + "; " + partial.message());
++            });
++        return converted.getFirst();
 +    }
 +}
 diff --git a/src/main/java/io/papermc/paper/adventure/providers/BossBarImplementationProvider.java b/src/main/java/io/papermc/paper/adventure/providers/BossBarImplementationProvider.java
@@ -1703,7 +2120,7 @@ index d120fff432d9c4fc7a35ddffdc4186459e45e950..73c15a0c56a103ba4e62f0a51af8d425
          }
      }
 diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index 9373502ede6c8a881af67db005cf12fd9313f37f..bc7d0cc8d66f07b45cffd9952829cc9bed9ce260 100644
+index 9373502ede6c8a881af67db005cf12fd9313f37f..50c7e0a449ea9d71e21e86b4f03dac0298f96130 100644
 --- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 +++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 @@ -87,6 +87,7 @@ public class FriendlyByteBuf extends ByteBuf {
@@ -1714,22 +2131,26 @@ index 9373502ede6c8a881af67db005cf12fd9313f37f..bc7d0cc8d66f07b45cffd9952829cc9b
      public static final short MAX_STRING_LENGTH = 32767;
      public static final int MAX_COMPONENT_STRING_LENGTH = 262144;
      private static final int PUBLIC_KEY_SIZE = 256;
-@@ -526,7 +527,15 @@ public class FriendlyByteBuf extends ByteBuf {
+@@ -526,8 +527,19 @@ public class FriendlyByteBuf extends ByteBuf {
          return (Component) this.readWithCodecTrusted(NbtOps.INSTANCE, ComponentSerialization.CODEC);
      }
  
-+    // Paper start
++    // Paper start - adventure
 +    public FriendlyByteBuf writeComponent(final net.kyori.adventure.text.Component component) {
-+        // TODO this.adventure$locale
-+        return this.writeWithCodec(NbtOps.INSTANCE, ComponentSerialization.CODEC, io.papermc.paper.adventure.PaperAdventure.asVanilla(component));
++        return this.writeWithCodec(NbtOps.INSTANCE, io.papermc.paper.adventure.PaperAdventure.localizedCodec(this.adventure$locale), component);
 +    }
-+    // Paper end
 +
      public FriendlyByteBuf writeComponent(Component text) {
++        if (text instanceof io.papermc.paper.adventure.AdventureComponent adv) {
++            return this.writeComponent(adv.adventure$component());
++        }
++
 +        // TODO this.adventure$locale
          return this.writeWithCodec(NbtOps.INSTANCE, ComponentSerialization.CODEC, text);
++        // Paper end - adventure
      }
  
+     public <T extends Enum<T>> T readEnum(Class<T> enumClass) {
 diff --git a/src/main/java/net/minecraft/network/PacketEncoder.java b/src/main/java/net/minecraft/network/PacketEncoder.java
 index 344c5af75c4a66bb27f3f422937c6c427c15ed25..3d359f80f52bff6f19fcb484f491a874f9dcff27 100644
 --- a/src/main/java/net/minecraft/network/PacketEncoder.java
@@ -1848,6 +2269,62 @@ index d3a80d0a23be762c05931ae8001d98e43cab2b4a..e0037b99838519eee5fb6f7e95ffaad2
              return Component.Serializer.serialize(ichatbasecomponent);
          }
      }
+diff --git a/src/main/java/net/minecraft/network/chat/ComponentSerialization.java b/src/main/java/net/minecraft/network/chat/ComponentSerialization.java
+index 60228c3778e53ca5c513cd265e5e08d151573a4f..ddc91d376fd59da982e594188fcef7202a2a5972 100644
+--- a/src/main/java/net/minecraft/network/chat/ComponentSerialization.java
++++ b/src/main/java/net/minecraft/network/chat/ComponentSerialization.java
+@@ -61,6 +61,33 @@ public class ComponentSerialization {
+         Codec<Component> codec = RecordCodecBuilder.create((instance) -> {
+             return instance.group(mapCodec.forGetter(Component::getContents), ExtraCodecs.strictOptionalField(ExtraCodecs.nonEmptyList(selfCodec.listOf()), "extra", List.of()).forGetter(Component::getSiblings), Style.Serializer.MAP_CODEC.forGetter(Component::getStyle)).apply(instance, MutableComponent::new);
+         });
++        // Paper start
++        final Codec<Component> origCodec = codec;
++        codec = new Codec<>() {
++            @Override
++            public <T> DataResult<com.mojang.datafixers.util.Pair<Component, T>> decode(final DynamicOps<T> ops, final T input) {
++                return origCodec.decode(ops, input);
++            }
++
++            @Override
++            public <T> DataResult<T> encode(final Component input, final DynamicOps<T> ops, final T prefix) {
++                if (input instanceof io.papermc.paper.adventure.AdventureComponent adv) {
++                    if (adv.deepConvertedIfPresent() != null) {
++                        return origCodec.encode(java.util.Objects.requireNonNull(adv.deepConvertedIfPresent()), ops, prefix);
++                    } else {
++                        // return io.papermc.paper.adventure.PaperAdventure.localizedCodec(locale).encode(adv.adventure$component(), ops, prefix); // TODO
++                        return io.papermc.paper.adventure.AdventureCodecs.COMPONENT_CODEC.encode(adv.adventure$component(), ops, prefix);
++                    }
++                }
++                return origCodec.encode(input, ops, prefix);
++            }
++
++            @Override
++            public String toString() {
++                return origCodec.toString() + "[AdventureComponentAware]";
++            }
++        };
++        // Paper end
+         return Codec.either(Codec.either(Codec.STRING, ExtraCodecs.nonEmptyList(selfCodec.listOf())), codec).xmap((either) -> {
+             return either.map((either2) -> {
+                 return either2.map(Component::literal, ComponentSerialization::createFromList);
+@@ -86,7 +113,7 @@ public class ComponentSerialization {
+             for(MapDecoder<? extends T> mapDecoder : this.codecs) {
+                 DataResult<? extends T> dataResult = mapDecoder.decode(dynamicOps, mapLike);
+                 if (dataResult.result().isPresent()) {
+-                    return dataResult;
++                    return (DataResult<T>) dataResult; // Paper - decomp fix
+                 }
+             }
+ 
+@@ -96,7 +123,7 @@ public class ComponentSerialization {
+         }
+ 
+         public <S> RecordBuilder<S> encode(T object, DynamicOps<S> dynamicOps, RecordBuilder<S> recordBuilder) {
+-            MapEncoder<T> mapEncoder = this.encoderGetter.apply(object);
++            MapEncoder<T> mapEncoder = (MapEncoder<T>) this.encoderGetter.apply(object); // Paper - decomp fix
+             return mapEncoder.encode(object, dynamicOps, recordBuilder);
+         }
+ 
 diff --git a/src/main/java/net/minecraft/network/chat/ComponentUtils.java b/src/main/java/net/minecraft/network/chat/ComponentUtils.java
 index b6506e881ef337bfd2a7a0644296b48b7300a0f6..7daca712816a79cc4a30b084afbd3d07b5d3755f 100644
 --- a/src/main/java/net/minecraft/network/chat/ComponentUtils.java
@@ -5006,6 +5483,378 @@ index 0000000000000000000000000000000000000000..3aedd0bbc97edacc1ebf71264b310e55
 +        "translation_key": "%s"
 +    }
 +}
+diff --git a/src/test/java/io/papermc/paper/adventure/AdventureCodecsTest.java b/src/test/java/io/papermc/paper/adventure/AdventureCodecsTest.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..af4b7704ab4690138e3188a45d41b890369f6237
+--- /dev/null
++++ b/src/test/java/io/papermc/paper/adventure/AdventureCodecsTest.java
+@@ -0,0 +1,366 @@
++package io.papermc.paper.adventure;
++
++import com.mojang.datafixers.util.Pair;
++import com.mojang.serialization.Codec;
++import com.mojang.serialization.DataResult;
++import java.io.IOException;
++import java.util.List;
++import java.util.UUID;
++import java.util.function.Function;
++import net.kyori.adventure.key.Key;
++import net.kyori.adventure.nbt.api.BinaryTagHolder;
++import net.kyori.adventure.text.BlockNBTComponent;
++import net.kyori.adventure.text.Component;
++import net.kyori.adventure.text.event.ClickEvent;
++import net.kyori.adventure.text.event.HoverEvent;
++import net.kyori.adventure.text.format.NamedTextColor;
++import net.kyori.adventure.text.format.Style;
++import net.kyori.adventure.text.format.TextColor;
++import net.kyori.adventure.text.format.TextDecoration;
++import net.minecraft.core.registries.BuiltInRegistries;
++import net.minecraft.nbt.ByteTag;
++import net.minecraft.nbt.CompoundTag;
++import net.minecraft.nbt.IntTag;
++import net.minecraft.nbt.ListTag;
++import net.minecraft.nbt.NbtOps;
++import net.minecraft.nbt.Tag;
++import net.minecraft.network.chat.ComponentSerialization;
++import net.minecraft.resources.ResourceLocation;
++import net.minecraft.world.item.ItemStack;
++import net.minecraft.world.item.Items;
++import org.apache.commons.lang3.RandomStringUtils;
++import org.bukkit.support.AbstractTestingBase;
++import org.junit.jupiter.api.Test;
++import org.junit.jupiter.params.ParameterizedTest;
++import org.junit.jupiter.params.provider.EnumSource;
++import org.junit.jupiter.params.provider.MethodSource;
++
++import static io.papermc.paper.adventure.AdventureCodecs.CLICK_EVENT_CODEC;
++import static io.papermc.paper.adventure.AdventureCodecs.COMPONENT_CODEC;
++import static io.papermc.paper.adventure.AdventureCodecs.HOVER_EVENT_CODEC;
++import static io.papermc.paper.adventure.AdventureCodecs.KEY_CODEC;
++import static io.papermc.paper.adventure.AdventureCodecs.STYLE_MAP_CODEC;
++import static io.papermc.paper.adventure.AdventureCodecs.TEXT_COLOR_CODEC;
++import static io.papermc.paper.adventure.PaperAdventure.NBT_CODEC;
++import static java.util.Objects.requireNonNull;
++import static net.kyori.adventure.key.Key.key;
++import static net.kyori.adventure.text.Component.blockNBT;
++import static net.kyori.adventure.text.Component.entityNBT;
++import static net.kyori.adventure.text.Component.keybind;
++import static net.kyori.adventure.text.Component.score;
++import static net.kyori.adventure.text.Component.selector;
++import static net.kyori.adventure.text.Component.storageNBT;
++import static net.kyori.adventure.text.Component.text;
++import static net.kyori.adventure.text.Component.translatable;
++import static net.kyori.adventure.text.event.ClickEvent.openUrl;
++import static net.kyori.adventure.text.event.ClickEvent.suggestCommand;
++import static net.kyori.adventure.text.event.HoverEvent.showEntity;
++import static net.kyori.adventure.text.format.Style.style;
++import static net.kyori.adventure.text.format.TextColor.color;
++import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertNotNull;
++import static org.junit.jupiter.api.Assertions.assertThrows;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++
++class AdventureCodecsTest extends AbstractTestingBase {
++
++    @Test
++    void testTextColor() {
++        final TextColor color = color(0x1d38df);
++        final Tag result = TEXT_COLOR_CODEC.encodeStart(NbtOps.INSTANCE, color).result().orElseThrow();
++        assertEquals(color.asHexString(), result.getAsString());
++        final net.minecraft.network.chat.TextColor nms = net.minecraft.network.chat.TextColor.CODEC.decode(NbtOps.INSTANCE, result).result().orElseThrow().getFirst();
++        assertEquals(color.value(), nms.getValue());
++    }
++
++    @Test
++    void testNamedTextColor() {
++        final NamedTextColor color = NamedTextColor.BLUE;
++        final Tag result = TEXT_COLOR_CODEC.encodeStart(NbtOps.INSTANCE, color).result().orElseThrow();
++        assertEquals(NamedTextColor.NAMES.keyOrThrow(color), result.getAsString());
++        final net.minecraft.network.chat.TextColor nms = net.minecraft.network.chat.TextColor.CODEC.decode(NbtOps.INSTANCE, result).result().orElseThrow().getFirst();
++        assertEquals(color.value(), nms.getValue());
++    }
++
++    @Test
++    void testKey() {
++        final Key key = key("hello", "there");
++        final Tag result = KEY_CODEC.encodeStart(NbtOps.INSTANCE, key).result().orElseThrow();
++        assertEquals(key.asString(), result.getAsString());
++        final ResourceLocation location = ResourceLocation.CODEC.decode(NbtOps.INSTANCE, result).result().orElseThrow().getFirst();
++        assertEquals(key.asString(), location.toString());
++    }
++
++    @ParameterizedTest
++    @EnumSource(value = ClickEvent.Action.class, mode = EnumSource.Mode.EXCLUDE, names = {"OPEN_FILE"})
++    void testClickEvent(final ClickEvent.Action action) {
++        final ClickEvent event = ClickEvent.clickEvent(action, RandomStringUtils.randomAlphanumeric(20));
++        final Tag result = CLICK_EVENT_CODEC.encodeStart(NbtOps.INSTANCE, event).result().orElseThrow();
++        final net.minecraft.network.chat.ClickEvent nms = net.minecraft.network.chat.ClickEvent.CODEC.decode(NbtOps.INSTANCE, result).result().orElseThrow().getFirst();
++        assertEquals(event.action().toString(), nms.getAction().getSerializedName());
++        assertEquals(event.value(), nms.getValue());
++    }
++
++    @Test
++    void testShowTextHoverEvent() {
++        final HoverEvent<Component> hoverEvent = HoverEvent.hoverEvent(HoverEvent.Action.SHOW_TEXT, text("hello"));
++        final Tag result = HOVER_EVENT_CODEC.encodeStart(NbtOps.INSTANCE, hoverEvent).result().orElseThrow();
++        final net.minecraft.network.chat.HoverEvent nms = net.minecraft.network.chat.HoverEvent.CODEC.decode(NbtOps.INSTANCE, result).result().orElseThrow().getFirst();
++        assertEquals(hoverEvent.action().toString(), nms.getAction().getSerializedName());
++        assertNotNull(nms.getValue(net.minecraft.network.chat.HoverEvent.Action.SHOW_TEXT));
++    }
++
++    @Test
++    void testShowItemHoverEvent() throws IOException {
++        final ItemStack stack = new ItemStack(Items.PUMPKIN, 3);
++        stack.setHoverName(net.minecraft.network.chat.Component.literal("NAME"));
++        final HoverEvent<HoverEvent.ShowItem> hoverEvent = HoverEvent.showItem(key("minecraft:pumpkin"), 3, BinaryTagHolder.encode(requireNonNull(stack.getTag()), NBT_CODEC));
++        final Tag result = HOVER_EVENT_CODEC.encodeStart(NbtOps.INSTANCE, hoverEvent).result().orElseThrow();
++        final DataResult<Pair<net.minecraft.network.chat.HoverEvent, Tag>> dataResult = net.minecraft.network.chat.HoverEvent.CODEC.decode(NbtOps.INSTANCE, result);
++        assertTrue(dataResult.result().isPresent(), () -> dataResult + " result is not present");
++        final net.minecraft.network.chat.HoverEvent nms = dataResult.result().orElseThrow().getFirst();
++        assertEquals(hoverEvent.action().toString(), nms.getAction().getSerializedName());
++        final net.minecraft.network.chat.HoverEvent.ItemStackInfo value = nms.getValue(net.minecraft.network.chat.HoverEvent.Action.SHOW_ITEM);
++        assertNotNull(value);
++        assertEquals(hoverEvent.value().count(), value.count);
++        assertEquals(hoverEvent.value().item().asString(), BuiltInRegistries.ITEM.getKey(value.item).toString());
++        assertEquals(stack.getTag(), value.tag.orElse(null));
++    }
++
++    @Test
++    void testShowEntityHoverEvent() {
++        UUID uuid = UUID.randomUUID();
++        final HoverEvent<HoverEvent.ShowEntity> hoverEvent = showEntity(key("minecraft:wolf"), uuid, text("NAME"));
++        final Tag result = HOVER_EVENT_CODEC.encodeStart(NbtOps.INSTANCE, hoverEvent).result().orElseThrow();
++        final DataResult<Pair<net.minecraft.network.chat.HoverEvent, Tag>> dataResult = net.minecraft.network.chat.HoverEvent.CODEC.decode(NbtOps.INSTANCE, result);
++        assertTrue(dataResult.result().isPresent(), () -> dataResult + " result is not present");
++        final net.minecraft.network.chat.HoverEvent nms = dataResult.result().orElseThrow().getFirst();
++        assertEquals(hoverEvent.action().toString(), nms.getAction().getSerializedName());
++        final net.minecraft.network.chat.HoverEvent.EntityTooltipInfo value = nms.getValue(net.minecraft.network.chat.HoverEvent.Action.SHOW_ENTITY);
++        assertNotNull(value);
++        assertEquals(hoverEvent.value().type().asString(), BuiltInRegistries.ENTITY_TYPE.getKey(value.type).toString());
++        assertEquals(hoverEvent.value().id(), value.id);
++        assertEquals("NAME", value.name.orElseThrow().getString());
++    }
++
++    @Test
++    void testSimpleStyle() {
++        final Style style = style().decorate(TextDecoration.BOLD).color(NamedTextColor.RED).build();
++        final Tag result = STYLE_MAP_CODEC.codec().encodeStart(NbtOps.INSTANCE, style).result().orElseThrow();
++        final DataResult<Pair<net.minecraft.network.chat.Style, Tag>> dataResult = net.minecraft.network.chat.Style.Serializer.CODEC.decode(NbtOps.INSTANCE, result);
++        assertTrue(dataResult.result().isPresent(), () -> dataResult + " result is not present");
++        final net.minecraft.network.chat.Style nms = dataResult.result().get().getFirst();
++        assertTrue(nms.isBold());
++        assertEquals(requireNonNull(style.color()).value(), requireNonNull(nms.getColor()).getValue());
++    }
++
++    @ParameterizedTest
++    @MethodSource({"testStyles"})
++    void testDirectRoundTripStyle(final Style style) {
++        testDirectRoundTrip(STYLE_MAP_CODEC.codec(), style);
++    }
++
++    @ParameterizedTest
++    @MethodSource({"testStyles"})
++    void testMinecraftRoundTripStyle(final Style style) {
++        testMinecraftRoundTrip(STYLE_MAP_CODEC.codec(), net.minecraft.network.chat.Style.Serializer.CODEC, style);
++    }
++
++    @ParameterizedTest
++    @MethodSource({"testTexts", "testTranslatables", "testKeybinds", "testScores",
++        "testSelectors", "testBlockNbts", "testEntityNbts", "testStorageNbts"})
++    void testDirectRoundTripComponent(final Component component) {
++        testDirectRoundTrip(COMPONENT_CODEC, component);
++    }
++
++    @ParameterizedTest
++    @MethodSource({"testTexts", "testTranslatables", "testKeybinds", "testScores",
++        "testSelectors", "testBlockNbts", "testEntityNbts", "testStorageNbts"})
++    void testMinecraftRoundTripComponent(final Component component) {
++        testMinecraftRoundTrip(COMPONENT_CODEC, ComponentSerialization.CODEC, component);
++    }
++
++    @ParameterizedTest
++    @MethodSource({"invalidData"})
++    void invalidThrows(final Tag input) {
++        assertThrows(RuntimeException.class, () -> {
++            require(
++                COMPONENT_CODEC.decode(NbtOps.INSTANCE, input),
++                msg -> "Failed to decode " + input + ": " + msg
++            );
++        });
++    }
++
++    static <A> void testDirectRoundTrip(final Codec<A> codec, final A adventure) {
++        final Tag encoded = require(
++            codec.encodeStart(NbtOps.INSTANCE, adventure),
++            msg -> "Failed to encode " + adventure + ": " + msg
++        );
++        final Pair<A, Tag> roundTripResult = require(
++            codec.decode(NbtOps.INSTANCE, encoded),
++            msg -> "Failed to decode " + encoded + ": " + msg
++        );
++        assertEquals(adventure, roundTripResult.getFirst());
++    }
++
++    static <A, M> void testMinecraftRoundTrip(final Codec<A> adventureCodec, final Codec<M> minecraftCodec, final A adventure) {
++        final Tag encoded = require(
++            adventureCodec.encodeStart(NbtOps.INSTANCE, adventure),
++            msg -> "Failed to encode " + adventure + ": " + msg
++        );
++        final M minecraftResult = require(
++            minecraftCodec.decode(NbtOps.INSTANCE, encoded),
++            msg -> "Failed to decode to Minecraft: " + encoded + "; " + msg
++        ).getFirst();
++        final Tag minecraftReEncoded = require(
++            minecraftCodec.encodeStart(NbtOps.INSTANCE, minecraftResult),
++            msg -> "Failed to re-encode Minecraft: " + minecraftResult + "; " + msg
++        );
++        final Pair<A, Tag> roundTripResult = require(
++            adventureCodec.decode(NbtOps.INSTANCE, minecraftReEncoded),
++            msg -> "Failed to decode " + minecraftReEncoded + ": " + msg
++        );
++        assertEquals(adventure, roundTripResult.getFirst());
++    }
++
++    static <R> R require(final DataResult<R> result, final Function<String, String> errorMessage) {
++        return result.get().map(Function.identity(), r -> {
++            throw new RuntimeException(errorMessage.apply(r.message()));
++        });
++    }
++
++    static List<Tag> invalidData() {
++        return List.of(
++            IntTag.valueOf(-1),
++            ByteTag.ZERO,
++            new CompoundTag(),
++            new ListTag()
++        );
++    }
++
++    static List<Style> testStyles() {
++        return List.of(
++            Style.empty(),
++            style(color(0x0a1ab9)),
++            style(NamedTextColor.LIGHT_PURPLE),
++            style(TextDecoration.BOLD),
++            style(TextDecoration.BOLD.withState(false)),
++            style(TextDecoration.BOLD.withState(TextDecoration.State.NOT_SET)),
++            style()
++                .font(key("kyori", "kittens"))
++                .color(NamedTextColor.RED)
++                .decoration(TextDecoration.BOLD, true)
++                .clickEvent(openUrl("https://github.com"))
++                .build(),
++            style()
++                .hoverEvent(HoverEvent.showEntity(HoverEvent.ShowEntity.showEntity(
++                    Key.key(Key.MINECRAFT_NAMESPACE, "pig"),
++                    UUID.randomUUID(),
++                    Component.text("Dolores", TextColor.color(0x0a1ab9))
++                )))
++                .build()
++        );
++    }
++
++    static List<Component> testTexts() {
++        return List.of(
++            Component.empty(),
++            text("Hello, world."),
++            text().content("c")
++                .color(NamedTextColor.GOLD)
++                .append(text("o", NamedTextColor.DARK_AQUA))
++                .append(text("l", NamedTextColor.LIGHT_PURPLE))
++                .append(text("o", NamedTextColor.DARK_PURPLE))
++                .append(text("u", NamedTextColor.BLUE))
++                .append(text("r", NamedTextColor.DARK_GREEN))
++                .append(text("s", NamedTextColor.RED))
++                .build(),
++            text().content("This is a test.")
++                .color(NamedTextColor.DARK_PURPLE)
++                .hoverEvent(HoverEvent.showText(text("A test.")))
++                .append(text(" "))
++                .append(text("A what?", NamedTextColor.DARK_AQUA))
++                .build(),
++            text().append(text("Hello")).build(),
++            miniMessage().deserialize("<rainbow>|||||||||||||||||||||||<bold>|||||||||||||</bold>|||||||||")
++        );
++    }
++
++    static List<Component> testTranslatables() {
++        final String key = "multiplayer.player.left";
++        final UUID id = UUID.fromString("eb121687-8b1a-4944-bd4d-e0a818d9dfe2");
++        final String name = "kashike";
++        final String command = String.format("/msg %s ", name);
++
++        return List.of(
++            translatable(key),
++            translatable()
++                .key("thisIsA")
++                .fallback("This is a test.")
++                .build(),
++            translatable(
++                key,
++                text().content(name)
++                    .clickEvent(suggestCommand(command))
++                    .hoverEvent(showEntity(HoverEvent.ShowEntity.showEntity(
++                        key("minecraft", "player"),
++                        id,
++                        text(name)
++                    )))
++                    .build()
++            ).color(NamedTextColor.YELLOW)
++        );
++    }
++
++    static List<Component> testKeybinds() {
++        return List.of(keybind("key.jump"));
++    }
++
++    static List<Component> testScores() {
++        final String name = "abc";
++        final String objective = "def";
++
++        return List.of(score(name, objective));
++    }
++
++    static List<Component> testSelectors() {
++        final String selector = "@p";
++
++        return List.of(
++            selector(selector),
++            selector(selector, text(','))
++        );
++    }
++
++    static List<Component> testBlockNbts() {
++        return List.of(
++            blockNBT().nbtPath("abc").localPos(1.23d, 2.0d, 3.89d).build(),
++            blockNBT().nbtPath("xyz").absoluteWorldPos(4, 5, 6).interpret(true).build(),
++            blockNBT().nbtPath("eeee").relativeWorldPos(7, 83, 900)
++                .separator(text(';'))
++                .build(),
++            blockNBT().nbtPath("qwert").worldPos(
++                BlockNBTComponent.WorldPos.Coordinate.absolute(12),
++                BlockNBTComponent.WorldPos.Coordinate.relative(3),
++                BlockNBTComponent.WorldPos.Coordinate.absolute(1200)
++            ).build()
++        );
++    }
++
++    static List<Component> testEntityNbts() {
++        return List.of(
++            entityNBT().nbtPath("abc").selector("test").build(),
++            entityNBT().nbtPath("abc").selector("test").separator(text(',')).build(),
++            entityNBT().nbtPath("abc").selector("test").interpret(true).build()
++        );
++    }
++
++    static List<Component> testStorageNbts() {
++        return List.of(
++            storageNBT().nbtPath("abc").storage(key("doom:apple")).build(),
++            storageNBT().nbtPath("abc").storage(key("doom:apple")).separator(text(", ")).build(),
++            storageNBT().nbtPath("abc").storage(key("doom:apple")).interpret(true).build()
++        );
++    }
++}
 diff --git a/src/test/java/io/papermc/paper/adventure/ComponentServicesTest.java b/src/test/java/io/papermc/paper/adventure/ComponentServicesTest.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..98114b8fdc441f2a1642abf230457c2b5208bb5c
diff --git a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch b/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
index 206e5c3ec9..a6f3f35ad4 100644
--- a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Player Tab List and Title APIs
 
 
 diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index bc7d0cc8d66f07b45cffd9952829cc9bed9ce260..3374ea2fa61e1683c4c4d7ea3ef9b8a20cd09f62 100644
+index 50c7e0a449ea9d71e21e86b4f03dac0298f96130..dd542b8b235115c4ce54578120d9bc184e852676 100644
 --- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 +++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-@@ -538,6 +538,12 @@ public class FriendlyByteBuf extends ByteBuf {
-         // TODO this.adventure$locale
+@@ -541,6 +541,12 @@ public class FriendlyByteBuf extends ByteBuf {
          return this.writeWithCodec(NbtOps.INSTANCE, ComponentSerialization.CODEC, text);
+         // Paper end - adventure
      }
 +    // Paper start - deprecated Tab List & Title APIs
 +    @Deprecated
diff --git a/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch
index 1a13167e8c..a245574757 100644
--- a/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -206,10 +206,10 @@ index 0000000000000000000000000000000000000000..8f07539a82f449ad217e316a7513a170
 +
 +}
 diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-index 3dc613116c086444ece88bcb0a569eeea953074f..db54a9c32578defa02fa58dc694c96684a4885ac 100644
+index 1fb9b0ea9f2dbff12d8d2fbc2ad2f4d88ca9f7ad..66ff48a12c8322cfbfd17c470d03dad1f912d123 100644
 --- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 +++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-@@ -20,6 +20,7 @@ import net.kyori.adventure.text.TranslatableComponent;
+@@ -22,6 +22,7 @@ import net.kyori.adventure.text.TranslatableComponent;
  import net.kyori.adventure.text.flattener.ComponentFlattener;
  import net.kyori.adventure.text.format.TextColor;
  import net.kyori.adventure.text.serializer.ComponentSerializer;
@@ -217,14 +217,12 @@ index 3dc613116c086444ece88bcb0a569eeea953074f..db54a9c32578defa02fa58dc694c9668
  import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
  import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
  import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-@@ -107,6 +108,9 @@ public final class PaperAdventure {
+@@ -109,6 +110,7 @@ public final class PaperAdventure {
      public static final AttributeKey<Locale> LOCALE_ATTRIBUTE = AttributeKey.valueOf("adventure:locale"); // init after FLATTENER because classloading triggered here might create a logger
      @Deprecated
      public static final PlainComponentSerializer PLAIN = PlainComponentSerializer.builder().flattener(FLATTENER).build();
-+
 +    public static final ANSIComponentSerializer ANSI_SERIALIZER = ANSIComponentSerializer.builder().flattener(FLATTENER).build();
-+
-     private static final Codec<CompoundTag, String, IOException, IOException> NBT_CODEC = new Codec<CompoundTag, String, IOException, IOException>() {
+     static final Codec<CompoundTag, String, IOException, IOException> NBT_CODEC = new Codec<CompoundTag, String, IOException, IOException>() {
          @Override
          public @NotNull CompoundTag decode(final @NotNull String encoded) throws IOException {
 diff --git a/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java b/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java
diff --git a/patches/server/0233-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0233-Remove-unnecessary-itemmeta-handling.patch
index 1f4a5d63d1..4c5bdbea5a 100644
--- a/patches/server/0233-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/server/0233-Remove-unnecessary-itemmeta-handling.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove unnecessary itemmeta handling
 
 
 diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index 3374ea2fa61e1683c4c4d7ea3ef9b8a20cd09f62..23d78a3193c30dd99d42182628c0e9e4527fc143 100644
+index dd542b8b235115c4ce54578120d9bc184e852676..6b566413cd53f84820f0920249037fc9c2c1c4ca 100644
 --- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 +++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-@@ -642,7 +642,7 @@ public class FriendlyByteBuf extends ByteBuf {
+@@ -645,7 +645,7 @@ public class FriendlyByteBuf extends ByteBuf {
              if (item.canBeDepleted() || item.shouldOverrideMultiplayerNbt()) {
                  // Spigot start - filter
                  stack = stack.copy();
@@ -17,7 +17,7 @@ index 3374ea2fa61e1683c4c4d7ea3ef9b8a20cd09f62..23d78a3193c30dd99d42182628c0e9e4
                  // Spigot end
                  nbttagcompound = stack.getTag();
              }
-@@ -663,7 +663,7 @@ public class FriendlyByteBuf extends ByteBuf {
+@@ -666,7 +666,7 @@ public class FriendlyByteBuf extends ByteBuf {
  
              itemstack.setTag(this.readNbt());
              // CraftBukkit start
diff --git a/patches/server/0421-incremental-chunk-and-player-saving.patch b/patches/server/0420-incremental-chunk-and-player-saving.patch
similarity index 98%
rename from patches/server/0421-incremental-chunk-and-player-saving.patch
rename to patches/server/0420-incremental-chunk-and-player-saving.patch
index 2b14124fc9..5ad93c49bb 100644
--- a/patches/server/0421-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0420-incremental-chunk-and-player-saving.patch
@@ -76,7 +76,7 @@ index 974b4970be214ca36a801d39932abcc751e540a5..63fad53a9184d7ab97f143b7d85ae9ef
      public void close() throws IOException {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d672b95fe589a57d469811a12420d7d16ea173c7..93a60c6dcbe29637e96aa57a76a5ceb544495fb5 100644
+index c877aca6093435be9d349c07ea1b01d06bcbd416..17802108f41c98b77c89922451ee56b5ba2dcde2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1302,6 +1302,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0420-initial-work-on-native-Adventure-codecs.patch b/patches/server/0420-initial-work-on-native-Adventure-codecs.patch
deleted file mode 100644
index f811852da0..0000000000
--- a/patches/server/0420-initial-work-on-native-Adventure-codecs.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Tue, 5 Dec 2023 16:47:40 -0800
-Subject: [PATCH] initial work on native Adventure codecs
-
-== AT ==
-public net.minecraft.network.chat.HoverEvent$ItemStackInfo item
-public net.minecraft.network.chat.HoverEvent$ItemStackInfo count
-public net.minecraft.network.chat.HoverEvent$ItemStackInfo tag
-public net.minecraft.network.chat.contents.TranslatableContents filterAllowedArguments(Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
-
-diff --git a/src/main/java/io/papermc/paper/adventure/AdventureCodecs.java b/src/main/java/io/papermc/paper/adventure/AdventureCodecs.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..87ad79ae42595116a0c1976c418a184cf0d6ddba
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/adventure/AdventureCodecs.java
-@@ -0,0 +1,273 @@
-+package io.papermc.paper.adventure;
-+
-+import com.mojang.datafixers.util.Either;
-+import com.mojang.serialization.Codec;
-+import com.mojang.serialization.DataResult;
-+import com.mojang.serialization.MapCodec;
-+import com.mojang.serialization.codecs.RecordCodecBuilder;
-+import java.io.IOException;
-+import java.util.Collections;
-+import java.util.List;
-+import java.util.Optional;
-+import java.util.function.Consumer;
-+import java.util.function.Function;
-+import java.util.function.Predicate;
-+import net.kyori.adventure.key.Key;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.KeybindComponent;
-+import net.kyori.adventure.text.ScoreComponent;
-+import net.kyori.adventure.text.SelectorComponent;
-+import net.kyori.adventure.text.TextComponent;
-+import net.kyori.adventure.text.TranslatableComponent;
-+import net.kyori.adventure.text.event.ClickEvent;
-+import net.kyori.adventure.text.event.HoverEvent;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import net.kyori.adventure.text.format.Style;
-+import net.kyori.adventure.text.format.TextColor;
-+import net.kyori.adventure.text.format.TextDecoration;
-+import net.minecraft.core.UUIDUtil;
-+import net.minecraft.core.registries.BuiltInRegistries;
-+import net.minecraft.nbt.CompoundTag;
-+import net.minecraft.network.chat.ComponentSerialization;
-+import net.minecraft.network.chat.contents.KeybindContents;
-+import net.minecraft.network.chat.contents.ScoreContents;
-+import net.minecraft.network.chat.contents.TranslatableContents;
-+import net.minecraft.util.ExtraCodecs;
-+import net.minecraft.util.StringRepresentable;
-+import net.minecraft.world.item.Item;
-+import net.minecraft.world.item.ItemStack;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+import org.intellij.lang.annotations.Subst;
-+
-+import static net.kyori.adventure.text.Component.text;
-+import static net.minecraft.util.ExtraCodecs.recursive;
-+import static net.minecraft.util.ExtraCodecs.strictOptionalField;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class AdventureCodecs {
-+
-+    public static final Codec<Component> COMPONENT_CODEC = recursive("adventure Component",  AdventureCodecs::createCodec);
-+
-+    private static final Codec<TextColor> TEXT_COLOR_CODEC = Codec.STRING.comapFlatMap(s -> {
-+        if (s.startsWith("#")) {
-+            @Nullable TextColor value = TextColor.fromHexString(s);
-+            return value != null ? DataResult.success(value) : DataResult.error(() -> "Cannot convert " + s + " to adventure TextColor");
-+        } else {
-+            final @Nullable NamedTextColor value = NamedTextColor.NAMES.value(s);
-+            return value != null ? DataResult.success(value) : DataResult.error(() -> "Cannot convert " + s + " to adventure NamedTextColor");
-+        }
-+    }, textColor -> {
-+        if (textColor instanceof NamedTextColor named) {
-+            return NamedTextColor.NAMES.keyOrThrow(named);
-+        } else {
-+            return textColor.asHexString();
-+        }
-+    });
-+
-+    private static final Codec<Key> KEY_CODEC = Codec.STRING.comapFlatMap(s -> {
-+        return Key.parseable(s) ? DataResult.success(Key.key(s)) : DataResult.error(() -> "Cannot convert " + s + " to adventure Key");
-+    }, Key::asString);
-+
-+    private static final Codec<ClickEvent.Action> CLICK_EVENT_ACTION_CODEC = Codec.STRING.comapFlatMap(s -> {
-+        final ClickEvent.@Nullable Action value = ClickEvent.Action.NAMES.value(s);
-+        return value != null ? DataResult.success(value) : DataResult.error(() -> "Cannot convert " + s + " to adventure ClickEvent$Action");
-+    }, ClickEvent.Action.NAMES::keyOrThrow);
-+    private static final Codec<ClickEvent> CLICK_EVENT_CODEC = RecordCodecBuilder.create((instance) -> {
-+        return instance.group(
-+            CLICK_EVENT_ACTION_CODEC.fieldOf("action").forGetter(ClickEvent::action),
-+            Codec.STRING.fieldOf("value").forGetter(ClickEvent::value)
-+        ).apply(instance, ClickEvent::clickEvent);
-+    });
-+
-+    private static Codec<HoverEvent.ShowEntity> showEntityCodec(final Codec<Component> componentCodec) {
-+        return RecordCodecBuilder.create((instance) -> {
-+            return instance.group(
-+                KEY_CODEC.fieldOf("type").forGetter(HoverEvent.ShowEntity::type),
-+                UUIDUtil.LENIENT_CODEC.fieldOf("id").forGetter(HoverEvent.ShowEntity::id),
-+                strictOptionalField(componentCodec, "name").forGetter(he -> Optional.ofNullable(he.name()))
-+            ).apply(instance, (key, uuid, component) -> {
-+                return HoverEvent.ShowEntity.showEntity(key, uuid, component.orElse(null));
-+            });
-+        });
-+    }
-+
-+    private static Codec<HoverEvent.ShowItem> showItemCodec(final Codec<Component> componentCodec) {
-+        return net.minecraft.network.chat.HoverEvent.ItemStackInfo.CODEC.xmap(isi -> {
-+            @Subst("key") final String typeKey = BuiltInRegistries.ITEM.getKey(isi.item).toString();
-+            return HoverEvent.ShowItem.showItem(Key.key(typeKey), isi.count, PaperAdventure.asBinaryTagHolder(isi.tag.orElse(null)));
-+        }, si -> {
-+            final Item itemType = BuiltInRegistries.ITEM.get(PaperAdventure.asVanilla(si.item()));
-+            final ItemStack stack;
-+            try {
-+                final @Nullable CompoundTag tag = si.nbt() != null ? si.nbt().get(PaperAdventure.NBT_CODEC) : null;
-+                stack = new ItemStack(BuiltInRegistries.ITEM.wrapAsHolder(itemType), si.count(), Optional.ofNullable(tag));
-+            } catch (IOException e) {
-+                throw new RuntimeException(e);
-+            }
-+            return new net.minecraft.network.chat.HoverEvent.ItemStackInfo(stack);
-+        });
-+    }
-+
-+    // TODO legacies
-+    private static final HoverEventType<HoverEvent.ShowEntity> SHOW_ENTITY_HOVER_EVENT_TYPE = new HoverEventType<>(AdventureCodecs::showEntityCodec, HoverEvent.Action.SHOW_ENTITY, "show_entity");
-+    private static final HoverEventType<HoverEvent.ShowItem> SHOW_ITEM_HOVER_EVENT_TYPE = new HoverEventType<>(AdventureCodecs::showItemCodec, HoverEvent.Action.SHOW_ITEM, "show_item");
-+    private static final HoverEventType<Component> SHOW_TEXT_HOVER_EVENT_TYPE = new HoverEventType<>(Function.identity(), HoverEvent.Action.SHOW_TEXT, "show_text");
-+    private static final Codec<HoverEventType<?>> HOVER_EVENT_TYPE_CODEC = StringRepresentable.fromValues(() -> new HoverEventType<?>[]{ SHOW_ENTITY_HOVER_EVENT_TYPE, SHOW_ITEM_HOVER_EVENT_TYPE, SHOW_TEXT_HOVER_EVENT_TYPE });
-+
-+    private record HoverEventType<V>(Function<Codec<Component>, Codec<HoverEvent<V>>> codec, String id) implements StringRepresentable {
-+        private HoverEventType(final Function<Codec<Component>, Codec<V>> contentCodec, final HoverEvent.Action<V> action, final String id) {
-+            this(cc -> contentCodec.apply(cc).xmap(v -> {
-+                return HoverEvent.hoverEvent(action, v);
-+            }, HoverEvent::value), id);
-+        }
-+        @Override
-+        public String getSerializedName() {
-+            return this.id;
-+        }
-+    }
-+
-+    private static MapCodec<HoverEvent<?>> hoverEventMapCodec(final Codec<Component> componentCodec) {
-+        return HOVER_EVENT_TYPE_CODEC.dispatchMap("action", he -> {
-+            if (he.action() == HoverEvent.Action.SHOW_ENTITY) {
-+                return SHOW_ENTITY_HOVER_EVENT_TYPE;
-+            } else if (he.action() == HoverEvent.Action.SHOW_ITEM) {
-+                return SHOW_ITEM_HOVER_EVENT_TYPE;
-+            } else if (he.action() == HoverEvent.Action.SHOW_TEXT) {
-+                return SHOW_TEXT_HOVER_EVENT_TYPE;
-+            } else {
-+                throw new IllegalStateException();
-+            }
-+        }, het -> het.codec.apply(componentCodec));
-+    }
-+
-+    public static MapCodec<Style> styleCodec(final Codec<Component> componentCodec) {
-+        return RecordCodecBuilder.mapCodec((instance) -> {
-+            return instance.group(
-+                strictOptionalField(TEXT_COLOR_CODEC, "color").forGetter(nullableGetter(Style::color)),
-+                strictOptionalField(Codec.BOOL, "bold").forGetter(decorationGetter(TextDecoration.BOLD)),
-+                strictOptionalField(Codec.BOOL, "italic").forGetter(decorationGetter(TextDecoration.ITALIC)),
-+                strictOptionalField(Codec.BOOL, "underlined").forGetter(decorationGetter(TextDecoration.UNDERLINED)),
-+                strictOptionalField(Codec.BOOL, "strikethrough").forGetter(decorationGetter(TextDecoration.STRIKETHROUGH)),
-+                strictOptionalField(Codec.BOOL, "obfuscated").forGetter(decorationGetter(TextDecoration.OBFUSCATED)),
-+                strictOptionalField(CLICK_EVENT_CODEC, "clickEvent").forGetter(nullableGetter(Style::clickEvent)),
-+                strictOptionalField(hoverEventMapCodec(componentCodec).codec(), "hoverEvent").forGetter(nullableGetter(Style::hoverEvent)),
-+                strictOptionalField(Codec.STRING, "insertion").forGetter(nullableGetter(Style::insertion)),
-+                strictOptionalField(KEY_CODEC, "font").forGetter(nullableGetter(Style::font))
-+            ).apply(instance, (textColor, bold, italic, underlined, strikethrough, obfuscated, clickEvent, hoverEvent, insertion, font) -> {
-+                return Style.style(builder -> {
-+                    textColor.ifPresent(builder::color);
-+                    bold.ifPresent(styleBooleanConsumer(builder, TextDecoration.BOLD));
-+                    italic.ifPresent(styleBooleanConsumer(builder, TextDecoration.ITALIC));
-+                    underlined.ifPresent(styleBooleanConsumer(builder, TextDecoration.UNDERLINED));
-+                    strikethrough.ifPresent(styleBooleanConsumer(builder, TextDecoration.STRIKETHROUGH));
-+                    obfuscated.ifPresent(styleBooleanConsumer(builder, TextDecoration.OBFUSCATED));
-+                    clickEvent.ifPresent(builder::clickEvent);
-+                    hoverEvent.ifPresent(builder::hoverEvent);
-+                    insertion.ifPresent(builder::insertion);
-+                    font.ifPresent(builder::font);
-+                });
-+            });
-+        });
-+    }
-+    private static Consumer<Boolean> styleBooleanConsumer(final Style.Builder builder, final TextDecoration decoration) {
-+        return b -> builder.decoration(decoration, b);
-+    }
-+
-+    private static Function<Style, Optional<Boolean>> decorationGetter(final TextDecoration decoration) {
-+        return style -> Optional.ofNullable(style.decoration(decoration) == TextDecoration.State.NOT_SET ? null : style.decoration(decoration) == TextDecoration.State.TRUE);
-+    }
-+
-+    private static <R, T> Function<R, Optional<T>> nullableGetter(final Function<R, @Nullable T> getter) {
-+        return style -> Optional.ofNullable(getter.apply(style));
-+    }
-+
-+    private static final MapCodec<TextComponent> TEXT_COMPONENT_MAP_CODEC = RecordCodecBuilder.mapCodec((instance) -> {
-+        return instance.group(Codec.STRING.fieldOf("text").forGetter(TextComponent::content)).apply(instance, Component::text);
-+    });
-+    private static final Codec<Object> PRIMITIVE_ARG_CODEC = ExtraCodecs.validate(ExtraCodecs.JAVA, TranslatableContents::filterAllowedArguments);
-+    private static final Codec<Component> ARG_CODEC = Codec.either(PRIMITIVE_ARG_CODEC, COMPONENT_CODEC).xmap((primitiveOrComponent) -> {
-+        return primitiveOrComponent.map(o -> text(String.valueOf(o)), Function.identity()); // just toString all primitives (not 100% correct to vanilla spec)
-+    }, Either::right);
-+    private static final MapCodec<TranslatableComponent> TRANSLATABLE_COMPONENT_MAP_CODEC = RecordCodecBuilder.mapCodec((instance) -> {
-+        return instance.group(
-+            Codec.STRING.fieldOf("translate").forGetter(TranslatableComponent::key),
-+            Codec.STRING.optionalFieldOf("fallback").forGetter(nullableGetter(TranslatableComponent::fallback)),
-+            strictOptionalField(ARG_CODEC.listOf(), "with").forGetter(c -> c.args().isEmpty() ? Optional.empty() : Optional.of(c.args()))
-+        ).apply(instance, (key, fallback, components) -> {
-+            return Component.translatable(key, components.orElse(Collections.emptyList())).fallback(fallback.orElse(null));
-+        });
-+    });
-+
-+    private static final MapCodec<KeybindComponent> KEYBIND_COMPONENT_MAP_CODEC = KeybindContents.CODEC.xmap(k -> Component.keybind(k.getName()), k -> new KeybindContents(k.keybind()));
-+    private static final MapCodec<ScoreComponent> SCORE_COMPONENT_MAP_CODEC = ScoreContents.INNER_CODEC.xmap(s -> Component.score(s.getName(), s.getObjective()), s -> new ScoreContents(s.name(), s.objective()));
-+    private static final MapCodec<SelectorComponent> SELECTOR_COMPONENT_MAP_CODEC = RecordCodecBuilder.mapCodec((instance) -> {
-+        return instance.group(
-+            Codec.STRING.fieldOf("selector").forGetter(SelectorComponent::pattern),
-+            strictOptionalField(COMPONENT_CODEC, "separator").forGetter(nullableGetter(SelectorComponent::separator))
-+        ).apply(instance, (selector, component) -> Component.selector(selector, component.orElse(null)));
-+    });
-+
-+    private record ComponentType<C extends Component>(MapCodec<C> codec, Predicate<Component> test, String id) implements StringRepresentable {
-+        @Override
-+        public String getSerializedName() {
-+            return this.id;
-+        }
-+    }
-+
-+    private static final ComponentType<TextComponent> PLAIN = new ComponentType<>(TEXT_COMPONENT_MAP_CODEC, TextComponent.class::isInstance, "text");
-+    private static final ComponentType<TranslatableComponent> TRANSLATABLE = new ComponentType<>(TRANSLATABLE_COMPONENT_MAP_CODEC, TranslatableComponent.class::isInstance, "translatable");
-+    private static final ComponentType<KeybindComponent> KEYBIND = new ComponentType<>(KEYBIND_COMPONENT_MAP_CODEC, KeybindComponent.class::isInstance, "keybind");
-+    private static final ComponentType<ScoreComponent> SCORE = new ComponentType<>(SCORE_COMPONENT_MAP_CODEC, ScoreComponent.class::isInstance, "score");
-+    private static final ComponentType<SelectorComponent> SELECTOR = new ComponentType<>(SELECTOR_COMPONENT_MAP_CODEC, SelectorComponent.class::isInstance, "selector");
-+
-+    private static Codec<Component> createCodec(final Codec<Component> selfCodec) {
-+        final ComponentType<?>[] types = new ComponentType<?>[]{PLAIN, TRANSLATABLE, KEYBIND, SCORE, SELECTOR};
-+        final MapCodec<Component> legacyCodec = ComponentSerialization.createLegacyComponentMatcher(types, ComponentType::codec, component -> {
-+            for (final ComponentType<?> type : types) {
-+                if (type.test().test(component)) {
-+                    return type;
-+                }
-+            }
-+            throw new IllegalStateException("Unexpected component type " + component);
-+        }, "type");
-+
-+        final Codec<Component> directCodec = RecordCodecBuilder.create((instance) -> {
-+            return instance.group(
-+                legacyCodec.forGetter(Function.identity()),
-+                strictOptionalField(ExtraCodecs.nonEmptyList(selfCodec.listOf()), "extra", List.of()).forGetter(Component::children),
-+                styleCodec(selfCodec).forGetter(Component::style)
-+            ).apply(instance, (component, children, style) -> {
-+                return component.style(style).children(children);
-+            });
-+        });
-+
-+        return Codec.either(Codec.either(Codec.STRING, ExtraCodecs.nonEmptyList(selfCodec.listOf())), directCodec).xmap((stringOrListOrComponent) -> {
-+            return stringOrListOrComponent.map((stringOrList) -> stringOrList.map(Component::text, AdventureCodecs::createFromList), Function.identity());
-+        }, (text) -> {
-+            final @Nullable String string = tryCollapseToString(text);
-+            return string != null ? Either.left(Either.left(string)) : Either.right(text);
-+        });
-+    }
-+
-+    private static @Nullable String tryCollapseToString(final Component component) {
-+        if (component instanceof final TextComponent textComponent) {
-+            if (component.children().isEmpty() && component.style().isEmpty()) {
-+                return textComponent.content();
-+            }
-+        }
-+        return null;
-+    }
-+
-+    private static Component createFromList(final List<Component> components) {
-+        Component component = components.get(0);
-+        for (int i = 1; i < components.size(); i++) {
-+            component = component.append(components.get(i));
-+        }
-+        return component;
-+    }
-+
-+    private AdventureCodecs() {
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-index db54a9c32578defa02fa58dc694c96684a4885ac..4ded541e9f2f19ef244fed290da3983b319f2c39 100644
---- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-+++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-@@ -111,7 +111,7 @@ public final class PaperAdventure {
- 
-     public static final ANSIComponentSerializer ANSI_SERIALIZER = ANSIComponentSerializer.builder().flattener(FLATTENER).build();
- 
--    private static final Codec<CompoundTag, String, IOException, IOException> NBT_CODEC = new Codec<CompoundTag, String, IOException, IOException>() {
-+    public static final Codec<CompoundTag, String, IOException, IOException> NBT_CODEC = new Codec<CompoundTag, String, IOException, IOException>() {
-         @Override
-         public @NotNull CompoundTag decode(final @NotNull String encoded) throws IOException {
-             try {
diff --git a/patches/server/0422-Support-old-UUID-format-for-NBT.patch b/patches/server/0421-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0422-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0421-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0423-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0422-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0423-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0422-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0424-Remove-some-streams-from-structures.patch b/patches/server/0423-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0424-Remove-some-streams-from-structures.patch
rename to patches/server/0423-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0425-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0424-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0425-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0424-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0426-Support-components-in-ItemMeta.patch b/patches/server/0425-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0426-Support-components-in-ItemMeta.patch
rename to patches/server/0425-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0427-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0426-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0427-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0426-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0428-Add-entity-liquid-API.patch b/patches/server/0427-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0428-Add-entity-liquid-API.patch
rename to patches/server/0427-Add-entity-liquid-API.patch
diff --git a/patches/server/0429-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0428-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0429-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0428-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0430-Add-PrepareResultEvent.patch b/patches/server/0429-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0430-Add-PrepareResultEvent.patch
rename to patches/server/0429-Add-PrepareResultEvent.patch
diff --git a/patches/server/0431-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0430-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0431-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0430-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0432-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0431-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0432-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0431-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0433-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0432-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0433-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0432-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0434-Fix-SPIGOT-5989.patch b/patches/server/0433-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0434-Fix-SPIGOT-5989.patch
rename to patches/server/0433-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0435-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0434-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0435-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0434-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0436-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0435-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0436-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0435-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0437-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0436-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0437-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0436-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0437-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0437-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0439-Fix-some-rails-connecting-improperly.patch b/patches/server/0438-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0439-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0438-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0440-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0439-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0440-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0439-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0441-Brand-support.patch b/patches/server/0440-Brand-support.patch
similarity index 98%
rename from patches/server/0441-Brand-support.patch
rename to patches/server/0440-Brand-support.patch
index 5f958d3be5..9db7930656 100644
--- a/patches/server/0441-Brand-support.patch
+++ b/patches/server/0440-Brand-support.patch
@@ -57,7 +57,7 @@ index 698fc66f8c232644f2d747c81f8ac2e39204fd7f..8cb7e9d67fc4713dc327ad0459518f06
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e10cad5e2b078ff6ff7cba84dfa105ea5704d019..630f98fc58579c0a900d8ff6712a463742f90338 100644
+index fb3b8f8eab00a2aadfee7780dfb0988f6fe3fc65..bb5c1a3ce83d737ac218a5b590b585916ac2d4d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2999,6 +2999,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0442-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0441-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0442-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0441-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0443-Don-t-require-FACING-data.patch b/patches/server/0442-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0443-Don-t-require-FACING-data.patch
rename to patches/server/0442-Don-t-require-FACING-data.patch
diff --git a/patches/server/0444-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0443-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0444-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0443-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0445-Add-moon-phase-API.patch b/patches/server/0444-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0445-Add-moon-phase-API.patch
rename to patches/server/0444-Add-moon-phase-API.patch
diff --git a/patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0445-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0445-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0447-Prevent-headless-pistons-from-being-created.patch b/patches/server/0446-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0447-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0446-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0448-Add-BellRingEvent.patch b/patches/server/0447-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0448-Add-BellRingEvent.patch
rename to patches/server/0447-Add-BellRingEvent.patch
diff --git a/patches/server/0449-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0448-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0449-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0448-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0450-Buffer-joins-to-world.patch b/patches/server/0449-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0450-Buffer-joins-to-world.patch
rename to patches/server/0449-Buffer-joins-to-world.patch
diff --git a/patches/server/0451-Eigencraft-redstone-implementation.patch b/patches/server/0450-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0451-Eigencraft-redstone-implementation.patch
rename to patches/server/0450-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0452-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0451-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0452-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0451-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0453-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0452-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0453-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0452-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0454-Add-more-Evoker-API.patch b/patches/server/0453-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0454-Add-more-Evoker-API.patch
rename to patches/server/0453-Add-more-Evoker-API.patch
diff --git a/patches/server/0455-Add-methods-to-get-translation-keys.patch b/patches/server/0454-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0455-Add-methods-to-get-translation-keys.patch
rename to patches/server/0454-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0456-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0455-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0456-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0455-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0457-Cache-block-data-strings.patch b/patches/server/0456-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0457-Cache-block-data-strings.patch
rename to patches/server/0456-Cache-block-data-strings.patch
diff --git a/patches/server/0458-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0457-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0458-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0457-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0459-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0458-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0459-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0458-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0460-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0459-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0460-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0459-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0461-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0460-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 96%
rename from patches/server/0461-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0460-Extend-block-drop-capture-to-capture-all-items-added.patch
index d7265e406a..4bb5817380 100644
--- a/patches/server/0461-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0460-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8ee66b28ee350564f0595541b904d593a6e3c8d5..6b5f325f847c096a4092ef3591627b21246601a0 100644
+index 0bd086f67f5d1f06f66499ae961c71e780a8290a..0fa23738e2a095f55960ebbcfe3198d4feff4b01 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1528,6 +1528,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0462-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0461-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0462-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0461-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0463-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0462-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0463-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0462-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0464-Entity-isTicking.patch b/patches/server/0463-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0464-Entity-isTicking.patch
rename to patches/server/0463-Entity-isTicking.patch
diff --git a/patches/server/0465-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0464-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0465-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0464-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0466-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0465-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0466-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0465-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0467-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0466-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0467-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0466-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0468-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0467-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0468-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0467-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0469-Optimise-getType-calls.patch b/patches/server/0468-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0469-Optimise-getType-calls.patch
rename to patches/server/0468-Optimise-getType-calls.patch
diff --git a/patches/server/0470-Villager-resetOffers.patch b/patches/server/0469-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0470-Villager-resetOffers.patch
rename to patches/server/0469-Villager-resetOffers.patch
diff --git a/patches/server/0471-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0470-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0471-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0470-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0472-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0471-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0472-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0471-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0473-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0472-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0473-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0472-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0474-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0473-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0474-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0473-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0475-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0474-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0475-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0474-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0476-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0475-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0476-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0475-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0477-Add-ignore-discounts-API.patch b/patches/server/0476-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0477-Add-ignore-discounts-API.patch
rename to patches/server/0476-Add-ignore-discounts-API.patch
diff --git a/patches/server/0478-Toggle-for-removing-existing-dragon.patch b/patches/server/0477-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0478-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0477-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0479-Fix-client-lag-on-advancement-loading.patch b/patches/server/0478-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0479-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0478-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0480-Item-no-age-no-player-pickup.patch b/patches/server/0479-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0480-Item-no-age-no-player-pickup.patch
rename to patches/server/0479-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0481-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0480-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0481-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0480-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0482-Beacon-API-custom-effect-ranges.patch b/patches/server/0481-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0482-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0481-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0483-Add-API-for-quit-reason.patch b/patches/server/0482-Add-API-for-quit-reason.patch
similarity index 98%
rename from patches/server/0483-Add-API-for-quit-reason.patch
rename to patches/server/0482-Add-API-for-quit-reason.patch
index 5c0e281f86..42c8560325 100644
--- a/patches/server/0483-Add-API-for-quit-reason.patch
+++ b/patches/server/0482-Add-API-for-quit-reason.patch
@@ -37,7 +37,7 @@ index 478abaffd1a80949b96f1c1774c98134be92e5ac..063742400f3065ace62b64b42d952517
      // Paper start - replace player chunk loader
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 9647f6a274f4a4d2a940759b9cbd00569ac3bb18..e9b46bc0650050595f9db503c747350dc1997a5d 100644
+index 8cb7e9d67fc4713dc327ad0459518f062dc9264e..4a2ff42950a9c15a3dbbf9ca7e3c43cad4c77404 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -302,6 +302,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0484-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0483-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0484-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0483-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0485-Expose-world-spawn-angle.patch b/patches/server/0484-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0485-Expose-world-spawn-angle.patch
rename to patches/server/0484-Expose-world-spawn-angle.patch
diff --git a/patches/server/0486-Add-Destroy-Speed-API.patch b/patches/server/0485-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0486-Add-Destroy-Speed-API.patch
rename to patches/server/0485-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0487-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0486-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 93%
rename from patches/server/0487-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0486-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index cfb4e7caf0..73114872d2 100644
--- a/patches/server/0487-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0486-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 630f98fc58579c0a900d8ff6712a463742f90338..32c51de77dcd278f895969c513e38075dad83ace 100644
+index bb5c1a3ce83d737ac218a5b590b585916ac2d4d7..b3cbd7779ca2046d952352a9cb9f509e8525b344 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2562,7 +2562,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0488-Add-LivingEntity-clearActiveItem.patch b/patches/server/0487-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0488-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0487-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0489-Add-PlayerItemCooldownEvent.patch b/patches/server/0488-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0489-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0488-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0490-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0489-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0490-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0489-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0491-More-lightning-API.patch b/patches/server/0490-More-lightning-API.patch
similarity index 100%
rename from patches/server/0491-More-lightning-API.patch
rename to patches/server/0490-More-lightning-API.patch
diff --git a/patches/server/0492-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0491-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0492-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0491-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0493-Added-missing-default-perms-for-commands.patch b/patches/server/0492-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0493-Added-missing-default-perms-for-commands.patch
rename to patches/server/0492-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0494-Add-PlayerShearBlockEvent.patch b/patches/server/0493-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0494-Add-PlayerShearBlockEvent.patch
rename to patches/server/0493-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0495-Limit-recipe-packets.patch b/patches/server/0494-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0495-Limit-recipe-packets.patch
rename to patches/server/0494-Limit-recipe-packets.patch
diff --git a/patches/server/0496-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0495-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0496-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0495-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0497-Player-Chunk-Load-Unload-Events.patch b/patches/server/0496-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0497-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0496-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0498-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0497-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0498-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0497-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0499-Expose-LivingEntity-hurt-direction.patch b/patches/server/0498-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0499-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0498-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0500-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0499-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0500-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0499-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0501-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0500-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0501-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0500-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0502-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0501-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0502-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0501-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0503-Implement-TargetHitEvent.patch b/patches/server/0502-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0503-Implement-TargetHitEvent.patch
rename to patches/server/0502-Implement-TargetHitEvent.patch
diff --git a/patches/server/0504-MC-4-Fix-item-position-desync.patch b/patches/server/0503-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0504-MC-4-Fix-item-position-desync.patch
rename to patches/server/0503-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0505-Additional-Block-Material-API-s.patch b/patches/server/0504-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0505-Additional-Block-Material-API-s.patch
rename to patches/server/0504-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0506-Fix-harming-potion-dupe.patch b/patches/server/0505-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0506-Fix-harming-potion-dupe.patch
rename to patches/server/0505-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0507-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0506-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0507-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0506-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0508-Cache-burn-durations.patch b/patches/server/0507-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0508-Cache-burn-durations.patch
rename to patches/server/0507-Cache-burn-durations.patch
diff --git a/patches/server/0509-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0508-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0509-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0508-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0510-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0509-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0510-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0509-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0511-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0510-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0511-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0510-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0512-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0511-Fix-interact-event-not-being-called-sometimes.patch
similarity index 100%
rename from patches/server/0512-Fix-interact-event-not-being-called-sometimes.patch
rename to patches/server/0511-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0513-Zombie-API-breaking-doors.patch b/patches/server/0512-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0513-Zombie-API-breaking-doors.patch
rename to patches/server/0512-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0514-Fix-nerfed-slime-when-splitting.patch b/patches/server/0513-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0514-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0513-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0515-Add-EntityLoadCrossbowEvent.patch b/patches/server/0514-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0515-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0514-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0516-Added-WorldGameRuleChangeEvent.patch b/patches/server/0515-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0516-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0515-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0517-Added-ServerResourcesReloadedEvent.patch b/patches/server/0516-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0517-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0516-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0518-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0517-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0518-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0517-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0519-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0518-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0519-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0518-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0520-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0519-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0520-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0519-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0521-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0520-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0521-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0520-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0522-Configurable-door-breaking-difficulty.patch b/patches/server/0521-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0522-Configurable-door-breaking-difficulty.patch
rename to patches/server/0521-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0523-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0522-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0523-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0522-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0524-Remove-stale-POIs.patch b/patches/server/0523-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0524-Remove-stale-POIs.patch
rename to patches/server/0523-Remove-stale-POIs.patch
diff --git a/patches/server/0525-Fix-villager-boat-exploit.patch b/patches/server/0524-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0525-Fix-villager-boat-exploit.patch
rename to patches/server/0524-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0526-Add-sendOpLevel-API.patch b/patches/server/0525-Add-sendOpLevel-API.patch
similarity index 96%
rename from patches/server/0526-Add-sendOpLevel-API.patch
rename to patches/server/0525-Add-sendOpLevel-API.patch
index 9f2f3ebb75..d78ec67bce 100644
--- a/patches/server/0526-Add-sendOpLevel-API.patch
+++ b/patches/server/0525-Add-sendOpLevel-API.patch
@@ -32,7 +32,7 @@ index 1131ee88f35c3898f0119c414c8376b0d9130169..bf361396bc2ec5d5c7b45d425af990c0
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 32c51de77dcd278f895969c513e38075dad83ace..f556375e1081039f38d2e2e5c0fb48c3f77dd387 100644
+index b3cbd7779ca2046d952352a9cb9f509e8525b344..b6beb02be7864c8fda297dead74d86258025348e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -636,6 +636,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0527-TODO-Registry-Modification-API.patch b/patches/server/0526-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0527-TODO-Registry-Modification-API.patch
rename to patches/server/0526-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0528-Add-StructuresLocateEvent.patch b/patches/server/0527-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0528-Add-StructuresLocateEvent.patch
rename to patches/server/0527-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0529-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0528-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0529-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0528-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0530-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0529-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0530-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0529-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0531-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0530-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0531-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0530-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0532-Make-schedule-command-per-world.patch b/patches/server/0531-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0532-Make-schedule-command-per-world.patch
rename to patches/server/0531-Make-schedule-command-per-world.patch
diff --git a/patches/server/0533-Configurable-max-leash-distance.patch b/patches/server/0532-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0533-Configurable-max-leash-distance.patch
rename to patches/server/0532-Configurable-max-leash-distance.patch
diff --git a/patches/server/0534-Implement-BlockPreDispenseEvent.patch b/patches/server/0533-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0534-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0533-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0535-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0534-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0535-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0534-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0536-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0535-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0536-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0535-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0537-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0536-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0537-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0536-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0538-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0537-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0538-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0537-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0539-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0538-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0539-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0538-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0540-add-DragonEggFormEvent.patch b/patches/server/0539-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0540-add-DragonEggFormEvent.patch
rename to patches/server/0539-add-DragonEggFormEvent.patch
diff --git a/patches/server/0541-EntityMoveEvent.patch b/patches/server/0540-EntityMoveEvent.patch
similarity index 97%
rename from patches/server/0541-EntityMoveEvent.patch
rename to patches/server/0540-EntityMoveEvent.patch
index d535a433ad..d21c548240 100644
--- a/patches/server/0541-EntityMoveEvent.patch
+++ b/patches/server/0540-EntityMoveEvent.patch
@@ -17,7 +17,7 @@ index c063dece36e110691297b38635a9d14d70c4e391..5f440e3d3a750c65d0d13834eca553b8
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0b321185ed39bfa056298a1ddfb157b73c4ffa03..cb416a3e5a904cae8de4930f49fee7afe9073bad 100644
+index 7b97230bfffd6cac128330cdfe451a62f0427a11..e411fe6e0e1495c417bb8938bf6bd42b7ac63f18 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -222,6 +222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0541-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 91%
rename from patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0541-added-option-to-disable-pathfinding-updates-on-block.patch
index 3acd93481c..1b96c337d6 100644
--- a/patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0541-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cb416a3e5a904cae8de4930f49fee7afe9073bad..8e2b088fe2ff21a242913c66bcd6e017c1de6f6f 100644
+index e411fe6e0e1495c417bb8938bf6bd42b7ac63f18..bbb2f5370474111e357fb43d800fcbb24a51e82c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1673,6 +1673,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0543-Inline-shift-direction-fields.patch b/patches/server/0542-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0543-Inline-shift-direction-fields.patch
rename to patches/server/0542-Inline-shift-direction-fields.patch
diff --git a/patches/server/0544-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0543-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0544-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0543-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0545-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0544-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0545-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0544-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0546-living-entity-allow-attribute-registration.patch b/patches/server/0545-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0546-living-entity-allow-attribute-registration.patch
rename to patches/server/0545-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0547-fix-dead-slime-setSize-invincibility.patch b/patches/server/0546-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0547-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0546-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0548-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0547-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0548-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0547-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0549-Expose-Tracked-Players.patch b/patches/server/0548-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0549-Expose-Tracked-Players.patch
rename to patches/server/0548-Expose-Tracked-Players.patch
diff --git a/patches/server/0550-Remove-streams-from-SensorNearest.patch b/patches/server/0549-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0550-Remove-streams-from-SensorNearest.patch
rename to patches/server/0549-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0551-Improve-ServerGUI.patch b/patches/server/0550-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0551-Improve-ServerGUI.patch
rename to patches/server/0550-Improve-ServerGUI.patch
diff --git a/patches/server/0552-fix-converting-txt-to-json-file.patch b/patches/server/0551-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0552-fix-converting-txt-to-json-file.patch
rename to patches/server/0551-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0553-Add-worldborder-events.patch b/patches/server/0552-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0553-Add-worldborder-events.patch
rename to patches/server/0552-Add-worldborder-events.patch
diff --git a/patches/server/0554-added-PlayerNameEntityEvent.patch b/patches/server/0553-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0554-added-PlayerNameEntityEvent.patch
rename to patches/server/0553-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0555-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0554-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0555-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0554-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0556-Add-recipe-to-cook-events.patch b/patches/server/0555-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0556-Add-recipe-to-cook-events.patch
rename to patches/server/0555-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0557-Add-Block-isValidTool.patch b/patches/server/0556-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0557-Add-Block-isValidTool.patch
rename to patches/server/0556-Add-Block-isValidTool.patch
diff --git a/patches/server/0558-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0557-Allow-using-signs-inside-spawn-protection.patch
similarity index 94%
rename from patches/server/0558-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0557-Allow-using-signs-inside-spawn-protection.patch
index 216804ad03..8a882ed51f 100644
--- a/patches/server/0558-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0557-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 85660d2d5ba535f6d8ace6783314cfe278d34317..cc785c1b10775cd6d07635228fbb9e1792fe81e5 100644
+index 30513a13c626d117e2de9ceef46621ef8cde6386..23e8bc131a6645d38b26eca3323eee7868c120ba 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1753,7 +1753,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0559-Expand-world-key-API.patch b/patches/server/0558-Expand-world-key-API.patch
similarity index 100%
rename from patches/server/0559-Expand-world-key-API.patch
rename to patches/server/0558-Expand-world-key-API.patch
diff --git a/patches/server/0560-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0559-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0560-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0559-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0561-Item-Rarity-API.patch b/patches/server/0560-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0561-Item-Rarity-API.patch
rename to patches/server/0560-Item-Rarity-API.patch
diff --git a/patches/server/0562-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0561-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0562-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0561-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0563-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0562-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0563-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0562-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0564-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0563-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 91%
rename from patches/server/0564-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0563-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 8e9ed37aa1..b262e12a06 100644
--- a/patches/server/0564-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0563-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cc785c1b10775cd6d07635228fbb9e1792fe81e5..9c8f2b74cf1ee0b186759f2d4915d2ba90558a1f 100644
+index 23e8bc131a6645d38b26eca3323eee7868c120ba..358a3ebd39bbbe9e4eba7197177bbf76e045b59c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1192,7 +1192,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0565-Expose-protocol-version.patch b/patches/server/0564-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0565-Expose-protocol-version.patch
rename to patches/server/0564-Expose-protocol-version.patch
diff --git a/patches/server/0566-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0565-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0566-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0565-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0567-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0566-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0567-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0566-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0568-Add-bypass-host-check.patch b/patches/server/0567-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0568-Add-bypass-host-check.patch
rename to patches/server/0567-Add-bypass-host-check.patch
diff --git a/patches/server/0569-Set-area-affect-cloud-rotation.patch b/patches/server/0568-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0569-Set-area-affect-cloud-rotation.patch
rename to patches/server/0568-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0570-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0569-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0570-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0569-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0571-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0570-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0571-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0570-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0572-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0571-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0572-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0571-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0573-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0572-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0573-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0572-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0574-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0573-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 93%
rename from patches/server/0574-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0573-fix-PlayerItemHeldEvent-firing-twice.patch
index 306d9f30f2..c6b14a829e 100644
--- a/patches/server/0574-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0573-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9c8f2b74cf1ee0b186759f2d4915d2ba90558a1f..b30f884007f79023d4bde8053c3a94f22cd59485 100644
+index 358a3ebd39bbbe9e4eba7197177bbf76e045b59c..dca8f977b13070a378ff4fd90fc61716da2636aa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1922,6 +1922,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0575-Added-PlayerDeepSleepEvent.patch b/patches/server/0574-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0575-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0574-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0576-More-World-API.patch b/patches/server/0575-More-World-API.patch
similarity index 100%
rename from patches/server/0576-More-World-API.patch
rename to patches/server/0575-More-World-API.patch
diff --git a/patches/server/0577-Added-PlayerBedFailEnterEvent.patch b/patches/server/0576-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0577-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0576-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0578-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0577-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0578-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0577-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0579-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0578-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0579-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0578-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0580-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0579-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0580-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0579-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0581-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0580-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 97%
rename from patches/server/0581-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0580-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 2e685fd7ff..b61bdd338c 100644
--- a/patches/server/0581-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0580-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b30f884007f79023d4bde8053c3a94f22cd59485..ba65b69e967ad933fec5e87da1ccfba25a42a372 100644
+index dca8f977b13070a378ff4fd90fc61716da2636aa..ba6f0c057f182b823d27d00e8c78349ca79c35ab 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2637,7 +2637,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0582-Add-Channel-initialization-listeners.patch b/patches/server/0581-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0582-Add-Channel-initialization-listeners.patch
rename to patches/server/0581-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0583-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0582-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0583-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0582-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0584-Add-more-WanderingTrader-API.patch b/patches/server/0583-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0584-Add-more-WanderingTrader-API.patch
rename to patches/server/0583-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0585-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0584-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0585-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0584-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0586-Entity-load-save-limit-per-chunk.patch b/patches/server/0585-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0586-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0585-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0587-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0586-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0587-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0586-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0588-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0587-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0588-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0587-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0589-Inventory-close.patch b/patches/server/0588-Inventory-close.patch
similarity index 100%
rename from patches/server/0589-Inventory-close.patch
rename to patches/server/0588-Inventory-close.patch
diff --git a/patches/server/0590-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0589-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0590-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0589-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0591-Add-basic-Datapack-API.patch b/patches/server/0590-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0591-Add-basic-Datapack-API.patch
rename to patches/server/0590-Add-basic-Datapack-API.patch
diff --git a/patches/server/0592-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0591-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0592-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0591-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0593-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0592-additions-to-PlayerGameModeChangeEvent.patch
similarity index 98%
rename from patches/server/0593-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0592-additions-to-PlayerGameModeChangeEvent.patch
index 67f37a1a0c..7900f1ef70 100644
--- a/patches/server/0593-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0592-additions-to-PlayerGameModeChangeEvent.patch
@@ -131,7 +131,7 @@ index c61754976fab6654f55b1403d769eb1721871dca..236dabc1d4ae9dc9a2a2c07a4a27fc0b
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ba65b69e967ad933fec5e87da1ccfba25a42a372..eb04b74e2d71bf1842a19b346576f0ff6e56e353 100644
+index ba6f0c057f182b823d27d00e8c78349ca79c35ab..353f85398aff20f15b78ff4334a242558876df19 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2646,7 +2646,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -144,7 +144,7 @@ index ba65b69e967ad933fec5e87da1ccfba25a42a372..eb04b74e2d71bf1842a19b346576f0ff
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f556375e1081039f38d2e2e5c0fb48c3f77dd387..785f218d1a56a22b9d01a4423ac0100a05758241 100644
+index b6beb02be7864c8fda297dead74d86258025348e..d3cd67fa46fa2ad3f642c752fb274085494420a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1562,7 +1562,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0594-ItemStack-repair-check-API.patch b/patches/server/0593-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0594-ItemStack-repair-check-API.patch
rename to patches/server/0593-ItemStack-repair-check-API.patch
diff --git a/patches/server/0595-More-Enchantment-API.patch b/patches/server/0594-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0595-More-Enchantment-API.patch
rename to patches/server/0594-More-Enchantment-API.patch
diff --git a/patches/server/0596-Move-range-check-for-block-placing-up.patch b/patches/server/0595-Move-range-check-for-block-placing-up.patch
similarity index 92%
rename from patches/server/0596-Move-range-check-for-block-placing-up.patch
rename to patches/server/0595-Move-range-check-for-block-placing-up.patch
index c41ba46b10..dda56bda00 100644
--- a/patches/server/0596-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0595-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index eb04b74e2d71bf1842a19b346576f0ff6e56e353..925ddcdfb48c27c98e8faff934d3250cdc6748bf 100644
+index 353f85398aff20f15b78ff4334a242558876df19..598e3ae877f014ce979d8a578445f8a314f0ba82 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1739,6 +1739,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0597-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0596-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0597-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0596-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0598-Add-Mob-lookAt-API.patch b/patches/server/0597-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0598-Add-Mob-lookAt-API.patch
rename to patches/server/0597-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0599-Add-Unix-domain-socket-support.patch b/patches/server/0598-Add-Unix-domain-socket-support.patch
similarity index 98%
rename from patches/server/0599-Add-Unix-domain-socket-support.patch
rename to patches/server/0598-Add-Unix-domain-socket-support.patch
index b8cc6f4179..a8a46b7765 100644
--- a/patches/server/0599-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0598-Add-Unix-domain-socket-support.patch
@@ -93,7 +93,7 @@ index 6641fd04821240b1bbeff1bd8d996a8f2fff8385..5f625acf04ddb56e3596d086252f9bfc
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 925ddcdfb48c27c98e8faff934d3250cdc6748bf..fea666b6734310c225e86ae551aed6571e4903a8 100644
+index 598e3ae877f014ce979d8a578445f8a314f0ba82..b7e6c7fdccb91f3cef5e6d96fe5f0c2ee7eb4f46 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2469,6 +2469,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0600-Add-EntityInsideBlockEvent.patch b/patches/server/0599-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0600-Add-EntityInsideBlockEvent.patch
rename to patches/server/0599-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0601-Attributes-API-for-item-defaults.patch b/patches/server/0600-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0601-Attributes-API-for-item-defaults.patch
rename to patches/server/0600-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0601-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 98%
rename from patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0601-Add-cause-to-Weather-ThunderChangeEvents.patch
index 5e8969dfb3..3c5d0139b6 100644
--- a/patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0601-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8e2b088fe2ff21a242913c66bcd6e017c1de6f6f..e6d8272f3186420478e92c95b508b87f818e50e5 100644
+index bbb2f5370474111e357fb43d800fcbb24a51e82c..08fee3d75a9f7ae950698a6ca8f18917ab0e3b21 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -668,8 +668,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0603-More-Lidded-Block-API.patch b/patches/server/0602-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0603-More-Lidded-Block-API.patch
rename to patches/server/0602-More-Lidded-Block-API.patch
diff --git a/patches/server/0604-Limit-item-frame-cursors-on-maps.patch b/patches/server/0603-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0604-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0603-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0605-Add-PlayerKickEvent-causes.patch b/patches/server/0604-Add-PlayerKickEvent-causes.patch
similarity index 99%
rename from patches/server/0605-Add-PlayerKickEvent-causes.patch
rename to patches/server/0604-Add-PlayerKickEvent-causes.patch
index 2e57d3520c..7c7c97fcba 100644
--- a/patches/server/0605-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0604-Add-PlayerKickEvent-causes.patch
@@ -209,7 +209,7 @@ index 4a2ff42950a9c15a3dbbf9ca7e3c43cad4c77404..312b7a446453cf0859538cb10e6e98a8
          if (this.cserver.getServer().isRunning()) {
              this.cserver.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fea666b6734310c225e86ae551aed6571e4903a8..6b92f00fe51ebb1730aecc85d58ce6f2ee75d22f 100644
+index b7e6c7fdccb91f3cef5e6d96fe5f0c2ee7eb4f46..8d666fb6b2d9ed90691d672f504571922f94c5ab 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -343,7 +343,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -491,7 +491,7 @@ index 6724d0a1af13e97bc1d3bd94fd43fef742a0deab..20ba0a0c9eae28658888a77dd2170f62
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 785f218d1a56a22b9d01a4423ac0100a05758241..aacd811da1e7b091e218054e9404242a2d2ac6c1 100644
+index d3cd67fa46fa2ad3f642c752fb274085494420a2..7b197b9b6b912956b3f71d24a57091caf5661635 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -594,7 +594,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0606-Add-PufferFishStateChangeEvent.patch b/patches/server/0605-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0606-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0605-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0607-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0606-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0607-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0606-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0608-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0607-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0608-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0607-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0609-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0608-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0609-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0608-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0610-Add-BellRevealRaiderEvent.patch b/patches/server/0609-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0610-Add-BellRevealRaiderEvent.patch
rename to patches/server/0609-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0611-Fix-invulnerable-end-crystals.patch b/patches/server/0610-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0611-Fix-invulnerable-end-crystals.patch
rename to patches/server/0610-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0612-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0611-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0612-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0611-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0613-Fix-dangerous-end-portal-logic.patch b/patches/server/0612-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0613-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0612-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0614-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0613-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0614-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0613-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0615-Make-item-validations-configurable.patch b/patches/server/0614-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0615-Make-item-validations-configurable.patch
rename to patches/server/0614-Make-item-validations-configurable.patch
diff --git a/patches/server/0616-Line-Of-Sight-Changes.patch b/patches/server/0615-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0616-Line-Of-Sight-Changes.patch
rename to patches/server/0615-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0617-add-per-world-spawn-limits.patch b/patches/server/0616-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0617-add-per-world-spawn-limits.patch
rename to patches/server/0616-add-per-world-spawn-limits.patch
diff --git a/patches/server/0618-Fix-potions-splash-events.patch b/patches/server/0617-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0618-Fix-potions-splash-events.patch
rename to patches/server/0617-Fix-potions-splash-events.patch
diff --git a/patches/server/0619-Add-more-LimitedRegion-API.patch b/patches/server/0618-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0619-Add-more-LimitedRegion-API.patch
rename to patches/server/0618-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0620-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0619-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0620-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0619-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0621-Missing-Entity-API.patch b/patches/server/0620-Missing-Entity-API.patch
similarity index 100%
rename from patches/server/0621-Missing-Entity-API.patch
rename to patches/server/0620-Missing-Entity-API.patch
diff --git a/patches/server/0622-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0621-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 92%
rename from patches/server/0622-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0621-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 82f34a8a0e..9d41ae7d9f 100644
--- a/patches/server/0622-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0621-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6b92f00fe51ebb1730aecc85d58ce6f2ee75d22f..8b2a188666938214c9f6f3ef461a768925f74b24 100644
+index 8d666fb6b2d9ed90691d672f504571922f94c5ab..a9a6bdccd55559614d933bf02b7d12432feb52dc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1101,7 +1101,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0623-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0622-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0623-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0622-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0623-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 97%
rename from patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0623-Use-getChunkIfLoadedImmediately-in-places.patch
index 101b1ec5de..ac79853979 100644
--- a/patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0623-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e6d8272f3186420478e92c95b508b87f818e50e5..abed54daee01f48b81f03b99b8e0615f5394ddac 100644
+index 08fee3d75a9f7ae950698a6ca8f18917ab0e3b21..107e2b2a159838301e173323df1747954a52b104 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -230,7 +230,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0625-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0624-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0625-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0624-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0626-Adds-PlayerArmSwingEvent.patch b/patches/server/0625-Adds-PlayerArmSwingEvent.patch
similarity index 93%
rename from patches/server/0626-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0625-Adds-PlayerArmSwingEvent.patch
index ef7392c45b..1c96a2596e 100644
--- a/patches/server/0626-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0625-Adds-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8b2a188666938214c9f6f3ef461a768925f74b24..0133b27284966ace784603c0dbde37879529a35b 100644
+index a9a6bdccd55559614d933bf02b7d12432feb52dc..2b251bbfdb208e9482acf87c233dac90f8908018 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2326,7 +2326,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0627-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0626-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 97%
rename from patches/server/0627-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0626-Fixes-kick-event-leave-message-not-being-sent.patch
index 913de52e2c..e5d7a22d60 100644
--- a/patches/server/0627-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0626-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -17,7 +17,7 @@ index 814754a73a8d653adc159b313fa201565db59590..ebbf5f835d619c90eae4240dbd2eb665
      public boolean isRealPlayer; // Paper
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index c0ed5bfcbd17b61c16484cad4b42eb1365a0556b..77cd2b73e4d499beca16962a6b3d1fefe279cd87 100644
+index 312b7a446453cf0859538cb10e6e98a8188d9094..4a712f5fc4f0b4a4434ae808c989113bee8d8634 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -76,6 +76,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -50,7 +50,7 @@ index c0ed5bfcbd17b61c16484cad4b42eb1365a0556b..77cd2b73e4d499beca16962a6b3d1fef
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0133b27284966ace784603c0dbde37879529a35b..d5b7d62e5a00d4db9439eb220c498b407ade5e45 100644
+index 2b251bbfdb208e9482acf87c233dac90f8908018..f34049f0afa5f607e64d13c5325c3ca8ba13dc92 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1883,6 +1883,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0628-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0627-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0628-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0627-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0629-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0628-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0629-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0628-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0630-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0629-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0630-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0629-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0631-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0630-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0631-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0630-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0632-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0631-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0632-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0631-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0633-Stinger-API.patch b/patches/server/0632-Stinger-API.patch
similarity index 100%
rename from patches/server/0633-Stinger-API.patch
rename to patches/server/0632-Stinger-API.patch
diff --git a/patches/server/0634-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0633-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0634-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0633-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0635-Add-System.out-err-catcher.patch b/patches/server/0634-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0635-Add-System.out-err-catcher.patch
rename to patches/server/0634-Add-System.out-err-catcher.patch
diff --git a/patches/server/0636-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0635-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0636-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0635-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0637-Improve-boat-collision-performance.patch b/patches/server/0636-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0637-Improve-boat-collision-performance.patch
rename to patches/server/0636-Improve-boat-collision-performance.patch
diff --git a/patches/server/0638-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0637-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0638-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0637-Prevent-AFK-kick-while-watching-end-credits.patch
index bffb9bdddc..5fa1f46e86 100644
--- a/patches/server/0638-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0637-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits.
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d5b7d62e5a00d4db9439eb220c498b407ade5e45..67645d6b50406f84cef5324be4a469c3d32dfa0c 100644
+index f34049f0afa5f607e64d13c5325c3ca8ba13dc92..179a1a635b174f1a6b2080ceb394928848c2df43 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -391,7 +391,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0639-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0638-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0639-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0638-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0640-Add-PlayerSetSpawnEvent.patch b/patches/server/0639-Add-PlayerSetSpawnEvent.patch
similarity index 99%
rename from patches/server/0640-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0639-Add-PlayerSetSpawnEvent.patch
index a251b7541c..4f8f2b0b30 100644
--- a/patches/server/0640-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0639-Add-PlayerSetSpawnEvent.patch
@@ -187,7 +187,7 @@ index ecaa7f0b2bf795f16187f11fa27f6d5d435ccbfe..c83ffba568f33323b0f8b9a03fa0b7bb
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index aacd811da1e7b091e218054e9404242a2d2ac6c1..f6eb66b0e8e442cf72aa6ea4507e550c1dcb9615 100644
+index 7b197b9b6b912956b3f71d24a57091caf5661635..5a9fe8f1149cb52f2b2bb31202cefe3ec9ab9d3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1321,9 +1321,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0641-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0640-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0641-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0640-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0642-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0641-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0642-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0641-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0643-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0642-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0643-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0642-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0644-Added-EntityDamageItemEvent.patch b/patches/server/0643-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0644-Added-EntityDamageItemEvent.patch
rename to patches/server/0643-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0645-Optimize-indirect-passenger-iteration.patch b/patches/server/0644-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0645-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0644-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0646-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0645-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0646-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0645-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0647-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0646-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0647-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0646-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0648-Clear-bucket-NBT-after-dispense.patch b/patches/server/0647-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0648-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0647-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0649-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0648-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0649-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0648-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0650-Add-BlockBreakBlockEvent.patch b/patches/server/0649-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0650-Add-BlockBreakBlockEvent.patch
rename to patches/server/0649-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0651-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0650-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0651-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0650-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0652-More-CommandBlock-API.patch b/patches/server/0651-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0652-More-CommandBlock-API.patch
rename to patches/server/0651-More-CommandBlock-API.patch
diff --git a/patches/server/0653-Add-missing-team-sidebar-display-slots.patch b/patches/server/0652-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0653-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0652-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0654-Add-back-EntityPortalExitEvent.patch b/patches/server/0653-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0654-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0653-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0655-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0654-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 96%
rename from patches/server/0655-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0654-Add-methods-to-find-targets-for-lightning-strikes.patch
index 733482d182..25eb515f25 100644
--- a/patches/server/0655-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0654-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index abed54daee01f48b81f03b99b8e0615f5394ddac..86969e7b23bcb463ac4143338647329f56af92ee 100644
+index 107e2b2a159838301e173323df1747954a52b104..31d6fa97fcd1572fd291870082309469987676c6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -994,6 +994,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0656-Get-entity-default-attributes.patch b/patches/server/0655-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0656-Get-entity-default-attributes.patch
rename to patches/server/0655-Get-entity-default-attributes.patch
diff --git a/patches/server/0657-Left-handed-API.patch b/patches/server/0656-Left-handed-API.patch
similarity index 100%
rename from patches/server/0657-Left-handed-API.patch
rename to patches/server/0656-Left-handed-API.patch
diff --git a/patches/server/0658-Add-more-advancement-API.patch b/patches/server/0657-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0658-Add-more-advancement-API.patch
rename to patches/server/0657-Add-more-advancement-API.patch
diff --git a/patches/server/0659-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0658-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0659-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0658-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0660-Add-critical-damage-API.patch b/patches/server/0659-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0660-Add-critical-damage-API.patch
rename to patches/server/0659-Add-critical-damage-API.patch
diff --git a/patches/server/0661-Fix-issues-with-mob-conversion.patch b/patches/server/0660-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0661-Fix-issues-with-mob-conversion.patch
rename to patches/server/0660-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0662-Add-isCollidable-methods-to-various-places.patch b/patches/server/0661-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0662-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0661-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0663-Goat-ram-API.patch b/patches/server/0662-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0663-Goat-ram-API.patch
rename to patches/server/0662-Goat-ram-API.patch
diff --git a/patches/server/0664-Add-API-for-resetting-a-single-score.patch b/patches/server/0663-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0664-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0663-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0665-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0664-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0665-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0664-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0666-Vanilla-command-permission-fixes.patch b/patches/server/0665-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0666-Vanilla-command-permission-fixes.patch
rename to patches/server/0665-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0667-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0666-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 97%
rename from patches/server/0667-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0666-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 4a6b078192..12eed70505 100644
--- a/patches/server/0667-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0666-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 86969e7b23bcb463ac4143338647329f56af92ee..7ca843fe809a78a16bca8f61a482b600396d6ab8 100644
+index 31d6fa97fcd1572fd291870082309469987676c6..e2b22b51a8c6d668eaa6572de16bb7a76351d0d3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1574,9 +1574,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0668-Fix-GameProfileCache-concurrency.patch b/patches/server/0667-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0668-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0667-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0669-Improve-and-expand-AsyncCatcher.patch b/patches/server/0668-Improve-and-expand-AsyncCatcher.patch
similarity index 99%
rename from patches/server/0669-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0668-Improve-and-expand-AsyncCatcher.patch
index 030d0b6d84..8f2bd876f9 100644
--- a/patches/server/0669-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0668-Improve-and-expand-AsyncCatcher.patch
@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 67645d6b50406f84cef5324be4a469c3d32dfa0c..44c39164bf1c77bc4aace75b89659ce6751e0514 100644
+index 179a1a635b174f1a6b2080ceb394928848c2df43..711959d5c2889035f366b5e798c0310593158282 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1571,6 +1571,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0670-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0669-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0670-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0669-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0671-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0670-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0671-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0670-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0672-Optimise-general-POI-access.patch b/patches/server/0671-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0672-Optimise-general-POI-access.patch
rename to patches/server/0671-Optimise-general-POI-access.patch
diff --git a/patches/server/0673-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0672-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0673-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0672-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0674-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0673-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0674-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0673-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0675-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0674-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0675-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0674-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0676-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0675-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0676-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0675-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0677-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0676-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0677-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0676-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0678-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0677-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0678-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0677-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0679-Time-scoreboard-search.patch b/patches/server/0678-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0679-Time-scoreboard-search.patch
rename to patches/server/0678-Time-scoreboard-search.patch
diff --git a/patches/server/0680-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0679-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0680-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0679-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0681-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0680-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0681-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0680-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0682-Execute-chunk-tasks-mid-tick.patch b/patches/server/0681-Execute-chunk-tasks-mid-tick.patch
similarity index 98%
rename from patches/server/0682-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0681-Execute-chunk-tasks-mid-tick.patch
index 0e30021bec..d73797f2c2 100644
--- a/patches/server/0682-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0681-Execute-chunk-tasks-mid-tick.patch
@@ -123,7 +123,7 @@ index 63fad53a9184d7ab97f143b7d85ae9ef2ca9f8bc..1483007b79e18107e41037c279e048f0
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7ca843fe809a78a16bca8f61a482b600396d6ab8..2868549d7e79a0add3c73a85b8eb8960cf77af97 100644
+index e2b22b51a8c6d668eaa6572de16bb7a76351d0d3..716420eb3dea5a9b6d8e72d0bdf388dc37677032 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -217,6 +217,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0683-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0682-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0683-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0682-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0684-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0683-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0684-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0683-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0685-Optimise-random-block-ticking.patch b/patches/server/0684-Optimise-random-block-ticking.patch
similarity index 99%
rename from patches/server/0685-Optimise-random-block-ticking.patch
rename to patches/server/0684-Optimise-random-block-ticking.patch
index 044d35a862..309f87c655 100644
--- a/patches/server/0685-Optimise-random-block-ticking.patch
+++ b/patches/server/0684-Optimise-random-block-ticking.patch
@@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2868549d7e79a0add3c73a85b8eb8960cf77af97..7f981102023230f91eb6c7bf6ade08ed3ab3cbb9 100644
+index 716420eb3dea5a9b6d8e72d0bdf388dc37677032..cd331e0c9b46187d3ee5012f18b27bd60fbccc16 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -856,6 +856,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0686-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0685-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0686-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0685-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0687-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0686-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0687-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0686-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0688-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0687-Detail-more-information-in-watchdog-dumps.patch
similarity index 99%
rename from patches/server/0688-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0687-Detail-more-information-in-watchdog-dumps.patch
index da9cbf343b..1724729bbf 100644
--- a/patches/server/0688-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0687-Detail-more-information-in-watchdog-dumps.patch
@@ -76,7 +76,7 @@ index 7de24c39b460e43d27839b3821e67213508ece81..7297bca9224c12d7ace0e1967340d994
              });
              throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7f981102023230f91eb6c7bf6ade08ed3ab3cbb9..a3ef919ff07655e835a1b423b3d4f71939a47db8 100644
+index cd331e0c9b46187d3ee5012f18b27bd60fbccc16..424d6fee9f5663371082fce4e23b6dc9282a591f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1240,7 +1240,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0689-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0688-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0689-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0688-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0690-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0689-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0690-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0689-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0691-Distance-manager-tick-timings.patch b/patches/server/0690-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0691-Distance-manager-tick-timings.patch
rename to patches/server/0690-Distance-manager-tick-timings.patch
diff --git a/patches/server/0692-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0691-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0692-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0691-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0693-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0692-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0693-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0692-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0694-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0693-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 92%
rename from patches/server/0694-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0693-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 13e9c948f1..7275450e69 100644
--- a/patches/server/0694-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0693-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 44c39164bf1c77bc4aace75b89659ce6751e0514..c54aa1b0ce2a4e9eb2f18987868e0b9ed71339ab 100644
+index 711959d5c2889035f366b5e798c0310593158282..2e80848841dcf6f4a693e3dc62af62e2a47cbf8f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -738,6 +738,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0695-Add-packet-limiter-config.patch b/patches/server/0694-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0695-Add-packet-limiter-config.patch
rename to patches/server/0694-Add-packet-limiter-config.patch
diff --git a/patches/server/0696-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0695-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0696-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0695-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0697-Ensure-valid-vehicle-status.patch b/patches/server/0696-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0697-Ensure-valid-vehicle-status.patch
rename to patches/server/0696-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0698-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0697-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0698-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0697-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0699-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0698-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0699-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0698-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0700-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0699-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0700-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0699-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0701-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0700-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0701-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0700-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0702-Preserve-overstacked-loot.patch b/patches/server/0701-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0702-Preserve-overstacked-loot.patch
rename to patches/server/0701-Preserve-overstacked-loot.patch
diff --git a/patches/server/0703-Update-head-rotation-in-missing-places.patch b/patches/server/0702-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0703-Update-head-rotation-in-missing-places.patch
rename to patches/server/0702-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0704-prevent-unintended-light-block-manipulation.patch b/patches/server/0703-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0704-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0703-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0705-Fix-CraftCriteria-defaults-map.patch b/patches/server/0704-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0705-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0704-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0706-Fix-upstreams-block-state-factories.patch b/patches/server/0705-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0706-Fix-upstreams-block-state-factories.patch
rename to patches/server/0705-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0707-Configurable-feature-seeds.patch b/patches/server/0706-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0707-Configurable-feature-seeds.patch
rename to patches/server/0706-Configurable-feature-seeds.patch
diff --git a/patches/server/0708-Add-root-admin-user-detection.patch b/patches/server/0707-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0708-Add-root-admin-user-detection.patch
rename to patches/server/0707-Add-root-admin-user-detection.patch
diff --git a/patches/server/0709-Always-allow-item-changing-in-Fireball.patch b/patches/server/0708-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0709-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0708-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0710-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0709-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0710-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0709-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0711-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0710-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0711-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0710-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0712-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0711-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0712-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0711-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0713-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0712-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0713-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0712-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0714-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0713-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0714-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0713-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0715-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0714-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 98%
rename from patches/server/0715-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0714-Hide-unnecessary-itemmeta-from-clients.patch
index 54df7aa68e..02804541cb 100644
--- a/patches/server/0715-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0714-Hide-unnecessary-itemmeta-from-clients.patch
@@ -18,7 +18,7 @@ index 8d2870c780c4c253f6570c7ef73f6e7c2ccc46ad..0cbb5dd17c5b37ad90ce11a31b644707
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c54aa1b0ce2a4e9eb2f18987868e0b9ed71339ab..3a355c09c259204fd711d97de8f6099df95ea678 100644
+index 2e80848841dcf6f4a693e3dc62af62e2a47cbf8f..0b745f852976611a12834101adccae52453d7dce 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2559,8 +2559,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0716-Fix-Spigot-growth-modifiers.patch b/patches/server/0715-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0716-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0715-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0717-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0716-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0717-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0716-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0718-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0717-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0718-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0717-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0719-Optimize-HashMapPalette.patch b/patches/server/0718-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0719-Optimize-HashMapPalette.patch
rename to patches/server/0718-Optimize-HashMapPalette.patch
diff --git a/patches/server/0720-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0719-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0720-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0719-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0721-Collision-optimisations.patch b/patches/server/0720-Collision-optimisations.patch
similarity index 100%
rename from patches/server/0721-Collision-optimisations.patch
rename to patches/server/0720-Collision-optimisations.patch
diff --git a/patches/server/0722-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0721-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 99%
rename from patches/server/0722-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0721-Optimise-collision-checking-in-player-move-packet-ha.patch
index 506956bae0..cf16f8b4db 100644
--- a/patches/server/0722-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0721-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN
 CHECK ME
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3a355c09c259204fd711d97de8f6099df95ea678..b650e7b53bea147be0b5d88449d41f03a971ca97 100644
+index 0b745f852976611a12834101adccae52453d7dce..adc87248cbd7af37aec299f1d7c9a10965c9de30 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -537,7 +537,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0723-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0722-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0723-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0722-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0724-Add-more-Campfire-API.patch b/patches/server/0723-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0724-Add-more-Campfire-API.patch
rename to patches/server/0723-Add-more-Campfire-API.patch
diff --git a/patches/server/0725-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0724-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0725-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0724-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0726-Fix-tripwire-state-inconsistency.patch b/patches/server/0725-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0726-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0725-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0727-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0726-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0727-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0726-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0728-Improve-scoreboard-entries.patch b/patches/server/0727-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0728-Improve-scoreboard-entries.patch
rename to patches/server/0727-Improve-scoreboard-entries.patch
diff --git a/patches/server/0729-Entity-powdered-snow-API.patch b/patches/server/0728-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0729-Entity-powdered-snow-API.patch
rename to patches/server/0728-Entity-powdered-snow-API.patch
diff --git a/patches/server/0730-Add-API-for-item-entity-health.patch b/patches/server/0729-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0730-Add-API-for-item-entity-health.patch
rename to patches/server/0729-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0731-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0730-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0731-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0730-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0732-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0731-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0732-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0731-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0733-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0732-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0733-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0732-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0734-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0733-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0734-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0733-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0735-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0734-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0735-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0734-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0736-Fix-bees-aging-inside-hives.patch b/patches/server/0735-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0736-Fix-bees-aging-inside-hives.patch
rename to patches/server/0735-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0737-Bucketable-API.patch b/patches/server/0736-Bucketable-API.patch
similarity index 100%
rename from patches/server/0737-Bucketable-API.patch
rename to patches/server/0736-Bucketable-API.patch
diff --git a/patches/server/0738-Validate-usernames.patch b/patches/server/0737-Validate-usernames.patch
similarity index 100%
rename from patches/server/0738-Validate-usernames.patch
rename to patches/server/0737-Validate-usernames.patch
diff --git a/patches/server/0739-Make-water-animal-spawn-height-configurable.patch b/patches/server/0738-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0739-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0738-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0740-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0739-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0740-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0739-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0741-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0740-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0741-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0740-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0742-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0741-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
similarity index 100%
rename from patches/server/0742-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
rename to patches/server/0741-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0743-Multiple-Entries-with-Scoreboards.patch b/patches/server/0742-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0743-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0742-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0744-Reset-placed-block-on-exception.patch b/patches/server/0743-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0744-Reset-placed-block-on-exception.patch
rename to patches/server/0743-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0745-Add-configurable-height-for-slime-spawn.patch b/patches/server/0744-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0745-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0744-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0746-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0745-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0746-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0745-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0747-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0746-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0747-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0746-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0748-Multi-Block-Change-API-Implementation.patch b/patches/server/0747-Multi-Block-Change-API-Implementation.patch
similarity index 97%
rename from patches/server/0748-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0747-Multi-Block-Change-API-Implementation.patch
index 5972c61d39..3377c47c6a 100644
--- a/patches/server/0748-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0747-Multi-Block-Change-API-Implementation.patch
@@ -24,7 +24,7 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..e3f355c85eb7cc8c1683e3009502c10a
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f6eb66b0e8e442cf72aa6ea4507e550c1dcb9615..2699f90a0fbe5397fb057ce59cadf0a64913659f 100644
+index 5a9fe8f1149cb52f2b2bb31202cefe3ec9ab9d3a..89c90b704045345d0a6d37a032de8483a43a634b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -889,6 +889,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0749-Fix-NotePlayEvent.patch b/patches/server/0748-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0749-Fix-NotePlayEvent.patch
rename to patches/server/0748-Fix-NotePlayEvent.patch
diff --git a/patches/server/0750-Freeze-Tick-Lock-API.patch b/patches/server/0749-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0750-Freeze-Tick-Lock-API.patch
rename to patches/server/0749-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0751-Dolphin-API.patch b/patches/server/0750-Dolphin-API.patch
similarity index 100%
rename from patches/server/0751-Dolphin-API.patch
rename to patches/server/0750-Dolphin-API.patch
diff --git a/patches/server/0752-More-PotionEffectType-API.patch b/patches/server/0751-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0752-More-PotionEffectType-API.patch
rename to patches/server/0751-More-PotionEffectType-API.patch
diff --git a/patches/server/0753-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0752-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0753-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0752-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0754-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0753-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0754-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0753-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0755-Add-missing-structure-set-seed-configs.patch b/patches/server/0754-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0755-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0754-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0756-Implement-regenerateChunk.patch b/patches/server/0755-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0756-Implement-regenerateChunk.patch
rename to patches/server/0755-Implement-regenerateChunk.patch
diff --git a/patches/server/0757-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0756-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0757-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0756-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0758-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0757-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0758-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0757-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0759-Add-GameEvent-tags.patch b/patches/server/0758-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0759-Add-GameEvent-tags.patch
rename to patches/server/0758-Add-GameEvent-tags.patch
diff --git a/patches/server/0760-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0759-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0760-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0759-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0761-Furnace-RecipesUsed-API.patch b/patches/server/0760-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0761-Furnace-RecipesUsed-API.patch
rename to patches/server/0760-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0762-Configurable-sculk-sensor-listener-range.patch b/patches/server/0761-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0762-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0761-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0763-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0762-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0763-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0762-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0764-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0763-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0764-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0763-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0765-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0764-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0765-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0764-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0766-Fix-Entity-Position-Desync.patch b/patches/server/0765-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0766-Fix-Entity-Position-Desync.patch
rename to patches/server/0765-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0767-Custom-Potion-Mixes.patch b/patches/server/0766-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0767-Custom-Potion-Mixes.patch
rename to patches/server/0766-Custom-Potion-Mixes.patch
diff --git a/patches/server/0768-Force-close-world-loading-screen.patch b/patches/server/0767-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0768-Force-close-world-loading-screen.patch
rename to patches/server/0767-Force-close-world-loading-screen.patch
diff --git a/patches/server/0769-Fix-falling-block-spawn-methods.patch b/patches/server/0768-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0769-Fix-falling-block-spawn-methods.patch
rename to patches/server/0768-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0770-Expose-furnace-minecart-push-values.patch b/patches/server/0769-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0770-Expose-furnace-minecart-push-values.patch
rename to patches/server/0769-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0771-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0770-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0771-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0770-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0772-More-Projectile-API.patch b/patches/server/0771-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0772-More-Projectile-API.patch
rename to patches/server/0771-More-Projectile-API.patch
diff --git a/patches/server/0773-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0772-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0773-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0772-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0774-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0773-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 93%
rename from patches/server/0774-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0773-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index d7d0be4a7a..3972197453 100644
--- a/patches/server/0774-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0773-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b650e7b53bea147be0b5d88449d41f03a971ca97..f65ded0df4814896f34755764ce5ead9550d0b77 100644
+index adc87248cbd7af37aec299f1d7c9a10965c9de30..8244cd81547b0ab95e4c5a322a05aa4a4d0bda7a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -466,6 +466,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0775-Implement-getComputedBiome-API.patch b/patches/server/0774-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0775-Implement-getComputedBiome-API.patch
rename to patches/server/0774-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0776-Make-some-itemstacks-nonnull.patch b/patches/server/0775-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0776-Make-some-itemstacks-nonnull.patch
rename to patches/server/0775-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0777-Implement-enchantWithLevels-API.patch b/patches/server/0776-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0777-Implement-enchantWithLevels-API.patch
rename to patches/server/0776-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0778-Fix-saving-in-unloadWorld.patch b/patches/server/0777-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0778-Fix-saving-in-unloadWorld.patch
rename to patches/server/0777-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0779-Buffer-OOB-setBlock-calls.patch b/patches/server/0778-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0779-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0778-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0780-Add-TameableDeathMessageEvent.patch b/patches/server/0779-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0780-Add-TameableDeathMessageEvent.patch
rename to patches/server/0779-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0781-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0780-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0781-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0780-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0782-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0781-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0782-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0781-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0783-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0782-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0783-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0782-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0784-Guard-against-invalid-entity-positions.patch b/patches/server/0783-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0784-Guard-against-invalid-entity-positions.patch
rename to patches/server/0783-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0785-cache-resource-keys.patch b/patches/server/0784-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0785-cache-resource-keys.patch
rename to patches/server/0784-cache-resource-keys.patch
diff --git a/patches/server/0786-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0785-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0786-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0785-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0787-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0786-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0787-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0786-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0788-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0787-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0788-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0787-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0789-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0788-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 93%
rename from patches/server/0789-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0788-Prevent-tile-entity-copies-loading-chunks.patch
index 90c5002136..cf25ea8b5b 100644
--- a/patches/server/0789-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0788-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f65ded0df4814896f34755764ce5ead9550d0b77..46feb009f0db6147573c972eeb2e9d1146a438d8 100644
+index 8244cd81547b0ab95e4c5a322a05aa4a4d0bda7a..f1e91dc5cc0fa3b1f028baf45118c79e630338af 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3190,7 +3190,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0790-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0789-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0790-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0789-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0791-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0790-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 99%
rename from patches/server/0791-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0790-Pass-ServerLevel-for-gamerule-callbacks.patch
index e2977791f3..f9af4b541a 100644
--- a/patches/server/0791-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0790-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -18,7 +18,7 @@ index a305557e97d8719f5f82e70794d15242364ce136..5264235c1547c78b8123e2efb07dcb77
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 46feb009f0db6147573c972eeb2e9d1146a438d8..889395f2c03c47bcd1d35cad67a99d7e503a8881 100644
+index f1e91dc5cc0fa3b1f028baf45118c79e630338af..a3f85ab062a1eed25cdb75ec787ba2d7aa8c2e86 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2754,7 +2754,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0792-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0791-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0792-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0791-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0793-WorldCreator-keepSpawnLoaded.patch b/patches/server/0792-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0793-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0792-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0794-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0793-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0794-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0793-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0795-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0794-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0795-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0794-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0796-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0795-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0796-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0795-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0797-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0796-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0797-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0796-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0798-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0797-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0798-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0797-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0799-Add-PlayerStopUsingItemEvent.patch b/patches/server/0798-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0799-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0798-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0800-Don-t-tick-markers.patch b/patches/server/0799-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0800-Don-t-tick-markers.patch
rename to patches/server/0799-Don-t-tick-markers.patch
diff --git a/patches/server/0801-Expand-FallingBlock-API.patch b/patches/server/0800-Expand-FallingBlock-API.patch
similarity index 100%
rename from patches/server/0801-Expand-FallingBlock-API.patch
rename to patches/server/0800-Expand-FallingBlock-API.patch
diff --git a/patches/server/0802-Do-not-accept-invalid-client-settings.patch b/patches/server/0801-Do-not-accept-invalid-client-settings.patch
similarity index 94%
rename from patches/server/0802-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0801-Do-not-accept-invalid-client-settings.patch
index 08cd6b79ba..61fd24e399 100644
--- a/patches/server/0802-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0801-Do-not-accept-invalid-client-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 889395f2c03c47bcd1d35cad67a99d7e503a8881..aaad61fa4d063092a5bc9262eaf50dc1b83f5cd5 100644
+index a3f85ab062a1eed25cdb75ec787ba2d7aa8c2e86..417f1be1168df292988b707756fad78c7cd9391d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3314,6 +3314,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0803-Add-support-for-Proxy-Protocol.patch b/patches/server/0802-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0803-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0802-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0804-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0803-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0804-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0803-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0805-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0804-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0805-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0804-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0806-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0805-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0806-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0805-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0807-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0806-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0807-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0806-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0808-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0807-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0808-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0807-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0809-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0808-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0809-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0808-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0810-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0809-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0810-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0809-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0811-Dont-resent-entity-on-art-update.patch b/patches/server/0810-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0811-Dont-resent-entity-on-art-update.patch
rename to patches/server/0810-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0812-Add-WardenAngerChangeEvent.patch b/patches/server/0811-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0812-Add-WardenAngerChangeEvent.patch
rename to patches/server/0811-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0813-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0812-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0813-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0812-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0814-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0813-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0814-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0813-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0815-Nameable-Banner-API.patch b/patches/server/0814-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0815-Nameable-Banner-API.patch
rename to patches/server/0814-Nameable-Banner-API.patch
diff --git a/patches/server/0816-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0815-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0816-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0815-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0817-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0816-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0817-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0816-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0818-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0817-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0818-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0817-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0819-Add-Player-getFishHook.patch b/patches/server/0818-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0819-Add-Player-getFishHook.patch
rename to patches/server/0818-Add-Player-getFishHook.patch
diff --git a/patches/server/0820-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0819-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0820-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0819-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0821-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0820-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0821-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0820-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0822-Fix-Bee-flower-NPE.patch b/patches/server/0821-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0822-Fix-Bee-flower-NPE.patch
rename to patches/server/0821-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0823-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0822-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 92%
rename from patches/server/0823-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0822-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index cb918a65e3..320e5bca68 100644
--- a/patches/server/0823-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0822-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index aaad61fa4d063092a5bc9262eaf50dc1b83f5cd5..3ed2bba9ab7ae5d25aebd82765b18c1a1fd1fd7f 100644
+index 417f1be1168df292988b707756fad78c7cd9391d..65bc013e9dc603ef0d64a9340353869f06ce18c2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2371,7 +2371,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0824-More-Teleport-API.patch b/patches/server/0823-More-Teleport-API.patch
similarity index 98%
rename from patches/server/0824-More-Teleport-API.patch
rename to patches/server/0823-More-Teleport-API.patch
index 0e6eb3a4b5..78587db55d 100644
--- a/patches/server/0824-More-Teleport-API.patch
+++ b/patches/server/0823-More-Teleport-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More Teleport API
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3ed2bba9ab7ae5d25aebd82765b18c1a1fd1fd7f..48eda556c333c4808c44ec7e6fd27c56fed68fe6 100644
+index 65bc013e9dc603ef0d64a9340353869f06ce18c2..23522e52cd8da1208004a6982b718c2a30530314 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1633,11 +1633,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -72,7 +72,7 @@ index d4fffcc5bb746df8dc177780f15ff4dbca64c018..ed30e079c23f564cbd0a45b38586bd12
          // Let the server handle cross world teleports
          if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2699f90a0fbe5397fb057ce59cadf0a64913659f..d8791e8b79b0aa430c0d451353e02a7ce8825893 100644
+index 89c90b704045345d0a6d37a032de8483a43a634b..a8ca69a7d1faf1aae1719fd1c125943424e778dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1210,13 +1210,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0825-Add-EntityPortalReadyEvent.patch b/patches/server/0824-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0825-Add-EntityPortalReadyEvent.patch
rename to patches/server/0824-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0826-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0825-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0826-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0825-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0827-Send-block-entities-after-destroy-prediction.patch b/patches/server/0826-Send-block-entities-after-destroy-prediction.patch
similarity index 98%
rename from patches/server/0827-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0826-Send-block-entities-after-destroy-prediction.patch
index 759925c47e..0f2280dba0 100644
--- a/patches/server/0827-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0826-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index bf9b185e3defb496022c20ec60a84a4f6f99d5be..4e1ed252bf400ec991f95b02984f01a9
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 48eda556c333c4808c44ec7e6fd27c56fed68fe6..63d9bfd162ccc1f57a8a00824388b04b5ea3c108 100644
+index 23522e52cd8da1208004a6982b718c2a30530314..a30523973711210e8c4b74d2f6cbce4314709338 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1779,8 +1779,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0828-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0827-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0828-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0827-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0829-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0828-Custom-Chat-Completion-Suggestions-API.patch
similarity index 94%
rename from patches/server/0829-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0828-Custom-Chat-Completion-Suggestions-API.patch
index a12668f87e..6af06925ba 100644
--- a/patches/server/0829-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0828-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d8791e8b79b0aa430c0d451353e02a7ce8825893..047b5a4b0d942726422f7025768dca5b00526d3c 100644
+index a8ca69a7d1faf1aae1719fd1c125943424e778dd..bb8453efee610a7d6b905f4ad57bc68bf8c3535f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -650,6 +650,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0830-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0829-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0830-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0829-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0831-Collision-API.patch b/patches/server/0830-Collision-API.patch
similarity index 100%
rename from patches/server/0831-Collision-API.patch
rename to patches/server/0830-Collision-API.patch
diff --git a/patches/server/0832-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0831-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0832-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0831-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0833-Block-Ticking-API.patch b/patches/server/0832-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0833-Block-Ticking-API.patch
rename to patches/server/0832-Block-Ticking-API.patch
diff --git a/patches/server/0834-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0833-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0834-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0833-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0835-Add-NamespacedKey-biome-methods.patch b/patches/server/0834-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0835-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0834-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0836-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0835-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0836-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0835-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0837-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0836-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0837-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0836-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0838-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0837-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0838-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0837-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0839-Missing-eating-regain-reason.patch b/patches/server/0838-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0839-Missing-eating-regain-reason.patch
rename to patches/server/0838-Missing-eating-regain-reason.patch
diff --git a/patches/server/0840-Missing-effect-cause.patch b/patches/server/0839-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0840-Missing-effect-cause.patch
rename to patches/server/0839-Missing-effect-cause.patch
diff --git a/patches/server/0841-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0840-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0841-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0840-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0842-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0841-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0842-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0841-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0843-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0842-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0843-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0842-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0844-Configurable-chat-thread-limit.patch b/patches/server/0843-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0844-Configurable-chat-thread-limit.patch
rename to patches/server/0843-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0845-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0844-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0845-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0844-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0846-fix-Jigsaw-block-kicking-user.patch b/patches/server/0845-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0846-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0845-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0847-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0846-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0847-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0846-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0848-Add-getDrops-to-BlockState.patch b/patches/server/0847-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0848-Add-getDrops-to-BlockState.patch
rename to patches/server/0847-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0849-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0848-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0849-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0848-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0850-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0849-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0850-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0849-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0851-Fix-custom-piglin-loved-items.patch b/patches/server/0850-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0851-Fix-custom-piglin-loved-items.patch
rename to patches/server/0850-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0852-EntityPickupItemEvent-fixes.patch b/patches/server/0851-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0852-EntityPickupItemEvent-fixes.patch
rename to patches/server/0851-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0853-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0852-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0853-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0852-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0854-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0853-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0854-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0853-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0855-Elder-Guardian-appearance-API.patch b/patches/server/0854-Elder-Guardian-appearance-API.patch
similarity index 90%
rename from patches/server/0855-Elder-Guardian-appearance-API.patch
rename to patches/server/0854-Elder-Guardian-appearance-API.patch
index 21ec461773..47e86cd523 100644
--- a/patches/server/0855-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0854-Elder-Guardian-appearance-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 047b5a4b0d942726422f7025768dca5b00526d3c..e05b3033b64672a9afe316fca49674f38f2830d5 100644
+index bb8453efee610a7d6b905f4ad57bc68bf8c3535f..1d32c0e3aca96b52899dc3734ea927820b7229c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3152,6 +3152,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0856-Allow-changing-bed-s-occupied-property.patch b/patches/server/0855-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0856-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0855-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0857-Add-entity-knockback-API.patch b/patches/server/0856-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0857-Add-entity-knockback-API.patch
rename to patches/server/0856-Add-entity-knockback-API.patch
diff --git a/patches/server/0858-Detect-headless-JREs.patch b/patches/server/0857-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0858-Detect-headless-JREs.patch
rename to patches/server/0857-Detect-headless-JREs.patch
diff --git a/patches/server/0859-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0858-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0859-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0858-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0860-optimized-dirt-and-snow-spreading.patch b/patches/server/0859-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0860-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0859-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0861-Added-EntityToggleSitEvent.patch b/patches/server/0860-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0861-Added-EntityToggleSitEvent.patch
rename to patches/server/0860-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0862-Add-fire-tick-delay-option.patch b/patches/server/0861-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0862-Add-fire-tick-delay-option.patch
rename to patches/server/0861-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0863-Add-Moving-Piston-API.patch b/patches/server/0862-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0863-Add-Moving-Piston-API.patch
rename to patches/server/0862-Add-Moving-Piston-API.patch
diff --git a/patches/server/0864-Ignore-impossible-spawn-tick.patch b/patches/server/0863-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0864-Ignore-impossible-spawn-tick.patch
rename to patches/server/0863-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0865-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0864-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0865-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0864-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0866-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0865-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0866-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0865-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0867-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0866-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0867-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0866-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0868-Prevent-compass-from-loading-chunks.patch b/patches/server/0867-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0868-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0867-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0869-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0868-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0869-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0868-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0870-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0869-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0870-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0869-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0871-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0870-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0871-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0870-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0872-Add-Player-Warden-Warning-API.patch b/patches/server/0871-Add-Player-Warden-Warning-API.patch
similarity index 95%
rename from patches/server/0872-Add-Player-Warden-Warning-API.patch
rename to patches/server/0871-Add-Player-Warden-Warning-API.patch
index 17f8b35103..6971eb5a91 100644
--- a/patches/server/0872-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0871-Add-Player-Warden-Warning-API.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e05b3033b64672a9afe316fca49674f38f2830d5..e15a9558e1525081025c1363e218f6b4bd312c59 100644
+index 1d32c0e3aca96b52899dc3734ea927820b7229c0..59c5c752f8a98dd20a42961045ced69c5e640f7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3157,6 +3157,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0873-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0872-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0873-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0872-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0874-Add-paper-dumplisteners-command.patch b/patches/server/0873-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0874-Add-paper-dumplisteners-command.patch
rename to patches/server/0873-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0875-check-global-player-list-where-appropriate.patch b/patches/server/0874-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0875-check-global-player-list-where-appropriate.patch
rename to patches/server/0874-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0876-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0875-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0876-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0875-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0877-ItemStack-damage-API.patch b/patches/server/0876-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0877-ItemStack-damage-API.patch
rename to patches/server/0876-ItemStack-damage-API.patch
diff --git a/patches/server/0878-Friction-API.patch b/patches/server/0877-Friction-API.patch
similarity index 100%
rename from patches/server/0878-Friction-API.patch
rename to patches/server/0877-Friction-API.patch
diff --git a/patches/server/0879-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0878-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0879-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0878-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0880-Fix-player-kick-on-shutdown.patch b/patches/server/0879-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0880-Fix-player-kick-on-shutdown.patch
rename to patches/server/0879-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0881-Sync-offhand-slot-in-menus.patch b/patches/server/0880-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0881-Sync-offhand-slot-in-menus.patch
rename to patches/server/0880-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0882-Player-Entity-Tracking-Events.patch b/patches/server/0881-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0882-Player-Entity-Tracking-Events.patch
rename to patches/server/0881-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0883-Limit-pet-look-distance.patch b/patches/server/0882-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0883-Limit-pet-look-distance.patch
rename to patches/server/0882-Limit-pet-look-distance.patch
diff --git a/patches/server/0884-Properly-resend-entities.patch b/patches/server/0883-Properly-resend-entities.patch
similarity index 99%
rename from patches/server/0884-Properly-resend-entities.patch
rename to patches/server/0883-Properly-resend-entities.patch
index 30cd4d1675..3bc49c2536 100644
--- a/patches/server/0884-Properly-resend-entities.patch
+++ b/patches/server/0883-Properly-resend-entities.patch
@@ -85,7 +85,7 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..ccb7d92b6c36b6225a2e640f8cea6c0d
      public static class DataItem<T> {
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 63d9bfd162ccc1f57a8a00824388b04b5ea3c108..8797f0d1caed0f73f0c19852789c9509f3112075 100644
+index a30523973711210e8c4b74d2f6cbce4314709338..d4187f23bdebbab0cbee72009e0257de3e1c876c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2651,7 +2651,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0885-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0884-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0885-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0884-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0886-fix-Instruments.patch b/patches/server/0885-fix-Instruments.patch
similarity index 96%
rename from patches/server/0886-fix-Instruments.patch
rename to patches/server/0885-fix-Instruments.patch
index cd27f3f33b..9d74161588 100644
--- a/patches/server/0886-fix-Instruments.patch
+++ b/patches/server/0885-fix-Instruments.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e15a9558e1525081025c1363e218f6b4bd312c59..0911c5ca8f2ea1a0f99567b1621c80064ee81ce8 100644
+index 59c5c752f8a98dd20a42961045ced69c5e640f7f..46f6e1d3a87617440e1855580a2e20ea106a0216 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -727,7 +727,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0887-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0886-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0887-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0886-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0888-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0887-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0888-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0887-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0889-Add-BlockLockCheckEvent.patch b/patches/server/0888-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0889-Add-BlockLockCheckEvent.patch
rename to patches/server/0888-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0890-Add-Sneaking-API-for-Entities.patch b/patches/server/0889-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0890-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0889-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0891-Improve-logging-and-errors.patch b/patches/server/0890-Improve-logging-and-errors.patch
similarity index 98%
rename from patches/server/0891-Improve-logging-and-errors.patch
rename to patches/server/0890-Improve-logging-and-errors.patch
index 6e6e93f787..0f6d3a7501 100644
--- a/patches/server/0891-Improve-logging-and-errors.patch
+++ b/patches/server/0890-Improve-logging-and-errors.patch
@@ -40,7 +40,7 @@ index 536f0c496ce36ca3248fc6eeac9bbd77214a36f9..5e24c1e712eb16d0d5343760a65310bd
  
          while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8797f0d1caed0f73f0c19852789c9509f3112075..8b71e52d84575e2fea3c7be9f90ec9d558d2628a 100644
+index d4187f23bdebbab0cbee72009e0257de3e1c876c..8ff416bbb4743af7bb4f3a1b30e34bd288059fa9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3388,7 +3388,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0892-Improve-PortalEvents.patch b/patches/server/0891-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0892-Improve-PortalEvents.patch
rename to patches/server/0891-Improve-PortalEvents.patch
diff --git a/patches/server/0893-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0892-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0893-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0892-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0894-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0893-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 92%
rename from patches/server/0894-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0893-Add-missing-SpigotConfig-logCommands-check.patch
index b9b1cb630f..70205aaf05 100644
--- a/patches/server/0894-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0893-Add-missing-SpigotConfig-logCommands-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8b71e52d84575e2fea3c7be9f90ec9d558d2628a..e83b6a1c01f56e22aa3e148abe3e0699d838bc3b 100644
+index 8ff416bbb4743af7bb4f3a1b30e34bd288059fa9..38f34e26dc515b66fe4bc38285b9813023c0ed97 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2135,7 +2135,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0895-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0894-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0895-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0894-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0896-Flying-Fall-Damage.patch b/patches/server/0895-Flying-Fall-Damage.patch
similarity index 95%
rename from patches/server/0896-Flying-Fall-Damage.patch
rename to patches/server/0895-Flying-Fall-Damage.patch
index 983ea7cf35..346011c78e 100644
--- a/patches/server/0896-Flying-Fall-Damage.patch
+++ b/patches/server/0895-Flying-Fall-Damage.patch
@@ -26,7 +26,7 @@ index 28fa46f29639a6b643b475912133d601028facb2..7f3466340891b4409d1399ebeb2ca865
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0911c5ca8f2ea1a0f99567b1621c80064ee81ce8..79105c8525b8087e4121814f99f3a8b8ae285bb5 100644
+index 46f6e1d3a87617440e1855580a2e20ea106a0216..b2b3b0fef761a4a096af35258d168f0e5eb5b58f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2434,6 +2434,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0897-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0896-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0897-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0896-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0898-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0897-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0898-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0897-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0899-config-for-disabling-entity-tag-tags.patch b/patches/server/0898-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0899-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0898-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0900-Use-single-player-info-update-packet-on-join.patch b/patches/server/0899-Use-single-player-info-update-packet-on-join.patch
similarity index 97%
rename from patches/server/0900-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0899-Use-single-player-info-update-packet-on-join.patch
index 54b0240637..2043f5795b 100644
--- a/patches/server/0900-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0899-Use-single-player-info-update-packet-on-join.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e83b6a1c01f56e22aa3e148abe3e0699d838bc3b..7e6f530eb007e82c3115cb654165fa2c60a185ed 100644
+index 38f34e26dc515b66fe4bc38285b9813023c0ed97..3aa38ad04f706de37406acbec7b9379a663bcc98 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3418,7 +3418,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0901-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0900-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0901-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0900-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0902-Win-Screen-API.patch b/patches/server/0901-Win-Screen-API.patch
similarity index 93%
rename from patches/server/0902-Win-Screen-API.patch
rename to patches/server/0901-Win-Screen-API.patch
index 3d0eb8d793..2434be446a 100644
--- a/patches/server/0902-Win-Screen-API.patch
+++ b/patches/server/0901-Win-Screen-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 79105c8525b8087e4121814f99f3a8b8ae285bb5..849fa10a831b83061a974c284b4e42cbf9d812cc 100644
+index b2b3b0fef761a4a096af35258d168f0e5eb5b58f..975961b230de5138de73723d318adf7e9fe8eeb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1229,6 +1229,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0903-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0902-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0903-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0902-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0904-Fix-force-opening-enchantment-tables.patch b/patches/server/0903-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0904-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0903-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0905-Add-Entity-Body-Yaw-API.patch b/patches/server/0904-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0905-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0904-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0906-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0905-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0906-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0905-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0907-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0906-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 100%
rename from patches/server/0907-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0906-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0908-Add-EntityFertilizeEggEvent.patch b/patches/server/0907-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0908-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0907-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0909-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0908-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0909-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0908-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0910-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0909-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0910-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0909-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0911-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0910-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0911-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0910-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0912-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0911-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0912-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0911-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0913-Fix-text-display-error-on-spawn.patch b/patches/server/0912-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0913-Fix-text-display-error-on-spawn.patch
rename to patches/server/0912-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0914-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0913-Fix-certain-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0914-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0913-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0915-Add-Shearable-API.patch b/patches/server/0914-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0915-Add-Shearable-API.patch
rename to patches/server/0914-Add-Shearable-API.patch
diff --git a/patches/server/0916-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0915-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0916-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0915-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0917-Optimize-Hoppers.patch b/patches/server/0916-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0917-Optimize-Hoppers.patch
rename to patches/server/0916-Optimize-Hoppers.patch
diff --git a/patches/server/0918-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0917-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0918-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0917-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0919-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0918-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0919-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0918-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0920-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0919-Treat-sequence-violations-like-they-should-be.patch
similarity index 91%
rename from patches/server/0920-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0919-Treat-sequence-violations-like-they-should-be.patch
index b519609990..2fda1635ac 100644
--- a/patches/server/0920-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0919-Treat-sequence-violations-like-they-should-be.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7e6f530eb007e82c3115cb654165fa2c60a185ed..869440f9413610bed007bbfc0983113b2555d5f6 100644
+index 3aa38ad04f706de37406acbec7b9379a663bcc98..40ba283c36436d2190f45592f2f96f645174978b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2039,6 +2039,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0921-remove-duplicate-animate-packet-for-records.patch b/patches/server/0920-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0921-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0920-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0922-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0921-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 97%
rename from patches/server/0922-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0921-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 82e3390352..cdcb6012dd 100644
--- a/patches/server/0922-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0921-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -24,7 +24,7 @@ index 0e54e8faa48751a651b953bec72543a94edf74bc..aa1c6de4d6cb7bbca33d25895c54707d
          UPDATE_GAME_MODE((serialized, buf) -> {
              serialized.gameMode = GameType.byId(buf.readVarInt());
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 869440f9413610bed007bbfc0983113b2555d5f6..df6aa82e8a556c65e8581ac3efd95d5dd8868331 100644
+index 40ba283c36436d2190f45592f2f96f645174978b..207576cbf4517d43a5159d7543db47782612c8c9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -287,6 +287,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0923-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0922-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0923-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0922-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0924-Use-array-for-gamerule-storage.patch b/patches/server/0923-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0924-Use-array-for-gamerule-storage.patch
rename to patches/server/0923-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0925-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0924-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0925-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0924-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0926-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0925-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0926-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0925-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0927-Add-Mob-Experience-reward-API.patch b/patches/server/0926-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0927-Add-Mob-Experience-reward-API.patch
rename to patches/server/0926-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0928-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0927-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0928-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0927-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0929-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0928-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0929-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0928-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0930-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0929-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0930-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0929-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0931-More-accurate-isInOpenWater-impl.patch b/patches/server/0930-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0931-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0930-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0932-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0931-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0932-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0931-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0933-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0932-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0933-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0932-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0934-Expand-PlayerItemMendEvent.patch b/patches/server/0933-Expand-PlayerItemMendEvent.patch
similarity index 98%
rename from patches/server/0934-Expand-PlayerItemMendEvent.patch
rename to patches/server/0933-Expand-PlayerItemMendEvent.patch
index 28a28a4921..ca1da3876a 100644
--- a/patches/server/0934-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0933-Expand-PlayerItemMendEvent.patch
@@ -33,7 +33,7 @@ index cab5636fe6be9ee7f23ffbd5a399d2aeea1cd538..fb74f13ab2a977224e843a468ea8c72d
              return k > 0 ? this.repairPlayerItems(player, k) : 0;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 849fa10a831b83061a974c284b4e42cbf9d812cc..104a46702686340fafd25b80a1f5a7c1a69076a6 100644
+index 975961b230de5138de73723d318adf7e9fe8eeb6..70a75170fb6516ab143b8e4da6d453876b02942d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1751,11 +1751,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0935-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0934-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0935-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0934-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0936-Add-transient-modifier-API.patch b/patches/server/0935-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0936-Add-transient-modifier-API.patch
rename to patches/server/0935-Add-transient-modifier-API.patch
diff --git a/patches/server/0937-Fix-block-place-logic.patch b/patches/server/0936-Fix-block-place-logic.patch
similarity index 100%
rename from patches/server/0937-Fix-block-place-logic.patch
rename to patches/server/0936-Fix-block-place-logic.patch
diff --git a/patches/server/0938-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0937-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0938-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0937-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0939-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0938-Ignore-inline-definitions-of-trim-material-pattern.patch
similarity index 100%
rename from patches/server/0939-Ignore-inline-definitions-of-trim-material-pattern.patch
rename to patches/server/0938-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0940-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0939-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0940-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0939-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0941-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0940-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0941-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0940-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0942-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0941-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0942-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0941-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0943-Fix-sniffer-removeExploredLocation.patch b/patches/server/0942-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0943-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0942-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0944-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0943-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0944-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0943-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0945-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0944-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 100%
rename from patches/server/0945-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0944-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0946-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0945-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0946-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0945-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0947-Properly-Cancel-Usable-Items.patch b/patches/server/0946-Properly-Cancel-Usable-Items.patch
similarity index 97%
rename from patches/server/0947-Properly-Cancel-Usable-Items.patch
rename to patches/server/0946-Properly-Cancel-Usable-Items.patch
index bc96a5a2f8..bf1aac71a2 100644
--- a/patches/server/0947-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0946-Properly-Cancel-Usable-Items.patch
@@ -34,7 +34,7 @@ index f58386e952d29a16d160b628a23efbe102791277..82f26186156a487f29ad3abff3f68852
          return enuminteractionresult;
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index df6aa82e8a556c65e8581ac3efd95d5dd8868331..68d9b62ff075f899877b8b9a6857408933ab8b36 100644
+index 207576cbf4517d43a5159d7543db47782612c8c9..ccd6b734534a9f2b4205ee857ac650b26be74d5e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1951,6 +1951,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0948-Add-event-for-player-editing-sign.patch b/patches/server/0947-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0948-Add-event-for-player-editing-sign.patch
rename to patches/server/0947-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0949-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0948-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0949-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0948-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0950-Improve-command-function-perm-level-checks.patch b/patches/server/0949-Improve-command-function-perm-level-checks.patch
similarity index 100%
rename from patches/server/0950-Improve-command-function-perm-level-checks.patch
rename to patches/server/0949-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0951-Add-option-to-disable-block-updates.patch b/patches/server/0950-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0951-Add-option-to-disable-block-updates.patch
rename to patches/server/0950-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0952-Call-missing-BlockDispenseEvent.patch b/patches/server/0951-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0952-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0951-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0953-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0952-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 100%
rename from patches/server/0953-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0952-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0954-Optimize-player-lookups-for-beacons.patch b/patches/server/0953-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0954-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0953-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0955-Add-Sign-getInteractableSideFor.patch b/patches/server/0954-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0955-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0954-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0956-Array-backed-synched-entity-data.patch b/patches/server/0955-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0956-Array-backed-synched-entity-data.patch
rename to patches/server/0955-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0957-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0956-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0957-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0956-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0958-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0957-Suppress-Item-Meta-Validation-Checks.patch
similarity index 100%
rename from patches/server/0958-Suppress-Item-Meta-Validation-Checks.patch
rename to patches/server/0957-Suppress-Item-Meta-Validation-Checks.patch
diff --git a/patches/server/0959-Fix-BanList-API.patch b/patches/server/0958-Fix-BanList-API.patch
similarity index 99%
rename from patches/server/0959-Fix-BanList-API.patch
rename to patches/server/0958-Fix-BanList-API.patch
index 9a67b58cae..d466acddb4 100644
--- a/patches/server/0959-Fix-BanList-API.patch
+++ b/patches/server/0958-Fix-BanList-API.patch
@@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 104a46702686340fafd25b80a1f5a7c1a69076a6..2453a6930c37b7596844d5355fc2aa99518f683a 100644
+index 70a75170fb6516ab143b8e4da6d453876b02942d..ef0f3199a9a0fe1ab8457af647a8f4912d3b38eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1649,23 +1649,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0960-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0959-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0960-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0959-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0961-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0960-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0961-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0960-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0962-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0961-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0962-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0961-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0963-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0962-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0963-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0962-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0964-Don-t-tick-signs.patch b/patches/server/0963-Don-t-tick-signs.patch
similarity index 100%
rename from patches/server/0964-Don-t-tick-signs.patch
rename to patches/server/0963-Don-t-tick-signs.patch
diff --git a/patches/server/0965-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0964-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0965-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0964-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0966-Add-whitelist-events.patch b/patches/server/0965-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0966-Add-whitelist-events.patch
rename to patches/server/0965-Add-whitelist-events.patch
diff --git a/patches/server/0967-Implement-PlayerFailMoveEvent.patch b/patches/server/0966-Implement-PlayerFailMoveEvent.patch
similarity index 98%
rename from patches/server/0967-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0966-Implement-PlayerFailMoveEvent.patch
index 24a3ac3fd0..328c69ac9c 100644
--- a/patches/server/0967-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0966-Implement-PlayerFailMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 68d9b62ff075f899877b8b9a6857408933ab8b36..a28001634f1582efa2a0580f528fd7a5ae7d2624 100644
+index ccd6b734534a9f2b4205ee857ac650b26be74d5e..e58a86e70767707e144f45e9160f1b266ae07145 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1317,8 +1317,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0968-Folia-scheduler-and-owned-region-API.patch b/patches/server/0967-Folia-scheduler-and-owned-region-API.patch
similarity index 100%
rename from patches/server/0968-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0967-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0969-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0968-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0969-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0968-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0970-API-for-updating-recipes-on-clients.patch b/patches/server/0969-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/server/0970-API-for-updating-recipes-on-clients.patch
rename to patches/server/0969-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0971-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0970-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0971-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0970-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0972-Only-capture-actual-tree-growth.patch b/patches/server/0971-Only-capture-actual-tree-growth.patch
similarity index 100%
rename from patches/server/0972-Only-capture-actual-tree-growth.patch
rename to patches/server/0971-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0973-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0972-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0973-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0972-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0974-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0973-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0974-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0973-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0975-Use-correct-seed-on-api-world-load.patch b/patches/server/0974-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/0975-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0974-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0976-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0975-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0976-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0975-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0977-Cache-map-ids-on-item-frames.patch b/patches/server/0976-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0977-Cache-map-ids-on-item-frames.patch
rename to patches/server/0976-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0978-Fix-custom-statistic-criteria-creation.patch b/patches/server/0977-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0978-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0977-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0979-Bandaid-fix-for-Effect.patch b/patches/server/0978-Bandaid-fix-for-Effect.patch
similarity index 98%
rename from patches/server/0979-Bandaid-fix-for-Effect.patch
rename to patches/server/0978-Bandaid-fix-for-Effect.patch
index dc85a27f09..d3a0eb2a15 100644
--- a/patches/server/0979-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0978-Bandaid-fix-for-Effect.patch
@@ -73,7 +73,7 @@ index c77fec78636805a496ecea3e56f26290dbcbffff..abb14719496971a780650782bdce17c6
              // Special case: the axis is optional for ELECTRIC_SPARK
              Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2453a6930c37b7596844d5355fc2aa99518f683a..1a0d57c849b059d781cda9617c163bf6830c063a 100644
+index ef0f3199a9a0fe1ab8457af647a8f4912d3b38eb..5b26e8b4d57360562d9d2859826577da58256d87 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -876,7 +876,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0980-SculkCatalyst-bloom-API.patch b/patches/server/0979-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0980-SculkCatalyst-bloom-API.patch
rename to patches/server/0979-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0981-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0980-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0981-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0980-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0982-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0981-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 100%
rename from patches/server/0982-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0981-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0983-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0982-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/server/0983-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0982-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0984-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0983-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 95%
rename from patches/server/0984-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0983-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 3d3a9e0cf2..1511ed2158 100644
--- a/patches/server/0984-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0983-Don-t-tab-complete-namespaced-commands-if-send-names.patch
@@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player
 requests tab-complete only commands.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a28001634f1582efa2a0580f528fd7a5ae7d2624..60c7fecfdea20086431a1d2de6b932866651366b 100644
+index e58a86e70767707e144f45e9160f1b266ae07145..38669b07813c41e6e7c2389507802d91fb697872 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -809,6 +809,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0985-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0984-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/0985-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0984-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0986-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0985-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0986-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0985-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0987-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0986-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 100%
rename from patches/server/0987-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0986-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0988-Add-Listing-API-for-Player.patch b/patches/server/0987-Add-Listing-API-for-Player.patch
similarity index 99%
rename from patches/server/0988-Add-Listing-API-for-Player.patch
rename to patches/server/0987-Add-Listing-API-for-Player.patch
index 6fb01f29ad..3ce68e3230 100644
--- a/patches/server/0988-Add-Listing-API-for-Player.patch
+++ b/patches/server/0987-Add-Listing-API-for-Player.patch
@@ -113,7 +113,7 @@ index 098bb36a66e022da30302936aba10d296587ac88..a35638a92479b90afa89cf201fc45b49
          // Paper end
          player.sentListPacket = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1a0d57c849b059d781cda9617c163bf6830c063a..a86f389034825b200bec799c03464541a9f4df87 100644
+index 5b26e8b4d57360562d9d2859826577da58256d87..b7f5c1ec495a61528d95fd91b9d60428e9b00438 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -185,6 +185,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0989-Configurable-Region-Compression-Format.patch b/patches/server/0988-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0989-Configurable-Region-Compression-Format.patch
rename to patches/server/0988-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0990-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/0989-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 100%
rename from patches/server/0990-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/server/0989-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/server/0991-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0990-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/0991-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0990-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0992-Expand-Pose-API.patch b/patches/server/0991-Expand-Pose-API.patch
similarity index 100%
rename from patches/server/0992-Expand-Pose-API.patch
rename to patches/server/0991-Expand-Pose-API.patch
diff --git a/patches/server/0993-More-DragonBattle-API.patch b/patches/server/0992-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/0993-More-DragonBattle-API.patch
rename to patches/server/0992-More-DragonBattle-API.patch
diff --git a/patches/server/0994-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0993-Deep-clone-unhandled-nbt-tags.patch
similarity index 100%
rename from patches/server/0994-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/0993-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/0995-Add-PlayerPickItemEvent.patch b/patches/server/0994-Add-PlayerPickItemEvent.patch
similarity index 96%
rename from patches/server/0995-Add-PlayerPickItemEvent.patch
rename to patches/server/0994-Add-PlayerPickItemEvent.patch
index 6e43a703f0..d3f62c2961 100644
--- a/patches/server/0995-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0994-Add-PlayerPickItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 60c7fecfdea20086431a1d2de6b932866651366b..cabdd17112b130564fb3876c5db711721f13cfba 100644
+index 38669b07813c41e6e7c2389507802d91fb697872..047af80d7becc0484f1d38a2c2b70fa394972161 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -946,7 +946,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0996-Improve-performance-of-mass-crafts.patch b/patches/server/0995-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/0996-Improve-performance-of-mass-crafts.patch
rename to patches/server/0995-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/0997-Allow-trident-custom-damage.patch b/patches/server/0996-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/0997-Allow-trident-custom-damage.patch
rename to patches/server/0996-Allow-trident-custom-damage.patch
diff --git a/patches/server/0998-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/0997-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/0998-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/server/0997-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/0999-Optimize-nearest-structure-border-iteration.patch b/patches/server/0998-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/0999-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/0998-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/1000-Implement-OfflinePlayer-isConnected.patch b/patches/server/0999-Implement-OfflinePlayer-isConnected.patch
similarity index 94%
rename from patches/server/1000-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/0999-Implement-OfflinePlayer-isConnected.patch
index d7a56953a9..3a92f89bbe 100644
--- a/patches/server/1000-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0999-Implement-OfflinePlayer-isConnected.patch
@@ -23,7 +23,7 @@ index 9daec0782774ab51ea8091cb8ed9d0a106e34cfa..2bbc39c257965ad91ee360cdfcd3538a
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a86f389034825b200bec799c03464541a9f4df87..abcde413e2fe22b14994b2f5b15fd7db1a257465 100644
+index b7f5c1ec495a61528d95fd91b9d60428e9b00438..11d56ec04b2f63c8a0fb54e586bebe98afc1a3ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -282,6 +282,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1001-Fix-inventory-desync.patch b/patches/server/1000-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/1001-Fix-inventory-desync.patch
rename to patches/server/1000-Fix-inventory-desync.patch
diff --git a/patches/server/1002-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1001-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/server/1002-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/1001-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/1003-Configure-sniffer-egg-hatch-time.patch b/patches/server/1002-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/1003-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/1002-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/1004-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1003-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/1004-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/1003-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/1005-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1004-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/1005-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/1004-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/1006-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1005-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 96%
rename from patches/server/1006-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/1005-Add-slot-sanity-checks-in-container-clicks.patch
index 5a19297c23..6aae76295f 100644
--- a/patches/server/1006-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/1005-Add-slot-sanity-checks-in-container-clicks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add slot sanity checks in container clicks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cabdd17112b130564fb3876c5db711721f13cfba..9073db9ad3627633f46314ae936d584fa400a9ce 100644
+index 047af80d7becc0484f1d38a2c2b70fa394972161..30ccbab1586a656e0ae41d7406525fb02d9e025b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2983,6 +2983,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1007-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1006-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/1007-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/1006-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/1008-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1007-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/1008-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/1007-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/1009-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1008-Fix-silent-equipment-change-for-mobs.patch
similarity index 100%
rename from patches/server/1009-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/1008-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/1010-Fix-spigot-s-Forced-Stats.patch b/patches/server/1009-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/1010-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/1009-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/1011-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1010-Add-missing-InventoryHolders-to-inventories.patch
similarity index 100%
rename from patches/server/1011-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/1010-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/1012-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1011-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 100%
rename from patches/server/1012-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/1011-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/1013-Actually-optimise-explosions.patch b/patches/server/1012-Actually-optimise-explosions.patch
similarity index 100%
rename from patches/server/1013-Actually-optimise-explosions.patch
rename to patches/server/1012-Actually-optimise-explosions.patch
diff --git a/patches/server/1014-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1013-Add-missing-logs-for-log-ips-config-option.patch
similarity index 100%
rename from patches/server/1014-Add-missing-logs-for-log-ips-config-option.patch
rename to patches/server/1013-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/1015-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1014-Remove-Spigot-Bug-Fix-for-MC-109346.patch
similarity index 100%
rename from patches/server/1015-Remove-Spigot-Bug-Fix-for-MC-109346.patch
rename to patches/server/1014-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/1016-Fix-SuspiciousStewMeta.patch b/patches/server/1015-Fix-SuspiciousStewMeta.patch
similarity index 100%
rename from patches/server/1016-Fix-SuspiciousStewMeta.patch
rename to patches/server/1015-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/1017-Optimise-chunk-tick-iteration.patch b/patches/server/1016-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/1017-Optimise-chunk-tick-iteration.patch
rename to patches/server/1016-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1018-Lag-compensation-ticks.patch b/patches/server/1017-Lag-compensation-ticks.patch
similarity index 100%
rename from patches/server/1018-Lag-compensation-ticks.patch
rename to patches/server/1017-Lag-compensation-ticks.patch
diff --git a/patches/server/1019-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1018-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
similarity index 100%
rename from patches/server/1019-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
rename to patches/server/1018-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/1020-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1019-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
similarity index 100%
rename from patches/server/1020-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
rename to patches/server/1019-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/1021-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1020-Fix-team-sidebar-objectives-not-being-cleared.patch
similarity index 100%
rename from patches/server/1021-Fix-team-sidebar-objectives-not-being-cleared.patch
rename to patches/server/1020-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/1022-Optimise-nearby-player-retrieval.patch b/patches/server/1021-Optimise-nearby-player-retrieval.patch
similarity index 100%
rename from patches/server/1022-Optimise-nearby-player-retrieval.patch
rename to patches/server/1021-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1023-Remove-streams-for-villager-AI.patch b/patches/server/1022-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/1023-Remove-streams-for-villager-AI.patch
rename to patches/server/1022-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/1024-Fix-missing-map-initialize-event-call.patch b/patches/server/1023-Fix-missing-map-initialize-event-call.patch
similarity index 100%
rename from patches/server/1024-Fix-missing-map-initialize-event-call.patch
rename to patches/server/1023-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/1025-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1024-Update-entity-data-when-attaching-firework-to-entity.patch
similarity index 100%
rename from patches/server/1025-Update-entity-data-when-attaching-firework-to-entity.patch
rename to patches/server/1024-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/1026-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1025-Use-correct-variable-for-initializing-CraftLootTable.patch
similarity index 100%
rename from patches/server/1026-Use-correct-variable-for-initializing-CraftLootTable.patch
rename to patches/server/1025-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/1027-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1026-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
similarity index 100%
rename from patches/server/1027-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
rename to patches/server/1026-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/1028-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1027-Fix-UnsafeValues-loadAdvancement.patch
similarity index 100%
rename from patches/server/1028-Fix-UnsafeValues-loadAdvancement.patch
rename to patches/server/1027-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/1029-Add-player-idle-duration-API.patch b/patches/server/1028-Add-player-idle-duration-API.patch
similarity index 91%
rename from patches/server/1029-Add-player-idle-duration-API.patch
rename to patches/server/1028-Add-player-idle-duration-API.patch
index 1c75e9eb2f..9baa7c4ace 100644
--- a/patches/server/1029-Add-player-idle-duration-API.patch
+++ b/patches/server/1028-Add-player-idle-duration-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index abcde413e2fe22b14994b2f5b15fd7db1a257465..9073edd4c0baa82f2b340d1898a89cf285262484 100644
+index 11d56ec04b2f63c8a0fb54e586bebe98afc1a3ad..8a99ce2806d0ef5bf8125f37e6c95980aeb9e7c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3274,6 +3274,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1030-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1029-Don-t-check-if-we-can-see-non-visible-entities.patch
similarity index 100%
rename from patches/server/1030-Don-t-check-if-we-can-see-non-visible-entities.patch
rename to patches/server/1029-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/1031-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1030-Fix-NPE-in-SculkBloomEvent-world-access.patch
similarity index 100%
rename from patches/server/1031-Fix-NPE-in-SculkBloomEvent-world-access.patch
rename to patches/server/1030-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/1032-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1031-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
similarity index 90%
rename from patches/server/1032-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
rename to patches/server/1031-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 08933a9259..7748c22a1a 100644
--- a/patches/server/1032-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/1031-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9073edd4c0baa82f2b340d1898a89cf285262484..2f65d85b35eec863dabf05eff2230ee513d341d3 100644
+index 8a99ce2806d0ef5bf8125f37e6c95980aeb9e7c5..3c0fb2821c3b621b463accc0ca6915bd51992993 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1086,7 +1086,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1033-Optimize-VarInts.patch b/patches/server/1032-Optimize-VarInts.patch
similarity index 100%
rename from patches/server/1033-Optimize-VarInts.patch
rename to patches/server/1032-Optimize-VarInts.patch
diff --git a/patches/server/1034-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/1033-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/server/1034-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/server/1033-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/1035-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/1034-Add-predicate-for-blocks-when-raytracing.patch
similarity index 100%
rename from patches/server/1035-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/server/1034-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/1036-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/1035-Broadcast-take-item-packets-with-collector-as-source.patch
similarity index 100%
rename from patches/server/1036-Broadcast-take-item-packets-with-collector-as-source.patch
rename to patches/server/1035-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/1037-fix-secure-profile-with-proxy-online-mode.patch b/patches/server/1036-fix-secure-profile-with-proxy-online-mode.patch
similarity index 100%
rename from patches/server/1037-fix-secure-profile-with-proxy-online-mode.patch
rename to patches/server/1036-fix-secure-profile-with-proxy-online-mode.patch
diff --git a/patches/server/1038-Expand-LingeringPotion-API.patch b/patches/server/1037-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/server/1038-Expand-LingeringPotion-API.patch
rename to patches/server/1037-Expand-LingeringPotion-API.patch
diff --git a/patches/server/1039-Add-MaterialTagsTest.patch b/patches/server/1038-Add-MaterialTagsTest.patch
similarity index 100%
rename from patches/server/1039-Add-MaterialTagsTest.patch
rename to patches/server/1038-Add-MaterialTagsTest.patch
diff --git a/patches/server/1040-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/1039-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
similarity index 100%
rename from patches/server/1040-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
rename to patches/server/1039-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/1041-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/1040-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/server/1041-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/server/1040-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/1042-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/1041-Fix-several-issues-with-EntityBreedEvent.patch
similarity index 100%
rename from patches/server/1042-Fix-several-issues-with-EntityBreedEvent.patch
rename to patches/server/1041-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/1043-Add-UUID-attribute-modifier-API.patch b/patches/server/1042-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/server/1043-Add-UUID-attribute-modifier-API.patch
rename to patches/server/1042-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/1044-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/1043-Fix-missing-event-call-for-entity-teleport-API.patch
similarity index 100%
rename from patches/server/1044-Fix-missing-event-call-for-entity-teleport-API.patch
rename to patches/server/1043-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/1045-Lazily-create-LootContext-for-criterions.patch b/patches/server/1044-Lazily-create-LootContext-for-criterions.patch
similarity index 100%
rename from patches/server/1045-Lazily-create-LootContext-for-criterions.patch
rename to patches/server/1044-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/1046-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch b/patches/server/1045-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch
similarity index 100%
rename from patches/server/1046-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch
rename to patches/server/1045-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch
diff --git a/patches/server/1047-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/1046-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
similarity index 100%
rename from patches/server/1047-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
rename to patches/server/1046-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/1048-Restore-vanilla-entity-drops-behavior.patch b/patches/server/1047-Restore-vanilla-entity-drops-behavior.patch
similarity index 100%
rename from patches/server/1048-Restore-vanilla-entity-drops-behavior.patch
rename to patches/server/1047-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/1049-Add-Structure-check-API.patch b/patches/server/1048-Add-Structure-check-API.patch
similarity index 100%
rename from patches/server/1049-Add-Structure-check-API.patch
rename to patches/server/1048-Add-Structure-check-API.patch
diff --git a/patches/server/1050-Dont-resend-blocks-on-interactions.patch b/patches/server/1049-Dont-resend-blocks-on-interactions.patch
similarity index 100%
rename from patches/server/1050-Dont-resend-blocks-on-interactions.patch
rename to patches/server/1049-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/1051-Temp-adventure-update.patch b/patches/server/1050-Temp-adventure-update.patch
similarity index 100%
rename from patches/server/1051-Temp-adventure-update.patch
rename to patches/server/1050-Temp-adventure-update.patch
diff --git a/patches/server/1052-Keep-previous-behavior-for-setResourcePack.patch b/patches/server/1051-Keep-previous-behavior-for-setResourcePack.patch
similarity index 94%
rename from patches/server/1052-Keep-previous-behavior-for-setResourcePack.patch
rename to patches/server/1051-Keep-previous-behavior-for-setResourcePack.patch
index 8c1093aae5..c2d217c1ba 100644
--- a/patches/server/1052-Keep-previous-behavior-for-setResourcePack.patch
+++ b/patches/server/1051-Keep-previous-behavior-for-setResourcePack.patch
@@ -10,7 +10,7 @@ packs before sending the new pack. Other API exists
 for adding a new pack to the existing packs on a client.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2f65d85b35eec863dabf05eff2230ee513d341d3..036b31cbfda8bac02205d99c1eff8a08f4da1250 100644
+index 3c0fb2821c3b621b463accc0ca6915bd51992993..fd84786f3e72875e79df46416f47f3403876cef3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2350,8 +2350,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {