Merge branch '1.19.2/main' into 1.20.1/main

Author: millennIumAMbiguity

changelogs/1.5.4-beta.1.md

@@ -1,8 +1,8 @@
 # Additions
   * Allow floaters and balloons on non eureka ships to function. [95eabc9](https://github.com/ValkyrienSkies/Eureka/commit/95eabc914f2463bec933ae00f196dcd70152d197)
-    * Added config `AllowFloatersAndBalloonsOnNonEurekaShips` default value true.
-    * Added config `PassiveBallonMinHeight` default value 64.
-    * Added config `PassiveBallonMaxHeight ` default value 400.
+    * Added config `allowFloatersAndBalloonsOnNonEurekaShips` default value true.
+    * Added config `passiveBalloonMinHeight` default value 64.
+    * Added config `passiveBalloonMaxHeight ` default value 400.
 # Changes
   * Remove duplicate linearBaseSpeed config. [13c5899](https://github.com/ValkyrienSkies/Eureka/commit/13c5899e305346046a293e82a852e95934038b59)
     * `baseSpeed` was removed.

common/src/main/kotlin/org/valkyrienskies/eureka/EurekaConfig.kt

@@ -92,13 +92,13 @@ object EurekaConfig {
         var elevationSnappiness = 1.0
 
         @JsonSchema(description = "Allows ships without a helm (passive ships) to use floaters and balloons")
-        var AllowFloatersAndBalloonsOnNonEurekaShips = true
+        var allowFloatersAndBalloonsOnNonEurekaShips = true
 
         @JsonSchema(description = "The height where balloons starts to loose effectiveness on ships without a helm")
-        var PassiveBallonMinHeight = 64.0
+        var passiveBalloonMinHeight = 64.0
 
         @JsonSchema(description = "The height where balloons effectiveness is zero on ships without a helm")
-        var PassiveBallonMaxHeight = 400.0
+        var passiveBalloonMaxHeight = 400.0
 
         // Allow Eureka controlled ships to be affected by fluid drag
         @JsonSchema(description = "Allow Eureka controlled ships to be affected by fluid drag")

common/src/main/kotlin/org/valkyrienskies/eureka/ship/EurekaShipControl.kt

@@ -87,14 +87,14 @@ class EurekaShipControl : ShipForcesInducer, ServerTickListener {
             // Enable fluid drag if all the helms have been destroyed
             physShip.doFluidDrag = true
 
-            if (EurekaConfig.SERVER.AllowFloatersAndBalloonsOnNonEurekaShips) {
+            if (EurekaConfig.SERVER.allowFloatersAndBalloonsOnNonEurekaShips) {
                 val mass = physShip.mass
                 val velY = physShip.velocity.y()
 
                 var balloonForce = getBalloonForce()
                 // balloon force 100% at y 100, 0% at y 320
                 // the "velY * 10" reduces bobbing by sampling the height position in the future
-                balloonForce *= 1 - Math.clamp(0.0, 1.0, (physShip.transform.positionInWorld.y() + velY * 10 - EurekaConfig.SERVER.PassiveBallonMinHeight) / (EurekaConfig.SERVER.PassiveBallonMaxHeight - EurekaConfig.SERVER.PassiveBallonMinHeight))
+                balloonForce *= 1 - Math.clamp(0.0, 1.0, (physShip.transform.positionInWorld.y() + velY * 10 - EurekaConfig.SERVER.passiveBalloonMinHeight) / (EurekaConfig.SERVER.passiveBalloonMaxHeight - EurekaConfig.SERVER.passiveBalloonMinHeight))
                 balloonForce = min(balloonForce, max(getIdealUpwardForce(EurekaConfig.SERVER.balloonElevationMaxSpeed, velY, mass), 0.0))
                 physShip.applyInvariantForce(Vector3d(0.0, balloonForce, 0.0))