Refactor ElytraFlyPlusPlus settings and logic

Standardized setting names to kebab-case, added 'only-while-colliding' option for motion Y boost, and improved descriptions for custom yaw and start position. Updated module group, enhanced collision and portal trap logic, and fixed sound event handling for fake fly mode.

Author: FaxHack

src/main/java/dev/journey/PathSeeker/modules/utility/ElytraFlyPlusPlus.java

@@ -45,30 +45,38 @@ public class ElytraFlyPlusPlus extends Module {
     private final SettingGroup sgObstaclePasser = settings.createGroup("Obstacle Passer");
 
     private final Setting<Boolean> bounce = sgGeneral.add(new BoolSetting.Builder()
-            .name("Bounce")
+            .name("bounce")
             .description("Automatically does bounce efly.")
             .defaultValue(false)
             .build()
     );
 
     private final Setting<Boolean> motionYBoost = sgGeneral.add(new BoolSetting.Builder()
-            .name("Motion Y Boost")
+            .name("motion-y-boost")
             .description("Greatly increases speed by cancelling Y momentum.")
             .defaultValue(false)
             .visible(bounce::get)
             .build()
     );
 
+    private final Setting<Boolean> onlyWhileColliding = sgGeneral.add(new BoolSetting.Builder()
+            .name("only-while-colliding")
+            .description("Only enables motion y boost if colliding with a wall.")
+            .defaultValue(true)
+            .visible(() -> bounce.get() && motionYBoost.get())
+            .build()
+    );
+
     private final Setting<Boolean> tunnelBounce = sgGeneral.add(new BoolSetting.Builder()
-            .name("Tunnel Bounce")
+            .name("tunnel-bounce")
             .description("Allows you to bounce in 1x2 tunnels. This should not be on if you are not in a tunnel.")
             .defaultValue(false)
             .visible(() -> bounce.get() && motionYBoost.get())
             .build()
     );
 
     private final Setting<Double> speed = sgGeneral.add(new DoubleSetting.Builder()
-            .name("Speed")
+            .name("speed")
             .description("The speed in blocks per second to keep you at.")
             .defaultValue(100.0)
             .sliderRange(20, 250)
@@ -77,15 +85,15 @@ public class ElytraFlyPlusPlus extends Module {
     );
 
     private final Setting<Boolean> lockPitch = sgGeneral.add(new BoolSetting.Builder()
-            .name("Lock Pitch")
+            .name("lock-pitch")
             .description("Whether to lock your pitch when bounce is enabled.")
             .defaultValue(true)
             .visible(bounce::get)
             .build()
     );
 
     private final Setting<Double> pitch = sgGeneral.add(new DoubleSetting.Builder()
-            .name("Pitch")
+            .name("pitch")
             .description("The pitch to set when bounce is enabled.")
             .defaultValue(90.0)
             .sliderRange(-90, 90)
@@ -94,88 +102,86 @@ public class ElytraFlyPlusPlus extends Module {
     );
 
     private final Setting<Boolean> lockYaw = sgGeneral.add(new BoolSetting.Builder()
-            .name("Lock Yaw")
+            .name("lock-yaw")
             .description("Whether to lock your yaw when bounce is enabled.")
             .defaultValue(false)
             .visible(bounce::get)
             .build()
     );
 
     private final Setting<Boolean> useCustomYaw = sgGeneral.add(new BoolSetting.Builder()
-            .name("Use Custom Yaw")
-            .description("Enable this if you want to use a yaw that isn't a factor of 45.")
+            .name("use-custom-yaw")
+            .description("Enable this if you want to use a yaw that isn't a factor of 45. WARNING: This effects the baritone goal for obstacle passer, " +
+                    "use the default Rotations module if you only want a different yawlock.")
             .defaultValue(false)
             .visible(bounce::get)
             .build()
     );
 
     private final Setting<Double> yaw = sgGeneral.add(new DoubleSetting.Builder()
-            .name("Yaw")
-            .description("The yaw to set when bounce is enabled. This is auto set to the closest 45 deg angle to you unless Use Custom Yaw is enabled.")
+            .name("yaw")
+            .description("The yaw to set when bounce is enabled. This is auto set to the closest 45 deg angle to you unless Use Custom Yaw is enabled. " +
+                    "WARNING: This effects the baritone goal for obstacle passer, use the default Rotations module if you only want a different yawlock.")
             .defaultValue(0.0)
             .sliderRange(0, 359)
             .visible(() -> bounce.get() && useCustomYaw.get())
             .build()
     );
 
     private final Setting<Boolean> highwayObstaclePasser = sgObstaclePasser.add(new BoolSetting.Builder()
-            .name("Highway Obstacle Passer")
+            .name("highway-obstacle-passer")
             .description("Uses baritone to pass obstacles.")
             .defaultValue(false)
             .visible(bounce::get)
             .build()
     );
 
     private final Setting<Boolean> useCustomStartPos = sgObstaclePasser.add(new BoolSetting.Builder()
-            .name("Use Custom Start Position")
+            .name("use-custom-start-position")
             .description("Enable and set this ONLY if you are on a ringroad or don't want to be locked to a highway. Otherwise (0, 0) is the start position and will be automatically used.")
             .defaultValue(false)
             .visible(() -> bounce.get() && highwayObstaclePasser.get())
             .build()
     );
-
-    private final Setting<BlockPos> startPos = sgObstaclePasser.add(new BlockPosSetting.Builder()
-            .name("Start Position")
-            .description("The start position to use when using a custom start position.")
-            .defaultValue(new BlockPos(0, 0, 0))
-            .visible(() -> bounce.get() && highwayObstaclePasser.get() && useCustomStartPos.get())
-            .build()
-    );
-
     private final Setting<Boolean> awayFromStartPos = sgObstaclePasser.add(new BoolSetting.Builder()
-            .name("Away From Start Position")
+            .name("away-from-start-position")
             .description("If true, will go away from the start position instead of towards it. The start pos is (0,0) if it is not set to a custom start pos.")
             .defaultValue(true)
             .visible(() -> bounce.get() && highwayObstaclePasser.get())
             .build()
     );
-
     private final Setting<Double> distance = sgObstaclePasser.add(new DoubleSetting.Builder()
-            .name("Distance")
+            .name("distance")
             .description("The distance to set the baritone goal for path realignment.")
             .defaultValue(10.0)
             .visible(() -> bounce.get() && highwayObstaclePasser.get())
             .build()
     );
-
     private final Setting<Integer> targetY = sgObstaclePasser.add(new IntSetting.Builder()
-            .name("Y Level")
+            .name("y-level")
             .description("The Y level to bounce at. This must be correct or bounce will not start properly.")
             .defaultValue(120)
             .visible(() -> bounce.get() && highwayObstaclePasser.get())
             .build()
     );
-
+    private final Setting<BlockPos> startPos = sgObstaclePasser.add(new BlockPosSetting.Builder()
+            .name("start-position")
+            .description("The start position to use when using a custom start position.")
+            .defaultValue(new BlockPos(0, 0, 0))
+            .visible(() -> bounce.get() && highwayObstaclePasser.get() && useCustomStartPos.get())
+            .onChanged(pos -> this.targetY.set(pos.getY()))
+            .build()
+    );
     private final Setting<Boolean> avoidPortalTraps = sgObstaclePasser.add(new BoolSetting.Builder()
-            .name("Avoid Portal Traps")
+            .name("avoid-portal-traps")
             .description("Will attempt to detect portal traps on chunk load and avoid them.")
             .defaultValue(false)
             .visible(() -> bounce.get() && highwayObstaclePasser.get())
             .build()
     );
 
     private final Setting<Double> portalAvoidDistance = sgObstaclePasser.add(new DoubleSetting.Builder()
-            .name("Portal Avoid Distance")
+            .name("portal-avoid-distance")
             .description("The distance to a portal trap where the obstacle passer will takeover and go around it.")
             .defaultValue(20)
             .min(0)
@@ -185,7 +191,7 @@ public class ElytraFlyPlusPlus extends Module {
     );
 
     private final Setting<Integer> portalScanWidth = sgObstaclePasser.add(new IntSetting.Builder()
-            .name("Portal Scan Width")
+            .name("portal-scan-width")
             .description("The width on the axis of the highway that will be scanned for portal traps.")
             .defaultValue(5)
             .min(3)
@@ -195,14 +201,14 @@ public class ElytraFlyPlusPlus extends Module {
     );
 
     private final Setting<Boolean> fakeFly = sgGeneral.add(new BoolSetting.Builder()
-            .name("Chestplate / Fakefly")
+            .name("chestplate-fakefly")
             .description("Lets you fly using a chestplate to use almost 0 elytra durability. Must have elytra in hotbar.")
             .defaultValue(false)
             .build()
     );
 
     private final Setting<Boolean> toggleElytra = sgGeneral.add(new BoolSetting.Builder()
-            .name("Toggle Elytra")
+            .name("toggle-elytra")
             .description("Equips an elytra on activate, and a chestplate on deactivate.")
             .defaultValue(false)
             .visible(() -> !fakeFly.get())
@@ -226,7 +232,7 @@ public class ElytraFlyPlusPlus extends Module {
 
     public ElytraFlyPlusPlus() {
         super(
-                PathSeeker.Utility,
+                PathSeeker.Hunting,
                 "ElytraFlyPlusPlus",
                 "Elytra fly with some more features."
         );
@@ -290,6 +296,8 @@ private void onPlayerMove(PlayerMoveEvent event) {
         if (mc.player == null || event.type != MovementType.SELF || !enabled() || !motionYBoost.get() || !bounce.get())
             return;
 
+        if (onlyWhileColliding.get() && !mc.player.horizontalCollision) return;
+
         if (lastPos != null) {
             double speedBps = mc.player.getPos().subtract(lastPos).multiply(20, 0, 20).length();
 
@@ -364,7 +372,7 @@ private void onTick(TickEvent.Pre event) {
             }
 
             if (highwayObstaclePasser.get() && mc.player.getPos().length() > 100 && // > 100 check needed bc server sends queue coordinates when joining in first tick causing goal coordinates to be set to (0, 0)
-                    (mc.player.getY() < targetY.get() || mc.player.getY() > targetY.get() + 2 || mc.player.horizontalCollision // collisions / out of highway
+                    (mc.player.getY() < targetY.get() || mc.player.getY() > targetY.get() + 2 || (mc.player.horizontalCollision && !mc.player.collidedSoftly) // collisions / out of highway
                             || (portalTrap != null && portalTrap.getSquaredDistance(mc.player.getBlockPos()) < portalAvoidDistance.get() * portalAvoidDistance.get()) // portal trap detection
                             || waitingForChunksToLoad // waiting for chunks to load
                             || stuckTimer > 50)) {
@@ -460,6 +468,7 @@ private void doGrimEflyStuff() {
 
     @EventHandler
     private void onPlaySound(PlaySoundEvent event) {
+        if (!fakeFly.get()) return;
         List<Identifier> armorEquipSounds = List.of(
                 Identifier.of("minecraft:item.armor.equip_generic"),
                 Identifier.of("minecraft:item.armor.equip_netherite"),
@@ -507,8 +516,8 @@ private void sendSwapPacket(Int2ObjectMap<ItemStack> changedSlots, int buttonNum
         mc.player.networkHandler.sendPacket(new ClickSlotC2SPacket(
                 syncId,
                 stateId,
-                6,                 // slotNum
-                buttonNum,   // the slot number thats being swapped
+                6,
+                buttonNum,
                 SlotActionType.SWAP,
                 new ItemStack(Items.AIR),
                 changedSlots