From 15327cdef6087e29a7bfe657e5df088aa9dcbe98 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 5 Jul 2014 21:43:00 +0800 Subject: [PATCH] Fixed wrenching of wireless charger. --- .../wireless/BlockWirelessCharger.java | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java index 12fbdb68..75fdecc8 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.wireless; -import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -9,21 +8,14 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; -import crazypants.enderio.EnderIO; -import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.gui.IResourceTooltipProvider; -import crazypants.enderio.machine.power.PacketPowerStorage; -import crazypants.enderio.machine.vacuum.BlockVacuumChest; -import crazypants.enderio.machine.vacuum.ContainerVacuumChest; -import crazypants.enderio.machine.vacuum.GuiVacuumChest; -import crazypants.enderio.machine.vacuum.TileVacuumChest; import crazypants.enderio.network.PacketHandler; +import crazypants.util.Util; public class BlockWirelessCharger extends BlockEio implements IResourceTooltipProvider /*IGuiHandler*/ { @@ -59,7 +51,11 @@ public class BlockWirelessCharger extends BlockEio implements IResourceTooltipPr if(entityPlayer.isSneaking() && entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { IToolWrench wrench = (IToolWrench) entityPlayer.getCurrentEquippedItem().getItem(); if(wrench.canWrench(entityPlayer, x, y, z)) { - removedByPlayer(world, entityPlayer, x, y, z, false); + if(!world.isRemote) { + Util.dropItems(world, new ItemStack(this), x, y, z, true); + } + breakBlock(world, x, y, z, this, 0); + world.setBlockToAir(x, y, z); if(entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { ((IToolWrench) entityPlayer.getCurrentEquippedItem().getItem()).wrenchUsed(entityPlayer, x, y, z); } @@ -138,11 +134,6 @@ public class BlockWirelessCharger extends BlockEio implements IResourceTooltipPr // return null; // } - public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { - super.breakBlock(world, x, y, z, block, p_149749_6_); - world.removeTileEntity(x, y, z); - } - @Override public String getUnlocalizedNameForTooltip(ItemStack itemStack) { return getUnlocalizedName();