From 0c66f4ee560c3acbfe8b550200e4e26a8be67bd4 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 2 Sep 2015 14:07:22 -0400 Subject: [PATCH] Implement isAccessibleByPlayer where needed --- .../crazypants/enderio/machine/AbstractMachineEntity.java | 8 +------- .../crazypants/enderio/machine/capbank/TileCapBank.java | 5 +++++ .../enderio/machine/enchanter/TileEnchanter.java | 6 ++++++ .../enderio/machine/vacuum/TileVacuumChest.java | 5 +++++ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index a4c26b47..cfbdc391 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -550,13 +550,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi @Override 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; + return canPlayerAccess(player); } @Override diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index 97120a8d..ebb0dc4c 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -703,6 +703,11 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceiver //------------------- Inventory + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return canPlayerAccess(player); + } + @Override public ItemStack getStackInSlot(int slot) { if(network == null) { diff --git a/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java index 8481b85d..4518bc01 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.enchanter; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentData; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -56,6 +57,11 @@ public class TileEnchanter extends TileEntityEio implements ISidedInventory { facing = root.getShort("facing"); } + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return canPlayerAccess(player); + } + @Override public int getSizeInventory() { return inv.length; diff --git a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java index 4376fe35..200c385e 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java @@ -135,6 +135,11 @@ public class TileVacuumChest extends TileEntityEio implements IEntitySelector, I return true; } + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return canPlayerAccess(player); + } + @Override public int getSizeInventory() { return inv.length;