mirror/Wurst7
0
0
Fork 0
mirror of https://github.com/Wurst-Imperium/Wurst7.git synced 2024-09-19 17:02:13 +02:00
Code

Refactor Tillaura to use InteractionSimulator

Browse Source
This commit is contained in:
Alexander01998 2024-05-10 15:55:31 +02:00
parent 99f4272a6e
commit a28ab1cc43
1 changed files with 41 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
src/main/java/net/wurstclient/hacks/TillauraHack.java
View File

@ -8,10 +8,8 @@
package net.wurstclient.hacks;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import net.minecraft.block.Block;
@ -20,7 +18,6 @@ import net.minecraft.item.HoeItem;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.Vec3d;
import net.wurstclient.Category;
import net.wurstclient.SearchTags;
@ -29,7 +26,11 @@ import net.wurstclient.hack.Hack;
import net.wurstclient.settings.CheckboxSetting;
import net.wurstclient.settings.SliderSetting;
import net.wurstclient.settings.SliderSetting.ValueDisplay;
import net.wurstclient.settings.SwingHandSetting.SwingHand;
import net.wurstclient.util.BlockBreaker;
import net.wurstclient.util.BlockBreaker.BlockBreakingParams;
import net.wurstclient.util.BlockUtils;
import net.wurstclient.util.InteractionSimulator;
import net.wurstclient.util.RotationUtils;
@SearchTags({"till aura", "HoeAura", "hoe aura", "FarmlandAura",
@ -51,7 +52,7 @@ public final class TillauraHack extends Hack implements UpdateListener
+ "Good for NoCheat+ servers, but unnecessary in vanilla.",
true);
private final List<Block> tillableBlocks = Arrays.asList(Blocks.GRASS_BLOCK,
private final List<Block> tillableBlocks = List.of(Blocks.GRASS_BLOCK,
Blocks.DIRT_PATH, Blocks.DIRT, Blocks.COARSE_DIRT);
public TillauraHack()
@ -83,14 +84,17 @@ public final class TillauraHack extends Hack implements UpdateListener
if(MC.itemUseCooldown > 0)
return;
// don't till while breaking or riding
if(MC.interactionManager.isBreakingBlock() || MC.player.isRiding())
return;
// check held item
ItemStack stack = MC.player.getInventory().getMainHandStack();
if(stack.isEmpty() || !(stack.getItem() instanceof HoeItem))
return;
// get valid blocks
ArrayList<BlockPos> validBlocks =
getValidBlocks(range.getValue(), this::isCorrectBlock);
ArrayList<BlockPos> validBlocks = getValidBlocks();
if(multiTill.isChecked())
{
@ -111,22 +115,18 @@ public final class TillauraHack extends Hack implements UpdateListener
break;
}
private ArrayList<BlockPos> getValidBlocks(double range,
Predicate<BlockPos> validator)
private ArrayList<BlockPos> getValidBlocks()
{
Vec3d eyesVec = RotationUtils.getEyesPos().subtract(0.5, 0.5, 0.5);
double rangeSq = Math.pow(range + 0.5, 2);
int rangeI = (int)Math.ceil(range);
Vec3d eyesVec = RotationUtils.getEyesPos();
BlockPos eyesBlock = BlockPos.ofFloored(eyesVec);
double rangeSq = range.getValueSq();
int blockRange = range.getValueCeil();
BlockPos center = BlockPos.ofFloored(RotationUtils.getEyesPos());
BlockPos min = center.add(-rangeI, -rangeI, -rangeI);
BlockPos max = center.add(rangeI, rangeI, rangeI);
return BlockUtils.getAllInBox(min, max).stream()
.filter(pos -> eyesVec.squaredDistanceTo(Vec3d.of(pos)) <= rangeSq)
.filter(validator)
.sorted(Comparator.comparingDouble(
pos -> eyesVec.squaredDistanceTo(Vec3d.of(pos))))
return BlockUtils.getAllInBoxStream(eyesBlock, blockRange)
.filter(pos -> pos.getSquaredDistance(eyesVec) <= rangeSq)
.filter(this::isCorrectBlock)
.sorted(Comparator
.comparingDouble(pos -> pos.getSquaredDistance(eyesVec)))
.collect(Collectors.toCollection(ArrayList::new));
}
@ -143,69 +143,32 @@ public final class TillauraHack extends Hack implements UpdateListener
private boolean rightClickBlockLegit(BlockPos pos)
{
Vec3d eyesPos = RotationUtils.getEyesPos();
Vec3d posVec = Vec3d.ofCenter(pos);
double distanceSqPosVec = eyesPos.squaredDistanceTo(posVec);
double rangeSq = Math.pow(range.getValue(), 2);
// if this block is unreachable, try the next one
BlockBreakingParams params = BlockBreaker.getBlockBreakingParams(pos);
if(params == null || params.distanceSq() > range.getValueSq())
return false;
if(checkLOS.isChecked() && !params.lineOfSight())
return false;
for(Direction side : Direction.values())
{
Vec3d hitVec = posVec.add(Vec3d.of(side.getVector()).multiply(0.5));
double distanceSqHitVec = eyesPos.squaredDistanceTo(hitVec);
// check if hitVec is within range
if(distanceSqHitVec > rangeSq)
continue;
// check if side is facing towards player
if(distanceSqHitVec >= distanceSqPosVec)
continue;
if(checkLOS.isChecked()
&& !BlockUtils.hasLineOfSight(eyesPos, hitVec))
continue;
// face block
WURST.getRotationFaker().faceVectorPacket(hitVec);
// right click block
IMC.getInteractionManager().rightClickBlock(pos, side, hitVec);
MC.player.swingHand(Hand.MAIN_HAND);
MC.itemUseCooldown = 4;
return true;
}
return false;
// face and right click the block
MC.itemUseCooldown = 4;
WURST.getRotationFaker().faceVectorPacket(params.hitVec());
InteractionSimulator.rightClickBlock(params.toHitResult());
return true;
}
private boolean rightClickBlockSimple(BlockPos pos)
{
Vec3d eyesPos = RotationUtils.getEyesPos();
Vec3d posVec = Vec3d.ofCenter(pos);
double distanceSqPosVec = eyesPos.squaredDistanceTo(posVec);
double rangeSq = Math.pow(range.getValue(), 2);
// if this block is unreachable, try the next one
BlockBreakingParams params = BlockBreaker.getBlockBreakingParams(pos);
if(params == null || params.distanceSq() > range.getValueSq())
return false;
if(checkLOS.isChecked() && !params.lineOfSight())
return false;
for(Direction side : Direction.values())
{
Vec3d hitVec = posVec.add(Vec3d.of(side.getVector()).multiply(0.5));
double distanceSqHitVec = eyesPos.squaredDistanceTo(hitVec);
// check if hitVec is within range
if(distanceSqHitVec > rangeSq)
continue;
// check if side is facing towards player
if(distanceSqHitVec >= distanceSqPosVec)
continue;
if(checkLOS.isChecked()
&& !BlockUtils.hasLineOfSight(eyesPos, hitVec))
continue;
IMC.getInteractionManager().rightClickBlock(pos, side, hitVec);
return true;
}
return false;
// right click the block
InteractionSimulator.rightClickBlock(params.toHitResult(),
SwingHand.OFF);
return true;
}
}