diff --git a/common/src/main/kotlin/io/github/xiewuzhiying/vs_addition/VSAdditionConfig.kt b/common/src/main/kotlin/io/github/xiewuzhiying/vs_addition/VSAdditionConfig.kt index 8e7fec42..174c9786 100644 --- a/common/src/main/kotlin/io/github/xiewuzhiying/vs_addition/VSAdditionConfig.kt +++ b/common/src/main/kotlin/io/github/xiewuzhiying/vs_addition/VSAdditionConfig.kt @@ -70,10 +70,10 @@ object VSAdditionConfig { class CREATE { @JsonSchema(description = "Compliance of sticker's constraints") - var stickerCompliance : Double = 1e-128 + var stickerCompliance : Double = 1e-10 @JsonSchema(description = "Max Force of sticker's constraints") - var stickerMaxForce : Double = 1e300 + var stickerMaxForce : Double = 1e10 @JsonSchema(description = "Enable encased fan to work between ships") var encasedFanMixin : Boolean = false diff --git a/common/src/main/kotlin/io/github/xiewuzhiying/vs_addition/compats/create/content/contraptions/chassis/sticker/StickerConstraintManager.kt b/common/src/main/kotlin/io/github/xiewuzhiying/vs_addition/compats/create/content/contraptions/chassis/sticker/StickerConstraintManager.kt index 14a54f57..dfd94428 100644 --- a/common/src/main/kotlin/io/github/xiewuzhiying/vs_addition/compats/create/content/contraptions/chassis/sticker/StickerConstraintManager.kt +++ b/common/src/main/kotlin/io/github/xiewuzhiying/vs_addition/compats/create/content/contraptions/chassis/sticker/StickerConstraintManager.kt @@ -1,5 +1,6 @@ package io.github.xiewuzhiying.vs_addition.compats.create.content.contraptions.chassis.sticker +import io.github.xiewuzhiying.vs_addition.VSAdditionConfig import io.github.xiewuzhiying.vs_addition.context.constraint.ConstraintGroup import io.github.xiewuzhiying.vs_addition.context.constraint.ConstraintManager import io.github.xiewuzhiying.vs_addition.networking.create.sticker.StickerSoundPacketS2CPacket @@ -66,13 +67,16 @@ open class StickerConstraintManager(val level: ServerLevel, val ship: ServerShip } } - val attachmentConstraint = VSAttachmentConstraint(bodyId!!, otherId, 1e-10, localPos0, localPos1, 1e10, 0.0) + val compliance = VSAdditionConfig.SERVER.create.stickerCompliance + val maxForce = VSAdditionConfig.SERVER.create.stickerMaxForce + + val attachmentConstraint = VSAttachmentConstraint(bodyId!!, otherId, compliance, localPos0, localPos1, maxForce, 0.0) val fixOrientationConstraint = VSFixedOrientationConstraint( - bodyId!!, otherId, 1e-10, + bodyId!!, otherId, compliance, (ship?.transform?.shipToWorldRotation ?: Quaterniond()).invert(Quaterniond()), (otherShip?.transform?.shipToWorldRotation ?: Quaterniond()).invert(Quaterniond()), - 1e10 + maxForce, ) this.addConstraintGroup(StickerConstraintGroup(this.createConstraint(attachmentConstraint) ?: return@transformFromWorldToNearbyLoadedShipsAndWorld, this.createConstraint(fixOrientationConstraint) ?: return@transformFromWorldToNearbyLoadedShipsAndWorld, pos.toBlockPos))