Skip to content

Fix spamming #73

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
p1k0chu wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix spamming #73

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b45fcaa
player could be null here
p1k0chu Oct 22, 2024
900c493
fixes AdvancedXRay/Auto-Clicker#72
p1k0chu Oct 22, 2024
006a37b
fixed bug when using items and attacking simultaneously
p1k0chu Oct 22, 2024
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
77 changes: 71 additions & 6 deletions common/src/main/java/pro/mikey/autoclicker/AutoClicker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ShieldItem;
import net.minecraft.text.Text;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Formatting;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.hit.EntityHitResult;
import net.minecraft.util.hit.HitResult;
import org.apache.logging.log4j.LogManager;
Expand Down Expand Up @@ -187,12 +189,15 @@ private void handleActiveHolding(MinecraftClient mc, Holding key) {
key.resetTimeout();
}

// Press the button twice by toggling 1 and 0
key.getKey().setPressed(key.getTimeout() == 1);

if (key.getKey().isPressed()) {
this.attemptMobAttack(mc, key);
// simulate the actual button press only if its jumping
if(key == jumpHolding) {
// Press the button twice by toggling 1 and 0
key.getKey().setPressed(key.getTimeout() == 1);
}
// for left click, attempt to attack the mob
this.attemptMobAttack(mc, key);
// for right click, attempt to interact with block or mob
this.attemptUse(mc, key);
}
key.decreaseTimeout();
} else {
Expand Down Expand Up @@ -229,19 +234,79 @@ private void handleActiveHolding(MinecraftClient mc, Holding key) {
}
}

/**
* Attempts to use items in main hand, and if it couldn't, tries offhand.
*/
private void attemptUse(MinecraftClient mc, Holding key) {
// don't interact on left click
if(key.getKey() != rightHolding.getKey() || mc.interactionManager == null || mc.player == null) {
return;
}

HitResult rayTrace = mc.crosshairTarget;
if(rayTrace == null) {
return;
}

// try with both hands
for(var hand : Hand.values()) {
if (rayTrace.getType() == HitResult.Type.ENTITY && rayTrace instanceof EntityHitResult) {
// interact with entity
ActionResult result = mc.interactionManager.interactEntity(mc.player, ((EntityHitResult) rayTrace).getEntity(), hand);
if (result.isAccepted()) {
if (result.shouldSwingHand()) {
mc.player.swingHand(hand);
}
return;
}
} else if (rayTrace.getType() == HitResult.Type.BLOCK) {
// interact with block
ActionResult result = mc.interactionManager.interactBlock(mc.player, hand, (BlockHitResult) rayTrace);
if (result.isAccepted()) {
if (result.shouldSwingHand()) {
mc.player.swingHand(hand);
}
return;
} else {
// if you cant interact with block, you could use a water bucket on it
ActionResult result1 = mc.interactionManager.interactItem(mc.player, hand);
if(result1.isAccepted()) {
if(result.shouldSwingHand()) {
mc.player.swingHand(hand);
}
return;
}
}
} else if (rayTrace.getType() == HitResult.Type.MISS) {
// no blocks and entities to interact with
// attempt to use an item (e.g. ender pearl)
ActionResult result = mc.interactionManager.interactItem(mc.player, hand);
if (result.isAccepted()) {
if (result.shouldSwingHand()) {
// cosmetic swing
mc.player.swingHand(hand);
}
return;
}
}
}
}

private void attemptMobAttack(MinecraftClient mc, Holding key) {
// Don't attack on a right click
if (key.getKey() != leftHolding.getKey()) {
return;
}

HitResult rayTrace = mc.crosshairTarget;
if (rayTrace instanceof EntityHitResult && mc.interactionManager != null) {
if (rayTrace instanceof EntityHitResult && mc.interactionManager != null && mc.player != null) {
if(!(config.getLeftClick().isRespectShield() && isShielding(mc.player))) {
mc.interactionManager.attackEntity(mc.player, ((EntityHitResult) rayTrace).getEntity());
if (mc.player != null) {
mc.player.swingHand(Hand.MAIN_HAND);
}
// it's impossible in vanilla minecraft to attack and use item at the same time
mc.interactionManager.stopUsingItem(mc.player);
}
}
}
Expand Down