seb/autotrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix folia for 1.21.10 (fixes constantiam)

Browse Source
This commit is contained in:
seb
2026-05-14 05:57:56 +02:00
parent cf97ebe11b
commit a4474870a0
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/github/sebseb7/autotrade/event/AutoTradeClientTick.java
View File

@@ -40,9 +40,7 @@ import net.minecraft.world.item.trading.MerchantOffers;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
//? if mc26 {
import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.EntityHitResult;
//?}
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
final class AutoTradeClientTick { final class AutoTradeClientTick {
@@ -160,12 +158,26 @@ final class AutoTradeClientTick {
if (!newVillagersInRange.contains(entity)) { if (!newVillagersInRange.contains(entity)) {
found = true; found = true;
newVillagersInRange.add(entity); newVillagersInRange.add(entity);
// Paper/Folia rejects entity-interact packets unless the player is
// actually facing the entity, so align the look vector first and
// mirror vanilla's full INTERACT_AT + INTERACT + swing sequence.
Vec3 eyePos = mc.player.getEyePosition();
Vec3 targetEye = entity.getEyePosition();
Vec3 delta = targetEye.subtract(eyePos);
double horiz = Math.sqrt(delta.x * delta.x + delta.z * delta.z);
float yaw = (float) (Math.toDegrees(Math.atan2(delta.z, delta.x)) - 90.0);
float pitch = (float) -Math.toDegrees(Math.atan2(delta.y, horiz));
mc.player.setYRot(yaw);
mc.player.setXRot(pitch);
mc.player.yHeadRot = yaw;
EntityHitResult ehr = new EntityHitResult(entity, targetEye);
//? if mc26 { //? if mc26 {
EntityHitResult ehr = new EntityHitResult(entity, entity.position());
mc.gameMode.interact(mc.player, entity, ehr, InteractionHand.MAIN_HAND); mc.gameMode.interact(mc.player, entity, ehr, InteractionHand.MAIN_HAND);
//?} else { //?} else {
mc.gameMode.interactAt(mc.player, entity, ehr, InteractionHand.MAIN_HAND);
mc.gameMode.interact(mc.player, entity, InteractionHand.MAIN_HAND); mc.gameMode.interact(mc.player, entity, InteractionHand.MAIN_HAND);
//?} //?}
mc.player.swing(InteractionHand.MAIN_HAND);
postMerchantInventorySyncTicks = 0; postMerchantInventorySyncTicks = 0;
voidDelay = Configs.Generic.VOID_TRADING_DELAY.getIntegerValue(); voidDelay = Configs.Generic.VOID_TRADING_DELAY.getIntegerValue();
villagerActive = entity.getId(); villagerActive = entity.getId();