Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
69fa4695 Add some missing deprecation annotations
f850da2e Update Maven plugins/versions
8d8400db Use regular compiler seeing as ECJ doesn't support Java 21 JRE
c29e1688 Revert "BUILDTOOLS-676: Downgrade Maven compiler version"
07bce714 SPIGOT-7355: More field renames and fixes
6a8ea764 Fix bad merge in penultimate commit
50a7920c Fix imports in previous commit
83640dd1 PR-995: Add required feature to MinecraftExperimental for easy lookups
fc1f96cf BUILDTOOLS-676: Downgrade Maven compiler version

CraftBukkit Changes:
90f1059ba Fix item placement
661afb43c SPIGOT-7633: Clearer error message for missing particle data
807b465b3 SPIGOT-7634: Armadillo updates infrequently
590cf09a8 Fix unit tests always seeing Mojang server as unavailable
7c7ac5eb2 SPIGOT-7636: Fix clearing ItemMeta
4a72905cf SPIGOT-7635: Fix Player#transfer and cookie methods
ebb50e136 Fix incorrect Vault implementation
b33fed8b7 Update Maven plugins/versions
6f00f0608 SPIGOT-7632: Control middle clicking chest does not copy contents
db821f405 Use regular compiler seeing as ECJ doesn't support Java 21 JRE
8a2976737 Revert "BUILDTOOLS-676: Downgrade Maven compiler version"
0297f87bb SPIGOT-7355: More field renames and fixes
2d03bdf6a SPIGOT-7629: Fix loading banner patterns
e77951fac Fix equality of deserialized display names
c66f3e4fd SPIGOT-7631: Fix deserialisation of BlockStateMeta
9c2c7be8d SPIGOT-7630: Fix crash saving unticked leashed entities
8c1e7c841 PR-1384: Disable certain PlayerProfile tests, if Mojang's services or internet are not available
ced93d572 SPIGOT-7626: sendSignChange() has no effect
c77362cae SPIGOT-7625: ItemStack with lore cannot be serialized in 1.20.5
ff2004387 SPIGOT-7620: Fix server crash when hoppers transfer items to double chests
8b4abeb03 BUILDTOOLS-676: Downgrade Maven compiler version

patches/api/Adventure.patch

@@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/build.gradle.kts
 @@ -0,0 +0,0 @@ java {
  
- val annotationsVersion = "24.0.1"
+ val annotationsVersion = "24.1.0"
  val bungeeCordChatVersion = "1.20-R0.2"
 +val adventureVersion = "4.17.0-SNAPSHOT"
 +val apiAndDocs: Configuration by configurations.creating {
@@ -5110,6 +5110,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -     * @deprecated use {@link #registerNewObjective(String, Criteria, String)}
 +     * @deprecated use {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component)}
       */
+     @Deprecated
      @NotNull
 +    @Deprecated // Paper
      Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @NotNull String displayName);
@@ -5122,6 +5123,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -     * @deprecated use {@link #registerNewObjective(String, Criteria, String, RenderType)}
 +     * @deprecated use {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component, RenderType)}
       */
+     @Deprecated
      @NotNull
 +    @Deprecated // Paper
      Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @NotNull String displayName, @NotNull RenderType renderType);

patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -18,7 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -0,0 +0,0 @@ java {
- val annotationsVersion = "24.0.1"
+ val annotationsVersion = "24.1.0"
  val bungeeCordChatVersion = "1.20-R0.2"
  val adventureVersion = "4.17.0-SNAPSHOT"
 +val slf4jVersion = "2.0.9"

patches/api/Build-system-changes.patch

@@ -34,7 +34,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper end
 +
      testImplementation("org.apache.commons:commons-lang3:3.12.0")
-     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
+     testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
      testImplementation("org.hamcrest:hamcrest:2.2")
 @@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
      options.links(

patches/api/Code-Generation.patch

@@ -249,9 +249,10 @@ diff --git a/src/main/java/org/bukkit/MinecraftExperimental.java b/src/main/java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/MinecraftExperimental.java
 +++ b/src/main/java/org/bukkit/MinecraftExperimental.java
-@@ -0,0 +0,0 @@ import org.jetbrains.annotations.ApiStatus;
+@@ -0,0 +0,0 @@ public @interface MinecraftExperimental {
- })
+ 
- @ApiStatus.Internal
+         UPDATE_1_21
- public @interface MinecraftExperimental {
+     }
-+    String value() default ""; // Paper
++
++    String desc() default ""; // Paper
  }

patches/api/Convert-project-to-Gradle.patch

@@ -41,7 +41,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    withJavadocJar()
 +}
 +
-+val annotationsVersion = "24.0.1"
++val annotationsVersion = "24.1.0"
 +val bungeeCordChatVersion = "1.20-R0.2"
 +
 +dependencies {
@@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    testCompileOnly(annotations)
 +
 +    testImplementation("org.apache.commons:commons-lang3:3.12.0")
-+    testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
++    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
 +    testImplementation("org.hamcrest:hamcrest:2.2")
 +    testImplementation("org.mockito:mockito-core:5.11.0")
 +    testImplementation("org.ow2.asm:asm-tree:9.7")
@@ -217,14 +217,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.jetbrains</groupId>
 -            <artifactId>annotations-java5</artifactId>
--            <version>24.0.1</version>
+-            <version>24.1.0</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <!-- testing -->
 -        <dependency>
 -            <groupId>org.junit.jupiter</groupId>
 -            <artifactId>junit-jupiter</artifactId>
--            <version>5.10.0</version>
+-            <version>5.10.2</version>
 -            <scope>test</scope>
 -        </dependency>
 -        <dependency>
@@ -267,23 +267,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                <artifactId>maven-compiler-plugin</artifactId>
 -                <version>3.13.0</version>
 -                <configuration>
--                    <!-- we use the Eclipse compiler as it doesn't need a JDK -->
--                    <compilerId>eclipse</compilerId>
 -                    <!-- default changed with version 3.11.0 -->
 -                    <showWarnings>false</showWarnings>
 -                </configuration>
--                <dependencies>
--                    <dependency>
--                        <groupId>org.codehaus.plexus</groupId>
--                        <artifactId>plexus-compiler-eclipse</artifactId>
--                        <version>2.15.0</version>
--                    </dependency>
--                </dependencies>
 -            </plugin>
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-jar-plugin</artifactId>
--                <version>3.3.0</version>
+-                <version>3.4.1</version>
 -                <configuration>
 -                    <archive>
 -                        <manifest>
@@ -298,7 +289,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-shade-plugin</artifactId>
--                <version>3.5.0</version>
+-                <version>3.5.3</version>
 -                <executions>
 -                    <execution>
 -                        <phase>package</phase>
@@ -325,10 +316,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-javadoc-plugin</artifactId>
--                <version>3.5.0</version>
+-                <version>3.6.3</version>
 -                <configuration>
 -                    <links>
--                        <link>https://guava.dev/releases/31.1-jre/api/docs/</link>
+-                        <link>https://guava.dev/releases/32.1.2-jre/api/docs/</link>
 -                    </links>
 -                    <tags>
 -                        <tag>
@@ -342,7 +333,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-surefire-plugin</artifactId>
--                <version>3.1.0</version>
+-                <version>3.2.5</version>
 -            </plugin>
 -        </plugins>
 -    </build>
@@ -358,7 +349,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                    <plugin>
 -                        <groupId>org.apache.maven.plugins</groupId>
 -                        <artifactId>maven-checkstyle-plugin</artifactId>
--                        <version>3.3.0</version>
+-                        <version>3.3.1</version>
 -                        <executions>
 -                            <execution>
 -                                <phase>process-classes</phase>

patches/api/Fix-Spigot-annotation-mistakes.patch

@@ -822,6 +822,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + * @deprecated should not be used for anything, use {@link ThrownPotion} and
 + * set the potion via the methods there.
   */
+-@Deprecated
 +@Deprecated(forRemoval = true) // Paper
  public interface LingeringPotion extends ThrownPotion { }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -985,8 +986,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       */
 +    @Deprecated // Paper
      @NotNull
+     @Deprecated
      public int[] getExpLevelCostsOffered() {
-         int[] levelOffers = new int[offers.length];
 @@ -0,0 +0,0 @@ public class PrepareItemEnchantEvent extends InventoryEvent implements Cancellab
       *
       * @return list of available enchantment offers
@@ -1430,14 +1431,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import org.bukkit.Utility;
  import org.bukkit.configuration.serialization.ConfigurationSerializable;
  import org.bukkit.enchantments.Enchantment;
-@@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
-      * @param damage durability / damage
-      * @deprecated see {@link #setDurability(short)}
-      */
-+    @Deprecated // Paper
-     public ItemStack(@NotNull final Material type, final int amount, final short damage) {
-         this(type, amount, damage, null);
-     }
 @@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
       * Gets the MaterialData for this stack of items
       *
@@ -1868,8 +1861,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       */
 +    @Deprecated // Paper
      @Override
+     @Deprecated
      protected int getTextureIndex() {
-         return getData() & 0x7;
 diff --git a/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java b/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java

patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch

@@ -8,16 +8,6 @@ diff --git a/src/main/java/org/bukkit/inventory/ItemFlag.java b/src/main/java/or
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFlag.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFlag.java
-@@ -0,0 +0,0 @@ public enum ItemFlag {
-     /**
-      * Setting to show/hide potion effects, book and firework information, map
-      * tooltips, patterns of banners, and enchantments of enchanted books.
-+     * @deprecated misleading name and description, use {@link #HIDE_ITEM_SPECIFICS}
-      */
-+    @Deprecated // Paper
-     HIDE_POTION_EFFECTS,
-     /**
-      * Setting to show/hide dyes from colored leather armor.
 @@ -0,0 +0,0 @@ public enum ItemFlag {
       * Setting to show/hide armor trim from armor.
       */
@@ -41,6 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     <li>Spawner descriptions</li>
 +     * </ul>
 +     */
-+    public static final ItemFlag HIDE_ITEM_SPECIFICS = HIDE_POTION_EFFECTS;
++    @Deprecated
++    public static final ItemFlag HIDE_ITEM_SPECIFICS = HIDE_ADDITIONAL_TOOLTIP;
 +    // Paper end
  }

patches/server/Adventure.patch

@@ -2821,9 +2821,9 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ import net.minecraft.nbt.CompoundTag;
+@@ -0,0 +0,0 @@ import net.minecraft.core.registries.Registries;
+ import net.minecraft.nbt.CompoundTag;
  import net.minecraft.network.Connection;
- import net.minecraft.network.ConnectionProtocol;
  import net.minecraft.network.TickablePacketListener;
 +import net.minecraft.network.chat.ChatDecorator;
  import net.minecraft.network.chat.ChatType;
@@ -4221,19 +4221,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    private void sendSignChange0(Component[] components, Location loc, DyeColor dyeColor, boolean hasGlowingText) {
-         SignBlockEntity sign = new SignBlockEntity(CraftLocation.toBlockPosition(loc), Blocks.OAK_SIGN.defaultBlockState());
-         sign.setLevel(this.getHandle().level());
-         SignText text = sign.getFrontText();
-@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         }
-         sign.setText(text, true);
- 
--        this.getHandle().connection.send(sign.getUpdatePacket());
-+        getHandle().connection.send(sign.getUpdatePacket());
 +        // Paper end
-     }
+         SignBlockEntity sign = new SignBlockEntity(CraftLocation.toBlockPosition(loc), Blocks.OAK_SIGN.defaultBlockState());
- 
+         SignText text = sign.getFrontText();
-     @Override
+         text = text.setColor(net.minecraft.world.item.DyeColor.byId(dyeColor.getWoolData()));
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override

patches/server/Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -47,13 +47,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    @Override
 +    public <T> void spawnParticle(Particle particle, List<Player> receivers, Player sender, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
 +        // Paper end - Particle API
-         data = CraftParticle.convertLegacy(data);
++        data = CraftParticle.convertLegacy(data);
-         if (data != null) {
++        if (data != null) {
-             Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
++            Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
-         }
++        }
          this.getHandle().sendParticles(
 -                null, // Sender
-+                receivers == null ? getHandle().players() : receivers.stream().map(player -> ((CraftPlayer) player).getHandle()).collect(java.util.stream.Collectors.toList()), // Paper -  Particle API
++                receivers == null ? this.getHandle().players() : receivers.stream().map(player -> ((CraftPlayer) player).getHandle()).collect(java.util.stream.Collectors.toList()), // Paper -  Particle API
 +                sender != null ? ((CraftPlayer) sender).getHandle() : null, // Sender // Paper - Particle API
                  CraftParticle.createParticleParam(particle, data), // Particle
                  x, y, z, // Position

patches/server/Expose-client-protocol-version-and-virtual-host.patch

@@ -94,7 +94,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         this.getHandle().transferCookieConnection.send(new ClientboundTransferPacket(host, port));
+         this.getHandle().transferCookieConnection.sendPacket(new ClientboundTransferPacket(host, port));
      }
  
 +    // Paper start - Implement NetworkClient

patches/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch

@@ -9,11 +9,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         if (data != null) {
+ 
-             Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
+     @Override
-         }
+     public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data) {
 -        ClientboundLevelParticlesPacket packetplayoutworldparticles = new ClientboundLevelParticlesPacket(CraftParticle.createParticleParam(particle, data), true, (float) x, (float) y, (float) z, (float) offsetX, (float) offsetY, (float) offsetZ, (float) extra, count);
-+        ClientboundLevelParticlesPacket packetplayoutworldparticles = new ClientboundLevelParticlesPacket(CraftParticle.createParticleParam(particle, data), true, x, y, z, (float) offsetX, (float) offsetY, (float) offsetZ, (float) extra, count); // Paper - Fix x/y/z coordinate precision loss
++        ClientboundLevelParticlesPacket packetplayoutworldparticles = new ClientboundLevelParticlesPacket(CraftParticle.createParticleParam(particle, data), true, x, y, z, (float) offsetX, (float) offsetY, (float) offsetZ, (float) extra, count); // Paper - fix x/y/z precision loss
          this.getHandle().connection.send(packetplayoutworldparticles);
  
      }

patches/server/Hook-into-CB-plugin-rewrites.patch

@@ -28,8 +28,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import joptsimple.OptionSet;
  import joptsimple.OptionSpec;
 @@ -0,0 +0,0 @@ public class Commodore {
-             "org/spigotmc/event/entity/EntityDismountEvent", "org/bukkit/event/entity/EntityDismountEvent"
+     public static final List<Map<String, RerouteMethodData>> REROUTES = new ArrayList<>(); // Only used for testing
-     );
+     private static final Map<String, RerouteMethodData> FIELD_RENAME_METHOD_REROUTE = Commodore.createReroutes(FieldRename.class);
  
 +    // Paper start - Plugin rewrites
 +    private static final Map<String, String> SEARCH_AND_REMOVE = initReplacementsMap();
@@ -65,9 +65,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end - Plugin rewrites
 +
-     private static final Map<String, RerouteMethodData> FIELD_RENAME_METHOD_REROUTE = RerouteBuilder.buildFromClass(FieldRename.class);
- 
      public static void main(String[] args) {
+         OptionParser parser = new OptionParser();
+         OptionSpec<File> inputFlag = parser.acceptsAll(Arrays.asList("i", "input")).withRequiredArg().ofType(File.class).required();
 @@ -0,0 +0,0 @@ public class Commodore {
              @Override
              public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {

patches/server/Implement-Mob-Goal-API.patch

@@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
  
 +    testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
-     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
+     testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
      testImplementation("org.hamcrest:hamcrest:2.2")
      testImplementation("org.mockito:mockito-core:5.11.0")
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java

patches/server/Optimize-Hoppers.patch

@@ -388,7 +388,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                            destinationInventory = new CraftInventory(iinventory);
 -                        }
 -
--                        InventoryMoveItemEvent event = new InventoryMoveItemEvent(iinventory.getOwner().getInventory(), oitemstack, destinationInventory, true);
+-                        InventoryMoveItemEvent event = new InventoryMoveItemEvent(blockEntity.getOwner().getInventory(), oitemstack, destinationInventory, true);
 -                        world.getCraftServer().getPluginManager().callEvent(event);
 -                        if (event.isCancelled()) {
 -                            blockEntity.setItem(i, itemstack);
@@ -431,7 +431,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                //            destinationInventory = new CraftInventory(iinventory);
 +                //        }
 +
-+                //        InventoryMoveItemEvent event = new InventoryMoveItemEvent(iinventory.getOwner().getInventory(), oitemstack, destinationInventory, true);
++                //        InventoryMoveItemEvent event = new InventoryMoveItemEvent(tileentityhopper.getOwner().getInventory(), oitemstack, destinationInventory, true);
 +                //        world.getCraftServer().getPluginManager().callEvent(event);
 +                //        if (event.isCancelled()) {
 +                //            blockEntity.setItem(i, itemstack);

patches/server/Remap-reflection-calls-in-plugins-using-internals.patch

@@ -662,7 +662,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -0,0 +0,0 @@ public class Commodore {
-     );
+     private static final Map<String, RerouteMethodData> FIELD_RENAME_METHOD_REROUTE = Commodore.createReroutes(FieldRename.class);
  
      // Paper start - Plugin rewrites
 -    private static final Map<String, String> SEARCH_AND_REMOVE = initReplacementsMap();

patches/server/Sanitize-sent-BlockEntity-NBT.patch

@@ -9,11 +9,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
 @@ -0,0 +0,0 @@ public class ClientboundBlockEntityDataPacket implements Packet<ClientGamePacket
- 
      public static ClientboundBlockEntityDataPacket create(BlockEntity blockEntity, BiFunction<BlockEntity, RegistryAccess, CompoundTag> nbtGetter) {
-         RegistryAccess registryAccess = blockEntity.getLevel().registryAccess();
+         RegistryAccess iregistrycustom = blockEntity.getLevel().registryAccess();
--        return new ClientboundBlockEntityDataPacket(blockEntity.getBlockPos(), blockEntity.getType(), nbtGetter.apply(blockEntity, registryAccess));
+ 
-+        return new ClientboundBlockEntityDataPacket(blockEntity.getBlockPos(), blockEntity.getType(), blockEntity.sanitizeSentNbt(nbtGetter.apply(blockEntity, registryAccess)));  // Paper - Sanitize sent data
+-        return new ClientboundBlockEntityDataPacket(blockEntity.getBlockPos(), blockEntity.getType(), (CompoundTag) nbtGetter.apply(blockEntity, iregistrycustom));
++        return new ClientboundBlockEntityDataPacket(blockEntity.getBlockPos(), blockEntity.getType(), (CompoundTag) blockEntity.sanitizeSentNbt(nbtGetter.apply(blockEntity, iregistrycustom)));  // Paper - Sanitize sent data
      }
  
      public static ClientboundBlockEntityDataPacket create(BlockEntity blockEntity) {

patches/server/Setup-Gradle-project.patch

@@ -55,7 +55,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
 +    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
 +
-+    testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
++    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
 +    testImplementation("org.hamcrest:hamcrest:2.2")
 +    testImplementation("org.mockito:mockito-core:5.11.0")
 +    testImplementation("org.ow2.asm:asm-tree:9.7")
@@ -435,14 +435,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.jetbrains</groupId>
 -            <artifactId>annotations-java5</artifactId>
--            <version>24.0.1</version>
+-            <version>24.1.0</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <!-- testing -->
 -        <dependency>
 -            <groupId>org.junit.jupiter</groupId>
 -            <artifactId>junit-jupiter</artifactId>
--            <version>5.10.0</version>
+-            <version>5.10.2</version>
 -            <scope>test</scope>
 -        </dependency>
 -        <dependency>
@@ -515,7 +515,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-jar-plugin</artifactId>
--                <version>3.3.0</version>
+-                <version>3.4.1</version>
 -                <configuration>
 -                    <archive>
 -                        <manifest>
@@ -557,7 +557,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-shade-plugin</artifactId>
--                <version>3.5.0</version>
+-                <version>3.5.3</version>
 -                <executions>
 -                    <execution>
 -                        <phase>package</phase>
@@ -588,7 +588,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>net.md-5</groupId>
 -                <artifactId>specialsource-maven-plugin</artifactId>
--                <version>2.0.2</version>
+-                <version>2.0.3</version>
 -                <executions>
 -                    <execution>
 -                        <phase>package</phase>
@@ -634,7 +634,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-assembly-plugin</artifactId>
--                <version>3.6.0</version>
+-                <version>3.7.1</version>
 -                <executions>
 -                    <execution>
 -                        <phase>package</phase>
@@ -663,23 +663,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                <artifactId>maven-compiler-plugin</artifactId>
 -                <version>3.13.0</version>
 -                <configuration>
--                    <!-- we use the Eclipse compiler as it doesn't need a JDK -->
--                    <compilerId>eclipse</compilerId>
 -                    <!-- default changed with version 3.11.0 -->
 -                    <showWarnings>false</showWarnings>
 -                </configuration>
--                <dependencies>
--                    <dependency>
--                        <groupId>org.codehaus.plexus</groupId>
--                        <artifactId>plexus-compiler-eclipse</artifactId>
--                        <version>2.15.0</version>
--                    </dependency>
--                </dependencies>
 -            </plugin>
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-surefire-plugin</artifactId>
--                <version>3.1.0</version>
+-                <version>3.2.5</version>
 -                <configuration>
 -                    <workingDirectory>${basedir}/target/test-server</workingDirectory>
 -                    <excludes>
@@ -708,7 +699,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                    <plugin>
 -                        <groupId>org.apache.maven.plugins</groupId>
 -                        <artifactId>maven-checkstyle-plugin</artifactId>
--                        <version>3.3.0</version>
+-                        <version>3.3.1</version>
 -                        <executions>
 -                            <execution>
 -                                <phase>test-compile</phase>

work/Bukkit

@@ -1 +1 @@
-Subproject commit 9ea9bb32fe341b8308f6071bcc5f31c1e73a9d26
+Subproject commit 69fa46950cc65264d4e4db9f22e58d5f57e47f46

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 062d2bb13b341b2bcc9a504677b2196c6f68ecb3
+Subproject commit 90f1059bae911966b5629b3ec1ff242d109fde7f