From fa3ed1b5e5475ccbc639ae2aee3a55fe2cb6c2a0 Mon Sep 17 00:00:00 2001 From: TheLMiffy1111 <6522061+TheLMiffy1111@users.noreply.github.com> Date: Tue, 5 May 2026 03:09:04 +0800 Subject: [PATCH 1/3] Allow joints to be added on arbitrary rigidbodies --- .../sable/api/physics/PhysicsPipeline.java | 11 ++++++++++ .../impl/rapier/RapierPhysicsPipeline.java | 20 +++++++++---------- .../fixed/RapierFixedConstraintHandle.java | 8 ++++---- .../free/RapierFreeConstraintHandle.java | 8 ++++---- .../RapierGenericConstraintHandle.java | 8 ++++---- .../rotary/RapierRotaryConstraintHandle.java | 8 ++++---- common/src/main/rust/rapier/src/joints.rs | 16 +++++++++++---- 7 files changed, 49 insertions(+), 30 deletions(-) diff --git a/common/src/main/java/dev/ryanhcode/sable/api/physics/PhysicsPipeline.java b/common/src/main/java/dev/ryanhcode/sable/api/physics/PhysicsPipeline.java index c51e8b35..7564a803 100644 --- a/common/src/main/java/dev/ryanhcode/sable/api/physics/PhysicsPipeline.java +++ b/common/src/main/java/dev/ryanhcode/sable/api/physics/PhysicsPipeline.java @@ -221,6 +221,17 @@ default Vector3d getAngularVelocity(final PhysicsPipelineBody body, final Vector * @param configuration the configuration of the constraint */ default T addConstraint(@Nullable final ServerSubLevel sublevelA, @Nullable final ServerSubLevel sublevelB, final PhysicsConstraintConfiguration configuration) { + return this.addConstraint((PhysicsPipelineBody)sublevelA, sublevelB, configuration); + } + + /** + * Adds a constraint to the engine, returning its handle + * + * @param rigidbodyA the first rigid-body to constrain, or null to constrain the second rigid-body to the world + * @param rigidbodyB the second rigid-body to constrain, or null to constrain the first rigid-body to the world + * @param configuration the configuration of the constraint + */ + default T addConstraint(@Nullable final PhysicsPipelineBody rigidbodyA, @Nullable final PhysicsPipelineBody rigidbodyB, final PhysicsConstraintConfiguration configuration) { throw new UnsupportedOperationException("Not implemented"); } diff --git a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/RapierPhysicsPipeline.java b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/RapierPhysicsPipeline.java index 011e0200..a7b13766 100644 --- a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/RapierPhysicsPipeline.java +++ b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/RapierPhysicsPipeline.java @@ -617,37 +617,37 @@ public void wakeUp(final PhysicsPipelineBody body) { /** * Adds a constraint to the engine, returning its handle * - * @param sublevelA the first sub-level to constrain, or null to constrain the second sub-level to the world - * @param sublevelB the second sub-level to constrain, or null to constrain the first sub-level to the world + * @param rigidbodyA the first body to constrain, or null to constrain the second body to the world + * @param rigidbodyB the second body to constrain, or null to constrain the first body to the world * @param configuration the configuration of the constraint */ @SuppressWarnings("unchecked") @Override - public T addConstraint(@Nullable final ServerSubLevel sublevelA, @Nullable final ServerSubLevel sublevelB, final PhysicsConstraintConfiguration configuration) { - if (sublevelA == null && sublevelB == null) { + public T addConstraint(@Nullable final PhysicsPipelineBody rigidbodyA, @Nullable final PhysicsPipelineBody rigidbodyB, final PhysicsConstraintConfiguration configuration) { + if (rigidbodyA == null && rigidbodyB == null) { Sable.LOGGER.error("Cannot add a constraint between the static world and static world"); return null; } - if (sublevelA == sublevelB) { - Sable.LOGGER.error("Cannot add a constraint between a sub-level and itself"); + if (rigidbodyA == rigidbodyB) { + Sable.LOGGER.error("Cannot add a constraint between a body and itself"); return null; } if (configuration instanceof final RotaryConstraintConfiguration config) { - return (T) RapierRotaryConstraintHandle.create(this.level, sublevelA, sublevelB, config); + return (T) RapierRotaryConstraintHandle.create(this.level, rigidbodyA, rigidbodyB, config); } if (configuration instanceof final FixedConstraintConfiguration config) { - return (T) RapierFixedConstraintHandle.create(this.level, sublevelA, sublevelB, config); + return (T) RapierFixedConstraintHandle.create(this.level, rigidbodyA, rigidbodyB, config); } if (configuration instanceof final FreeConstraintConfiguration config) { - return (T) RapierFreeConstraintHandle.create(this.level, sublevelA, sublevelB, config); + return (T) RapierFreeConstraintHandle.create(this.level, rigidbodyA, rigidbodyB, config); } if (configuration instanceof final GenericConstraintConfiguration config) { - return (T) RapierGenericConstraintHandle.create(this.level, sublevelA, sublevelB, config); + return (T) RapierGenericConstraintHandle.create(this.level, rigidbodyA, rigidbodyB, config); } Sable.LOGGER.error("Unknown constraint configuration type: {}", configuration.getClass().getName()); diff --git a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/fixed/RapierFixedConstraintHandle.java b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/fixed/RapierFixedConstraintHandle.java index 0fbcb28e..436821c3 100644 --- a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/fixed/RapierFixedConstraintHandle.java +++ b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/fixed/RapierFixedConstraintHandle.java @@ -1,10 +1,10 @@ package dev.ryanhcode.sable.physics.impl.rapier.constraint.fixed; +import dev.ryanhcode.sable.api.physics.PhysicsPipelineBody; import dev.ryanhcode.sable.api.physics.constraint.fixed.FixedConstraintConfiguration; import dev.ryanhcode.sable.api.physics.constraint.fixed.FixedConstraintHandle; import dev.ryanhcode.sable.physics.impl.rapier.Rapier3D; import dev.ryanhcode.sable.physics.impl.rapier.constraint.RapierConstraintHandle; -import dev.ryanhcode.sable.sublevel.ServerSubLevel; import net.minecraft.server.level.ServerLevel; import org.jetbrains.annotations.Nullable; @@ -12,13 +12,13 @@ public class RapierFixedConstraintHandle extends RapierConstraintHandle implemen /** * Creates a rapier constraint handle */ - public static RapierFixedConstraintHandle create(final ServerLevel serverLevel, @Nullable final ServerSubLevel sublevelA, @Nullable final ServerSubLevel sublevelB, final FixedConstraintConfiguration config) { + public static RapierFixedConstraintHandle create(final ServerLevel serverLevel, @Nullable final PhysicsPipelineBody rigidbodyA, @Nullable final PhysicsPipelineBody rigidbodyB, final FixedConstraintConfiguration config) { final int sceneID = Rapier3D.getID(serverLevel); final long handle = Rapier3D.addFixedConstraint( sceneID, - sublevelA == null ? -1 : Rapier3D.getID(sublevelA), - sublevelB == null ? -1 : Rapier3D.getID(sublevelB), + rigidbodyA == null ? -1 : Rapier3D.getID(rigidbodyA), + rigidbodyB == null ? -1 : Rapier3D.getID(rigidbodyB), config.pos1().x(), config.pos1().y(), config.pos1().z(), diff --git a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/free/RapierFreeConstraintHandle.java b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/free/RapierFreeConstraintHandle.java index 4bfd6f90..647559a5 100644 --- a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/free/RapierFreeConstraintHandle.java +++ b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/free/RapierFreeConstraintHandle.java @@ -1,10 +1,10 @@ package dev.ryanhcode.sable.physics.impl.rapier.constraint.free; +import dev.ryanhcode.sable.api.physics.PhysicsPipelineBody; import dev.ryanhcode.sable.api.physics.constraint.free.FreeConstraintConfiguration; import dev.ryanhcode.sable.api.physics.constraint.free.FreeConstraintHandle; import dev.ryanhcode.sable.physics.impl.rapier.Rapier3D; import dev.ryanhcode.sable.physics.impl.rapier.constraint.RapierConstraintHandle; -import dev.ryanhcode.sable.sublevel.ServerSubLevel; import net.minecraft.server.level.ServerLevel; import org.jetbrains.annotations.Nullable; @@ -12,13 +12,13 @@ public class RapierFreeConstraintHandle extends RapierConstraintHandle implement /** * Creates a rapier constraint handle */ - public static RapierFreeConstraintHandle create(final ServerLevel serverLevel, @Nullable final ServerSubLevel sublevelA, @Nullable final ServerSubLevel sublevelB, final FreeConstraintConfiguration config) { + public static RapierFreeConstraintHandle create(final ServerLevel serverLevel, @Nullable final PhysicsPipelineBody rigidbodyA, @Nullable final PhysicsPipelineBody rigidbodyB, final FreeConstraintConfiguration config) { final int sceneID = Rapier3D.getID(serverLevel); final long handle = Rapier3D.addFreeConstraint( sceneID, - sublevelA == null ? -1 : Rapier3D.getID(sublevelA), - sublevelB == null ? -1 : Rapier3D.getID(sublevelB), + rigidbodyA == null ? -1 : Rapier3D.getID(rigidbodyA), + rigidbodyB == null ? -1 : Rapier3D.getID(rigidbodyB), config.pos1().x(), config.pos1().y(), config.pos1().z(), diff --git a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/generic/RapierGenericConstraintHandle.java b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/generic/RapierGenericConstraintHandle.java index 24160741..eab3f513 100644 --- a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/generic/RapierGenericConstraintHandle.java +++ b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/generic/RapierGenericConstraintHandle.java @@ -1,11 +1,11 @@ package dev.ryanhcode.sable.physics.impl.rapier.constraint.generic; +import dev.ryanhcode.sable.api.physics.PhysicsPipelineBody; import dev.ryanhcode.sable.api.physics.constraint.ConstraintJointAxis; import dev.ryanhcode.sable.api.physics.constraint.generic.GenericConstraintConfiguration; import dev.ryanhcode.sable.api.physics.constraint.generic.GenericConstraintHandle; import dev.ryanhcode.sable.physics.impl.rapier.Rapier3D; import dev.ryanhcode.sable.physics.impl.rapier.constraint.RapierConstraintHandle; -import dev.ryanhcode.sable.sublevel.ServerSubLevel; import net.minecraft.server.level.ServerLevel; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; @@ -21,7 +21,7 @@ public class RapierGenericConstraintHandle extends RapierConstraintHandle implem /** * Creates a rapier constraint handle */ - public static RapierGenericConstraintHandle create(final ServerLevel serverLevel, @Nullable final ServerSubLevel sublevelA, @Nullable final ServerSubLevel sublevelB, final GenericConstraintConfiguration config) { + public static RapierGenericConstraintHandle create(final ServerLevel serverLevel, @Nullable final PhysicsPipelineBody rigidbodyA, @Nullable final PhysicsPipelineBody rigidbodyB, final GenericConstraintConfiguration config) { final int sceneID = Rapier3D.getID(serverLevel); int lockedAxesMask = 0; @@ -31,8 +31,8 @@ public static RapierGenericConstraintHandle create(final ServerLevel serverLevel final long handle = Rapier3D.addGenericConstraint( sceneID, - sublevelA == null ? -1 : Rapier3D.getID(sublevelA), - sublevelB == null ? -1 : Rapier3D.getID(sublevelB), + rigidbodyA == null ? -1 : Rapier3D.getID(rigidbodyA), + rigidbodyB == null ? -1 : Rapier3D.getID(rigidbodyB), config.pos1().x(), config.pos1().y(), config.pos1().z(), diff --git a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/rotary/RapierRotaryConstraintHandle.java b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/rotary/RapierRotaryConstraintHandle.java index b30563d2..6d17000b 100644 --- a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/rotary/RapierRotaryConstraintHandle.java +++ b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/rotary/RapierRotaryConstraintHandle.java @@ -1,10 +1,10 @@ package dev.ryanhcode.sable.physics.impl.rapier.constraint.rotary; +import dev.ryanhcode.sable.api.physics.PhysicsPipelineBody; import dev.ryanhcode.sable.api.physics.constraint.rotary.RotaryConstraintConfiguration; import dev.ryanhcode.sable.api.physics.constraint.rotary.RotaryConstraintHandle; import dev.ryanhcode.sable.physics.impl.rapier.Rapier3D; import dev.ryanhcode.sable.physics.impl.rapier.constraint.RapierConstraintHandle; -import dev.ryanhcode.sable.sublevel.ServerSubLevel; import net.minecraft.server.level.ServerLevel; import org.jetbrains.annotations.Nullable; @@ -12,13 +12,13 @@ public class RapierRotaryConstraintHandle extends RapierConstraintHandle impleme /** * Creates a rapier constraint handle */ - public static RapierRotaryConstraintHandle create(final ServerLevel serverLevel, @Nullable final ServerSubLevel sublevelA, @Nullable final ServerSubLevel sublevelB, final RotaryConstraintConfiguration config) { + public static RapierRotaryConstraintHandle create(final ServerLevel serverLevel, @Nullable final PhysicsPipelineBody rigidbodyA, @Nullable final PhysicsPipelineBody rigidbodyB, final RotaryConstraintConfiguration config) { final int sceneID = Rapier3D.getID(serverLevel); final long handle = Rapier3D.addRotaryConstraint( sceneID, - sublevelA == null ? -1 : Rapier3D.getID(sublevelA), - sublevelB == null ? -1 : Rapier3D.getID(sublevelB), + rigidbodyA == null ? -1 : Rapier3D.getID(rigidbodyA), + rigidbodyB == null ? -1 : Rapier3D.getID(rigidbodyB), config.pos1().x(), config.pos1().y(), config.pos1().z(), diff --git a/common/src/main/rust/rapier/src/joints.rs b/common/src/main/rust/rapier/src/joints.rs index 71f6a7d5..e1056ffc 100644 --- a/common/src/main/rust/rapier/src/joints.rs +++ b/common/src/main/rust/rapier/src/joints.rs @@ -71,8 +71,12 @@ pub fn tick(scene_id: jint) { } let local_anchor_1 = joint.pos_a - if let Some(id_a) = joint.id_a { - let rb_a = &scene.level_colliders[&id_a]; - rb_a.center_of_mass.unwrap() + if let Some(rb_a) = scene.level_colliders.get(&id_a) { + rb_a.center_of_mass.unwrap() + } + else { + Vector3::new(0.0, 0.0, 0.0) + } } else { Vector3::new(0.0, 0.0, 0.0) }; @@ -90,8 +94,12 @@ pub fn tick(scene_id: jint) { } let local_anchor_2 = joint.pos_b - if let Some(id_b) = joint.id_b { - let rb_b = &scene.level_colliders[&id_b]; - rb_b.center_of_mass.unwrap() + if let Some(rb_b) = scene.level_colliders.get(&id_b) { + rb_b.center_of_mass.unwrap() + } + else { + Vector3::new(0.0, 0.0, 0.0) + } } else { Vector3::new(0.0, 0.0, 0.0) }; From c1d76534ffa4104d7ceaad04372c1f1900686fbc Mon Sep 17 00:00:00 2001 From: TheLMiffy1111 <6522061+TheLMiffy1111@users.noreply.github.com> Date: Tue, 5 May 2026 03:47:02 +0800 Subject: [PATCH 2/3] Change getting joint collider center of mass to functional chain --- common/src/main/rust/rapier/src/joints.rs | 30 ++++++++--------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/common/src/main/rust/rapier/src/joints.rs b/common/src/main/rust/rapier/src/joints.rs index e1056ffc..67d0a72f 100644 --- a/common/src/main/rust/rapier/src/joints.rs +++ b/common/src/main/rust/rapier/src/joints.rs @@ -70,16 +70,11 @@ pub fn tick(scene_id: jint) { )); } let local_anchor_1 = joint.pos_a - - if let Some(id_a) = joint.id_a { - if let Some(rb_a) = scene.level_colliders.get(&id_a) { - rb_a.center_of_mass.unwrap() - } - else { - Vector3::new(0.0, 0.0, 0.0) - } - } else { - Vector3::new(0.0, 0.0, 0.0) - }; + - joint + .id_a + .and_then(|id| scene.level_colliders.get(&id)) + .and_then(|rb| rb.center_of_mass) + .unwrap_or_default(); impulse_joint.data.set_local_anchor1(Vector::new( local_anchor_1.x as Real, local_anchor_1.y as Real, @@ -93,16 +88,11 @@ pub fn tick(scene_id: jint) { )); } let local_anchor_2 = joint.pos_b - - if let Some(id_b) = joint.id_b { - if let Some(rb_b) = scene.level_colliders.get(&id_b) { - rb_b.center_of_mass.unwrap() - } - else { - Vector3::new(0.0, 0.0, 0.0) - } - } else { - Vector3::new(0.0, 0.0, 0.0) - }; + - joint + .id_b + .and_then(|id| scene.level_colliders.get(&id)) + .and_then(|rb| rb.center_of_mass) + .unwrap_or_default(); impulse_joint.data.set_local_anchor2(Vector::new( local_anchor_2.x as Real, local_anchor_2.y as Real, From 70ab60e9c91b8b118cedb118562dfe040dece640 Mon Sep 17 00:00:00 2001 From: TheLMiffy1111 <6522061+TheLMiffy1111@users.noreply.github.com> Date: Wed, 6 May 2026 15:16:27 +0800 Subject: [PATCH 3/3] Update formatting and parameter names --- .../sable/api/physics/PhysicsPipeline.java | 8 ++++---- .../impl/rapier/RapierPhysicsPipeline.java | 20 +++++++++---------- .../fixed/RapierFixedConstraintHandle.java | 6 +++--- .../free/RapierFreeConstraintHandle.java | 6 +++--- .../RapierGenericConstraintHandle.java | 6 +++--- .../rotary/RapierRotaryConstraintHandle.java | 6 +++--- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/common/src/main/java/dev/ryanhcode/sable/api/physics/PhysicsPipeline.java b/common/src/main/java/dev/ryanhcode/sable/api/physics/PhysicsPipeline.java index 7564a803..de729f9f 100644 --- a/common/src/main/java/dev/ryanhcode/sable/api/physics/PhysicsPipeline.java +++ b/common/src/main/java/dev/ryanhcode/sable/api/physics/PhysicsPipeline.java @@ -221,17 +221,17 @@ default Vector3d getAngularVelocity(final PhysicsPipelineBody body, final Vector * @param configuration the configuration of the constraint */ default T addConstraint(@Nullable final ServerSubLevel sublevelA, @Nullable final ServerSubLevel sublevelB, final PhysicsConstraintConfiguration configuration) { - return this.addConstraint((PhysicsPipelineBody)sublevelA, sublevelB, configuration); + return this.addConstraint((PhysicsPipelineBody) sublevelA, sublevelB, configuration); } /** * Adds a constraint to the engine, returning its handle * - * @param rigidbodyA the first rigid-body to constrain, or null to constrain the second rigid-body to the world - * @param rigidbodyB the second rigid-body to constrain, or null to constrain the first rigid-body to the world + * @param bodyA the first rigid-body to constrain, or null to constrain the second rigid-body to the world + * @param bodyB the second rigid-body to constrain, or null to constrain the first rigid-body to the world * @param configuration the configuration of the constraint */ - default T addConstraint(@Nullable final PhysicsPipelineBody rigidbodyA, @Nullable final PhysicsPipelineBody rigidbodyB, final PhysicsConstraintConfiguration configuration) { + default T addConstraint(@Nullable final PhysicsPipelineBody bodyA, @Nullable final PhysicsPipelineBody bodyB, final PhysicsConstraintConfiguration configuration) { throw new UnsupportedOperationException("Not implemented"); } diff --git a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/RapierPhysicsPipeline.java b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/RapierPhysicsPipeline.java index a7b13766..ba6ebe80 100644 --- a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/RapierPhysicsPipeline.java +++ b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/RapierPhysicsPipeline.java @@ -617,37 +617,37 @@ public void wakeUp(final PhysicsPipelineBody body) { /** * Adds a constraint to the engine, returning its handle * - * @param rigidbodyA the first body to constrain, or null to constrain the second body to the world - * @param rigidbodyB the second body to constrain, or null to constrain the first body to the world + * @param bodyA the first rigid-body to constrain, or null to constrain the second rigid-body to the world + * @param bodyB the second rigid-body to constrain, or null to constrain the first rigid-body to the world * @param configuration the configuration of the constraint */ @SuppressWarnings("unchecked") @Override - public T addConstraint(@Nullable final PhysicsPipelineBody rigidbodyA, @Nullable final PhysicsPipelineBody rigidbodyB, final PhysicsConstraintConfiguration configuration) { - if (rigidbodyA == null && rigidbodyB == null) { + public T addConstraint(@Nullable final PhysicsPipelineBody bodyA, @Nullable final PhysicsPipelineBody bodyB, final PhysicsConstraintConfiguration configuration) { + if (bodyA == null && bodyB == null) { Sable.LOGGER.error("Cannot add a constraint between the static world and static world"); return null; } - if (rigidbodyA == rigidbodyB) { - Sable.LOGGER.error("Cannot add a constraint between a body and itself"); + if (bodyA == bodyB) { + Sable.LOGGER.error("Cannot add a constraint between a rigid-body and itself"); return null; } if (configuration instanceof final RotaryConstraintConfiguration config) { - return (T) RapierRotaryConstraintHandle.create(this.level, rigidbodyA, rigidbodyB, config); + return (T) RapierRotaryConstraintHandle.create(this.level, bodyA, bodyB, config); } if (configuration instanceof final FixedConstraintConfiguration config) { - return (T) RapierFixedConstraintHandle.create(this.level, rigidbodyA, rigidbodyB, config); + return (T) RapierFixedConstraintHandle.create(this.level, bodyA, bodyB, config); } if (configuration instanceof final FreeConstraintConfiguration config) { - return (T) RapierFreeConstraintHandle.create(this.level, rigidbodyA, rigidbodyB, config); + return (T) RapierFreeConstraintHandle.create(this.level, bodyA, bodyB, config); } if (configuration instanceof final GenericConstraintConfiguration config) { - return (T) RapierGenericConstraintHandle.create(this.level, rigidbodyA, rigidbodyB, config); + return (T) RapierGenericConstraintHandle.create(this.level, bodyA, bodyB, config); } Sable.LOGGER.error("Unknown constraint configuration type: {}", configuration.getClass().getName()); diff --git a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/fixed/RapierFixedConstraintHandle.java b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/fixed/RapierFixedConstraintHandle.java index 436821c3..46ea248e 100644 --- a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/fixed/RapierFixedConstraintHandle.java +++ b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/fixed/RapierFixedConstraintHandle.java @@ -12,13 +12,13 @@ public class RapierFixedConstraintHandle extends RapierConstraintHandle implemen /** * Creates a rapier constraint handle */ - public static RapierFixedConstraintHandle create(final ServerLevel serverLevel, @Nullable final PhysicsPipelineBody rigidbodyA, @Nullable final PhysicsPipelineBody rigidbodyB, final FixedConstraintConfiguration config) { + public static RapierFixedConstraintHandle create(final ServerLevel serverLevel, @Nullable final PhysicsPipelineBody bodyA, @Nullable final PhysicsPipelineBody bodyB, final FixedConstraintConfiguration config) { final int sceneID = Rapier3D.getID(serverLevel); final long handle = Rapier3D.addFixedConstraint( sceneID, - rigidbodyA == null ? -1 : Rapier3D.getID(rigidbodyA), - rigidbodyB == null ? -1 : Rapier3D.getID(rigidbodyB), + bodyA == null ? -1 : Rapier3D.getID(bodyA), + bodyB == null ? -1 : Rapier3D.getID(bodyB), config.pos1().x(), config.pos1().y(), config.pos1().z(), diff --git a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/free/RapierFreeConstraintHandle.java b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/free/RapierFreeConstraintHandle.java index 647559a5..8a42c77c 100644 --- a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/free/RapierFreeConstraintHandle.java +++ b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/free/RapierFreeConstraintHandle.java @@ -12,13 +12,13 @@ public class RapierFreeConstraintHandle extends RapierConstraintHandle implement /** * Creates a rapier constraint handle */ - public static RapierFreeConstraintHandle create(final ServerLevel serverLevel, @Nullable final PhysicsPipelineBody rigidbodyA, @Nullable final PhysicsPipelineBody rigidbodyB, final FreeConstraintConfiguration config) { + public static RapierFreeConstraintHandle create(final ServerLevel serverLevel, @Nullable final PhysicsPipelineBody bodyA, @Nullable final PhysicsPipelineBody bodyB, final FreeConstraintConfiguration config) { final int sceneID = Rapier3D.getID(serverLevel); final long handle = Rapier3D.addFreeConstraint( sceneID, - rigidbodyA == null ? -1 : Rapier3D.getID(rigidbodyA), - rigidbodyB == null ? -1 : Rapier3D.getID(rigidbodyB), + bodyA == null ? -1 : Rapier3D.getID(bodyA), + bodyB == null ? -1 : Rapier3D.getID(bodyB), config.pos1().x(), config.pos1().y(), config.pos1().z(), diff --git a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/generic/RapierGenericConstraintHandle.java b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/generic/RapierGenericConstraintHandle.java index eab3f513..75f0db3d 100644 --- a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/generic/RapierGenericConstraintHandle.java +++ b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/generic/RapierGenericConstraintHandle.java @@ -21,7 +21,7 @@ public class RapierGenericConstraintHandle extends RapierConstraintHandle implem /** * Creates a rapier constraint handle */ - public static RapierGenericConstraintHandle create(final ServerLevel serverLevel, @Nullable final PhysicsPipelineBody rigidbodyA, @Nullable final PhysicsPipelineBody rigidbodyB, final GenericConstraintConfiguration config) { + public static RapierGenericConstraintHandle create(final ServerLevel serverLevel, @Nullable final PhysicsPipelineBody bodyA, @Nullable final PhysicsPipelineBody bodyB, final GenericConstraintConfiguration config) { final int sceneID = Rapier3D.getID(serverLevel); int lockedAxesMask = 0; @@ -31,8 +31,8 @@ public static RapierGenericConstraintHandle create(final ServerLevel serverLevel final long handle = Rapier3D.addGenericConstraint( sceneID, - rigidbodyA == null ? -1 : Rapier3D.getID(rigidbodyA), - rigidbodyB == null ? -1 : Rapier3D.getID(rigidbodyB), + bodyA == null ? -1 : Rapier3D.getID(bodyA), + bodyB == null ? -1 : Rapier3D.getID(bodyB), config.pos1().x(), config.pos1().y(), config.pos1().z(), diff --git a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/rotary/RapierRotaryConstraintHandle.java b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/rotary/RapierRotaryConstraintHandle.java index 6d17000b..64945549 100644 --- a/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/rotary/RapierRotaryConstraintHandle.java +++ b/common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/constraint/rotary/RapierRotaryConstraintHandle.java @@ -12,13 +12,13 @@ public class RapierRotaryConstraintHandle extends RapierConstraintHandle impleme /** * Creates a rapier constraint handle */ - public static RapierRotaryConstraintHandle create(final ServerLevel serverLevel, @Nullable final PhysicsPipelineBody rigidbodyA, @Nullable final PhysicsPipelineBody rigidbodyB, final RotaryConstraintConfiguration config) { + public static RapierRotaryConstraintHandle create(final ServerLevel serverLevel, @Nullable final PhysicsPipelineBody bodyA, @Nullable final PhysicsPipelineBody bodyB, final RotaryConstraintConfiguration config) { final int sceneID = Rapier3D.getID(serverLevel); final long handle = Rapier3D.addRotaryConstraint( sceneID, - rigidbodyA == null ? -1 : Rapier3D.getID(rigidbodyA), - rigidbodyB == null ? -1 : Rapier3D.getID(rigidbodyB), + bodyA == null ? -1 : Rapier3D.getID(bodyA), + bodyB == null ? -1 : Rapier3D.getID(bodyB), config.pos1().x(), config.pos1().y(), config.pos1().z(),