From 0d1886cd3a85e7829646b666c36b35cf3321f1b0 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 22 Jun 2021 01:11:38 +0800 Subject: Fix #559 --- .../java/me/shedaniel/rei/plugin/common/DefaultPlugin.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'default-plugin/src') diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java index 902e51f76..807fec537 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java @@ -51,10 +51,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; import net.minecraft.world.inventory.*; -import net.minecraft.world.item.BucketItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; +import net.minecraft.world.item.*; import net.minecraft.world.level.material.Fluid; import org.jetbrains.annotations.ApiStatus; @@ -69,8 +66,13 @@ public class DefaultPlugin implements BuiltinPlugin, REIServerPlugin { Function enchantmentTag = stack -> { CompoundTag tag = stack.getTag(); if (tag == null) return null; - if (!tag.contains("Enchantments", NbtType.LIST)) return null; - return tag.getList("Enchantments", NbtType.COMPOUND); + if (!tag.contains(ItemStack.TAG_ENCH, NbtType.LIST)) { + if (tag.contains(EnchantedBookItem.TAG_STORED_ENCHANTMENTS, NbtType.LIST)) { + return tag.getList(EnchantedBookItem.TAG_STORED_ENCHANTMENTS, NbtType.COMPOUND); + } + return null; + } + return tag.getList(ItemStack.TAG_ENCH, NbtType.COMPOUND); }; registry.register((context, stack) -> nbtHasher.hash(context, enchantmentTag.apply(stack)), Items.ENCHANTED_BOOK); registry.registerNbt(Items.POTION); -- cgit