-- This is where the backportable changes start!

enjarai · May 12, 2024 · 537e91c · 537e91c
1 parent 1b1ecdf
commit 537e91c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/common/src/main/java/nl/enjarai/doabarrelroll/compat/yacl/YACLImplementation.java b/common/src/main/java/nl/enjarai/doabarrelroll/compat/yacl/YACLImplementation.java
@@ -104,7 +104,10 @@ public static Screen generateConfigScreen(Screen parent) {
                         .group(OptionGroup.createBuilder()
                                 .name(getText("thrust"))
                                 .collapsed(true)
-                                .option(thrustingAllowed.add(getBooleanOption("thrust", "enable_thrust", true, false)
+                                .option(thrustingAllowed.add(getBooleanOption("thrust", "enable_thrust", false, false)
+                                        .description(OptionDescription.of(Text.translatable(
+                                                "config.do_a_barrel_roll.thrust.enable_thrust.description",
+                                                ModKeybindings.THRUST_FORWARD.getBoundKeyLocalizedText())))
                                         .binding(false, () -> ModConfig.INSTANCE.getEnableThrustClient(), value -> ModConfig.INSTANCE.setEnableThrust(value))))
                                 .option(thrustingAllowed.add(getOption(Double.class, "thrust", "max_thrust", true, false)
                                         .controller(option -> getDoubleSlider(option, 0.1, 10.0, 0.1))

diff --git a/common/src/main/resources/assets/do_a_barrel_roll/lang/en_us.yml b/common/src/main/resources/assets/do_a_barrel_roll/lang/en_us.yml
@@ -74,18 +74,18 @@ config.do_a_barrel_roll:
     .: Thrusting Options
     enable_thrust: Enable Thrusting
     enable_thrust.description: >
-      Enables you to use the forward and back keys (W and S by default) 
-      to infinitely accelerate and decelerate respectively.
+      Enables you to use the %1$s key
+      to infinitely accelerate while flying with an Elytra.
       
       §4This feature is disabled on any server that does not explicitly allow it.
     max_thrust: Max Thrusting Speed
     max_thrust.description: >
-      The maximum speed that can be reached by thrusting. 
+      The maximum speed that can be reached by thrusting in blocks per tick. 
       Setting this to anything above 2-3 might cause
       problems with chunks not loading fast enough.
     thrust_acceleration: Thrusting Acceleration
     thrust_acceleration.description: >
-      The acceleration of thrusting. 
+      The acceleration of thrusting in blocks per tick squared. 
       Higher values will make it easier to reach max speed.
     thrust_particles: Show Thrusting Particles
   misc: