From cbac95de0f29a056374fea5dfc27617c8d21aec0 Mon Sep 17 00:00:00 2001 From: Cyborgmas Date: Thu, 25 Jun 2020 22:17:29 -0400 Subject: [PATCH] Fixed villager trades having non-applicable enchants Also added an AT at lex's request --- .../net/minecraft/enchantment/EnchantmentHelper.java.patch | 2 +- src/main/resources/META-INF/accesstransformer.cfg | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch b/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch index 87ae54787..1d2ca8bc8 100644 --- a/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch +++ b/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch @@ -23,7 +23,7 @@ for(Enchantment enchantment : Registry.field_212628_q) { - if ((!enchantment.func_185261_e() || p_185291_2_) && enchantment.func_230310_i_() && (enchantment.field_77351_y.func_77557_a(item) || flag)) { -+ if ((!enchantment.func_185261_e() || p_185291_2_) && (enchantment.canApplyAtEnchantingTable(p_185291_1_) || (flag || enchantment.isAllowedOnBooks()))) { ++ if ((!enchantment.func_185261_e() || p_185291_2_) && (enchantment.canApplyAtEnchantingTable(p_185291_1_) || (flag && enchantment.isAllowedOnBooks()))) { for(int i = enchantment.func_77325_b(); i > enchantment.func_77319_d() - 1; --i) { if (p_185291_0_ >= enchantment.func_77321_a(i) && p_185291_0_ <= enchantment.func_223551_b(i)) { list.add(new EnchantmentData(enchantment, i)); diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 81afb5b04..98fb58edf 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -173,4 +173,5 @@ public net.minecraft.world.gen.layer.LayerUtil func_202829_a(JLnet/minecraft/wor private-f net.minecraft.world.server.ChunkHolder field_219320_o # block update location public net.minecraft.world.server.ServerChunkProvider field_186029_c # chunkGenerator public net.minecraft.world.server.ServerChunkProvider field_73251_h # worldObj -public net.minecraft.world.storage.FolderName (Ljava/lang/String;)V # constructor \ No newline at end of file +public net.minecraft.world.storage.FolderName (Ljava/lang/String;)V # constructor +public net.minecraft.item.ItemModelsProperties func_239418_a_(Lnet/minecraft/item/Item;Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/item/IItemPropertyGetter;)V \ No newline at end of file