Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild
# Conflicts: # build.gradle # src/main/java/techreborn/client/container/ContainerAlloyFurnace.java # src/main/java/techreborn/items/tools/ItemWrench.java
This commit is contained in:
commit
3f8128d890
7 changed files with 73 additions and 23 deletions
|
@ -3,6 +3,7 @@ package techreborn.items.tools;
|
|||
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
|
||||
import net.minecraft.block.BlockDynamicLiquid;
|
||||
import net.minecraft.block.BlockStaticLiquid;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
@ -26,6 +27,7 @@ import reborncore.common.IWrenchable;
|
|||
import reborncore.common.tile.TileMachineBase;
|
||||
import reborncore.common.util.RebornPermissions;
|
||||
import techreborn.blocks.fluid.BlockFluidBase;
|
||||
import techreborn.blocks.storage.BlockEnergyStorage;
|
||||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
import techreborn.compat.CompatManager;
|
||||
import techreborn.init.ModSounds;
|
||||
|
@ -68,13 +70,24 @@ public class ItemWrench extends ItemTR implements ITexturedItem {
|
|||
return EnumActionResult.FAIL;
|
||||
}
|
||||
|
||||
if (!player.isSneaking() && !player.world.isRemote) {
|
||||
if (!player.isSneaking()) {
|
||||
if (tile instanceof TileMachineBase) {
|
||||
if (side != EnumFacing.DOWN && side != EnumFacing.UP) {
|
||||
((TileMachineBase) tile).setFacing(side);
|
||||
return EnumActionResult.SUCCESS;
|
||||
}
|
||||
}
|
||||
IBlockState state = world.getBlockState(pos);
|
||||
if(state.getBlock() instanceof BlockEnergyStorage){
|
||||
EnumFacing facing = state.getValue(BlockEnergyStorage.FACING);
|
||||
if(facing.getOpposite() == side){
|
||||
facing = side;
|
||||
} else {
|
||||
facing = side.getOpposite();
|
||||
}
|
||||
world.setBlockState(pos, state.withProperty(BlockEnergyStorage.FACING, facing));
|
||||
return EnumActionResult.SUCCESS;
|
||||
}
|
||||
}
|
||||
return super.onItemUseFirst(player, world, pos, side, hitX, hitY, hitZ, hand);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue