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

Add edge distance setting to SafeWalk

Browse Source
This commit is contained in:
Alexander01998 2023-05-05 21:43:47 +02:00
parent 88711cf1a5
commit 51e8e2d148
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/net/wurstclient/hacks/SafeWalkHack.java
View File

@ -15,6 +15,8 @@ import net.wurstclient.SearchTags;
import net.wurstclient.hack.Hack;
import net.wurstclient.mixinterface.IKeyBinding;
import net.wurstclient.settings.CheckboxSetting;
import net.wurstclient.settings.SliderSetting;
import net.wurstclient.settings.SliderSetting.ValueDisplay;
@SearchTags({"safe walk"})
public final class SafeWalkHack extends Hack
@ -22,6 +24,12 @@ public final class SafeWalkHack extends Hack
private final CheckboxSetting sneak =
new CheckboxSetting("Sneak at edges", "Visibly sneak at edges.", false);
private final SliderSetting edgeDistance = new SliderSetting(
"Sneak edge distance",
"How close SafeWalk will let you get to the edge before sneaking.\n\n"
+ "This setting is only used when \"Sneak at edges\" is enabled.",
0.05, 0.05, 0.25, 0.001, ValueDisplay.DECIMAL.withSuffix("m"));
private boolean sneaking;
public SafeWalkHack()
@ -29,6 +37,7 @@ public final class SafeWalkHack extends Hack
super("SafeWalk");
setCategory(Category.MOVEMENT);
addSetting(sneak);
addSetting(edgeDistance);
}
@Override
@ -47,7 +56,9 @@ public final class SafeWalkHack extends Hack
public void onClipAtLedge(boolean clipping)
{
if(!isEnabled() || !sneak.isChecked() || !MC.player.isOnGround())
ClientPlayerEntity player = MC.player;
if(!isEnabled() || !sneak.isChecked() || !player.isOnGround())
{
if(sneaking)
setSneaking(false);
@ -55,15 +66,13 @@ public final class SafeWalkHack extends Hack
return;
}
ClientPlayerEntity player = MC.player;
Box bb = player.getBoundingBox();
float stepHeight = player.stepHeight;
Box box = player.getBoundingBox();
Box adjustedBox = box.stretch(0, -player.stepHeight, 0)
.expand(-edgeDistance.getValue(), 0, -edgeDistance.getValue());
if(MC.world.isSpaceEmpty(player, adjustedBox))
clipping = true;
for(double x = -0.05; x <= 0.05; x += 0.05)
for(double z = -0.05; z <= 0.05; z += 0.05)
if(MC.world.isSpaceEmpty(player, bb.offset(x, -stepHeight, z)))
clipping = true;
setSneaking(clipping);
}
@ -78,4 +87,6 @@ public final class SafeWalkHack extends Hack
this.sneaking = sneaking;
}
// See ClientPlayerEntityMixin
}

7
src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java
View File

@ -201,6 +201,9 @@ public class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
.getAdditionalJumpMotion();
}
/**
* This is the part that makes SafeWalk work.
*/
@Override
protected boolean clipAtLedge()
{
@ -208,6 +211,10 @@ public class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
|| WurstClient.INSTANCE.getHax().safeWalkHack.isEnabled();
}
/**
* This mixin allows SafeWalk to sneak visibly when the player is
* near a ledge.
*/
@Override
protected Vec3d adjustMovementForSneaking(Vec3d movement, MovementType type)
{