From 59636634dfb7e6853bca417ef436d10da0d6a94b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 14 Dec 2019 15:04:48 -0600 Subject: [PATCH] Hopperhocks now detect vertically-facing item frames. Also fix probably bugs with double chests. --- .../subtile/functional/SubTileHopperhock.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index f5f533a74..cb0170bb0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -12,6 +12,8 @@ package vazkii.botania.common.block.subtile.functional; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.ChestBlock; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.ItemEntity; @@ -19,6 +21,7 @@ import net.minecraft.entity.item.ItemFrameEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; +import net.minecraft.state.properties.ChestType; import net.minecraft.tileentity.ChestTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; @@ -163,18 +166,20 @@ public class SubTileHopperhock extends TileEntityFunctionalFlower { List filter = new ArrayList<>(); if(recursiveForDoubleChests) { - TileEntity tileEntity = getWorld().getTileEntity(pos); - Block chest = getWorld().getBlockState(pos).getBlock(); + BlockState chest = getWorld().getBlockState(pos); - if(tileEntity instanceof ChestTileEntity) - for(Direction dir : MathHelper.HORIZONTALS) - if(getWorld().getBlockState(pos.offset(dir)).getBlock() == chest) { - filter.addAll(getFilterForInventory(pos.offset(dir), false)); - break; + if(chest.has(ChestBlock.TYPE)) { + ChestType type = chest.get(ChestBlock.TYPE); + if (type != ChestType.SINGLE) { + BlockPos other = pos.offset(ChestBlock.getDirectionToAttached(chest)); + if (getWorld().getBlockState(other).getBlock() == chest.getBlock()) { + filter.addAll(getFilterForInventory(other, false)); } + } + } } - for(Direction dir : MathHelper.HORIZONTALS) { + for(Direction dir : Direction.values()) { AxisAlignedBB aabb = new AxisAlignedBB(pos.offset(dir)); List frames = getWorld().getEntitiesWithinAABB(ItemFrameEntity.class, aabb); for(ItemFrameEntity frame : frames) {