Skip to content

Require empty hand to shift click open covers #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serenibyss merged 1 commit into from
Dec 21, 2021
Merged

Require empty hand to shift click open covers #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ public boolean onRightClick(EntityPlayer playerIn, EnumHand hand, EnumFacing fac
MetaTileEntityUIFactory.INSTANCE.openUI(getHolder(), (EntityPlayerMP) playerIn);
}
return true;
} else if (playerIn.isSneaking()) {
} else if (playerIn.isSneaking() && playerIn.getHeldItemMainhand().isEmpty()) {
EnumFacing hitFacing = hitResult.sideHit;

CoverBehavior coverBehavior = hitFacing == null ? null : getCoverAtSide(hitFacing);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/api/pipenet/block/BlockPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ public boolean onPipeActivated(World world, BlockPos pos, EntityPlayer entityPla

EnumActionResult result = coverBehavior.onRightClick(entityPlayer, hand, hit);
if (result == EnumActionResult.PASS) {
return entityPlayer.isSneaking() && coverBehavior.onScrewdriverClick(entityPlayer, hand, hit) != EnumActionResult.PASS;
return entityPlayer.isSneaking() && entityPlayer.getHeldItemMainhand().isEmpty() && coverBehavior.onScrewdriverClick(entityPlayer, hand, hit) != EnumActionResult.PASS;
} else if (result == EnumActionResult.SUCCESS) {
if (!world.isRemote)
GTTriggers.FIRST_COVER_PLACE.trigger((EntityPlayerMP) entityPlayer);
Expand Down