Fix merge issues, fix build

This commit is contained in:
modmuss50 2016-12-14 09:28:05 +00:00
parent c1d2e875bf
commit ccdb5c0761
3 changed files with 6 additions and 7 deletions

View file

@ -109,8 +109,7 @@ dependencies {
//deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170" //deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170"
deobfCompile "mcjty.theoneprobe:TheOneProbe:1.11-1.3.3-46" deobfCompile "mcjty.theoneprobe:TheOneProbe:1.11-1.3.3-46"
//Only API until ... compileOnly 'net.industrial-craft:industrialcraft-2:2.6.129-ex110'
deobfCompile 'net.industrial-craft:industrialcraft-2:2.6.58-ex110:api'
} }

View file

@ -43,12 +43,12 @@ public class ItemElectricTreetap extends ItemTRNoDestroy implements IEnergyItemI
} }
@Override @Override
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
IBlockState state = worldIn.getBlockState(pos); IBlockState state = worldIn.getBlockState(pos);
Block block = state.getBlock(); Block block = state.getBlock();
if(CompatManager.isIC2Loaded && block == Block.getBlockFromName("ic2:rubber_wood") && PoweredItem.canUseEnergy(20, stack)) if(CompatManager.isIC2Loaded && block == Block.getBlockFromName("ic2:rubber_wood") && PoweredItem.canUseEnergy(20, playerIn.getHeldItem(hand)))
if (ItemTreetap.attemptExtract(playerIn, worldIn, pos, side, state, null) && !worldIn.isRemote) { if (ItemTreetap.attemptExtract(playerIn, worldIn, pos, side, state, null) && !worldIn.isRemote) {
PoweredItem.useEnergy(20, stack); PoweredItem.useEnergy(20, playerIn.getHeldItem(hand));
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} }
return EnumActionResult.PASS; return EnumActionResult.PASS;

View file

@ -32,13 +32,13 @@ public class ItemTreeTap extends ItemTRNoDestroy {
@Override @Override
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
IBlockState state = worldIn.getBlockState(pos); IBlockState state = worldIn.getBlockState(pos);
Block block = state.getBlock(); Block block = state.getBlock();
if(CompatManager.isIC2Loaded && block == Block.getBlockFromName("ic2:rubber_wood")) { if(CompatManager.isIC2Loaded && block == Block.getBlockFromName("ic2:rubber_wood")) {
ItemTreetap.attemptExtract(playerIn, worldIn, pos, side, state, null); ItemTreetap.attemptExtract(playerIn, worldIn, pos, side, state, null);
if (!worldIn.isRemote) if (!worldIn.isRemote)
stack.damageItem(1, playerIn); playerIn.getHeldItem(hand).damageItem(1, playerIn);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} }
return EnumActionResult.PASS; return EnumActionResult.PASS;