From d4734e3fe6c746175d27cada7585a0b02cdf13ae Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 29 Mar 2020 13:26:40 -0500 Subject: [PATCH] Move inventory cases of itemfinder to last, fixes villager trades not being shown. Allow wandering trader to be scanned as well. --- .../item/equipment/bauble/ItemItemFinder.java | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index cc890328b..9f4b44c64 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -22,6 +22,7 @@ import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.item.ItemEntity; +import net.minecraft.entity.merchant.villager.AbstractVillagerEntity; import net.minecraft.entity.merchant.villager.VillagerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; @@ -135,24 +136,12 @@ public class ItemItemFinder extends ItemBauble { if (e == player) { continue; } - if (e.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).isPresent() && !(e instanceof PlayerEntity)) { - if (scanInventory(e.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY), pstack)) { - entIdBuilder.add(e.getEntityId()); - } - - } else if (e instanceof ItemEntity) { + if (e instanceof ItemEntity) { ItemEntity item = (ItemEntity) e; ItemStack istack = item.getItem(); if (player.isSneaking() || istack.isItemEqual(pstack) && ItemStack.areItemStackTagsEqual(istack, pstack)) { entIdBuilder.add(item.getEntityId()); } - - } else if (e instanceof IInventory) { - IInventory inv = (IInventory) e; - if (scanInventory(LazyOptional.of(() -> new InvWrapper(inv)), pstack)) { - entIdBuilder.add(e.getEntityId()); - } - } else if (e instanceof PlayerEntity) { PlayerEntity player_ = (PlayerEntity) e; LazyOptional playerInv = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY); @@ -161,8 +150,8 @@ public class ItemItemFinder extends ItemBauble { entIdBuilder.add(player_.getEntityId()); } - } else if (e instanceof VillagerEntity) { - VillagerEntity villager = (VillagerEntity) e; + } else if (e instanceof AbstractVillagerEntity) { + AbstractVillagerEntity villager = (AbstractVillagerEntity) e; for (MerchantOffer offer : villager.getOffers()) { if (equalStacks(pstack, offer.getBuyingStackFirst()) || equalStacks(pstack, offer.getBuyingStackSecond()) @@ -170,6 +159,15 @@ public class ItemItemFinder extends ItemBauble { entIdBuilder.add(villager.getEntityId()); } } + } else if (e.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).isPresent()) { + if (scanInventory(e.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY), pstack)) { + entIdBuilder.add(e.getEntityId()); + } + } else if (e instanceof IInventory) { + IInventory inv = (IInventory) e; + if (scanInventory(LazyOptional.of(() -> new InvWrapper(inv)), pstack)) { + entIdBuilder.add(e.getEntityId()); + } } }