Update to Minecraft 1.20.5

By: md_5 <git@md-5.net>

paper-server/nms-patches/net/minecraft/network/PacketDataSerializer.patch

@@ -1,33 +1,24 @@
 --- a/net/minecraft/network/PacketDataSerializer.java
 +++ b/net/minecraft/network/PacketDataSerializer.java
-@@ -81,6 +81,8 @@
- import org.joml.Quaternionf;
- import org.joml.Vector3f;
+@@ -139,7 +139,7 @@
  
-+import org.bukkit.craftbukkit.inventory.CraftItemStack; // CraftBukkit
-+
- public class PacketDataSerializer extends ByteBuf {
- 
-     public static final int DEFAULT_NBT_QUOTA = 2097152;
-@@ -205,7 +207,7 @@
- 
-     public <T, C extends Collection<T>> C readCollection(IntFunction<C> intfunction, PacketDataSerializer.a<T> packetdataserializer_a) {
+     public <T, C extends Collection<T>> C readCollection(IntFunction<C> intfunction, StreamDecoder<? super PacketDataSerializer, T> streamdecoder) {
          int i = this.readVarInt();
 -        C c0 = (Collection) intfunction.apply(i);
 +        C c0 = intfunction.apply(i); // CraftBukkit - decompile error
  
          for (int j = 0; j < i; ++j) {
-             c0.add(packetdataserializer_a.apply(this));
-@@ -216,7 +218,7 @@
+             c0.add(streamdecoder.decode(this));
+@@ -150,7 +150,7 @@
  
-     public <T> void writeCollection(Collection<T> collection, PacketDataSerializer.b<T> packetdataserializer_b) {
+     public <T> void writeCollection(Collection<T> collection, StreamEncoder<? super PacketDataSerializer, T> streamencoder) {
          this.writeVarInt(collection.size());
 -        Iterator iterator = collection.iterator();
 +        Iterator<T> iterator = collection.iterator(); // CraftBukkit - decompile error
  
          while (iterator.hasNext()) {
              T t0 = iterator.next();
-@@ -243,12 +245,12 @@
+@@ -177,12 +177,12 @@
  
      public void writeIntIdList(IntList intlist) {
          this.writeVarInt(intlist.size());
@@ -35,14 +26,14 @@
 +        intlist.forEach((java.util.function.IntConsumer) this::writeVarInt); // CraftBukkit - decompile error
      }
  
-     public <K, V, M extends Map<K, V>> M readMap(IntFunction<M> intfunction, PacketDataSerializer.a<K> packetdataserializer_a, PacketDataSerializer.a<V> packetdataserializer_a1) {
+     public <K, V, M extends Map<K, V>> M readMap(IntFunction<M> intfunction, StreamDecoder<? super PacketDataSerializer, K> streamdecoder, StreamDecoder<? super PacketDataSerializer, V> streamdecoder1) {
          int i = this.readVarInt();
 -        M m0 = (Map) intfunction.apply(i);
 +        M m0 = intfunction.apply(i); // CraftBukkit - decompile error
  
          for (int j = 0; j < i; ++j) {
-             K k0 = packetdataserializer_a.apply(this);
-@@ -282,7 +284,7 @@
+             K k0 = streamdecoder.decode(this);
+@@ -216,7 +216,7 @@
      }
  
      public <E extends Enum<E>> void writeEnumSet(EnumSet<E> enumset, Class<E> oclass) {
@@ -51,7 +42,7 @@
          BitSet bitset = new BitSet(ae.length);
  
          for (int i = 0; i < ae.length; ++i) {
-@@ -293,7 +295,7 @@
+@@ -227,7 +227,7 @@
      }
  
      public <E extends Enum<E>> EnumSet<E> readEnumSet(Class<E> oclass) {
@@ -60,7 +51,7 @@
          BitSet bitset = this.readFixedBitSet(ae.length);
          EnumSet<E> enumset = EnumSet.noneOf(oclass);
  
-@@ -529,7 +531,7 @@
+@@ -482,7 +482,7 @@
      }
  
      public <T extends Enum<T>> T readEnum(Class<T> oclass) {
@@ -69,33 +60,12 @@
      }
  
      public PacketDataSerializer writeEnum(Enum<?> oenum) {
-@@ -584,7 +586,7 @@
+@@ -549,7 +549,7 @@
+ 
          try {
-             NBTCompressedStreamTools.writeAnyTag((NBTBase) nbtbase, new ByteBufOutputStream(this));
-             return this;
+             NBTCompressedStreamTools.writeAnyTag((NBTBase) nbtbase, new ByteBufOutputStream(bytebuf));
 -        } catch (IOException ioexception) {
 +        } catch (Exception ioexception) { // CraftBukkit - IOException -> Exception
              throw new EncoderException(ioexception);
          }
      }
-@@ -612,7 +614,7 @@
-     }
- 
-     public PacketDataSerializer writeItem(ItemStack itemstack) {
--        if (itemstack.isEmpty()) {
-+        if (itemstack.isEmpty() || itemstack.getItem() == null) { // CraftBukkit - NPE fix itemstack.getItem()
-             this.writeBoolean(false);
-         } else {
-             this.writeBoolean(true);
-@@ -641,6 +643,11 @@
-             ItemStack itemstack = new ItemStack(item, b0);
- 
-             itemstack.setTag(this.readNbt());
-+            // CraftBukkit start
-+            if (itemstack.getTag() != null) {
-+                CraftItemStack.setItemMeta(itemstack, CraftItemStack.getItemMeta(itemstack));
-+            }
-+            // CraftBukkit end
-             return itemstack;
-         }
-     }