diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index 64082ab..342fbfc 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -69,7 +69,7 @@ import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.avaritia.items.ItemMatterCluster; import xonin.backhand.api.core.BackhandUtils; -public class BlockDrawers extends BlockContainer implements INetworked { +public class BlockDrawers extends BlockContainer implements INetworked, IExtendedBlockClickHandler { private static final ResourceLocation blockConfig = new ResourceLocation( StorageDrawers.MOD_ID + ":textures/blocks/block_config.mcmeta"); @@ -496,6 +496,13 @@ public class BlockDrawers extends BlockContainer implements INetworked { return true; } + @Override + public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, + float hitZ, boolean invertShift) { + TileEntityDrawers ted = getTileEntitySafe(world, x, y, z); + ted.onClick(player, x, y, z, side, world, hitX, hitY, hitZ, invertShift); + } + @Override public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { if (halfDepth) return false; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java index 0b7a601..9bd6945 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java @@ -394,8 +394,9 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe downgraded = state; } - public void onClick(BlockDrawers block, EntityPlayer player, int x, int y, int z, int face, World world, float hitX, - float hitY, float hitZ, boolean invertShift) { + public void onClick(EntityPlayer player, int x, int y, int z, int face, World world, float hitX, float hitY, + float hitZ, boolean invertShift) { + BlockDrawers block = (BlockDrawers) world.getBlock(x, y, z); int dir = getDirection(); if (dir == face) { int slot = block.getDrawerSlot(face, hitX, hitY, hitZ); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java index 67e7315..1df40d9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java @@ -50,7 +50,6 @@ public abstract class MixinPlayerControllerMP { boolean invertShift = StorageDrawers.config.cache.invertShift; StorageDrawers.network .sendToServer(new BlockClickMessage(x, y, z, side, hitX, hitY, hitZ, invertShift)); - ted.onClick(bd, mc.thePlayer, x, y, z, side, mc.theWorld, hitX, hitY, hitZ, invertShift); } } }