Added tile checks for GUIs

Fixes Thorfusion#62
DrParadox7 · Dec 11, 2022 · cf4c800 · cf4c800
1 parent 884dff3
commit cf4c800
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/build.properties b/build.properties
@@ -4,5 +4,5 @@ FMP_version=1.2.0.347
 CCLIB_version=1.1.3.141
 NEI_version=1.0.5.120
 CCC_version=1.0.7.48
-mod_version=9.10.19-LE
+mod_version=9.10.19a-LE
 alt_version=9, 10, 19
diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java
@@ -13,6 +13,7 @@
 import mekanism.common.tile.TileEntityContainerBlock;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
@@ -285,4 +286,9 @@ protected FontRenderer getFontRenderer()
 	{
 		return fontRendererObj;
 	}
+
+	public boolean canInteractWith(EntityPlayer entityPlayer)
+	{
+		return tileEntity.isUseableByPlayer(entityPlayer);
+	}
 }
diff --git a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java
@@ -146,7 +146,10 @@ public void setInventorySlotContents(int slotID, ItemStack itemstack)
 	@Override
 	public boolean isUseableByPlayer(EntityPlayer entityplayer)
 	{
-		return !isInvalid();
+		if (isInvalid())
+			return false;
+
+		return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) == this && entityplayer.getDistanceSq(this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord +0.5) < 64;
 	}
 
 	@Override