Skip to content
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

Freecam: Rusherhack compatibility #493

Merged
merged 3 commits into from
Feb 19, 2023
Merged

Freecam: Rusherhack compatibility #493

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56acb2b
Freecam: Rusherhack compatibility
rfresh2 Feb 17, 2023
47c68ab
use our paraphrased pos/rot update methods
rfresh2 Feb 18, 2023
31ce2da
Cleanup
Avanatiker Feb 19, 2023
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
144 changes: 93 additions & 51 deletions src/main/java/com/lambda/mixin/player/MixinEntityPlayerSP.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import net.minecraft.inventory.IInventory;
import net.minecraft.network.play.client.CPacketEntityAction;
import net.minecraft.network.play.client.CPacketPlayer;
import net.minecraft.util.MovementInput;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IInteractionObject;
import net.minecraft.world.World;
Expand All @@ -37,9 +39,16 @@
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

import java.util.Objects;

@Mixin(value = EntityPlayerSP.class, priority = Integer.MAX_VALUE)
public abstract class MixinEntityPlayerSP extends EntityPlayer {
@Shadow @Final public NetHandlerPlayClient connection;
@Shadow public MovementInput movementInput;
@Shadow public float renderArmYaw;
@Shadow public float renderArmPitch;
@Shadow public float prevRenderArmYaw;
@Shadow public float prevRenderArmPitch;
@Shadow protected Minecraft mc;
@Shadow private double lastReportedPosX;
@Shadow private double lastReportedPosY;
Expand All @@ -56,9 +65,6 @@ public MixinEntityPlayerSP(World worldIn, GameProfile gameProfileIn) {
super(worldIn, gameProfileIn);
}

@Shadow
protected abstract boolean isCurrentViewEntity();

@Shadow
protected abstract void updateAutoJump(float p_189810_1_, float p_189810_2_);

Expand Down Expand Up @@ -89,7 +95,7 @@ private void onPushOutOfBlocks(CallbackInfoReturnable<Boolean> callbackInfoRetur
public void onDisplayGUIChest(IInventory chestInventory, CallbackInfo ci) {
if (BeaconSelector.INSTANCE.isEnabled()) {
if (chestInventory instanceof IInteractionObject && "minecraft:beacon".equals(((IInteractionObject) chestInventory).getGuiID())) {
Minecraft.getMinecraft().displayGuiScreen(new LambdaGuiBeacon(this.inventory, chestInventory));
Minecraft.getMinecraft().displayGuiScreen(new LambdaGuiBeacon(inventory, chestInventory));
ci.cancel();
}
}
Expand All @@ -104,11 +110,11 @@ public void moveHead(MoverType type, double x, double y, double z, CallbackInfo
LambdaEventBus.INSTANCE.post(event);

if (event.isModified()) {
double prevX = this.posX;
double prevZ = this.posZ;
double prevX = posX;
double prevZ = posZ;

super.move(type, event.getX(), event.getY(), event.getZ());
this.updateAutoJump((float) (this.posX - prevX), (float) (this.posZ - prevZ));
updateAutoJump((float) (posX - prevX), (float) (posZ - prevZ));

ci.cancel();
}
Expand All @@ -123,11 +129,50 @@ public boolean modifySprinting(boolean sprinting) {
}
}

// We have to return true here so it would still update movement inputs from Baritone and send packets
@Inject(method = "isCurrentViewEntity", at = @At("RETURN"), cancellable = true)
protected void mixinIsCurrentViewEntity(CallbackInfoReturnable<Boolean> cir) {
if (Freecam.INSTANCE.isEnabled() && Freecam.INSTANCE.getCameraGuy() != null) {
cir.setReturnValue(mc.getRenderViewEntity() == Freecam.INSTANCE.getCameraGuy());
// Cannot use an inject in isCurrentViewEntity due to rusherhack redirecting it here
@Inject(method = "onUpdateWalkingPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/EntityPlayerSP;isCurrentViewEntity()Z"), cancellable = true)
protected void mixinUpdateWalkingPlayerCompat(CallbackInfo ci) {
if (Freecam.INSTANCE.isEnabled() && Freecam.INSTANCE.getCameraGuy() != null && Objects.equals(this, mc.player)) {
ci.cancel();
// we need to perform the same actions as what is in the mc method
++positionUpdateTicks;
final AxisAlignedBB boundingBox = getEntityBoundingBox();
final Vec3d pos = new Vec3d(posX, boundingBox.minY, posZ);
final Vec2f rot = new Vec2f(rotationYaw, rotationPitch);
final boolean isMoving = isMoving(pos);
final boolean isRotating = isRotating(rot);
sendPlayerPacket(isMoving, isRotating, pos, rot);
if (isMoving) {
lastReportedPosX = pos.x;
lastReportedPosY = pos.y;
lastReportedPosZ = pos.z;
positionUpdateTicks = 0;
}

if (isRotating) {
lastReportedYaw = rot.getX();
lastReportedPitch = rot.getY();
}

prevOnGround = onGround;
autoJumpEnabled = mc.gameSettings.autoJump;
}
}

// Cannot use an inject in isCurrentViewEntity due to rusherhack redirecting it here
@Inject(method = "updateEntityActionState", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/EntityPlayerSP;isCurrentViewEntity()Z"), cancellable = true)
protected void mixinEntityActionState(CallbackInfo ci) {
if (Freecam.INSTANCE.isEnabled() && Freecam.INSTANCE.getCameraGuy() != null && Objects.equals(this, mc.player)) {
ci.cancel();

// we need to perform the same actions as what is in the mc method
moveStrafing = movementInput.moveStrafe;
moveForward = movementInput.moveForward;
isJumping = movementInput.jump;
prevRenderArmYaw = renderArmYaw;
prevRenderArmPitch = renderArmPitch;
renderArmPitch = renderArmPitch + (rotationPitch - renderArmPitch) * 0.5f;
renderArmYaw = renderArmYaw + (rotationYaw - renderArmYaw) * 0.5f;
}
}

Expand All @@ -141,23 +186,25 @@ private void onUpdateInvokeOnUpdateWalkingPlayer(CallbackInfo ci) {
Vec3d serverSidePos = PlayerPacketManager.INSTANCE.getServerSidePosition();
Vec2f serverSideRotation = PlayerPacketManager.INSTANCE.getPrevServerSideRotation();

this.lastReportedPosX = serverSidePos.x;
this.lastReportedPosY = serverSidePos.y;
this.lastReportedPosZ = serverSidePos.z;
lastReportedPosX = serverSidePos.x;
lastReportedPosY = serverSidePos.y;
lastReportedPosZ = serverSidePos.z;

this.lastReportedYaw = serverSideRotation.getX();
this.lastReportedPitch = serverSideRotation.getY();
lastReportedYaw = serverSideRotation.getX();
lastReportedPitch = serverSideRotation.getY();
}

@Inject(method = "onUpdateWalkingPlayer", at = @At("HEAD"), cancellable = true)
private void onUpdateWalkingPlayerHead(CallbackInfo ci) {
if (Freecam.INSTANCE.isEnabled() && Freecam.INSTANCE.getCameraGuy() != null
&& Objects.equals(this, Freecam.INSTANCE.getCameraGuy())) return;

CriticalsUpdateWalkingEvent criticalsEditEvent = new CriticalsUpdateWalkingEvent();
LambdaEventBus.INSTANCE.post(criticalsEditEvent);

// Setup flags
Vec3d position = new Vec3d(this.posX, this.getEntityBoundingBox().minY, this.posZ);
Vec2f rotation = new Vec2f(this.rotationYaw, this.rotationPitch);
Vec3d position = new Vec3d(posX, getEntityBoundingBox().minY, posZ);
Vec2f rotation = new Vec2f(rotationYaw, rotationPitch);
boolean moving = isMoving(position);
boolean rotating = isRotating(rotation);

Expand All @@ -181,76 +228,71 @@ private void onUpdateWalkingPlayerHead(CallbackInfo ci) {
sendSneakPacket();
sendPlayerPacket(moving, rotating, position, rotation);

this.prevOnGround = onGround;
prevOnGround = onGround;
}

++this.positionUpdateTicks;
this.autoJumpEnabled = this.mc.gameSettings.autoJump;
++positionUpdateTicks;
autoJumpEnabled = mc.gameSettings.autoJump;
}

event = event.nextPhase();
LambdaEventBus.INSTANCE.post(event);
}

private void sendSprintPacket() {
boolean sprinting = this.isSprinting();
boolean sprinting = isSprinting();

if (sprinting != this.serverSprintState) {
if (sprinting != serverSprintState) {
if (sprinting) {
this.connection.sendPacket(new CPacketEntityAction(this, CPacketEntityAction.Action.START_SPRINTING));
connection.sendPacket(new CPacketEntityAction(this, CPacketEntityAction.Action.START_SPRINTING));
} else {
this.connection.sendPacket(new CPacketEntityAction(this, CPacketEntityAction.Action.STOP_SPRINTING));
connection.sendPacket(new CPacketEntityAction(this, CPacketEntityAction.Action.STOP_SPRINTING));
}
this.serverSprintState = sprinting;
serverSprintState = sprinting;
}
}

private void sendSneakPacket() {
boolean sneaking = this.isSneaking();
boolean sneaking = isSneaking();

if (sneaking != this.serverSneakState) {
if (sneaking != serverSneakState) {
if (sneaking) {
this.connection.sendPacket(new CPacketEntityAction(this, CPacketEntityAction.Action.START_SNEAKING));
connection.sendPacket(new CPacketEntityAction(this, CPacketEntityAction.Action.START_SNEAKING));
} else {
this.connection.sendPacket(new CPacketEntityAction(this, CPacketEntityAction.Action.STOP_SNEAKING));
connection.sendPacket(new CPacketEntityAction(this, CPacketEntityAction.Action.STOP_SNEAKING));
}
this.serverSneakState = sneaking;
serverSneakState = sneaking;
}
}

private void sendPlayerPacket(boolean moving, boolean rotating, Vec3d position, Vec2f rotation) {
if (!this.isCurrentViewEntity()) return;

if (this.isRiding()) {
this.connection.sendPacket(new CPacketPlayer.PositionRotation(this.motionX, -999.0D, this.motionZ, rotation.getX(), rotation.getY(), onGround));
if (isRiding()) {
connection.sendPacket(new CPacketPlayer.PositionRotation(motionX, -999.0D, motionZ, rotation.getX(), rotation.getY(), onGround));
moving = false;
} else if (moving && rotating) {
this.connection.sendPacket(new CPacketPlayer.PositionRotation(position.x, position.y, position.z, rotation.getX(), rotation.getY(), onGround));
connection.sendPacket(new CPacketPlayer.PositionRotation(position.x, position.y, position.z, rotation.getX(), rotation.getY(), onGround));
} else if (moving) {
this.connection.sendPacket(new CPacketPlayer.Position(position.x, position.y, position.z, onGround));
connection.sendPacket(new CPacketPlayer.Position(position.x, position.y, position.z, onGround));
} else if (rotating) {
this.connection.sendPacket(new CPacketPlayer.Rotation(rotation.getX(), rotation.getY(), onGround));
} else if (this.prevOnGround != onGround) {
this.connection.sendPacket(new CPacketPlayer(onGround));
connection.sendPacket(new CPacketPlayer.Rotation(rotation.getX(), rotation.getY(), onGround));
} else if (prevOnGround != onGround) {
connection.sendPacket(new CPacketPlayer(onGround));
}

if (moving) {
this.positionUpdateTicks = 0;
}
if (moving) positionUpdateTicks = 0;
}

private boolean isMoving(Vec3d position) {
double xDiff = position.x - this.lastReportedPosX;
double yDiff = position.y - this.lastReportedPosY;
double zDiff = position.z - this.lastReportedPosZ;
double xDiff = position.x - lastReportedPosX;
double yDiff = position.y - lastReportedPosY;
double zDiff = position.z - lastReportedPosZ;

return this.positionUpdateTicks >= 20 || xDiff * xDiff + yDiff * yDiff + zDiff * zDiff > 9.0E-4D;
return positionUpdateTicks >= 20 || xDiff * xDiff + yDiff * yDiff + zDiff * zDiff > 9.0E-4D;
}

private boolean isRotating(Vec2f rotation) {
double yawDiff = rotation.getX() - this.lastReportedYaw;
double pitchDiff = rotation.getY() - this.lastReportedPitch;

double yawDiff = rotation.getX() - lastReportedYaw;
double pitchDiff = rotation.getY() - lastReportedPitch;
return yawDiff != 0.0D || pitchDiff != 0.0D;
}
}