diff --git a/src/main/java/crazypants/enderio/TileEntityEio.java b/src/main/java/crazypants/enderio/TileEntityEio.java index 5354112c..0475ba6c 100644 --- a/src/main/java/crazypants/enderio/TileEntityEio.java +++ b/src/main/java/crazypants/enderio/TileEntityEio.java @@ -40,8 +40,12 @@ public abstract class TileEntityEio extends TileEntity { protected abstract void readCustomNBT(NBTTagCompound root); protected void updateBlock() { - if (worldObj != null) { + if(worldObj != null) { worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } + } + } + + protected boolean isPoweredRedstone() { + return worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord) > 0; } } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index f3e50577..fe344e79 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -231,7 +231,7 @@ public abstract class AbstractMachineBlock exte } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { if(!world.isRemote && (!player.capabilities.isCreativeMode)) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof AbstractMachineEntity) { @@ -250,7 +250,7 @@ public abstract class AbstractMachineBlock exte world.spawnEntityInWorld(entityitem); } } - return super.removedByPlayer(world, player, x, y, z); + return super.removedByPlayer(world, player, x, y, z, doHarvest); } @Override diff --git a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java index c77151e0..e5f7e83e 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java @@ -65,7 +65,7 @@ public class BlockWirelessCharger extends BlockEio implements IResourceTooltipPr TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileWirelessCharger) { TileWirelessCharger twc = (TileWirelessCharger) te; - if(twc.getEnergyStored() > 0) { + if(twc.isActive()) { return centerOn; } } diff --git a/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java index ed5fe6d3..d7aeaf60 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java @@ -11,6 +11,14 @@ public interface IWirelessCharger { BlockCoord getLocation(); boolean chargeItems(ItemStack[] armorInventory); - + int takeEnergy(int max); + + /** + * Can prevent {@link #chargeItems(ItemStack[])} from being called. + * + * @return If this charger is "active". If the charger is not active it will + * not be attempted to be used. + */ + boolean isActive(); } diff --git a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java index 9cc00dba..9b651775 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java @@ -159,4 +159,8 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower public boolean displayPower() { return true; } + + public boolean isActive() { + return getEnergyStored() > 0 && !isPoweredRedstone(); + } } diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java index a7ac6254..4c78f70b 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java @@ -60,9 +60,9 @@ public class WirelessChargerController { if(chargers.isEmpty()) { return; } - BlockCoord bc = new BlockCoord((int) player.posX, (int) player.posY, (int) player.posZ); + BlockCoord bc = new BlockCoord(player); for (IWirelessCharger capBank : chargers.values()) { - if(capBank.getLocation().distanceSquared(bc) <= RANGE_SQ) { + if(capBank.isActive() && capBank.getLocation().distanceSquared(bc) <= RANGE_SQ) { boolean done = chargeFromCapBank(player, capBank); if(done) { return; diff --git a/src/main/java/crazypants/util/BlockCoord.java b/src/main/java/crazypants/util/BlockCoord.java index ee63af17..e2b45c25 100644 --- a/src/main/java/crazypants/util/BlockCoord.java +++ b/src/main/java/crazypants/util/BlockCoord.java @@ -2,7 +2,9 @@ package crazypants.util; import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; +import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -21,6 +23,10 @@ public final class BlockCoord { public BlockCoord(TileEntity tile) { this(tile.xCoord, tile.yCoord, tile.zCoord); } + + public BlockCoord(Entity e) { + this(MathHelper.floor_double(e.posX), MathHelper.floor_double(e.posY), MathHelper.floor_double(e.posZ)); + } public BlockCoord(BlockCoord bc) { x = bc.x;