Merge branch '1.18.x/main' into 1.19.2/main

Author: millennIumAMbiguity

changelogs/1.5.4-beta.1.md

@@ -0,0 +1,16 @@
+# 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.
+# Changes
+  * Remove duplicate linearBaseSpeed config. [13c5899](https://github.com/ValkyrienSkies/Eureka/commit/13c5899e305346046a293e82a852e95934038b59)
+    * `baseSpeed` was removed.
+    * `linearCasualSpeed` was renamed to `linearBaseSpeed` to make it clearer.
+  * Floater buoyancy changes [38e7940](https://github.com/ValkyrienSkies/Eureka/commit/38e79406cad6ae1436ccf8bcddfcaf0489531506)
+    * Renamed `floaterBuoyantFactorPerKg` to `floaterBuoyantLift`, set its default value to `2000` from `3333` (scaled), and removed a "divide by 15" instruction from it.
+    * Default `maxFloaterBuoyantFactor` changed from `1.0` to `0.1`
+  * Allow seats to be 0.5 blocks below the helm. [99f5ce0](https://github.com/ValkyrienSkies/Eureka/commit/99f5ce0081cd239af680ac66b83e8bc52fa4f608)
+# Fixes
+  * Fixed maxBalloonsPerEngine not working while player is on helm. [13c5899](https://github.com/ValkyrienSkies/Eureka/commit/13c5899e305346046a293e82a852e95934038b59)
+  * Fixed mod-icon missing from fabric [5f50e26](https://github.com/ValkyrienSkies/Eureka/commit/5f50e260f997f0ff96d5ad59b30306d60af136b4)

common/src/main/java/org/valkyrienskies/eureka/mixin/client/PlayerEntityModelMixin.java

@@ -29,7 +29,8 @@ public void setupAnim(final T livingEntity,
                           final CallbackInfo info) {
         final Entity vehicle = livingEntity.getVehicle();
         if (vehicle instanceof ShipMountingEntity) {
-            if (vehicle.level.getBlockState(vehicle.blockPosition()).isAir()) {
+            var pos = vehicle.position();
+            if (Math.abs((pos.x + .5) % 1.0) < .05 && Math.abs((pos.z + .5) % 1.0) < .05) {
                 this.riding = false;
             }
         }

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

@@ -59,27 +59,23 @@ object EurekaConfig {
         val engineBoostExponentialPower = 0.000001
 
         @JsonSchema(description = "Max speed of a ship with engines (actual max speed varies with engines and mass.)")
-        val maxSpeedFromEngines = 16.0
+        val maxSpeedFromEngines = 12.0
 
         @JsonSchema(description = "Max reverse speed of a ship with engines")
-        val maxReverseSpeedFromEngines = 8.0
+        val maxReverseSpeedFromEngines = 5.0
 
         @JsonSchema(description = "The speed at which the ship stabilizes")
         var stabilizationSpeed = 10.0
 
-        @JsonSchema(description = "The amount extra that each floater will make the ship float, per kg mass")
-        var floaterBuoyantFactorPerKg = 50_000.0
+        @JsonSchema(description = "How how much force is Kg each floater supports")
+        var floaterBuoyantLift = 2_000.0
 
         @JsonSchema(description = "The maximum amount extra each floater will multiply the buoyant force by, irrespective of mass")
-        var maxFloaterBuoyantFactor = 1.0
+        var maxFloaterBuoyantFactor = 0.1
 
         @JsonSchema(description = "how much the mass decreases the speed.")
         var speedMassScale = 1.0
 
-        // The velocity any ship at least can move at.
-        @JsonSchema(description = "The speed a ship with no engines can move at")
-        var baseSpeed = 3.0
-
         // Sensitivity of the up/down impulse buttons.
         // TODO maybe should be moved to VS2 client-side config?
         @JsonSchema(description = "Vertical sensitivity when ascending")
@@ -95,6 +91,15 @@ object EurekaConfig {
         @JsonSchema(description = "Ascend and descend acceleration")
         var elevationSnappiness = 1.0
 
+        @JsonSchema(description = "Allows ships without a helm (passive ships) to use floaters and balloons")
+        var AllowFloatersAndBalloonsOnNonEurekaShips = true
+
+        @JsonSchema(description = "The height where balloons starts to loose effectiveness on ships without a helm")
+        var PassiveBallonMinHeight = 64.0
+
+        @JsonSchema(description = "The height where balloons effectiveness is zero on ships without a helm")
+        var PassiveBallonMaxHeight = 400.0
+
         // Allow Eureka controlled ships to be affected by fluid drag
         @JsonSchema(description = "Allow Eureka controlled ships to be affected by fluid drag")
         var doFluidDrag = false
@@ -141,12 +146,12 @@ object EurekaConfig {
         @JsonSchema(description = "Base mass for linear acceleration in Kg.")
         var linearBaseMass = 50.0
 
-        //when value is same as linearMaxMass, actual value will be 1/3. actual value will be close to linearMaxMass when 5 times over
-        @JsonSchema(description = "Max smoothing value, will smooth out before reaching max value.")
+        // when value is same as linearMaxMass. actual value will be close to linearMaxMass when 5 times over
+        @JsonSchema(description = "Max mass for the linear stabilisation, will smooth out before reaching max value.")
         var linearMaxMass = 10000.0
 
         @JsonSchema(description = "Max unscaled speed in m/s without engines.")
-        var linearCasualSpeed = 3.0
+        var linearBaseSpeed = 3.0
 
         // Anti-velocity mass relevance when stopping the ship
         // Max 10.0 (means no mass irrelevance)

common/src/main/kotlin/org/valkyrienskies/eureka/block/ShipHelmBlock.kt

@@ -30,7 +30,7 @@ import org.valkyrienskies.eureka.blockentity.ShipHelmBlockEntity
 import org.valkyrienskies.eureka.ship.EurekaShipControl
 import org.valkyrienskies.eureka.util.DirectionalShape
 import org.valkyrienskies.eureka.util.RotShapes
-import org.valkyrienskies.mod.common.ValkyrienSkiesMod
+import org.valkyrienskies.mod.common.entity.ShipMountingEntity
 import org.valkyrienskies.mod.common.getShipManagingPos
 import org.valkyrienskies.mod.common.getShipObjectManagingPos
 import java.awt.TextComponent
@@ -63,7 +63,7 @@ class ShipHelmBlock(properties: Properties, val woodType: IWoodType) : BaseEntit
 
         level.getShipManagingPos(pos)?.getAttachment<EurekaShipControl>()?.let { control ->
 
-            if (control.helms <= 1 && control.seatedPlayer?.vehicle?.type == ValkyrienSkiesMod.SHIP_MOUNTING_ENTITY_TYPE) {
+            if (control.helms <= 1 && control.seatedPlayer?.vehicle is ShipMountingEntity) {
                 control.seatedPlayer!!.unRide()
                 control.seatedPlayer = null
             }

common/src/main/kotlin/org/valkyrienskies/eureka/blockentity/ShipHelmBlockEntity.kt

@@ -19,6 +19,7 @@ import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING
 import net.minecraft.world.level.block.state.properties.Half
+import net.minecraft.world.phys.Vec3
 import org.joml.Vector3d
 import org.joml.Vector3dc
 import org.valkyrienskies.core.api.ships.ServerShip
@@ -62,20 +63,36 @@ class ShipHelmBlockEntity(pos: BlockPos, state: BlockState) :
     fun spawnSeat(blockPos: BlockPos, state: BlockState, level: ServerLevel): ShipMountingEntity {
         val newPos = blockPos.relative(state.getValue(HorizontalDirectionalBlock.FACING))
         val newState = level.getBlockState(newPos)
-        val newShape = newState.getShape(level, newPos)
-        val newBlock = newState.block
-        var height = 0.5
+        var height = 0.0
         if (!newState.isAir) {
             height = if (
-                newBlock is StairBlock &&
+                newState.block is StairBlock &&
                 (!newState.hasProperty(StairBlock.HALF) || newState.getValue(StairBlock.HALF) == Half.BOTTOM)
             )
                 0.5 // Valid StairBlock
             else
-                newShape.max(Axis.Y)
+                newState.getShape(level, newPos).max(Axis.Y)
+        } else {
+            val stateBelow = level.getBlockState(BlockPos(newPos.x, newPos.y - 1, newPos.z))
+
+            // If block below expected seat is valid slab or stair, move seat down one block
+            val shapeHeight = stateBelow.getShape(level, newPos).max(Axis.Y)
+            // if block is slab or higher
+            if (shapeHeight >= 0.5 && shapeHeight < 1.0) {
+                height = shapeHeight - 1.0
+            }
         }
+
         val entity = ValkyrienSkiesMod.SHIP_MOUNTING_ENTITY_TYPE.create(level)!!.apply {
-            val seatEntityPos: Vector3dc = Vector3d(newPos.x + .5, (newPos.y - .5) + height, newPos.z + .5)
+
+            val offset =
+                if (height > 0.15)
+                    // when seated, place player 0.1m closer to helm
+                    state.getValue(HorizontalDirectionalBlock.FACING).normal.toDoubles().scale(-0.1).add(.5, height - .5, .5)
+                else
+                    Vec3(.5, height + 0.1, .5)
+
+            val seatEntityPos: Vector3dc = Vector3d(newPos.x + offset.x, newPos.y + offset.y, newPos.z + offset.z)
             moveTo(seatEntityPos.x(), seatEntityPos.y(), seatEntityPos.z())
 
             lookAt(

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

@@ -86,6 +86,21 @@ class EurekaShipControl : ShipForcesInducer, ServerTickListener {
         if (helms < 1) {
             // Enable fluid drag if all the helms have been destroyed
             physShip.doFluidDrag = true
+
+            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 = min(balloonForce, max(getIdealUpwardForce(EurekaConfig.SERVER.balloonElevationMaxSpeed, velY, mass), 0.0))
+                physShip.applyInvariantForce(Vector3d(0.0, balloonForce, 0.0))
+
+                physShip.buoyantFactor = getFloaterFactor(mass)
+            }
+
             return
         }
         // Disable fluid drag when helms are present, because it makes ships hard to drive
@@ -96,21 +111,8 @@ class EurekaShipControl : ShipForcesInducer, ServerTickListener {
         val moiTensor = physShip.momentOfInertia
         val omega: Vector3dc = physShip.omega
         val vel: Vector3dc = physShip.velocity
-        var balloonForceProvided = balloons * forcePerBalloon
 
-        if (EurekaConfig.SERVER.maxBalloonsPerEngine > 0) {
-            balloonForceProvided *= min(
-                1.0,
-                ( extraForceLinear * EurekaConfig.SERVER.maxBalloonsPerEngine ) / ( EurekaConfig.SERVER.enginePowerLinear * balloons )
-            )
-        }
-
-        val buoyantFactorPerFloater = min(
-            EurekaConfig.SERVER.floaterBuoyantFactorPerKg / 15.0 / mass,
-            EurekaConfig.SERVER.maxFloaterBuoyantFactor
-        )
-
-        physShip.buoyantFactor = 1.0 + floaters * buoyantFactorPerFloater
+        physShip.buoyantFactor = getFloaterFactor(mass)
 
         // region Aligning
 
@@ -189,12 +191,8 @@ class EurekaShipControl : ShipForcesInducer, ServerTickListener {
             idealUpwardVel = getPlayerUpwardVel(control, mass)
         }
 
-        // region Elevation
-        val idealUpwardForce = (idealUpwardVel.y() - vel.y() - (GRAVITY / EurekaConfig.SERVER.elevationSnappiness)) *
-                mass * EurekaConfig.SERVER.elevationSnappiness
-
         physShip.applyInvariantForce(Vector3d(0.0,
-            min(balloonForceProvided, max(idealUpwardForce, 0.0)) +
+            min(getBalloonForce(), max(getIdealUpwardForce(idealUpwardVel.y(), vel.y(), mass), 0.0)) +
             // Add drag to the y-component
             vel.y() * -mass,
             0.0)
@@ -204,6 +202,30 @@ class EurekaShipControl : ShipForcesInducer, ServerTickListener {
         physShip.isStatic = anchored
     }
 
+    private fun getBalloonForce(): Double {
+        // Disable if maxBalloonsPerEngine <= 0
+        if (EurekaConfig.SERVER.maxBalloonsPerEngine > 0) {
+            // remove power from unpowered balloons
+            return balloons * forcePerBalloon * min(
+                1.0,
+                // (currentTotalEnginePower * maxBalloonsPerEngine) / (enginePowerAtMaxHeat * balloonsCount)
+                ( extraForceLinear * EurekaConfig.SERVER.maxBalloonsPerEngine ) / ( EurekaConfig.SERVER.enginePowerLinear * balloons )
+            )
+        }
+        return balloons * forcePerBalloon
+    }
+
+    private fun getFloaterFactor(mass: Double): Double {
+        return 1.0 + floaters * min(
+            EurekaConfig.SERVER.floaterBuoyantLift / mass,
+            EurekaConfig.SERVER.maxFloaterBuoyantFactor
+        )
+    }
+
+    private fun getIdealUpwardForce(idealUpwardVelY: Double, velY: Double, mass: Double): Double {
+        return (idealUpwardVelY - velY - (GRAVITY / EurekaConfig.SERVER.elevationSnappiness)) * mass * EurekaConfig.SERVER.elevationSnappiness
+    }
+
     private fun getControlData(player: SeatedControllingPlayer): ControlData {
 
         val currentControlData = ControlData.create(player)
@@ -300,28 +322,26 @@ class EurekaShipControl : ShipForcesInducer, ServerTickListener {
         )
 
         oldSpeed = oldSpeed * (1 - s) + control.forwardImpulse.toDouble() * s // from -1 to 1.
-        var speed = oldSpeed * EurekaConfig.SERVER.linearCasualSpeed / 3 // 1 unit -> 3m/s
+        var speed = oldSpeed * EurekaConfig.SERVER.linearBaseSpeed
 
         if (extraForceLinear != 0.0) {
             // engine boost
-            val boost = max((extraForceLinear - EurekaConfig.SERVER.enginePowerLinear * EurekaConfig.SERVER.engineBoostOffset) * EurekaConfig.SERVER.engineBoost, 0.0)
-            extraForceLinear += boost + boost * boost * EurekaConfig.SERVER.engineBoostExponentialPower
-            extraForceLinear /= scaledMass
+            var boost = max((extraForceLinear - EurekaConfig.SERVER.enginePowerLinear * EurekaConfig.SERVER.engineBoostOffset) * EurekaConfig.SERVER.engineBoost, 0.0)
+            boost = extraForceLinear + boost + boost * boost * EurekaConfig.SERVER.engineBoostExponentialPower
+            boost /= scaledMass
 
             speed += if (speed < 0) {
-                smoothingATanMax(EurekaConfig.SERVER.maxReverseSpeedFromEngines, extraForceLinear * oldSpeed)
+                smoothingATanMax(EurekaConfig.SERVER.maxReverseSpeedFromEngines, boost * oldSpeed)
             } else {
-                smoothingATanMax(EurekaConfig.SERVER.maxSpeedFromEngines, extraForceLinear * oldSpeed)
+                smoothingATanMax(EurekaConfig.SERVER.maxSpeedFromEngines, boost * oldSpeed)
             }
         }
 
-        forwardVector.mul(speed)
-
         val playerUpDirection = physShip.transform.shipToWorldRotation.transform(Vector3d(0.0, 1.0, 0.0))
         val velOrthogonalToPlayerUp = vel.sub(playerUpDirection.mul(playerUpDirection.dot(vel)), Vector3d())
 
         // This is the speed that the ship is always allowed to go out, without engines
-        val baseForwardVel = forwardVector.mul(EurekaConfig.SERVER.baseSpeed)
+        val baseForwardVel = forwardVector.mul(speed)
         val forwardForce = baseForwardVel.sub(velOrthogonalToPlayerUp).mul(scaledMass)
 
         return forwardForce

forge/src/main/resources/icon.png common/src/main/resources/icon.pngforge/src/main/resources/icon.png renamed to common/src/main/resources/icon.png

@@ -21,7 +21,7 @@
     "issues": "https://github.com/ValkyrienSkies/Eureka/issues"
   },
   "license": "Apache-2.0",
-  "icon": "assets/vs_eureka/icon.png",
+  "icon": "icon.png",
   "environment": "*",
   "entrypoints": {
     "main": [

fabric/src/main/resources/fabric.mod.json

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=1G
 # Identity
 mod_name=eureka
 mod_id=vs_eureka
-eureka_version=1.5.3-beta.2
+eureka_version=1.5.4-beta.2
 enabled_platforms=fabric,forge
 archives_base_name=eureka-1192
 maven_group=org.valkyrienskies