BaseBand/BaseBandRewrite
3
0
Fork 0
Code Issues 4 Pull requests Projects 3 Releases Packages Wiki Activity Actions

improve fall damage mitigations
All checks were successful
/ Build BaseBand (push) Successful in 2m43s
Details

Browse source
This commit is contained in:
Daniella / Tove 2024-10-04 22:20:43 +02:00
parent f2470a67a7
commit 4f451d8551
Signed by: TudbuT
GPG key ID: B3CF345217F202D3
4 changed files with 65 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Client/src/main/java/de/com/baseband/client/feature/modules/movement/ElytraFly.java
View file

@ -3,18 +3,18 @@ package de.com.baseband.client.feature.modules.movement;
import de.com.baseband.client.event.events.MoveEvent;
import de.com.baseband.client.event.events.PacketEvent;
import de.com.baseband.client.feature.Feature;
import de.com.baseband.client.feature.Features;
import de.com.baseband.client.feature.category.Movement;
import de.com.baseband.client.registry.annotation.Config;
import de.com.baseband.client.registry.annotation.Description;
import de.com.baseband.client.registry.annotation.Gate;
import de.com.baseband.client.registry.annotation.Range;
import de.com.baseband.client.util.adapt.Marker;
import de.com.baseband.client.util.interact.InventoryUtils;
import de.com.baseband.client.util.interact.MotionUtil;
import de.com.baseband.client.util.interact.ServerDataManager;
import de.tudbut.tools.Lock;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ClickType;
import net.minecraft.network.Packet;
import net.minecraft.network.play.client.CPacketEntityAction;
import net.minecraft.network.play.client.CPacketPlayer;
@ -35,10 +35,6 @@ public class ElytraFly extends Feature {
@Marker(4)
public boolean stopOnDisable = false;
@Config("Stop with packet")
@Gate(4)
public boolean stopWithPacket = true;
@Config("Mixin (recommended)")
@Description("Use the client's mixin for ElytraFly control, which is more accurate but can theoretically be broken by other clients.")
@Marker(2)
@ -122,19 +118,37 @@ public class ElytraFly extends Feature {
public void onDisable() {
init = false;
if(stopOnDisable && !notIngame()) {
if(stopWithPacket) {
mc.player.connection.sendPacket(new CPacketPlayer.Position(mc.player.posX, mc.player.posY, mc.player.posZ, true));
mc.player.connection.sendPacket(new CPacketEntityAction(mc.player, CPacketEntityAction.Action.START_FALL_FLYING));
if(mc.player.motionY >= -0.1 && mc.player.rotationPitch < 40) {
sendDisablePackets();
}
else {
InventoryUtils.clickSlot(6, ClickType.PICKUP, 0);
InventoryUtils.clickSlot(6, ClickType.PICKUP, 0);
// stop fall dmg
mc.player.connection.sendPacket(new CPacketPlayer.Rotation(mc.player.rotationYaw, 0, false));
mc.player.motionY = 0.1;
sendDisableTimer = ServerDataManager.timeToSurelyTicked();
// use NoFall setting if that's enabled, since the player might prefer something else
Features.ifFeatureEnabled(NoFall.class, x -> sendDisableTimer = x.disengageTime);
}
}
}
private void sendDisablePackets() {
mc.player.connection.sendPacket(new CPacketPlayer.Position(mc.player.posX, mc.player.posY, mc.player.posZ, true));
mc.player.connection.sendPacket(new CPacketEntityAction(mc.player, CPacketEntityAction.Action.START_FALL_FLYING));
}
private int sendDisableTimer = -1;
@Override
public void onEveryTick() {
if(sendDisableTimer > 0) {
mc.player.motionY = 0.1;
sendDisableTimer--;
}
if(sendDisableTimer == 0) {
sendDisablePackets();
sendDisableTimer = -1;
}
if (blockMovement) {
meta = "Locked";
} else {

29
Client/src/main/java/de/com/baseband/client/feature/modules/movement/NoFall.java
View file

@ -3,12 +3,11 @@ package de.com.baseband.client.feature.modules.movement;
import de.com.baseband.client.event.events.PacketEvent;
import de.com.baseband.client.feature.Feature;
import de.com.baseband.client.feature.category.Movement;
import de.com.baseband.client.registry.annotation.Config;
import de.com.baseband.client.registry.annotation.Description;
import de.com.baseband.client.registry.annotation.Gate;
import de.com.baseband.client.registry.annotation.Range;
import de.com.baseband.client.registry.annotation.*;
import de.com.baseband.client.util.adapt.FieldFinder;
import de.com.baseband.client.util.adapt.Marker;
import de.com.baseband.client.util.interact.ServerDataManager;
import de.com.baseband.client.util.misc.PacketUtils;
import net.minecraft.entity.Entity;
import net.minecraft.network.datasync.DataParameter;
import net.minecraft.network.play.client.CPacketEntityAction;
@ -31,10 +30,17 @@ public class NoFall extends Feature {
@Marker(1)
boolean modeIsElytra = false;
@Config("Automatic disengage")
@Description("Determines Disengage time automatically based on TPS.")
@Gate(1)
@Marker(2)
public boolean autoDisengage = true;
@Config("Disengage time")
@Description("Directly depends on how performant the server is. If it's always 20TPS, this can be 2, otherwise higher.")
@Description("Directly depends on how performant the server is. If it's always 20TPS, this can be 2, otherwise higher.\nLower is more unsafe but faster.")
@Range("2..20")
@Gate(1)
@MultiGate(andNot = {2})
public int disengageTime = 2;
boolean lastOnGround = true;
@ -50,15 +56,7 @@ public class NoFall extends Feature {
// rotations will mess with resetting fall distance when using the elytra!
if(mode == Mode.Elytra && cancelElytraNT != 0) {
if(packet instanceof CPacketPlayer.Rotation) {
event.setCancelled(true);
return;
}
if(packet instanceof CPacketPlayer.PositionRotation) {
mc.player.connection.sendPacket(new CPacketPlayer.Position(packet.getX(0), packet.getY(0), packet.getZ(0), packet.isOnGround()));
event.setCancelled(true);
return;
}
PacketUtils.removeRotationsFrom(event, packet);
}
// we check the fall distance so we dont interfere with things that require server-side onground, **LAMBDA**!
@ -99,6 +97,9 @@ public class NoFall extends Feature {
public void onTick() {
if(mc.player.onGround)
ranThisFall = false;
if(autoDisengage) {
disengageTime = ServerDataManager.timeToSurelyTicked();
}
lastOnGround = mc.player.onGround;
lastFallDist = mc.player.fallDistance;
if(mode == Mode.Elytra && !mc.player.isElytraFlying()) {

4
Client/src/main/java/de/com/baseband/client/util/interact/ServerDataManager.java
View file

@ -83,4 +83,8 @@ public class ServerDataManager {
lock.waitHere();
}
}
public static int timeToSurelyTicked() {
return (int) Math.ceil((20f / tps) * 3f); // 20 => 3, 10 => 6, etc
}
}

21
Client/src/main/java/de/com/baseband/client/util/misc/PacketUtils.java Normal file
View file

@ -0,0 +1,21 @@
package de.com.baseband.client.util.misc;
import de.com.baseband.client.event.events.PacketEvent;
import net.minecraft.network.play.client.CPacketPlayer;
import static de.com.baseband.client.BaseBand.mc;
public class PacketUtils {
public static void removeRotationsFrom(PacketEvent.Send event, CPacketPlayer packet) {
if(packet instanceof CPacketPlayer.Rotation) {
event.setCancelled(true);
return;
}
if(packet instanceof CPacketPlayer.PositionRotation) {
mc.player.connection.sendPacket(new CPacketPlayer.Position(packet.getX(0), packet.getY(0), packet.getZ(0), packet.isOnGround()));
event.setCancelled(true);
return;
}
}
}