From 4a9e01dee7303141d95da55e8201d3f97ac80a7f Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Thu, 18 Sep 2014 13:09:28 +0800 Subject: [PATCH] You can no longer place a block over you head using the ds axe / pick right click function. --- .../item/darksteel/ItemDarkSteelAxe.java | 15 +++++++++++---- .../item/darksteel/ItemDarkSteelPickaxe.java | 18 ++++++++++++++---- .../java/crazypants/render/BoundingBox.java | 5 +++++ 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index 56af614f..8735ffe4 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -19,6 +19,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; @@ -38,6 +39,7 @@ import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.machine.farm.farmers.HarvestResult; import crazypants.enderio.machine.farm.farmers.TreeHarvestUtil; +import crazypants.render.BoundingBox; import crazypants.util.BlockCoord; import crazypants.util.ItemUtil; import crazypants.util.Lang; @@ -184,14 +186,19 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I } @Override - public boolean onItemUse(ItemStack item, EntityPlayer player, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { int slot = player.inventory.currentItem + 1; if(slot < 9 && player.inventory.mainInventory[slot] != null && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { - return player.inventory.mainInventory[slot].getItem().onItemUse(player.inventory.mainInventory[slot], player, par3World, par4, par5, par6, par7, par8, + BlockCoord bc = new BlockCoord(x,y,z).getLocation(ForgeDirection.getOrientation(side)); + BoundingBox bb = new BoundingBox(bc); + AxisAlignedBB aabb = bb.getAxisAlignedBB(); + if(aabb.intersectsWith(player.boundingBox)) { + return false; + } + return player.inventory.mainInventory[slot].getItem().onItemUse(player.inventory.mainInventory[slot], player, world, x, y, z, side, par8, par9, par10); } - - return super.onItemUse(item, player, par3World, par4, par5, par6, par7, par8, par9, par10); + return false; } private void applyDamage(EntityLivingBase entity, ItemStack item, int damage, boolean isMultiharvest) { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 1ccd348c..e45f5adc 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -13,10 +13,12 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -29,6 +31,8 @@ import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.teleport.IItemOfTravel; import crazypants.enderio.teleport.TravelController; import crazypants.enderio.teleport.TravelSource; +import crazypants.render.BoundingBox; +import crazypants.util.BlockCoord; import crazypants.util.ItemUtil; import crazypants.util.Lang; @@ -115,15 +119,21 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine } @Override - public boolean onItemUse(ItemStack item, EntityPlayer player, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { int slot = player.inventory.currentItem + 1; - if(slot < 9 && player.inventory.mainInventory[slot] != null && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { - return player.inventory.mainInventory[slot].getItem().onItemUse(player.inventory.mainInventory[slot], player, par3World, par4, par5, par6, par7, par8, + if(slot < 9 && player.inventory.mainInventory[slot] != null && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { + BlockCoord bc = new BlockCoord(x,y,z).getLocation(ForgeDirection.getOrientation(side)); + BoundingBox bb = new BoundingBox(bc); + AxisAlignedBB aabb = bb.getAxisAlignedBB(); + if(aabb.intersectsWith(player.boundingBox)) { + return false; + } + return player.inventory.mainInventory[slot].getItem().onItemUse(player.inventory.mainInventory[slot], player, world, x, y, z, side, par8, par9, par10); } - return super.onItemUse(item, player, par3World, par4, par5, par6, par7, par8, par9, par10); + return false; } private void applyDamage(EntityLivingBase entity, ItemStack item, int damage) { diff --git a/src/main/java/crazypants/render/BoundingBox.java b/src/main/java/crazypants/render/BoundingBox.java index 5e666ee6..e6b57378 100644 --- a/src/main/java/crazypants/render/BoundingBox.java +++ b/src/main/java/crazypants/render/BoundingBox.java @@ -3,6 +3,7 @@ package crazypants.render; import java.util.ArrayList; import java.util.List; +import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; import crazypants.util.BlockCoord; import crazypants.vecmath.Vector2f; @@ -331,4 +332,8 @@ public final class BoundingBox { return new BoundingBox(mnX, mnY, mnZ, mxX, mxY, mxZ); } + public AxisAlignedBB getAxisAlignedBB() { + return AxisAlignedBB.getBoundingBox(minX, minY, minZ, maxX, maxY, maxZ); + } + }