[sim] Move Sim classes from HAL to wpilibc/j (#2549)

Also move some things in HAL for consistency.

WAS:
C++:
- C APIs: #include "mockdata/AccelerometerData.h"
- User side class: #include "simulation/AccelerometerSim.h"
Java:
- JNI APIs: hal.sim.mockdata.AccelerometerData (and a few classes in hal.sim)
- User side classes: hal.sim.AccelerometerSim

IS:
C++:
- C APIs: #include "hal/simulation/AccelerometerData.h"
- C++ class: #include "frc/simulation/AccelerometerSim.h"
Java:
- JNI APIs: hal.simulation.AccelerometerData
- User side class: wpilibj.simulation.AccelerometerSim

hal/src/main/native/sim/jni/RoboRioDataJNI.cpp

@@ -8,20 +8,20 @@
 #include <jni.h>
 
 #include "CallbackStore.h"
-#include "edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI.h"
-#include "mockdata/RoboRioData.h"
+#include "edu_wpi_first_hal_simulation_RoboRioDataJNI.h"
+#include "hal/simulation/RoboRioData.h"
 
 using namespace hal;
 
 extern "C" {
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerFPGAButtonCallback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerFPGAButtonCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerFPGAButtonCallback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerFPGAButtonCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelFPGAButtonCallback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelFPGAButtonCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelFPGAButtonCallback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelFPGAButtonCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getFPGAButton
  * Signature: (I)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getFPGAButton
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getFPGAButton
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioFPGAButton(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setFPGAButton
  * Signature: (IZ)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setFPGAButton
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setFPGAButton
   (JNIEnv*, jclass, jint index, jboolean value)
 {
   HALSIM_SetRoboRioFPGAButton(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerVInVoltageCallback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerVInVoltageCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerVInVoltageCallback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerVInVoltageCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelVInVoltageCallback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelVInVoltageCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelVInVoltageCallback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -92,36 +92,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelVInVoltageCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getVInVoltage
  * Signature: (I)D
  */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getVInVoltage
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getVInVoltage
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioVInVoltage(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setVInVoltage
  * Signature: (ID)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setVInVoltage
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setVInVoltage
   (JNIEnv*, jclass, jint index, jdouble value)
 {
   HALSIM_SetRoboRioVInVoltage(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerVInCurrentCallback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerVInCurrentCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerVInCurrentCallback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -129,12 +129,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerVInCurrentCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelVInCurrentCallback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelVInCurrentCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelVInCurrentCallback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -142,36 +142,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelVInCurrentCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getVInCurrent
  * Signature: (I)D
  */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getVInCurrent
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getVInCurrent
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioVInCurrent(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setVInCurrent
  * Signature: (ID)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setVInCurrent
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setVInCurrent
   (JNIEnv*, jclass, jint index, jdouble value)
 {
   HALSIM_SetRoboRioVInCurrent(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerUserVoltage6VCallback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserVoltage6VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserVoltage6VCallback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -179,12 +179,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserVoltage6VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelUserVoltage6VCallback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserVoltage6VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserVoltage6VCallback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -192,36 +192,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserVoltage6VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getUserVoltage6V
  * Signature: (I)D
  */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserVoltage6V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserVoltage6V
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioUserVoltage6V(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setUserVoltage6V
  * Signature: (ID)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserVoltage6V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserVoltage6V
   (JNIEnv*, jclass, jint index, jdouble value)
 {
   HALSIM_SetRoboRioUserVoltage6V(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerUserCurrent6VCallback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserCurrent6VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserCurrent6VCallback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -229,12 +229,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserCurrent6VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelUserCurrent6VCallback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserCurrent6VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserCurrent6VCallback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -242,36 +242,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserCurrent6VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getUserCurrent6V
  * Signature: (I)D
  */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserCurrent6V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserCurrent6V
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioUserCurrent6V(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setUserCurrent6V
  * Signature: (ID)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserCurrent6V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserCurrent6V
   (JNIEnv*, jclass, jint index, jdouble value)
 {
   HALSIM_SetRoboRioUserCurrent6V(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerUserActive6VCallback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserActive6VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserActive6VCallback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -279,12 +279,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserActive6VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelUserActive6VCallback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserActive6VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserActive6VCallback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -292,36 +292,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserActive6VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getUserActive6V
  * Signature: (I)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserActive6V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserActive6V
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioUserActive6V(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setUserActive6V
  * Signature: (IZ)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserActive6V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserActive6V
   (JNIEnv*, jclass, jint index, jboolean value)
 {
   HALSIM_SetRoboRioUserActive6V(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerUserVoltage5VCallback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserVoltage5VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserVoltage5VCallback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -329,12 +329,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserVoltage5VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelUserVoltage5VCallback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserVoltage5VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserVoltage5VCallback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -342,36 +342,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserVoltage5VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getUserVoltage5V
  * Signature: (I)D
  */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserVoltage5V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserVoltage5V
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioUserVoltage5V(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setUserVoltage5V
  * Signature: (ID)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserVoltage5V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserVoltage5V
   (JNIEnv*, jclass, jint index, jdouble value)
 {
   HALSIM_SetRoboRioUserVoltage5V(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerUserCurrent5VCallback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserCurrent5VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserCurrent5VCallback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -379,12 +379,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserCurrent5VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelUserCurrent5VCallback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserCurrent5VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserCurrent5VCallback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -392,36 +392,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserCurrent5VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getUserCurrent5V
  * Signature: (I)D
  */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserCurrent5V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserCurrent5V
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioUserCurrent5V(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setUserCurrent5V
  * Signature: (ID)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserCurrent5V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserCurrent5V
   (JNIEnv*, jclass, jint index, jdouble value)
 {
   HALSIM_SetRoboRioUserCurrent5V(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerUserActive5VCallback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserActive5VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserActive5VCallback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -429,12 +429,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserActive5VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelUserActive5VCallback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserActive5VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserActive5VCallback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -442,36 +442,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserActive5VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getUserActive5V
  * Signature: (I)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserActive5V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserActive5V
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioUserActive5V(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setUserActive5V
  * Signature: (IZ)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserActive5V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserActive5V
   (JNIEnv*, jclass, jint index, jboolean value)
 {
   HALSIM_SetRoboRioUserActive5V(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerUserVoltage3V3Callback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserVoltage3V3Callback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserVoltage3V3Callback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -479,12 +479,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserVoltage3V3Callbac
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelUserVoltage3V3Callback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserVoltage3V3Callback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserVoltage3V3Callback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -492,36 +492,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserVoltage3V3Callback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getUserVoltage3V3
  * Signature: (I)D
  */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserVoltage3V3
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserVoltage3V3
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioUserVoltage3V3(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setUserVoltage3V3
  * Signature: (ID)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserVoltage3V3
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserVoltage3V3
   (JNIEnv*, jclass, jint index, jdouble value)
 {
   HALSIM_SetRoboRioUserVoltage3V3(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerUserCurrent3V3Callback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserCurrent3V3Callback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserCurrent3V3Callback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -529,12 +529,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserCurrent3V3Callbac
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelUserCurrent3V3Callback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserCurrent3V3Callback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserCurrent3V3Callback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -542,36 +542,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserCurrent3V3Callback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getUserCurrent3V3
  * Signature: (I)D
  */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserCurrent3V3
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserCurrent3V3
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioUserCurrent3V3(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setUserCurrent3V3
  * Signature: (ID)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserCurrent3V3
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserCurrent3V3
   (JNIEnv*, jclass, jint index, jdouble value)
 {
   HALSIM_SetRoboRioUserCurrent3V3(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerUserActive3V3Callback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserActive3V3Callback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserActive3V3Callback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -579,12 +579,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserActive3V3Callback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelUserActive3V3Callback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserActive3V3Callback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserActive3V3Callback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -592,36 +592,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserActive3V3Callback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getUserActive3V3
  * Signature: (I)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserActive3V3
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserActive3V3
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioUserActive3V3(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setUserActive3V3
  * Signature: (IZ)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserActive3V3
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserActive3V3
   (JNIEnv*, jclass, jint index, jboolean value)
 {
   HALSIM_SetRoboRioUserActive3V3(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerUserFaults6VCallback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserFaults6VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserFaults6VCallback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -629,12 +629,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserFaults6VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelUserFaults6VCallback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserFaults6VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserFaults6VCallback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -642,36 +642,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserFaults6VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getUserFaults6V
  * Signature: (I)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserFaults6V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserFaults6V
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioUserFaults6V(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setUserFaults6V
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserFaults6V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserFaults6V
   (JNIEnv*, jclass, jint index, jint value)
 {
   HALSIM_SetRoboRioUserFaults6V(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerUserFaults5VCallback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserFaults5VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserFaults5VCallback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -679,12 +679,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserFaults5VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelUserFaults5VCallback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserFaults5VCallback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserFaults5VCallback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -692,36 +692,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserFaults5VCallback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getUserFaults5V
  * Signature: (I)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserFaults5V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserFaults5V
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioUserFaults5V(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setUserFaults5V
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserFaults5V
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserFaults5V
   (JNIEnv*, jclass, jint index, jint value)
 {
   HALSIM_SetRoboRioUserFaults5V(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    registerUserFaults3V3Callback
  * Signature: (ILjava/lang/Object;Z)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserFaults3V3Callback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserFaults3V3Callback
   (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
   return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -729,12 +729,12 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_registerUserFaults3V3Callback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    cancelUserFaults3V3Callback
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserFaults3V3Callback
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserFaults3V3Callback
   (JNIEnv* env, jclass, jint index, jint handle)
 {
   return sim::FreeCallback(env, handle, index,
@@ -742,36 +742,36 @@ Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_cancelUserFaults3V3Callback
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    getUserFaults3V3
  * Signature: (I)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_getUserFaults3V3
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserFaults3V3
   (JNIEnv*, jclass, jint index)
 {
   return HALSIM_GetRoboRioUserFaults3V3(index);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    setUserFaults3V3
  * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_setUserFaults3V3
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserFaults3V3
   (JNIEnv*, jclass, jint index, jint value)
 {
   HALSIM_SetRoboRioUserFaults3V3(index, value);
 }
 
 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI
+ * Class:     edu_wpi_first_hal_simulation_RoboRioDataJNI
  * Method:    resetData
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_RoboRioDataJNI_resetData
+Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_resetData
   (JNIEnv*, jclass, jint index)
 {
   HALSIM_ResetRoboRioData(index);