Skip to content

fix: place villagers from off-hand when the main hand is occupied (#109) #110

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

Open
mattlawliet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: place villagers from off-hand when the main hand is occupied (#109) #110

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
20 changes: 3 additions & 17 deletions mod/src/main/java/de/clickism/clickvillagers/event/PlaceVillagerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.BlockHitResult;

Expand All @@ -30,8 +29,6 @@ public InteractionResult event(
InteractionHand hand,
BlockHitResult hitResult
) {
InteractionHand usedHand = getUsedHand(player);
if (!hand.equals(usedHand)) return InteractionResult.PASS;
if (hitResult == null) return InteractionResult.PASS;
if (world.isClientSide()) return InteractionResult.PASS;
if (player.isSpectator()) return InteractionResult.PASS;
Expand All @@ -51,10 +48,10 @@ public InteractionResult event(
BlockPos pos = clickedPos.relative(hitResult.getDirection());
de.clickism.clickvillagers.util.VersionHelper.moveEntity(entity, pos);
world.addFreshEntity(entity);
// ponytail: shrink the stack in the hand that was actually used, not the selected hotbar slot
itemStack.shrink(1);
if (itemStack.getCount() <= 0) {
int slot = de.clickism.clickvillagers.util.VersionHelper.getSelectedSlot(player.getInventory());
player.getInventory().setItem(slot, Items.AIR.getDefaultInstance());
if (itemStack.isEmpty()) {
player.setItemInHand(hand, ItemStack.EMPTY);
}
BlockPos posBelow = pos.below();
de.clickism.clickvillagers.util.VersionHelper.playSound(player, SoundEvents.PLAYER_ATTACK_WEAK, SoundSource.NEUTRAL, 1, .5f);
Expand All @@ -66,15 +63,4 @@ public InteractionResult event(
return InteractionResult.SUCCESS;
}

private static InteractionHand getUsedHand(Player player) {
ItemStack mainHandItem = player.getMainHandItem();
if (!mainHandItem.isEmpty()) {
return InteractionHand.MAIN_HAND;
}
ItemStack offHandItem = player.getOffhandItem();
if (!offHandItem.isEmpty()) {
return InteractionHand.OFF_HAND;
}
return InteractionHand.MAIN_HAND; // Default to main hand
}
}