From 29018cf64c1cac97731c62882cc1983089d25409 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 6 Dec 2023 21:28:59 +0100 Subject: [PATCH] Make it compile again --- .../HACK-id-string-codec-in-hover-event.patch | 21 +++++++++++++++++++ .../Handle-Item-Meta-Inconsistencies.patch | 8 ------- 2 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 patches/server/HACK-id-string-codec-in-hover-event.patch diff --git a/patches/server/HACK-id-string-codec-in-hover-event.patch b/patches/server/HACK-id-string-codec-in-hover-event.patch new file mode 100644 index 0000000000..3b1951c7d8 --- /dev/null +++ b/patches/server/HACK-id-string-codec-in-hover-event.patch @@ -0,0 +1,21 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nassim Jahnke +Date: Wed, 6 Dec 2023 21:24:54 +0100 +Subject: [PATCH] HACK id string codec in hover event + +Temporary hack to remove serialization to the int array, since adventure has not been updated to deserialize this format + + +diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/network/chat/HoverEvent.java ++++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java +@@ -0,0 +0,0 @@ public class HoverEvent { + public static final Codec CODEC = RecordCodecBuilder.create((instance) -> { + return instance.group(BuiltInRegistries.ENTITY_TYPE.byNameCodec().fieldOf("type").forGetter((content) -> { + return content.type; +- }), UUIDUtil.LENIENT_CODEC.fieldOf("id").forGetter((content) -> { ++ }), UUIDUtil.STRING_CODEC.fieldOf("id").forGetter((content) -> { + return content.id; + }), ExtraCodecs.strictOptionalField(ComponentSerialization.CODEC, "name").forGetter((content) -> { + return content.name; diff --git a/patches/server/Handle-Item-Meta-Inconsistencies.patch b/patches/server/Handle-Item-Meta-Inconsistencies.patch index 7c138a34d1..61423090a5 100644 --- a/patches/server/Handle-Item-Meta-Inconsistencies.patch +++ b/patches/server/Handle-Item-Meta-Inconsistencies.patch @@ -108,14 +108,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 static boolean makeTag(net.minecraft.world.item.ItemStack item) { @@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack { - if (this.handle == null) { - return 0; - } -- return EnchantmentHelper.getItemEnchantmentLevel(CraftEnchantment.bukkitToMinecraft(ench), this.handle); -+ return EnchantmentHelper.getItemEnchantmentLevel(CraftEnchantment.getRaw(ench), handle); - } - - @Override public int removeEnchantment(Enchantment ench) { Preconditions.checkArgument(ench != null, "Enchantment cannot be null");