From 555a44714308c46c8481df7a6fa6d125fbb12d5e Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 25 Aug 2015 17:17:16 -0400 Subject: [PATCH] Add a base implementation for when a Container/IInventory is usable --- .../enderio/core/client/gui/GuiContainerBase.java | 4 ++++ .../com/enderio/core/common/TileEntityEnder.java | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/main/java/com/enderio/core/client/gui/GuiContainerBase.java b/src/main/java/com/enderio/core/client/gui/GuiContainerBase.java index d58f0ca..18cdf41 100644 --- a/src/main/java/com/enderio/core/client/gui/GuiContainerBase.java +++ b/src/main/java/com/enderio/core/client/gui/GuiContainerBase.java @@ -158,6 +158,10 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe public void updateScreen() { super.updateScreen(); + if (!inventorySlots.canInteractWith(mc.thePlayer)) { + mc.thePlayer.closeScreen(); + } + for (GuiTextField f : textFields) { f.updateCursorCounter(); } diff --git a/src/main/java/com/enderio/core/common/TileEntityEnder.java b/src/main/java/com/enderio/core/common/TileEntityEnder.java index 0df2c3e..b23d0fd 100644 --- a/src/main/java/com/enderio/core/common/TileEntityEnder.java +++ b/src/main/java/com/enderio/core/common/TileEntityEnder.java @@ -1,5 +1,6 @@ package com.enderio.core.common; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; @@ -100,6 +101,17 @@ public abstract class TileEntityEnder extends TileEntity { public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { readCustomNBT(pkt.func_148857_g()); } + + // This implements the IInventory method in a standard way + public boolean isUseableByPlayer(EntityPlayer player) { + if (worldObj == null) { + return true; + } + if (worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) { + return false; + } + return player.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <= 64D; + } protected abstract void writeCustomNBT(NBTTagCompound root);