Remove TridentFlight (sry Kamigen)

Author: Avanatiker

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

@@ -11,14 +11,27 @@
 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; }
+    private double modifyVelocity0(double velocity) {
+        return TridentBoost.INSTANCE.isEnabled() ? velocity * TridentBoost.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; }
+    private double modifyVelocity1(double velocity) {
+        return TridentBoost.INSTANCE.isEnabled() ? velocity * TridentBoost.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; }
+    private double modifyVelocity2(double velocity) {
+        return TridentBoost.INSTANCE.isEnabled() ? velocity * TridentBoost.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; }
+    private boolean modifyIsTouchingWaterOrRain(boolean original) {
+        return TridentBoost.INSTANCE.isEnabled() && TridentBoost.getForceUse() || original;
+    }
+
+    @ModifyArg(method = "onStoppedUsing", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;useRiptide(I)V"))
+    private int modifyRiptide(int riptide) {
+        return TridentBoost.INSTANCE.isEnabled() ? TridentBoost.getDelay() : riptide;
+    }
 }

common/src/main/java/com/lambda/mixin/world/WorldMixin.java

@@ -8,6 +8,6 @@ object TridentBoost : Module(
     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")
+    @JvmStatic val tridentSpeed by setting("Speed Factor", 1.0, 0.1..3.0, 0.1, description = "Speed factor of the trident boost")
+    @JvmStatic 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/TridentBoost.kt

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