Update to Minecraft 1.19

By: md_5 <git@md-5.net>
2022-06-08 02:00:00 +10:00
parent 91d9aa9a89
commit 25f3b50f6b
332 changed files with 3628 additions and 2559 deletions
--- a/paper-server/nms-patches/net/minecraft/network/PacketDataSerializer.patch
+++ b/paper-server/nms-patches/net/minecraft/network/PacketDataSerializer.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/network/PacketDataSerializer.java
 +++ b/net/minecraft/network/PacketDataSerializer.java
-@@ -54,6 +54,8 @@
+@@ -68,6 +68,8 @@
 import net.minecraft.world.phys.MovingObjectPositionBlock;
 import net.minecraft.world.phys.Vec3D;
 
@@ -9,34 +9,25 @@
 public class PacketDataSerializer extends ByteBuf {
 
     private static final int MAX_VARINT_SIZE = 5;
-@@ -122,7 +124,7 @@
+@@ -158,7 +160,7 @@
 
-     public <T, C extends Collection<T>> C readCollection(IntFunction<C> intfunction, Function<PacketDataSerializer, T> function) {
+     public <T, C extends Collection<T>> C readCollection(IntFunction<C> intfunction, PacketDataSerializer.a<T> packetdataserializer_a) {
         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(function.apply(this));
-@@ -133,7 +135,7 @@
+             c0.add(packetdataserializer_a.apply(this));
+@@ -169,7 +171,7 @@
 
-     public <T> void writeCollection(Collection<T> collection, BiConsumer<PacketDataSerializer, T> biconsumer) {
+     public <T> void writeCollection(Collection<T> collection, PacketDataSerializer.b<T> packetdataserializer_b) {
         this.writeVarInt(collection.size());
 -        Iterator iterator = collection.iterator();
 +        Iterator<T> iterator = collection.iterator(); // CraftBukkit - decompile error
 
         while (iterator.hasNext()) {
             T t0 = iterator.next();
-@@ -144,7 +146,7 @@
-     }
- 
-     public <T> List<T> readList(Function<PacketDataSerializer, T> function) {
-        return (List) this.readCollection(Lists::newArrayListWithCapacity, function);
-+        return (List) this.readCollection((java.util.function.IntFunction) Lists::newArrayListWithCapacity, function); // CraftBukkit - decompile error
-     }
- 
-     public IntList readIntIdList() {
-@@ -160,12 +162,12 @@
+@@ -196,12 +198,12 @@
 
     public void writeIntIdList(IntList intlist) {
         this.writeVarInt(intlist.size());
@@ -44,14 +35,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, Function<PacketDataSerializer, K> function, Function<PacketDataSerializer, V> function1) {
+     public <K, V, M extends Map<K, V>> M readMap(IntFunction<M> intfunction, PacketDataSerializer.a<K> packetdataserializer_a, PacketDataSerializer.a<V> packetdataserializer_a1) {
         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 = function.apply(this);
-@@ -354,7 +356,7 @@
+             K k0 = packetdataserializer_a.apply(this);
+@@ -437,7 +439,7 @@
     }
 
     public <T extends Enum<T>> T readEnum(Class<T> oclass) {
@@ -60,7 +51,7 @@
     }
 
     public PacketDataSerializer writeEnum(Enum<?> oenum) {
-@@ -431,7 +433,7 @@
+@@ -514,7 +516,7 @@
         } else {
             try {
                 NBTCompressedStreamTools.write(nbttagcompound, (DataOutput) (new ByteBufOutputStream(this)));
@@ -69,7 +60,7 @@
                 throw new EncoderException(ioexception);
             }
         }
-@@ -468,7 +470,7 @@
+@@ -551,7 +553,7 @@
     }
 
     public PacketDataSerializer writeItem(ItemStack itemstack) {
@@ -78,8 +69,8 @@
             this.writeBoolean(false);
         } else {
             this.writeBoolean(true);
-@@ -497,6 +499,11 @@
-             ItemStack itemstack = new ItemStack(Item.byId(i), b0);
+@@ -580,6 +582,11 @@
+             ItemStack itemstack = new ItemStack(item, b0);
 
             itemstack.setTag(this.readNbt());
 +            // CraftBukkit start
--- a/paper-server/nms-patches/net/minecraft/network/chat/ChatHexColor.patch
+++ b/paper-server/nms-patches/net/minecraft/network/chat/ChatHexColor.patch
@@ -1,15 +1,15 @@
 --- a/net/minecraft/network/chat/ChatHexColor.java
 +++ b/net/minecraft/network/chat/ChatHexColor.java
-@@ -12,7 +12,7 @@
- 
-     private static final String CUSTOM_COLOR_PREFIX = "#";
+@@ -19,7 +19,7 @@
+         return chathexcolor != null ? DataResult.success(chathexcolor) : DataResult.error("String is not a valid color name or hex color code");
+     }, ChatHexColor::serialize);
     private static final Map<EnumChatFormat, ChatHexColor> LEGACY_FORMAT_TO_COLOR = (Map) Stream.of(EnumChatFormat.values()).filter(EnumChatFormat::isColor).collect(ImmutableMap.toImmutableMap(Function.identity(), (enumchatformat) -> {
 -        return new ChatHexColor(enumchatformat.getColor(), enumchatformat.getName());
 +        return new ChatHexColor(enumchatformat.getColor(), enumchatformat.getName(), enumchatformat); // CraftBukkit
     }));
     private static final Map<String, ChatHexColor> NAMED_COLORS = (Map) ChatHexColor.LEGACY_FORMAT_TO_COLOR.values().stream().collect(ImmutableMap.toImmutableMap((chathexcolor) -> {
         return chathexcolor.name;
-@@ -20,16 +20,22 @@
+@@ -27,16 +27,22 @@
     private final int value;
     @Nullable
     public final String name;
--- a/paper-server/nms-patches/net/minecraft/network/chat/IChatBaseComponent.patch
+++ b/paper-server/nms-patches/net/minecraft/network/chat/IChatBaseComponent.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/network/chat/IChatBaseComponent.java
 +++ b/net/minecraft/network/chat/IChatBaseComponent.java
-@@ -29,7 +29,23 @@
+@@ -40,7 +40,23 @@
 import net.minecraft.util.ChatTypeAdapterFactory;
 import net.minecraft.util.FormattedString;
 
--- a/paper-server/nms-patches/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.patch
+++ b/paper-server/nms-patches/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.patch
@@ -0,0 +1,7 @@
+--- a/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
+++ b/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
+@@ -1,3 +1,4 @@
+// mc-dev import
+ package net.minecraft.network.protocol.game;
+ 
+ import java.util.Objects;
--- a/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInChat.patch
+++ b/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInChat.patch
@@ -1,11 +1,11 @@
 --- a/net/minecraft/network/protocol/game/PacketPlayInChat.java
 +++ b/net/minecraft/network/protocol/game/PacketPlayInChat.java
-@@ -17,7 +17,7 @@
+@@ -25,7 +25,7 @@
     }
 
     public PacketPlayInChat(PacketDataSerializer packetdataserializer) {
 -        this.message = packetdataserializer.readUtf(256);
 +        this.message = org.apache.commons.lang3.StringUtils.normalizeSpace(packetdataserializer.readUtf(256)); // CraftBukkit - see PlayerConnection
-     }
- 
-     @Override
+         this.timeStamp = packetdataserializer.readInstant();
+         this.saltSignature = new MinecraftEncryption.b(packetdataserializer);
+         this.signedPreview = packetdataserializer.readBoolean();
--- a/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayOutChat.patch
+++ b/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayOutChat.patch
@@ -1,7 +0,0 @@
--- a/net/minecraft/network/protocol/game/PacketPlayOutChat.java
-+++ b/net/minecraft/network/protocol/game/PacketPlayOutChat.java
-@@ -1,3 +1,4 @@
-+// mc-dev import
- package net.minecraft.network.protocol.game;
- 
- import java.util.UUID;