Feature: Trident boost

Author: emyfops

common/src/main/java/com/lambda/mixin/items/TridentMixin.java

@@ -0,0 +1,24 @@
+package com.lambda.mixin.items;
+
+import com.lambda.module.modules.movement.TridentBoost;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import net.minecraft.item.TridentItem;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Mixin(TridentItem.class)
+public class TridentMixin {
+    // Forge doesn't support the @ModityArgs annotation, so we have to chain multiple @ModifyArg
+    @ModifyArg(method = "onStoppedUsing", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;addVelocity(DDD)V"), index = 0)
+    private double modifyVelocity0(double velocity) { return TridentBoost.INSTANCE.isEnabled() ? velocity * TridentBoost.INSTANCE.getTridentSpeed() : velocity; }
+
+    @ModifyArg(method = "onStoppedUsing", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;addVelocity(DDD)V"), index = 1)
+    private double modifyVelocity1(double velocity) { return TridentBoost.INSTANCE.isEnabled() ? velocity * TridentBoost.INSTANCE.getTridentSpeed() : velocity; }
+
+    @ModifyArg(method = "onStoppedUsing", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;addVelocity(DDD)V"), index = 2)
+    private double modifyVelocity2(double velocity) { return TridentBoost.INSTANCE.isEnabled() ? velocity * TridentBoost.INSTANCE.getTridentSpeed() : velocity; }
+
+    @ModifyExpressionValue(method = {"onStoppedUsing", "use"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;isTouchingWaterOrRain()Z"))
+    private boolean modifyIsTouchingWaterOrRain(boolean original) { return TridentBoost.INSTANCE.isEnabled() ? TridentBoost.INSTANCE.getForceUse() : original; }
+}

common/src/main/kotlin/com/lambda/module/modules/movement/TridentBoost.kt

@@ -0,0 +1,13 @@
+package com.lambda.module.modules.movement
+
+import com.lambda.module.Module
+import com.lambda.module.tag.ModuleTag
+
+object TridentBoost : Module(
+    name = "TridentBoost",
+    description = "Boosts you with tridents",
+    defaultTags = setOf(ModuleTag.MOVEMENT)
+) {
+    val tridentSpeed by setting("Speed Factor", 2.0, 0.1..3.0, 0.1, description = "Speed factor of the trident boost")
+    val forceUse by setting("Force Use", true, description = "Try to use the trident outside of water or rain")
+}

common/src/main/kotlin/com/lambda/module/modules/movement/TridentFlight.kt

@@ -1,10 +1,10 @@
 package com.lambda.module.modules.movement
 
-import baritone.api.utils.Helper
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
+import net.minecraft.enchantment.EnchantmentHelper
 import net.minecraft.entity.MovementType
 import net.minecraft.item.TridentItem
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket
@@ -22,8 +22,10 @@ object TridentFlight : Module(
     description = "Allows you to fly with tridents",
     defaultTags = setOf(ModuleTag.MOVEMENT, ModuleTag.BYPASS, ModuleTag.GRIM),
 ) {
-    private val delay by setting("Delay", 0, 0..20, 1, description = "Delay in ticks before releasing the trident")
-    private val grimBypass by setting("Grim Bypass", true, description = "Bypass Grim's trident flight check")
+    private val bounce by setting("Bounce", true, description = "Automatically use the trident")
+    private val delay by setting("Delay", 0, 0..20, 1, description = "Delay in ticks before releasing the trident", visibility = { bounce })
+    private val tridentSpeed by setting("Speed Factor", 1.0, 0.1..5.0, 0.1, description = "Speed factor of the trident flight")
+
     val rain by setting("Rain", true, description = "Set rain client-side to allow flight")
 
     private var ticks = 0
@@ -39,22 +41,25 @@ object TridentFlight : Module(
                 connection.sendPacket(UpdateSelectedSlotC2SPacket(tridentSlot))
                 connection.sendPacket(PlayerActionC2SPacket(PlayerActionC2SPacket.Action.RELEASE_USE_ITEM, BlockPos.ORIGIN, Direction.DOWN))
 
-                if (grimBypass) {
-                    val yaw = player.yaw * (Math.PI / 180)
-                    val pitch = player.pitch * (Math.PI / 180)
+                val level = EnchantmentHelper.getRiptide(player.activeItem)
+                val yaw = player.yaw * (Math.PI / 180)
+                val pitch = player.pitch * (Math.PI / 180)
 
-                    val x = -sin(yaw) * cos(pitch)
-                    val y = -sin(pitch)
-                    val z = cos(yaw) * cos(pitch)
+                val x = -sin(yaw) * cos(pitch)
+                val y = -sin(pitch)
+                val z = cos(yaw) * cos(pitch)
 
-                    val dot = sqrt(x * x + y * y + z * z)
-                    val multiplier = 3 / dot
+                val dot = sqrt(x * x + y * y + z * z)
+                val multiplier = (3 * ((1.0 + level) / 4.0)) / dot
 
-                    player.addVelocity(x * multiplier, y * multiplier, z * multiplier)
+                player.addVelocity(
+                    x * multiplier * tridentSpeed,
+                    y * multiplier * tridentSpeed,
+                    z * multiplier * tridentSpeed
+                )
 
-                    if (player.isOnGround)
-                        player.move(MovementType.SELF, Vec3d(0.0, 1.2, 0.0))
-                }
+                if (player.isOnGround)
+                    player.move(MovementType.SELF, Vec3d(0.0, 1.19999, 0.0))
 
                 connection.sendPacket(UpdateSelectedSlotC2SPacket(spoofSlot))
 

common/src/main/resources/lambda.mixins.common.json

@@ -27,7 +27,8 @@
     "render.RenderTickCounterMixin",
     "render.VertexBufferMixin",
     "render.WorldRendererMixin",
-    "world.WorldMixin"
+    "world.WorldMixin",
+    "items.TridentMixin"
   ],
   "injectors": {
     "defaultRequire": 1