Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,10 @@ private void updateChangeLookDirection(double cursorDeltaX, double cursorDeltaY,
FreeLook freeLook = Modules.get().get(FreeLook.class);

if (freecam.isActive()) {
freecam.changeLookDirection(cursorDeltaX * 0.15, cursorDeltaY * 0.15);
ci.cancel();
if (!freecam.getOverride()) {
freecam.changeLookDirection(cursorDeltaX * 0.15, cursorDeltaY * 0.15);
ci.cancel();
}
}
else if (Modules.get().isActive(HighwayBuilder.class)) {
Camera camera = mc.gameRenderer.getCamera();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,47 +172,26 @@ private void updateTargetedEntityInvoke(float tickDelta, CallbackInfo info) {
Freecam freecam = Modules.get().get(Freecam.class);
boolean highwayBuilder = Modules.get().isActive(HighwayBuilder.class);

if ((freecam.isActive() || highwayBuilder) && client.getCameraEntity() != null && !freecamSet) {
if ((freecam.shouldChangeCrosshairTarget() || highwayBuilder) && client.getCameraEntity() != null && !freecamSet) {
info.cancel();
Entity cameraE = client.getCameraEntity();

double x = cameraE.getX();
double y = cameraE.getY();
double z = cameraE.getZ();
double lastX = cameraE.lastX;
double lastY = cameraE.lastY;
double lastZ = cameraE.lastZ;
float yaw = cameraE.getYaw();
float pitch = cameraE.getPitch();
float lastYaw = cameraE.lastYaw;
float lastPitch = cameraE.lastPitch;

freecamSet = true;
if (highwayBuilder) {
float yaw = cameraE.getYaw();
float pitch = cameraE.getPitch();

cameraE.setYaw(camera.getYaw());
cameraE.setPitch(camera.getPitch());

updateCrosshairTarget(tickDelta);

cameraE.setYaw(yaw);
cameraE.setPitch(pitch);
} else {
((IVec3d) cameraE.getPos()).meteor$set(freecam.pos.x, freecam.pos.y - cameraE.getEyeHeight(cameraE.getPose()), freecam.pos.z);
cameraE.lastX = freecam.prevPos.x;
cameraE.lastY = freecam.prevPos.y - cameraE.getEyeHeight(cameraE.getPose());
cameraE.lastZ = freecam.prevPos.z;
cameraE.setYaw(freecam.yaw);
cameraE.setPitch(freecam.pitch);
cameraE.lastYaw = freecam.lastYaw;
cameraE.lastPitch = freecam.lastPitch;
Freecam.withPos(() -> updateCrosshairTarget(tickDelta));
}

freecamSet = true;
updateCrosshairTarget(tickDelta);
freecamSet = false;

((IVec3d) cameraE.getPos()).meteor$set(x, y, z);
cameraE.lastX = lastX;
cameraE.lastY = lastY;
cameraE.lastZ = lastZ;
cameraE.setYaw(yaw);
cameraE.setPitch(pitch);
cameraE.lastYaw = lastYaw;
cameraE.lastPitch = lastPitch;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import meteordevelopment.meteorclient.settings.*;
import meteordevelopment.meteorclient.systems.modules.Categories;
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.meteorclient.systems.modules.render.Freecam;
import meteordevelopment.meteorclient.utils.player.InvUtils;
import meteordevelopment.meteorclient.utils.render.color.SettingColor;
import meteordevelopment.meteorclient.utils.world.BlockUtils;
Expand Down Expand Up @@ -89,7 +90,7 @@ private void onTick(TickEvent.Pre event) {
if (mc.crosshairTarget != null && mc.crosshairTarget.getType() != HitResult.Type.MISS) return;

double r = customRange.get() ? range.get() : mc.player.getBlockInteractionRange();
hitResult = mc.getCameraEntity().raycast(r, 0, false);
hitResult = Freecam.withPos(() -> mc.getCameraEntity().raycast(r, 0, false));
}

@EventHandler
Expand Down
Loading