From 9328a446c441c14001a1636b1462a9e9ef4d4c73 Mon Sep 17 00:00:00 2001
From: Davis Rollman <drollma@hotmail.com>
Date: Wed, 15 Apr 2026 23:20:14 -0400
Subject: [PATCH] deprecate jbullet bridge apis

---
 .../src/main/java/com/jme3/bullet/BulletAppState.java         | 1 +
 jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java  | 1 +
 .../src/main/java/com/jme3/bullet/PhysicsTickListener.java    | 1 +
 .../src/main/java/com/jme3/bullet/animation/BoneLink.java     | 1 +
 .../src/main/java/com/jme3/bullet/animation/DacLinks.java     | 1 +
 .../java/com/jme3/bullet/animation/DynamicAnimControl.java    | 1 +
 .../main/java/com/jme3/bullet/animation/KinematicSubmode.java | 1 +
 .../src/main/java/com/jme3/bullet/animation/RagUtils.java     | 1 +
 .../com/jme3/bullet/animation/RagdollCollisionListener.java   | 1 +
 .../main/java/com/jme3/bullet/animation/RangeOfMotion.java    | 1 +
 .../src/main/java/com/jme3/bullet/animation/TorsoLink.java    | 1 +
 .../src/main/java/com/jme3/bullet/animation/VectorSet.java    | 1 +
 .../java/com/jme3/bullet/collision/PhysicsCollisionEvent.java | 1 +
 .../jme3/bullet/collision/PhysicsCollisionEventFactory.java   | 1 +
 .../jme3/bullet/collision/PhysicsCollisionGroupListener.java  | 1 +
 .../com/jme3/bullet/collision/PhysicsCollisionListener.java   | 1 +
 .../com/jme3/bullet/collision/PhysicsCollisionObject.java     | 1 +
 .../java/com/jme3/bullet/collision/PhysicsRayTestResult.java  | 1 +
 .../com/jme3/bullet/collision/PhysicsSweepTestResult.java     | 1 +
 .../com/jme3/bullet/collision/RagdollCollisionListener.java   | 1 +
 .../com/jme3/bullet/collision/shapes/BoxCollisionShape.java   | 1 +
 .../jme3/bullet/collision/shapes/CapsuleCollisionShape.java   | 1 +
 .../java/com/jme3/bullet/collision/shapes/CollisionShape.java | 4 ++++
 .../jme3/bullet/collision/shapes/CompoundCollisionShape.java  | 1 +
 .../com/jme3/bullet/collision/shapes/ConeCollisionShape.java  | 1 +
 .../jme3/bullet/collision/shapes/CylinderCollisionShape.java  | 1 +
 .../jme3/bullet/collision/shapes/GImpactCollisionShape.java   | 1 +
 .../bullet/collision/shapes/HeightfieldCollisionShape.java    | 1 +
 .../com/jme3/bullet/collision/shapes/HullCollisionShape.java  | 1 +
 .../com/jme3/bullet/collision/shapes/MeshCollisionShape.java  | 1 +
 .../com/jme3/bullet/collision/shapes/PlaneCollisionShape.java | 1 +
 .../jme3/bullet/collision/shapes/SimplexCollisionShape.java   | 1 +
 .../jme3/bullet/collision/shapes/SphereCollisionShape.java    | 1 +
 .../bullet/collision/shapes/infos/ChildCollisionShape.java    | 1 +
 .../java/com/jme3/bullet/control/AbstractPhysicsControl.java  | 1 +
 .../java/com/jme3/bullet/control/BetterCharacterControl.java  | 1 +
 .../main/java/com/jme3/bullet/control/CharacterControl.java   | 1 +
 .../src/main/java/com/jme3/bullet/control/GhostControl.java   | 1 +
 .../src/main/java/com/jme3/bullet/control/PhysicsControl.java | 1 +
 .../main/java/com/jme3/bullet/control/RigidBodyControl.java   | 1 +
 .../src/main/java/com/jme3/bullet/control/VehicleControl.java | 1 +
 .../jme3/bullet/control/ragdoll/HumanoidRagdollPreset.java    | 1 +
 .../java/com/jme3/bullet/control/ragdoll/RagdollPreset.java   | 1 +
 .../java/com/jme3/bullet/control/ragdoll/RagdollUtils.java    | 1 +
 .../com/jme3/bullet/debug/AbstractPhysicsDebugControl.java    | 1 +
 .../com/jme3/bullet/debug/BulletCharacterDebugControl.java    | 1 +
 .../main/java/com/jme3/bullet/debug/BulletDebugAppState.java  | 1 +
 .../com/jme3/bullet/debug/BulletGhostObjectDebugControl.java  | 1 +
 .../java/com/jme3/bullet/debug/BulletJointDebugControl.java   | 1 +
 .../com/jme3/bullet/debug/BulletRigidBodyDebugControl.java    | 1 +
 .../java/com/jme3/bullet/debug/BulletVehicleDebugControl.java | 1 +
 .../src/main/java/com/jme3/bullet/debug/DebugTools.java       | 1 +
 .../src/main/java/com/jme3/bullet/joints/ConeJoint.java       | 1 +
 .../src/main/java/com/jme3/bullet/joints/HingeJoint.java      | 1 +
 .../src/main/java/com/jme3/bullet/joints/PhysicsJoint.java    | 1 +
 .../main/java/com/jme3/bullet/joints/Point2PointJoint.java    | 1 +
 .../src/main/java/com/jme3/bullet/joints/SixDofJoint.java     | 1 +
 .../src/main/java/com/jme3/bullet/joints/SliderJoint.java     | 1 +
 .../com/jme3/bullet/joints/motors/RotationalLimitMotor.java   | 4 +++-
 .../jme3/bullet/joints/motors/TranslationalLimitMotor.java    | 4 +++-
 .../main/java/com/jme3/bullet/objects/PhysicsCharacter.java   | 1 +
 .../main/java/com/jme3/bullet/objects/PhysicsGhostObject.java | 1 +
 .../main/java/com/jme3/bullet/objects/PhysicsRigidBody.java   | 1 +
 .../src/main/java/com/jme3/bullet/objects/PhysicsVehicle.java | 1 +
 .../src/main/java/com/jme3/bullet/objects/VehicleWheel.java   | 3 +++
 .../com/jme3/bullet/objects/infos/RigidBodyMotionState.java   | 1 +
 .../main/java/com/jme3/bullet/util/CollisionShapeFactory.java | 1 +
 .../src/main/java/com/jme3/bullet/util/Converter.java         | 1 +
 .../src/main/java/com/jme3/bullet/util/DebugShapeFactory.java | 1 +
 69 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/BulletAppState.java b/jme3-jbullet/src/main/java/com/jme3/bullet/BulletAppState.java
index d18b8526b8..92654e90ca 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/BulletAppState.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/BulletAppState.java
@@ -49,6 +49,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class BulletAppState
         extends AbstractAppState
         implements PhysicsTickListener {
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java b/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java
index 7d0735cb25..3d0630e919 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java
@@ -101,6 +101,7 @@
  * <p>PhysicsSpace - The central jbullet-jme physics space</p>
  * @author normenhansen
  */
+@Deprecated
 public class PhysicsSpace {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsTickListener.java b/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsTickListener.java
index 55281caaf8..28add1e7b0 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsTickListener.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsTickListener.java
@@ -38,6 +38,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public interface PhysicsTickListener {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/BoneLink.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/BoneLink.java
index 893baf32e1..2f94d2ec38 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/BoneLink.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/BoneLink.java
@@ -58,6 +58,7 @@
  *
  * Based on KinematicRagdollControl by Normen Hansen and Rémy Bouquet (Nehon).
  */
+@Deprecated
 public class BoneLink extends PhysicsLink {
     // *************************************************************************
     // constants and loggers
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/DacLinks.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/DacLinks.java
index 6e1a44a606..73a4b99512 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/DacLinks.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/DacLinks.java
@@ -72,6 +72,7 @@
  *
  * Based on KinematicRagdollControl by Normen Hansen and Rémy Bouquet (Nehon).
  */
+@Deprecated
 public class DacLinks
         extends DacConfiguration
         implements PhysicsTickListener {
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/DynamicAnimControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/DynamicAnimControl.java
index 7ae598f0be..267d9075d2 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/DynamicAnimControl.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/DynamicAnimControl.java
@@ -70,6 +70,7 @@
  *
  * Based on KinematicRagdollControl by Normen Hansen and Rémy Bouquet (Nehon).
  */
+@Deprecated
 public class DynamicAnimControl
         extends DacLinks
         implements PhysicsCollisionListener {
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/KinematicSubmode.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/KinematicSubmode.java
index 95ffa186bf..8bed3fdbaa 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/KinematicSubmode.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/KinematicSubmode.java
@@ -38,6 +38,7 @@
  *
  * @author Stephen Gold sgold@sonic.net
  */
+@Deprecated
 public enum KinematicSubmode {
     /**
      * driven by animation (if any)
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RagUtils.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RagUtils.java
index 0a51b894e8..f53b73c7e7 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RagUtils.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RagUtils.java
@@ -68,6 +68,7 @@
  *
  * Based on KinematicRagdollControl by Normen Hansen and Rémy Bouquet (Nehon).
  */
+@Deprecated
 public class RagUtils {
     // *************************************************************************
     // constants and loggers
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RagdollCollisionListener.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RagdollCollisionListener.java
index 3e0eccdb48..bdd7e8903d 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RagdollCollisionListener.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RagdollCollisionListener.java
@@ -42,6 +42,7 @@
  *
  * @author Nehon
  */
+@Deprecated
 public interface RagdollCollisionListener {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RangeOfMotion.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RangeOfMotion.java
index b79d8519c7..99db5c061a 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RangeOfMotion.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RangeOfMotion.java
@@ -54,6 +54,7 @@
  *
  * Based on RagdollPreset by Rémy Bouquet (Nehon).
  */
+@Deprecated
 public class RangeOfMotion implements Savable {
     // *************************************************************************
     // constants and loggers
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/TorsoLink.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/TorsoLink.java
index fcb3fdbdab..1e13c646df 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/TorsoLink.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/TorsoLink.java
@@ -56,6 +56,7 @@
  *
  * Based on KinematicRagdollControl by Normen Hansen and Rémy Bouquet (Nehon).
  */
+@Deprecated
 public class TorsoLink extends PhysicsLink {
     // *************************************************************************
     // constants and loggers
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/VectorSet.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/VectorSet.java
index 482f957396..bfc9f94a6c 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/animation/VectorSet.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/VectorSet.java
@@ -46,6 +46,7 @@
  *
  * @author Stephen Gold sgold@sonic.net
  */
+@Deprecated
 public class VectorSet {
     // *************************************************************************
     // constants and loggers
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionEvent.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionEvent.java
index 9ba347e384..f304aa20db 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionEvent.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionEvent.java
@@ -43,6 +43,7 @@
  * Get/reference all data you need in the collide method.
  * @author normenhansen
  */
+@Deprecated
 public class PhysicsCollisionEvent extends EventObject {
 
     public static final int TYPE_ADDED = 0;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionEventFactory.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionEventFactory.java
index d4ea7a0062..940bef3cec 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionEventFactory.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionEventFactory.java
@@ -38,6 +38,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class PhysicsCollisionEventFactory {
 
     private ConcurrentLinkedQueue<PhysicsCollisionEvent> eventBuffer = new ConcurrentLinkedQueue<>();
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionGroupListener.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionGroupListener.java
index 4a7a0432d6..08f6ba960f 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionGroupListener.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionGroupListener.java
@@ -39,6 +39,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public interface PhysicsCollisionGroupListener {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionListener.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionListener.java
index 8bcaf4e22d..91b0252ded 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionListener.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionListener.java
@@ -39,6 +39,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public interface PhysicsCollisionListener {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionObject.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionObject.java
index 4cfbc9d65f..5a8d0cc0e7 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionObject.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionObject.java
@@ -39,6 +39,7 @@
  * Base class for collision objects (PhysicsRigidBody, PhysicsGhostObject)
  * @author normenhansen
  */
+@Deprecated
 public abstract class PhysicsCollisionObject implements Savable {
 
     protected CollisionShape collisionShape;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsRayTestResult.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsRayTestResult.java
index e88ffa27e0..92b8270223 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsRayTestResult.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsRayTestResult.java
@@ -38,6 +38,7 @@
  * <b>Read data only in callback method, object is reused</b>
  * @author normenhansen
  */
+@Deprecated
 public class PhysicsRayTestResult {
 
     private PhysicsCollisionObject collisionObject;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsSweepTestResult.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsSweepTestResult.java
index 8e61b66a24..238cece559 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsSweepTestResult.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsSweepTestResult.java
@@ -37,6 +37,7 @@
  * Contains the results of a PhysicsSpace rayTest
  * @author normenhansen
  */
+@Deprecated
 public class PhysicsSweepTestResult {
 
     private PhysicsCollisionObject collisionObject;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/RagdollCollisionListener.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/RagdollCollisionListener.java
index 84e50cdaed..498a8552e4 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/RagdollCollisionListener.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/RagdollCollisionListener.java
@@ -41,6 +41,7 @@
  *
  * @author Nehon
  */
+@Deprecated
 public interface RagdollCollisionListener {
     
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/BoxCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/BoxCollisionShape.java
index a8c47006fb..5e576c440d 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/BoxCollisionShape.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/BoxCollisionShape.java
@@ -44,6 +44,7 @@
  * Basic box collision shape
  * @author normenhansen
  */
+@Deprecated
 public class BoxCollisionShape extends CollisionShape {
 
     private Vector3f halfExtents;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CapsuleCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CapsuleCollisionShape.java
index 5eaead802c..a55567b06a 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CapsuleCollisionShape.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CapsuleCollisionShape.java
@@ -45,6 +45,7 @@
  * Basic capsule collision shape
  * @author normenhansen
  */
+@Deprecated
 public class CapsuleCollisionShape extends CollisionShape{
     protected float radius,height;
     protected int axis;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CollisionShape.java
index 43987206a3..76ed32ae18 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CollisionShape.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CollisionShape.java
@@ -42,6 +42,7 @@
  * TODO: add static methods to create shapes from nodes (like jbullet-jme constructor)
  * @author normenhansen
  */
+@Deprecated
 public abstract class CollisionShape implements Savable {
 
     /**
@@ -65,6 +66,7 @@ protected CollisionShape() {
      * @param mass the desired mass for the body
      * @param vector storage for the result (not null, modified)
      */
+    @Deprecated
     public void calculateLocalInertia(float mass, javax.vecmath.Vector3f vector) {
         if (cShape == null) {
             return;
@@ -81,6 +83,7 @@ public void calculateLocalInertia(float mass, javax.vecmath.Vector3f vector) {
      *
      * @return the pre-existing instance
      */
+    @Deprecated
     public com.bulletphysics.collision.shapes.CollisionShape getCShape() {
         return cShape;
     }
@@ -90,6 +93,7 @@ public com.bulletphysics.collision.shapes.CollisionShape getCShape() {
      *
      * @param cShape the shape to use (alias created)
      */
+    @Deprecated
     public void setCShape(com.bulletphysics.collision.shapes.CollisionShape cShape) {
         this.cShape = cShape;
     }
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java
index 33157fc97c..cc75a68896 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java
@@ -53,6 +53,7 @@
  * to generate a more sophisticated shape.
  * @author normenhansen
  */
+@Deprecated
 public class CompoundCollisionShape extends CollisionShape {
 
     protected ArrayList<ChildCollisionShape> children = new ArrayList<>();
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/ConeCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/ConeCollisionShape.java
index f82ce96ea1..d68c019b8e 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/ConeCollisionShape.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/ConeCollisionShape.java
@@ -47,6 +47,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class ConeCollisionShape extends CollisionShape {
 
     protected float radius;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java
index 88f8a5a4ce..32dc120251 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java
@@ -48,6 +48,7 @@
  * Basic cylinder collision shape
  * @author normenhansen
  */
+@Deprecated
 public class CylinderCollisionShape extends CollisionShape {
 
     protected Vector3f halfExtents;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java
index 7dadd68835..88d87c148e 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java
@@ -48,6 +48,7 @@
  * Basic mesh collision shape
  * @author normenhansen
  */
+@Deprecated
 public class GImpactCollisionShape extends CollisionShape{
 
     protected Vector3f worldScale;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java
index d6102d660f..1799b9cf65 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java
@@ -53,6 +53,7 @@
  * 
  * @author Brent Owens
  */
+@Deprecated
 public class HeightfieldCollisionShape extends CollisionShape {
 
     //protected HeightfieldTerrainShape heightfieldShape;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/HullCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/HullCollisionShape.java
index 24746934a5..ffcadb2d6e 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/HullCollisionShape.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/HullCollisionShape.java
@@ -44,6 +44,7 @@
 import java.nio.FloatBuffer;
 import javax.vecmath.Vector3f;
 
+@Deprecated
 public class HullCollisionShape extends CollisionShape {
 
     private float[] points;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/MeshCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/MeshCollisionShape.java
index acb93ee043..7263202ba3 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/MeshCollisionShape.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/MeshCollisionShape.java
@@ -48,6 +48,7 @@
  * Basic mesh collision shape
  * @author normenhansen
  */
+@Deprecated
 public class MeshCollisionShape extends CollisionShape {
 
     protected int numVertices, numTriangles, vertexStride, triangleIndexStride;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/PlaneCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/PlaneCollisionShape.java
index e5f6b304d1..d59f5752bb 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/PlaneCollisionShape.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/PlaneCollisionShape.java
@@ -44,6 +44,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class PlaneCollisionShape extends CollisionShape{
     private Plane plane;
 
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SimplexCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SimplexCollisionShape.java
index 2ae60bceee..6f1139f28b 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SimplexCollisionShape.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SimplexCollisionShape.java
@@ -44,6 +44,7 @@
  * A simple point, line, triangle or quad collisionShape based on one to four points-
  * @author normenhansen
  */
+@Deprecated
 public class SimplexCollisionShape extends CollisionShape {
 
     private Vector3f vector1, vector2, vector3, vector4;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java
index ec4f08fc58..0c597e9fa2 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java
@@ -43,6 +43,7 @@
  * Basic sphere collision shape
  * @author normenhansen
  */
+@Deprecated
 public class SphereCollisionShape extends CollisionShape {
 
     protected float radius;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java
index 9665efde65..a89b46ee96 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java
@@ -46,6 +46,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class ChildCollisionShape implements Savable {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/control/AbstractPhysicsControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/AbstractPhysicsControl.java
index 38d0aa6d0e..f2f20d25db 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/control/AbstractPhysicsControl.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/control/AbstractPhysicsControl.java
@@ -54,6 +54,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public abstract class AbstractPhysicsControl implements PhysicsControl, JmeCloneable {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/control/BetterCharacterControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/BetterCharacterControl.java
index 57755eebde..cc6f1a1eb8 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/control/BetterCharacterControl.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/control/BetterCharacterControl.java
@@ -69,6 +69,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class BetterCharacterControl extends AbstractPhysicsControl implements PhysicsTickListener, JmeCloneable {
 
     protected static final Logger logger = Logger.getLogger(BetterCharacterControl.class.getName());
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/control/CharacterControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/CharacterControl.java
index 834a937650..a46af4f380 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/control/CharacterControl.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/control/CharacterControl.java
@@ -52,6 +52,7 @@
  * You might want to try <code>BetterCharacterControl</code> as well.
  * @author normenhansen
  */
+@Deprecated
 public class CharacterControl extends PhysicsCharacter implements PhysicsControl, JmeCloneable {
 
     protected Spatial spatial;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/control/GhostControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/GhostControl.java
index 6bfb71fe8c..b50f9c43e9 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/control/GhostControl.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/control/GhostControl.java
@@ -58,6 +58,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class GhostControl extends PhysicsGhostObject implements PhysicsControl, JmeCloneable {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/control/PhysicsControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/PhysicsControl.java
index 1c81a7ff70..3d81dd6c90 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/control/PhysicsControl.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/control/PhysicsControl.java
@@ -42,6 +42,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public interface PhysicsControl extends Control {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/control/RigidBodyControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/RigidBodyControl.java
index 6377ee413b..91bbe91c16 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/control/RigidBodyControl.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/control/RigidBodyControl.java
@@ -62,6 +62,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class RigidBodyControl extends PhysicsRigidBody implements PhysicsControl, JmeCloneable {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/control/VehicleControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/VehicleControl.java
index 275cb215af..2116142ff0 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/control/VehicleControl.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/control/VehicleControl.java
@@ -57,6 +57,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class VehicleControl extends PhysicsVehicle implements PhysicsControl, JmeCloneable {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/HumanoidRagdollPreset.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/HumanoidRagdollPreset.java
index 68696090e3..ac58e19c01 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/HumanoidRagdollPreset.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/HumanoidRagdollPreset.java
@@ -40,6 +40,7 @@
  *
  * @author Nehon
  */
+@Deprecated
 public class HumanoidRagdollPreset extends RagdollPreset {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/RagdollPreset.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/RagdollPreset.java
index dbcc38df46..ba12c5c3fe 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/RagdollPreset.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/RagdollPreset.java
@@ -41,6 +41,7 @@
  *
  * @author Nehon
  */
+@Deprecated
 public abstract class RagdollPreset {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/RagdollUtils.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/RagdollUtils.java
index f24ccf5f72..a1a97ba5cd 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/RagdollUtils.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/RagdollUtils.java
@@ -56,6 +56,7 @@
  *
  * @author Nehon
  */
+@Deprecated
 public class RagdollUtils {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/AbstractPhysicsDebugControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/AbstractPhysicsDebugControl.java
index 44293d3b0c..f23e331386 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/AbstractPhysicsDebugControl.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/AbstractPhysicsDebugControl.java
@@ -45,6 +45,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public abstract class AbstractPhysicsDebugControl extends AbstractControl {
 
     private final Quaternion tmp_inverseWorldRotation = new Quaternion();
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletCharacterDebugControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletCharacterDebugControl.java
index 514e79b165..2bc5acd068 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletCharacterDebugControl.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletCharacterDebugControl.java
@@ -48,6 +48,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class BulletCharacterDebugControl extends AbstractPhysicsDebugControl {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletDebugAppState.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletDebugAppState.java
index 9bbfb86f5c..b0f602bf0b 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletDebugAppState.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletDebugAppState.java
@@ -61,6 +61,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class BulletDebugAppState extends AbstractAppState {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletGhostObjectDebugControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletGhostObjectDebugControl.java
index bdb6932d7a..80ae04dd35 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletGhostObjectDebugControl.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletGhostObjectDebugControl.java
@@ -48,6 +48,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class BulletGhostObjectDebugControl extends AbstractPhysicsDebugControl {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletJointDebugControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletJointDebugControl.java
index 7b11a41d68..e9dbe61fa5 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletJointDebugControl.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletJointDebugControl.java
@@ -49,6 +49,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class BulletJointDebugControl extends AbstractPhysicsDebugControl {
 
     protected final PhysicsJoint body;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletRigidBodyDebugControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletRigidBodyDebugControl.java
index 727deebc33..da4887138b 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletRigidBodyDebugControl.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletRigidBodyDebugControl.java
@@ -48,6 +48,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class BulletRigidBodyDebugControl extends AbstractPhysicsDebugControl {
 
     /**
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletVehicleDebugControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletVehicleDebugControl.java
index c964c420b7..b019b6e01f 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletVehicleDebugControl.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletVehicleDebugControl.java
@@ -49,6 +49,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class BulletVehicleDebugControl extends AbstractPhysicsDebugControl {
 
     protected final PhysicsVehicle body;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/DebugTools.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/DebugTools.java
index 16bc38ac8c..c33a77d134 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/debug/DebugTools.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/DebugTools.java
@@ -48,6 +48,7 @@
  *
  * @author normenhansen
  */
+@Deprecated
 public class DebugTools {
 
     protected final AssetManager manager;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/ConeJoint.java b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/ConeJoint.java
index c0838f1c55..a09d20a823 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/ConeJoint.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/ConeJoint.java
@@ -50,6 +50,7 @@
  * The x-axis serves as twist axis.
  * @author normenhansen
  */
+@Deprecated
 public class ConeJoint extends PhysicsJoint {
 
     protected Matrix3f rotA, rotB;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/HingeJoint.java b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/HingeJoint.java
index 2d6de96013..1a71d809a2 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/HingeJoint.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/HingeJoint.java
@@ -49,6 +49,7 @@
  * The user can specify limits and motor for the hinge.
  * @author normenhansen
  */
+@Deprecated
 public class HingeJoint extends PhysicsJoint {
 
     protected Vector3f axisA;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/PhysicsJoint.java b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/PhysicsJoint.java
index f2f670578a..a301b901b0 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/PhysicsJoint.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/PhysicsJoint.java
@@ -41,6 +41,7 @@
  * <p>PhysicsJoint - Basic Physics Joint</p>
  * @author normenhansen
  */
+@Deprecated
 public abstract class PhysicsJoint implements Savable {
 
     protected TypedConstraint constraint;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/Point2PointJoint.java b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/Point2PointJoint.java
index bd862f8540..f9daeddcbf 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/Point2PointJoint.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/Point2PointJoint.java
@@ -48,6 +48,7 @@
  * A chain of rigid bodies can be connected using this constraint.
  * @author normenhansen
  */
+@Deprecated
 public class Point2PointJoint extends PhysicsJoint {
 
     protected Point2PointJoint() {
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/SixDofJoint.java b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/SixDofJoint.java
index d041689b94..ead525a26b 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/SixDofJoint.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/SixDofJoint.java
@@ -58,6 +58,7 @@
  * include free and/or limited angular degrees of freedom are undefined.
  * @author normenhansen
  */
+@Deprecated
 public class SixDofJoint extends PhysicsJoint {
 
     private boolean useLinearReferenceFrameA = true;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/SliderJoint.java b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/SliderJoint.java
index 7b75ef7789..aef9ee7583 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/SliderJoint.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/SliderJoint.java
@@ -48,6 +48,7 @@
  * The slider constraint allows the body to rotate around one axis and translate along this axis.
  * @author normenhansen
  */
+@Deprecated
 public class SliderJoint extends PhysicsJoint {
     protected Matrix3f rotA, rotB;
     protected boolean useLinearReferenceFrameA;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/motors/RotationalLimitMotor.java b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/motors/RotationalLimitMotor.java
index b1d4e3c80a..c4559316ec 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/motors/RotationalLimitMotor.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/motors/RotationalLimitMotor.java
@@ -32,17 +32,19 @@
 package com.jme3.bullet.joints.motors;
 
 /**
- *
  * @author normenhansen
  */
+@Deprecated
 public class RotationalLimitMotor {
 
     private com.bulletphysics.dynamics.constraintsolver.RotationalLimitMotor motor;
 
+    @Deprecated
     public RotationalLimitMotor(com.bulletphysics.dynamics.constraintsolver.RotationalLimitMotor motor) {
         this.motor = motor;
     }
 
+    @Deprecated
     public com.bulletphysics.dynamics.constraintsolver.RotationalLimitMotor getMotor() {
         return motor;
     }
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/motors/TranslationalLimitMotor.java b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/motors/TranslationalLimitMotor.java
index 38e663f91d..252e49502e 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/joints/motors/TranslationalLimitMotor.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/joints/motors/TranslationalLimitMotor.java
@@ -35,17 +35,19 @@
 import com.jme3.math.Vector3f;
 
 /**
- *
  * @author normenhansen
  */
+@Deprecated
 public class TranslationalLimitMotor {
 
     private com.bulletphysics.dynamics.constraintsolver.TranslationalLimitMotor motor;
 
+    @Deprecated
     public TranslationalLimitMotor(com.bulletphysics.dynamics.constraintsolver.TranslationalLimitMotor motor) {
         this.motor = motor;
     }
 
+    @Deprecated
     public com.bulletphysics.dynamics.constraintsolver.TranslationalLimitMotor getMotor() {
         return motor;
     }
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsCharacter.java b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsCharacter.java
index a5a2fda8b2..ec11dfaa5b 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsCharacter.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsCharacter.java
@@ -52,6 +52,7 @@
  * Basic Bullet Character
  * @author normenhansen
  */
+@Deprecated
 public class PhysicsCharacter extends PhysicsCollisionObject {
 
     protected KinematicCharacterController character;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsGhostObject.java b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsGhostObject.java
index 24c182bbc1..535be2b2d1 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsGhostObject.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsGhostObject.java
@@ -57,6 +57,7 @@
  * collision sensors/triggers, explosions etc.<br>
  * @author normenhansen
  */
+@Deprecated
 public class PhysicsGhostObject extends PhysicsCollisionObject {
 
     protected PairCachingGhostObject gObject;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java
index 71e7fe154a..1c6e21855e 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java
@@ -57,6 +57,7 @@
  * <p>PhysicsRigidBody - Basic physics object</p>
  * @author normenhansen
  */
+@Deprecated
 public class PhysicsRigidBody extends PhysicsCollisionObject {
 
     protected RigidBodyConstructionInfo constructionInfo;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsVehicle.java b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsVehicle.java
index 265d5eb5a5..3011a086cc 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsVehicle.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsVehicle.java
@@ -59,6 +59,7 @@
  * </p>
  * @author normenhansen
  */
+@Deprecated
 public class PhysicsVehicle extends PhysicsRigidBody {
 
     protected RaycastVehicle vehicle;
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/VehicleWheel.java b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/VehicleWheel.java
index 8f254f9d3f..5c9b25de41 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/VehicleWheel.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/VehicleWheel.java
@@ -44,6 +44,7 @@
  * Stores info about one wheel of a PhysicsVehicle
  * @author normenhansen
  */
+@Deprecated
 public class VehicleWheel implements Savable {
 
     protected com.bulletphysics.dynamics.vehicle.WheelInfo wheelInfo;
@@ -114,10 +115,12 @@ public void applyWheelTransform() {
         }
     }
 
+    @Deprecated
     public com.bulletphysics.dynamics.vehicle.WheelInfo getWheelInfo() {
         return wheelInfo;
     }
 
+    @Deprecated
     public void setWheelInfo(com.bulletphysics.dynamics.vehicle.WheelInfo wheelInfo) {
         this.wheelInfo = wheelInfo;
         applyInfo();
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/infos/RigidBodyMotionState.java b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/infos/RigidBodyMotionState.java
index 5ca251eb41..328af3a080 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/objects/infos/RigidBodyMotionState.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/objects/infos/RigidBodyMotionState.java
@@ -45,6 +45,7 @@
  * allow multithreaded access from the jme scenegraph and the bullet physics space
  * @author normenhansen
  */
+@Deprecated
 public class RigidBodyMotionState extends MotionState {
     //stores the bullet transform
 
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/util/CollisionShapeFactory.java b/jme3-jbullet/src/main/java/com/jme3/bullet/util/CollisionShapeFactory.java
index 80d71c53ce..faac22b1d8 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/util/CollisionShapeFactory.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/util/CollisionShapeFactory.java
@@ -50,6 +50,7 @@
  *
  * @author normenhansen, tim8dev
  */
+@Deprecated
 public class CollisionShapeFactory {
     /**
      * A private constructor to inhibit instantiation of this class.
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/util/Converter.java b/jme3-jbullet/src/main/java/com/jme3/bullet/util/Converter.java
index 096c926e8d..cfab0d8f81 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/util/Converter.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/util/Converter.java
@@ -46,6 +46,7 @@
  * Objects, also some jme to jbullet mesh conversion.
  * @author normenhansen
  */
+@Deprecated
 public class Converter {
 
     private Converter() {
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/util/DebugShapeFactory.java b/jme3-jbullet/src/main/java/com/jme3/bullet/util/DebugShapeFactory.java
index 3e74f1ab3c..593415febb 100644
--- a/jme3-jbullet/src/main/java/com/jme3/bullet/util/DebugShapeFactory.java
+++ b/jme3-jbullet/src/main/java/com/jme3/bullet/util/DebugShapeFactory.java
@@ -57,6 +57,7 @@
  *
  * @author CJ Hare, normenhansen
  */
+@Deprecated
 public class DebugShapeFactory {
 
     /** The maximum corner for the aabb used for triangles to include in ConcaveShape processing.*/